Rename ShapeRender to DeferredPipelineLib

libraries/render-utils/src/DeferredPipelineLib.cpp

@@ -1,5 +1,5 @@
 //
-//  ShapeRender.cpp
+//  DeferredPipelineLib.cpp
 //  render-utils/src
 //
 //  Created by Zach Pomerantz on 1/4/2015.
@@ -9,7 +9,7 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#include "ShapeRender.h"
+#include "DeferredPipelineLib.h"
 
 #include <model-networking/TextureCache.h>
 
@@ -37,15 +37,15 @@
 #include "model_lightmap_specular_map_frag.h"
 #include "model_translucent_frag.h"
 
-ShapeRender::ShapeRender() {
-    // TODO: Move pipeline initialization to those Jobs using ShapeRender
+DeferredPipelineLib::DeferredPipelineLib() {
+    // TODO: Move pipeline initialization to those Jobs using DeferredPipelineLib
     //       such that they own their own pipelines and it is done only once
     if (_pipelineLib.empty()) {
         initPipeline();
     }
 }
 
-void ShapeRender::initPipeline() {
+void DeferredPipelineLib::initPipeline() {
     assert(_pipelineLib.empty());
 
     // Vertex shaders
@@ -171,8 +171,8 @@ void ShapeRender::initPipeline() {
         skinModelShadowVertex, modelShadowPixel);
 }
 
-const ShapeRender::PipelinePointer ShapeRender::pickPipeline(RenderArgs* args, const Key& key) const {
-    PerformanceTimer perfTimer("ShapeRender::pickPipeline");
+const DeferredPipelineLib::PipelinePointer DeferredPipelineLib::pickPipeline(RenderArgs* args, const Key& key) const {
+    PerformanceTimer perfTimer("DeferredPipelineLib::pickPipeline");
 
     auto pipeline = _pickPipeline(args, key);
     if (!pipeline) {
@@ -187,9 +187,9 @@ const ShapeRender::PipelinePointer ShapeRender::pickPipeline(RenderArgs* args, c
     return pipeline;
 }
 
-model::MaterialPointer ShapeRender::_collisionHullMaterial;
+model::MaterialPointer DeferredPipelineLib::_collisionHullMaterial;
 
-model::MaterialPointer ShapeRender::getCollisionHullMaterial() {
+model::MaterialPointer DeferredPipelineLib::getCollisionHullMaterial() {
     if (!_collisionHullMaterial) {
         _collisionHullMaterial = std::make_shared<model::Material>();
         _collisionHullMaterial->setDiffuse(glm::vec3(1.0f, 0.5f, 0.0f));

libraries/render-utils/src/DeferredPipelineLib.h

@@ -1,5 +1,5 @@
 //
-//  ShapeRender.h
+//  DeferredPipelineLib.h
 //  render-utils/src
 //
 //  Created by Zach Pomerantz on 1/4/2015.
@@ -9,15 +9,15 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef hifi_render_utils_Shape_h
-#define hifi_render_utils_Shape_h
+#ifndef hifi_render_utils_DeferredPipelineLib_h
+#define hifi_render_utils_DeferredPipelineLib_h
 
 #include <render/ShapePipeline.h>
 #include <model/Material.h>
 
-class ShapeRender : public render::ShapePipelineLib {
+class DeferredPipelineLib : public render::ShapePipelineLib {
 public:
-    ShapeRender();
+    DeferredPipelineLib();
     static void initPipeline();
     const PipelinePointer pickPipeline(RenderArgs* args, const Key& key) const override;
 
@@ -27,4 +27,4 @@ protected:
     static model::MaterialPointer _collisionHullMaterial;
 };
 
-#endif // hifi_render_utils_Shape_h
+#endif // hifi_render_utils_DeferredPipelineLib_h

libraries/render-utils/src/MeshPartPayload.h

@@ -15,11 +15,10 @@
 #include <gpu/Batch.h>
 
 #include <render/Scene.h>
+#include <render/ShapePipeline.h>
 
 #include <model/Geometry.h>
 
-#include "ShapeRender.h"
-
 class Model;
 
 class MeshPartPayload {

libraries/render-utils/src/Model.cpp

@@ -22,8 +22,9 @@
 #include <ViewFrustum.h>
 
 #include "AbstractViewStateInterface.h"
-#include "Model.h"
+#include "DeferredPipelineLib.h"
 #include "MeshPartPayload.h"
+#include "Model.h"
 
 #include "RenderUtilsLogging.h"
 
@@ -1193,7 +1194,7 @@ void Model::segregateMeshGroups() {
         int totalParts = mesh.parts.size();
         for (int partIndex = 0; partIndex < totalParts; partIndex++) {
             if (showingCollisionHull) {
-                _renderItemsSet << std::make_shared<MeshPartPayload>(networkMesh._mesh, partIndex, ShapeRender::getCollisionHullMaterial(), transform, offset);
+                _renderItemsSet << std::make_shared<MeshPartPayload>(networkMesh._mesh, partIndex, DeferredPipelineLib::getCollisionHullMaterial(), transform, offset);
 
             } else {
                 _renderItemsSet << std::make_shared<ModelMeshPartPayload>(this, i, partIndex, shapeID, transform, offset);

libraries/render-utils/src/RenderDeferredTask.cpp

@@ -193,7 +193,7 @@ void DrawOpaqueDeferred::run(const SceneContextPointer& sceneContext, const Rend
         batch.setProjectionTransform(projMat);
         batch.setViewTransform(viewMat);
 
-        renderShapes(sceneContext, renderContext, _renderer, inItems, opaque.maxDrawn);
+        renderShapes(sceneContext, renderContext, _deferredPipelineLib, inItems, opaque.maxDrawn);
         args->_batch = nullptr;
     });
 }
@@ -219,7 +219,7 @@ void DrawTransparentDeferred::run(const SceneContextPointer& sceneContext, const
         batch.setProjectionTransform(projMat);
         batch.setViewTransform(viewMat);
 
-        renderShapes(sceneContext, renderContext, _renderer, inItems, transparent.maxDrawn);
+        renderShapes(sceneContext, renderContext, _deferredPipelineLib, inItems, transparent.maxDrawn);
         args->_batch = nullptr;
     });
 }
@@ -292,7 +292,7 @@ void DrawOverlay3D::run(const SceneContextPointer& sceneContext, const RenderCon
 
             batch.setPipeline(getOpaquePipeline());
             batch.setResourceTexture(0, args->_whiteTexture);
-            renderShapes(sceneContext, renderContext, _renderer, inItems, renderContext->getItemsConfig().overlay3D.maxDrawn);
+            renderShapes(sceneContext, renderContext, _deferredPipelineLib, inItems, renderContext->getItemsConfig().overlay3D.maxDrawn);
         });
         args->_batch = nullptr;
         args->_whiteTexture.reset();

libraries/render-utils/src/RenderDeferredTask.h

@@ -16,7 +16,7 @@
 
 #include "gpu/Pipeline.h"
 
-#include "ShapeRender.h"
+#include "DeferredPipelineLib.h"
 #include "ToneMappingEffect.h"
 
 class SetupDeferred {
@@ -57,7 +57,7 @@ public:
     typedef render::Job::ModelI<DrawOpaqueDeferred, render::ItemIDsBounds> JobModel;
 
 protected:
-    ShapeRender _renderer;
+    DeferredPipelineLib _deferredPipelineLib;
 };
 
 class DrawTransparentDeferred {
@@ -67,7 +67,7 @@ public:
     typedef render::Job::ModelI<DrawTransparentDeferred, render::ItemIDsBounds> JobModel;
 
 protected:
-    ShapeRender _renderer;
+    DeferredPipelineLib _deferredPipelineLib;
 };
 
 class DrawStencilDeferred {
@@ -99,7 +99,7 @@ public:
 
 protected:
     static gpu::PipelinePointer _opaquePipeline; //lazy evaluation hence mutable
-    ShapeRender _renderer;
+    DeferredPipelineLib _deferredPipelineLib;
 };
 
 class Blit {