(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index ffa63dd..45a71a9 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -168,8 +168,8 @@ void makeMenu() {
   glutCreateMenu(processMainEvents);\r
   glutAddMenuEntry("Rotate/Move Camera", M_ROTATE_MOVE_CAMERA);\r
   glutAddSubMenu("Add object", objectMenu);\r
-  //glutAddMenuEntry("Position/Scale", M_POSITION_SCALE);\r
-  //glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);\r
+  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("Ground texture", gTextureMenu);\r
@@ -302,9 +302,24 @@ void motion(int x, int y) {
       //so.x, so.y, so.z\r
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: left/right, h: near/far\r
-        sceneObjs[curObject].x += (x - startx);\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 scaling;\r
+\r
+        if ( diff < 0 ) {\r
+          scaling = (x - -height)/(0 - -height);\r
+        } else {\r
+          scaling = diff;\r
+        }\r
+        \r
+        printf("Scaling by %f on all axii\n", scaling);\r
+        sceneObjs[curObject].scale[0] += scaling;\r
+        sceneObjs[curObject].scale[1] += scaling;\r
+        sceneObjs[curObject].scale[2] += scaling;\r
       }\r
 \r
       startx = x;\r