fdsafd

ahmedtd · May 25, 2012 · b0e7f14 · b0e7f14
1 parent 60fa848
commit b0e7f14
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/assignment-2/scan-convert.cpp b/assignment-2/scan-convert.cpp
@@ -452,8 +452,8 @@ void reshapeCallback(int new_width, int new_height)
         clip_tl.x(0);
         clip_tl.y(window_height);
 
-	clip_br.x(window_width);
-	clip_br.y(0);
+        clip_br.x(window_width);
+        clip_br.y(0);
     }
 
     // Update the projection matrix to account for the window shape

diff --git a/assignment-5/raytrace.cpp b/assignment-5/raytrace.cpp
@@ -457,9 +457,22 @@ void keyboardCallback(unsigned char key, int x, int y)
 
 void reshapeCallback(int new_width, int new_height)
 {
+    double pixels_per_meter = 20;
+
     renderbuffer.reshape(new_width, new_height);
 
     glViewport(0, 0, new_width, new_height);
+
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glOrtho(0.0,
+            ((double)new_width)/pixels_per_meter,
+            ((double)new_width)/pixels_per_meter,
+            0.0,
+            -1.0,
+            1.0);
+
+    glMatrixMode(GL_MODELVIEW);
 }
 
 int main(int argc, char **argv)