Changeset 2805 for GTP/trunk/App

Timestamp:

06/28/08 17:40:17 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

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

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

@@ -66 +66 @@
                 return false;
 
-        int tsize = mat->GetTexture() ? mat->GetTexture()->GetByteSize() : 0;
-        if (tsize != mBuckets[idx]->mTextureSize)
+        const bool hasTexture = (mat->GetTexture() != NULL);
+
+        if (hasTexture != mBuckets[idx]->mHasTexture)
                 return false;
+
+        if (hasTexture)
+        {
+                if (mat->GetTexture()->GetWidth() != mBuckets[idx]->mTexWidth)
+                        return false;
+
+                if (mat->GetTexture()->GetHeight() != mBuckets[idx]->mTexHeight)
+                        return false;
+        }
 
         return true;
@@ -103 +113 @@
 
                         bucket->mAlphaTestEnabled = mat->IsAlphaTestEnabled();
-                        bucket->mTextureSize = mat->GetTexture() ? mat->GetTexture()->GetByteSize() : 0;
+
+                        const bool hasTexture = (mat->GetTexture() != NULL);
+
+                        bucket->mHasTexture = hasTexture; 
+
+                        bucket->mTexWidth = hasTexture ? mat->GetTexture()->GetWidth() : 0;
+                        bucket->mTexHeight = hasTexture ? mat->GetTexture()->GetHeight() : 0;
 
                         mBuckets.push_back(bucket);

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

@@ -17 +17 @@
 struct RenderQueueBucket
 {
-        /** should be full texture format, but we as use the same format for all textures
-            they differ only in size, and we implicitly assume that textures with the same 
-            size have exactly the same format
+        /** should test for all texture format parameters, 
+            but we as use the same format for all textures they differ only in size
         */
-        int mTextureSize;
+        int mTexHeight;
+        int mTexWidth;
+
+        bool mHasTexture;
         bool mAlphaTestEnabled;