Changeset 3060

Timestamp:

10/21/08 23:20:17 (16 years ago)

Author:

mattausch

Message:

updated render queue: as we assume incoming nodes to be sorted front to back,
no sorting is required anymore

Location:

GTP/trunk/App/Demos/Vis/FriendlyCulling/src

Files:

• RenderQueue.cpp (modified) (7 diffs)
• RenderQueue.h (modified) (5 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderQueue.cpp

@@ -15 +15 @@
 
 
-inline static bool CompDist(RenderQueueBucket *b1, RenderQueueBucket *b2)
+/*inline static bool CompDist(RenderQueueBucket *b1, RenderQueueBucket *b2)
 {
         return (b1->mMinDistance < b2->mMinDistance);
-}
-
-
-
+}*/
 RenderQueue::RenderQueue(): 
 mState(NULL), 
-mMinSizeForSorting(3),
 mCamera(NULL),
 mNumEntries(0)
@@ -33 +29 @@
 RenderQueue::RenderQueue(RenderState *state, Camera *cam):
 mState(state), 
-mMinSizeForSorting(3),
 mCamera(cam),
 mNumEntries(0)
@@ -118 +113 @@
                 {
                         RenderQueueBucket *bucket = new RenderQueueBucket();
-                        bucket->mMinDistance = -1;
+                        //bucket->mMinDistance = -1;
 
                         bucket->mAlphaTestEnabled = tech->IsAlphaTestEnabled();
@@ -161 +156 @@
         }
 
-        if (bucket->mMinDistance < .0f)
-        {
+        if (bucket->IsEmpty())
+        {
+                // add to currently active buckets that will be rendered
                 // assume that the incoming nodes are ordered by distance 
+                // => active buckets are sorted by distance
+                mActiveBuckets.push_back(bucket);
+        
                 // => set min dist on first incoming node
-                const Vector3 v = shape->GetCenter() - mCamera->GetPosition();
-                
-                const float dist = SqrMagnitude(v);
-                bucket->mMinDistance = dist;
-        }
+                //const Vector3 v = shape->GetCenter() - mCamera->GetPosition();
+                //const float dist = SqrMagnitude(v);
+                //bucket->mMinDistance = dist;
+
+                }
 
         bucket->mShapes.push_back(shape);
@@ -177 +176 @@
 void RenderQueue::Clear()
 {
-        for (size_t i = 0; i < mBuckets.size(); ++ i)
-        {
-                mBuckets[i]->mMinDistance = -1;
-                mBuckets[i]->mShapes.clear();
+        for (size_t i = 0; i < mActiveBuckets.size(); ++ i)
+        {
+                //mBuckets[i]->mMinDistance = -1;
+                mActiveBuckets[i]->mShapes.clear();
         }
 
         mNumEntries = 0;
+
+        mActiveBuckets.clear();
 }
 
@@ -196 +197 @@
 {
         // sort the buckets
-        Sort();
+        //Sort();
 
         // render all buckets
@@ -236 +237 @@
 
 
-void RenderQueue::Sort()
+/*void RenderQueue::Sort()
 {
         // sort buckets itself by distance
         sort(mBuckets.begin(), mBuckets.end(), CompDist);
-}
+}*/
 
 

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderQueue.h

@@ -17 +17 @@
 struct RenderQueueBucket
 {
+        inline bool IsEmpty() const { return mShapes.empty();}
+
         ////////
         //-- the attributes used to sort the materials
-        /// texture parameters
+        
+        // texture related parameters
         int mTexHeight;
         int mTexWidth;
@@ -39 +42 @@
 
         /// minimal distance to the camera
-        float mMinDistance;
+        //float mMinDistance;
 
         /// the shapes that belong to a bucket
@@ -49 +52 @@
         to minimize state changes while approximately keeping front-to-back order
         The implementation roughly follows the suggested implementation in 
-        Tom Forsyth's article on render state changes. It requires sorting only on 
-        bucket level and therefore has very     low overhead.
+        Tom Forsyth's article on render state changes. It assumes that the incoming
+        objecs are roughly front to back level and therefore does not require any sorting 
+        and therefore has very  low overhead.
 */
 class RenderQueue
@@ -88 +92 @@
 protected:
 
-        void Sort();
+        //void Sort();
 
         inline bool FitsInBucket(Shape *shape, size_t idx) const;
@@ -100 +104 @@
 
         ///////////
+        //-- members
 
+        // the current render state
         RenderState *mState;
         
         Camera *mCamera;
-        //SceneEntityContainer mEntities;
-        int mMinSizeForSorting;
         /// each bucket contains objects with similar materials that don't cause a hard state change
         std::vector<RenderQueueBucket *> mBuckets;
+        /// this are the buckets that where touched until the last clear. They are sorted by distance
+        std::vector<RenderQueueBucket *> mActiveBuckets;
 
         int mNumEntries;