Changeset 40 for trunk/VUT/OcclusionCullingSceneManager/include

Timestamp:

04/06/05 18:36:40 (19 years ago)

Author:

mattausch

Message:

 

Location:

trunk/VUT/OcclusionCullingSceneManager/include

Files:

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

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingTerrainSceneManager.h

@@ -10 +10 @@
 
 #include "OgrePrerequisites.h"
-#include "OgreOcclusionCullingSceneTraverser.h"
+#include "OgreOcclusionCullingTerrainSceneTraverser.h"
 //#include "OgreSolidHalfBoundingBox.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
@@ -41 +25 @@
                 ~OcclusionCullingTerrainSceneManager();
         
-                //void _renderVisibleObjects(void);
-                //void _findVisibleObjects(Camera* cam, bool onlyShadowCasters);
-                
-                //void _updateSceneGraph(Camera* cam);
+                void _renderVisibleObjects(void);
+                void _findVisibleObjects(Camera* cam, bool onlyShadowCasters);
+                void _updateSceneGraph(Camera* cam);
 
                 /** Sets the given option for the SceneManager
@@ -62 +45 @@
                 bool getOptionKeys( StringVector &refKeys );
 
+                /** Renders one octant of an octree, i.e., renders current octant
+                        node and does not traverse deeper into the tree.
+                        @remark Note that OctreeNode instances are NOT part of the octree 
+                        hierarchy, instead one octant of an Octree contains many OctreeNode instances.
+                        @param octree the octree to be rendered
+                        @param cam current camera
+                */
+                void _renderOctant(Camera* cam, Octree *octree);
+
         protected:
-                OcclusionCullingSceneTraverser *mOcclusionCullingSceneTraverser;
+                //OcclusionCullingTerrainSceneTraverser *mOcclusionCullingTerrainSceneTraverser;
+                OcclusionCullingSceneTraverser *mOcclusionCullingTerrainSceneTraverser;
         };
 

trunk/VUT/OcclusionCullingSceneManager/include/OgreOcclusionCullingTerrainSceneTraverser.h

@@ -8 +8 @@
 
 namespace Ogre {
-void Octree::_getCullBounds( AxisAlignedBox *b )
+        /**
+                This class implements the compare operator for the priority queue
+                especially for octree hierarchies using getCullBounds for bounding
+                box computation. A lower distance has a higher value in the queue.
+        */
+        template <typename T> class octreeless 
+        {
+        public:
+                octreeless(Camera *cam) { mCamera = cam; }
+                
+                bool operator() (T v1, T v2) const
+                {
+                        AxisAlignedBox box1, box2;
+                        v1->_getCullBounds(&box1);
+                        v2->_getCullBounds(&box2);
+
+                        return getSquaredViewDepth(mCamera, &box1) > getSquaredViewDepth(mCamera, &box2);
+                }
+
+        private:
+                Real getSquaredViewDepth(const Ogre::Camera* cam, const Ogre::AxisAlignedBox* box) const
+                {
+                        Vector3 mid  = ((box->getMinimum() - box->getMaximum()) * 0.5) + box->getMinimum();
+                        return (cam->getDerivedPosition() - mid).squaredLength();                                                                   
+                }
+
+                Camera *mCamera;
+                //AxisAlignedBox mBox1, mBox2;
+                //Ogre::Vector3 min, max, mid, dist;
+        };
+
         typedef pair<Octree *, HardwareOcclusionQuery *> OctreeQueryPair;
-        typedef priority_queue<Octree *, vector<Octree *>, myless<vector<Octree *>::value_type> > OctreePriorityQueue;
+        typedef priority_queue<Octree *, vector<Octree *>, octreeless<vector<Octree *>::value_type> > OctreePriorityQueue;
         //typedef queue<QueryPair> QueryQueue;
 
-        class OcclusionCullingTerrainSceneTraverser: OcclusionCullingSceneTraverser
+        class OcclusionCullingTerrainSceneTraverser: public OcclusionCullingSceneTraverser
         {
+        public:
+                OcclusionCullingTerrainSceneTraverser(SceneManager *sm, RenderSystem *rsys);
                 void renderScene( Camera *cam, Octree *root );
+                
+        protected:
+                /** Renders the scene with view frustum culling only. */
                 void renderCullFrustum( Camera *cam );
-                void pullUpVisibility( Octree *node );
-                void traverseNode( Camera *cam, Octree *node );
+                /** Renders the scene with the hierarchical stop and wait algorithm. */
+                void renderStopAndWait( Camera *cam );
+                /** Renders the scene with the coherent hierarchical algorithm and the query queye. */
+                void renderCoherentWithQueue( Camera *cam );
+                /** Issue a occlusion query for this node. */
+                
+                void pullUpVisibility( Octree *octree );
+                void traverseOctree( Camera *cam, Octree *octree );
+                void renderOctree( Camera *cam, Octree *octree );
 
-        protected:
                 OctreePriorityQueue *mDistanceQueue;
         };