X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=types.h;h=e18c6f4336cd34de4161c92ab946e0c760816bd0;hp=197eb03f12ae0f8658a2c9a628bb9a3a2aef578c;hb=be10e0bdc4f3277599aa5c02fdddfc0d1cc2f66f;hpb=ae7da963e8c91eb4463b8c9f60d0b82c4a2155ce

diff --git a/types.h b/types.h
index 197eb03..e18c6f4 100644
--- a/types.h
+++ b/types.h
@@ -34,22 +34,37 @@ typedef struct {
     GLubyte *rgbData;   // Array of bytes with the colour data for the texture
 } texture;
 
+// A type for point data
+typedef struct {
+    GLfloat x, y, z;    // Amount of rotation on axis
+} point;
 
-typedef GLfloat vector[3]; // Vector datatyle
-
+// A type for texture id/scale data
 typedef struct {
-    GLfloat parameter;  // Transform amount
-    vector* vect;        // Transform vector
-} transform;
+    int id;
+    GLfloat scale;
+} texturedat;
 
+// A type to maintain the state of an object in the scene
 typedef struct {
-    int mesh;           // Mesh index number
-    int texture;        // Texture index number
-    float x,y,z;        // Scene position
-    vector* scale;       // Scale vector
-    transform rotation; // Rotation transformation
+    int mesh;             // Mesh index number
+    texturedat texture;   // Texture index number
+    GLfloat x,y,z;        // Scene position
+    GLfloat scale[3];     // Scale vector
+    point rotation;       // Rotation transformation
 } SceneObject;
 
+// A type to maintain the state of a light in the scene
+typedef struct {
+    GLfloat position[4];  // Light position
+    GLfloat ambient[4];   // Ambient parameter
+    GLfloat diffuse[4];   // Diffuse parameter
+    GLfloat specular[4];  // Specular parameter
+    GLfloat direction[3]; // Direction parameter
+    GLfloat cutoff;       // Cutoff of light
+    char exponent;        // Light exponent value, 0 - 128
+} LightObject;
+
 // Menu enum
 enum menu {
   // Main menu
@@ -75,5 +90,13 @@ 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,
+  STATE_LIGHT_1_MOVE,
+  STATE_LIGHT_2_MOVE,
+};
 
+#endif	/* TYPES_H */
\ No newline at end of file