From 563cd6f7e369ee29d57979f0ee80aad60efde290 Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Fri, 5 Dec 2014 10:10:21 -0800 Subject: [PATCH 1/2] watch your language... --- libraries/fbx/src/FBXReader.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/fbx/src/FBXReader.cpp b/libraries/fbx/src/FBXReader.cpp index a750ab53e2..f8451637a8 100644 --- a/libraries/fbx/src/FBXReader.cpp +++ b/libraries/fbx/src/FBXReader.cpp @@ -1520,7 +1520,7 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping, } } else { std::string whatisthat = subobject.name; - if (whatisthat == "WTF") { + if (whatisthat == "Shape") { } } #endif From 01c13cd6f114fcc36b1e03c70c24d077142c5e1e Mon Sep 17 00:00:00 2001 From: Sam Gateau Date: Tue, 9 Dec 2014 17:58:17 -0800 Subject: [PATCH 2/2] Fix the broken shadows by simply calling the needed setViewTransform which is used for rendering the ENitites and avatars --- interface/src/Application.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 3824185f52..ba2f806c29 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2874,8 +2874,13 @@ void Application::updateShadowMap() { // store view matrix without translation, which we'll use for precision-sensitive objects updateUntranslatedViewMatrix(); - // TODO: assign an equivalent viewTransform object to the application to match the current path which uses glMatrixStack - // setViewTransform(viewTransform); + + // Equivalent to what is happening with _untranslatedViewMatrix and the _viewMatrixTranslation + // the viewTransofmr object is updatded with the correct values and saved, + // this is what is used for rendering the Entities and avatars + Transform viewTransform; + viewTransform.setRotation(rotation); + setViewTransform(viewTransform); glEnable(GL_POLYGON_OFFSET_FILL); glPolygonOffset(1.1f, 4.0f); // magic numbers courtesy http://www.eecs.berkeley.edu/~ravir/6160/papers/shadowmaps.ppt