Worked on refactor ^_^

BruceKnowsHow · Aug 11, 2017 · 385ca0d · 385ca0d
1 parent 8e8f364
commit 385ca0d
Show file tree

Hide file tree

Showing 18 changed files with 87 additions and 87 deletions.
diff --git a/shaders/composite.vsh b/shaders/composite.vsh
@@ -22,21 +22,20 @@ varying vec2 texcoord;
 #include "/lib/Uniform/Shading_Variables.glsl"
 #include "/UserProgram/centerDepthSmooth.glsl"
 #include "/lib/Uniform/Shadow_View_Matrix.vsh"
+#include "/lib/Vertex/Shading_Setup.vsh"
 
 #define COMPOSITE0_SCALE 0.50 // [0.10 0.15 0.20 0.25 0.30 0.35 0.40 0.45 0.50 0.55 0.60 0.65 0.70 0.75 0.80 0.85 0.90 0.95 1.00]
 
 void main() {
-#if defined GI_ENABLED || defined AO_ENABLED || defined VOLUMETRIC_LIGHT
+#if !(defined GI_ENABLED || defined AO_ENABLED || defined VOLUMETRIC_LIGHT)
+	gl_Position = vec4(-1.0); return;
+#endif
+
 	texcoord    = gl_MultiTexCoord0.st;
 	gl_Position = ftransform();
 
 	gl_Position.xy = ((gl_Position.xy * 0.5 + 0.5) * COMPOSITE0_SCALE) * 2.0 - 1.0;
 
-
 	SetupProjection();
-
-	#include "/lib/Vertex/Shading_Setup.vsh"
-#else
-	gl_Position = vec4(-1.0);
-#endif
-}
+	SetupShading();
+}
diff --git a/shaders/composite1.vsh b/shaders/composite1.vsh
@@ -27,15 +27,14 @@ flat varying vec2 pixelSize;
 #include "/lib/Uniform/Shading_Variables.glsl"
 #include "/UserProgram/centerDepthSmooth.glsl"
 #include "/lib/Uniform/Shadow_View_Matrix.vsh"
+#include "/lib/Vertex/Shading_Setup.vsh"
 
 void main() {
 	texcoord    = gl_MultiTexCoord0.st;
 	gl_Position = ftransform();
 
 	pixelSize = 1.0 / vec2(viewWidth, viewHeight);
 
-
 	SetupProjection();
-
-	#include "/lib/Vertex/Shading_Setup.vsh"
-}
+	SetupShading();
+}
diff --git a/shaders/composite2.vsh b/shaders/composite2.vsh
@@ -27,15 +27,14 @@ flat varying vec2 pixelSize;
 #include "/lib/Uniform/Shading_Variables.glsl"
 #include "/UserProgram/centerDepthSmooth.glsl"
 #include "/lib/Uniform/Shadow_View_Matrix.vsh"
+#include "/lib/Vertex/Shading_Setup.vsh"
 
 void main() {
 	texcoord    = gl_MultiTexCoord0.st;
 	gl_Position = ftransform();
 
 	pixelSize = 1.0 / vec2(viewWidth, viewHeight);
 
-
 	SetupProjection();
-
-	#include "/lib/Vertex/Shading_Setup.vsh"
-}
+	SetupShading();
+}
diff --git a/shaders/final.vsh b/shaders/final.vsh
@@ -27,6 +27,7 @@ flat varying vec2 pixelSize;
 #include "/lib/Uniform/Shading_Variables.glsl"
 #include "/UserProgram/centerDepthSmooth.glsl"
 #include "/lib/Uniform/Shadow_View_Matrix.vsh"
+#include "/lib/Vertex/Shading_Setup.vsh"
 
 void main() {
 	texcoord    = gl_MultiTexCoord0.st;
@@ -35,6 +36,5 @@ void main() {
 	pixelSize = 1.0 / vec2(viewWidth, viewHeight);
 
 	SetupProjection();
-
-	#include "/lib/Vertex/Shading_Setup.vsh"
-}
+	SetupShading();
+}
diff --git a/shaders/gbuffers_damagedblock.vsh b/shaders/gbuffers_damagedblock.vsh
@@ -4,5 +4,7 @@
 #define ShaderStage -2
 #include "/lib/Syntax.glsl"
 
+#define GetMaterialIDs(a) 1.0
+
 
 #include "gbuffers_main.vsh"
diff --git a/shaders/gbuffers_entities.vsh b/shaders/gbuffers_entities.vsh
@@ -4,5 +4,7 @@
 #define ShaderStage -2
 #include "/lib/Syntax.glsl"
 
+#define GetMaterialIDs(a) 1.0
+
 
 #include "gbuffers_main.vsh"
diff --git a/shaders/gbuffers_hand.vsh b/shaders/gbuffers_hand.vsh
@@ -4,5 +4,7 @@
 #define ShaderStage -2
 #include "/lib/Syntax.glsl"
 
+#define GetMaterialIDs(a) 5.0
+
 
 #include "gbuffers_main.vsh"
diff --git a/shaders/gbuffers_main.fsh b/shaders/gbuffers_main.fsh
@@ -1,6 +1,6 @@
 /* DRAWBUFFERS:01234 */
 
-uniform sampler2D texture;
+uniform sampler2D tex;
 uniform sampler2D normals;
 uniform sampler2D specular;
 
@@ -17,7 +17,6 @@ varying mat2x3 position;
 
 varying vec3 worldDisplacement;
 
-flat varying float mcID;
 flat varying float materialIDs;
 
 #include "/lib/Settings.glsl"
@@ -39,7 +38,7 @@ float LOD = 0.0;
 #define GetTexture(x, y) texture2D(x, y)
 
 vec4 GetDiffuse(vec2 coord) {
-	return vec4(color.rgb, 1.0) * GetTexture(texture, coord);
+	return vec4(color.rgb, 1.0) * GetTexture(tex, coord);
 }
 
 vec3 GetNormal(vec2 coord) {

diff --git a/shaders/gbuffers_main.vsh b/shaders/gbuffers_main.vsh
@@ -2,8 +2,6 @@ attribute vec4 mc_Entity;
 attribute vec4 at_tangent;
 attribute vec4 mc_midTexCoord;
 
-uniform sampler2D lightmap;
-
 uniform mat4 gbufferModelViewInverse;
 
 uniform vec3  cameraPosition;
@@ -20,7 +18,6 @@ varying mat2x3 position;
 
 varying vec3 worldDisplacement;
 
-flat varying float mcID;
 flat varying float materialIDs;
 
 #include "/lib/Settings.glsl"
@@ -90,7 +87,6 @@ void main() {
 
 	color        = abs(mc_Entity.x - 10.5) > 0.6 ? gl_Color.rgb : vec3(1.0);
 	texcoord     = gl_MultiTexCoord0.st;
-	mcID         = mc_Entity.x;
 	vertLightmap = GetDefaultLightmap();
 	materialIDs  = GetMaterialIDs(int(mc_Entity.x));
 
@@ -109,4 +105,4 @@ void main() {
 
 
 	exit();
-}
+}
diff --git a/shaders/gbuffers_spidereyes.vsh b/shaders/gbuffers_spidereyes.vsh
@@ -5,5 +5,7 @@
 #define ShaderStage -2
 #include "/lib/Syntax.glsl"
 
+#define GetMaterialIDs(a) 1.0
+
 
 #include "gbuffers_main.vsh"
diff --git a/shaders/gbuffers_terrain.vsh b/shaders/gbuffers_terrain.vsh
@@ -5,5 +5,33 @@
 #include "/lib/Syntax.glsl"
 #include "/lib/Misc/Menu_Initializer.glsl"
 
+float GetMaterialIDs(int mc_ID) { // Gather material masks
+	float materialID = 1.0;
+
+	switch(mc_ID) {
+		case 31:                     // Tall Grass
+		case 37:                     // Dandelion
+		case 38:                     // Rose
+		case 59:                     // Wheat
+		case 83:                     // Sugar Cane
+		case 141:                    // Carrot
+		case 142:                    // Potatoes
+		case 175:                    // Double Tall Grass
+		case 18:                     // Generic leaves
+		case 106:                    // Vines
+		case 161:                    // New leaves
+			materialID = 2.0; break; // Translucent
+		case 10:                     // Flowing Lava
+		case 11:                     // Still Lava
+		case 50:                     // Torch
+		case 51:                     // Fire
+		case 89:                     // Glowstone
+		case 124:                    // Redstone Lamp
+			materialID = 3.0; break; // Emissive
+	}
+
+	return materialID;
+}
+
 
 #include "gbuffers_main.vsh"
diff --git a/shaders/gbuffers_textured.vsh b/shaders/gbuffers_textured.vsh
@@ -4,5 +4,7 @@
 #define ShaderStage -2
 #include "/lib/Syntax.glsl"
 
+#define GetMaterialIDs(a) 1.0
+
 
 #include "gbuffers_main.vsh"
diff --git a/shaders/gbuffers_water.fsh b/shaders/gbuffers_water.fsh
@@ -22,7 +22,7 @@ uniform int isEyeInWater;
 uniform int heldBlockLightValue;
 uniform int heldBlockLightValue2;
 
-uniform sampler2D texture;
+uniform sampler2D tex;
 uniform sampler2D normals;
 uniform sampler2D specular;
 
@@ -41,7 +41,6 @@ varying mat2x3 position;
 
 varying vec3 worldDisplacement;
 
-flat varying float mcID;
 flat varying float materialIDs;
 
 
@@ -62,7 +61,7 @@ flat varying float materialIDs;
 #include "/lib/Fragment/Water_Waves.fsh"
 
 vec4 GetDiffuse(vec2 coord) {
-	return vec4(color.rgb, 1.0) * texture2D(texture, coord);
+	return vec4(color.rgb, 1.0) * texture2D(tex, coord);
 }
 
 vec3 GetNormal(vec2 coord) {
@@ -177,15 +176,15 @@ vec3 GetWaveNormals(vec3 worldSpacePosition, vec3 flatWorldNormal) {
 
 void main() {
 	if (CalculateFogFactor(position[0]) >= 1.0) discard;
-	if (!gl_FrontFacing && abs(materialIDs - 4.0) < 0.1) discard;
+	if (!gl_FrontFacing && materialIDs == 4.0) discard;
 
 	vec4  diffuse     = GetDiffuse(texcoord);
 	vec3  normal      = GetNormal(texcoord);
 	float specularity = GetSpecularity(texcoord);
 
 	Mask mask = EmptyMask;
 
-	if (abs(materialIDs - 4.0) < 0.1) {
+	if (materialIDs == 4.0) {
 		diffuse = vec4(0.215, 0.356, 0.533, 0.75);
 
 		normal = tbnMatrix * GetWaveNormals(position[1], tbnMatrix[2]);
@@ -203,4 +202,4 @@ void main() {
 	gl_FragData[4] = vec4(0.0);
 
 	exit();
-}
+}
diff --git a/shaders/gbuffers_water.vsh b/shaders/gbuffers_water.vsh
@@ -15,8 +15,6 @@ attribute vec4 mc_Entity;
 attribute vec4 at_tangent;
 attribute vec4 mc_midTexCoord;
 
-uniform sampler2D lightmap;
-
 uniform mat4 gbufferModelViewInverse;
 
 uniform vec3  cameraPosition;
@@ -33,7 +31,6 @@ varying mat2x3 position;
 
 varying vec3 worldDisplacement;
 
-flat varying float mcID;
 flat varying float materialIDs;
 
 #include "/lib/Settings.glsl"
@@ -44,6 +41,23 @@ flat varying float materialIDs;
 #include "/lib/Uniform/Shading_Variables.glsl"
 #include "/UserProgram/centerDepthSmooth.glsl"
 #include "/lib/Uniform/Shadow_View_Matrix.vsh"
+#include "/lib/Vertex/Shading_Setup.vsh"
+
+float GetMaterialIDs(int mc_ID) {
+	float materialID = 1.0;
+
+	switch(mc_ID) {
+		case 8:
+		case 9:
+			materialID = 4.0; break; // Water
+	}
+
+	// Custom Streams Mod ID's can go here:
+//	if (mc_Entity.x == 8 || mc_Entity.x == 9 || mc_Entity.x == 235 || mc_Entity.x == 236 ... )
+//		materialID = 4.0;
+
+	return materialID;
+}
 
 
 vec2 GetDefaultLightmap() {
@@ -52,8 +66,6 @@ vec2 GetDefaultLightmap() {
 	return clamp01(lightmapCoord / vec2(0.8745, 0.9373)).rg;
 }
 
-#include "/lib/Vertex/Materials.vsh"
-
 vec3 GetWorldSpacePosition() {
 	vec3 position = transMAD(gl_ModelViewMatrix, gl_Vertex.xyz);
 
@@ -104,10 +116,10 @@ void main() {
 #endif
 
 	SetupProjection();
+	SetupShading();
 
 	color        = abs(mc_Entity.x - 10.5) > 0.6 ? gl_Color.rgb : vec3(1.0);
 	texcoord     = gl_MultiTexCoord0.st;
-	mcID         = mc_Entity.x;
 	vertLightmap = GetDefaultLightmap();
 	materialIDs  = GetMaterialIDs(int(mc_Entity.x));
 
@@ -125,8 +137,5 @@ void main() {
 	tbnMatrix = CalculateTBN(worldSpacePosition);
 
 
-	#include "/lib/Vertex/Shading_Setup.vsh"
-
-
 	exit();
 }
diff --git a/shaders/gbuffers_weather.vsh b/shaders/gbuffers_weather.vsh
@@ -4,5 +4,7 @@
 #define ShaderStage -2
 #include "/lib/Syntax.glsl"
 
+#define GetMaterialIDs(a) 1.0
+
 
 #include "gbuffers_main.vsh"
diff --git a/shaders/lib/Vertex/Materials.vsh b/shaders/lib/Vertex/Materials.vsh