Adding standard vertex and pixel shaders for drawing texture in applicationOverlay

interface/src/ui/ApplicationOverlay.cpp

@@ -36,6 +36,9 @@
 #include "Util.h"
 #include "ui/Stats.h"
 
+#include "../../libraries/render-utils/standardTransformPNTC_vert.h"
+#include "../../libraries/render-utils/standardDrawTexture_frag.h"
+
 // Used to animate the magnification windows
 const float MAG_SPEED = 0.08f;
 
@@ -278,6 +281,24 @@ void ApplicationOverlay::renderOverlay(RenderArgs* renderArgs) {
 //    glDisable(GL_TEXTURE_2D);
 //}
 
+gpu::PipelinePointer ApplicationOverlay::getDrawPipeline() {
+    if (!_standardDrawPipeline) {
+        auto vs = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(standardTransformPNTC_vert)));
+        auto ps = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(standardDrawTexture_frag)));
+        auto program = gpu::ShaderPointer(gpu::Shader::createProgram(vs, ps));
+        gpu::Shader::makeProgram((*program));
+        
+        auto state = gpu::StatePointer(new gpu::State());
+
+        // enable decal blend
+        state->setBlendFunction(true, gpu::State::SRC_ALPHA, gpu::State::BLEND_OP_ADD, gpu::State::INV_SRC_ALPHA);
+        
+        _standardDrawPipeline.reset(gpu::Pipeline::create(program, state));
+    }
+
+    return _standardDrawPipeline;
+}
+
 // Draws the FBO texture for the screen
 void ApplicationOverlay::displayOverlayTexture(RenderArgs* renderArgs) {
 
@@ -290,11 +311,12 @@ void ApplicationOverlay::displayOverlayTexture(RenderArgs* renderArgs) {
             PathUtils::resourcesPath() + "images/sixense-reticle.png");
     }
 
-    /*
-    FIXME - doesn't work
+    
+    //FIXME - doesn't work
     renderArgs->_context->syncCache();
     gpu::Batch batch;
-    DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(batch, true);
+    //DependencyManager::get<DeferredLightingEffect>()->bindSimpleProgram(batch, true);
+    batch.setPipeline(getDrawPipeline());
     batch.setModelTransform(Transform());
     batch.setProjectionTransform(mat4());
     batch.setViewTransform(Transform());
@@ -302,7 +324,7 @@ void ApplicationOverlay::displayOverlayTexture(RenderArgs* renderArgs) {
     DependencyManager::get<GeometryCache>()->renderUnitQuad(batch, vec4(vec3(1), _alpha));
     renderArgs->_context->render(batch);
     return;
-    */
+
 
     
     glDisable(GL_DEPTH_TEST);

interface/src/ui/ApplicationOverlay.h

@@ -143,6 +143,10 @@ private:
     glm::vec3 _previousMagnifierTopLeft;
     glm::vec3 _previousMagnifierTopRight;
 
+    gpu::PipelinePointer _standardDrawPipeline;
+
+    gpu::PipelinePointer getDrawPipeline();
+
 };
 
 #endif // hifi_ApplicationOverlay_h

libraries/render-utils/src/standardDrawTexture.slf

@@ -0,0 +1,24 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//  standardDrawTexture.frag
+//  fragment shader
+//
+//  Created by Sam Gateau on 6/10/15.
+//  Copyright 2015 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+// the texture
+uniform sampler2D colorMap;
+
+varying vec2 varTexcoord;
+varying vec4 varColor;
+
+
+void main(void) {
+    vec4 color = texture2D(colorMap, varTexcoord);
+    gl_FragColor = color * varColor;
+}

libraries/render-utils/src/standardTransformPNTC.slv

@@ -0,0 +1,33 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  standardTransformPNTC.slv
+//  vertex shader
+//
+//  Created by Sam Gateau on 6/10/2015.
+//  Copyright 2015 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+<@include gpu/Transform.slh@>
+
+<$declareStandardTransform()$>
+
+varying vec3 varNormal;
+varying vec2 varTexcoord;
+varying vec4 varColor;
+
+void main(void) {
+    varTexcoord = gl_MultiTexCoord0.xy;
+    varColor = gl_Color;
+    
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToClipPos(cam, obj, gl_Vertex, gl_Position)$>
+    <$transformModelToEyeDir(cam, obj, gl_Normal, varNormal)$>
+    varNormal = normalize(varNormal);
+}