(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index d794a0f..8bf5f29 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -1,6 +1,6 @@
 /**\r
  * CITS2231 Graphics Scene Editor\r
- * @author Ashley Tyndall (20915779)\r
+ * @author Ashley Tyndall (20915779), Jenna de la Harpe (20367932)\r
  */\r
 \r
 #include <stdlib.h>\r
@@ -110,8 +110,8 @@ void processLightEvents(int id) {
  * @param id ID of object selected\r
  */\r
 void processObjectEvents(int id) {\r
-  // **NOTE: For the testing phase, only have the teapot\r
   addSceneObject(id);\r
+  manipulateState = STATE_OBJECT_POSITION_SCALE;\r
   glutPostRedisplay();\r
 }\r
 \r
@@ -120,7 +120,10 @@ void processObjectEvents(int id) {
  * @param id ID of texutre selected\r
  */\r
 void processTextureEvents(int id) {\r
-\r
+  if ( curObject >= 0 ) {\r
+    sceneObjs[curObject].texture = id;\r
+    glutPostRedisplay();\r
+  }\r
 }\r
 \r
 /**\r
@@ -168,7 +171,7 @@ void makeMenu() {
   glutAddMenuEntry("Position/Scale", M_POSITION_SCALE);\r
   glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);\r
   //glutAddSubMenu("Material", materialMenu);\r
-  //glutAddSubMenu("Texture", textureMenu);\r
+  glutAddSubMenu("Texture", textureMenu);\r
   glutAddSubMenu("Ground texture", gTextureMenu);\r
   //glutAddSubMenu("Lights", lightMenu);\r
   glutAddMenuEntry("Exit", M_EXIT);\r
@@ -296,21 +299,47 @@ void motion(int x, int y) {
       break;\r
 \r
     case STATE_OBJECT_POSITION_SCALE:\r
-      //SceneObject co = sceneObjs[curObject];\r
-\r
+      //so.x, so.y, so.z\r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: left/right, h: near/far\r
-        \r
+        //sceneObjs[curObject].x += (x - startx)*leftrightFactor;\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: big/small, h: up/down\r
+\r
+        // For big/small scaling, we map negative numbers to 0->1 and positive numbers to 1->inf\r
+        float diff = (y - starty);\r
+        float map = (diff - -((float)height/2))/(0 - -((float)height/2));\r
+        float scaling;\r
+\r
+        if ( diff < 0 ) {\r
+          scaling = map;\r
+        } else {\r
+          scaling = pow(1/map, diff);\r
+        }\r
+\r
+        if ( scaling != 0 ) {\r
+       \r
+          \r
+          sceneObjs[curObject].scale[0] *= scaling;\r
+          sceneObjs[curObject].scale[1] *= scaling;\r
+          sceneObjs[curObject].scale[2] *= scaling;\r
+          printf("Diff is %f, Scaling by %f on all axii\n", diff, sceneObjs[curObject].scale[0]);\r
+\r
+        }\r
+\r
+        starty = y;\r
       }\r
+\r
+      startx = x;\r
       break;\r
 \r
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:\r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: rotate on width, h: rotate on h\r
+\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
-        // w & h, rotate on h\r
+        // w: rotate on height, h: texture scale\r
+        \r
       }\r
       break;\r
 \r
@@ -390,13 +419,10 @@ void display() {
         SceneObject so = sceneObjs[i];\r
 \r
         // Apply rotation vector\r
-        GLfloat* rv = &so.rotation.vector;\r
-        printf("%f, %f, %f\n", rv[0], rv[1], rv[2]);\r
-        glRotatef(so.rotation.amount, rv[0], rv[1], rv[2]);\r
+        glRotatef(so.rotation.amount, so.rotation.vector[0], so.rotation.vector[1], so.rotation.vector[2]);\r
 \r
         // Apply scaling vector\r
-        GLfloat* sv = &so.scale;\r
-        glScalef(sv[0], sv[1], sv[2]);\r
+        glScalef(so.scale[0], so.scale[1], so.scale[2]);\r
 \r
         // Apply translation vector\r
         glTranslatef(so.x, so.y, so.z);\r