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

Timestamp:

06/22/08 05:24:22 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -4 +4 @@
 #include "Texture.h"
 #include "Material.h"
-
 
 using namespace std;
@@ -22 +21 @@
         int tsize2 = t2 ? t2->GetByteSize() : 0;
 
-        // if texture size equal, group by material
-        if (tsize1 == tsize2)
-                return ent1->GetMaterial() < ent2->GetMaterial();
+        return tsize1 < tsize2;
+}
 
-        return tsize1 < tsize2;
+
+inline static bool IsLower2(SceneEntity *ent1, SceneEntity *ent2)
+{
+        return ent1->GetMaterial() < ent2->GetMaterial();
 }
 
@@ -63 +64 @@
 {
         if (mEntities.size() >= mMinSizeForSorting)
+        {
+                sortTimer.Entry();
                 Sort();
+                sortTimer.Exit();
+        }
         
         SceneEntityContainer::const_iterator sit, sit_end = mEntities.end();
@@ -72 +77 @@
                 ent->Render(mState);
         }
+
+        //Print();
 }
+
+
+void RenderQueue::Print()
+{
+        SceneEntityContainer::const_iterator sit, sit_end = mEntities.end();
+
+        Debug << "\nrq size: " << GetSize() << endl;
+        Debug << "texture size: " << endl;
+        // show ordering by texture size
+        for (sit = mEntities.begin(); sit != sit_end; ++ sit)
+        {
+                SceneEntity *ent = *sit;
+                Texture *t = ent->GetMaterial()->GetTexture();
+                int tsize = t ? t->GetByteSize() : 0;
+                Debug << tsize << " ";
+        }
+
+        // show ordering by material
+        Debug << "\nmaterial ptr: " << endl;
         
+        for (sit = mEntities.begin(); sit != sit_end; ++ sit)
+        {
+                Debug << (*sit)->GetMaterial() << " ";
+        }
+}
+
+
+void RenderQueue::Apply()
+{
+        Render();
+        Clear();
+}
+
 
 void RenderQueue::Sort()
 {
-        sort(mEntities.begin(), mEntities.end(), IsLower);
+        // sort by material
+        sort(mEntities.begin(), mEntities.end(), IsLower2);
+        // sort by texture size
+        stable_sort(mEntities.begin(), mEntities.end(), IsLower);
 }