Changeset 2332 for GTP/trunk/Lib/Vis/OnlineCullingCHC

Timestamp:

04/23/07 16:19:30 (17 years ago)

Author:

mattausch

Message:

implemented part of rendering estimation of wimmer et al. for view space / object space subdivision.
warning: not working with undersampling estimation + local visibility based subdivision.

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC

Files:

• OGRE/include/OgreOctreeHierarchyInterface.h (modified) (1 diff)
• OGRE/include/OgrePlatformHierarchyInterface.h (modified) (1 diff)
• OGRE/src/OgreOctreeHierarchyInterface.cpp (modified) (2 diffs)
• OGRE/src/Plugin_VisibilitySceneManager.vcproj (modified) (2 diffs)
• ObjReader/include/ObjReader.h (modified) (1 diff)
• ObjReader/src/ObjReader.vcproj (modified) (1 diff)
• include/CoherentHierarchicalCullingManager.h (modified) (2 diffs)
• include/HierarchyInterface.h (modified) (1 diff)
• src/CoherentHierarchicalCullingManager.cpp (modified) (8 diffs)
• src/RandomUpdateCullingManager.cpp (modified) (2 diffs)

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

@@ -67 +67 @@
         float GetNodeVisibilityRatio(GtpVisibility::HierarchyNode *node) const;
 
+        GtpVisibility::HierarchyNode *GetParent(GtpVisibility::HierarchyNode *node);
+
+
 protected:
 

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

@@ -130 +130 @@
         float GetNodeVisibilityRatio(GtpVisibility::HierarchyNode *node) const { return 1.0f;}
 
+        GtpVisibility::HierarchyNode *GetParent(GtpVisibility::HierarchyNode *node) { return NULL;}
+
+
 protected:
+
         /** Renders the given geometry 
         */

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

@@ -188 +188 @@
 //-----------------------------------------------------------------------
 void OctreeHierarchyInterface::DetermineVisibilityRatio(GtpVisibility::HierarchyNode *node) const
-{               
+{       
         Octree *octant = static_cast<Octree *>(node);
 
@@ -394 +394 @@
 }
 
+//-----------------------------------------------------------------------
+GtpVisibility::HierarchyNode *OctreeHierarchyInterface::GetParent(GtpVisibility::HierarchyNode *node)
+{
+        Octree *octree = static_cast<Octree *>(node);
+
+        return octree->getParent();
+}
 
 } // namespace Ogre

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/src/Plugin_VisibilitySceneManager.vcproj

@@ -113 +113 @@
                                 AdditionalLibraryDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\bin\$(ConfigurationName)";"$(OGRE_PATH)\OgreMain\lib\$(ConfigurationName)";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\lib";"$(OGRE_PATH)\Dependencies\lib\$(ConfigurationName)";"..\..\..\Preprocessing\lib\$(ConfigurationName)";..\..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\Preprocessing\src\GL;..\..\..\..\..\..\..\NonGTP\Zlib\lib;"..\..\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\lib\$(ConfigurationName)";"..\..\..\..\..\Lib\Vis\OnlineCullingCHC\ObjReader\lib\$(ConfigurationName)""
                                 ModuleDefinitionFile="..\misc\OgreVisibilitySceneManager.def"
-                                GenerateDebugInformation="TRUE"
+                                GenerateDebugInformation="FALSE"
                                 SubSystem="2"
                                 OptimizeReferences="2"
@@ -371 +371 @@
                                 OptimizeForWindowsApplication="TRUE"
                                 AdditionalIncludeDirectories=""$(OGRE_PATH)\PlugIns\OctreeSceneManager\include";"$(OGRE_PATH)\Samples\Common\include";"$(OGRE_PATH)\Dependencies\include\CEGUI";"$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include";"$(OGRE_PATH)\OgreMain\include";"$(OGRE_PATH)\Dependencies\include";..\include;..\..\..\OnlineCullingCHC\include;..\..\..\Preprocessing\src;..\..\..\..\..\Lib\Vis\OnlineCullingCHC\IVReader\include"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;PLUGIN_KD_TERRAIN_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE;GAMETOOLS_ILLUMINATION_MODULE"
                                 StringPooling="TRUE"
                                 RuntimeLibrary="2"

GTP/trunk/Lib/Vis/OnlineCullingCHC/ObjReader/include/ObjReader.h

@@ -21 +21 @@
                                   const std::string &visibilitySolution,
                                   Ogre::SceneNode *root);
-        void dummy();
-        Ogre::Entity * dummy2(const std::string &name,
-                                GtpVisibilityPreprocessor::Intersectable *object);
+        
         Ogre::Entity *CreateEntity(const std::string &name,
                                                            GtpVisibilityPreprocessor::Intersectable *object);

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

@@ -295 +295 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Dependencies\include\CEGUI&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;&quot;$(OGRE_PATH)\Dependencies\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;..\include"
+                                AdditionalIncludeDirectories="&quot;$(OGRE_PATH)\Dependencies\include\CEGUI&quot;;&quot;$(OGRE_PATH)\Samples\Common\CEGUIRenderer\include&quot;;&quot;$(OGRE_PATH)\OgreMain\include&quot;;&quot;$(OGRE_PATH)\Dependencies\include&quot;;&quot;$(OGRE_PATH)\Samples\Common\include&quot;;..\include;..\..\..\Preprocessing\src"
                                 PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OBJREADER_EXPORTS;GTP_VISIBILITY_MODIFIED_OGRE"
                                 RuntimeLibrary="2"

GTP/trunk/Lib/Vis/OnlineCullingCHC/include/CoherentHierarchicalCullingManager.h

@@ -30 +30 @@
 
 protected:
+
         /** Decides if node is considered to be visible depeding on the 
                 assumed visibility factor.
@@ -36 +37 @@
         bool DecideVisible(HierarchyNode *node) const;
 
-
         /** Skip query for this node.
         */
         void SkipQuery(HierarchyNode *node) const;
+
+        /** If this node is still valid for traversal in this frame.
+                It is possible that the parent was tested invisible before
+                so this node can be skipped.
+        */
+        bool NodeInvalid(HierarchyNode *node) const;
 
         /** number of steps the visibility is assumed to be valid.

GTP/trunk/Lib/Vis/OnlineCullingCHC/include/HierarchyInterface.h

@@ -159 +159 @@
         std::vector<HierarchyNode *> *GetVisibleNodes();
 
-        virtual void PullUpLastVisited(GtpVisibility::HierarchyNode *node, const int frameId) const = 0;
-        virtual void DetermineVisibilityRatio(GtpVisibility::HierarchyNode *node) const = 0;
-        virtual float GetNodeVisibilityRatio(GtpVisibility::HierarchyNode *node) const = 0;
+        virtual void PullUpLastVisited(HierarchyNode *node, const int frameId) const = 0;
+        virtual void DetermineVisibilityRatio(HierarchyNode *node) const = 0;
+        virtual float GetNodeVisibilityRatio(HierarchyNode *node) const = 0;
+
+        virtual HierarchyNode *GetParent(HierarchyNode *node) = 0;
 
 protected:

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/CoherentHierarchicalCullingManager.cpp

@@ -33 +33 @@
         while (!mHierarchyInterface->GetQueue()->empty() || !queryQueue.empty())
         {
-                bool resultAvailable = false;
-
+                //////////
                 //-- only wait for result if there are no nodes to process
                 while (!queryQueue.empty() && 
-                                queryQueue.front().second->GetQueryResult(visiblePixels, 
-                                mHierarchyInterface->GetQueue()->empty()))
+                           (NodeInvalid(queryQueue.front().first) ||
+                            queryQueue.front().second->GetQueryResult(
+                                             visiblePixels, mHierarchyInterface->GetQueue()->empty())))
                 {
                         HierarchyNode *node = queryQueue.front().first;
-                        
                         queryQueue.pop();
-                        
+
+                        // parent was tested invisible => remove children from queue
+                        if (NodeInvalid(node))
+                        {
+                                //CullingLogManager::GetSingleton()->LogMessage("skipping this node");
+                                continue;
+                        }
+                        // tested visible
                         if (visiblePixels > mVisibilityThreshold)
                         {
-                                // in case geometry is in omterior node: ensure that we only traverse once
+                                // in case geometry is in interior node: ensure that we only traverse once
                                 if (!mHierarchyInterface->IsNodeVisible(node))
                                 {
@@ -58 +64 @@
                                 mHierarchyInterface->SetNodeVisible(node, false);
 
-                                ++ mNumQueryCulledNodes;
+                ++ mNumQueryCulledNodes;
                                 
                                 if (mVisualizeCulledNodes)
@@ -65 +71 @@
                                 }
                         }
+                        
+                        // update node's visited flag
+                        mHierarchyInterface->SetLastVisited(node, mHierarchyInterface->GetFrameId());   
                 }
                 
@@ -73 +82 @@
                         mHierarchyInterface->GetQueue()->pop();
                                 
+                        // parent was tested invisible => remove children from queue
+                        if (NodeInvalid(node))
+                        {
+                                //CullingLogManager::GetSingleton()->LogMessage("skipping this node");
+                                continue;
+                        }
+
                         bool intersects = false;
 
@@ -96 +112 @@
                                 
                                 // if we assume node to be visible in this frame => skip query 
-                                bool skipQuery = wasVisible && (mAssumedVisibility > 0) && 
-                                        DecideVisible(node) && mHierarchyInterface->HasGeometry(node);
+                                const bool skipQuery = wasVisible && 
+                                                           (mAssumedVisibility > 0) && 
+                                                                           DecideVisible(node) && 
+                                                                           mHierarchyInterface->HasGeometry(node);
 
                                 if (skipQuery)
@@ -113 +131 @@
                                 mHierarchyInterface->SetNodeVisible(node, wasVisible && issueQuery);
 
-                                // update node's visited flag
-                                mHierarchyInterface->SetLastVisited(node, mHierarchyInterface->GetFrameId());
-                                
                                 // skip testing previously visible nodes without geometry
                                 if (issueQuery)
@@ -124 +139 @@
                                                 IssueNodeOcclusionQuery(node, wasVisible)));
                                 }
-                                
+                                else
+                                {
+                                        // update node's visited flag
+                                        mHierarchyInterface->SetLastVisited(node, mHierarchyInterface->GetFrameId());
+                                }
+
                                 // always traverse a node if it was visible
                                 if (wasVisible)
@@ -164 +184 @@
         mHierarchyInterface->TraverseNode(node);
 }
-
+//-----------------------------------------------------------------------
+bool CoherentHierarchicalCullingManager::NodeInvalid(HierarchyNode *node) const
+{
+        // parent was tested invisible in this frame
+        HierarchyNode *parent = mHierarchyInterface->GetParent(node);
+    return 
+                parent && 
+                (mHierarchyInterface->LastVisited(node) == mHierarchyInterface->GetFrameId()) && 
+                !mHierarchyInterface->IsNodeVisible(parent);
+}
 } // namespace GtpVisibility

GTP/trunk/Lib/Vis/OnlineCullingCHC/src/RandomUpdateCullingManager.cpp

@@ -105 +105 @@
                         else
                         {
-                                // identify previously visible nodes
-                                const bool wasVisible = mHierarchyInterface->IsNodeVisible(node) && 
-                                        (mHierarchyInterface->LastVisited(node) == mHierarchyInterface->GetFrameId() - 1);
-                                
-                                // if we assume node to be visible in this frame => skip query 
-                                const bool skipQuery = wasVisible && (mAssumedVisibility > 0) && 
-                                        DecideVisible(node) && mHierarchyInterface->HasGeometry(node);
-
-                                if (skipQuery)
-                                {
-                                        SkipQuery(node);
-                                        continue;
-                                }
-                                                                
+                                
                                 if (mHierarchyInterface->IsNodeFullyVisible(node))
                                 {
@@ -162 +149 @@
                                 }
 
+                                // identify previously visible nodes
+                                const bool wasVisible = mHierarchyInterface->IsNodeVisible(node) && 
+                                        (mHierarchyInterface->LastVisited(node) == mHierarchyInterface->GetFrameId() - 1);
+                                        
+
+                                // if we assume node to be visible in this frame => skip query 
+                                const bool skipQuery = wasVisible && (mAssumedVisibility > 0) && 
+                                        DecideVisible(node) && mHierarchyInterface->HasGeometry(node);
+
+                                if (skipQuery)
+                                {
+                                        SkipQuery(node);
+                                        continue;
+                                }
+                                                        
                 // identify nodes that we cannot skip queries for
                                 // geometry not only in leaves => test for renderable geometry