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

Timestamp:

06/27/08 13:33:46 (16 years ago)

Author:

mattausch

Message:

 

File:

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

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

@@ -7 +7 @@
 using namespace std;
 
+// sort by alpha, in second instance per texture
+//#define SORT_ALPHA
 
 namespace CHCDemoEngine
@@ -12 +14 @@
 
 
-inline static bool IsLower(SceneEntity *ent1, SceneEntity *ent2)
+inline static bool CompTexture(SceneEntity *ent1, SceneEntity *ent2)
 {
         // group by texture size
@@ -25 +27 @@
 
 
-inline static bool IsLower2(SceneEntity *ent1, SceneEntity *ent2)
+#ifdef SORT_ALPHA
+
+inline static bool CompMat(SceneEntity *ent1, SceneEntity *ent2)
+{ 
+        return ent1->GetMaterial()->IsAlphaTestEnabled() < ent2->GetMaterial()->IsAlphaTestEnabled();
+}
+
+#else
+
+inline static bool CompMat(SceneEntity *ent1, SceneEntity *ent2)
 {
         return ent1->GetMaterial() < ent2->GetMaterial();
 }
+
+#endif
 
 
@@ -37 +50 @@
 
 RenderQueue::RenderQueue(RenderState *state):
-mState(state)
+mState(state), mMinSizeForSorting(3)
 {
 }
@@ -100 +113 @@
 
         // show ordering by material
-        Debug << "\nmaterial ptr: " << endl;
+        Debug << "\nmaterial: " << endl;
         
         for (sit = mEntities.begin(); sit != sit_end; ++ sit)
         {
+#ifdef SORT_ALPHA
+                Debug << (*sit)->GetMaterial()->IsAlphaTestEnabled() << " ";
+#else
                 Debug << (*sit)->GetMaterial() << " ";
+#endif
         }
 }
@@ -118 +135 @@
 void RenderQueue::Sort()
 {
+#ifdef SORT_ALPHA
+        // sort by texture size
+        sort(mEntities.begin(), mEntities.end(), CompTexture);
+        // sort by alpha test enabled
+        stable_sort(mEntities.begin(), mEntities.end(), CompMat);
+#else
         // sort by material
-        sort(mEntities.begin(), mEntities.end(), IsLower2);
+        sort(mEntities.begin(), mEntities.end(), CompMat);
         // sort by texture size
-        stable_sort(mEntities.begin(), mEntities.end(), IsLower);
+        stable_sort(mEntities.begin(), mEntities.end(), CompTexture);
+#endif
 }