Changeset 3051

Timestamp:

10/20/08 23:37:48 (16 years ago)

Author:

mattausch

Message:

included new material properties (vp, fp) into render queue

Location:

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

Files:

• RenderQueue.cpp (modified) (3 diffs)
• RenderQueue.h (modified) (2 diffs)
• chcdemo.cpp (modified) (1 diff)

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

@@ -55 +55 @@
         // test if entity belongs to this bucket
         // note: rather slows down the application for some reason!!
-        if (tech->IsAlphaTestEnabled() != mBuckets[idx]->mAlphaTestEnabled)
-                return false;
-
-        if (tech->IsCullFaceEnabled() != mBuckets[idx]->mCullFaceEnabled)
-                return false;
+        if (tech->IsAlphaTestEnabled() != mBuckets[idx]->mAlphaTestEnabled) return false;
+        if (tech->IsCullFaceEnabled() != mBuckets[idx]->mCullFaceEnabled) return false;
+        if (tech->IsColorWriteEnabled() != mBuckets[idx]->mColorWriteEnabled) return false;
+        if (tech->IsLightingEnabled() != mBuckets[idx]->mLightingEnabled) return false;
+        if (tech->IsDepthWriteEnabled() != mBuckets[idx]->mDepthWriteEnabled) return false;
 
         const bool hasTexture = (tech->GetTexture() != NULL);
@@ -68 +68 @@
         if (hasTexture)
         {
-                if (tech->GetTexture()->GetWidth() != mBuckets[idx]->mTexWidth)
-                        return false;
-
-                if (tech->GetTexture()->GetHeight() != mBuckets[idx]->mTexHeight)
-                        return false;
-        }
+                if (tech->GetTexture()->GetWidth() != mBuckets[idx]->mTexWidth) return false;
+                if (tech->GetTexture()->GetHeight() != mBuckets[idx]->mTexHeight) return false;
+                if (tech->GetTexture()->GetFormat() != mBuckets[idx]->mTexFormat) return false;
+        }
+
+        if ((tech->GetFragmentProgram() != NULL) && mBuckets[idx]->mHasFragmentProgram) return false;
+        if ((tech->GetVertexProgram() != NULL) && mBuckets[idx]->mHasVertexProgram) return false;
+
 
         return true;
@@ -124 +126 @@
                         bucket->mCullFaceEnabled = tech->IsCullFaceEnabled();
 
-                        const bool hasTexture = (tech->GetTexture() != NULL);
-
-                        bucket->mHasTexture = hasTexture; 
-
-                        bucket->mTexWidth = hasTexture ? tech->GetTexture()->GetWidth() : 0;
-                        bucket->mTexHeight = hasTexture ? tech->GetTexture()->GetHeight() : 0;
+                        bucket->mColorWriteEnabled = tech->IsColorWriteEnabled();
+                        bucket->mLightingEnabled = tech->IsLightingEnabled();
+                        bucket->mDepthWriteEnabled = tech->IsDepthWriteEnabled();
+
+
+                        Texture *tex = tech->GetTexture();
+
+                        if (tex != NULL)
+                        {
+                                bucket->mHasTexture = true; 
+
+                                bucket->mTexWidth = tex->GetWidth();
+                                bucket->mTexHeight = tex->GetHeight();
+
+                                bucket->mTexFormat = tex->GetFormat(); 
+                        }
+                        else
+                        {
+                                bucket->mHasTexture = false; 
+
+                                bucket->mTexWidth = 0;
+                                bucket->mTexHeight = 0;
+                                bucket->mTexFormat = 0;
+                        }
+
+                        bucket->mHasVertexProgram = tech->GetVertexProgram() != NULL;
+                        bucket->mHasFragmentProgram = tech->GetFragmentProgram() != NULL;
 
                         mBuckets.push_back(bucket);

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

@@ -17 +17 @@
 struct RenderQueueBucket
 {
-        /** should test for all texture format parameters, 
-            but we as use the same format for all textures they differ only in size
-        */
+        ////////
+        //-- the attributes used to sort the materials
+        /// texture parameters
         int mTexHeight;
         int mTexWidth;
+        int mTexFormat;
 
         bool mHasTexture;
+
+        bool mColorWriteEnabled;
+        bool mDepthWriteEnabled;
+        bool mLightingEnabled;
+
         bool mAlphaTestEnabled;
         bool mCullFaceEnabled;
+
+        bool mHasVertexProgram;
+        bool mHasFragmentProgram;
 
         /// minimal distance to the camera
         float mMinDistance;
 
+        /// the shapes that belong to a bucket
         ShapeContainer mShapes;
 };
@@ -36 +46 @@
 /** This class implements a render queue that sorts renderable geometry in order
         to minimize state changes while approximately keeping front-to-back order
-        The implementation roughly follows the suggested implemenation on Tom Forsyth's article
-        on render state changes. It requires sorting only on bucket level and therefore has very
-        low overhead
+        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.
 */
 class RenderQueue

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

@@ -1012 +1012 @@
         // this would conveniently solves some issues (e.g, skys without shadows)
 
-        //RenderSky();
+        RenderSky();