X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FModels.h;h=a82f85d04287ec55a750fddebfb80ed5364da274;hb=e724a1c4bd1f94b55ac1331bedd32c51eebb08d9;hp=2f1da97fa140da17d3c8defcc5dcdaf1929de21d;hpb=0cca0c495c7dc29d134a10d7eed5de1f377c99bf;p=lugaru.git

diff --git a/Source/Models.h b/Source/Models.h
index 2f1da97..a82f85d 100644
--- a/Source/Models.h
+++ b/Source/Models.h
@@ -1,3 +1,24 @@
+/*
+Copyright (C) 2003, 2010 - Wolfire Games
+
+This file is part of Lugaru.
+
+Lugaru is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
 #ifndef _MODELS_H_
 #define _MODELS_H_
 
@@ -5,16 +26,16 @@
 //
 // Model Maximums
 //
-#include "gl.h"
+#include "gamegl.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <vector>
 
-#include "Constants.h"
 #include "Terrain.h"
 #include "binio.h"
 #include "Quaternions.h"
+#include "Texture.h"
 
 //
 // Textures List
@@ -65,8 +86,8 @@ public:
 	TexturedTriangle Triangles[max_textured_triangle];
 	GLfloat vArray[max_textured_triangle*24];*/
 
-	GLuint 				textureptr;
-	ModelTexture		Texture;
+	Texture textureptr;
+	ModelTexture modelTexture;
 	int numpossible;
 	bool color;
 
@@ -96,7 +117,7 @@ public:
 	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);
@@ -106,10 +127,10 @@ public:
 	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();
@@ -119,6 +140,7 @@ public:
 	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);
@@ -127,4 +149,4 @@ public:
 	Model();
 };
 
-#endif
\ No newline at end of file
+#endif