X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=types.h;h=be7c1e43798c9d42c291d5e5c8a323964a042cae;hp=573418d241b3f2d55e45a9f479580adb84334820;hb=978c1b7a8041e274db1840ef60071c622198f356;hpb=d3465c5cd0e6e9b414e669e8c8aa464b03f2fd24;ds=inline

diff --git a/types.h b/types.h
index 573418d..be7c1e4 100644
--- a/types.h
+++ b/types.h
@@ -35,9 +35,16 @@ typedef struct {
 } texture;
 
 typedef struct {
-    // You'll need to add scale, rotation, material, mesh number, etc.,
-    // to this structure
-    float x,y,z;
+    GLfloat amount;     // Transform amount
+    GLfloat vector[3];  // Transform vector
+} transform;
+
+typedef struct {
+    int mesh;           // Mesh index number
+    int texture;        // Texture index number
+    float x,y,z;        // Scene position
+    GLfloat scale[3];   // Scale vector
+    transform rotation; // Rotation transformation
 } SceneObject;
 
 // Menu enum
@@ -65,5 +72,11 @@ enum menu {
   M_LIGHT_RGBALL_LIGHT_2
 };
 
-#endif	/* TYPES_H */
+// Manipulation states
+enum manipulateStates {
+  STATE_CAMERA_ROTATE_MOVE,
+  STATE_OBJECT_POSITION_SCALE,
+  STATE_OBJECT_ROTATION_TEXTURE_SCALE
+};
 
+#endif	/* TYPES_H */
\ No newline at end of file