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

Timestamp:

01/21/07 00:40:56 (17 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -265 +265 @@
 
         cout << "binary obj dump available, loading " << filename.c_str() << endl;
-        // table associating indices with vectors
-        map<int, Vector3> hashTable;
+        
 
         // table for vertices
         VertexContainer vertices; 
-        FaceContainer faces;
-
+        
         if (parents)
                 cout << "using face parents" << endl;
@@ -277 +275 @@
                 cout << "not using face parents" << endl;
 
+        int dummy = 0;
+        vector<Triangle3> triangles;
+        //triangles.reserve(sizeof(Triangle3) * 13000000);
+        //triangles.reserve(13000000);
+        //root->mGeometry.reserve(13000000);
+
         while (1)
         {
@@ -291 +295 @@
                 TriangleIntersectable *obj = new TriangleIntersectable(tri);
                 root->mGeometry.push_back(obj);
-
-                // matt: we don't really need to keep an additional data structure
-                // if working with triangles => remove this
-                if (parents) 
-                {
-                        FaceParentInfo info(obj, 0);
-                        parents->push_back(info);
-                }       
-        }
-        
+                //triangles.push_back(tri);
+                //dummy ++;
+                //if (dummy % 100000 == 9999)
+                //cout << "idx: " << dummy << endl;
+        }
+        
+        //cout << "here411" << endl;
         return true;
 }
@@ -405 +406 @@
 Intersectable *Preprocessor::GetParentObject(const int index) const
 {
-        if (index == -1)
-          return NULL;
+        if (index < 0)
+        {
+                cerr << "Warning: triangle index smaller zero! " << index << endl;
+                return NULL;
+        }
         
         if (!mFaceParents.empty())
@@ -421 +425 @@
         }
         else
-          {
-          if (index >= (int)mObjects.size()) {
-                cerr<<"Warning: triangle  index out of range! "<<index<<endl;
-                return NULL;
-          }
-          else
-                {
-                  return mObjects[index];
-                }
-          }
+        {
+                  if (index >= (int)mObjects.size()) 
+                  {
+                          cerr<<"Warning: triangle  index out of range! " << index << endl;
+                          return NULL;
+                  }
+                  else
+                  {
+                          return mObjects[index];
+                  }
+        }
 }
 
@@ -1078 +1083 @@
 
 
-bool Preprocessor::InitRayCast(const string externKdTree, 
-                                                           const string internKdTree)
+bool Preprocessor::LoadInternKdTree( const string internKdTree)
 {
         // always try to load the kd tree
@@ -1111 +1115 @@
         cout << mKdTree->GetBox() << endl;
 
+        return true;
+}
+
+
+bool Preprocessor::InitRayCast(const string externKdTree, 
+                                                           const string internKdTree)
+{
+        // always try to load the kd tree
+/*      cout << "loading kd tree file " << internKdTree << " ... " << endl;
+
+        if (!LoadKdTree(internKdTree))
+        {
+                cout << "error loading kd tree with filename " 
+                         << internKdTree << ", rebuilding it instead ... " << endl;
+                // build new kd tree from scene geometry
+                BuildKdTree();
+
+                // export kd tree?
+                const long startTime = GetTime();
+                cout << "exporting kd tree ... ";
+
+                if (!ExportKdTree(internKdTree))
+                {
+                        cout << " error exporting kd tree with filename " 
+                                 << internKdTree << endl;
+                }
+                else
+                {
+                        cout << "finished in " 
+                                 << TimeDiff(startTime, GetTime()) * 1e-3 
+                                 << " secs" << endl;
+                }
+        }
+        
+        KdTreeStatistics(cout);
+        cout << mKdTree->GetBox() << endl;
+*/
         int rayCastMethod;
         Environment::GetSingleton()->
@@ -1118 +1159 @@
         {
                 cout << "ray cast method: internal" << endl;
-                mRayCaster = new InternalRayCaster(*this, mKdTree);
+                mRayCaster = new InternalRayCaster(*this);
         }
         else
@@ -1140 +1181 @@
                                            )
 {
-
-
   const long t1 = GetTime();