Changeset 2703 for GTP

Timestamp:

05/23/08 18:29:47 (17 years ago)

Author:

mattausch

Message:

worked on dynamic objects

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Preprocessor.cpp (modified) (2 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (8 diffs)
• QtInterface/QtGlRenderer.h (modified) (4 diffs)

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

@@ -662 +662 @@
                 cout << "loading objects from " << buf << endl;
 
-                // load scene objects used as pvs entries
+                // load scene objects which are the entities used as pvs entries
                 ObjectContainer pvsObjects;
                 if (0) LoadObjects(buf, pvsObjects, mObjects);
@@ -1598 +1598 @@
         mSceneGraph->GetRoot()->mChildren.push_back(leaf);
 
-  if (mRayCaster)
-        mRayCaster->AddDynamicObjecs(leaf->mGeometry, leaf->GetTransformation());
-  // $$ JB in order to compile
-  return leaf;
+        if (mRayCaster)
+                mRayCaster->AddDynamicObjecs(leaf->mGeometry, leaf->GetTransformation());
+        // $$ JB in order to compile
+        //return leaf;
 }
 

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

@@ -835 +835 @@
                 swap(p->mDynamicObjects[idx], p->mDynamicObjects.back());
                 p->mDynamicObjects.pop_back();
-                /*if (mCurrentDynamicObjectIdx >= 0) {
-                preprocessor->ScheduleUpdateDynamicObjects();
-                }*/
+                //preprocessor->ScheduleUpdateDynamicObjects();
         }
 }
@@ -1113 +1111 @@
         mUseSpatialFilter = tmp;
 
-        //mLogWriter = new LogWriter("myfile.out");
-
         mShowRenderCost = false;
         mShowPvsSizes = false;
@@ -1127 +1123 @@
         mShowWeightedTriangles = false;
         mShowDistribution = 15;
-        mCurrentDynamicObjectIdx = -1;
 
         mSpatialFilterSize = 0.01;
@@ -1156 +1151 @@
         connect(mControlWidget, SIGNAL(ComputeGVS(void)), this, SLOT(ComputeGVS(void)));
         connect(mControlWidget, SIGNAL(ReplayViewPoints(void)), this, SLOT(ReplayViewPoints(void)));
-        connect(mControlWidget, SIGNAL(LoadObject(void)), this, SLOT(LoadObject(void)));
+        connect(mControlWidget, SIGNAL(NextObject(void)), this, SLOT(NextObject(void)));
 
         connect(mControlWidget, SIGNAL(SetSceneCut(int)), this, SLOT(SetSceneCut(int)));
@@ -1215 +1210 @@
         
         mControlWidget->show();
+
+        LoadObjects();
 }
 
@@ -1266 +1263 @@
 
 
-void QtGlRendererWidget::LoadObject()
-{
-        string filename("../data/teapot.bn");
-        //string filename("../data/cube.obj");
-        
-        cout << "Loading model << " << filename << endl;
-
-        ++ mCurrentDynamicObjectIdx;
+void QtGlRendererWidget::LoadObjects()
+{
+        LoadObject("../data/teapot.bn");
+        LoadObject("../data/bunny.bn");
+        LoadObject("../data/horse.bn");
+}
+
+
+void QtGlRendererWidget::NextObject()
+{
+        cout << "*********\n**** next object!!!!!!!!!!!! " << endl;
+        mPlacer->NextObject();  
+}
+
+
+void QtGlRendererWidget::LoadObject(const string &filename)
+{
+        cout << "Loading model " << filename << endl;
 
         SceneGraphLeaf *leaf = 
@@ -1286 +1293 @@
                 cerr << "Loading failed" << endl;
         
-    updateGL();
+    //updateGL();
 }
 
@@ -2378 +2385 @@
         button = new QPushButton("Load object", vbox);
         vbox->layout()->addWidget(button);
-        connect(button, SIGNAL(clicked()), SIGNAL(LoadObject()));
+        connect(button, SIGNAL(clicked()), SIGNAL(NextObject()));
+        //connect(button, SIGNAL(clicked()), SIGNAL(LoadObject()));
 
         /*cb = new QCheckBox("Stats", vbox);

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

@@ -119 +119 @@
   void StoreStatistics();
   void ComputeGVS();
-  void LoadObject();
+  //void LoadObjects();
+  void NextObject();
   void UpdateAllPvs();
   void SetViewCellGranularity(int);
@@ -217 +218 @@
         int mShowDistribution;
 
-        int mCurrentDynamicObjectIdx;
-
         bool mReplayMode;
 
@@ -327 +326 @@
         int FindDynamicObject(float x, float y);
 
+        void LoadObjects();
+        void LoadObject(const std::string &filename);
 
 public slots:
@@ -340 +341 @@
         void StoreStatistics();
         
-        void LoadObject();
+        //void LoadObject();
+        void NextObject();
 
         void SetRenderErrors(bool b) {