X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=9a803cbd3b401a9dfd0f1e847ace1a53a914a3fe;hp=6f74153d176ed43babe4a7cb788b9b89e4fdefe1;hb=156ee3d62238bda349822b1f72009dcdaf1daf80;hpb=bc7b210b34ea0d6fb40bd163955a50d80db3a11e

diff --git a/scene.c b/scene.c
index 6f74153..9a803cb 100644
--- a/scene.c
+++ b/scene.c
@@ -121,7 +121,7 @@ void processObjectEvents(int id) {
  */
 void processTextureEvents(int id) {
   if ( curObject >= 0 ) {
-    sceneObjs[curObject].texture = id;
+    sceneObjs[curObject].texture.id = id;
     glutPostRedisplay();
   }
 }
@@ -153,8 +153,8 @@ void makeMenu() {
   // Construct light menu
   int lightMenu = glutCreateMenu(processLightEvents);
   glutAddMenuEntry("Move Light 1", M_LIGHT_MOVE_LIGHT_1);
-  glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);
-  glutAddMenuEntry("Move Light 2", M_LIGHT_MOVE_LIGHT_2);
+  //glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);
+  //glutAddMenuEntry("Move Light 2", M_LIGHT_MOVE_LIGHT_2);
   glutAddMenuEntry("R/G/B/All Light 2", M_LIGHT_RGBALL_LIGHT_2);
 
   // Construct object menu
@@ -173,7 +173,7 @@ void makeMenu() {
   //glutAddSubMenu("Material", materialMenu);
   glutAddSubMenu("Texture", textureMenu);
   glutAddSubMenu("Ground texture", gTextureMenu);
-  //glutAddSubMenu("Lights", lightMenu);
+  glutAddSubMenu("Lights", lightMenu);
   glutAddMenuEntry("Exit", M_EXIT);
 
   // Bind to right mouse button
@@ -305,11 +305,9 @@ void motion(int x, int y) {
 
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: left/right, h: near/far
-
-        // **NOTE: Currently a work in progress
-        printf("cam angle: %f\n", rotate*rotateFactor);
-        sceneObjs[curObject].x += diffx * sin(rotate*rotateFactor);
-        sceneObjs[curObject].z += diffx * cos(rotate*rotateFactor);
+        float angler = 2 * M_PI * ( (rotate*camRotateFactor)/360.0 );
+        sceneObjs[curObject].x += diffx * cos(angler) * leftrightFactor + diffy * cos(M_PI/2 + angler) * nearfarFactor;
+        sceneObjs[curObject].z += diffx * sin(angler) * leftrightFactor + diffy * sin(M_PI/2 + angler) * nearfarFactor;
 
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
         // w: big/small
@@ -327,14 +325,25 @@ void motion(int x, int y) {
       break;
 
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:
+
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
-        // w: rotate on width, h: rotate on h
-        sceneObjs[curObject].rotation.x += diffx * rotateFactor;
+        // w: rotate on y
+        sceneObjs[curObject].rotation.y += diffx * rotateFactor;
+
+        // h: rotate on x
+        sceneObjs[curObject].rotation.x += diffy * rotateFactor;
 
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
-        // w: rotate on height, h: texture scale
-        
+        // w: rotate on x
+        sceneObjs[curObject].rotation.x += diffx * rotateFactor;
+
+        // h: texture scale
+        float max = (float)height/texscaleFactor;
+        float scaling = (diffy + max) / max;
+        sceneObjs[curObject].texture.scale *= scaling;
+
       }
+      
       break;
 
   }
@@ -401,7 +410,7 @@ void display() {
   glPushMatrix();
 
     /* Perform scene rotations based on user mouse/keyboard input. */
-    glRotatef(rotate*rotateFactor, 0.0, 1.0, 0.0);
+    glRotatef(rotate*camRotateFactor, 0.0, 1.0, 0.0);
     glTranslatef(camx, camy, camz);
     glRotatef(keyrot, 1.0, 0.0, 0.0);
 
@@ -415,6 +424,9 @@ void display() {
       glPushMatrix();
         SceneObject so = sceneObjs[i];
 
+        // Apply translation vector
+        glTranslatef(so.x, so.y, so.z);
+
         // Apply independant rotation vectors
         glRotatef(so.rotation.x, 1.0, 0.0, 0.0);
         glRotatef(so.rotation.y, 0.0, 1.0, 0.0);
@@ -423,13 +435,13 @@ void display() {
         // Apply scaling vector
         glScalef(so.scale[0], so.scale[1], so.scale[2]);
 
-        // Apply translation vector
-        glTranslatef(so.x, so.y, so.z);
-
         // Apply texture
-        if ( so.texture > 0 ) {
-          getTexture(so.texture);
-          glBindTexture(GL_TEXTURE_2D, so.texture);
+        if ( so.texture.id > 0 ) {
+          getTexture(so.texture.id);
+          glBindTexture(GL_TEXTURE_2D, so.texture.id);
+          glMatrixMode(GL_TEXTURE);
+          glScalef(so.texture.scale, so.texture.scale, so.texture.scale);
+          glMatrixMode(GL_MODELVIEW);
         } else {
           glBindTexture(GL_TEXTURE_2D, 0);
         }
@@ -447,7 +459,6 @@ void display() {
         glBindTexture(GL_TEXTURE_2D, 0);
       glPopMatrix();
     }
-    
 
     // Draw a white ball over the light sources
     glDisable(GL_LIGHTING);
@@ -455,12 +466,12 @@ void display() {
 
     glPushMatrix();
       glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]);
-      glutSolidSphere(0.5, 50, 50);
+      glutSolidSphere(lightBallSize, 20, 20);
     glPopMatrix();
 
     glPushMatrix();
       glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]);
-      glutSolidSphere(0.5, 50, 50);
+      glutSolidSphere(lightBallSize, 20, 20);
     glPopMatrix();
 
     glEnable(GL_LIGHTING);
@@ -516,8 +527,8 @@ int main(int argc, char **argv) {
 
   glutInitDisplayMode(GLUT_DOUBLE | GLUT_RGB | GLUT_DEPTH);
 
-  glutInitWindowSize(500, 500);
-  glutCreateWindow("Scene Editor");
+  glutInitWindowSize(width, height);
+  glutCreateWindow("Scene Editor - Ashley Tyndall (20915779), Jenna de la Harpe (20367932)");
 
   glShadeModel(GL_SMOOTH); // Enables Smooth Shading
   glClearColor(0.0f, 0.0f, 0.0f, 0.0f); // Black Background