Changeset 3042 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderQueue.cpp

Timestamp:

10/19/08 01:33:16 (16 years ago)

Author:

mattausch

Message:

added technique

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/RenderQueue.cpp (modified) (4 diffs)

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

@@ -51 +51 @@
 bool RenderQueue::FitsInBucket(Shape *shape, size_t idx) const
 {
-        Material *mat = shape->GetMaterial();
+        Technique *tech = shape->GetMaterial()->GetDefaultTechnique();
 
         // test if entity belongs to this bucket
         // note: rather slows down the application for some reason!!
-        if (mat->IsAlphaTestEnabled() != mBuckets[idx]->mAlphaTestEnabled)
+        if (tech->IsAlphaTestEnabled() != mBuckets[idx]->mAlphaTestEnabled)
                 return false;
 
-        if (mat->IsCullFaceEnabled() != mBuckets[idx]->mCullFaceEnabled)
+        if (tech->IsCullFaceEnabled() != mBuckets[idx]->mCullFaceEnabled)
                 return false;
 
-        const bool hasTexture = (mat->GetTexture() != NULL);
+        const bool hasTexture = (tech->GetTexture() != NULL);
 
         if (hasTexture != mBuckets[idx]->mHasTexture)
@@ -68 +68 @@
         if (hasTexture)
         {
-                if (mat->GetTexture()->GetWidth() != mBuckets[idx]->mTexWidth)
+                if (tech->GetTexture()->GetWidth() != mBuckets[idx]->mTexWidth)
                         return false;
 
-                if (mat->GetTexture()->GetHeight() != mBuckets[idx]->mTexHeight)
+                if (tech->GetTexture()->GetHeight() != mBuckets[idx]->mTexHeight)
                         return false;
         }
@@ -119 +119 @@
                         bucket->mMinDistance = -1;
 
-                        Material *mat = shape->GetMaterial();
-
-                        bucket->mAlphaTestEnabled = mat->IsAlphaTestEnabled();
-                        bucket->mCullFaceEnabled = mat->IsCullFaceEnabled();
-
-                        const bool hasTexture = (mat->GetTexture() != NULL);
+                        Technique *tech = shape->GetMaterial()->GetDefaultTechnique();
+
+                        bucket->mAlphaTestEnabled = tech->IsAlphaTestEnabled();
+                        bucket->mCullFaceEnabled = tech->IsCullFaceEnabled();
+
+                        const bool hasTexture = (tech->GetTexture() != NULL);
 
                         bucket->mHasTexture = hasTexture; 
 
-                        bucket->mTexWidth = hasTexture ? mat->GetTexture()->GetWidth() : 0;
-                        bucket->mTexHeight = hasTexture ? mat->GetTexture()->GetHeight() : 0;
+                        bucket->mTexWidth = hasTexture ? tech->GetTexture()->GetWidth() : 0;
+                        bucket->mTexHeight = hasTexture ? tech->GetTexture()->GetHeight() : 0;
 
                         mBuckets.push_back(bucket);
@@ -204 +204 @@
                         Shape *shape = *sit;
                         
-                        Material *mat = shape->GetMaterial();
-                        int tsize = mat->GetTexture() ? mat->GetTexture()->GetByteSize() : 0;
+                        Technique *tech = shape->GetMaterial()->GetDefaultTechnique();
+                        int tsize = tech->GetTexture() ? tech->GetTexture()->GetByteSize() : 0;
                         
                         float dist = SqrMagnitude(shape->GetBoundingBox().Center() - mCamera->GetPosition());
                         
-                        Debug << "e: " << shape << " a: " << mat->IsAlphaTestEnabled() << " s: " << tsize << " d: " << dist << " " << endl;
+                        Debug << "e: " << shape << " a: " << tech->IsAlphaTestEnabled() << " s: " << tsize << " d: " << dist << " " << endl;
                 }
         }