Changeset 2841 for GTP

Timestamp:

07/16/08 14:59:55 (16 years ago)

Author:

mattausch

Message:

 

Location:

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

Files:

• RenderQueue.cpp (modified) (4 diffs)
• RenderQueue.h (modified) (1 diff)
• SceneEntity.cpp (modified) (3 diffs)
• SceneEntity.h (modified) (1 diff)

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

@@ -59 +59 @@
 
 
-bool RenderQueue::FitsInBucket(Shape *ent, size_t idx) const
-{
-#ifdef TODO
-        Material *mat = ent->GetMaterial();
-#else
-        Material *mat = NULL;
-#endif
+bool RenderQueue::FitsInBucket(Shape *shape, size_t idx) const
+{
+        Material *mat = shape->GetMaterial();
+
         // test if entity belongs to this bucket
         // note: rather slows down the application for some reason!!
-        if (0 && mat->IsAlphaTestEnabled() != mBuckets[idx]->mAlphaTestEnabled)
+        if (mat->IsAlphaTestEnabled() != mBuckets[idx]->mAlphaTestEnabled)
                 return false;
 
@@ -91 +88 @@
 void RenderQueue::Enqueue(SceneEntity *entity)
 {
+        static ShapeContainer shapes;
+        shapes.clear();
+
+        entity->GetCurrentLODLevel(shapes)
+
+        ShapeContainer::const_iterator sit, sit_end = shapes.end();
+
+        for (sit = shapes.begin(); sit != sit_end; ++ sit)
+        {
+                Enqueue(*sit);
+        }
+}
+
+
+void RenderQueue::Enqueue(Shape *shape)
+{
         RenderQueueBucket *bucket;
         ++ mSize;
-#ifdef TODO
+        
         if (entity->mRenderQueueBucket)
         {
@@ -141 +154 @@
 
         bucket->mEntities.push_back(entity);
-#endif
-
 }
 
@@ -195 +206 @@
                         Material *mat = shape->GetMaterial();
                         int tsize = mat->GetTexture() ? mat->GetTexture()->GetByteSize() : 0;
-#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;
                 }

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

@@ -70 +70 @@
 protected:
 
+        void Enqueue(Shape *shape);
+
         inline bool FitsInBucket(Shape *shape, size_t idx) const;
 

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

@@ -22 +22 @@
 
 
-ShapeContainer *SceneEntity::GetCurrentLOD()
+void SceneEntity::GetCurrentLODLevel(ShapeContainer &shapes)
 {
-/*      if (mLODInfos->empty())
-                return &mShapes;
+        ShapeContainer::const_iterator sit, sit_end;
+
+        if (mLODInfos->empty())
+        {
+                sit = mShapes.begin(); sit_end = mShapes.end();
+        }
 
         float mDistance = 0.0f;
@@ -31 +35 @@
         int i = 0;
 
-        for (int i = 0; i < mLODInfos->size(); ++ i)
+        LODInfo *info;
+
+        LODInfoContainer::const_iterator lid, lid_end = mLODInfos.end();
+
+        for (lid = mLODInfos.begin(); lid != lid_end; ++ lid)
         {
-                if ((mLODInfos*)[i].mDistance > mDistance)
-                        return &(mLODInfos*)[i].mShapes;
+                info = *lid;
+
+                if (info->mDistance > mDistance)
+                {
+                        sit = info->mShapes.begin(); 
+                        sit_end = info->mShapes.end();
+                        break;
+                }
         }
 
-        return &(mLODInfos->last().mShapes);
-        */
-        return NULL;
+        for (; sit != sit_end; ++ sit)
+        {
+                shapes.push_back(*sit);
+        }
 }
 
@@ -48 +63 @@
         float mDistance = 0.0f;
 
-        ShapeContainer *shapes;
+        static ShapeContainer shapes;
+        shapes.clear();
 
-        shapes = GetCurrentLOD();
+        GetCurrentLODLevel(shapes);
 
-        for (int i = 0; i < shapes->size(); ++ i)
+        ShapeContainer::const_iterator sit, sit_end = shapes.end();
+
+        for (; sit != sit_end; ++ sit)
         {
-                (*shapes)[i]->Render(state);
+                (*sit)->Render(state);
         }
 }

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

@@ -63 +63 @@
 
 
+        void GetCurrentLODLevel(ShapeContainer &shapes);
+
 protected:
 
-        ShapeContainer *GetCurrentLOD();
 
         /// transform matrix