Changeset 2710 for GTP/trunk

Timestamp:

05/26/08 04:01:24 (17 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• scripts/run_demo_vienna (modified) (2 diffs)
• src/HavranDynRayCaster.cpp (modified) (1 diff)
• src/IntelRayCaster.cpp (modified) (1 diff)
• src/Preprocessor.cpp (modified) (5 diffs)
• src/QtInterface/ObjectPlacer.cpp (modified) (1 diff)
• src/QtInterface/ObjectPlacer.h (modified) (1 diff)
• src/QtInterface/QtGlRenderer.cpp (modified) (4 diffs)
• src/SceneGraph.cpp (modified) (3 diffs)
• src/ViewCellsManager.cpp (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
@@ -52 +52 @@
 -preprocessor_detect_empty_viewspace+ \
 -preprocessor_use_vbos- \
--preprocessor_ray_cast_method=1 \
+-preprocessor_ray_cast_method=3 \
 -view_cells_random_viewpoint_list=$VIEWPOINTS \
 demo1.env

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

@@ -348 +348 @@
         objI[i] = 0;
     }
-    
     // Here we shoot first backward rays and forward ones
     SimpleRayContainer::iterator sit = rays.begin() + offset; 

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

@@ -340 +340 @@
     {
       Intersectable *intersect =
-        mPreprocessor.GetParentObject(backward_hit_triangles[i]);
+                  mPreprocessor.GetParentObject(backward_hit_triangles[i]);
       
       if (intersect)
       { 
-        hitB.mObject = intersect;
-        hitB.mNormal = mPreprocessor.GetParentNormal(backward_hit_triangles[i]);
-        
-        // normalB = rays[i].mDirection; // $$ temporary
-        hitB.mPoint = rays[k].Extrap(-backward_dist[i]);
+                  hitB.mObject = intersect;
+                  hitB.mNormal = mPreprocessor.GetParentNormal(backward_hit_triangles[i]);
+                  
+                  // normalB = rays[i].mDirection; // $$ temporary
+                  hitB.mPoint = rays[k].Extrap(-backward_dist[i]);
       }
     }

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

@@ -36 +36 @@
 
 
+static int sCurrentDynamicId = 0;
+
+
 inline static bool ilt(Intersectable *obj1, Intersectable *obj2)
 {
@@ -329 +332 @@
 
 
-Intersectable *Preprocessor::GetParentObject(const int index) const
+Intersectable *Preprocessor::GetParentObject(int index) const
 {
         if (index < 0)
@@ -351 +354 @@
         else
         {
-                  if (index >= (int)mObjects.size()) 
-                  {
-                          cerr<<"Warning: triangle index out of range! " << index << " of " << (int)mObjects.size() << endl;
-                          return NULL;
-                  }
-                  else
-                  {
-                          return mObjects[index];
-                  }
+                return mObjects[index];
         }
 }
@@ -733 +728 @@
                 }
         }
+
 
         ////////
@@ -1594 +1590 @@
         mDynamicObjects.push_back(leaf);
 
+        const int currentId = (int)mObjects.size() + sCurrentDynamicId;
+
+        leaf->GetIntersectable()->SetId(currentId);
+
+        for (size_t i = 0; i < leaf->mGeometry.size(); ++ i)
+        {
+                leaf->mGeometry[i]->SetId(currentId);
+        }
+
+        cout << "\**************\n******* new object has id " << currentId << endl;
+
+        ++ sCurrentDynamicId;
+
         // tell ray caster to update
         ScheduleUpdateDynamicObjects();

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

@@ -58 +58 @@
 }
 
+
+void ObjectPlacer::PlaceObject(SceneGraphLeaf *leaf, const Vector3 &pt)
+{
+        AxisAlignedBox3 box = leaf->GetBox();
+
+        Vector3 p = box.Center() - pt;;
+
+        // set pivot to ground of object
+        //p.y -= obj->GetOriginalBox().Min().y;
+        Matrix4x4 trafo = TranslationMatrix(p);
+
+        leaf->ApplyTransform(trafo);
 }
+
+}

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

@@ -33 +33 @@
         */
         void PlaceObject(const Vector3 &p);
+        /** Adds an object at the indicated position.
+        */
+        void PlaceObject(SceneGraphLeaf *l, const Vector3 &p);
         /** Returns the currently active object.
         */

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

@@ -143 +143 @@
     glLoadIdentity();
     glOrtho(-1, 1, -1, 1, -99, 99);
-    //glTranslatef(-0.5f, -0.5f, 0.0f);
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
@@ -916 +915 @@
                 {
                         Matrix4x4 tm;
+
+                        SceneGraphLeaf *l =
+                          mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
 
                         switch (mTrafoType)
@@ -948 +950 @@
                                 cerr << "not implemented" << endl;
                         }
-
-                        SceneGraphLeaf *l =
-                          mViewCellsManager->GetPreprocessor()->mDynamicObjects[mCurrentDynamicObjectIdx];
+                        
                         l->ApplyTransform(tm);
-                        
+
                         updateGL();
                 }
@@ -1184 +1184 @@
         mCurrentDynamicObjectIdx = -1;
 
+        // export frame buffer during walkthrough
         //mExportFrameBuffer = true;
         mExportFrameBuffer = false;

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

@@ -281 +281 @@
 {
         mTrafo = IdentityMatrix();
-
         mIntersectable = new SceneGraphLeafIntersectable(this, mBox);
 }
@@ -289 +288 @@
 {
     mTrafo = IdentityMatrix();
+        mIntersectable = new SceneGraphLeafIntersectable(this, mBox);
 }
 
@@ -336 +336 @@
         mTrafo = copy.mTrafo;
         mIsDynamic = copy.mIsDynamic;
+
+        mIntersectable = new SceneGraphLeafIntersectable(this, mBox);
         mHasChanged = true;
 }

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

@@ -369 +369 @@
 {
         // dynamic objects are scene graph leaves
-        if (ray.mTerminationObject->Type() == Intersectable::SCENEGRAPHLEAF_INTERSECTABLE)
+        const int index = ray.mTerminationObject->GetId();
+        if (index >= mPreprocessor->mObjects.size())
+        {
+                for (size_t i = 0; i < mPreprocessor->mDynamicObjects.size(); ++ i)
+                {
+                        Intersectable *obj = mPreprocessor->mDynamicObjects[i]->GetIntersectable();
+                        if (obj->GetId() == index)
+                                return obj;
+                }
+                        
                 return ray.mTerminationObject;
+        }
 
         if (mUseKdPvs)