Changeset 41 for trunk/VUT/OcclusionCullingSceneManager/include

Timestamp:

04/07/05 18:51:36 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager/include

Files:

• OgreOcclusionCullingSceneTraverser.h (modified) (4 diffs)
• OgreOcclusionCullingTerrainSceneManager.h (modified) (1 diff)
• OgreOcclusionCullingTerrainSceneTraverser.h (modified) (1 diff)

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingSceneTraverser.h

@@ -93 +93 @@
                 void setNumSceneNodes(int num );
 
+                /** Sets the required number of occlusion queries.
+                @param num number occlusion queries
+                */
+                void setNumQueries( int num );
+
         protected:
                 /** query mode (= without color) or RENDER_MODE */
@@ -114 +119 @@
                 /** Renders the scene with the coherent hierarchical algorithm and the query queye. */
                 void renderCoherentWithQueue( Camera *cam );
-                /** Issue a occlusion query for this node. */
-                HardwareOcclusionQuery *issueOcclusionQuery( SceneNode *node, bool wasVisible );
+                /** Issue a occlusion query for this node. 
+                @param box the axis aligned bounding box of the node
+                @wasVisible if the node was visible in previous frame
+                */
+                HardwareOcclusionQuery *issueOcclusionQuery( AxisAlignedBox *box, bool wasVisible );
                 /** Pulls up the visibility from the child nodes. */
                 void pullUpVisibility( SceneNode *node );
@@ -121 +129 @@
                 void deleteQueries();
                 /** Renders bounding box of specified node.
-                @param the scene node contained in the bounding box to be rendered
-                */
-                void renderBoundingBox( SceneNode *node );
+                @param box the bounding box of the scene node to be rendered */
+                void renderBoundingBox( AxisAlignedBox *box );
                 /** Returns one half of the bounding box.
-                @param the half of the bouding box
+                @param half the half index of the bouding box (0 or 1)
                 */
                 SolidHalfBoundingBox *getSolidHalfBoundingBox( int half );
@@ -147 +154 @@
                 int mQueryMode;
 
+                unsigned int mNumQueries;
+
                 //--- statistics
                 unsigned int mNumSceneNodes;

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingTerrainSceneManager.h

@@ -55 +55 @@
 
         protected:
-                //OcclusionCullingTerrainSceneTraverser *mOcclusionCullingTerrainSceneTraverser;
-                OcclusionCullingSceneTraverser *mOcclusionCullingTerrainSceneTraverser;
+                /** Recursively counts octree size (i.e., number of octree instances)
+                @param root current octree
+                */
+                unsigned int countOctreeSize(Octree *root);
+
+                OcclusionCullingTerrainSceneTraverser *mOcclusionCullingTerrainSceneTraverser;
+                //OcclusionCullingSceneTraverser *mOcclusionCullingTerrainSceneTraverser;
         };
 

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingTerrainSceneTraverser.h

@@ -59 +59 @@
                 
                 void pullUpVisibility( Octree *octree );
-                void traverseOctree( Camera *cam, Octree *octree );
-                void renderOctree( Camera *cam, Octree *octree );
+                void traverseOctant(Camera *cam, Octree *octant );
+                void renderOctant( Camera *cam, Octree *octant );
 
                 OctreePriorityQueue *mDistanceQueue;