Using an enum for model type

[lugaru.git] / Source / Graphic / Models.hpp

diff --git a/Source/Graphic/Models.hpp b/Source/Graphic/Models.hpp
index e642f17d2da82c9dba2f2c5c39c2feb85f193945..54b28858ae3a7d2f2a3bcf31e347bfe7b56f11ba 100644 (file)
--- a/Source/Graphic/Models.hpp
+++ b/Source/Graphic/Models.hpp
@@ -24,7 +24,7 @@ along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 #include "Environment/Terrain.hpp"
 #include "Graphic/gamegl.hpp"
 #include "Graphic/Texture.hpp"
-#include "Math/Quaternions.hpp"
+#include "Math/XYZ.hpp"
 #include "Utils/binio.h"
 
 #include <cstdio>
@@ -54,28 +54,29 @@ public:
 
 #define max_model_decals 300
 
-#define nothing 0
-#define normaltype 4
-#define notextype 1
-#define rawtype 2
-#define decalstype 3
+enum ModelType
+{
+    nothing = 0,
+    notextype = 1,
+    rawtype = 2,
+    decalstype = 3,
+    normaltype = 4
+};
 
 class Model
 {
 public:
     short vertexNum;
-    bool hastexture;
 
-    int type, oldtype;
+    ModelType type;
 
-    int* possible;
     int* owner;
     XYZ* vertex;
     XYZ* normals;
     std::vector<TexturedTriangle> Triangles;
     GLfloat* vArray;
 
-    /*int possible[max_model_vertex];
+    /*
     int owner[max_textured_triangle];
     XYZ vertex[max_model_vertex];
     XYZ normals[max_model_vertex];
@@ -83,7 +84,6 @@ public:
 
     Texture textureptr;
     ModelTexture modelTexture;
-    int numpossible;
     bool color;
 
     XYZ boundingspherecenter;
@@ -93,6 +93,8 @@ public:
 
     bool flat;
 
+    Model();
+    ~Model();
     void DeleteDecal(int which);
     void MakeDecal(decal_type atype, XYZ *where, float *size, float *opacity, float *rotation);
     void MakeDecal(decal_type atype, XYZ where, float size, float opacity, float rotation);
@@ -117,14 +119,15 @@ public:
     void Translate(float xtrans, float ytrans, float ztrans);
     void CalculateNormals(bool facenormalise);
     void draw();
-    void drawdifftex(GLuint texture);
     void drawdifftex(Texture texture);
     void drawimmediate();
     void Rotate(float xang, float yang, float zang);
     void deleteDeadDecals();
-    ~Model();
+
+private:
     void deallocate();
-    Model();
+    /* indices of triangles that might collide */
+    std::vector<unsigned int> possible;
 };
 
 #endif