Changeset 1786 for GTP/trunk/Lib/Vis/Preprocessing/src/IntelRayCaster.cpp

Timestamp:

11/24/06 00:24:41 (18 years ago)

Author:

mattausch

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/IntelRayCaster.cpp (modified) (3 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/IntelRayCaster.cpp

@@ -55 +55 @@
 
         if (hittriangle != -1 ) {
-                if (hittriangle >= mPreprocessor.mFaceParents.size())
-                        cerr<<"Warning: triangle index out of range! "<<hittriangle<<endl;
-                else {
-                        hitA.mObject = mPreprocessor.mFaceParents[hittriangle].mObject;
+                Intersectable *intersect = mPreprocessor.GetParentObject(hittriangle);
+                
+                if (intersect)
+                {
+                        hitA.mObject = intersect;
                         hitA.mNormal = Vector3(normal[0], normal[1], normal[2]);
                         // Get the normal of that face
@@ -77 +78 @@
                         dist);
 
-                if (hittriangle != -1 ) {
-                        if (hittriangle >= mPreprocessor.mFaceParents.size())
-                                cerr<<"Warning: triangle index out of range! "<<hittriangle<<endl;
-                        else 
-                        {
-                                hitB.mObject = mPreprocessor.mFaceParents[hittriangle].mObject;
-                                hitB.mNormal = Vector3(normal[0], normal[1], normal[2]);
-                                // Get the normal of that face
-                                //              Mesh *mesh = ((MeshInstance *)objectB)->GetMesh();
-                                //              normalA = mesh->GetFacePlane(mFaceParents[forward_hit_triangles[i]].mFaceIndex).mNormal;
-                                //-rays[index+i].mDirection; // $$ temporary
-                                hitB.mPoint = simpleRay.Extrap(dist);
-                        }
+                Intersectable *intersect = mPreprocessor.GetParentObject(hittriangle);
+                
+                if (intersect)
+                {
+                        hitB.mObject = intersect;
+                        hitB.mNormal = Vector3(normal[0], normal[1], normal[2]);
+                        // Get the normal of that face
+                        //              Mesh *mesh = ((MeshInstance *)objectB)->GetMesh();
+                        //              normalA = mesh->GetFacePlane(mFaceParents[forward_hit_triangles[i]].mFaceIndex).mNormal;
+                        //-rays[index+i].mDirection; // $$ temporary
+                        hitB.mPoint = simpleRay.Extrap(dist);
                 }
         }
@@ -170 +169 @@
 
         for (i=0; i < num; i++) 
-          {
+        {
                 Intersection hitA(rays[i].mOrigin), hitB(rays[i].mOrigin);
 
 #if DEBUG_RAYCAST
-          Debug<<"FH\n"<<flush;
-#endif
-                
-                if (forward_hit_triangles[i] != -1 ) {
-                  if (forward_hit_triangles[i] >= mPreprocessor.mFaceParents.size())
-                        cerr<<"Warning: triangle index out of range! "<<forward_hit_triangles[i]<<endl;
-                  else { 
-                        hitA.mObject = mPreprocessor.mFaceParents[forward_hit_triangles[i]].mObject;
+                Debug<<"FH\n"<<flush;
+#endif
+                Intersectable *intersect = mPreprocessor.GetParentObject(forward_hit_triangles[i]);
+
+                if (intersect)
+                {
+                        hitA.mObject = intersect;
                         // Get the normal of that face
-                        hitA.mNormal = hitA.mObject->GetNormal(mPreprocessor.mFaceParents[forward_hit_triangles[i]].mFaceIndex);
+                        hitA.mNormal = mPreprocessor.GetParentNormal(forward_hit_triangles[i]);
+
                         //-rays[index+i].mDirection; // $$ temporary
                         hitA.mPoint = rays[index+i].Extrap(forward_dist[i]);
+                }
+        
+#if DEBUG_RAYCAST
+                Debug<<"BH\n"<<flush;
+#endif
+
+                if (castDoubleRay) 
+                {
+                        Intersectable *intersect = mPreprocessor.GetParentObject(backward_hit_triangles[i]);
+
+                        if (intersect)
+                        { 
+                                hitB.mObject = intersect;
+                                hitB.mNormal = mPreprocessor.GetParentNormal(backward_hit_triangles[i]);
+
+                                // normalB = rays[index+i].mDirection; // $$ temporary
+                                hitB.mPoint = rays[index+i].Extrap(-backward_dist[i]);
                         }
-          }
-#if DEBUG_RAYCAST
-          Debug<<"BH\n"<<flush;
-#endif
-          
-          if (castDoubleRay && (backward_hit_triangles[i] != -1)) {
-                if (backward_hit_triangles[i] >= mPreprocessor.mFaceParents.size())
-                  cerr<<"Warning: triangle  index out of range! "<<backward_hit_triangles[i]<<endl;
-                else { 
-                  hitB.mObject = mPreprocessor.mFaceParents[backward_hit_triangles[i]].mObject;
-                  hitB.mNormal = hitB.mObject->GetNormal(mPreprocessor.mFaceParents[backward_hit_triangles[i]].mFaceIndex);
-                  
-                  // normalB = rays[index+i].mDirection; // $$ temporary
-                  hitB.mPoint = rays[index+i].Extrap(-backward_dist[i]);
-                }
-          }
-          
-#if DEBUG_RAYCAST
-          Debug<<"PR\n"<<flush;
-#endif
-          
-          ProcessRay(
-                                 rays[index + i],
-                                 hitA,
-                                 hitB,
-                                 vssRays,
-                                 sbox,
-                                 castDoubleRay,
-                                 pruneInvalidRays
-                                 );
-        }
-        
+                }
+
+#if DEBUG_RAYCAST
+                Debug<<"PR\n"<<flush;
+#endif
+
+                ProcessRay(rays[index + i],
+                                   hitA,
+                                   hitB,
+                                   vssRays,
+                                   sbox,
+                                   castDoubleRay,
+                                   pruneInvalidRays
+                                   );
+        }
+
 #if DEBUG_RAYCAST
         Debug<<"C16F\n"<<flush;