Changeset 2645 for GTP/trunk

Timestamp:

02/27/08 18:40:49 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/ObjReader/src/ObjManualMeshLoader.cpp (modified) (1 diff)
• Preprocessing/src/Preprocessor.cpp (modified) (1 diff)
• Preprocessing/src/Preprocessor.h (modified) (2 diffs)
• Preprocessing/src/QtInterface/QtGlRenderer.cpp (modified) (3 diffs)

GTP/trunk/Lib/Vis/OnlineCullingCHC/ObjReader/src/ObjManualMeshLoader.cpp

@@ -93 +93 @@
         rop.useIndexes = false;
 #endif
+
+
         //////
         //-- Creates the index data
     
         const int indexCount = vertexCount;
+
         submesh->indexData->indexStart = 0;
         submesh->operationType = RenderOperation::OT_TRIANGLE_LIST;

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

@@ -1849 +1849 @@
 }
 
-void
-Preprocessor::UpdateDynamicObjects()
-{
-  if (mUpdateDynamicObjects) {
-
-        preprocessor->mRayCaster->DeleteDynamicObjects();
-        
-        for (int i=0; i < mDynamicObjects.size(); i++) {
-          SceneGraphLeaf *l = mDynamicObjects[i];
-          cout<<"Updating dynamic objects in ray caster..."<<endl;
-          mRayCaster->AddDynamicObjecs(l->mGeometry, l->GetTransformation());
-          cout<<"done."<<endl;
-          cout<<"Updating affected PVSs..."<<endl;
-          preprocessor->ObjectMoved(l);
-          cout<<"done."<<endl;
+
+void Preprocessor::UpdateDynamicObjects()
+{
+        if (mUpdateDynamicObjects) 
+        {
           
-        }
-        mUpdateDynamicObjects = false;
-  }
-}
-
-}
+                preprocessor->mRayCaster->DeleteDynamicObjects();
+        
+                for (size_t i=0; i < mDynamicObjects.size(); ++ i) 
+                {
+                        SceneGraphLeaf *l = mDynamicObjects[i];
+                  
+                        cout<<"Updating dynamic objects in ray caster..."<<endl;
+                  
+                        mRayCaster->AddDynamicObjecs(l->mGeometry, l->GetTransformation());
+                        
+                        cout<<"done."<<endl;
+                        
+                        cout<<"Updating affected PVSs..."<<endl;
+                        preprocessor->ObjectMoved(l);
+                        cout<<"done."<<endl;      
+                }
+        
+                mUpdateDynamicObjects = false;
+        
+        }
+}
+
+
+void Preprocessor::ScheduleUpdateDynamicObjects()
+{
+                mUpdateDynamicObjects = true;
+}
+
+
+}

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

@@ -272 +272 @@
         RayCaster *mRayCaster;
 
-
-  int mGenericStats;
+        int mGenericStats;
         int mGenericStats2;
 
-  void ScheduleUpdateDynamicObjects() {
-        mUpdateDynamicObjects = true;
-  }
-
-  void UpdateDynamicObjects();
+        void ScheduleUpdateDynamicObjects();
+        void UpdateDynamicObjects();
+
 
 protected:
@@ -298 +295 @@
         virtual void EvalViewCellHistogram();
 
-  virtual void ObjectMoved(SceneGraphLeaf *object);
+        virtual void ObjectMoved(SceneGraphLeaf *object);
+
+
+
         /////////////////////////
 

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

@@ -1060 +1060 @@
 
         // setting the main window size here
-        //resize(800, 600);
-        //resize(640, 480);
-        //resize(512, 384);
-        //resize(512, 320);
-        resize(640, 400);
+        resize(800, 600);
+        //resize(640, 400);
         
         mControlWidget->show();
@@ -1120 +1117 @@
 void QtGlRendererWidget::LoadObject()
 {
-  //    string filename("../data/teapot.bn");
-  // string filename("../data/teapot.bn");
-  string filename("../data/cube.obj");
+        string filename("../data/teapot.bn");
+        //string filename("../data/cube.obj");
         
         cout << "Loading model << " << filename << endl;
@@ -1917 +1913 @@
         QPushButton *button;
 
-#if REMOVE_TEMPORARY
+#if 0//REMOVE_TEMPORARY
 
         label = new QLabel("Granularity");