(no commit message)

[atyndall/cits2231.git] / types.h

diff --git a/types.h b/types.h
index 197eb03..0d7110e 100644 (file)
--- 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;
 
     GLubyte *rgbData;   // Array of bytes with the colour data for the texture
 } texture;
 

-
-typedef GLfloat vector[3]; // Vector datatyle
-

 typedef struct {
 typedef struct {

-    GLfloat parameter;  // Transform amount
-    vector* vect;        // Transform vector
+    GLfloat x, y, z;    // Amount of rotation on axis

 } transform;
 
 } transform;
 

+typedef struct {
+    int id;
+    GLfloat scale;
+} texturedat;
+

 typedef struct {
     int mesh;           // Mesh index number
 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;
 
     transform rotation; // Rotation transformation
 } SceneObject;
 


@@ -75,5 +76,11 @@ enum menu {
   M_LIGHT_RGBALL_LIGHT_2
 };
 
   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