Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 15:38:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1

Browse source
This commit is contained in:
Seth Alves 2015-05-07 09:54:09 -07:00
commit ddec6d5207
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/avatar/MyAvatar.cpp
View file

@ -1173,8 +1173,10 @@ void MyAvatar::renderBody(ViewFrustum* renderFrustum, RenderArgs::RenderMode ren
Camera *camera = Application::getInstance()->getCamera(); Camera *camera = Application::getInstance()->getCamera();
const glm::vec3 cameraPos = camera->getPosition(); 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 // 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. // 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()) { if (shouldRenderHead(cameraPos, renderMode) || !getHead()->getFaceModel().getURL().isEmpty()) {
renderFrustum->setNearClip(DEFAULT_NEAR_CLIP); 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); + camera->getOrientation() * glm::vec3(0.0f, 0.0f, -clipDistance) - cameraPos);
renderFrustum->setNearClip(clipDistance); renderFrustum->setNearClip(clipDistance);
} }
} }*/
// Render the body's voxels and head // Render the body's voxels and head
RenderArgs::RenderMode modelRenderMode = renderMode; RenderArgs::RenderMode modelRenderMode = renderMode;

3
libraries/octree/src/ViewFrustum.h
View file

@ -30,7 +30,8 @@
const float DEFAULT_KEYHOLE_RADIUS = 3.0f; const float DEFAULT_KEYHOLE_RADIUS = 3.0f;
const float DEFAULT_FIELD_OF_VIEW_DEGREES = 45.0f; const float DEFAULT_FIELD_OF_VIEW_DEGREES = 45.0f;
const float DEFAULT_ASPECT_RATIO = 16.0f/9.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; const float DEFAULT_FAR_CLIP = (float)TREE_SCALE;
class ViewFrustum { class ViewFrustum {