From 88d8d2466398c8e8f42fa3cb18614fbb399b207f Mon Sep 17 00:00:00 2001
From: Jozufozu <jozsefaug@gmail.com>
Date: Mon, 10 Jan 2022 14:38:27 -0800
Subject: [PATCH] Separate vertex and fragment shaders and templates

---
 .../structureMovement/render/FlwContraptionManager.java      | 2 +-
 .../simibubi/create/foundation/render/CreateContexts.java    | 4 ++--
 src/main/resources/assets/create/flywheel/programs/belt.json | 3 ++-
 .../assets/create/flywheel/programs/contraption_actor.json   | 3 ++-
 src/main/resources/assets/create/flywheel/programs/flap.json | 3 ++-
 .../resources/assets/create/flywheel/programs/rotating.json  | 3 ++-
 src/main/resources/assets/create/flywheel/shaders/belt.vert  | 3 ---
 .../assets/create/flywheel/shaders/contraption_actor.vert    | 4 ----
 src/main/resources/assets/create/flywheel/shaders/flap.vert  | 5 -----
 .../resources/assets/create/flywheel/shaders/rotating.vert   | 4 ----
 10 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java
index c3ea55c65..6e19d1d27 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/render/FlwContraptionManager.java
@@ -50,7 +50,7 @@ public class FlwContraptionManager extends ContraptionRenderingWorld<FlwContrapt
 
 		Textures.bindActiveTextures();
 
-		ContraptionProgram structureShader = CreateContexts.STRUCTURE.getProgram(ProgramContext.create(Materials.Names.PASSTHRU, Formats.BLOCK, event.getLayer()));
+		ContraptionProgram structureShader = CreateContexts.STRUCTURE.getProgram(ProgramContext.create(Materials.Names.PASSTHRU, Formats.BLOCK, RenderLayer.getLayer(type)));
 
 		structureShader.bind();
 		structureShader.uploadViewProjection(event.viewProjection);
diff --git a/src/main/java/com/simibubi/create/foundation/render/CreateContexts.java b/src/main/java/com/simibubi/create/foundation/render/CreateContexts.java
index 439390c54..c21c5510f 100644
--- a/src/main/java/com/simibubi/create/foundation/render/CreateContexts.java
+++ b/src/main/java/com/simibubi/create/foundation/render/CreateContexts.java
@@ -25,8 +25,8 @@ public class CreateContexts {
 		GameStateRegistry.register(RainbowDebugStateProvider.INSTANCE);
         FileResolution header = Resolver.INSTANCE.get(ResourceUtil.subPath(CONTRAPTION, ".glsl"));
 
-		CWORLD = Templates.INSTANCING.programCompiler(ContraptionProgram::new, header);
-		STRUCTURE = Templates.ONE_SHOT.programCompiler(ContraptionProgram::new, header);
+		CWORLD = ProgramCompiler.create(Templates.INSTANCING, ContraptionProgram::new, header);
+		STRUCTURE = ProgramCompiler.create(Templates.ONE_SHOT, ContraptionProgram::new, header);
 	}
 
 }
diff --git a/src/main/resources/assets/create/flywheel/programs/belt.json b/src/main/resources/assets/create/flywheel/programs/belt.json
index 47f867e68..a58daad0c 100644
--- a/src/main/resources/assets/create/flywheel/programs/belt.json
+++ b/src/main/resources/assets/create/flywheel/programs/belt.json
@@ -1,5 +1,6 @@
 {
-  "source": "create:belt.vert",
+  "vertex": "create:belt.vert",
+  "fragment": "flywheel:block.frag",
   "states": [
     {
       "when": "create:rainbow_debug",
diff --git a/src/main/resources/assets/create/flywheel/programs/contraption_actor.json b/src/main/resources/assets/create/flywheel/programs/contraption_actor.json
index db423a474..652e414fe 100644
--- a/src/main/resources/assets/create/flywheel/programs/contraption_actor.json
+++ b/src/main/resources/assets/create/flywheel/programs/contraption_actor.json
@@ -1,5 +1,6 @@
 {
-  "source": "create:contraption_actor.vert",
+  "vertex": "create:contraption_actor.vert",
+  "fragment": "flywheel:block.frag",
   "states": [
     {
       "when": "flywheel:normal_debug",
diff --git a/src/main/resources/assets/create/flywheel/programs/flap.json b/src/main/resources/assets/create/flywheel/programs/flap.json
index 49f0f4719..5dee11e86 100644
--- a/src/main/resources/assets/create/flywheel/programs/flap.json
+++ b/src/main/resources/assets/create/flywheel/programs/flap.json
@@ -1,5 +1,6 @@
 {
-  "source": "create:flap.vert",
+  "vertex": "create:flap.vert",
+  "fragment": "flywheel:block.frag",
   "states": [
     {
       "when": "flywheel:normal_debug",
diff --git a/src/main/resources/assets/create/flywheel/programs/rotating.json b/src/main/resources/assets/create/flywheel/programs/rotating.json
index 079023b0d..4bcd46963 100644
--- a/src/main/resources/assets/create/flywheel/programs/rotating.json
+++ b/src/main/resources/assets/create/flywheel/programs/rotating.json
@@ -1,5 +1,6 @@
 {
-  "source": "create:rotating.vert",
+  "vertex": "create:rotating.vert",
+  "fragment": "flywheel:block.frag",
   "states": [
     {
       "when": "create:rainbow_debug",
diff --git a/src/main/resources/assets/create/flywheel/shaders/belt.vert b/src/main/resources/assets/create/flywheel/shaders/belt.vert
index 0ffe704d7..215958ef6 100644
--- a/src/main/resources/assets/create/flywheel/shaders/belt.vert
+++ b/src/main/resources/assets/create/flywheel/shaders/belt.vert
@@ -15,9 +15,7 @@ struct Belt {
     float scrollMult;
 };
 
-#use "flywheel:block.frag"
 
-#if defined(VERTEX_SHADER)
 void vertex(inout Vertex v, Belt instance) {
     v.pos = rotateVertexByQuat(v.pos - .5, instance.rotation) + instance.pos + .5;
 
@@ -33,4 +31,3 @@ void vertex(inout Vertex v, Belt instance) {
     v.color = instance.color;
     #endif
 }
-#endif
diff --git a/src/main/resources/assets/create/flywheel/shaders/contraption_actor.vert b/src/main/resources/assets/create/flywheel/shaders/contraption_actor.vert
index ca5e958ef..1cb8335de 100644
--- a/src/main/resources/assets/create/flywheel/shaders/contraption_actor.vert
+++ b/src/main/resources/assets/create/flywheel/shaders/contraption_actor.vert
@@ -13,9 +13,6 @@ struct Actor {
     float speed;
 };
 
-#use "flywheel:block.frag"
-
-#if defined(VERTEX_SHADER)
 void vertex(inout Vertex v, Actor instance) {
     float degrees = instance.offset + uTime * instance.speed / 20.;
     //float angle = fract(degrees / 360.) * PI * 2.;
@@ -27,4 +24,3 @@ void vertex(inout Vertex v, Actor instance) {
     v.normal = rotateVertexByQuat(rotateVertexByQuat(v.normal, kineticRot), instance.rotation);
     v.light = instance.light;
 }
-#endif
diff --git a/src/main/resources/assets/create/flywheel/shaders/flap.vert b/src/main/resources/assets/create/flywheel/shaders/flap.vert
index e7e7130b8..396672436 100644
--- a/src/main/resources/assets/create/flywheel/shaders/flap.vert
+++ b/src/main/resources/assets/create/flywheel/shaders/flap.vert
@@ -14,10 +14,6 @@ struct Flap {
     float flapness;
 };
 
-#use "flywheel:block.frag"
-
-#if defined(VERTEX_SHADER)
-
 float toRad(float degrees) {
     return fract(degrees / 360.) * PI * 2.;
 }
@@ -48,4 +44,3 @@ void vertex(inout Vertex v, Flap flap) {
     v.normal = rotateVertexByQuat(rotateVertexByQuat(v.normal, flapRotation), orientation);
     v.light = flap.light;
 }
-#endif
diff --git a/src/main/resources/assets/create/flywheel/shaders/rotating.vert b/src/main/resources/assets/create/flywheel/shaders/rotating.vert
index 660adc1a5..08a0e331c 100644
--- a/src/main/resources/assets/create/flywheel/shaders/rotating.vert
+++ b/src/main/resources/assets/create/flywheel/shaders/rotating.vert
@@ -11,8 +11,6 @@ struct Rotating {
     vec3 axis;
 };
 
-#use "flywheel:block.frag"
-
 mat4 kineticRotation(float offset, float speed, vec3 axis) {
     float degrees = offset + uTime * speed * 3./10.;
     float angle = fract(degrees / 360.) * PI * 2.;
@@ -20,7 +18,6 @@ mat4 kineticRotation(float offset, float speed, vec3 axis) {
     return rotate(axis, angle);
 }
 
-#if defined(VERTEX_SHADER)
 void vertex(inout Vertex v, Rotating instance) {
     mat4 spin = kineticRotation(instance.offset, instance.speed, instance.axis);
 
@@ -34,4 +31,3 @@ void vertex(inout Vertex v, Rotating instance) {
     v.color = instance.color;
     #endif
 }
-#endif