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

28
Programs/mapgenerator/ProtocolManager.cs
View File

@@ -41,17 +41,17 @@ namespace mapgenerator
/// <summary></summary>
F64,
/// <summary></summary>
UUID,
LLUUID,
/// <summary></summary>
BOOL,
/// <summary></summary>
Vector3,
LLVector3,
/// <summary></summary>
Vector3d,
LLVector3d,
/// <summary></summary>
Vector4,
LLVector4,
/// <summary></summary>
Quaternion,
LLQuaternion,
/// <summary></summary>
IPADDR,
/// <summary></summary>
@@ -207,12 +207,12 @@ namespace mapgenerator
TypeSizes.Add(FieldType.S32, 4);
TypeSizes.Add(FieldType.F32, 4);
TypeSizes.Add(FieldType.F64, 8);
TypeSizes.Add(FieldType.UUID, 16);
TypeSizes.Add(FieldType.LLUUID, 16);
TypeSizes.Add(FieldType.BOOL, 1);
TypeSizes.Add(FieldType.Vector3, 12);
TypeSizes.Add(FieldType.Vector3d, 24);
TypeSizes.Add(FieldType.Vector4, 16);
TypeSizes.Add(FieldType.Quaternion, 16);
TypeSizes.Add(FieldType.LLVector3, 12);
TypeSizes.Add(FieldType.LLVector3d, 24);
TypeSizes.Add(FieldType.LLVector4, 16);
TypeSizes.Add(FieldType.LLQuaternion, 16);
TypeSizes.Add(FieldType.IPADDR, 4);
TypeSizes.Add(FieldType.IPPORT, 2);
TypeSizes.Add(FieldType.Variable, -1);
@@ -347,7 +347,7 @@ namespace mapgenerator
{
writer.WriteLine("{0} {1,5} - {2} - {3} - {4}", frequency, i, map[i].Name,
map[i].Trusted ? "Trusted" : "Untrusted",
map[i].Encoded ? "Unencoded" : "Zerocoded");
map[i].Encoded ? "Zerocoded" : "Unencoded");
foreach (MapBlock block in map[i].Blocks)
{
@@ -529,7 +529,7 @@ namespace mapgenerator
LowMaps[packetID].Frequency = PacketFrequency.Low;
LowMaps[packetID].Name = tokens[0];
LowMaps[packetID].Trusted = (tokens[2] == "Trusted");
LowMaps[packetID].Encoded = (tokens[3] == "Zerocoded");
LowMaps[packetID].Encoded = (tokens[4] == "Zerocoded");
LowMaps[packetID].Blocks = new List<MapBlock>();
currentPacket = LowMaps[packetID];
@@ -542,7 +542,7 @@ namespace mapgenerator
MediumMaps[packetID].Frequency = PacketFrequency.Medium;
MediumMaps[packetID].Name = tokens[0];
MediumMaps[packetID].Trusted = (tokens[2] == "Trusted");
MediumMaps[packetID].Encoded = (tokens[3] == "Zerocoded");
MediumMaps[packetID].Encoded = (tokens[4] == "Zerocoded");
MediumMaps[packetID].Blocks = new List<MapBlock>();
currentPacket = MediumMaps[packetID];
@@ -555,7 +555,7 @@ namespace mapgenerator
HighMaps[packetID].Frequency = PacketFrequency.High;
HighMaps[packetID].Name = tokens[0];
HighMaps[packetID].Trusted = (tokens[2] == "Trusted");
HighMaps[packetID].Encoded = (tokens[3] == "Zerocoded");
HighMaps[packetID].Encoded = (tokens[4] == "Zerocoded");
HighMaps[packetID].Blocks = new List<MapBlock>();
currentPacket = HighMaps[packetID];

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;