(no commit message)

diff --git a/globals.c b/globals.c
index 4f7c69e..278bf89 100644 (file)
--- a/globals.c
+++ b/globals.c
@@ -46,10 +46,7 @@ char *dirDefault2 = "/cslinux/examples/CITS2231/project-files/models-textures";
 
 char dataDir[200];  // Stores the directory name for the meshes and textures.
 
-int moving, startx, starty;
-
-/* Recursion level for floor drawing */
-int drawFloorRecurse = 8;
+int startx, starty;
 
 /* Size of floor, from -n to n, floorSize must be divisible by squareSize */
 int floorSize = 200;

diff --git a/globals.h b/globals.h
index 058e32c..c7d62d2 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -35,10 +35,7 @@ extern char *dirDefault2;
 // Stores the directory name for the meshes and textures.
 extern char dataDir[];
 
-extern int moving, startx, starty;
-
-/* Recursion level for floor drawing */
-extern int drawFloorRecurse;
+extern int startx, starty;
 
 /* Size of floor, from -n to n */
 extern int floorSize;

diff --git a/scene.c b/scene.c
index c62831e..ffc138d 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -285,13 +285,13 @@ void motion(int x, int y) {
       if ( buttonSelected == GLUT_LEFT_BUTTON ) {\r
         // w: rotate, h: zoom\r
         zoom += (y - starty);\r
-        printf("zoom is %f\n", zoom);\r
       } else if ( buttonSelected == GLUT_MIDDLE_BUTTON ) {\r
         // w: rotate, h: tilt\r
         camAngle += (y - starty);\r
       }\r
 \r
       starty = y;\r
+      printf("zoom is %f, y is %f starty is %f\n", zoom, y, starty);\r
       startx = x;\r
 \r
       break;\r