X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=54ef0d84ea2e0e5e256d95eb39185d418bb83827;hp=debba608da20efb80cf51e68205f7bdf0538aacd;hb=057887dfb66573803c3e127d47e88a29c02bd6f8;hpb=9d534bb644d7510782a835c701e4b185957f7e64

diff --git a/scene.c b/scene.c
index debba60..54ef0d8 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();
   }
 }
@@ -284,61 +284,80 @@ void keyboard(unsigned char key, int x, int y) {
 void motion(int x, int y) {
   if ( buttonSelected == -1 ) return; // No button selected, no action
 
+  float diffx = x - startx;
+  float diffy = y - starty;
+
   switch ( manipulateState ) {
     case STATE_CAMERA_ROTATE_MOVE:
       // w: rotate
-      rotate += (x - startx);
+      rotate += diffx;
 
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // h: zoom
-        zoom += (y - starty);
+        zoom += diffy;
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
         // h: tilt
-        camAngle += (y - starty);
+        camAngle += diffy;
       }
-
-      starty = y;
-      startx = x;
-
       break;
 
     case STATE_OBJECT_POSITION_SCALE:
-     
+
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
         // w: left/right, h: near/far
-         //so.x, so.y, so.z
-        //sceneObjs[curObject].x += (x - startx)*leftrightFactor;
+
+        // **NOTE: Currently a work in progress, does not work correctly
+        float angler = 2 * M_PI * ( (rotate*camRotateFactor)/360.0 );
+        printf("cam angle: %f\n", rotate*camRotateFactor);
+
+        sceneObjs[curObject].x += diffx * cos(angler) * 0.1;
+        sceneObjs[curObject].z += diffx * sin(angler) * 0.1;
+
+        sceneObjs[curObject].x += diffy * sin(angler) * 0.1;
+        sceneObjs[curObject].z += diffy * cos(angler) * 0.1;
+
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {
         // w: big/small
-        float diff = (x - startx);
         float max = (float)height/bigsmallFactor;
-        float scaling = ( diff + max) / max;
+        float scaling = (diffx + max) / max;
 
         sceneObjs[curObject].scale[0] *= scaling;
         sceneObjs[curObject].scale[1] *= scaling;
         sceneObjs[curObject].scale[2] *= scaling;
 
         // h: up/down
-        sceneObjs[curObject].y += (y - starty) * updownFactor;
+        sceneObjs[curObject].y -= diffy * updownFactor;
       }
 
-      starty = y;
-      startx = x;
-
       break;
 
     case STATE_OBJECT_ROTATION_TEXTURE_SCALE:
+
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {
-        // w: rotate on width, h: rotate on h
+        // 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;
 
   }
 
+  starty = y;
+  startx = x;
+
   glutPostRedisplay();
 }
 
@@ -375,7 +394,7 @@ void display() {
     0.0,  10.0,  0.0   /* up is in postivie Y direction */
     );
 
-  glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0);
+  glRotatef(camAngle*camAngleFactor, 1.0, 0.0, 0.0); // Set camera angle upward
 
   /* Reposition the light source 0. */
   lightPosition0[0] = 12*cos(lightAngle0);
@@ -398,7 +417,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);
 
@@ -412,19 +431,24 @@ void display() {
       glPushMatrix();
         SceneObject so = sceneObjs[i];
 
-        // Apply rotation vector
-        glRotatef(so.rotation.amount, so.rotation.vector[0], so.rotation.vector[1], so.rotation.vector[2]);
+        // 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);
+        glRotatef(so.rotation.z, 0.0, 0.0, 1.0);
 
         // 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);
         }
@@ -442,26 +466,23 @@ void display() {
         glBindTexture(GL_TEXTURE_2D, 0);
       glPopMatrix();
     }
-    
 
-    // Draw a white ball over the light source
+    // Draw a white ball over the light sources
+    glDisable(GL_LIGHTING);
+    glColor3f(1.0, 1.0, 1.0);
+
     glPushMatrix();
-      glDisable(GL_LIGHTING);
-      glColor3f(1.0, 1.0, 1.0);
       glTranslatef(lightPosition0[0], lightPosition0[1], lightPosition0[2]);
       glutSolidSphere(0.5, 50, 50);
-      glEnable(GL_LIGHTING);
     glPopMatrix();
 
-    // Draw a white ball over the light source
     glPushMatrix();
-      glDisable(GL_LIGHTING);
-      glColor3f(1.0, 1.0, 1.0);
       glTranslatef(lightPosition1[0], lightPosition1[1], lightPosition1[2]);
       glutSolidSphere(0.5, 50, 50);
-      glEnable(GL_LIGHTING);
     glPopMatrix();
 
+    glEnable(GL_LIGHTING);
+
     drawAxisLines();
 
   glPopMatrix();
@@ -513,8 +534,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