Changeset 672

Timestamp:

06/03/07 08:05:11 (18 months ago)

Author:

danny@…

Message:

Odd mismatch here - LineTriangleMinIntersection? expects all pointers but was not getting them. I have added some &'s to make pointers to things to get this file to compile.

Files:

• trunk/common/piece.cpp (modified) (4 diffs)

trunk/common/piece.cpp

@@ -461 +461 @@
                     Vector3 v4(verts[IndexPtr[i+3]*3], verts[IndexPtr[i+3]*3+1], verts[IndexPtr[i+3]*3+2]);
 
-                    if (LineQuadMinIntersection(v1, v2, v3, v4, Start, End, pLine->mindist, Intersection))
+                    if (LineQuadMinIntersection(v1, v2, v3, v4, Start, End, &(pLine->mindist), &Intersection))
                     {
                         pLine->pClosest = this;
@@ -477 +477 @@
                     Vector3 v4(verts[IndexPtr[i+3]*3], verts[IndexPtr[i+3]*3+1], verts[IndexPtr[i+3]*3+2]);
 
-                    if (LineQuadMinIntersection(v1, v2, v3, v4, Start, End, pLine->mindist, Intersection))
+                    if (LineQuadMinIntersection(v1, v2, v3, v4, Start, End, &(pLine->mindist), &Intersection))
                     {
                         pLine->pClosest = this;
@@ -495 +495 @@
                     Vector3 v3(verts[IndexPtr[i+2]*3], verts[IndexPtr[i+2]*3+1], verts[IndexPtr[i+2]*3+2]);
 
-                    if (LineTriangleMinIntersection(v1, v2, v3, Start, End, pLine->mindist, Intersection))
+                    if (LineTriangleMinIntersection(v1, v2, v3, Start, End, &(pLine->mindist), &Intersection))
                     {
                         pLine->pClosest = this;
@@ -510 +510 @@
                     Vector3 v3(verts[IndexPtr[i+2]*3], verts[IndexPtr[i+2]*3+1], verts[IndexPtr[i+2]*3+2]);
 
-                    if (LineTriangleMinIntersection(v1, v2, v3, Start, End, pLine->mindist, Intersection))
+                    if (LineTriangleMinIntersection(v1, v2, v3, Start, End, &(pLine->mindist), &Intersection))
                     {
                         pLine->pClosest = this;