Changeset 1312 for GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include

Timestamp:

09/01/06 13:48:15 (18 years ago)

Author:

szydlowski

Message:

per-frame-stats with internal rendering - use depth pass issue unresolved

Location:

GTP/trunk/Lib/Vis/OnlineCullingCHC/OGRE/include

Files:

• OgreKdTree.h (modified) (5 diffs)
• OgreKdTreeCamera.h (modified) (2 diffs)

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

@@ -483 +483 @@
                 typedef std::set<LeafPtr> LeafSet;
 
-                typedef struct Stats_
+                struct TreeStats
                 {
                         unsigned int mNumNodes;
@@ -494 +494 @@
                                 mNumLeaves = 0;
                                 mNumSceneNodes = 0;
-                        };
-                } Stats;
+                        }
+                };
+
+                struct FrameStats 
+                {
+                        unsigned int mTraversedNodes;
+                        unsigned int mRenderedNodes;
+                        unsigned int mFrustumCulledNodes;
+
+                        void clear(void)
+                        {
+                                mTraversedNodes = 0;
+                                mRenderedNodes = 0;
+                                mFrustumCulledNodes = 0;
+                        }
+                };
 
                 enum RenderMethod
@@ -571 +585 @@
 
                 // self-explanatory ...
-                int getMaxDepth(void) { return mMaxDepth; };
-                const Stats& getStats(void) const { return mStats; };
-                AxisAlignedBox getBox(void) { if (mKdRoot) return mKdRoot->mAABB; else return AxisAlignedBox(); };
+                int getMaxDepth(void) { return mMaxDepth; }
+                const TreeStats& getTreeStats(void) const { return mTreeStats; }
+                const FrameStats& getFramesStats(void) const { return mFrameStats; }
+                AxisAlignedBox getBox(void) { if (mKdRoot) return mKdRoot->mAABB; else return AxisAlignedBox(); }
                 void setBuildMethod(BuildMethod bm) { mBuildMethod = bm; }
         protected:
@@ -627 +642 @@
                 Log * mBuildLog;
 
-                // statistical information
-                Stats mStats;
+                // statistical information on the tree
+                TreeStats mTreeStats;
+
+                // statistical info on a single rendered frame
+                FrameStats mFrameStats;
 
                 /** Visualization flags **/
@@ -638 +656 @@
                 bool mShowNodes;
 
-                // pointer zur getVisibility function (simple oder enhanced)
+                // function pointer to the getVisibility function
+                // allows choosing between regular vis (NONE/PART, same es isVisible)
+                // and enhaced vis (NONE/PART/FULL) for early traversal abort
                 KdTreeCamera::NodeVisibility (KdTreeCamera::*getVisibility)(const AxisAlignedBox& box) const;
 

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

@@ -28 +28 @@
         };
 
-        //typedef NodeVisibility (KdTreeCamera::*VisFunction)(const AxisAlignedBox& box) const;
-
         // default constructor
         KdTreeCamera(const String& name, SceneManager *sm);
         // default destructor
         ~KdTreeCamera();
-
-        // chage vis mode
-        void setEnhancedVisMode(bool enhanced);
-        // query vis mode
-        bool getEnhancedVisMode(void);
-
-        // function pointer to the actual getvis function
-        // allows choosing between regular vis (NONE/PART, same es isVisible)
-        // and enhaced vis (NONE/PART/FULL) for early traversal abort
-        //NodeVisibility (KdTreeCamera::*getVisibility)(const AxisAlignedBox& box) const;
-        //VisFunction getVisibility;
-        //NodeVisibility getVisibility(const AxisAlignedBox& box ) const;
 
         // regular visibility, like isVisible
@@ -52 +38 @@
         NodeVisibility getVisibilityEnhanced(const AxisAlignedBox& box) const;
 
-        // DEBUG
-        //mutable unsigned int mNumVisQueries;
-protected:
-
-        // flag indicating current vis mode, default is on (true)
-        bool mEnhancedVisMode;
+        // statistical info
+        mutable unsigned int mNumVisQueries;
 };