#include <string.h>
#include <vector>
-#include "Constants.h"
#include "Terrain.h"
#include "binio.h"
#include "Quaternions.h"
+#include "Texture.h"
//
// Textures List
TexturedTriangle Triangles[max_textured_triangle];
GLfloat vArray[max_textured_triangle*24];*/
- GLuint textureptr;
- ModelTexture Texture;
+ Texture textureptr;
+ ModelTexture modelTexture;
int numpossible;
bool color;
void DeleteDecal(int which);
void MakeDecal(int atype, XYZ *where, float *size, float *opacity, float *rotation);
void MakeDecal(int atype, XYZ where, float size, float opacity, float rotation);
- void drawdecals(GLuint shadowtexture,GLuint bloodtexture,GLuint bloodtexture2,GLuint breaktexture);
+ 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);
int LineCheck(XYZ *p1,XYZ *p2, XYZ *p, XYZ *move, float *rotate);
void UpdateVertexArray();
void UpdateVertexArrayNoTex();
void UpdateVertexArrayNoTexNoNorm();
- bool loadnotex(char *filename);
+ bool loadnotex(const char *filename);
bool loadraw(char *filename);
- bool load(char *filename,bool texture);
- bool loaddecal(char *filename,bool texture);
+ bool load(const char *filename,bool texture);
+ bool loaddecal(const char *filename,bool texture);
void Scale(float xscale,float yscale,float zscale);
void FlipTexCoords();
void UniformTexCoords();
void CalculateNormals(bool facenormalise);
void draw();
void drawdifftex(GLuint texture);
+ void drawdifftex(Texture texture);
void drawimmediate();
void drawdiffteximmediate(GLuint texture);
void Rotate(float xang,float yang,float zang);