From 1b501487fd9eb019cd2894aeb8caba9c49ab623e Mon Sep 17 00:00:00 2001 From: samcake Date: Fri, 24 Feb 2017 16:03:28 -0800 Subject: [PATCH] simple shader checks --- libraries/render-utils/src/overlay3D_model.slf | 6 ++---- scripts/system/pal.js | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/render-utils/src/overlay3D_model.slf b/libraries/render-utils/src/overlay3D_model.slf index 979a6f2201..75198cdfe4 100644 --- a/libraries/render-utils/src/overlay3D_model.slf +++ b/libraries/render-utils/src/overlay3D_model.slf @@ -112,10 +112,8 @@ void main(void) { opacity); color.rgb += emissive; - // color.rgb = vec3(0.5, 0.5, 1.0); - // Apply standard tone mapping - _fragColor = vec4(pow(color.xyz, vec3(1.0 / 2.2)), 1.0); - //_fragColor = vec4(pow(color.xyz, vec3(1.0 / 2.2)), color.w); + + _fragColor = vec4(pow(color.xyz, vec3(1.0 / 2.2)), color.w); /*_fragColor = vec4(evalGlobalLightingAlphaBlended( cam._viewInverse, diff --git a/scripts/system/pal.js b/scripts/system/pal.js index 36ecc1f084..962923eeef 100644 --- a/scripts/system/pal.js +++ b/scripts/system/pal.js @@ -175,7 +175,8 @@ function HighlightedEntity(id, entityProperties) { }, lineWidth: 1.0, ignoreRayIntersection: true, - drawInFront: false // Arguable. For now, let's not distract with mysterious wires around the scene. + //drawInFront: false // Arguable. For now, let's not distract with mysterious wires around the scene. + drawInFront: true // Arguable. For now, let's not distract with mysterious wires around the scene. }); HighlightedEntity.overlays.push(this); }