X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects.h;h=a99c646f7e445b240629d0a59f660cc67c999c2d;hb=26debbd380c6922e5a0b60d99567c6374a4fef9a;hp=400d6b3064e4f300b744dd134d50fef0de96d26d;hpb=de7834267e2ff8f28a2cb49647fc91e060686e93;p=lugaru.git

diff --git a/Source/Objects.h b/Source/Objects.h
index 400d6b3..a99c646 100644
--- a/Source/Objects.h
+++ b/Source/Objects.h
@@ -31,6 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "Models.h"
 #include "Terrain.h"
 #include "Sprite.h"
+#include "Texture.h"
 #include <vector>
 //
 // Model Structures
@@ -59,8 +60,8 @@ public:
 	float radius;
 	XYZ position[max_objects];
 	int type[max_objects];
-	float rotation[max_objects];
-	float rotation2[max_objects];
+	float yaw[max_objects];
+	float pitch[max_objects];
 	float rotx[max_objects];
 	float rotxvel[max_objects];
 	float roty[max_objects];
@@ -73,10 +74,10 @@ public:
 	float scale[max_objects];
 	float messedwith[max_objects];
 	float checked[max_objects];
-	GLuint 	boxtextureptr;
-	GLuint 	treetextureptr;
-	GLuint 	bushtextureptr;
-	GLuint 	rocktextureptr;
+	Texture boxtextureptr;
+	Texture treetextureptr;
+	Texture bushtextureptr;
+	Texture rocktextureptr;
 	float shadowed[max_objects];
 	float occluded[max_objects];
 	bool checkcollide(XYZ startpoint, XYZ endpoint,int which);
@@ -85,8 +86,8 @@ public:
 
 	void SphereCheckPossible(XYZ *p1,float radius);
 	void DeleteObject(int which);
-	void MakeObject(int atype, XYZ where, float arotation, float ascale);
-	void MakeObject(int atype, XYZ where, float arotation, float arotation2, float ascale);
+	void MakeObject(int atype, XYZ where, float ayaw, float ascale);
+	void MakeObject(int atype, XYZ where, float ayaw, float apitch, float ascale);
 	void Draw();
 	void DoShadows();
 	void DoStuff();