OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork

avinationmerge
ubit 2012-10-13 02:45:42 +02:00
parent 4bd64c887d 666fb744a3
commit eef92a9df6
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Physics/Manager/IMesher.cs
View File

@ -73,7 +73,7 @@ namespace OpenSim.Region.Physics.Manager
public override string ToString()
{
return uuid.ToString() + "-" + hashC.ToString() ;
return uuid.ToString() + "-" + hashC.ToString("x") ;
}
}

30
OpenSim/Region/Physics/UbitMeshing/Meshmerizer.cs
View File

@ -956,7 +956,6 @@ namespace OpenSim.Region.Physics.Meshing
hash = mdjb2(hash, primShape.PathScaleY);
hash = mdjb2(hash, primShape.PathShearX);
key.hashA = hash;
key.hashA |= 0xf000000000000000;
hash = key.hashB;
hash = mdjb2(hash, primShape.PathShearY);
hash = mdjb2(hash, (byte)primShape.PathTwist);
@ -975,21 +974,32 @@ namespace OpenSim.Region.Physics.Meshing
hash = key.hashC;
someBytes = size.GetBytes();
for (int i = 0; i < someBytes.Length; i++)
hash = mdjb2(hash, someBytes[i]);
hash = mdjb2(hash, lod);
hash &= 0x3fffffffffffffff;
if (size == m_MeshUnitSize)
{
hash = hash << 8;
hash |= 8;
}
else
{
someBytes = size.GetBytes();
for (int i = 0; i < someBytes.Length; i++)
hash = mdjb2(hash, someBytes[i]);
hash = hash << 8;
}
if (convex)
hash |= 0x4000000000000000;
hash |= 4;
if (primShape.SculptEntry)
hash |= 0x8000000000000000;
{
hash |= 1;
if (primShape.SculptType == (byte)SculptType.Mesh)
hash |= 2;
}
key.hashB = hash;
key.hashC = hash;
return key;
}