Changeset 1697

Timestamp:

10/29/06 19:15:22 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• data/soda/soda.kdf (added)
• data/soda/soda.obj (added)
• src/HierarchyManager.cpp (modified) (1 diff)
• src/Intersectable.h (modified) (1 diff)
• src/Preprocessor.cpp (modified) (1 diff)
• src/main.cpp (modified) (1 diff)

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

@@ -963 +963 @@
                 if (success)
                 {
-                        //sc->CollectDirtyCandidates(dirtyCandidates, true);
+                        sc->CollectDirtyCandidates(dirtyCandidates, true);
                         ++ steps;
                 }

GTP/trunk/Lib/Vis/Preprocessing/src/Intersectable.h

@@ -77 +77 @@
   Intersectable(): mMailbox(0), mReferences(0), mBvhLeaf(0), mVssRays(NULL) {}
 
-  virtual Intersectable::~Intersectable() {};
+  virtual Intersectable::~Intersectable() {DEL_PTR(mVssRays);};
 
   void SetId(const int id) { mId = id; }

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

@@ -500 +500 @@
                 cout<<"#NUM_OBJECTS (Total numner of objects)\n"<<intersectables<<endl;
                 cout<<"#NUM_FACES (Total numner of faces)\n"<<faces<<endl;
+                mObjects.reserve(intersectables);
                 mSceneGraph->CollectObjects(&mObjects);
                 mSceneGraph->GetRoot()->UpdateBox();
- 
+                cout << "finished loading" << endl;
                 if (0)
                 {

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

@@ -202 +202 @@
         }
 
-        if (1) {
-          // export obj file
-          Exporter *exporter = new ObjExporter("scene.obj");
-          exporter->ExportScene(preprocessor->mSceneGraph->GetRoot());
-          delete exporter;
-        }
-        
-        
         const string externKdTree = ReplaceSuffix(filename, ".obj", ".kdf");
         const string internKdTree = GetInternFilename(filename, preprocessor->mLoadMeshes ? ".kdm" : ".kdt");
 
-        //-- initialize external ray casters
+        ////////////
+        //-- initialize external ray caster
         
         if (preprocessor->InitRayCast(externKdTree, internKdTree))