diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Physics/Meshing/Meshmerizer.cs | 48 | ||||
-rw-r--r-- | OpenSim/Region/Physics/Meshing/PrimMesher.cs | 2 |
2 files changed, 25 insertions, 25 deletions
diff --git a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs index 311db79..3ca7786 100644 --- a/OpenSim/Region/Physics/Meshing/Meshmerizer.cs +++ b/OpenSim/Region/Physics/Meshing/Meshmerizer.cs | |||
@@ -69,35 +69,35 @@ namespace OpenSim.Region.Physics.Meshing | |||
69 | 69 | ||
70 | private float minSizeForComplexMesh = 0.2f; // prims with all dimensions smaller than this will have a bounding box mesh | 70 | private float minSizeForComplexMesh = 0.2f; // prims with all dimensions smaller than this will have a bounding box mesh |
71 | 71 | ||
72 | private static void IntersectionParameterPD(PhysicsVector p1, PhysicsVector r1, PhysicsVector p2, | 72 | // private static void IntersectionParameterPD(PhysicsVector p1, PhysicsVector r1, PhysicsVector p2, |
73 | PhysicsVector r2, ref float lambda, ref float mu) | 73 | // PhysicsVector r2, ref float lambda, ref float mu) |
74 | { | 74 | // { |
75 | // p1, p2, points on the straight | 75 | // p1, p2, points on the straight |
76 | // r1, r2, directional vectors of the straight. Not necessarily of length 1! | 76 | // r1, r2, directional vectors of the straight. Not necessarily of length 1! |
77 | // note, that l, m can be scaled such, that the range 0..1 is mapped to the area between two points, | 77 | // note, that l, m can be scaled such, that the range 0..1 is mapped to the area between two points, |
78 | // thus allowing to decide whether an intersection is between two points | 78 | // thus allowing to decide whether an intersection is between two points |
79 | 79 | ||
80 | float r1x = r1.X; | 80 | // float r1x = r1.X; |
81 | float r1y = r1.Y; | 81 | // float r1y = r1.Y; |
82 | float r2x = r2.X; | 82 | // float r2x = r2.X; |
83 | float r2y = r2.Y; | 83 | // float r2y = r2.Y; |
84 | 84 | // | |
85 | float denom = r1y * r2x - r1x * r2y; | 85 | // float denom = r1y * r2x - r1x * r2y; |
86 | 86 | // | |
87 | if (denom == 0.0) | 87 | // if (denom == 0.0) |
88 | { | 88 | // { |
89 | lambda = Single.NaN; | 89 | // lambda = Single.NaN; |
90 | mu = Single.NaN; | 90 | // mu = Single.NaN; |
91 | return; | 91 | // return; |
92 | } | 92 | // } |
93 | 93 | // | |
94 | float p1x = p1.X; | 94 | // float p1x = p1.X; |
95 | float p1y = p1.Y; | 95 | // float p1y = p1.Y; |
96 | float p2x = p2.X; | 96 | // float p2x = p2.X; |
97 | float p2y = p2.Y; | 97 | // float p2y = p2.Y; |
98 | lambda = (-p2x * r2y + p1x * r2y + (p2y - p1y) * r2x) / denom; | 98 | // lambda = (-p2x * r2y + p1x * r2y + (p2y - p1y) * r2x) / denom; |
99 | mu = (-p2x * r1y + p1x * r1y + (p2y - p1y) * r1x) / denom; | 99 | // mu = (-p2x * r1y + p1x * r1y + (p2y - p1y) * r1x) / denom; |
100 | } | 100 | // } |
101 | 101 | ||
102 | private static List<Triangle> FindInfluencedTriangles(List<Triangle> triangles, Vertex v) | 102 | private static List<Triangle> FindInfluencedTriangles(List<Triangle> triangles, Vertex v) |
103 | { | 103 | { |
diff --git a/OpenSim/Region/Physics/Meshing/PrimMesher.cs b/OpenSim/Region/Physics/Meshing/PrimMesher.cs index caf5966..dc19b1c 100644 --- a/OpenSim/Region/Physics/Meshing/PrimMesher.cs +++ b/OpenSim/Region/Physics/Meshing/PrimMesher.cs | |||
@@ -1173,7 +1173,7 @@ namespace PrimMesher | |||
1173 | 1173 | ||
1174 | public Coord SurfaceNormal(int faceIndex) | 1174 | public Coord SurfaceNormal(int faceIndex) |
1175 | { | 1175 | { |
1176 | int numFaces = faces.Count; | 1176 | //int numFaces = faces.Count; |
1177 | if (faceIndex < 0 || faceIndex >= faces.Count) | 1177 | if (faceIndex < 0 || faceIndex >= faces.Count) |
1178 | return new Coord(0.0f, 0.0f, 0.0f); | 1178 | return new Coord(0.0f, 0.0f, 0.0f); |
1179 | 1179 | ||