Changeset 2360 for GTP/trunk/Lib

Timestamp:

05/09/07 10:24:25 (18 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis

Files:

• OnlineCullingCHC/OGRE/include/OgreOcclusionCullingSceneManager.h (modified) (1 diff)
• OnlineCullingCHC/OGRE/src/OgreOcclusionCullingSceneManager.cpp (modified) (6 diffs)
• OnlineCullingCHC/OGRE/src/OgreOctreeHierarchyInterface.cpp (modified) (3 diffs)
• OnlineCullingCHC/include/CoherentHierarchicalCullingManager2.h (added)
• OnlineCullingCHC/scripts/terrainCulling.cfg (modified) (1 diff)
• OnlineCullingCHC/src/CoherentHierarchicalCullingManager2.cpp (added)
• OnlineCullingCHC/src/FlexibleHeap.h (added)
• OnlineCullingCHC/src/GtpVisibility.vcproj (modified) (3 diffs)
• Preprocessing/src/Environment.cpp (modified) (1 diff)
• Preprocessing/src/FlexibleHeap.h (modified) (2 diffs)

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

@@ -220 +220 @@
         /// if content of the nodes is shown in the visualization
         bool mRenderNodesContentForViz;
+
+        bool mRenderPvsForViz;
 
         /// render transparents after the hierarchical traversal

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

@@ -67 +67 @@
 mUseFromPointQueries(false),
 mQueryMode(NODE_QUERIES),
-mResetMaterialForQueries(false)
+mResetMaterialForQueries(false),
+mRenderPvsForViz(false)
 {
         Ogre::LogManager::getSingleton().
@@ -180 +181 @@
                 float max_z = mOptions.scale.z * mOptions.pageSize;
 
-                float maxAxis = std::max(max_x, max_y);
-                maxAxis = std::max(maxAxis, max_z);
-                resize(AxisAlignedBox( 0, 0, 0, maxAxis, maxAxis, maxAxis));
-                //resize(AxisAlignedBox( 0, 0, 0, max_x, max_y, max_z ));
+        if (1)
+                {
+                        // keep octree equal at all sides so nodes adapt better to small objects
+                        float maxAxis = std::max(max_x, max_y);
+                        maxAxis = std::max(maxAxis, max_z);
+                        resize(AxisAlignedBox( 0, 0, 0, maxAxis, maxAxis, maxAxis));
+                }
+                else
+                {
+                        resize(AxisAlignedBox( 0, 0, 0, max_x, max_y, max_z));
+                }
 
                 setupTerrainMaterial();
@@ -631 +639 @@
     }
 
-        // add bounding boxes of rendered objects
-        if (0)
-        for (BoxList::iterator it = mBoxes.begin(); it != mBoxes.end(); ++it)
-        {
-                getRenderQueue()->addRenderable(*it);
-        }
-
-        // show current view cell geometry
-    if (mCurrentViewCell)// && mCurrentViewCell->GetMesh())
-        {
-                //const bool showSingleViewCell = true;
-                if (mViewCellsGeometryLoaded)
-                {
-                        ShowViewCellsGeometry();
-                }
-                
-                //////////
-                //-- set PVS of view cell visible
-
-                GtpVisibilityPreprocessor::ObjectPvsIterator pit = 
-                        mCurrentViewCell->GetPvs().GetIterator();
-
-                MailPvsObjects();
-
-                while (pit.HasMoreEntries())
-                {
-                        RenderPvsEntry(pit.Next());
-                }       
-        }
-#if 0
-   if (mRenderNodesForViz || mRenderNodesContentForViz)
-        {
-                // HACK: change node material so it is better suited for visualization
-                MaterialPtr nodeMat = MaterialManager::getSingleton().getByName("Core/NodeMaterial");
-                nodeMat->setAmbient(1, 1, 0);
-                nodeMat->setLightingEnabled(true);
-                nodeMat->getTechnique(0)->getPass(0)->removeAllTextureUnitStates();
-
-                for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++it)
-                {
-                        if (mRenderNodesForViz)
+        if (mRenderPvsForViz)
+        {
+                // show current view cell geometry
+                if (mCurrentViewCell)// && mCurrentViewCell->GetMesh())
+                {
+                        //const bool showSingleViewCell = true;
+                        if (mViewCellsGeometryLoaded)
                         {
-                                // render the visible leaf nodes
-                                if ((*it)->numAttachedObjects() && 
-                                        !(*it)->numChildren() && 
-                                        ((*it)->getAttachedObject(0)->getMovableType() == "Entity") &&
-                                        (*it)->getAttachedObject(0)->isVisible())
+                                ShowViewCellsGeometry();
+                        }
+
+                        //////////
+                        //-- set PVS of view cell visible
+
+                        GtpVisibilityPreprocessor::ObjectPvsIterator pit = 
+                                mCurrentViewCell->GetPvs().GetIterator();
+
+                        MailPvsObjects();
+
+                        while (pit.HasMoreEntries())
+                        {
+                                RenderPvsEntry(pit.Next());
+                        }       
+                }
+        }
+        else
+        {
+                // add bounding boxes of rendered objects
+                if (1)
+                {
+                        for (BoxList::iterator it = mBoxes.begin(); it != mBoxes.end(); ++it)
+                        {
+                                getRenderQueue()->addRenderable(*it);
+                        }
+                }
+                if (mRenderNodesForViz || mRenderNodesContentForViz)
+                {
+                        // HACK: change node material so it is better suited for visualization
+                        MaterialPtr nodeMat = MaterialManager::getSingleton().getByName("Core/NodeMaterial");
+                        nodeMat->setAmbient(1, 1, 0);
+                        nodeMat->setLightingEnabled(true);
+                        nodeMat->getTechnique(0)->getPass(0)->removeAllTextureUnitStates();
+
+                        for (NodeList::iterator it = mVisible.begin(); it != mVisible.end(); ++it)
+                        {
+                                if (mRenderNodesForViz)
                                 {
-                                        //getRenderQueue()->addRenderable((*it));
+                                        // render the visible leaf nodes
+                                        if ((*it)->numAttachedObjects() && 
+                                                !(*it)->numChildren() && 
+                                                ((*it)->getAttachedObject(0)->getMovableType() == "Entity") &&
+                                                (*it)->getAttachedObject(0)->isVisible())
+                                        {
+                                                getRenderQueue()->addRenderable((*it));
+                                                //(*it)->_addToRenderQueue(cam, getRenderQueue(), false);
+                                        }
+
+                                        // render bounding boxes of nodes
+                                        if (0) (*it)->_addBoundingBoxToQueue(getRenderQueue());
+                                }
+
+                                // add renderables itself
+                                if (mRenderNodesContentForViz) 
+                                {
                                         (*it)->_addToRenderQueue(cam, getRenderQueue(), false);
                                 }
-
-                                // add bounding boxes instead of node itself
-                                if (0) (*it)->_addBoundingBoxToQueue(getRenderQueue());
                         }
-
-                        // add renderables itself
-                        if (mRenderNodesContentForViz) 
-                        {
-                                (*it)->_addToRenderQueue(cam, getRenderQueue(), false);
-                        }
-                }
-        }
-#endif
+                }
+        }
 }
 //-----------------------------------------------------------------------
@@ -994 +1007 @@
                 return true;
         }
+        if (key == "RenderPvsForViz")
+        {
+                mRenderPvsForViz = (*static_cast<const bool *>(val));
+                return true;
+        }
         if (key == "SkyBoxEnabled")
         {
@@ -1016 +1034 @@
         if (key == "DelayRenderTransparents")
         {
-                //LoadScene(mFilename, mViewCellsFilename);
                 mDelayRenderTransparents = (*static_cast<const bool *>(val));
                 return true;
@@ -1925 +1942 @@
                 ivReader.setLog(log);
         }
-        
-        //viennaNode->translate(Vector3(-300, -300, 0));
 
         if (ivReader.loadFile(filename.c_str()))

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

@@ -189 +189 @@
 void OctreeHierarchyInterface::DetermineVisibilityRatio(GtpVisibility::HierarchyNode *node) const
 {       
+#if 0   
         Octree *octant = static_cast<Octree *>(node);
 
@@ -229 +230 @@
         octant->setNumLeaves(numLeaves);
         octant->setNumVisibleLeaves(numVisibleLeaves);
+#endif
 }
 //-----------------------------------------------------------------------
@@ -285 +287 @@
 bool OctreeHierarchyInterface::IsNodeFullyVisible(GtpVisibility::HierarchyNode *node) const
 {
-#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        //return static_cast<Octree *>(node)->getVisibilityRatio() > 0.9f;
         return static_cast<Octree *>(node)->isOctreeFullyVisible();
+}
+//-----------------------------------------------------------------------
+float OctreeHierarchyInterface::GetNodeVisibilityRatio(GtpVisibility::HierarchyNode *node) const
+{
+#if 0
+        return static_cast<Octree *>(node)->getVisibilityRatio();
 #else
-        return true;
-#endif
-}
-//-----------------------------------------------------------------------
-float OctreeHierarchyInterface::GetNodeVisibilityRatio(GtpVisibility::HierarchyNode *node) const
-{
-#ifdef GTP_VISIBILITY_MODIFIED_OGRE
-        return static_cast<Octree *>(node)->getVisibilityRatio();
-        //return static_cast<Octree *>(node)->isOctreeFullyVisible();
-#else
-        return true;
+        return 1.0f;
 #endif
 }

GTP/trunk/Lib/Vis/OnlineCullingCHC/scripts/terrainCulling.cfg

@@ -84 +84 @@
 #
 
-#ViewCells=../../../../../../../GTP/trunk/Lib/Vis/Preprocessing/scripts/vienna-visibility.xml.gz
+ViewCells=../../../../../resources/media/vienna-visibility.xml.gz
 
 

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/GtpVisibility.vcproj

@@ -259 +259 @@
                         </File>
                         <File
+                                RelativePath=".\CoherentHierarchicalCullingManager2.cpp">
+                        </File>
+                        <File
                                 RelativePath=".\CullingLogManager.cpp">
                         </File>
@@ -266 +269 @@
                         <File
                                 RelativePath="..\src\DummyPreprocessingManager.cpp">
+                        </File>
+                        <File
+                                RelativePath=".\FlexibleHeap.h">
                         </File>
                         <File
@@ -301 +307 @@
                         <File
                                 RelativePath="..\include\CoherentHierarchicalCullingManager.h">
+                        </File>
+                        <File
+                                RelativePath="..\include\CoherentHierarchicalCullingManager2.h">
                         </File>
                         <File

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

@@ -1354 +1354 @@
                 optBool,
                 "gvs_per_viewcell=",
-                "false");
+                "true");
 
         RegisterOption("GvsPreprocessor.stats",

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

@@ -15 +15 @@
 {
 public:
+        
         Heapable(): mPriority(0) { NotInHeap(); SetPriority(0.0f); }
 
@@ -25 +26 @@
         //inline float GetPriority() const  { return mPriority; }
         virtual float GetPriority() const = 0;
+
 protected: