Changeset 2636

Timestamp:

01/23/08 06:32:46 (17 years ago)

Author:

bittner

Message:

moving objects partially functional

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• KdTree.cpp (modified) (1 diff)
• Preprocessor.cpp (modified) (4 diffs)
• Preprocessor.h (modified) (3 diffs)
• Pvs.h (modified) (2 diffs)
• QtInterface/QtGlRenderer.cpp (modified) (8 diffs)
• QtInterface/QtGlRenderer.h (modified) (2 diffs)
• SceneGraph.h (modified) (1 diff)
• run_test2 (modified) (1 diff)

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

@@ -152 +152 @@
   tStack.push(tdata);
   AxisAlignedBox3 backBox, frontBox;
-
+  
   while (!tStack.empty()) {
         //      cout<<mStat.Nodes()<<" "<<mTermMaxNodes<<endl;

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

@@ -1235 +1235 @@
                         pruneInvalidRays);
 
-#if DYNAMIC_OBJECTS_HACK
+                //#if DYNAMIC_OBJECTS_HACK
+                // disabled not neccessary
+                UpdateDynamicObjects();
+#if 0
                 static Ray hRay;
                 VssRayContainer::iterator vit, vit_end = vssRays.end();
@@ -1722 +1725 @@
 
                 mDynamicObjects.push_back(tmi);
+                
                 return true;
         }
@@ -1733 +1737 @@
                 leaf->RebuildKtbTree();
                 mSceneGraph->GetRoot()->mChildren.push_back(leaf);
+
+                if (mRayCaster)
+                  mRayCaster->AddDynamicObjecs(leaf->mGeometry, leaf->GetTransformation());
+
+
                 return true;
         }
@@ -1741 +1750 @@
 }
 
-}
+
+void
+Preprocessor::ObjectMoved(SceneGraphLeaf *object)
+{
+  // first invalidate all PVS from which this object is visible
+  ViewCellContainer::const_iterator vit, vit_end = mViewCellsManager->GetViewCells().end();
+  
+  AxisAlignedBox3 box = object->GetBox();
+
+  KdNode::NewMail();
+
+  ObjectContainer objects;
+  // first mail all kDObjects which are intersected by the object
+  preprocessor->mKdTree->CollectKdObjects(box,
+                                                                                  objects);
+  
+  // now search for pvss which contained any mailed node
+  for (vit = mViewCellsManager->GetViewCells().begin(); vit != vit_end; ++ vit) {
+        ObjectPvs &pvs = (*vit)->GetPvs();
+        for (int i=0; i < objects.size(); i++) {
+          vector<PvsEntry<Intersectable *,PvsData> >::iterator v;
+          //      ObjectPvsIterator it;
+          if (pvs.Find(objects[i], v)) {
+                // clear the pvs
+                pvs.Clear();
+                break;
+          }
+        }
+  }
+  
+}
+
+void
+Preprocessor::UpdateDynamicObjects()
+{
+  if (mUpdateDynamicObjects) {
+        preprocessor->mRayCaster->DeleteDynamicObjects();
+        
+        for (int i=0; i < mDynamicObjects.size(); i++) {
+          SceneGraphLeaf *l = mDynamicObjects[i];
+          mRayCaster->AddDynamicObjecs(l->mGeometry, l->GetTransformation());
+          preprocessor->ObjectMoved(l);
+        }
+        mUpdateDynamicObjects = false;
+  }
+}
+
+}

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

@@ -273 +273 @@
 
 
-        int mGenericStats;
+  int mGenericStats;
+
+  void ScheduleUpdateDynamicObjects() {
+        mUpdateDynamicObjects = true;
+  }
+
+  void UpdateDynamicObjects();
 
 protected:
@@ -291 +297 @@
         virtual void EvalViewCellHistogram();
 
-
+  virtual void ObjectMoved(SceneGraphLeaf *object);
         /////////////////////////
 
@@ -309 +315 @@
 
         PreprocessorThread *mThread;
+
+  bool mUpdateDynamicObjects;
 };
 

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

@@ -446 +446 @@
 bool VerbosePvs<T, S>::RemoveSample(T sample, const float pdf)
 {
-        -- mSamples;
         
         typename vector<PvsEntry<T, S> >::iterator it;
@@ -453 +452 @@
         if (!entryFound)
                 return false;
+
+        // $$JB decrement only if the sample found
+        -- mSamples;
 
         S &data = (*it).mData;

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

@@ -17 +17 @@
 #include "IntersectableWrapper.h"
 #include "LogWriter.h"
-
+#include "RayCaster.h"
 
 
@@ -664 +664 @@
 }
 
+void QtGlRendererWidget::mouseReleaseEvent(QMouseEvent *e)
+{
+
+  if (e->modifiers() & Qt::AltModifier) 
+        if (mCurrentDynamicObjectIdx >= 0) {
+          //      preprocessor->ScheduleUpdateDynamicObjects();
+        }
+}
+
 void
 QtGlRendererWidget::mouseMoveEvent(QMouseEvent *e)
@@ -722 +731 @@
                         tmi->ApplyWorldTransform(tm);
 #else
-                        SceneGraphLeaf *l = mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
+                        SceneGraphLeaf *l =
+                          mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
                         l->ApplyTransform(tm);
+                        
 #endif
                         updateGL();
@@ -744 +755 @@
 }
 
-void
-QtGlRendererWidget::mouseReleaseEvent(QMouseEvent *)
-{
-}
 
 void
@@ -1021 +1028 @@
         connect(mControlWidget, SIGNAL(SetRotation(bool)), this, SLOT(SetRotation(bool)));
         connect(mControlWidget, SIGNAL(SetScale(bool)), this, SLOT(SetScale(bool)));
-        
+
+        connect(mControlWidget, SIGNAL(UpdateDynamicObjects()), this, SLOT(UpdateDynamicObjects()));
+
         setWindowTitle("PVS Visualization");
 
@@ -1091 +1100 @@
         ++ mCurrentDynamicObjectIdx;
 
-        if (mViewCellsManager->GetPreprocessor()->LoadDynamicGeometry(filename))
-                cout << "Loading finished" << endl;
-        else
-                cerr << "Loading failed" << endl;
-
+        if (mViewCellsManager->GetPreprocessor()->LoadDynamicGeometry(filename)) {
+          
+          cout << "Loading finished" << endl;
+        } else
+          cerr << "Loading failed" << endl;
+        
     updateGL();
 }
@@ -1742 +1752 @@
 
         vbox2->addStretch(1);
+
+
+        QPushButton *button = new QPushButton("Update", groupBox);
+        vbox2->addWidget(button);
+        connect(button, SIGNAL(clicked()), SIGNAL(UpdateDynamicObjects()));
+        
+        
         groupBox->setLayout(vbox2);
-
+        
         return groupBox;
 }
-
 
 
@@ -2373 +2389 @@
 }
 
-}
+void
+QtGlRendererWidget::UpdateDynamicObjects()
+{
+  preprocessor->ScheduleUpdateDynamicObjects();
+  
+}
+
+}

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

@@ -108 +108 @@
 
   signals:
-
+  void UpdateDynamicObjects();
   void ComputeVisibility();
   void StopComputation();
@@ -310 +310 @@
 
 public slots:
-
+void UpdateDynamicObjects();
         void UpdateAllPvs();
         void ComputeVisibility();

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

@@ -78 +78 @@
         /// used as actual pvs entry
         ObjectContainer mGeometry;
-
+  const Matrix4x4 &GetTransformation() const { return mTrafo; }
 protected:
 

GTP/trunk/Lib/Vis/Preprocessing/src/run_test2

@@ -4 +4 @@
 
 #COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+"
-COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish- -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=5000000 -samples_per_pass=1000000 -total_samples=20000000 -mutation_use_pass_importance- -mutation_silhouette_search_steps=3 -preprocessor_ray_cast_method=1 -preprocessor_detect_empty_viewspace+"
+COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish- -preprocessor_use_gl_renderer+ -preprocessor_evaluate_filter- -samples_per_evaluation=5000000 -samples_per_pass=500000 -total_samples=20000000 -mutation_use_pass_importance- -mutation_silhouette_search_steps=3 -preprocessor_ray_cast_method=3 -preprocessor_detect_empty_viewspace+"
 
 #SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d"