Fixed near/far left/right moving of objects. Starting work on moving lights.

[atyndall/cits2231.git] / types.h

diff --git a/types.h b/types.h
index be7c1e4..0d7110e 100644 (file)
--- a/types.h
+++ b/types.h
@@ -35,14 +35,18 @@ typedef struct {
 } texture;
 
 typedef struct {
-    GLfloat amount;     // Transform amount
-    GLfloat vector[3];  // 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
+    texturedat texture; // Texture index number
+    GLfloat x,y,z;      // Scene position
     GLfloat scale[3];   // Scale vector
     transform rotation; // Rotation transformation
 } SceneObject;