X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=types.h;h=0d7110ec7993b557ded132674eb64a0b9ebb38b3;hp=91813eedfc1a061a27607f34a35a2f5d319fc07b;hb=cfaea2be22b34195a5c8c85600b1f67ea419d6c2;hpb=f1c86cda52b306cdfbe62e1776eb38cff811f47b

diff --git a/types.h b/types.h
index 91813ee..0d7110e 100644
--- a/types.h
+++ b/types.h
@@ -34,19 +34,20 @@ typedef struct {
     GLubyte *rgbData;   // Array of bytes with the colour data for the texture
 } texture;
 
-
-typedef GLfloat vector[3]; // Vector datatype
-
 typedef struct {
-    GLfloat parameter;  // Transform amount
-    vector* vect;        // Transform vector
+    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
-    float x,y,z;        // Scene position
-    vector* scale;       // Scale vector
+    texturedat texture; // Texture index number
+    GLfloat x,y,z;      // Scene position
+    GLfloat scale[3];   // Scale vector
     transform rotation; // Rotation transformation
 } SceneObject;