From 2f94c43968664a24c9d8124154b04c1f103591d8 Mon Sep 17 00:00:00 2001
From: Sam Gateau <samuel.gateau@gmail.com>
Date: Mon, 28 May 2018 23:20:04 -0700
Subject: [PATCH] Removing the getLayer from the meshPArtPayload and check that
 it s working

---
 libraries/render-utils/src/CauterizedModel.cpp |  2 +-
 libraries/render-utils/src/MeshPartPayload.cpp | 10 ++++++----
 libraries/render-utils/src/MeshPartPayload.h   |  8 ++++----
 libraries/render-utils/src/Model.cpp           |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/libraries/render-utils/src/CauterizedModel.cpp b/libraries/render-utils/src/CauterizedModel.cpp
index 3c6a0df850..387d0c7c23 100644
--- a/libraries/render-utils/src/CauterizedModel.cpp
+++ b/libraries/render-utils/src/CauterizedModel.cpp
@@ -278,7 +278,7 @@ void CauterizedModel::updateRenderItems() {
 
                     data.setEnableCauterization(enableCauterization);
                     data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, render::ItemKey::TAG_BITS_ALL, isGroupCulled);
-                    data.setLayer(isLayeredInFront, isLayeredInHUD);
+                //    data.setLayer(isLayeredInFront, isLayeredInHUD);
                     data.setShapeKey(invalidatePayloadShapeKey, isWireframe, useDualQuaternionSkinning);
                 });
             }
diff --git a/libraries/render-utils/src/MeshPartPayload.cpp b/libraries/render-utils/src/MeshPartPayload.cpp
index fa8a8ebfc9..5792a0c981 100644
--- a/libraries/render-utils/src/MeshPartPayload.cpp
+++ b/libraries/render-utils/src/MeshPartPayload.cpp
@@ -215,12 +215,13 @@ template <> const Item::Bound payloadGetBound(const ModelMeshPartPayload::Pointe
     }
     return Item::Bound();
 }
+/*
 template <> int payloadGetLayer(const ModelMeshPartPayload::Pointer& payload) {
     if (payload) {
         return payload->getLayer();
     }
     return 0;
-}
+}*/
 
 template <> const ShapeKey shapeGetShapeKey(const ModelMeshPartPayload::Pointer& payload) {
     if (payload) {
@@ -401,7 +402,7 @@ void ModelMeshPartPayload::updateKey(const render::ItemKey& key) {
     _itemKey = builder.build();
 }
 
-
+/*
 void ModelMeshPartPayload::setLayer(bool isLayeredInFront, bool isLayeredInHUD) {
     if (isLayeredInFront) {
         _layer = Item::LAYER_3D_FRONT;
@@ -411,10 +412,11 @@ void ModelMeshPartPayload::setLayer(bool isLayeredInFront, bool isLayeredInHUD)
         _layer = Item::LAYER_3D;
     }
 }
-
+*/
+/*
 int ModelMeshPartPayload::getLayer() const {
     return _layer;
-}
+}*/
 
 void ModelMeshPartPayload::setShapeKey(bool invalidateShapeKey, bool isWireframe, bool useDualQuaternionSkinning) {
     if (invalidateShapeKey) {
diff --git a/libraries/render-utils/src/MeshPartPayload.h b/libraries/render-utils/src/MeshPartPayload.h
index f6ca09d2f0..6782760d4c 100644
--- a/libraries/render-utils/src/MeshPartPayload.h
+++ b/libraries/render-utils/src/MeshPartPayload.h
@@ -107,11 +107,11 @@ public:
     void updateTransformForSkinnedMesh(const Transform& renderTransform, const Transform& boundTransform);
 
     // Render Item interface
-    int getLayer() const;
+//    int getLayer() const;
     render::ShapeKey getShapeKey() const override; // shape interface
     void render(RenderArgs* args) override;
 
-    void setLayer(bool isLayeredInFront, bool isLayeredInHUD);
+//    void setLayer(bool isLayeredInFront, bool isLayeredInHUD);
     void setShapeKey(bool invalidateShapeKey, bool isWireframe, bool useDualQuaternionSkinning);
 
     // ModelMeshPartPayload functions to perform render
@@ -141,13 +141,13 @@ private:
 
     gpu::BufferPointer _blendedVertexBuffer;
     render::ShapeKey _shapeKey { render::ShapeKey::Builder::invalid() };
-    int _layer { render::Item::LAYER_3D };
+  //  int _layer { render::Item::LAYER_3D };
 };
 
 namespace render {
     template <> const ItemKey payloadGetKey(const ModelMeshPartPayload::Pointer& payload);
     template <> const Item::Bound payloadGetBound(const ModelMeshPartPayload::Pointer& payload);
-    template <> int payloadGetLayer(const ModelMeshPartPayload::Pointer& payload);
+ //   template <> int payloadGetLayer(const ModelMeshPartPayload::Pointer& payload);
     template <> const ShapeKey shapeGetShapeKey(const ModelMeshPartPayload::Pointer& payload);
     template <> void payloadRender(const ModelMeshPartPayload::Pointer& payload, RenderArgs* args);
 }
diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp
index 533705f2ba..d5a0f243b0 100644
--- a/libraries/render-utils/src/Model.cpp
+++ b/libraries/render-utils/src/Model.cpp
@@ -315,7 +315,7 @@ void Model::updateRenderItems() {
                 data.updateTransformForSkinnedMesh(renderTransform, modelTransform);
 
                 data.updateKey(isVisible, isLayeredInFront || isLayeredInHUD, canCastShadow, viewTagBits, isGroupCulled);
-                data.setLayer(isLayeredInFront, isLayeredInHUD);
+             //   data.setLayer(isLayeredInFront, isLayeredInHUD);
                 data.setShapeKey(invalidatePayloadShapeKey, isWireframe, useDualQuaternionSkinning);
             });
         }