From ad773747325e4d80996c6279333211445a6d5f13 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 12 Jun 2015 13:03:33 -0700
Subject: [PATCH 1/3] Fix setting of _renderMode
---
interface/src/Application.cpp | 8 +++-----
libraries/render-utils/src/RenderDeferredTask.cpp | 3 ---
libraries/render/src/render/DrawTask.cpp | 4 ----
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 56fe4188e9..0757e6790f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -958,12 +958,15 @@ void Application::paintGL() {
_applicationOverlay.displayOverlayTexture(&renderArgs);
glPopMatrix();
+ renderArgs._renderMode = RenderArgs::MIRROR_RENDER_MODE;
if (Menu::getInstance()->isOptionChecked(MenuOption::FullscreenMirror)) {
_rearMirrorTools->render(&renderArgs, true, _glWidget->mapFromGlobal(QCursor::pos()));
} else if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) {
renderRearViewMirror(&renderArgs, _mirrorViewRect);
}
+ renderArgs._renderMode = RenderArgs::NORMAL_RENDER_MODE;
+
auto finalFbo = DependencyManager::get<GlowEffect>()->render(&renderArgs);
glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
@@ -3439,7 +3442,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
"Application::displaySide() ... entities...");
RenderArgs::DebugFlags renderDebugFlags = RenderArgs::RENDER_DEBUG_NONE;
- RenderArgs::RenderMode renderMode = RenderArgs::DEFAULT_RENDER_MODE;
if (Menu::getInstance()->isOptionChecked(MenuOption::PhysicsShowHulls)) {
renderDebugFlags = (RenderArgs::DebugFlags) (renderDebugFlags | (int) RenderArgs::RENDER_DEBUG_HULLS);
@@ -3448,10 +3450,6 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
renderDebugFlags =
(RenderArgs::DebugFlags) (renderDebugFlags | (int) RenderArgs::RENDER_DEBUG_SIMULATION_OWNERSHIP);
}
- if (theCamera.getMode() == CAMERA_MODE_MIRROR) {
- renderMode = RenderArgs::MIRROR_RENDER_MODE;
- }
- renderArgs->_renderMode = renderMode;
renderArgs->_debugFlags = renderDebugFlags;
_entities.render(renderArgs);
}
diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp
index 3fd7d05666..96a197335a 100755
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -139,7 +139,6 @@ template <> void render::jobRun(const DrawOpaqueDeferred& job, const SceneContex
batch.setProjectionTransform(projMat);
batch.setViewTransform(viewMat);
- renderContext->args->_renderMode = RenderArgs::NORMAL_RENDER_MODE;
{
GLenum buffers[3];
int bufferCount = 0;
@@ -207,8 +206,6 @@ template <> void render::jobRun(const DrawTransparentDeferred& job, const SceneC
batch.setProjectionTransform(projMat);
batch.setViewTransform(viewMat);
- args->_renderMode = RenderArgs::NORMAL_RENDER_MODE;
-
const float TRANSPARENT_ALPHA_THRESHOLD = 0.0f;
{
diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp
index 53964ac1db..96be8d63b0 100755
--- a/libraries/render/src/render/DrawTask.cpp
+++ b/libraries/render/src/render/DrawTask.cpp
@@ -263,7 +263,6 @@ template <> void render::jobRun(const DrawOpaque& job, const SceneContextPointer
renderContext->_numDrawnOpaqueItems = renderedItems.size();
-
ItemIDsBounds sortedItems;
sortedItems.reserve(culledItems.size());
if (renderContext->_sortOpaque) {
@@ -283,7 +282,6 @@ template <> void render::jobRun(const DrawOpaque& job, const SceneContextPointer
batch.setProjectionTransform(projMat);
batch.setViewTransform(viewMat);
- renderContext->args->_renderMode = RenderArgs::NORMAL_RENDER_MODE;
{
GLenum buffers[3];
int bufferCount = 0;
@@ -350,8 +348,6 @@ template <> void render::jobRun(const DrawTransparent& job, const SceneContextPo
batch.setProjectionTransform(projMat);
batch.setViewTransform(viewMat);
- args->_renderMode = RenderArgs::NORMAL_RENDER_MODE;
-
const float MOSTLY_OPAQUE_THRESHOLD = 0.75f;
const float TRANSPARENT_ALPHA_THRESHOLD = 0.0f;
From 66a65e367511259c699ca6ea382040fccde5c7d1 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 12 Jun 2015 13:04:02 -0700
Subject: [PATCH 2/3] Update model to select clockwise backface culling program
when in mirror mode
---
libraries/render-utils/src/Model.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 8d234cdef5..636bb4bcbe 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -2047,6 +2047,9 @@ void Model::pickPrograms(gpu::Batch& batch, RenderMode mode, bool translucent, f
Locations*& locations) {
RenderKey key(mode, translucent, alphaThreshold, hasLightmap, hasTangents, hasSpecular, isSkinned, isWireframe);
+ if (mode == RenderArgs::MIRROR_RENDER_MODE) {
+ key = RenderKey(key.getRaw() | RenderKey::IS_MIRROR);
+ }
auto pipeline = _renderPipelineLib.find(key.getRaw());
if (pipeline == _renderPipelineLib.end()) {
qDebug() << "No good, couldn't find a pipeline from the key ?" << key.getRaw();
From 81d003bdb8e34ca5709bb7e326f7169de55c1e8a Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 12 Jun 2015 13:05:10 -0700
Subject: [PATCH 3/3] Add post-scale to view matrix when in mirror mode
---
libraries/render-utils/src/RenderDeferredTask.cpp | 6 ++++++
libraries/render/src/render/DrawTask.cpp | 12 ++++++++++++
2 files changed, 18 insertions(+)
diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp
index 96a197335a..d9dda279e0 100755
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -136,6 +136,9 @@ template <> void render::jobRun(const DrawOpaqueDeferred& job, const SceneContex
Transform viewMat;
args->_viewFrustum->evalProjectionMatrix(projMat);
args->_viewFrustum->evalViewTransform(viewMat);
+ if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+ viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f));
+ }
batch.setProjectionTransform(projMat);
batch.setViewTransform(viewMat);
@@ -203,6 +206,9 @@ template <> void render::jobRun(const DrawTransparentDeferred& job, const SceneC
Transform viewMat;
args->_viewFrustum->evalProjectionMatrix(projMat);
args->_viewFrustum->evalViewTransform(viewMat);
+ if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+ viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f));
+ }
batch.setProjectionTransform(projMat);
batch.setViewTransform(viewMat);
diff --git a/libraries/render/src/render/DrawTask.cpp b/libraries/render/src/render/DrawTask.cpp
index 96be8d63b0..bb4ba00cee 100755
--- a/libraries/render/src/render/DrawTask.cpp
+++ b/libraries/render/src/render/DrawTask.cpp
@@ -279,6 +279,9 @@ template <> void render::jobRun(const DrawOpaque& job, const SceneContextPointer
Transform viewMat;
args->_viewFrustum->evalProjectionMatrix(projMat);
args->_viewFrustum->evalViewTransform(viewMat);
+ if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+ viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f));
+ }
batch.setProjectionTransform(projMat);
batch.setViewTransform(viewMat);
@@ -345,6 +348,9 @@ template <> void render::jobRun(const DrawTransparent& job, const SceneContextPo
Transform viewMat;
args->_viewFrustum->evalProjectionMatrix(projMat);
args->_viewFrustum->evalViewTransform(viewMat);
+ if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+ viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f));
+ }
batch.setProjectionTransform(projMat);
batch.setViewTransform(viewMat);
@@ -430,6 +436,9 @@ template <> void render::jobRun(const DrawBackground& job, const SceneContextPoi
Transform viewMat;
args->_viewFrustum->evalProjectionMatrix(projMat);
args->_viewFrustum->evalViewTransform(viewMat);
+ if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+ viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f));
+ }
batch.setProjectionTransform(projMat);
batch.setViewTransform(viewMat);
@@ -471,6 +480,9 @@ template <> void render::jobRun(const DrawPostLayered& job, const SceneContextPo
Transform viewMat;
args->_viewFrustum->evalProjectionMatrix(projMat);
args->_viewFrustum->evalViewTransform(viewMat);
+ if (args->_renderMode == RenderArgs::MIRROR_RENDER_MODE) {
+ viewMat.postScale(glm::vec3(-1.0f, 1.0f, 1.0f));
+ }
batch.setProjectionTransform(projMat);
batch.setViewTransform(viewMat);