adding custom shader for flipped normals

examples/hydraPolyLinePaint.js

@@ -28,7 +28,7 @@ var DRAWING_DEPTH = 2;
 var LINE_DIMENSIONS = 100;
 
 
-var DISTANCE_FROM_HAND = 5;
+var DISTANCE_FROM_HAND = 2;
 var MIN_POINT_DISTANCE = 0.01;
 
 var MIN_BRUSH_RADIUS = 0.04;

libraries/entities-renderer/CMakeLists.txt

@@ -1,5 +1,7 @@
 set(TARGET_NAME entities-renderer)
 
+AUTOSCRIBE_SHADER_LIB(gpu model render)
+
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Widgets OpenGL Network Script)
 

libraries/entities-renderer/src/DeferredBufferWrite.slh

@@ -0,0 +1,54 @@
+<!
+//  DeferredBufferWrite.slh
+//  libraries/render-utils/src
+//
+//  Created by Sam Gateau on 1/12/15.
+//  Copyright 2013 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
+!>
+<@if not DEFERRED_BUFFER_WRITE_SLH@>
+<@def DEFERRED_BUFFER_WRITE_SLH@>
+
+// the glow intensity
+uniform float glowIntensity;
+
+// the alpha threshold
+uniform float alphaThreshold;
+
+float evalOpaqueFinalAlpha(float alpha, float mapAlpha) {
+    return mix(alpha * glowIntensity, 1.0 - alpha * glowIntensity, step(mapAlpha, alphaThreshold));
+}
+
+void packDeferredFragment(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess) {
+    if (alpha != glowIntensity) {
+        discard;
+    }
+    gl_FragData[0] = vec4(diffuse.rgb, alpha);
+    gl_FragData[1] = vec4(normal, 0.0) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
+    gl_FragData[2] = vec4(specular, shininess / 128.0);
+}
+
+void packDeferredFragmentLightmap(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess, vec3 emissive) {
+    if (alpha != glowIntensity) {
+        discard;
+    }
+
+    gl_FragData[0] = vec4(diffuse.rgb, alpha);
+    //gl_FragData[1] = vec4(normal, 0.0) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
+    gl_FragData[1] = vec4(normal, 0.0) * 0.5 + vec4(0.5, 0.5, 0.5, 0.5);
+    gl_FragData[2] = vec4(emissive, shininess / 128.0);
+}
+
+void packDeferredFragmentTranslucent(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess) {
+    if (alpha <= alphaThreshold) {
+        discard;
+    } 
+
+    gl_FragData[0] = vec4(diffuse.rgb, alpha);
+  //  gl_FragData[1] = vec4(normal, 0.0) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
+  //  gl_FragData[2] = vec4(specular, shininess / 128.0);
+}
+
+<@endif@>

libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp

@@ -19,6 +19,10 @@
 
 #include "RenderablePolyLineEntityItem.h"
 
+#include "paintStroke_vert.h"
+#include "paintStroke_frag.h"
+
+
 
 EntityItemPointer RenderablePolyLineEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
     return EntityItemPointer(new RenderablePolyLineEntityItem(entityID, properties));
@@ -41,8 +45,8 @@ void RenderablePolyLineEntityItem::createPipeline() {
     _format->setAttribute(gpu::Stream::NORMAL, 0, gpu::Element(gpu::VEC3, gpu::FLOAT, gpu::XYZ), NORMAL_OFFSET);
     _format->setAttribute(gpu::Stream::COLOR, 0, gpu::Element(gpu::VEC4, gpu::UINT8, gpu::RGBA), COLOR_OFFSET);
     
-    auto VS = DependencyManager::get<DeferredLightingEffect>()->getSimpleVertexShader();
-    auto PS = DependencyManager::get<DeferredLightingEffect>()->getSimplePixelShader();
+    auto VS = gpu::ShaderPointer(gpu::Shader::createVertex(std::string(paintStroke_vert)));
+    auto PS = gpu::ShaderPointer(gpu::Shader::createPixel(std::string(paintStroke_frag)));
     gpu::ShaderPointer program = gpu::ShaderPointer(gpu::Shader::createProgram(VS, PS));
     
     gpu::Shader::BindingSet slotBindings;

libraries/entities-renderer/src/paintStroke.slf

@@ -0,0 +1,29 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  paintStroke.frag
+//  fragment shader
+//
+//  Created by Andrzej Kapolka on 9/15/14.
+//  Copyright 2014 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 DeferredBufferWrite.slh@>
+
+// the interpolated normal
+varying vec4 interpolatedNormal;
+
+
+void main(void) {
+    vec3 color = vec3(0.9, 0.2, 0.9);
+    packDeferredFragment(
+        normalize(interpolatedNormal.xyz), 
+        glowIntensity,
+        gl_Color.rgb,
+        gl_FrontMaterial.specular.rgb,
+        gl_FrontMaterial.shininess);
+}

libraries/entities-renderer/src/paintStroke.slv

@@ -0,0 +1,35 @@
+<@include gpu/Config.slh@>
+<$VERSION_HEADER$>
+//  Generated on <$_SCRIBE_DATE$>
+//
+//  paintStroke.vert
+//  vertex shader
+//
+//  Created by Andrzej Kapolka on 9/15/14.
+//  Copyright 2014 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()$>
+
+// the interpolated normal
+varying vec4 interpolatedNormal;
+
+void main(void) {
+    gl_TexCoord[0] = gl_MultiTexCoord0;
+    
+    // pass along the diffuse color
+    gl_FrontColor = gl_Color;
+    
+    // standard transform
+    TransformCamera cam = getTransformCamera();
+    TransformObject obj = getTransformObject();
+    <$transformModelToClipPos(cam, obj, gl_Vertex, gl_Position)$>
+    <$transformModelToEyeDir(cam, obj, gl_Normal, interpolatedNormal.xyz)$>
+
+    interpolatedNormal = vec4(normalize(interpolatedNormal.xyz), 0.0);
+}

libraries/entities/src/PolyLineEntityItem.cpp

@@ -126,6 +126,8 @@ bool PolyLineEntityItem::setNormals(const QVector<glm::vec3>& normals) {
     if (_points.size () < 2 || _strokeWidths.size() < 2) {
         return false;
     }
+    
+//    int minArraySize = glm::min(_normals.size(), _points.size())
     _vertices.clear();
     //Go through and create vertices for triangle strip based on normalsa
     if (_normals.size() != _points.size()) {