Changeset 880 for GTP/trunk/Lib

Timestamp:

05/03/06 01:13:24 (19 years ago)

Author:

mattausch

Message:

added filter to online stuff (not fully working, too slow
)

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/include/OgreVisibilityOctreeSceneManager.h (modified) (1 diff)
• OnlineCullingCHC/OGRE/src/OgreOctreeHierarchyInterface.cpp (modified) (1 diff)
• OnlineCullingCHC/OGRE/src/OgreVisibilityOctreeSceneManager.cpp (modified) (9 diffs)
• Preprocessing/src/ViewCell.cpp (modified) (1 diff)
• Preprocessing/src/ViewCell.h (modified) (1 diff)
• Preprocessing/src/ViewCellsManager.cpp (modified) (2 diffs)
• Preprocessing/src/ViewCellsManager.h (modified) (2 diffs)
• Preprocessing/src/ViewCellsParser.cpp (modified) (1 diff)

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include/OgreVisibilityOctreeSceneManager.h

@@ -196 +196 @@
         GtpVisibilityPreprocessor::ViewCellsManager *mViewCellsManager;
 
-        /** Used to assign Ogre meshes to view cell entries.
-        */
+        /// Used to assign Ogre meshes to view cell entries.
         GtpVisibilityPreprocessor::ObjectContainer mObjects;
 
-        GtpVisibilityPreprocessor::ViewCell *mOldViewCell;
+        GtpVisibilityPreprocessor::ViewCell *mElementaryViewCell;
         GtpVisibilityPreprocessor::ViewCell *mCurrentViewCell;
 
-        /** If view cells are used.
-        */
+        /// If view cells are used.
         bool mUseViewCells;
+
+        /// if the view cells are filtered
+        bool mUseVisibilityFilter;
 };
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreOctreeHierarchyInterface.cpp

@@ -144 +144 @@
         {
                 mSavedNode = node;
-            //dynamic_cast<Octree *>(node)->_getCullBounds(&mBox);
+            //static_cast<Octree *>(node)->_getCullBounds(&mBox);
                 mBox = static_cast<Octree *>(node)->_getWorldAABB();
         }

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/OgreVisibilityOctreeSceneManager.cpp

@@ -45 +45 @@
 mIsHierarchicalCulling(false),
 mViewCellsLoaded(false),
+mUseViewCells(false),
+mUseVisibilityFilter(false),
 mCurrentViewCell(NULL),
-mOldViewCell(NULL),
-mUseViewCells(false)
+mElementaryViewCell(NULL)
 {
         mHierarchyInterface = new OctreeHierarchyInterface(this, mDestRenderSystem);
@@ -91 +92 @@
         OGRE_DELETE(mHierarchyInterface);
         CLEAR_CONTAINER(mObjects);
+        OGRE_DELETE(mCurrentViewCell);
 }
 //-----------------------------------------------------------------------
@@ -514 +516 @@
         if (key == "UseViewCells")
         { 
-                if (mViewCellsLoaded)
-                {
-                        mUseViewCells = *static_cast<const bool *>(val);
-                        
-                        if (mUseViewCells)
-                        {
-                                SetObjectsVisible(false);
-                                mCurrentViewCell = mOldViewCell = NULL;
-                        }
-                        else
-                        {
-                                SetObjectsVisible(true);
-                        }
-                }
-
-                return true;
-        }
+                mUseViewCells = *static_cast<const bool *>(val);
+
+                // reset view cell
+                OGRE_DELETE(mCurrentViewCell);
+                if (mUseViewCells)
+                        mCurrentViewCell =  mViewCellsManager->GenerateViewCell();
+                mElementaryViewCell = NULL;
+                // if using view cells, all objects are set to false initially
+                SetObjectsVisible(!mUseViewCells);
+                
+                return true;
+        }
+        if (key == "UseVisibilityFilter")
+        {
+                mUseVisibilityFilter = *static_cast<const bool *>(val);
+                // set null =>recomputation of the pvs
+        mElementaryViewCell = NULL;
+                return true;
+        }
+
         return VisibilityOptionsManager(mVisibilityManager, mHierarchyInterface).
                 setOption(key, val) || OctreeSceneManager::setOption(key, val);
@@ -864 +869 @@
                         // Also render any objects which have receive shadows disabled
                         OctreeSceneManager::renderObjects(pPriorityGrp->_getSolidPassesNoShadow(), true);
-                
-                        /*std::stringstream d; 
+#if 0           
+                        std::stringstream d; 
                         d << " solid size: " << (int)pPriorityGrp->_getSolidPasses().size()
                                 << " solid no shadow size: " << (int)pPriorityGrp->_getSolidPassesNoShadow().size()
                                 << "difspec size: " << (int)pPriorityGrp->_getSolidPassesDiffuseSpecular().size()
                                 << " decal size: " << (int)pPriorityGrp->_getSolidPassesDecal().size();
-                        LogManager::getSingleton().logMessage(d.str());*/
+                        LogManager::getSingleton().logMessage(d.str());
+#endif
                 }
         }
@@ -1027 +1033 @@
 void VisibilityOctreeSceneManager::applyViewCellPvs(GtpVisibilityPreprocessor::ViewCell *vc, 
                                                                                                         const bool load)
-{       GtpVisibilityPreprocessor::Debug << "here9 " << endl;
-        // NOTE: should not happen, rather apply view cell representing unbounded space then
-        if (!vc) return;
+{       // NOTE: should not happen, rather apply view cell representing unbounded space then
+        if (!vc) 
+        {       
+                // set everything visible for savety
+                SetObjectsVisible(true);
+
+                return;
+        }
 
         GtpVisibilityPreprocessor::ObjectPvsMap::const_iterator oit,
@@ -1041 +1052 @@
                 OgreMeshInstance *omi = dynamic_cast<OgreMeshInstance*>((*oit).first);
                 omi->GetMesh()->setVisible(load);
-                GtpVisibilityPreprocessor::Debug << "here45 " << omi->GetId() << endl;
+                //GtpVisibilityPreprocessor::Debug << "here45 " << omi->GetId() << endl;
         }
 }
@@ -1048 +1059 @@
 {
         // for OGRE 1.2
-#ifdef OGRE12
-        MovableObjectIterator mit = getMovableObjectIterator("Entity");
-#else
+//#ifdef OGRE12
+        //MovableObjectIterator mit = getMovableObjectIterator("Entity");
+#if 0
         EntityIterator eit = getEntityIterator();
 
@@ -1060 +1071 @@
         }
 
+#else
+        GtpVisibilityPreprocessor::ObjectContainer::iterator it, it_end = mObjects.end();
+
+        for (it = mObjects.begin(); it != it_end; ++ it)
+        {
+                OgreMeshInstance *omi = static_cast<OgreMeshInstance *>(*it);
+                Entity *ent = omi->GetMesh();
+                ent->setVisible(visible);
+        }
 #endif
 }
@@ -1089 +1109 @@
 void VisibilityOctreeSceneManager::updatePvs(Camera *cam)
 {
-        Ogre::LogManager::getSingleton().logMessage("here196");
         if (mViewCellsLoaded && mUseViewCells)
         {
-                GtpVisibilityPreprocessor::ViewCell *vc = 
-                        mViewCellsManager->GetViewCell(OgreTypeConverter::ConvertFromOgre(cam->getDerivedPosition()));
-
-                std::stringstream d; d << "pos " << cam->getDerivedPosition() << "vc: " << vc;
-                Ogre::LogManager::getSingleton().logMessage(d.str());
-
-                // view cell changed => unload old objects and load new objects
-                if (vc != mCurrentViewCell)
-                {
-                        //-- unload old pvs
-                        if (mOldViewCell)
-                        {
-                                const bool load = false;
-
-                                applyViewCellPvs(mOldViewCell, load);
-                                Ogre::LogManager::getSingleton().logMessage("here16");
-                        }
-
-                        mOldViewCell = mCurrentViewCell;
-
-                        //-- load new pvs
-                        mCurrentViewCell = vc;
-                        const bool load = true;
-
-                        applyViewCellPvs(mCurrentViewCell, load);
-                        Ogre::LogManager::getSingleton().logMessage("here106");
-                }
+                const GtpVisibilityPreprocessor::Vector3 viewPoint = 
+                        OgreTypeConverter::ConvertFromOgre(cam->getDerivedPosition());
+
+                GtpVisibilityPreprocessor::ViewCell *newElementary = 
+                        mViewCellsManager->GetViewCell(viewPoint);
+
+                // elementary view cell did not change => apply same pvs
+                if (mElementaryViewCell == newElementary)
+                        return;
+
+                mElementaryViewCell = newElementary;
+
+                //-- unload old pvs
+                applyViewCellPvs(mCurrentViewCell, false);
+
+
+                //-- the new view cell
+                
+                GtpVisibilityPreprocessor::ViewCell *viewCell;
+
+                
+                if (mUseVisibilityFilter)
+                {
+                        //-- compute new filtered cell
+                        GtpVisibilityPreprocessor::PrVs prvs;
+                        mViewCellsManager->GetPrVS(viewPoint, prvs);
+                        viewCell = prvs.mViewCell;
+                }
+                else
+                {
+                        viewCell = newElementary;
+                }
+                        
+                //-- load new pvs
+                applyViewCellPvs(viewCell, true);
+
+                // store pvs
+                mCurrentViewCell->SetPvs(viewCell->GetPvs());
+
+                // delete merge tree of filtered view cell
+                if (mUseVisibilityFilter)
+                        mViewCellsManager->DeleteLocalMergeTree(viewCell);
         }
 }

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

@@ -174 +174 @@
 {
         return mPvs;
+}
+
+
+void ViewCell::SetPvs(const ObjectPvs &pvs)
+{
+        mPvs = pvs;
 }
 

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

@@ -117 +117 @@
 
         ObjectPvs &GetPvs();
+
+        void SetPvs(const ObjectPvs &pvs);
 
         /** Type of view cells.

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

@@ -4959 +4959 @@
         Vector3 bsize = mViewSpaceBox.Size();
         const Vector3 viewPoint(mViewSpaceBox.Center());
-        float w = Magnitude(mViewSpaceBox.Size())*mFilterWidth;
+        float w = Magnitude(mViewSpaceBox.Size()) * mFilterWidth;
         const Vector3 width = Vector3(w);
         
@@ -4980 +4980 @@
 
                 exporter->SetForcedMaterial(RgbColor(0,1,0));
-                ExportViewCellGeometry(exporter,  GetViewCell(viewPoint));
+                ExportViewCellGeometry(exporter, GetViewCell(viewPoint));
 
                 //exporter->ResetForcedMaterial();

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

@@ -43 +43 @@
   ViewCell *mViewCell;
 
-  // input parameter is the render budget for the PrVS
+  // input parameter is the render budget for the PrVs
   float mRenderBudget;
 
@@ -467 +467 @@
                                                                                 ViewCellContainer &viewCells) const;
 
+        /** Tests the visibility filter functionality.
+        */
         virtual void TestFilter(const ObjectContainer &objects) {};
 

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

@@ -300 +300 @@
                                   lower_bound(mObjects->begin(), mObjects->end(), (Intersectable *)&dummyInst, ilt);
                                 
-                                Intersectable *obj = *oit;
-                                
-                                if (obj->GetId() == objId)
+                                                        
+                                if ((oit != mObjects->end()) && ((*oit)->GetId() == objId))
                                 {
-                                  // $$JB we should store a float a per object which corresponds
-                                  // to sumof pdfs, i.e. its relative visibility
-                                  // temporarily set to 1.0f
-                                        viewCell->GetPvs().AddSample(obj, 1.0f);                                
+                                        // $$JB we should store a float a per object which corresponds
+                                        // to sumof pdfs, i.e. its relative visibility
+                                        // temporarily set to 1.0f
+                                        viewCell->GetPvs().AddSample(*oit, 1.0f);                               
                                 }
                                 else
                                 {
-                                        Debug << "error: object does not exist" << endl;
+                                        Debug << "error: object with id " << objId << " does not exist" << endl;
                                 }
                         }