Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 17:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed magic number to use DEFAULT_NEAR/FAR_CLIP

Browse source
This commit is contained in:
Atlante45 2014-07-25 10:56:44 -07:00
parent c5ad856e65
commit 72a31ec8fc
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -524,8 +524,8 @@ void Application::initializeGL() {
// Before we render anything, let's set up our viewFrustumOffsetCamera with a sufficiently large // 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. // field of view and near and far clip to make it interesting.
//viewFrustumOffsetCamera.setFieldOfView(90.0); //viewFrustumOffsetCamera.setFieldOfView(90.0);
_viewFrustumOffsetCamera.setNearClip(0.1f); _viewFrustumOffsetCamera.setNearClip(DEFAULT_NEAR_CLIP);
_viewFrustumOffsetCamera.setFarClip(500.0f * TREE_SCALE); _viewFrustumOffsetCamera.setFarClip(DEFAULT_FAR_CLIP);
initDisplay(); initDisplay();
qDebug( "Initialized Display."); qDebug( "Initialized Display.");

4
interface/src/Camera.cpp
View file

@ -47,8 +47,8 @@ Camera::Camera() :
_targetPosition(0.0f, 0.0f, 0.0f), _targetPosition(0.0f, 0.0f, 0.0f),
_fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES), _fieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES),
_aspectRatio(16.0f/9.0f), _aspectRatio(16.0f/9.0f),
_nearClip(0.08f), // default _nearClip(DEFAULT_NEAR_CLIP), // default
_farClip(50.0f * TREE_SCALE), // default _farClip(DEFAULT_FAR_CLIP), // default
_upShift(0.0f), _upShift(0.0f),
_distance(0.0f), _distance(0.0f),
_tightness(10.0f), // default _tightness(10.0f), // default

2
libraries/octree/src/OctreeHeadlessViewer.cpp
View file

@ -22,7 +22,7 @@ OctreeHeadlessViewer::OctreeHeadlessViewer() :
_viewFrustum.setFieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES); _viewFrustum.setFieldOfView(DEFAULT_FIELD_OF_VIEW_DEGREES);
_viewFrustum.setAspectRatio(DEFAULT_ASPECT_RATIO); _viewFrustum.setAspectRatio(DEFAULT_ASPECT_RATIO);
_viewFrustum.setNearClip(DEFAULT_NEAR_CLIP); _viewFrustum.setNearClip(DEFAULT_NEAR_CLIP);
_viewFrustum.setFarClip(TREE_SCALE); _viewFrustum.setFarClip(DEFAULT_FAR_CLIP);
} }
OctreeHeadlessViewer::~OctreeHeadlessViewer() { OctreeHeadlessViewer::~OctreeHeadlessViewer() {

4
libraries/octree/src/ViewFrustum.cpp
View file

@ -36,8 +36,8 @@ ViewFrustum::ViewFrustum() :
_height(1.0f), _height(1.0f),
_fieldOfView(0.0), _fieldOfView(0.0),
_aspectRatio(1.0f), _aspectRatio(1.0f),
_nearClip(0.1f), _nearClip(DEFAULT_NEAR_CLIP),
_farClip(500.0f), _farClip(DEFAULT_FAR_CLIP),
_focalLength(0.25f), _focalLength(0.25f),
_keyholeRadius(DEFAULT_KEYHOLE_RADIUS), _keyholeRadius(DEFAULT_KEYHOLE_RADIUS),
_farTopLeft(0,0,0), _farTopLeft(0,0,0),