Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Fixed mapgenerator bug caused by types name change

Browse Source 
* Fixed mapgenerator bug causing all packets to default to Unencoded
* Added Helpers.BytesToInt()
* Fixed endian problem in Helpers.BytesToUIntBig()
* Fixed LoginResponseData.ToXmlRpc() to return non-broken inventory skeleton
* Added EstateAssetType and TransferError enums
* Changed an Asset constructor to also take an AssetID

git-svn-id: http://libopenmetaverse.googlecode.com/svn/trunk@2124 52acb1d6-8a22-11de-b505-999d5b087335
This commit is contained in:
John Hurliman
2008-08-20 22:46:28 +00:00
parent 967da500c1
commit cfb75b85b0
8 changed files with 319 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Programs/mapgenerator/mapgenerator.cs
View File

@@ -29,19 +29,19 @@ namespace mapgenerator
case FieldType.U32:
type = "uint";
break;
case FieldType.Quaternion:
case FieldType.LLQuaternion:
type = "Quaternion";
break;
case FieldType.UUID:
case FieldType.LLUUID:
type = "UUID";
break;
case FieldType.Vector3:
case FieldType.LLVector3:
type = "Vector3";
break;
case FieldType.Vector3d:
case FieldType.LLVector3d:
type = "Vector3d";
break;
case FieldType.Vector4:
case FieldType.LLVector4:
type = "Vector4";
break;
case FieldType.S16:
@@ -126,19 +126,19 @@ namespace mapgenerator
writer.WriteLine(" " + field.Name +
" = (ushort)(bytes[i++] + (bytes[i++] << 8));");
break;
case FieldType.Quaternion:
case FieldType.LLQuaternion:
writer.WriteLine(" " + field.Name + ".FromBytes(bytes, i, true); i += 12;");
break;
case FieldType.UUID:
case FieldType.LLUUID:
writer.WriteLine(" " + field.Name + ".FromBytes(bytes, i); i += 16;");
break;
case FieldType.Vector3:
case FieldType.LLVector3:
writer.WriteLine(" " + field.Name + ".FromBytes(bytes, i); i += 12;");
break;
case FieldType.Vector3d:
case FieldType.LLVector3d:
writer.WriteLine(" " + field.Name + ".FromBytes(bytes, i); i += 24;");
break;
case FieldType.Vector4:
case FieldType.LLVector4:
writer.WriteLine(" " + field.Name + ".FromBytes(bytes, i); i += 16;");
break;
case FieldType.S16:
@@ -216,17 +216,17 @@ namespace mapgenerator
writer.WriteLine("bytes[i++] = (byte)(" + field.Name + " % 256);");
writer.WriteLine(" bytes[i++] = (byte)((" + field.Name + " >> 8) % 256);");
break;
case FieldType.UUID:
case FieldType.LLUUID:
writer.WriteLine("Buffer.BlockCopy(" + field.Name + ".GetBytes(), 0, bytes, i, 16); i += 16;");
break;
case FieldType.Vector4:
case FieldType.LLVector4:
writer.WriteLine("Buffer.BlockCopy(" + field.Name + ".GetBytes(), 0, bytes, i, 16); i += 16;");
break;
case FieldType.Quaternion:
case FieldType.Vector3:
case FieldType.LLQuaternion:
case FieldType.LLVector3:
writer.WriteLine("Buffer.BlockCopy(" + field.Name + ".GetBytes(), 0, bytes, i, 12); i += 12;");
break;
case FieldType.Vector3d:
case FieldType.LLVector3d:
writer.WriteLine("Buffer.BlockCopy(" + field.Name + ".GetBytes(), 0, bytes, i, 24); i += 24;");
break;
case FieldType.U8:
@@ -295,13 +295,13 @@ namespace mapgenerator
case FieldType.U64:
case FieldType.F64:
return 8;
case FieldType.Vector3:
case FieldType.Quaternion:
case FieldType.LLVector3:
case FieldType.LLQuaternion:
return 12;
case FieldType.UUID:
case FieldType.Vector4:
case FieldType.LLUUID:
case FieldType.LLVector4:
return 16;
case FieldType.Vector3d:
case FieldType.LLVector3d:
return 24;
case FieldType.Fixed:
return field.Count;