X-Git-Url: https://git.ucc.asn.au/?p=atyndall%2Fcits2231.git;a=blobdiff_plain;f=scene.c;h=99ccfa0b902ca7fdbc6102addaf2b1708302d733;hp=b02b4f1d1dfdf3c07d8a4c388f2d02bc0fc8d7e3;hb=7862999a5314cfc2b287d719e3d2dde05df21ae8;hpb=faf8b6a77994ac32ffff814c08fe59e70431f5d7

diff --git a/scene.c b/scene.c
index b02b4f1..99ccfa0 100644
--- a/scene.c
+++ b/scene.c
@@ -308,6 +308,7 @@ void motion(int x, int y) {
 
         // **NOTE: Currently a work in progress, does not work correctly
         printf("cam angle: %f\n", rotate*camRotateFactor);
+       // float arc = arctan()
         sceneObjs[curObject].x += diffx * sin(rotate*camRotateFactor);
         sceneObjs[curObject].z += diffx * cos(rotate*camRotateFactor);
 
@@ -426,6 +427,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);
@@ -434,9 +438,6 @@ 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.id > 0 ) {
           getTexture(so.texture.id);
@@ -461,7 +462,6 @@ void display() {
         glBindTexture(GL_TEXTURE_2D, 0);
       glPopMatrix();
     }
-    
 
     // Draw a white ball over the light sources
     glDisable(GL_LIGHTING);
@@ -530,8 +530,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