Cleaning up the pipeline and checking that it is working for all cases

interface/src/Application.cpp

@@ -315,7 +315,7 @@ static QTimer pingTimer;
 static bool DISABLE_WATCHDOG = true;
 #else
 static const QString DISABLE_WATCHDOG_FLAG{ "HIFI_DISABLE_WATCHDOG" };
-static bool DISABLE_WATCHDOG = nsightActive() || QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG);
+static bool DISABLE_WATCHDOG = true || nsightActive() || QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG);
 #endif
 
 #if defined(USE_GLES)

libraries/render-utils/src/model.slv

@@ -14,12 +14,13 @@
 <@include gpu/Color.slh@>
 <@include gpu/Transform.slh@>
 <@include graphics/MaterialTextures.slh@>
-<@include render-utils/ShaderConstants.h@>
 
 <$declareStandardTransform()$>
 
 <$declareMaterialTexMapArrayBuffer()$>
 
+<@include render-utils/ShaderConstants.h@>
+
 layout(location=RENDER_UTILS_ATTR_POSITION_WS) out vec4 _positionWS;
 layout(location=RENDER_UTILS_ATTR_POSITION_ES) out vec4 _positionES;
 layout(location=RENDER_UTILS_ATTR_TEXCOORD01) out vec4 _texCoord01;

libraries/render-utils/src/model_normal_map.slv

@@ -20,7 +20,6 @@
 
 <$declareMaterialTexMapArrayBuffer()$>
 
-
 layout(location=RENDER_UTILS_ATTR_POSITION_ES) out vec4 _positionES;
 layout(location=RENDER_UTILS_ATTR_TEXCOORD01) out vec4 _texCoord01;
 layout(location=RENDER_UTILS_ATTR_NORMAL_WS) out vec3 _normalWS;

libraries/render-utils/src/model_shadow.slv

@@ -16,9 +16,14 @@
 
 <$declareStandardTransform()$>
 
+<@include render-utils/ShaderConstants.h@>
+
+layout(location=RENDER_UTILS_ATTR_POSITION_WS) out vec4 _positionWS;
+
 void main(void) {
     // standard transform
     TransformCamera cam = getTransformCamera();
     TransformObject obj = getTransformObject();
     <$transformModelToClipPos(cam, obj, inPosition, gl_Position)$>
+    <$transformModelToWorldPos(obj, inPosition, _positionWS)$>
 }

libraries/render-utils/src/model_shadow_fade.slv

@@ -1,28 +0,0 @@
-<@include gpu/Config.slh@>
-<$VERSION_HEADER$>
-// <$_SCRIBE_FILENAME$> 
-// Generated on <$_SCRIBE_DATE$>
-//
-//  Created by Olivier Prat on 06/05/17.
-//  Copyright 2017 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/Inputs.slh@>
-<@include gpu/Transform.slh@>
-<@include render-utils/ShaderConstants.h@>
-
-<$declareStandardTransform()$>
-
-
-layout(location=RENDER_UTILS_ATTR_POSITION_WS) out vec4 _positionWS;
-
-void main(void) {
-    // standard transform
-    TransformCamera cam = getTransformCamera();
-    TransformObject obj = getTransformObject();
-    <$transformModelToClipPos(cam, obj, inPosition, gl_Position)$>
-    <$transformModelToWorldPos(obj, inPosition, _positionWS)$>
-}

libraries/render-utils/src/render-utils/skin_model.slp

@@ -1 +1,2 @@
+VERTEX skin_model
 FRAGMENT model

libraries/render-utils/src/render-utils/skin_model_dq.slp

@@ -1 +1,2 @@
+VERTEX skin_model_dq
 FRAGMENT model

libraries/render-utils/src/render-utils/skin_model_normal_map.slp

@@ -1 +1,2 @@
+VERTEX skin_model_normal_map
 FRAGMENT model_normal_map

libraries/render-utils/src/render-utils/skin_model_normal_map_dq.slp

@@ -1 +1,2 @@
+VERTEX skin_model_normal_map_dq
 FRAGMENT model_normal_map

libraries/render-utils/src/render-utils/skin_model_shadow.slp

@@ -1 +1,2 @@
+VERTEX skin_model_shadow
 FRAGMENT model_shadow

libraries/render-utils/src/render-utils/skin_model_shadow_dq.slp

@@ -1 +1,2 @@
+VERTEX skin_model_shadow_dq
 FRAGMENT model_shadow

libraries/render-utils/src/skin_model.slv

@@ -19,7 +19,7 @@
 <$declareMaterialTexMapArrayBuffer()$>
 
 <@include MeshDeformer.slh@>
-<$declareMeshDeformer(1, _SCRIBE_NULL, 1, 0, 1)$>
+<$declareMeshDeformer(1, _SCRIBE_NULL, 1, _SCRIBE_NULL, 1)$>
 <$declareMeshDeformerActivation(1, 1)$>
 
 <@include LightingModel.slh@>

libraries/render-utils/src/skin_model_shadow.slv

@@ -20,6 +20,8 @@
 
 <@include render-utils/ShaderConstants.h@>
 
+layout(location=RENDER_UTILS_ATTR_POSITION_WS) out vec4 _positionWS;
+
 void main(void) {
     vec4 deformedPosition = vec4(0.0, 0.0, 0.0, 0.0);
     evalMeshDeformer(inPosition, deformedPosition, 
@@ -30,5 +32,6 @@ void main(void) {
     TransformCamera cam = getTransformCamera();
     TransformObject obj = getTransformObject();
     <$transformModelToClipPos(cam, obj, deformedPosition, gl_Position)$>
+    <$transformModelToWorldPos(obj, deformedPosition, _positionWS)$>
 }
 

libraries/render-utils/src/skin_model_shadow_dq.slv

@@ -20,6 +20,8 @@
 
 <@include render-utils/ShaderConstants.h@>
 
+layout(location=RENDER_UTILS_ATTR_POSITION_WS) out vec4 _positionWS;
+
 void main(void) {
     vec4 deformedPosition = vec4(0.0, 0.0, 0.0, 0.0);
     evalMeshDeformer(inPosition, deformedPosition, 
@@ -30,4 +32,5 @@ void main(void) {
     TransformCamera cam = getTransformCamera();
     TransformObject obj = getTransformObject();
     <$transformModelToClipPos(cam, obj, deformedPosition, gl_Position)$>
+    <$transformModelToWorldPos(obj, deformedPosition, _positionWS)$>
 }

libraries/render-utils/src/skin_model_shadow_fade.slv

@@ -1,39 +0,0 @@
-<@include gpu/Config.slh@>
-<$VERSION_HEADER$>
-// <$_SCRIBE_FILENAME$> 
-// Generated on <$_SCRIBE_DATE$>
-//
-//  Created by Hifi Engine Team.
-//  Created by Olivier Prat on 06/045/17.
-//  Copyright 2017 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/Inputs.slh@>
-<@include gpu/Transform.slh@>
-<@include render-utils/ShaderConstants.h@>
-
-<$declareStandardTransform()$>
-
-<@include MeshDeformer.slh@>
-<$declareMeshDeformer(_SCRIBE_NULL, _SCRIBE_NULL, 1, _SCRIBE_NULL, 1)$>
-<$declareMeshDeformerActivation(1, 1)$>
-
-<@include render-utils/ShaderConstants.h@>
-
-layout(location=RENDER_UTILS_ATTR_POSITION_WS) out vec4 _positionWS;
-
-void main(void) {
-    vec4 deformedPosition = vec4(0.0, 0.0, 0.0, 0.0);
-    evalMeshDeformer(inPosition, deformedPosition, 
-                    meshDeformer_doSkinning(_drawCallInfo.y), inSkinClusterIndex, inSkinClusterWeight,
-                    meshDeformer_doBlendshape(_drawCallInfo.y), gl_VertexID);
-
-    // standard transform
-    TransformCamera cam = getTransformCamera();
-    TransformObject obj = getTransformObject();
-    <$transformModelToClipPos(cam, obj, deformedPosition, gl_Position)$>
-    <$transformModelToWorldPos(obj, deformedPosition, _positionWS)$>
-}

libraries/render-utils/src/skin_model_shadow_fade_dq.slv

@@ -1,39 +0,0 @@
-<@include gpu/Config.slh@>
-<$VERSION_HEADER$>
-// <$_SCRIBE_FILENAME$> 
-// Generated on <$_SCRIBE_DATE$>
-//
-//  Created by Hifi Engine Team.
-//  Created by Olivier Prat on 06/045/17.
-//  Copyright 2017 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/Inputs.slh@>
-<@include gpu/Transform.slh@>
-<@include render-utils/ShaderConstants.h@>
-
-<$declareStandardTransform()$>
-
-<@include MeshDeformer.slh@>
-<$declareMeshDeformer(_SCRIBE_NULL, _SCRIBE_NULL, 1, 1, 1)$>
-<$declareMeshDeformerActivation(1, 1)$>
-
-<@include render-utils/ShaderConstants.h@>
-
-layout(location=RENDER_UTILS_ATTR_POSITION_WS) out vec4 _positionWS;
-
-void main(void) {
-    vec4 deformedPosition = vec4(0.0, 0.0, 0.0, 0.0);
-    evalMeshDeformer(inPosition, deformedPosition, 
-                    meshDeformer_doSkinning(_drawCallInfo.y), inSkinClusterIndex, inSkinClusterWeight,
-                    meshDeformer_doBlendshape(_drawCallInfo.y), gl_VertexID);
-
-    // standard transform
-    TransformCamera cam = getTransformCamera();
-    TransformObject obj = getTransformObject();
-    <$transformModelToClipPos(cam, obj, deformedPosition, gl_Position)$>
-    <$transformModelToWorldPos(obj, deformedPosition, _positionWS)$>
-}

libraries/render/src/render/DrawTask.cpp

@@ -86,8 +86,10 @@ void render::renderStateSortShapes(const RenderContextPointer& renderContext,
     RenderArgs* args = renderContext->args;
 
     int numItemsToDraw = (int)inItems.size();
+    int lastItemToDraw = -1; 
     if (maxDrawnItems != -1) {
         numItemsToDraw = glm::min(numItemsToDraw, maxDrawnItems);
+        lastItemToDraw = numItemsToDraw - 1;
     }
 
     using SortedPipelines = std::vector<render::ShapeKey>;
@@ -98,7 +100,11 @@ void render::renderStateSortShapes(const RenderContextPointer& renderContext,
 
     for (auto i = 0; i < numItemsToDraw; ++i) {
         auto& item = scene->getItem(inItems[i].id);
-
+        if (lastItemToDraw == i) {
+            if (!item.getKey().isShape()) {
+                qDebug() << "Item explored";
+            }
+        }
         {
             assert(item.getKey().isShape());
             auto key = item.getShapeKey() | globalKey;