From b8db0ff2d7736b667c3d4804e22ec8bc4d4e0dc9 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Fri, 3 Apr 2015 17:05:08 -0700 Subject: [PATCH] getting ready for pr for a few syntax issues --- .../entities-renderer/src/RenderableModelEntityItem.cpp | 3 +-- libraries/render-utils/src/Model.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp index 5618d66114..bf5ce62ff8 100644 --- a/libraries/entities-renderer/src/RenderableModelEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableModelEntityItem.cpp @@ -169,8 +169,7 @@ void RenderableModelEntityItem::render(RenderArgs* args) { PerformanceTimer perfTimer("model->render"); // filter out if not needed to render if (args && (args->_renderMode == RenderArgs::SHADOW_RENDER_MODE)) { - // if (movingOrAnimating) { - { + if (movingOrAnimating) { _model->renderInScene(alpha, args); } } else { diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 0a09f65e9f..ab32c89bf5 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -710,13 +710,18 @@ bool Model::renderCore(float alpha, RenderMode mode, RenderArgs* args) { } GLBATCH(glEnable)(GL_DEPTH_TEST); GLBATCH(glDepthFunc)(GL_LEQUAL); + if (mode == SHADOW_RENDER_MODE) { + GLBATCH(glDepthFunc)(GL_ALWAYS); + } GLBATCH(glDepthMask)(true); // render opaque meshes with alpha testing GLBATCH(glDisable)(GL_BLEND); GLBATCH(glEnable)(GL_ALPHA_TEST); - + if (mode == SHADOW_RENDER_MODE) { + GLBATCH(glDisable)(GL_ALPHA_TEST); + } if (mode == SHADOW_RENDER_MODE) { GLBATCH(glAlphaFunc)(GL_EQUAL, 0.0f); }