Sorting vectors now working

ChangeLog.md

@@ -2,6 +2,10 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140714 ]
+    * Fixed a bug where std::sort did not use the objects operator<
+      method, but instead sorted based on the objects address in memory
+
     [ 20140706 ]
     * Use cmake to check for sys/time.h availability
     * Use long nearly everywhere where STL containers are interfaced,

cmake/travis_after_success_linux.sh

@@ -10,13 +10,14 @@ echo "set datadir \"../../data\"" >> OpenRaider.ini
 echo "set font \"../../data/test.ttf\"" >> OpenRaider.ini
 
 xvfb-run -n 99 -s "-screen 0 640x480x24" ./OpenRaider &
-sleep 10 # Wait for OpenRaider to start
-import -window root -display :99.0 screenshot.png
 
+# Wait for OpenRaider to start
 wget http://imgur.com/tools/imgurbash.sh
 chmod a+x ./imgurbash.sh
-./imgurbash.sh screenshot.png > url
+sleep 10
 
+import -window root -display :99.0 screenshot.png
+./imgurbash.sh screenshot.png > url
 (
     echo "NICK OR-$(echo -n $TRAVIS_OS_NAME)-$(echo -n $CC)"
     echo "USER OR-$(echo -n $TRAVIS_OS_NAME)-$(echo -n $CC) 9 \* :OR-$(echo -n $TRAVIS_OS_NAME)-$(echo -n $CC)"

include/Entity.h

@@ -24,6 +24,7 @@ public:
     Entity(TombRaider &tr, unsigned int index, unsigned int i, unsigned int model);
 
     bool operator<(Entity &o);
+    static bool compare(Entity *a, Entity *b);
     void display();
     void move(char movement);
     void print();

include/RoomData.h

@@ -62,6 +62,7 @@ public:
 
     // Compares distance to ViewVolume for depth sorting
     bool operator<(const StaticModel &other);
+    static bool compare(StaticModel *a, StaticModel *b);
 
 private:
     int index;

src/Entity.cpp

@@ -41,6 +41,10 @@ bool Entity::operator<(Entity &o) {
     return (distA < distB);
 }
 
+bool Entity::compare(Entity *a, Entity *b) {
+    return (*b) < (*a);
+}
+
 void Entity::display() {
     glPushMatrix();
     glTranslatef(pos[0], pos[1], pos[2]);

src/Render.cpp

@@ -347,7 +347,7 @@ void Render::display()
         glPopMatrix();
 
         // Depth sort entityRenderList and display each entity
-        std::sort(entityRenderList.begin(), entityRenderList.end());
+        std::sort(entityRenderList.begin(), entityRenderList.end(), Entity::compare);
         for (unsigned int i = 0; i < entityRenderList.size(); i++) {
             entityRenderList[i]->display();
         }

src/Room.cpp

@@ -647,7 +647,7 @@ StaticModel &Room::getModel(unsigned long index) {
 }
 
 void Room::sortModels() {
-    std::sort(models.begin(), models.end());
+    std::sort(models.begin(), models.end(), StaticModel::compare);
 }
 
 unsigned long Room::sizeLights() {

src/RoomData.cpp

@@ -200,6 +200,10 @@ bool StaticModel::operator<(const StaticModel &other) {
     return (distA < distB);
 }
 
+bool StaticModel::compare(StaticModel *a, StaticModel *b) {
+    return (*b) < (*a);
+}
+
 // ----------------------------------------------------------------------------
 
 Portal::Portal(TombRaider &tr, unsigned int room, unsigned int index, Matrix &transform) {