From efa1dd02741b9de6712d730337749e93dc6ba7e3 Mon Sep 17 00:00:00 2001
From: sam gateau <samuel.gateau@gmail.com>
Date: Tue, 25 Sep 2018 17:32:04 -0700
Subject: [PATCH] rename the files from skin to deformed

---
 .../render-utils/src/HighlightEffect.cpp      |  4 +-
 .../render-utils/src/RenderPipelines.cpp      | 64 +++++++++----------
 .../{skin_model.slv => deformed_model.slv}    |  0
 ...kin_model_dq.slv => deformed_model_dq.slv} |  0
 ..._map.slv => deformed_model_normal_map.slv} |  0
 ...q.slv => deformed_model_normal_map_dq.slv} |  0
 ...l_shadow.slv => deformed_model_shadow.slv} |  0
 ...ow_dq.slv => deformed_model_shadow_dq.slv} |  0
 .../src/render-utils/deformed_model.slp       |  2 +
 .../src/render-utils/deformed_model_dq.slp    |  2 +
 .../src/render-utils/deformed_model_fade.slp  |  2 +
 .../render-utils/deformed_model_fade_dq.slp   |  2 +
 .../deformed_model_normal_map.slp             |  2 +
 .../deformed_model_normal_map_dq.slp          |  2 +
 .../deformed_model_normal_map_fade.slp        |  2 +
 .../deformed_model_normal_map_fade_dq.slp     |  2 +
 ...deformed_model_normal_map_translucent.slp} |  2 +-
 ...ormed_model_normal_map_translucent_dq.slp} |  2 +-
 ...med_model_normal_map_translucent_fade.slp} |  2 +-
 ..._model_normal_map_translucent_fade_dq.slp} |  2 +-
 .../render-utils/deformed_model_shadow.slp    |  2 +
 .../render-utils/deformed_model_shadow_dq.slp |  2 +
 .../deformed_model_shadow_fade.slp            |  2 +
 .../deformed_model_shadow_fade_dq.slp         |  2 +
 ...ent.slp => deformed_model_translucent.slp} |  2 +-
 ....slp => deformed_model_translucent_dq.slp} |  2 +-
 ...lp => deformed_model_translucent_fade.slp} |  2 +-
 ...=> deformed_model_translucent_fade_dq.slp} |  2 +-
 ...n_model.slp => forward_deformed_model.slp} |  2 +-
 .../forward_deformed_model_dq.slp             |  2 +
 ... => forward_deformed_model_normal_map.slp} |  2 +-
 .../forward_deformed_model_normal_map_dq.slp  |  2 +
 ...t.slp => forward_deformed_translucent.slp} |  2 +-
 ...lp => forward_deformed_translucent_dq.slp} |  2 +-
 ...rward_deformed_translucent_normal_map.slp} |  2 +-
 ...ard_deformed_translucent_normal_map_dq.slp |  2 +
 .../render-utils/forward_skin_model_dq.slp    |  2 -
 .../forward_skin_model_normal_map_dq.slp      |  2 -
 ...forward_skin_translucent_normal_map_dq.slp |  2 -
 .../src/render-utils/skin_model.slp           |  2 -
 .../src/render-utils/skin_model_dq.slp        |  2 -
 .../src/render-utils/skin_model_fade.slp      |  2 -
 .../src/render-utils/skin_model_fade_dq.slp   |  2 -
 .../render-utils/skin_model_normal_map.slp    |  2 -
 .../render-utils/skin_model_normal_map_dq.slp |  2 -
 .../skin_model_normal_map_fade.slp            |  2 -
 .../skin_model_normal_map_fade_dq.slp         |  2 -
 .../src/render-utils/skin_model_shadow.slp    |  2 -
 .../src/render-utils/skin_model_shadow_dq.slp |  2 -
 .../render-utils/skin_model_shadow_fade.slp   |  2 -
 .../skin_model_shadow_fade_dq.slp             |  2 -
 51 files changed, 77 insertions(+), 77 deletions(-)
 rename libraries/render-utils/src/{skin_model.slv => deformed_model.slv} (100%)
 rename libraries/render-utils/src/{skin_model_dq.slv => deformed_model_dq.slv} (100%)
 rename libraries/render-utils/src/{skin_model_normal_map.slv => deformed_model_normal_map.slv} (100%)
 rename libraries/render-utils/src/{skin_model_normal_map_dq.slv => deformed_model_normal_map_dq.slv} (100%)
 rename libraries/render-utils/src/{skin_model_shadow.slv => deformed_model_shadow.slv} (100%)
 rename libraries/render-utils/src/{skin_model_shadow_dq.slv => deformed_model_shadow_dq.slv} (100%)
 create mode 100644 libraries/render-utils/src/render-utils/deformed_model.slp
 create mode 100644 libraries/render-utils/src/render-utils/deformed_model_dq.slp
 create mode 100644 libraries/render-utils/src/render-utils/deformed_model_fade.slp
 create mode 100644 libraries/render-utils/src/render-utils/deformed_model_fade_dq.slp
 create mode 100644 libraries/render-utils/src/render-utils/deformed_model_normal_map.slp
 create mode 100644 libraries/render-utils/src/render-utils/deformed_model_normal_map_dq.slp
 create mode 100644 libraries/render-utils/src/render-utils/deformed_model_normal_map_fade.slp
 create mode 100644 libraries/render-utils/src/render-utils/deformed_model_normal_map_fade_dq.slp
 rename libraries/render-utils/src/render-utils/{skin_model_normal_map_translucent.slp => deformed_model_normal_map_translucent.slp} (53%)
 rename libraries/render-utils/src/render-utils/{skin_model_normal_map_translucent_dq.slp => deformed_model_normal_map_translucent_dq.slp} (51%)
 rename libraries/render-utils/src/render-utils/{skin_model_normal_map_translucent_fade.slp => deformed_model_normal_map_translucent_fade.slp} (56%)
 rename libraries/render-utils/src/render-utils/{skin_model_normal_map_translucent_fade_dq.slp => deformed_model_normal_map_translucent_fade_dq.slp} (54%)
 create mode 100644 libraries/render-utils/src/render-utils/deformed_model_shadow.slp
 create mode 100644 libraries/render-utils/src/render-utils/deformed_model_shadow_dq.slp
 create mode 100644 libraries/render-utils/src/render-utils/deformed_model_shadow_fade.slp
 create mode 100644 libraries/render-utils/src/render-utils/deformed_model_shadow_fade_dq.slp
 rename libraries/render-utils/src/render-utils/{skin_model_translucent.slp => deformed_model_translucent.slp} (55%)
 rename libraries/render-utils/src/render-utils/{skin_model_translucent_dq.slp => deformed_model_translucent_dq.slp} (51%)
 rename libraries/render-utils/src/render-utils/{skin_model_translucent_fade.slp => deformed_model_translucent_fade.slp} (59%)
 rename libraries/render-utils/src/render-utils/{skin_model_translucent_fade_dq.slp => deformed_model_translucent_fade_dq.slp} (56%)
 rename libraries/render-utils/src/render-utils/{forward_skin_model.slp => forward_deformed_model.slp} (51%)
 create mode 100644 libraries/render-utils/src/render-utils/forward_deformed_model_dq.slp
 rename libraries/render-utils/src/render-utils/{forward_skin_model_normal_map.slp => forward_deformed_model_normal_map.slp} (50%)
 create mode 100644 libraries/render-utils/src/render-utils/forward_deformed_model_normal_map_dq.slp
 rename libraries/render-utils/src/render-utils/{forward_skin_translucent.slp => forward_deformed_translucent.slp} (61%)
 rename libraries/render-utils/src/render-utils/{forward_skin_translucent_dq.slp => forward_deformed_translucent_dq.slp} (58%)
 rename libraries/render-utils/src/render-utils/{forward_skin_translucent_normal_map.slp => forward_deformed_translucent_normal_map.slp} (51%)
 create mode 100644 libraries/render-utils/src/render-utils/forward_deformed_translucent_normal_map_dq.slp
 delete mode 100644 libraries/render-utils/src/render-utils/forward_skin_model_dq.slp
 delete mode 100644 libraries/render-utils/src/render-utils/forward_skin_model_normal_map_dq.slp
 delete mode 100644 libraries/render-utils/src/render-utils/forward_skin_translucent_normal_map_dq.slp
 delete mode 100644 libraries/render-utils/src/render-utils/skin_model.slp
 delete mode 100644 libraries/render-utils/src/render-utils/skin_model_dq.slp
 delete mode 100644 libraries/render-utils/src/render-utils/skin_model_fade.slp
 delete mode 100644 libraries/render-utils/src/render-utils/skin_model_fade_dq.slp
 delete mode 100644 libraries/render-utils/src/render-utils/skin_model_normal_map.slp
 delete mode 100644 libraries/render-utils/src/render-utils/skin_model_normal_map_dq.slp
 delete mode 100644 libraries/render-utils/src/render-utils/skin_model_normal_map_fade.slp
 delete mode 100644 libraries/render-utils/src/render-utils/skin_model_normal_map_fade_dq.slp
 delete mode 100644 libraries/render-utils/src/render-utils/skin_model_shadow.slp
 delete mode 100644 libraries/render-utils/src/render-utils/skin_model_shadow_dq.slp
 delete mode 100644 libraries/render-utils/src/render-utils/skin_model_shadow_fade.slp
 delete mode 100644 libraries/render-utils/src/render-utils/skin_model_shadow_fade_dq.slp

diff --git a/libraries/render-utils/src/HighlightEffect.cpp b/libraries/render-utils/src/HighlightEffect.cpp
index 11326b1120..882771b000 100644
--- a/libraries/render-utils/src/HighlightEffect.cpp
+++ b/libraries/render-utils/src/HighlightEffect.cpp
@@ -556,8 +556,8 @@ void DrawHighlightTask::initMaskPipelines(render::ShapePlumber& shapePlumber, gp
         ShapeKey::Filter::Builder().withoutSkinned(),
         modelProgram, state);
 
-    gpu::ShaderPointer skinProgram = gpu::Shader::createProgram(shader::render_utils::program::skin_model_shadow);
+    gpu::ShaderPointer deformedProgram = gpu::Shader::createProgram(shader::render_utils::program::deformed_model_shadow);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withSkinned(),
-        skinProgram, state);
+        deformedProgram, state);
 }
diff --git a/libraries/render-utils/src/RenderPipelines.cpp b/libraries/render-utils/src/RenderPipelines.cpp
index 4804416c00..a9be3fee5a 100644
--- a/libraries/render-utils/src/RenderPipelines.cpp
+++ b/libraries/render-utils/src/RenderPipelines.cpp
@@ -147,60 +147,60 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
     // matrix palette skinned
     addPipeline(
         Key::Builder().withMaterial().withSkinned(),
-        skin_model, nullptr, nullptr);
+        deformed_model, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTangents(),
-        skin_model_normal_map, nullptr, nullptr);
+        deformed_model_normal_map, nullptr, nullptr);
     // Same thing but with Fade on
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withFade(),
-        skin_model_fade, batchSetter, itemSetter);
+        deformed_model_fade, batchSetter, itemSetter);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTangents().withFade(),
-        skin_model_normal_map_fade, batchSetter, itemSetter);
+        deformed_model_normal_map_fade, batchSetter, itemSetter);
     // matrix palette skinned and translucent
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTranslucent(),
-        skin_model_translucent, nullptr, nullptr);
+        deformed_model_translucent, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTranslucent().withTangents(),
-        skin_model_normal_map_translucent, nullptr, nullptr);
+        deformed_model_normal_map_translucent, nullptr, nullptr);
     // Same thing but with Fade on
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTranslucent().withFade(),
-        skin_model_translucent_fade, batchSetter, itemSetter);
+        deformed_model_translucent_fade, batchSetter, itemSetter);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withTranslucent().withTangents().withFade(),
-        skin_model_normal_map_translucent_fade, batchSetter, itemSetter);
+        deformed_model_normal_map_translucent_fade, batchSetter, itemSetter);
 
     // dual quaternion skinned
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withDualQuatSkinned(),
-        skin_model_dq, nullptr, nullptr);
+        deformed_model_dq, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTangents(),
-        skin_model_normal_map_dq, nullptr, nullptr);
+        deformed_model_normal_map_dq, nullptr, nullptr);
     // Same thing but with Fade on
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withFade(),
-        skin_model_fade_dq, batchSetter, itemSetter);
+        deformed_model_fade_dq, batchSetter, itemSetter);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTangents().withFade(),
-        skin_model_normal_map_fade_dq, batchSetter, itemSetter);
+        deformed_model_normal_map_fade_dq, batchSetter, itemSetter);
     // dual quaternion skinned and translucent
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent(),
-        skin_model_translucent_dq, nullptr, nullptr);
+        deformed_model_translucent_dq, nullptr, nullptr);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent().withTangents(),
-        skin_model_normal_map_translucent_dq, nullptr, nullptr);
+        deformed_model_normal_map_translucent_dq, nullptr, nullptr);
     // Same thing but with Fade on
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent().withFade(),
-        skin_model_translucent_fade_dq, batchSetter, itemSetter);
+        deformed_model_translucent_fade_dq, batchSetter, itemSetter);
     addPipeline(
         Key::Builder().withMaterial().withSkinned().withDualQuatSkinned().withTranslucent().withTangents().withFade(),
-        skin_model_normal_map_translucent_fade_dq, batchSetter, itemSetter);
+        deformed_model_normal_map_translucent_fade_dq, batchSetter, itemSetter);
 
     // Depth-only
     addPipeline(
@@ -208,24 +208,24 @@ void initDeferredPipelines(render::ShapePlumber& plumber, const render::ShapePip
         model_shadow, nullptr, nullptr);
     addPipeline(
         Key::Builder().withSkinned().withDepthOnly(),
-        skin_model_shadow, nullptr, nullptr);
+        deformed_model_shadow, nullptr, nullptr);
     // Same thing but with Fade on
     addPipeline(
         Key::Builder().withDepthOnly().withFade(),
         model_shadow_fade, batchSetter, itemSetter);
     addPipeline(
         Key::Builder().withSkinned().withDepthOnly().withFade(),
-        skin_model_shadow_fade, batchSetter, itemSetter);
+        deformed_model_shadow_fade, batchSetter, itemSetter);
 
     // Now repeat for dual quaternion
     // Depth-only
     addPipeline(
         Key::Builder().withSkinned().withDualQuatSkinned().withDepthOnly(),
-        skin_model_shadow_dq, nullptr, nullptr);
+        deformed_model_shadow_dq, nullptr, nullptr);
     // Same thing but with Fade on
     addPipeline(
         Key::Builder().withSkinned().withDualQuatSkinned().withDepthOnly().withFade(),
-        skin_model_shadow_fade_dq, batchSetter, itemSetter);
+        deformed_model_shadow_fade_dq, batchSetter, itemSetter);
 }
 
 void initForwardPipelines(ShapePlumber& plumber) {
@@ -257,20 +257,20 @@ void initForwardPipelines(ShapePlumber& plumber) {
     addPipeline(Key::Builder().withMaterial().withTangents(), forward_model_translucent);
  
     // Skinned Opaques
-    addPipeline(Key::Builder().withMaterial().withSkinned(), forward_skin_model);
-    addPipeline(Key::Builder().withMaterial().withSkinned().withTangents(), forward_skin_model_normal_map);
-    addPipeline(Key::Builder().withMaterial().withSkinned().withDualQuatSkinned(), forward_skin_model_dq);
-    addPipeline(Key::Builder().withMaterial().withSkinned().withTangents().withDualQuatSkinned(), forward_skin_model_normal_map_dq);
+    addPipeline(Key::Builder().withMaterial().withSkinned(), forward_deformed_model);
+    addPipeline(Key::Builder().withMaterial().withSkinned().withTangents(), forward_deformed_model_normal_map);
+    addPipeline(Key::Builder().withMaterial().withSkinned().withDualQuatSkinned(), forward_deformed_model_dq);
+    addPipeline(Key::Builder().withMaterial().withSkinned().withTangents().withDualQuatSkinned(), forward_deformed_model_normal_map_dq);
 
     // Translucents
     addPipeline(Key::Builder().withMaterial().withTranslucent(), forward_model_translucent);
     addPipeline(Key::Builder().withMaterial().withTranslucent().withTangents(), forward_model_normal_map_translucent);
 
     // Skinned Translucents
-    addPipeline(Key::Builder().withMaterial().withSkinned().withTranslucent(), forward_skin_translucent);
-    addPipeline(Key::Builder().withMaterial().withSkinned().withTranslucent().withTangents(), forward_skin_translucent_normal_map);
-    addPipeline(Key::Builder().withMaterial().withSkinned().withTranslucent().withDualQuatSkinned(), forward_skin_translucent_dq);
-    addPipeline(Key::Builder().withMaterial().withSkinned().withTranslucent().withTangents().withDualQuatSkinned(), forward_skin_translucent_normal_map_dq);
+    addPipeline(Key::Builder().withMaterial().withSkinned().withTranslucent(), forward_deformed_translucent);
+    addPipeline(Key::Builder().withMaterial().withSkinned().withTranslucent().withTangents(), forward_deformed_translucent_normal_map);
+    addPipeline(Key::Builder().withMaterial().withSkinned().withTranslucent().withDualQuatSkinned(), forward_deformed_translucent_dq);
+    addPipeline(Key::Builder().withMaterial().withSkinned().withTranslucent().withTangents().withDualQuatSkinned(), forward_deformed_translucent_normal_map_dq);
 
     forceLightBatchSetter = false;
 }
@@ -369,7 +369,7 @@ void initZPassPipelines(ShapePlumber& shapePlumber, gpu::StatePointer state) {
         ShapeKey::Filter::Builder().withoutSkinned().withoutFade(),
         modelProgram, state);
 
-    gpu::ShaderPointer skinProgram = gpu::Shader::createProgram(skin_model_shadow);
+    gpu::ShaderPointer skinProgram = gpu::Shader::createProgram(deformed_model_shadow);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withSkinned().withoutDualQuatSkinned().withoutFade(),
         skinProgram, state);
@@ -379,17 +379,17 @@ void initZPassPipelines(ShapePlumber& shapePlumber, gpu::StatePointer state) {
         ShapeKey::Filter::Builder().withoutSkinned().withFade(),
         modelFadeProgram, state);
 
-    gpu::ShaderPointer skinFadeProgram = gpu::Shader::createProgram(skin_model_shadow_fade);
+    gpu::ShaderPointer skinFadeProgram = gpu::Shader::createProgram(deformed_model_shadow_fade);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withSkinned().withoutDualQuatSkinned().withFade(),
         skinFadeProgram, state);
 
-    gpu::ShaderPointer skinModelShadowDualQuatProgram = gpu::Shader::createProgram(skin_model_shadow_dq);
+    gpu::ShaderPointer skinModelShadowDualQuatProgram = gpu::Shader::createProgram(deformed_model_shadow_dq);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned().withoutFade(),
         skinModelShadowDualQuatProgram, state);
 
-    gpu::ShaderPointer skinModelShadowFadeDualQuatProgram = gpu::Shader::createProgram(skin_model_shadow_fade_dq);
+    gpu::ShaderPointer skinModelShadowFadeDualQuatProgram = gpu::Shader::createProgram(deformed_model_shadow_fade_dq);
     shapePlumber.addPipeline(
         ShapeKey::Filter::Builder().withSkinned().withDualQuatSkinned().withFade(),
         skinModelShadowFadeDualQuatProgram, state);
diff --git a/libraries/render-utils/src/skin_model.slv b/libraries/render-utils/src/deformed_model.slv
similarity index 100%
rename from libraries/render-utils/src/skin_model.slv
rename to libraries/render-utils/src/deformed_model.slv
diff --git a/libraries/render-utils/src/skin_model_dq.slv b/libraries/render-utils/src/deformed_model_dq.slv
similarity index 100%
rename from libraries/render-utils/src/skin_model_dq.slv
rename to libraries/render-utils/src/deformed_model_dq.slv
diff --git a/libraries/render-utils/src/skin_model_normal_map.slv b/libraries/render-utils/src/deformed_model_normal_map.slv
similarity index 100%
rename from libraries/render-utils/src/skin_model_normal_map.slv
rename to libraries/render-utils/src/deformed_model_normal_map.slv
diff --git a/libraries/render-utils/src/skin_model_normal_map_dq.slv b/libraries/render-utils/src/deformed_model_normal_map_dq.slv
similarity index 100%
rename from libraries/render-utils/src/skin_model_normal_map_dq.slv
rename to libraries/render-utils/src/deformed_model_normal_map_dq.slv
diff --git a/libraries/render-utils/src/skin_model_shadow.slv b/libraries/render-utils/src/deformed_model_shadow.slv
similarity index 100%
rename from libraries/render-utils/src/skin_model_shadow.slv
rename to libraries/render-utils/src/deformed_model_shadow.slv
diff --git a/libraries/render-utils/src/skin_model_shadow_dq.slv b/libraries/render-utils/src/deformed_model_shadow_dq.slv
similarity index 100%
rename from libraries/render-utils/src/skin_model_shadow_dq.slv
rename to libraries/render-utils/src/deformed_model_shadow_dq.slv
diff --git a/libraries/render-utils/src/render-utils/deformed_model.slp b/libraries/render-utils/src/render-utils/deformed_model.slp
new file mode 100644
index 0000000000..9db8938e86
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/deformed_model.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model
+FRAGMENT model
diff --git a/libraries/render-utils/src/render-utils/deformed_model_dq.slp b/libraries/render-utils/src/render-utils/deformed_model_dq.slp
new file mode 100644
index 0000000000..ec950ac784
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/deformed_model_dq.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_dq
+FRAGMENT model
diff --git a/libraries/render-utils/src/render-utils/deformed_model_fade.slp b/libraries/render-utils/src/render-utils/deformed_model_fade.slp
new file mode 100644
index 0000000000..5818e5e3af
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/deformed_model_fade.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model
+FRAGMENT model_fade
diff --git a/libraries/render-utils/src/render-utils/deformed_model_fade_dq.slp b/libraries/render-utils/src/render-utils/deformed_model_fade_dq.slp
new file mode 100644
index 0000000000..9047bc1286
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/deformed_model_fade_dq.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_dq
+FRAGMENT model_fade
diff --git a/libraries/render-utils/src/render-utils/deformed_model_normal_map.slp b/libraries/render-utils/src/render-utils/deformed_model_normal_map.slp
new file mode 100644
index 0000000000..ad460652ad
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/deformed_model_normal_map.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_normal_map
+FRAGMENT model_normal_map
diff --git a/libraries/render-utils/src/render-utils/deformed_model_normal_map_dq.slp b/libraries/render-utils/src/render-utils/deformed_model_normal_map_dq.slp
new file mode 100644
index 0000000000..44d5cd5272
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/deformed_model_normal_map_dq.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_normal_map_dq
+FRAGMENT model_normal_map
diff --git a/libraries/render-utils/src/render-utils/deformed_model_normal_map_fade.slp b/libraries/render-utils/src/render-utils/deformed_model_normal_map_fade.slp
new file mode 100644
index 0000000000..99aab59169
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/deformed_model_normal_map_fade.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_normal_map
+FRAGMENT model_normal_map_fade
diff --git a/libraries/render-utils/src/render-utils/deformed_model_normal_map_fade_dq.slp b/libraries/render-utils/src/render-utils/deformed_model_normal_map_fade_dq.slp
new file mode 100644
index 0000000000..0ee002b6a1
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/deformed_model_normal_map_fade_dq.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_normal_map_dq
+FRAGMENT model_normal_map_fade
diff --git a/libraries/render-utils/src/render-utils/skin_model_normal_map_translucent.slp b/libraries/render-utils/src/render-utils/deformed_model_normal_map_translucent.slp
similarity index 53%
rename from libraries/render-utils/src/render-utils/skin_model_normal_map_translucent.slp
rename to libraries/render-utils/src/render-utils/deformed_model_normal_map_translucent.slp
index 3404358b00..f2e2b2e4da 100644
--- a/libraries/render-utils/src/render-utils/skin_model_normal_map_translucent.slp
+++ b/libraries/render-utils/src/render-utils/deformed_model_normal_map_translucent.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model_normal_map
+VERTEX deformed_model_normal_map
 FRAGMENT model_translucent_normal_map
diff --git a/libraries/render-utils/src/render-utils/skin_model_normal_map_translucent_dq.slp b/libraries/render-utils/src/render-utils/deformed_model_normal_map_translucent_dq.slp
similarity index 51%
rename from libraries/render-utils/src/render-utils/skin_model_normal_map_translucent_dq.slp
rename to libraries/render-utils/src/render-utils/deformed_model_normal_map_translucent_dq.slp
index 6a8c3ada0c..577a6c1616 100644
--- a/libraries/render-utils/src/render-utils/skin_model_normal_map_translucent_dq.slp
+++ b/libraries/render-utils/src/render-utils/deformed_model_normal_map_translucent_dq.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model_normal_map_dq
+VERTEX deformed_model_normal_map_dq
 FRAGMENT model_translucent_normal_map
diff --git a/libraries/render-utils/src/render-utils/skin_model_normal_map_translucent_fade.slp b/libraries/render-utils/src/render-utils/deformed_model_normal_map_translucent_fade.slp
similarity index 56%
rename from libraries/render-utils/src/render-utils/skin_model_normal_map_translucent_fade.slp
rename to libraries/render-utils/src/render-utils/deformed_model_normal_map_translucent_fade.slp
index 5286615a99..de9591b45f 100644
--- a/libraries/render-utils/src/render-utils/skin_model_normal_map_translucent_fade.slp
+++ b/libraries/render-utils/src/render-utils/deformed_model_normal_map_translucent_fade.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model_normal_map
+VERTEX deformed_model_normal_map
 FRAGMENT model_translucent_normal_map_fade
diff --git a/libraries/render-utils/src/render-utils/skin_model_normal_map_translucent_fade_dq.slp b/libraries/render-utils/src/render-utils/deformed_model_normal_map_translucent_fade_dq.slp
similarity index 54%
rename from libraries/render-utils/src/render-utils/skin_model_normal_map_translucent_fade_dq.slp
rename to libraries/render-utils/src/render-utils/deformed_model_normal_map_translucent_fade_dq.slp
index d493c20aa9..3f624f7bf7 100644
--- a/libraries/render-utils/src/render-utils/skin_model_normal_map_translucent_fade_dq.slp
+++ b/libraries/render-utils/src/render-utils/deformed_model_normal_map_translucent_fade_dq.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model_normal_map_dq
+VERTEX deformed_model_normal_map_dq
 FRAGMENT model_translucent_normal_map_fade
diff --git a/libraries/render-utils/src/render-utils/deformed_model_shadow.slp b/libraries/render-utils/src/render-utils/deformed_model_shadow.slp
new file mode 100644
index 0000000000..c8718dff09
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/deformed_model_shadow.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_shadow
+FRAGMENT model_shadow
diff --git a/libraries/render-utils/src/render-utils/deformed_model_shadow_dq.slp b/libraries/render-utils/src/render-utils/deformed_model_shadow_dq.slp
new file mode 100644
index 0000000000..b0f1449234
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/deformed_model_shadow_dq.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_shadow_dq
+FRAGMENT model_shadow
diff --git a/libraries/render-utils/src/render-utils/deformed_model_shadow_fade.slp b/libraries/render-utils/src/render-utils/deformed_model_shadow_fade.slp
new file mode 100644
index 0000000000..1063134d96
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/deformed_model_shadow_fade.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_shadow
+FRAGMENT model_shadow_fade
diff --git a/libraries/render-utils/src/render-utils/deformed_model_shadow_fade_dq.slp b/libraries/render-utils/src/render-utils/deformed_model_shadow_fade_dq.slp
new file mode 100644
index 0000000000..25c99c75d1
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/deformed_model_shadow_fade_dq.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_shadow_dq
+FRAGMENT model_shadow_fade
diff --git a/libraries/render-utils/src/render-utils/skin_model_translucent.slp b/libraries/render-utils/src/render-utils/deformed_model_translucent.slp
similarity index 55%
rename from libraries/render-utils/src/render-utils/skin_model_translucent.slp
rename to libraries/render-utils/src/render-utils/deformed_model_translucent.slp
index 030db7b091..798fec9a5b 100644
--- a/libraries/render-utils/src/render-utils/skin_model_translucent.slp
+++ b/libraries/render-utils/src/render-utils/deformed_model_translucent.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model
+VERTEX deformed_model
 FRAGMENT model_translucent
diff --git a/libraries/render-utils/src/render-utils/skin_model_translucent_dq.slp b/libraries/render-utils/src/render-utils/deformed_model_translucent_dq.slp
similarity index 51%
rename from libraries/render-utils/src/render-utils/skin_model_translucent_dq.slp
rename to libraries/render-utils/src/render-utils/deformed_model_translucent_dq.slp
index e56a4cba7f..8a0b70cfcf 100644
--- a/libraries/render-utils/src/render-utils/skin_model_translucent_dq.slp
+++ b/libraries/render-utils/src/render-utils/deformed_model_translucent_dq.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model_dq
+VERTEX deformed_model_dq
 FRAGMENT model_translucent
diff --git a/libraries/render-utils/src/render-utils/skin_model_translucent_fade.slp b/libraries/render-utils/src/render-utils/deformed_model_translucent_fade.slp
similarity index 59%
rename from libraries/render-utils/src/render-utils/skin_model_translucent_fade.slp
rename to libraries/render-utils/src/render-utils/deformed_model_translucent_fade.slp
index af2df840e9..68eef3624d 100644
--- a/libraries/render-utils/src/render-utils/skin_model_translucent_fade.slp
+++ b/libraries/render-utils/src/render-utils/deformed_model_translucent_fade.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model
+VERTEX deformed_model
 FRAGMENT model_translucent_fade
diff --git a/libraries/render-utils/src/render-utils/skin_model_translucent_fade_dq.slp b/libraries/render-utils/src/render-utils/deformed_model_translucent_fade_dq.slp
similarity index 56%
rename from libraries/render-utils/src/render-utils/skin_model_translucent_fade_dq.slp
rename to libraries/render-utils/src/render-utils/deformed_model_translucent_fade_dq.slp
index 3cdfdabc62..4ce321fa78 100644
--- a/libraries/render-utils/src/render-utils/skin_model_translucent_fade_dq.slp
+++ b/libraries/render-utils/src/render-utils/deformed_model_translucent_fade_dq.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model_dq
+VERTEX deformed_model_dq
 FRAGMENT model_translucent_fade
diff --git a/libraries/render-utils/src/render-utils/forward_skin_model.slp b/libraries/render-utils/src/render-utils/forward_deformed_model.slp
similarity index 51%
rename from libraries/render-utils/src/render-utils/forward_skin_model.slp
rename to libraries/render-utils/src/render-utils/forward_deformed_model.slp
index 962cf69ac2..3b7c49705b 100644
--- a/libraries/render-utils/src/render-utils/forward_skin_model.slp
+++ b/libraries/render-utils/src/render-utils/forward_deformed_model.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model
+VERTEX deformed_model
 FRAGMENT forward_model
diff --git a/libraries/render-utils/src/render-utils/forward_deformed_model_dq.slp b/libraries/render-utils/src/render-utils/forward_deformed_model_dq.slp
new file mode 100644
index 0000000000..45d886529a
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/forward_deformed_model_dq.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_dq
+FRAGMENT forward_model
diff --git a/libraries/render-utils/src/render-utils/forward_skin_model_normal_map.slp b/libraries/render-utils/src/render-utils/forward_deformed_model_normal_map.slp
similarity index 50%
rename from libraries/render-utils/src/render-utils/forward_skin_model_normal_map.slp
rename to libraries/render-utils/src/render-utils/forward_deformed_model_normal_map.slp
index 5bae303829..539ca61193 100644
--- a/libraries/render-utils/src/render-utils/forward_skin_model_normal_map.slp
+++ b/libraries/render-utils/src/render-utils/forward_deformed_model_normal_map.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model_normal_map
+VERTEX deformed_model_normal_map
 FRAGMENT forward_model_normal_map
diff --git a/libraries/render-utils/src/render-utils/forward_deformed_model_normal_map_dq.slp b/libraries/render-utils/src/render-utils/forward_deformed_model_normal_map_dq.slp
new file mode 100644
index 0000000000..c663b671fe
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/forward_deformed_model_normal_map_dq.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_normal_map_dq
+FRAGMENT forward_model_normal_map
diff --git a/libraries/render-utils/src/render-utils/forward_skin_translucent.slp b/libraries/render-utils/src/render-utils/forward_deformed_translucent.slp
similarity index 61%
rename from libraries/render-utils/src/render-utils/forward_skin_translucent.slp
rename to libraries/render-utils/src/render-utils/forward_deformed_translucent.slp
index 1468d52428..605499ebc3 100644
--- a/libraries/render-utils/src/render-utils/forward_skin_translucent.slp
+++ b/libraries/render-utils/src/render-utils/forward_deformed_translucent.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model
+VERTEX deformed_model
 FRAGMENT forward_model_translucent
diff --git a/libraries/render-utils/src/render-utils/forward_skin_translucent_dq.slp b/libraries/render-utils/src/render-utils/forward_deformed_translucent_dq.slp
similarity index 58%
rename from libraries/render-utils/src/render-utils/forward_skin_translucent_dq.slp
rename to libraries/render-utils/src/render-utils/forward_deformed_translucent_dq.slp
index 688bf51ba2..cd20657b01 100644
--- a/libraries/render-utils/src/render-utils/forward_skin_translucent_dq.slp
+++ b/libraries/render-utils/src/render-utils/forward_deformed_translucent_dq.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model_dq
+VERTEX deformed_model_dq
 FRAGMENT forward_model_translucent
diff --git a/libraries/render-utils/src/render-utils/forward_skin_translucent_normal_map.slp b/libraries/render-utils/src/render-utils/forward_deformed_translucent_normal_map.slp
similarity index 51%
rename from libraries/render-utils/src/render-utils/forward_skin_translucent_normal_map.slp
rename to libraries/render-utils/src/render-utils/forward_deformed_translucent_normal_map.slp
index fe3db07670..85d08c1943 100644
--- a/libraries/render-utils/src/render-utils/forward_skin_translucent_normal_map.slp
+++ b/libraries/render-utils/src/render-utils/forward_deformed_translucent_normal_map.slp
@@ -1,2 +1,2 @@
-VERTEX skin_model_normal_map
+VERTEX deformed_model_normal_map
 FRAGMENT forward_model_translucent
diff --git a/libraries/render-utils/src/render-utils/forward_deformed_translucent_normal_map_dq.slp b/libraries/render-utils/src/render-utils/forward_deformed_translucent_normal_map_dq.slp
new file mode 100644
index 0000000000..2f13b16a5b
--- /dev/null
+++ b/libraries/render-utils/src/render-utils/forward_deformed_translucent_normal_map_dq.slp
@@ -0,0 +1,2 @@
+VERTEX deformed_model_normal_map_dq
+FRAGMENT forward_model_translucent
diff --git a/libraries/render-utils/src/render-utils/forward_skin_model_dq.slp b/libraries/render-utils/src/render-utils/forward_skin_model_dq.slp
deleted file mode 100644
index 8fe119440f..0000000000
--- a/libraries/render-utils/src/render-utils/forward_skin_model_dq.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_dq
-FRAGMENT forward_model
diff --git a/libraries/render-utils/src/render-utils/forward_skin_model_normal_map_dq.slp b/libraries/render-utils/src/render-utils/forward_skin_model_normal_map_dq.slp
deleted file mode 100644
index 551b8367c7..0000000000
--- a/libraries/render-utils/src/render-utils/forward_skin_model_normal_map_dq.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_normal_map_dq
-FRAGMENT forward_model_normal_map
diff --git a/libraries/render-utils/src/render-utils/forward_skin_translucent_normal_map_dq.slp b/libraries/render-utils/src/render-utils/forward_skin_translucent_normal_map_dq.slp
deleted file mode 100644
index 2012a77e89..0000000000
--- a/libraries/render-utils/src/render-utils/forward_skin_translucent_normal_map_dq.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_normal_map_dq
-FRAGMENT forward_model_translucent
diff --git a/libraries/render-utils/src/render-utils/skin_model.slp b/libraries/render-utils/src/render-utils/skin_model.slp
deleted file mode 100644
index 0d9b419365..0000000000
--- a/libraries/render-utils/src/render-utils/skin_model.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model
-FRAGMENT model
diff --git a/libraries/render-utils/src/render-utils/skin_model_dq.slp b/libraries/render-utils/src/render-utils/skin_model_dq.slp
deleted file mode 100644
index c90dc802c3..0000000000
--- a/libraries/render-utils/src/render-utils/skin_model_dq.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_dq
-FRAGMENT model
diff --git a/libraries/render-utils/src/render-utils/skin_model_fade.slp b/libraries/render-utils/src/render-utils/skin_model_fade.slp
deleted file mode 100644
index 798a0a826d..0000000000
--- a/libraries/render-utils/src/render-utils/skin_model_fade.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model
-FRAGMENT model_fade
diff --git a/libraries/render-utils/src/render-utils/skin_model_fade_dq.slp b/libraries/render-utils/src/render-utils/skin_model_fade_dq.slp
deleted file mode 100644
index 2d4c6cd9cd..0000000000
--- a/libraries/render-utils/src/render-utils/skin_model_fade_dq.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_dq
-FRAGMENT model_fade
diff --git a/libraries/render-utils/src/render-utils/skin_model_normal_map.slp b/libraries/render-utils/src/render-utils/skin_model_normal_map.slp
deleted file mode 100644
index 88c5986f06..0000000000
--- a/libraries/render-utils/src/render-utils/skin_model_normal_map.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_normal_map
-FRAGMENT model_normal_map
diff --git a/libraries/render-utils/src/render-utils/skin_model_normal_map_dq.slp b/libraries/render-utils/src/render-utils/skin_model_normal_map_dq.slp
deleted file mode 100644
index e443eaf431..0000000000
--- a/libraries/render-utils/src/render-utils/skin_model_normal_map_dq.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_normal_map_dq
-FRAGMENT model_normal_map
diff --git a/libraries/render-utils/src/render-utils/skin_model_normal_map_fade.slp b/libraries/render-utils/src/render-utils/skin_model_normal_map_fade.slp
deleted file mode 100644
index 1730c25aad..0000000000
--- a/libraries/render-utils/src/render-utils/skin_model_normal_map_fade.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_normal_map
-FRAGMENT model_normal_map_fade
diff --git a/libraries/render-utils/src/render-utils/skin_model_normal_map_fade_dq.slp b/libraries/render-utils/src/render-utils/skin_model_normal_map_fade_dq.slp
deleted file mode 100644
index cac2c5d1b6..0000000000
--- a/libraries/render-utils/src/render-utils/skin_model_normal_map_fade_dq.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_normal_map_dq
-FRAGMENT model_normal_map_fade
diff --git a/libraries/render-utils/src/render-utils/skin_model_shadow.slp b/libraries/render-utils/src/render-utils/skin_model_shadow.slp
deleted file mode 100644
index bb15fd1ef5..0000000000
--- a/libraries/render-utils/src/render-utils/skin_model_shadow.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_shadow
-FRAGMENT model_shadow
diff --git a/libraries/render-utils/src/render-utils/skin_model_shadow_dq.slp b/libraries/render-utils/src/render-utils/skin_model_shadow_dq.slp
deleted file mode 100644
index 6f930a2593..0000000000
--- a/libraries/render-utils/src/render-utils/skin_model_shadow_dq.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_shadow_dq
-FRAGMENT model_shadow
diff --git a/libraries/render-utils/src/render-utils/skin_model_shadow_fade.slp b/libraries/render-utils/src/render-utils/skin_model_shadow_fade.slp
deleted file mode 100644
index acf9e201de..0000000000
--- a/libraries/render-utils/src/render-utils/skin_model_shadow_fade.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_shadow
-FRAGMENT model_shadow_fade
diff --git a/libraries/render-utils/src/render-utils/skin_model_shadow_fade_dq.slp b/libraries/render-utils/src/render-utils/skin_model_shadow_fade_dq.slp
deleted file mode 100644
index 57bf072969..0000000000
--- a/libraries/render-utils/src/render-utils/skin_model_shadow_fade_dq.slp
+++ /dev/null
@@ -1,2 +0,0 @@
-VERTEX skin_model_shadow_dq
-FRAGMENT model_shadow_fade