X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FGraphic%2FModels.hpp;h=cb5bcdafdf4c3b953991dedc8951c2e4b23f3193;hb=1198f8141fe7d5b04a936935c45af3217064b0d7;hp=5d5e5ec5e90c006be40d3650a89a219fce20a85b;hpb=190f9f06c28bf4b7aff2ad0b61e5648ea2b10cc6;p=lugaru.git
diff --git a/Source/Graphic/Models.hpp b/Source/Graphic/Models.hpp
index 5d5e5ec..cb5bcda 100644
--- a/Source/Graphic/Models.hpp
+++ b/Source/Graphic/Models.hpp
@@ -24,7 +24,7 @@ along with Lugaru. If not, see .
#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
@@ -49,72 +49,56 @@ class TexturedTriangle
public:
short vertex[3];
float gx[3], gy[3];
+ XYZ facenormal;
};
#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, TriangleNum;
- bool hastexture;
+ short vertexNum;
- int type, oldtype;
+ ModelType type;
- int* possible;
int* owner;
XYZ* vertex;
XYZ* normals;
- XYZ* facenormals;
- TexturedTriangle* Triangles;
+ std::vector Triangles;
GLfloat* vArray;
- /*int possible[max_model_vertex];
+ /*
int owner[max_textured_triangle];
XYZ vertex[max_model_vertex];
XYZ normals[max_model_vertex];
- XYZ facenormals[max_textured_triangle];
- TexturedTriangle Triangles[max_textured_triangle];
GLfloat vArray[max_textured_triangle*24];*/
Texture textureptr;
ModelTexture modelTexture;
- int numpossible;
bool color;
XYZ boundingspherecenter;
float boundingsphereradius;
- //~ float*** decaltexcoords;
- //~ XYZ** decalvertex;
- //~ int* decaltype;
- //~ float* decalopacity;
- //~ float* decalrotation;
- //~ float* decalalivetime;
- //~ XYZ* decalposition;
std::vector decals;
- /*float decaltexcoords[max_model_decals][3][2];
- XYZ decalvertex[max_model_decals][3];
- int decaltype[max_model_decals];
- float decalopacity[max_model_decals];
- float decalrotation[max_model_decals];
- float decalalivetime[max_model_decals];
- XYZ decalposition[max_model_decals];*/
-
- int numdecals;
-
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);
+ const XYZ& getTriangleVertex(unsigned triangleId, unsigned vertexId) const;
void drawdecals(Texture shadowtexture, Texture bloodtexture, Texture bloodtexture2, Texture breaktexture);
int SphereCheck(XYZ *p1, float radius, XYZ *p, XYZ *move, float *rotate);
int SphereCheckPossible(XYZ *p1, float radius, XYZ *move, float *rotate);
@@ -136,14 +120,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 possible;
};
#endif