X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=types.h;h=0d7110ec7993b557ded132674eb64a0b9ebb38b3;hp=3c0b75bcf3c6e9dc0a2b6a8d8bbe19fe51e45d49;hb=d7422056ba339abc73eec8a40758dc2863ad86cc;hpb=bc7b210b34ea0d6fb40bd163955a50d80db3a11e;ds=sidebyside

diff --git a/types.h b/types.h
index 3c0b75b..0d7110e 100644
--- a/types.h
+++ b/types.h
@@ -38,10 +38,15 @@ typedef struct {
     GLfloat x, y, z;    // Amount of rotation on axis
 } transform;
 
+typedef struct {
+    int id;
+    GLfloat scale;
+} texturedat;
+
 typedef struct {
     int mesh;           // Mesh index number
-    int texture;        // Texture index number
-    GLfloat x,y,z;        // Scene position
+    texturedat texture; // Texture index number
+    GLfloat x,y,z;      // Scene position
     GLfloat scale[3];   // Scale vector
     transform rotation; // Rotation transformation
 } SceneObject;