Changeset 1945Tweet

Timestamp:

Sep 24, 2012, 8:42:47 AM (11 years ago)

Author:

sam

Message:

core: fix sorting of 2D scenes.

File:

• trunk/src/scene.cpp (modified) (2 diffs)

trunk/src/scene.cpp

@@ -51 +51 @@
         Tile const *t2 = (Tile const *)p2;
 
-        return t2->prio - t1->prio;
+        if (t1->pos.z > t2->pos.z)
+            return 1;
+        if (t1->pos.z < t2->pos.z)
+            return -1;
+        return 0;
     }
 
@@ -177 +181 @@
 #endif
     data->m_model_matrix *= mat4::translate(-320.0f, -240.0f, 0.0f);
+#if __ANDROID__
+    data->m_model_matrix = mat4::scale(1280.0f / 640,
+                                       736.0f / 480,
+                                       1.0f) * data->m_model_matrix;
+#endif
     // XXX: end of debug stuff