From 72a31ec8fccea098cd2ccb1a83c09142c5ab2352 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 25 Jul 2014 10:56:44 -0700 Subject: [PATCH] Removed magic number to use DEFAULT_NEAR/FAR_CLIP --- interface/src/Application.cpp | 4 ++-- interface/src/Camera.cpp | 4 ++-- libraries/octree/src/OctreeHeadlessViewer.cpp | 2 +- libraries/octree/src/ViewFrustum.cpp | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 6aa6fcd19e..c450c92759 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -524,8 +524,8 @@ void Application::initializeGL() { // Before we render anything, let's set up our viewFrustumOffsetCamera with a sufficiently large // field of view and near and far clip to make it interesting. //viewFrustumOffsetCamera.setFieldOfView(90.0); - _viewFrustumOffsetCamera.setNearClip(0.1f); - _viewFrustumOffsetCamera.setFarClip(500.0f * TREE_SCALE); + _viewFrustumOffsetCamera.setNearClip(DEFAULT_NEAR_CLIP); + _viewFrustumOffsetCamera.setFarClip(DEFAULT_FAR_CLIP); initDisplay(); qDebug( "Initialized Display."); diff --git a/interface/src/Camera.cpp b/interface/src/Camera.cpp index 4490b60fc9..4a924b4ec3 100644 --- a/interface/src/Camera.cpp +++ b/interface/src/Camera.cpp @@ -47,8 +47,8 @@ Camera::Camera() : _targetPosition(0.0f, 0.0f, 0.0f), _fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES), _aspectRatio(16.0f/9.0f), - _nearClip(0.08f), // default - _farClip(50.0f * TREE_SCALE), // default + _nearClip(DEFAULT_NEAR_CLIP), // default + _farClip(DEFAULT_FAR_CLIP), // default _upShift(0.0f), _distance(0.0f), _tightness(10.0f), // default diff --git a/libraries/octree/src/OctreeHeadlessViewer.cpp b/libraries/octree/src/OctreeHeadlessViewer.cpp index 2372d85b0e..2f21c7a899 100644 --- a/libraries/octree/src/OctreeHeadlessViewer.cpp +++ b/libraries/octree/src/OctreeHeadlessViewer.cpp @@ -22,7 +22,7 @@ OctreeHeadlessViewer::OctreeHeadlessViewer() : _viewFrustum.setFieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES); _viewFrustum.setAspectRatio(DEFAULT_ASPECT_RATIO); _viewFrustum.setNearClip(DEFAULT_NEAR_CLIP); - _viewFrustum.setFarClip(TREE_SCALE); + _viewFrustum.setFarClip(DEFAULT_FAR_CLIP); } OctreeHeadlessViewer::~OctreeHeadlessViewer() { diff --git a/libraries/octree/src/ViewFrustum.cpp b/libraries/octree/src/ViewFrustum.cpp index c06cb2ea88..9552129e29 100644 --- a/libraries/octree/src/ViewFrustum.cpp +++ b/libraries/octree/src/ViewFrustum.cpp @@ -36,8 +36,8 @@ ViewFrustum::ViewFrustum() : _height(1.0f), _fieldOfView(0.0), _aspectRatio(1.0f), - _nearClip(0.1f), - _farClip(500.0f), + _nearClip(DEFAULT_NEAR_CLIP), + _farClip(DEFAULT_FAR_CLIP), _focalLength(0.25f), _keyholeRadius(DEFAULT_KEYHOLE_RADIUS), _farTopLeft(0,0,0),