X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects.h;h=a99c646f7e445b240629d0a59f660cc67c999c2d;hb=b17ec650f79ea8efbfda00ae93bd82434fcea686;hp=d81cda4dacaadfa6695fbf0fe823422374b5fc00;hpb=0cca0c495c7dc29d134a10d7eed5de1f377c99bf;p=lugaru.git

diff --git a/Source/Objects.h b/Source/Objects.h
index d81cda4..a99c646 100644
--- a/Source/Objects.h
+++ b/Source/Objects.h
@@ -1,15 +1,37 @@
+/*
+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 _OBJECTS_H_
 #define _OBJECTS_H_
 
 #include "Quaternions.h"
-#include "gl.h"
+#include "gamegl.h"
 #include "TGALoader.h"
 #include "Quaternions.h"
 #include "Frustum.h"
 #include "Lights.h"
 #include "Models.h"
 #include "Terrain.h"
-#include "Sprites.h"
+#include "Sprite.h"
+#include "Texture.h"
 #include <vector>
 //
 // Model Structures
@@ -38,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];
@@ -52,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);
@@ -64,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();
@@ -75,3 +97,4 @@ public:
 };
 
 #endif
+