From bba7dcfe5fc1191b981b8bcc776e57c7d7734d62 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Wed, 6 May 2015 23:32:02 -0700 Subject: [PATCH] Try to fix the transform stack issue in 1st person --- interface/src/avatar/MyAvatar.cpp | 6 ++++-- libraries/octree/src/ViewFrustum.h | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp index 667a89a46b..a470867129 100644 --- a/interface/src/avatar/MyAvatar.cpp +++ b/interface/src/avatar/MyAvatar.cpp @@ -1173,8 +1173,10 @@ void MyAvatar::renderBody(ViewFrustum* renderFrustum, RenderArgs::RenderMode ren Camera *camera = Application::getInstance()->getCamera(); const glm::vec3 cameraPos = camera->getPosition(); + + // HACK: comment this block which possibly change the near and break the rendering 5/6/2015 // Only tweak the frustum near far if it's not shadow - if (renderMode != RenderArgs::SHADOW_RENDER_MODE) { + /* if (renderMode != RenderArgs::SHADOW_RENDER_MODE) { // Set near clip distance according to skeleton model dimensions if first person and there is no separate head model. if (shouldRenderHead(cameraPos, renderMode) || !getHead()->getFaceModel().getURL().isEmpty()) { renderFrustum->setNearClip(DEFAULT_NEAR_CLIP); @@ -1184,7 +1186,7 @@ void MyAvatar::renderBody(ViewFrustum* renderFrustum, RenderArgs::RenderMode ren + camera->getOrientation() * glm::vec3(0.0f, 0.0f, -clipDistance) - cameraPos); renderFrustum->setNearClip(clipDistance); } - } + }*/ // Render the body's voxels and head RenderArgs::RenderMode modelRenderMode = renderMode; diff --git a/libraries/octree/src/ViewFrustum.h b/libraries/octree/src/ViewFrustum.h index dfb0dcb308..5b20126293 100644 --- a/libraries/octree/src/ViewFrustum.h +++ b/libraries/octree/src/ViewFrustum.h @@ -30,7 +30,8 @@ const float DEFAULT_KEYHOLE_RADIUS = 3.0f; const float DEFAULT_FIELD_OF_VIEW_DEGREES = 45.0f; const float DEFAULT_ASPECT_RATIO = 16.0f/9.0f; -const float DEFAULT_NEAR_CLIP = 0.08f; +//const float DEFAULT_NEAR_CLIP = 0.08f; +const float DEFAULT_NEAR_CLIP = 0.25f; const float DEFAULT_FAR_CLIP = (float)TREE_SCALE; class ViewFrustum {