From e75a6feafe3fd73fe599e47bdaf814399a70d547 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1@gmail.com>
Date: Mon, 20 Jul 2015 11:58:26 -0700
Subject: [PATCH] can toggle hit effect on and off from a script

---
 interface/src/Application.cpp                         | 1 +
 libraries/render-utils/src/RenderDeferredTask.cpp     | 7 +++++++
 libraries/render-utils/src/RenderDeferredTask.h       | 4 ++++
 libraries/render-utils/src/hit_effect.slf             | 9 +++++----
 libraries/render/src/render/Engine.h                  | 1 +
 libraries/script-engine/src/SceneScriptingInterface.h | 5 +++++
 6 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 342580e03c..0fb4bbcc74 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3570,6 +3570,7 @@ void Application::displaySide(RenderArgs* renderArgs, Camera& theCamera, bool se
         renderContext._maxDrawnOverlay3DItems = sceneInterface->getEngineMaxDrawnOverlay3DItems();
 
         renderContext._drawItemStatus = sceneInterface->doEngineDisplayItemStatus();
+        renderContext._drawHitEffect = sceneInterface->doEngineDisplayHitEffect();
 
         renderArgs->_shouldRender = LODManager::shouldRender;
 
diff --git a/libraries/render-utils/src/RenderDeferredTask.cpp b/libraries/render-utils/src/RenderDeferredTask.cpp
index 95e0344313..b9767105c3 100755
--- a/libraries/render-utils/src/RenderDeferredTask.cpp
+++ b/libraries/render-utils/src/RenderDeferredTask.cpp
@@ -78,6 +78,9 @@ RenderDeferredTask::RenderDeferredTask() : Task() {
 
     _jobs.push_back(Job(new DrawOverlay3D::JobModel("DrawOverlay3D")));
     _jobs.push_back(Job(new HitEffect::JobModel("HitEffect")));
+    _jobs.back().setEnabled(false);
+    _drawHitEffectJobIndex = _jobs.size() -1;
+
     _jobs.push_back(Job(new ResetGLState::JobModel()));
     
 
@@ -106,6 +109,10 @@ void RenderDeferredTask::run(const SceneContextPointer& sceneContext, const Rend
 
     // Make sure we turn the displayItemStatus on/off
     setDrawItemStatus(renderContext->_drawItemStatus);
+    
+    //Make sure we display hit effect on screen, as desired from a script
+    setDrawHitEffect(renderContext->_drawHitEffect);
+    
 
     renderContext->args->_context->syncCache();
 
diff --git a/libraries/render-utils/src/RenderDeferredTask.h b/libraries/render-utils/src/RenderDeferredTask.h
index 4040606c62..b3957fe7dc 100755
--- a/libraries/render-utils/src/RenderDeferredTask.h
+++ b/libraries/render-utils/src/RenderDeferredTask.h
@@ -71,9 +71,13 @@ public:
     render::Jobs _jobs;
 
     int _drawStatusJobIndex = -1;
+    int _drawHitEffectJobIndex = -1;
 
     void setDrawItemStatus(bool draw) { if (_drawStatusJobIndex >= 0) { _jobs[_drawStatusJobIndex].setEnabled(draw); } }
     bool doDrawItemStatus() const { if (_drawStatusJobIndex >= 0) { return _jobs[_drawStatusJobIndex].isEnabled(); } else { return false; } }
+    
+    void setDrawHitEffect(bool draw) { if (_drawHitEffectJobIndex >= 0) { _jobs[_drawHitEffectJobIndex].setEnabled(draw); } }
+    bool doDrawHitEffect() const { if (_drawHitEffectJobIndex >=0) { return _jobs[_drawHitEffectJobIndex].isEnabled(); } else { return false; } }
 
     virtual void run(const render::SceneContextPointer& sceneContext, const render::RenderContextPointer& renderContext);
 
diff --git a/libraries/render-utils/src/hit_effect.slf b/libraries/render-utils/src/hit_effect.slf
index cd94de3620..5a5d85b21f 100644
--- a/libraries/render-utils/src/hit_effect.slf
+++ b/libraries/render-utils/src/hit_effect.slf
@@ -22,8 +22,9 @@ void main(void) {
   <$transformCameraViewport(cam, myViewport)$>
   vec2 center = vec2(myViewport.z/2.0, myViewport.w/2.0);
   float distFromCenter = distance(center, gl_FragCoord.xy);
-  //normalize
-  distFromCenter = distFromCenter/myViewport.z;
-  float alpha = mix(0.0, 1.0, distFromCenter);
-  gl_FragColor = vec4(0.7, 0.0, 0.0, alpha);
+  //normalize distance from center based on average of screen width and height
+  float normalizationFactor = (myViewport.z + myViewport.w)/2.0;
+  distFromCenter = distFromCenter/normalizationFactor;
+  float alpha = mix(0.0, 1.0, pow(distFromCenter, 1.5));
+  gl_FragColor = vec4(1.0, 0.0, 0.0, alpha);
 }
\ No newline at end of file
diff --git a/libraries/render/src/render/Engine.h b/libraries/render/src/render/Engine.h
index 1c600b13d6..e12d37118c 100644
--- a/libraries/render/src/render/Engine.h
+++ b/libraries/render/src/render/Engine.h
@@ -50,6 +50,7 @@ public:
     int _maxDrawnOverlay3DItems = -1;
 
     bool _drawItemStatus = false;
+    bool _drawHitEffect = false;
 
     RenderContext() {}
 };
diff --git a/libraries/script-engine/src/SceneScriptingInterface.h b/libraries/script-engine/src/SceneScriptingInterface.h
index 674b452528..a3ce2a7300 100644
--- a/libraries/script-engine/src/SceneScriptingInterface.h
+++ b/libraries/script-engine/src/SceneScriptingInterface.h
@@ -109,6 +109,9 @@ public:
 
     Q_INVOKABLE void setEngineDisplayItemStatus(bool display) { _drawItemStatus = display; }
     Q_INVOKABLE bool doEngineDisplayItemStatus() { return _drawItemStatus; }
+    
+    Q_INVOKABLE void setEngineDisplayHitEffect(bool display) { _drawHitEffect = display; }
+    Q_INVOKABLE bool doEngineDisplayHitEffect() { return _drawHitEffect; }
 
 signals:
     void shouldRenderAvatarsChanged(bool shouldRenderAvatars);
@@ -141,6 +144,8 @@ protected:
     int _maxDrawnOverlay3DItems = -1;
 
     bool _drawItemStatus = false;
+    
+    bool _drawHitEffect = false;
 
 };