Changeset 1344 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

09/12/06 17:39:08 (18 years ago)

Author:

mattausch

Message:

worked on triangle processing. logical units will be created by grouping objects
using their visibility definitions.

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (35 diffs)

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

@@ -162 +162 @@
         Debug << "detect empty view space=" << mDetectEmptyViewSpace << endl;
         Debug << "load polygons as meshes: " << mLoadPolygonsAsMeshes << endl;
+
+        if (mRayCastMethod == 0)
+                cout << "ray cast method: internal" << endl;
+        else
+                cout << "ray cast method: intel" << endl;
 }
 
@@ -231 +236 @@
         cout << "number of input files: " << files << endl;
         bool result = false;
+
+        // root for different files
+        mSceneGraph->SetRoot(new SceneGraphNode());
+
         if (files == 1) {
                 
@@ -245 +254 @@
                 cout << filename << endl;
 
-                SceneGraphNode *sroot = mSceneGraph->GetRoot();
-
                 if (mRayCastMethod == Preprocessor::INTEL_RAYCASTER)
-                { cout << "here5800" << endl;
+                { 
                         result = parser->ParseFile(
                                 filename, 
-                                &sroot,
+                                mSceneGraph->GetRoot(),
                                 mLoadPolygonsAsMeshes,
                                 &mFaceParents);
                 }
                 else
-                { cout << "here776645" << endl;
-                        result = parser->ParseFile(filename, &sroot, mLoadPolygonsAsMeshes);
+                { 
+                        result = parser->ParseFile(filename, mSceneGraph->GetRoot(), mLoadPolygonsAsMeshes);
                 }
-                 cout << "here98809845" << endl;
+                
                 delete parser;
 
         } else {
-                // root for different files
-                mSceneGraph->SetRoot(new SceneGraphNode());
+                
                 for (int i= 0; i < filenames.size(); i++) {
                   if (strstr(filenames[i].c_str(), ".x3d"))
@@ -271 +277 @@
                         parser = new UnigraphicsParser;
                   
-                  SceneGraphNode *node;
+                  SceneGraphNode *node = new SceneGraphNode();
                   bool success;
                   
                   if (mRayCastMethod == Preprocessor::INTEL_RAYCASTER)
-                  { cout << "here4500" << endl;
+                  { 
                           success = parser->ParseFile(
                                   filename, 
-                                  &node,
+                                  node,
                                   mLoadPolygonsAsMeshes,
                                   &mFaceParents);
@@ -284 +290 @@
                   else
                   {
-                          cout << "here45" << endl;
-                          success = parser->ParseFile(filename, &node, mLoadPolygonsAsMeshes);
+                          success = parser->ParseFile(filename, node, mLoadPolygonsAsMeshes);
                   }
 
                   if (success) 
-                  { cout << "here4509999" << endl;
+                  { 
                           mSceneGraph->GetRoot()->mChildren.push_back(node);
-                          // at least one file parsed
-                          result = true;
+                          result = true; // at least one file parsed
                   }
                   
@@ -298 +302 @@
                 }
         }
-         cout << "here8888" << endl;
-
+        
         if (result) 
-        { cout << "here199" << endl;
+        { 
                 // HACK 
                 if (ADDITIONAL_GEOMETRY_HACK)
@@ -307 +310 @@
 
                 mSceneGraph->AssignObjectIds();
- cout << "here99" << endl;
+ 
                 int intersectables, faces;
                 mSceneGraph->GetStatistics(intersectables, faces);
- cout << "here999" << endl;
+ 
                 cout<<filename<<" parsed successfully."<<endl;
                 cout<<"#NUM_OBJECTS (Total numner of objects)\n"<<intersectables<<endl;
@@ -316 +319 @@
                 mSceneGraph->CollectObjects(&mObjects);
                 mSceneGraph->GetRoot()->UpdateBox();
- cout << "here9999" << endl;
+ 
                 if (0)
                 {
@@ -369 +372 @@
 {
   mKdTree = new KdTree;
+
   // add mesh instances of the scene graph to the root of the tree
   KdLeaf *root = (KdLeaf *)mKdTree->GetRoot();
-        cout << "here3.95" << endl;
+        
   mSceneGraph->CollectObjects(&root->mObjects);
-        cout << "here3.97" << endl;
+  
   long startTime = GetTime();
-
   cout << "building kd tree ... " << endl;
+
   mKdTree->Construct();
+
   cout << "construction finished in " << TimeDiff(startTime, GetTime()) * 1e-3 << " secs " << endl;
+
   return true;
 }
@@ -847 +853 @@
         case INTEL_RAYCASTER:
 #ifdef GTP_INTERNAL
-          cout<<"Ray Cast file: "<<externKdTree<<endl;
+          cout<<"Ray Cast file: " << externKdTree << endl;
           return mlrtaLoadAS(externKdTree.c_str());
 #endif
@@ -868 +874 @@
 {
 #ifdef GTP_INTERNAL
+        //cout << "intel ray" << endl;
         VssRay *vssRay  = NULL;
         int hits = 0;
@@ -875 +882 @@
         Intersectable *objectA = NULL, *objectB = NULL;
         float dist;
-        
         double normal[3];
 
         hittriangle = mlrtaIntersectAS(&viewPoint.x,
-                                                                   &direction.x,
-                                                                   normal,
-                                                                   dist);
-
-        if (hittriangle !=-1 ) {
-          if (hittriangle >= mFaceParents.size())
-                cerr<<"Warning: triangle index out of range! "<<hittriangle<<endl;
-          else {
-                objectA = mFaceParents[hittriangle].mObject;
-                normalA = Vector3(normal[0], normal[1], normal[2]);
-                // Get the normal of that face
-                //              Mesh *mesh = ((MeshInstance *)objectA)->GetMesh();
-                //              normalA = mesh->GetFacePlane(mFaceParents[forward_hit_triangles[i]].mFaceIndex).mNormal;
-                //-rays[index+i].mDirection; // $$ temporary
-                pointA = viewPoint + direction*dist;
-          }
-        }
-
-        
+                &direction.x,
+                normal,
+                dist);
+
+        if (hittriangle != -1 ) {
+                if (hittriangle >= mFaceParents.size())
+                        cerr<<"Warning: triangle index out of range! "<<hittriangle<<endl;
+                else {
+                        objectA = mFaceParents[hittriangle].mObject;
+                        normalA = Vector3(normal[0], normal[1], normal[2]);
+                        // Get the normal of that face
+                        //              Mesh *mesh = ((MeshInstance *)objectA)->GetMesh();
+                        //              normalA = mesh->GetFacePlane(mFaceParents[forward_hit_triangles[i]].mFaceIndex).mNormal;
+                        //-rays[index+i].mDirection; // $$ temporary
+                        pointA = viewPoint + direction*dist;
+                }
+        }
+
+
         Vector3 dir = -direction;
         hittriangle = mlrtaIntersectAS(&viewPoint.x,
-                                                                   &dir.x,
-                                                                   normal,
-                                                                   dist);
-
-        if (hittriangle !=-1 ) {
-          if (hittriangle >= mFaceParents.size())
-                cerr<<"Warning: traingle index out of range! "<<hittriangle<<endl;
-          else {
-                objectB = mFaceParents[hittriangle].mObject;
-                normalB = 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
-                pointB = viewPoint + dir*dist;
-        }
+                &dir.x,
+                normal,
+                dist);
+
+        if (hittriangle != -1 ) {
+                if (hittriangle >= mFaceParents.size())
+                        cerr<<"Warning: triangle index out of range! "<<hittriangle<<endl;
+                else {
+                        objectB = mFaceParents[hittriangle].mObject;
+                        normalB = 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
+                        pointB = viewPoint + dir * dist;
+                }
         }
 
         return ProcessRay(viewPoint,
-                                          direction,
-                                          objectA, pointA, normalA,
-                                          objectB, pointB, normalB,
-                                          probability,
-                                          vssRays,
-                                          box
-                                          );
+                direction,
+                objectA, pointA, normalA,
+                objectB, pointB, normalB,
+                probability,
+                vssRays,
+                box
+                );
 #else
         return -1;
@@ -971 +977 @@
         else {
           if (hittriangle >= mFaceParents.size()) {
-                cerr<<"Warning: traingle index out of range! "<<hittriangle<<endl;
+                cerr<<"Warning: triangle index out of range! "<<hittriangle<<endl;
                 return NULL;
           }
@@ -989 +995 @@
 #endif
 
-        
-        
 }
 
@@ -1002 +1006 @@
                                                                   )
 {
-
+  cout << "internal ray" << endl;
   int hits = 0;
   static Ray ray;
@@ -1009 +1013 @@
 
   //  AxisAlignedBox3 box = Union(mKdTree->GetBox(), mViewCellsManager->GetViewSpaceBox());
-  
-
   AxisAlignedBox3 sbox = box;
   sbox.Enlarge(Vector3(-Limits::Small));
@@ -1042 +1044 @@
   }
 
-  
   SetupRay(ray, viewPoint, -direction);
   ray.mFlags &= ~Ray::CULL_BACKFACES;
@@ -1076 +1077 @@
                                                   );
           vssRays.push_back(vssRay);
+          //cout << "ray: " << *vssRay << endl;
           hits ++;
         }
@@ -1088 +1090 @@
                                                   );
           vssRays.push_back(vssRay);
+          //cout << "ray: " << *vssRay << endl;
           hits ++;
         }
@@ -1172 +1175 @@
                                                   );
           vssRays.push_back(vssRay);
+          //cout << "ray: " << *vssRay << endl;
           hits ++;
         }
@@ -1184 +1188 @@
                                                   );
           vssRays.push_back(vssRay);
+          //cout << "ray: " << *vssRay << endl;
           hits ++;
         }
@@ -1199 +1204 @@
 {
   int i;
-  int num = 16;
+  const int num = 16;
 
 #if DEBUG_RAYCAST
@@ -1214 +1219 @@
 
 
-  
-
   Vector3 min = sbox.Min();
   Vector3 max = sbox.Max();
+  
   for (i=0; i < num; i++) {
         mlrtaStoreRayAS16(&rays[index + i].mOrigin.x,
@@ -1223 +1227 @@
                                           i);
   }
-  
   
   mlrtaTraverseGroupAS16(&min.x,
@@ -1237 +1240 @@
   }
   
-  
   mlrtaTraverseGroupAS16(&min.x,
                                                  &max.x,
@@ -1244 +1246 @@
   
 
-
   for (i=0; i < num; i++) {
         Intersectable *objectA = NULL, *objectB = NULL;
@@ -1250 +1251 @@
         Vector3 normalA, normalB;
 
-
-  
-        if (forward_hit_triangles[i] !=-1 ) {
+        if (forward_hit_triangles[i] != -1 ) {
           if (forward_hit_triangles[i] >= mFaceParents.size())
-                cerr<<"Warning: traingle index out of range! "<<forward_hit_triangles[i]<<endl;
-          else {
+                cerr<<"Warning: triangle index out of range! "<<forward_hit_triangles[i]<<endl;
+          else { 
                 objectA = mFaceParents[forward_hit_triangles[i]].mObject;
                 // Get the normal of that face
-                Mesh *mesh = ((MeshInstance *)objectA)->GetMesh();
-                normalA = mesh->GetFacePlane(mFaceParents[forward_hit_triangles[i]].mFaceIndex).mNormal;
+                normalA = objectA->GetNormal(mFaceParents[forward_hit_triangles[i]].mFaceIndex);
                 //-rays[index+i].mDirection; // $$ temporary
                 pointA = rays[index+i].Extrap(forward_dist[i]);
           }
         }
-        
+         
         if (backward_hit_triangles[i]!=-1) {
           if (backward_hit_triangles[i] >= mFaceParents.size())
-                cerr<<"Warning: traingle index out of range! "<<backward_hit_triangles[i]<<endl;
-          else {
+                cerr<<"Warning: triangle  index out of range! "<<backward_hit_triangles[i]<<endl;
+          else { 
                 objectB = mFaceParents[backward_hit_triangles[i]].mObject;
-                Mesh *mesh = ((MeshInstance *)objectB)->GetMesh();
-                
-                normalB = mesh->GetFacePlane(mFaceParents[backward_hit_triangles[i]].mFaceIndex).mNormal;
-                
-                //        normalB = rays[index+i].mDirection; // $$ temporary
+                normalB = objectB->GetNormal(mFaceParents[forward_hit_triangles[i]].mFaceIndex);
+                
+                // normalB = rays[index+i].mDirection; // $$ temporary
                 pointB = rays[index+i].Extrap(-backward_dist[i]);
           }
         }
-
+ 
         ProcessRay(rays[index+i].mOrigin,
                            rays[index+i].mDirection,
@@ -1288 +1284 @@
                            );
   }
+  
 #endif
   
@@ -1312 +1309 @@
 {
   long t1 = GetTime();
-  for (int i=0; i < rays.size(); ) {
-        if (i + 16 < rays.size()) {
+  
+  for (int i = 0; i < (int)rays.size(); ) {
+          // method only available for intel raycaster yet
+        if (i + 16 < (int)rays.size()) {
+
           CastRays16(
                                  i,
@@ -1321 +1321 @@
           i += 16;
         } else {
-
           CastRay(rays[i].mOrigin,
                           rays[i].mDirection,
@@ -1327 +1326 @@
                           vssRays,
                           mViewCellsManager->GetViewSpaceBox());
-
           i++;
         }
@@ -1335 +1333 @@
 
   long t2 = GetTime();
-  
   cout<<2*rays.size()/(1e3*TimeDiff(t1, t2))<<"M rays/s"<<endl;
 }
@@ -1354 +1351 @@
          
           int hittriangle;
-          
 
 #ifdef GTP_INTERNAL
@@ -1367 +1363 @@
            if (hittriangle !=-1 ) {
                 if (hittriangle >= mFaceParents.size())
-                  cerr<<"Warning: traingle index out of range! "<<hittriangle<<endl;
+                  cerr<<"Warning: triangle index out of range! "<<hittriangle<<endl;
                 else {
                   result = mFaceParents[hittriangle].mObject;
@@ -1375 +1371 @@
           }
 #else
-        hittriangle = -1;
+          hittriangle = -1;
 #endif
 
-         
           break;
         }