major refactor of texture system

[lugaru.git] / Source / Objects.h

diff --git a/Source/Objects.h b/Source/Objects.h
index 4d35552acd773694affea99fd543070c06ca2467..a99c646f7e445b240629d0a59f660cc67c999c2d 100644 (file)
--- 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
@@ -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);