Added comparison operator to static model

include/Render.h

@@ -223,7 +223,7 @@ private:
      * Texture must be initialized.
      * \param mesh Static model to render
      */
-    void drawRoomModel(static_model_t *mesh);
+    void drawRoomModel(StaticModel &mesh);
 
     /*!
      * \brief Renders a mesh.
@@ -240,7 +240,7 @@ private:
      * Texture must be initialized.
      * \param sprite sprite to render
      */
-    void drawSprite(sprite_t *sprite);
+    void drawSprite(Sprite &sprite);
 
     /*!
      * \brief Updates View Volume. Call once per render frame.

include/Room.h

@@ -40,6 +40,9 @@ class StaticModel {
 public:
     StaticModel(int _index, vec_t _yaw, vec3_t _pos);
 
+    // Compares distance to ViewVolume for depth sorting
+    bool operator<(const StaticModel &other);
+
 private:
     int index;
     vec_t yaw;

include/WorldData.h

@@ -33,22 +33,6 @@ typedef struct {
     vec2_t st;
 } texel_t;
 
-/*
-typedef struct {
-    int num_verts;      //!< 4 == Quad, 3 == Triangle, rendered as triangles
-    vertex_t vertex[4];
-    texel_t texel[4];
-    float pos[3];
-    float radius;       //!< \fixme yeah, I know (I don't? --xythobuz)
-    int texture;
-} sprite_t;
-
-typedef struct {
-    int num_sprites;
-    sprite_t *sprite;
-} sprite_seq_t;
-*/
-
 /*! \fixme For now shaders are textures on tex objects
  * and materials on color objects. If -1
  * then it doesn't have that information yet.
@@ -104,54 +88,5 @@ typedef struct entity_s {
     */
 } entity_t;
 
-/*
-typedef struct {
-    int index;    //!< model_mesh index
-    float yaw;    //!< angle of rotation on Y
-    float pos[3]; //!< position
-
-    //vec3_t bboxMax;
-    //vec3_t bboxMin;
-} static_model_t;
-
-typedef struct {
-    float vertices[4][3];
-    float normal[3];
-    int adjoining_room;
-} portal_t;
-
-typedef struct {
-    vertex_t a;
-    vertex_t b;
-    vertex_t c;
-    vertex_t d;
-} box_t;
-
-typedef struct {
-    vec_t floor;
-    vec_t ceiling;
-
-    bool wall;
-} sector_t;
-
-//! \fixme No room mesh list or sprites and etc
-typedef struct {
-    std::vector<int> adjacentRooms;
-    std::vector<portal_t *> portals;
-    std::vector<static_model_t *> models;
-    std::vector<sprite_t *> sprites;
-    std::vector<box_t *> boxes;
-    std::vector<sector_t *> sectors;
-
-    int id;
-    unsigned int flags;
-    unsigned int numXSectors;
-    unsigned int numZSectors;
-    float pos[3];
-    vec3_t bbox_min;
-    vec3_t bbox_max;
-} room_mesh_t;
-*/
-
 #endif
 

src/Render.cpp

@@ -44,28 +44,6 @@ bool compareEntites(const void *voidA, const void *voidB)
     return (distA < distB);
 }
 
-
-bool compareStaticModels(const void *voidA, const void *voidB)
-{
-    static_model_t *a = (static_model_t *)voidA, *b = (static_model_t *)voidB;
-    vec_t distA, distB;
-
-    if (!a || !b)
-        return false; // error really
-
-    distA = getRender().mViewVolume.getDistToSphereFromNear(a->pos[0],
-            a->pos[1],
-            a->pos[2],
-            128.0f);
-    distB = getRender().mViewVolume.getDistToSphereFromNear(b->pos[0],
-            b->pos[1],
-            b->pos[2],
-            128.0f);
-
-    return (distA < distB);
-}
-
-
 bool compareRoomDist(const void *voidA, const void *voidB)
 {
     const RenderRoom *a = static_cast<const RenderRoom *>(voidA);

src/Room.cpp

@@ -5,6 +5,7 @@
  * \author xythobuz
  */
 
+#include "main.h"
 #include "Room.h"
 
 StaticModel::StaticModel(int _index, vec_t _yaw, vec3_t _pos) {
@@ -14,6 +15,15 @@ StaticModel::StaticModel(int _index, vec_t _yaw, vec3_t _pos) {
         pos[i] = _pos[i];
 }
 
+bool StaticModel::operator<(const StaticModel &other) {
+    vec_t distA, distB;
+    distA = getRender().mViewVolume.getDistToSphereFromNear(pos[0],
+            pos[1], pos[2], 128.0f);
+    distB = getRender().mViewVolume.getDistToSphereFromNear(other.pos[0],
+            other.pos[1], other.pos[2], 128.0f);
+    return (distA < distB);
+}
+
 Portal::Portal(vec3_t _vertices[4], vec3_t _normal, int _adjoiningRoom) {
     for (unsigned int i = 0; i < 3; i++) {
         vertices[0][i] = _vertices[0][i];