Changeset 39 for trunk/VUT/OcclusionCullingSceneManager/include

Timestamp:

04/05/05 17:39:03 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager/include

Files:

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

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingSceneTraverser.h

@@ -30 +30 @@
         };
 
-        typedef pair<SceneNode *, HardwareOcclusionQuery *> query_pair;
+        typedef pair<SceneNode *, HardwareOcclusionQuery *> QueryPair;
         typedef priority_queue<SceneNode *, vector<SceneNode *>, myless<vector<SceneNode *>::value_type> > PriorityQueue;
-        typedef queue<query_pair> QueryQueue;
+        typedef queue<QueryPair> QueryQueue;
         /**
                 Class which implements a scene mangager which uses occlusion queries for culling occluded objects
@@ -100 +100 @@
                 //HACK
                 //unsigned int countSceneNodes(SceneNode *node);
-                virtual void traverseNode( Camera *cam, SceneNode *node );
+                void traverseNode( Camera *cam, SceneNode *node );
                 /** Renders current scene node 
                 @param cam current camera

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingTerrainSceneManager.h

@@ -16 +16 @@
 
 namespace Ogre {
-        
+        template <typename T> class octreeless
+        {
+        public:
+                myless(Camera *cam) { mCamera = cam; }
+                //bool operator() (HierarchyNode *v1, HierarchyNode *v2) const
+                bool operator() (T v1, T v2) const
+                {
+                        v1->getCullBounds(&mAabb);
+                        return mAabb->getSquaredViewDepth(mCamera) > v2->getSquaredViewDepth(mCamera);
+                }
+
+        private:
+                Camera *mCamera;
+                AxisAlignedBox mAabb;
+        };
+
         /**
                 Class which implements a scene mangager which uses occlusion queries for culling occluded objects

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingTerrainSceneTraverser.h

@@ -2 +2 @@
 #define _OcclusionCullingTerrainSceneTraverser_H__
 
+#include "OgreOctree.h"
 #include "OgreOcclusionCullingSceneTraverser.h"
 
@@ -7 +8 @@
 
 namespace Ogre {
+void Octree::_getCullBounds( AxisAlignedBox *b )
+        typedef pair<Octree *, HardwareOcclusionQuery *> OctreeQueryPair;
+        typedef priority_queue<Octree *, vector<Octree *>, myless<vector<Octree *>::value_type> > OctreePriorityQueue;
+        //typedef queue<QueryPair> QueryQueue;
 
         class OcclusionCullingTerrainSceneTraverser: OcclusionCullingSceneTraverser
         {
-                void traverseNode( Camera *cam, SceneNode *node );
+                void renderScene( Camera *cam, Octree *root );
+                void renderCullFrustum( Camera *cam );
+                void pullUpVisibility( Octree *node );
+                void traverseNode( Camera *cam, Octree *node );
+
+        protected:
+                OctreePriorityQueue *mDistanceQueue;
         };