Changeset 112 for trunk/VUT/GtpVisibility

Timestamp:

05/25/05 18:28:46 (20 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/GtpVisibility

Files:

• include/CullingManager.h (modified) (2 diffs)
• include/HierarchyInterface.h (modified) (2 diffs)
• src/CoherentHierarchicalCullingManager.cpp (modified) (3 diffs)
• src/CullingManager.cpp (modified) (2 diffs)
• src/FrustumCullingManager.cpp (modified) (2 diffs)
• src/HierarchyInterface.cpp (modified) (1 diff)
• src/StopAndWaitCullingManager.cpp (modified) (2 diffs)

trunk/VUT/GtpVisibility/include/CullingManager.h

@@ -43 +43 @@
         /** basic initializations on beginning of each frame, e.g., 
                 resets statistics.
+                @param visualizeCulledNodes 
         */
-        void InitFrame();
+        void InitFrame(bool visualizeCulledNodes);
+
+        /** Some visualization of culled nodes are shown, depending 
+        on the type of hierarchy.
+        @param showVisualization if true, culled nodes are visualized
+        */
+        void SetVisualizeCulledNodes(bool visualizeCulledNodes);
 
 protected:
@@ -54 +61 @@
 
         HierarchyInterface *mHierarchyInterface;
+        bool mVisualizeCulledNodes;
 };
 } // namespace GtpVisibility

trunk/VUT/GtpVisibility/include/HierarchyInterface.h

@@ -5 +5 @@
 
 namespace GtpVisibility {
+
+enum  CullingType {QUERY_CULLED, FRUSTUM_CULLED};
 
 /**     Class which implements a hierarchy interface for a scene hierarchy.
@@ -109 +111 @@
         */
         void SetUseOptimization(bool useOptimization);
+        //bool mIsShadowPass;
 
-        bool mDummy;
+        /** Visualization of a culled node, dependent on the culling type. 
+                @param type can be one of FRUSTUM_CULLED, QUERY_CULLED
+        */
+        virtual void VisualizeCulledNode(HierarchyNode *node, 
+                CullingType type) = NULL;
 
 protected:

trunk/VUT/GtpVisibility/src/CoherentHierarchicalCullingManager.cpp

@@ -8 +8 @@
 {
         //InitFrame();
-        
         QueryQueue queryQueue;
         unsigned int visiblePixels = 0;
@@ -30 +29 @@
                         }
                         else
-                        {
-                                if (mHierarchyInterface->mDummy)
+                        {       //if (mHierarchyInterface->mIsShadowPass)
                                 mNumQueryCulledNodes ++;
+                                
+                                if(mVisualizeCulledNodes)
+                                {
+                                        mHierarchyInterface->VisualizeCulledNode(node, QUERY_CULLED);
+                                }
                         }
                 }
@@ -45 +48 @@
 
                         if (!mHierarchyInterface->CheckFrustumVisible(node, intersects))
-                        {       if (mHierarchyInterface->mDummy)
+                        {//if (mHierarchyInterface->mIsShadowPass)
                                 mNumFrustumCulledNodes ++;
+                                
+                                if(mVisualizeCulledNodes)
+                                {
+                                        mHierarchyInterface->VisualizeCulledNode(node, QUERY_CULLED);
+                                }
                         }
                         else

trunk/VUT/GtpVisibility/src/CullingManager.cpp

@@ -6 +6 @@
 CullingManager::CullingManager():
 mHierarchyInterface(NULL), mVisibilityThreshold(0), mNumQueryCulledNodes(0), 
-mNumFrustumCulledNodes(0), mNumQueriesIssued(0)
+mNumFrustumCulledNodes(0), mNumQueriesIssued(0),
+mVisualizeCulledNodes(false)
 {
 }
@@ -35 +36 @@
 }
 //-----------------------------------------------------------------------
-void CullingManager::InitFrame()
+void CullingManager::SetVisualizeCulledNodes(bool visualizeCulledNodes)
+{
+        mVisualizeCulledNodes = visualizeCulledNodes;
+}
+//-----------------------------------------------------------------------
+void CullingManager::InitFrame(bool visualizeCulledNodes)
 {
         mNumFrustumCulledNodes = mNumQueryCulledNodes = mNumQueriesIssued = 0;
+        mVisualizeCulledNodes = visualizeCulledNodes;
 }
 } // namespace GtpVisibility

trunk/VUT/GtpVisibility/src/FrustumCullingManager.cpp

@@ -11 +11 @@
         while (!mHierarchyInterface->GetQueue()->empty())
         {
-                if (mHierarchyInterface->mDummy)
-                        Ogre::LogManager::getSingleton().logMessage("shadow pass");
-        //      elseOgre::LogManager::getSingleton().logMessage("no shadow pass");
                 HierarchyNode *node = mHierarchyInterface->GetQueue()->top();
                 mHierarchyInterface->GetQueue()->pop();
@@ -22 +19 @@
 
                 if (!mHierarchyInterface->CheckFrustumVisible(node))
-                {if (mHierarchyInterface->mDummy)
+                {//if (mHierarchyInterface->mIsShadowPass)
                         mNumFrustumCulledNodes ++;
                 }

trunk/VUT/GtpVisibility/src/HierarchyInterface.cpp

@@ -8 +8 @@
 HierarchyInterface::HierarchyInterface(): 
 mFrameId(0), mNumTraversedNodes(0), mNumRenderedNodes(0), 
-mSceneRoot(0), mPreviousNode(0), mCurrentTestIdx(0), mUseOptimization(true),
-mDummy(false)
+mSceneRoot(0), mPreviousNode(0), mCurrentTestIdx(0), mUseOptimization(true)
+//, mIsShadowPass(false)
 {       
         mDistanceQueue = new DistanceQueue(GreaterDistance<HierarchyNode *>(this));

trunk/VUT/GtpVisibility/src/StopAndWaitCullingManager.cpp

@@ -21 +21 @@
 
                 if (!mHierarchyInterface->CheckFrustumVisible(node, intersects))
-                {if (mHierarchyInterface->mDummy)
+                {//if (mHierarchyInterface->mIsShadowPass)
                         mNumFrustumCulledNodes ++;
                 }
@@ -46 +46 @@
                         }
                         else
-                        {
-                                if (mHierarchyInterface->mDummy)
+                        {       //if (mHierarchyInterface->mIsShadowPass)
                                 mNumQueryCulledNodes ++;
                         }