From 27a1a55275ce7195b34e3531ac1e0ec075d5088b Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Fri, 26 Jun 2015 16:16:27 -0700 Subject: [PATCH] Don't cull text background/Text is emissive --- .../src/RenderableTextEntityItem.cpp | 3 ++- libraries/render-utils/src/sdf_text3D.slf | 14 ++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp index 245cf00a3d..7603187e94 100644 --- a/libraries/entities-renderer/src/RenderableTextEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableTextEntityItem.cpp @@ -56,7 +56,8 @@ void RenderableTextEntityItem::render(RenderArgs* args) { batch.setModelTransform(transformToTopLeft); } - DependencyManager::get()->renderQuad(batch, minCorner, maxCorner, backgroundColor); + DependencyManager::get()->bindSimpleProgram(batch, false, false); + DependencyManager::get()->renderQuad(batch, minCorner, maxCorner, backgroundColor); float scale = _lineHeight / _textRenderer->getFontSize(); transformToTopLeft.setScale(scale); // Scale to have the correct line height diff --git a/libraries/render-utils/src/sdf_text3D.slf b/libraries/render-utils/src/sdf_text3D.slf index 361f8454ab..e22eba8ff5 100644 --- a/libraries/render-utils/src/sdf_text3D.slf +++ b/libraries/render-utils/src/sdf_text3D.slf @@ -10,6 +10,8 @@ // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +<@include DeferredBufferWrite.slh@> + uniform sampler2D Font; uniform bool Outline; uniform vec4 Color; @@ -44,9 +46,13 @@ void main() { if (a < 0.01) { discard; } - + // final color - gl_FragData[0] = vec4(Color.rgb, Color.a * a); - gl_FragData[1] = vec4(interpolatedNormal.xyz, 0.0) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0); - gl_FragData[2] = vec4(0.0); + packDeferredFragmentLightmap( + normalize(interpolatedNormal.xyz), + glowIntensity * texel.a, + gl_Color.rgb, + gl_FrontMaterial.specular.rgb, + gl_FrontMaterial.shininess, + Color.rgb); } \ No newline at end of file