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

Timestamp:

07/16/08 11:28:52 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -5 +5 @@
 #include "Material.h"
 #include "Camera.h"
+#include "Shape.h"
 
 
@@ -138 +139 @@
                 entity->mRenderQueueBucket = bucket;
         }
+
+        bucket->mEntities.push_back(entity);
 #endif
-        bucket->mEntities.push_back(entity);
+
 }
 
@@ -146 +149 @@
 {
         for (size_t i = 0; i < mBuckets.size(); ++ i)
-                mBuckets[i]->mEntities.clear();
+                mBuckets[i]->mShapes.clear();
 
         mSize = 0;
@@ -165 +168 @@
         for (size_t i = 0; i < mBuckets.size(); ++ i)
         {
-                SceneEntityContainer::const_iterator sit, sit_end = mBuckets[i]->mEntities.end();
-                for (sit = mBuckets[i]->mEntities.begin(); sit != sit_end; ++ sit)
-                {
-                        SceneEntity *ent = *sit;
-                        ent->Render(mState);
+                ShapeContainer::const_iterator sit, sit_end = mBuckets[i]->mShapes.end();
+
+                for (sit = mBuckets[i]->mShapes.begin(); sit != sit_end; ++ sit)
+                {
+                        Shape *shape = *sit;
+                        shape->Render(mState);
                 }
         }
@@ -183 +187 @@
                 Debug << "\n******\nbucket " << (int)i << endl;
 
-                SceneEntityContainer::const_iterator sit, sit_end = mBuckets[i]->mEntities.end();
-
-                for (sit = mBuckets[i]->mEntities.begin(); sit != sit_end; ++ sit)
-                {
-                        SceneEntity *ent = *sit;
-        #ifdef TODO
-                        Material *mat = ent->GetMaterial();
+                ShapeContainer::const_iterator sit, sit_end = mBuckets[i]->mShapes.end();
+
+                for (sit = mBuckets[i]->mShapes.begin(); sit != sit_end; ++ sit)
+                {
+                        Shape *shape = *sit;
+                        
+                        Material *mat = shape->GetMaterial();
                         int tsize = mat->GetTexture() ? mat->GetTexture()->GetByteSize() : 0;
-                        float dist = SqrMagnitude(ent->GetBoundingBox().Center() - mCamera->GetPosition());
-                        Debug << "e: " << ent << " a: " << mat->IsAlphaTestEnabled() << " s: " << tsize << " d: " << dist << " " << endl;
+#ifdef TODO
+                        float dist = SqrMagnitude(shape->GetBoundingBox().Center() - mCamera->GetPosition());
+#else
+                        float dist = -1;
 #endif
+                        Debug << "e: " << shape << " a: " << mat->IsAlphaTestEnabled() << " s: " << tsize << " d: " << dist << " " << endl;
                 }
         }