Changeset 2709 for GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

Timestamp:

05/26/08 01:05:56 (16 years ago)

Author:

mattausch

Message:

sheduling dynamic object only when necessary

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp (modified) (10 diffs)

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

@@ -58 +58 @@
 mGlobalLinesRenderer(NULL),
 mUseHwGlobalLines(false),
-mTotalRaysCast(0)
+mTotalRaysCast(0),
+mSynchronize(false)
 {
         Environment::GetSingleton()->GetBoolValue("Preprocessor.useGlRenderer", mUseGlRenderer);
@@ -665 +666 @@
                 // load scene objects which are the entities used as pvs entries
                 ObjectContainer pvsObjects;
-                if (0) LoadObjects(buf, pvsObjects, mObjects);
+                if (1) LoadObjects(buf, pvsObjects, mObjects);
 
                 const bool finalizeViewCells = true;
@@ -746 +747 @@
 
         mViewCellsManager->SetRenderer(mRenderSimulator);
-        
         mViewCellsManager->SetPreprocessor(this);
 
@@ -838 +838 @@
         
     Vector3 origin, termination;
-        // HACK: needed only for lower_bound algorithm to find the 
-        // intersected objects
+        // HACK: needed only for lower_bound algorithm to find the intersected objects
         MeshInstance sObj(NULL);
         MeshInstance tObj(NULL);
@@ -1452 +1451 @@
 Preprocessor::ComputeRenderError()
 {
-  // compute rendering error
-        
+  // compute rendering error    
   if (renderer && renderer->mPvsStatFrames) {
         
@@ -1596 +1594 @@
         mDynamicObjects.push_back(leaf);
 
-        // add to scene graph
-        mSceneGraph->GetRoot()->mChildren.push_back(leaf);
-
-        if (mRayCaster)
-                mRayCaster->AddDynamicObjecs(leaf->mGeometry, leaf->GetTransformation());
+        // 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;
@@ -1646 +1650 @@
 
                 leaf->UpdateBox();
+
+                float offs = -leaf->GetOriginalBox().Min().y;
+
+                // scale so pivot is always on bottom
+                for (it = leaf->mGeometry.begin(); it != it_end; ++ it)
+                {
+                        TriangleIntersectable *tri = static_cast<TriangleIntersectable *>(*it);
+
+                        Triangle3 t = tri->GetItem();
+
+                        // hack: scale object appropriately
+                        t.mVertices[0].y += offs;
+                        t.mVertices[1].y += offs;
+                        t.mVertices[2].y += offs;
+
+                        tri->SetItem(t);
+                }
+
+                leaf->UpdateBox();
+
+
                 cout<<"Dynamic object loaded successfully: " << leaf->GetBox() << endl;
 
@@ -1709 +1734 @@
 
 
+void Preprocessor::ObjectRemoved(SceneGraphLeaf *leaf)
+{
+        ObjectMoved(leaf);
+}
+
+
 void Preprocessor::UpdateDynamicObjects()
 {
@@ -1716 +1747 @@
                 preprocessor->mRayCaster->DeleteDynamicObjects();
         
-                for (size_t i=0; i < mDynamicObjects.size(); ++ i) 
+                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;
-                        
-                        cerr<<"Updating affected PVSs..."<<endl;
-                        preprocessor->ObjectMoved(l);
-                        cerr<<"done."<<endl;      
+
+                        UpdateObjectInRayCaster(l);
+
+                        if (l->HasChanged())
+                        {
+                                cout<<"Updating affected PVSs..."<<endl;
+                                preprocessor->ObjectMoved(l);
+                                cout<<"done."<<endl;    
+                                l->SetHasChanged(false);
+                        }
                 }
         
                 mUpdateDynamicObjects = false;
-        
         }
 }
@@ -1739 +1769 @@
 void Preprocessor::ScheduleUpdateDynamicObjects()
 {
-                mUpdateDynamicObjects = true;
-}
-
-
-}
+        mUpdateDynamicObjects = true;
+}
+
+
+void Preprocessor::UpdateObjectInRayCaster(SceneGraphLeaf *l)
+{
+        cout<<"Updating dynamic objects in ray caster..."<<endl;
+
+        mRayCaster->AddDynamicObjecs(l->mGeometry, l->GetTransformation());
+        cout<<"done."<<endl;
+}
+
+}