diff options
| author | Don Bright <hugh.m.bright@gmail.com> | 2012-01-29 14:33:52 (GMT) |
|---|---|---|
| committer | Don Bright <hugh.m.bright@gmail.com> | 2012-01-29 14:33:52 (GMT) |
| commit | fcd0629a12123b15cfce6ee3d444ef938e556ad6 (patch) | |
| tree | 9c344cb5520d26de206a2b6022da6d9329172014 | |
| parent | 85fbe5073e12a45a3ca1aaf705e1edd0272dd9c0 (diff) | |
| parent | e6222d95205887124f670db65d8f9e4930af602b (diff) | |
Merge branch 'master' of github.com:openscad/openscad
| -rw-r--r-- | src/glview.cc | 3 | ||||
| -rw-r--r-- | src/system-gl.h | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/glview.cc b/src/glview.cc index 499e555..0f9ec5b 100644 --- a/src/glview.cc +++ b/src/glview.cc @@ -371,6 +371,7 @@ void GLView::setupOrtho(double distance, bool offset) glOrtho(-w_h_ratio*l, +w_h_ratio*l, -(1/w_h_ratio)*l, +(1/w_h_ratio)*l, -FAR_FAR_AWAY, +FAR_FAR_AWAY); + gluLookAt(0.0, -viewer_distance, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0); } void GLView::paintGL() @@ -450,8 +451,6 @@ void GLView::paintGL() setupOrtho(1000,true); - gluLookAt(0.0, -1000, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0); - glMatrixMode(GL_MODELVIEW); glLoadIdentity(); glRotated(object_rot_x, 1.0, 0.0, 0.0); diff --git a/src/system-gl.h b/src/system-gl.h index 76b49e7..0377b72 100644 --- a/src/system-gl.h +++ b/src/system-gl.h @@ -4,9 +4,12 @@ #include <GL/glew.h> #ifdef __APPLE__ -#include <OpenGL/OpenGL.h> + #include <OpenGL/OpenGL.h> #else -#include <GL/gl.h> + #include <GL/gl.h> + #ifdef _WIN32 + #include <windows.h> // For the CALLBACK macro + #endif #endif #endif |