Changeset 2715 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

05/27/08 10:57:05 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/run_demo_vienna (modified) (2 diffs)
• src/Preprocessor.cpp (modified) (6 diffs)
• src/Preprocessor.h (modified) (1 diff)
• src/QtInterface/QtGlRenderer.cpp (modified) (7 diffs)
• src/SceneGraph.cpp (modified) (5 diffs)
• src/SceneGraph.h (modified) (1 diff)
• src/TestPreprocessor05.vcproj (modified) (1 diff)

GTP/trunk/Lib/Vis/Preprocessing/scripts/run_demo_vienna

@@ -10 +10 @@
 #SCENE=../data/vienna/vienna_cropped.obj
 #SCENE=../data/vienna/city_full.obj
-SCENE=../data/vienna/city_full_hp.obj
-#SCENE=../data/vienna/vienna_rep.obj
+#SCENE=../data/vienna/city_full_hp.obj
+SCENE=../data/vienna/vienna_rep.obj
 
 VIEWCELLS=../data/vienna/vienna_cropped-gradient-viewcells.xml.gz
@@ -31 +31 @@
 #DISTRIBUTIONS=spatial
 
-# $COMMAND -preprocessor=combined \
-# -scene_filename=$SCENE \
-# -view_cells_filename=$VIEWCELLS \
-# -rss_distributions=$DISTRIBUTIONS \
-# -view_cells_use_kd_pvs+ -af_use_kd_pvs+ \
-# -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \
-# -preprocessor_stats=$PREFIX-i-mixed-b1-n4a.log \
-# -preprocessor_detect_empty_viewspace+ \
-# -preprocessor_use_vbos- \
-# -preprocessor_ray_cast_method=1 \
-# -view_cells_random_viewpoint_list=$VIEWPOINTS \
-# demo1.env
+ $COMMAND -preprocessor=combined \
+ -scene_filename=$SCENE \
+ -view_cells_filename=$VIEWCELLS \
+ -rss_distributions=$DISTRIBUTIONS \
+ -view_cells_use_kd_pvs+ -af_use_kd_pvs+ \
+ -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \
+ -preprocessor_stats=$PREFIX-i-mixed-b1-n4a.log \
+ -preprocessor_detect_empty_viewspace+ \
+ -preprocessor_use_vbos- \
+ -preprocessor_ray_cast_method=3 \
+ -view_cells_random_viewpoint_list=$VIEWPOINTS \
+ demo1.env
 
-$COMMAND -preprocessor=sampling \
--scene_filename=$SCENE \
--view_cells_filename=$VIEWCELLS \
--view_cells_use_kd_pvs+ -af_use_kd_pvs+ \
--preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \
--preprocessor_stats=$PREFIX-i-mixed-b1-n4a.log \
--preprocessor_detect_empty_viewspace+ \
--preprocessor_use_vbos- \
--preprocessor_ray_cast_method=1 \
--view_cells_random_viewpoint_list=$VIEWPOINTS \
-demo1.env
+#$COMMAND -preprocessor=sampling \
+#-scene_filename=$SCENE \
+#-view_cells_filename=$VIEWCELLS \
+#-view_cells_use_kd_pvs+ -af_use_kd_pvs+ \
+#-preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \
+#-preprocessor_stats=$PREFIX-i-mixed-b1-n4a.log \
+#-preprocessor_detect_empty_viewspace+ \
+#-preprocessor_use_vbos- \
+#-preprocessor_ray_cast_method=1 \
+#-view_cells_random_viewpoint_list=$VIEWPOINTS \
+#demo1.env
 
 

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

@@ -1599 +1599 @@
         }
 
-        cout << "\**************\n******* new object has id " << currentId << endl;
+        cout << "new object registered with id " << currentId << endl;
 
         ++ sCurrentDynamicId;
@@ -1605 +1605 @@
         // tell ray caster to update
         ScheduleUpdateDynamicObjects();
-
-        if (0) 
-        {
-                // add to scene graph
-                mSceneGraph->GetRoot()->mChildren.push_back(leaf);
-                // add to ray caster
-                if (mRayCaster)
-                        mRayCaster->AddDynamicObjecs(leaf->mGeometry, leaf->GetTransformation());
-        }
-        // $$ JB in order to compile
-        //return leaf;
 }
 
@@ -1769 +1758 @@
           preprocessor->mRayCaster->DeleteDynamicObjects();
           
-#define MULTIPLE_OBJECTS 0
-#define CREATE_TRANSF_COPIES_OF_DYN_OBJECTS      1
+#define MULTIPLE_OBJECTS 1
 
 #if MULTIPLE_OBJECTS 
-#if CREATE_TRANSF_COPIES_OF_DYN_OBJECTS 
           static ObjectContainer objects;
           
-          if (objects.size()) {
-                for (size_t i = 0; i < objects.size(); ++ i) {
-                  delete objects[i];
-                }
-                objects.clear();
-          }
+          CLEAR_CONTAINER(objects);
           
           for (size_t i = 0; i < mDynamicObjects.size(); ++ i) {
@@ -1789 +1771 @@
                         Triangle3 t(((TriangleIntersectable *)l->mGeometry[j])->GetItem());
                         t.ApplyTransformation(l->GetTransformation());
-                        objects.push_back(new TriangleIntersectable(t));
+                        TriangleIntersectable *to = new TriangleIntersectable(t);
+                        to->SetId(l->GetIntersectable()->GetId());
+
+                        objects.push_back(to);
                   }
                 }
           }
           mRayCaster->AddDynamicObjecs(objects, IdentityMatrix());
-#else
-          mRayCaster->AddDynamicObjecs(objects, IdentityMatrix());
-#endif
 #endif    
 
@@ -1802 +1784 @@
           
           for (size_t i = 0; i < mDynamicObjects.size(); ++ i) 
-                {
+          {
                   SceneGraphLeaf *l = mDynamicObjects[i];
 
 #if  !MULTIPLE_OBJECTS
-                  UpdateObjectInRayCaster(l);
+                  PrepareObjectsForRayCaster(l);
 #endif
 
                   if (l->HasChanged())
-                        {
-                          
+                  {
                           cout<<"Updating affected PVSs..."<<endl;
                           preprocessor->ObjectMoved(l);
                           cout<<"done."<<endl;  
                           l->SetHasChanged(false);
-                        }
-                }
-
+                  }
+          }
 
           mUpdateDynamicObjects = false;
@@ -1832 +1812 @@
 
 
-void Preprocessor::UpdateObjectInRayCaster(SceneGraphLeaf *l)
+void Preprocessor::PrepareObjectsForRayCaster(SceneGraphLeaf *l)
 {
         cout<<"Updating dynamic objects in ray caster..."<<endl;

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

@@ -200 +200 @@
         void RegisterDynamicObject(SceneGraphLeaf *leaf);
         
-        void UpdateObjectInRayCaster(SceneGraphLeaf *l);
+        void PrepareObjectsForRayCaster(SceneGraphLeaf *l);
         
         void ScheduleUpdateDynamicObjects();

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

@@ -574 +574 @@
         DynamicObjectsContainer::const_iterator dit, dit_end = mDynamicPvsObjects.end();
 
+        //cout << "dynamic objects in pvs " << mDynamicPvsObjects.size() << endl;;
+
         for (dit = mDynamicPvsObjects.begin(); dit != dit_end; ++ dit)
         {
                 _RenderDynamicObject(*dit);
         }
+
+        glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
 
         // show placed dynamic objects as wireframe
         Preprocessor *p = mViewCellsManager->GetPreprocessor();
-        dit, dit_end = p->mDynamicObjects.end();
+        dit_end = p->mDynamicObjects.end();
 
         int i = 0;
@@ -591 +595 @@
                         glColor3f(0, 1, 0);
 
-                glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
                 _RenderDynamicObject(*dit);
-                glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-        }
+        }
+        
+        glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 }
 
@@ -2002 +2006 @@
     
         QVBoxLayout *vbox2 = new QVBoxLayout;
-        QGroupBox *groupBox = new QGroupBox("Trafo types");
+        QGroupBox *groupBox = new QGroupBox("Dynamic Obojects");
 
         vbox2->addWidget(rb1);
@@ -2021 +2025 @@
         connect(button, SIGNAL(clicked()), SIGNAL(DeleteDynamicObject()));
         
+        button = new QPushButton("Next object", groupBox);
+        vbox2->layout()->addWidget(button);
+        connect(button, SIGNAL(clicked()), SIGNAL(NextObject()));
+
         groupBox->setLayout(vbox2);
         
@@ -2398 +2406 @@
 #endif
 
-
-        
-
 #if REMOVE_TEMPORARY
         
@@ -2438 +2443 @@
         connect(button, SIGNAL(clicked()), SIGNAL(ComputeGVS()));
 #endif
-
-#if 1   
+        
         button = new QPushButton("Replay view points", vbox);
         vbox->layout()->addWidget(button);
         connect(button, SIGNAL(clicked()), SIGNAL(ReplayViewPoints()));
 
-#endif
-
-        button = new QPushButton("Next object", vbox);
-        vbox->layout()->addWidget(button);
-        connect(button, SIGNAL(clicked()), SIGNAL(NextObject()));
-        //connect(button, SIGNAL(clicked()), SIGNAL(LoadObject()));
 
         /*cb = new QCheckBox("Stats", vbox);
@@ -2631 +2629 @@
                 if (mUseRandomColorPerPvsObject)
                 {
-                        KdIntersectable *kdint = static_cast<KdIntersectable *>(obj);
-
-                        if (kdint->mGenericIdx == -1)
+                        if (obj->Type() == Intersectable::KD_INTERSECTABLE)
                         {
-                                kdint->mGenericIdx = (int)mColors.size();
-                                mColors.push_back(RandomColor(0, 1));
+                                KdIntersectable *kdint = static_cast<KdIntersectable *>(obj);
+
+                                if (kdint->mGenericIdx == -1)
+                                {
+                                        kdint->mGenericIdx = (int)mColors.size();
+                                        mColors.push_back(RandomColor(0, 1));
+                                }
+                                color = mColors[kdint->mGenericIdx];
                         }
-                        color = mColors[kdint->mGenericIdx];
                 } 
                 else

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

@@ -39 +39 @@
 SceneGraphLeaf::~SceneGraphLeaf()
 {
-    CLEAR_CONTAINER(mGeometry);
+        if (mDeleteGeometry)
+                CLEAR_CONTAINER(mGeometry);
 }
 
@@ -278 +279 @@
 
 
-SceneGraphLeaf::SceneGraphLeaf(): mIsDynamic(false), mHasChanged(true)
+SceneGraphLeaf::SceneGraphLeaf(): 
+mIsDynamic(false), mHasChanged(true), mDeleteGeometry(true)
 {
         mTrafo = IdentityMatrix();
@@ -285 +287 @@
 
 
-SceneGraphLeaf::SceneGraphLeaf(bool isDynamic): mIsDynamic(isDynamic), mHasChanged(true)
+SceneGraphLeaf::SceneGraphLeaf(bool isDynamic): 
+mIsDynamic(isDynamic), mHasChanged(true), mDeleteGeometry(true)
 {
     mTrafo = IdentityMatrix();
@@ -327 +330 @@
 {
         // hack: should just pass a IntersectableGroup as a whole
-        // instead we duplicate the object container and create a new
-        // leaf
+        // instead we duplicate the geometry vector
         mGeometry = copy.mGeometry;
-        //for (size_t i = 0; i < copy.mGeometry->size(); ++ i)
-        //      mGeometry.push_back(copy.mGeometry[i]);
 
         mBox = copy.mBox;
@@ -339 +339 @@
         mIntersectable = new SceneGraphLeafIntersectable(this, mBox);
         mHasChanged = true;
-}
-
-}
+
+        // hack: the geometry should not be deleted here because this
+        // is just a copy
+        mDeleteGeometry = false;
+}
+
+}

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

@@ -96 +96 @@
 
         Matrix4x4 mTrafo;
+
+        bool mDeleteGeometry;
 };
 

GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor05.vcproj

@@ -157 +157 @@
                                 LinkIncremental="1"
                                 AdditionalLibraryDirectories=""$(QTDIR)\lib";..\src\GL;"..\lib05\$(ConfigurationName)";..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;"..\MultiLevelRayTracing\RTScene\$(ConfigurationName)";"..\MultiLevelRayTracing\RTWorld\$(ConfigurationName)";"QtInterface\$(ConfigurationName)";"..\..\..\..\..\..\NonGTP\Xerces\xerces-c_2_8_0\lib";"$(CG_LIB_PATH)""
-                                GenerateDebugInformation="false"
+                                GenerateDebugInformation="true"
                                 SubSystem="1"
                                 LargeAddressAware="2"