aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authordahlia2013-05-18 11:15:05 -0700
committerdahlia2013-05-18 11:15:05 -0700
commit477bee6468f35ca9264fc8f752a9124e32503901 (patch)
tree53ac2849b0635443ed935550f15d1d09a0211101 /OpenSim
parentadd prototype code to decode convex hulls from mesh assets. Please do not use... (diff)
downloadopensim-SC_OLD-477bee6468f35ca9264fc8f752a9124e32503901.zip
opensim-SC_OLD-477bee6468f35ca9264fc8f752a9124e32503901.tar.gz
opensim-SC_OLD-477bee6468f35ca9264fc8f752a9124e32503901.tar.bz2
opensim-SC_OLD-477bee6468f35ca9264fc8f752a9124e32503901.tar.xz
remove duplicate hull scaling
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Physics/Meshing/Meshmerizer.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
index 825e622..a57146c 100644
--- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
+++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs
@@ -396,9 +396,9 @@ namespace OpenSim.Region.Physics.Meshing
396 ushort uZ = Utils.BytesToUInt16(posBytes, posNdx); posNdx += 2; 396 ushort uZ = Utils.BytesToUInt16(posBytes, posNdx); posNdx += 2;
397 397
398 Vector3 pos = new Vector3( 398 Vector3 pos = new Vector3(
399 Utils.UInt16ToFloat(uX, min.X, max.X) * size.X, 399 Utils.UInt16ToFloat(uX, min.X, max.X),
400 Utils.UInt16ToFloat(uY, min.Y, max.Y) * size.Y, 400 Utils.UInt16ToFloat(uY, min.Y, max.Y),
401 Utils.UInt16ToFloat(uZ, min.Z, max.Z) * size.Z 401 Utils.UInt16ToFloat(uZ, min.Z, max.Z)
402 ); 402 );
403 403
404 hull.Add(pos); 404 hull.Add(pos);