X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects.h;h=bd604868c68b23acfc71cfd01bcb7aa45ca0beb5;hb=97989f58ab13c64fbe05e629d2b2a024a2c3cfa4;hp=400d6b3064e4f300b744dd134d50fef0de96d26d;hpb=8265984dce72d262e3865ebad4668d98b5b26d4a;p=lugaru.git

diff --git a/Source/Objects.h b/Source/Objects.h
index 400d6b3..bd60486 100644
--- a/Source/Objects.h
+++ b/Source/Objects.h
@@ -3,20 +3,18 @@ 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.
+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,
+Lugaru 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.
+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.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _OBJECTS_H_
@@ -24,13 +22,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "Quaternions.h"
 #include "gamegl.h"
-#include "TGALoader.h"
+#include "ImageIO.h"
 #include "Quaternions.h"
 #include "Frustum.h"
 #include "Lights.h"
 #include "Models.h"
 #include "Terrain.h"
 #include "Sprite.h"
+#include "Texture.h"
 #include <vector>
 //
 // Model Structures
@@ -53,46 +52,47 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define firetype 13
 
 
-class Objects{
+class Objects
+{
 public:
-	XYZ center;
-	float radius;
-	XYZ position[max_objects];
-	int type[max_objects];
-	float rotation[max_objects];
-	float rotation2[max_objects];
-	float rotx[max_objects];
-	float rotxvel[max_objects];
-	float roty[max_objects];
-	float rotyvel[max_objects];
-	int numobjects;
-	bool possible[max_objects];
-	Model model[max_objects];
-	Model displaymodel[max_objects];
-	float friction[max_objects];
-	float scale[max_objects];
-	float messedwith[max_objects];
-	float checked[max_objects];
-	GLuint 	boxtextureptr;
-	GLuint 	treetextureptr;
-	GLuint 	bushtextureptr;
-	GLuint 	rocktextureptr;
-	float shadowed[max_objects];
-	float occluded[max_objects];
-	bool checkcollide(XYZ startpoint, XYZ endpoint,int which);
-	bool onfire[max_objects];
-	float flamedelay[max_objects];
+    XYZ center;
+    float radius;
+    XYZ position[max_objects];
+    int type[max_objects];
+    float yaw[max_objects];
+    float pitch[max_objects];
+    float rotx[max_objects];
+    float rotxvel[max_objects];
+    float roty[max_objects];
+    float rotyvel[max_objects];
+    int numobjects;
+    bool possible[max_objects];
+    Model model[max_objects];
+    Model displaymodel[max_objects];
+    float friction[max_objects];
+    float scale[max_objects];
+    float messedwith[max_objects];
+    float checked[max_objects];
+    Texture boxtextureptr;
+    Texture treetextureptr;
+    Texture bushtextureptr;
+    Texture rocktextureptr;
+    float shadowed[max_objects];
+    float occluded[max_objects];
+    bool checkcollide(XYZ startpoint, XYZ endpoint, int which);
+    bool onfire[max_objects];
+    float flamedelay[max_objects];
 
-	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 Draw();
-	void DoShadows();
-	void DoStuff();
+    void SphereCheckPossible(XYZ *p1, float radius);
+    void DeleteObject(int which);
+    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();
 
-	Objects();
-	~Objects();
+    Objects();
+    ~Objects();
 };
 
 #endif