Changeset 2768 for GTP/trunk/App/Demos/Vis/CHC_revisited/RenderQueue.cpp

Timestamp:

06/17/08 23:08:39 (16 years ago)

Author:

mattausch

Message:

debug version

File:

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

GTP/trunk/App/Demos/Vis/CHC_revisited/RenderQueue.cpp

@@ -5 +5 @@
 #include "Material.h"
 
+
+using namespace std;
 
 
@@ -13 +15 @@
 inline static bool IsLower(SceneEntity *ent1, SceneEntity *ent2)
 {
-        if (ent1->GetGeometry()->HasTexture() && ent2->GetGeometry()->HasTexture())
-        {
-                Texture *t1 = ent1->GetMaterial()->GetTexture();
-                Texture *t2 = ent1->GetMaterial()->GetTexture();
+        Texture *t1 = ent1->GetMaterial()->GetTexture();
+        Texture *t2 = ent2->GetMaterial()->GetTexture();
 
-                return t1->GetByteSize() < t2->GetByteSize();
-        }
-        else if (ent2->GetGeometry()->HasTexture())
-        {
-                return true;
-        }
+        int tsize1 = t1 ? t1->GetByteSize() : 0;
+        int tsize2 = t2 ? t2->GetByteSize() : 0;
 
-        return false;
+        if (tsize1 == tsize2)
+                return ent1->GetMaterial() < ent2->GetMaterial();
+
+        return tsize1 < tsize2;
 }
-
 
 
@@ -65 +63 @@
 {
         Sort();
-
+        
+        //if (!mEntities.empty()) Debug << "rendering render queue" << endl;
         SceneEntityContainer::const_iterator sit, sit_end = mEntities.end();
 
@@ -72 +71 @@
                 SceneEntity *ent = *sit;
                 ent->Render(mState);
+
+                /*if (ent->GetMaterial()->GetTexture())
+                        Debug << " " << ent->GetMaterial()->GetTexture()->GetWidth();
+                else
+                        Debug << " 0";*/
         }
 }
-
         
 
 void RenderQueue::Sort()
 {
-        sort(mEntities.begin(), mEntities.end());
+        //InitTiming();
+        //long t1, t2;
+        //t1 = GetTime();
+
+        sort(mEntities.begin(), mEntities.end(), IsLower);
+
+        //t2 = GetTime();
+        //cout << "sort: " << TimeDiff(t1, t2) << endl;
 }