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
//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
+ float scaling = (y - starty)*bigsmallFactor;\r
+ sceneObjs[curObject].scale[0] += scaling;\r
+ sceneObjs[curObject].scale[1] += scaling;\r
+ sceneObjs[curObject].scale[2] += scaling;\r
}\r
\r
startx = x;\r