From e60b0b74191bbccf7c294b8770509da8e27144e4 Mon Sep 17 00:00:00 2001 From: don bright Date: Sun, 3 Mar 2013 19:37:57 -0800 Subject: lol far_far_away should be double not size_t diff --git a/src/Camera.h b/src/Camera.h index d79fc8f..dfc71f8 100644 --- a/src/Camera.h +++ b/src/Camera.h @@ -28,6 +28,7 @@ public: enum ProjectionType { ORTHOGONAL, PERSPECTIVE } projection; Camera() { type = Camera::NONE; + projection = Camera::PERSPECTIVE; } Camera( enum CameraType e ) { @@ -59,7 +60,6 @@ public: } else { assert( "Gimbal cam needs 7 numbers, Vector camera needs 6" ); } - projection = Camera::PERSPECTIVE; } // Vectorcam diff --git a/src/GLView.h b/src/GLView.h index 0b4de7b..165c634 100644 --- a/src/GLView.h +++ b/src/GLView.h @@ -57,7 +57,7 @@ public: Renderer *renderer; Camera cam; - size_t far_far_away; + double far_far_away; size_t width; size_t height; double w_h_ratio; diff --git a/src/rendersettings.h b/src/rendersettings.h index 3d51495..e4fa6c8 100644 --- a/src/rendersettings.h +++ b/src/rendersettings.h @@ -25,8 +25,8 @@ public: void setColors(const std::map &colors); Color4f color(RenderColor idx); - unsigned int openCSGTermLimit, img_width, img_height, far_gl_clip_limit; - + unsigned int openCSGTermLimit, img_width, img_height; + double far_gl_clip_limit; private: RenderSettings(); ~RenderSettings() {} -- cgit v0.10.1