update to 1.21

Godlander · Godlander · commit 4a7fb1858cf1 · 2024-06-21T16:22:46.000-07:00
diff --git a/assets/minecraft/shaders/core/position_color.vsh b/assets/minecraft/shaders/core/position_color.vsh
@@ -14,6 +14,6 @@ out float fogDistance;
 
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
-    fogDistance = fog_distance(ModelViewMat, Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     vertexColor = Color;
 }
diff --git a/assets/minecraft/shaders/core/position_tex.json b/assets/minecraft/shaders/core/position_tex.json
@@ -16,7 +16,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "ScreenSize", "type": "float",     "count": 2,  "values": [ 1.0, 1.0 ] },
         { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] },
diff --git a/assets/minecraft/shaders/core/render/armor.vsh b/assets/minecraft/shaders/core/render/armor.vsh
@@ -14,7 +14,6 @@ uniform sampler2D Sampler2;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
-uniform mat3 IViewRotMat;
 uniform int FogShape;
 
 uniform vec3 Light0_Direction;
@@ -29,7 +28,7 @@ out vec4 glpos;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
     glpos = gl_Position;
-    fogDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color);
     lightColor = getlight(Sampler2, UV2);
     texCoord0 = UV0;
diff --git a/assets/minecraft/shaders/core/render/clouds.vsh b/assets/minecraft/shaders/core/render/clouds.vsh
@@ -27,7 +27,7 @@ void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(pos, 1.0);
 
     texCoord0 = UV0;
-    fogDistance = fog_distance(ModelViewMat, pos, FogShape);
+    fogDistance = fog_distance(pos, FogShape);
 
     // try the flatten the cloud shading as much as possible
     vec4 col = Color;
diff --git a/assets/minecraft/shaders/core/render/crumbling.vsh b/assets/minecraft/shaders/core/render/crumbling.vsh
@@ -10,7 +10,6 @@ uniform sampler2D Sampler0;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
-uniform mat3 IViewRotMat;
 
 out vec4 vertexColor;
 out vec2 texCoord0;
@@ -29,15 +28,15 @@ void main() {
     vertexColor = Color;
     texCoord0 = UV0;
 
-    rNormal = normalize(IViewRotMat * Normal);
+    rNormal = normalize(Normal);
 
     vec3 xVec, yVec;
     if (abs(rNormal.y) >= 0.9) {
-        yVec = vec3(0, 0, -1) * IViewRotMat;
-        xVec = vec3(1, 0, 0) * IViewRotMat;
+        yVec = mat3(ModelViewMat) * vec3(0, 0, -1);
+        xVec = mat3(ModelViewMat) * vec3(1, 0, 0);
     }
     else {
-        yVec = vec3(0, 1, 0) * IViewRotMat;
+        yVec = mat3(ModelViewMat) * vec3(0, 1, 0);
         xVec = cross(Normal, yVec);
     }
 
diff --git a/assets/minecraft/shaders/core/render/end_crystal_beam.vsh b/assets/minecraft/shaders/core/render/end_crystal_beam.vsh
@@ -15,7 +15,6 @@ uniform sampler2D Sampler2;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
-uniform mat3 IViewRotMat;
 uniform int FogShape;
 
 uniform vec3 Light0_Direction;
@@ -31,7 +30,7 @@ out vec4 glpos;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
     glpos = gl_Position;
-    fogDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, Normal, Color);
     lightColor = getlight(Sampler2, UV2);
     overlayColor = texelFetch(Sampler1, UV1, 0);
diff --git a/assets/minecraft/shaders/core/render/end_portal.vsh b/assets/minecraft/shaders/core/render/end_portal.vsh
@@ -7,7 +7,6 @@ in vec3 Position;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
-uniform mat3 IViewRotMat;
 uniform int FogShape;
 
 out float fogDistance;
@@ -17,6 +16,6 @@ out vec4 glpos;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
     glpos = gl_Position;
-    fogDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     texProj0 = projection_from_position(gl_Position);
 }
diff --git a/assets/minecraft/shaders/core/render/energy_swirl.vsh b/assets/minecraft/shaders/core/render/energy_swirl.vsh
@@ -20,7 +20,7 @@ void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
     glpos = gl_Position;
 
-    fogDistance = fog_distance(ModelViewMat, Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     vertexColor = Color;
     texCoord0 = (TextureMat * vec4(UV0, 0.0, 1.0)).xy;
 }
diff --git a/assets/minecraft/shaders/core/render/eyes.vsh b/assets/minecraft/shaders/core/render/eyes.vsh
@@ -8,7 +8,6 @@ in vec2 UV0;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
-uniform mat3 IViewRotMat;
 uniform int FogShape;
 
 out float fogDistance;
@@ -19,7 +18,7 @@ out vec4 glpos;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
     glpos = gl_Position;
-    fogDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     vertexColor = Color;
     texCoord0 = UV0;
 }
diff --git a/assets/minecraft/shaders/core/render/glint_armor.vsh b/assets/minecraft/shaders/core/render/glint_armor.vsh
@@ -17,6 +17,6 @@ out vec4 glpos;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
     glpos = gl_Position;
-    fogDistance = fog_distance(ModelViewMat, Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     texCoord0 = (TextureMat * vec4(UV0, 0.0, 1.0)).xy;
 }
diff --git a/assets/minecraft/shaders/core/render/glint_item.vsh b/assets/minecraft/shaders/core/render/glint_item.vsh
@@ -7,7 +7,6 @@ in vec2 UV0;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
-uniform mat3 IViewRotMat;
 uniform mat4 TextureMat;
 uniform int FogShape;
 
@@ -18,6 +17,6 @@ out vec4 glpos;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
     glpos = gl_Position;
-    fogDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     texCoord0 = (TextureMat * vec4(UV0*0.3, 0.0, 1.0)).xy;
 }
diff --git a/assets/minecraft/shaders/core/render/gui_texture.fsh b/assets/minecraft/shaders/core/render/gui_texture.fsh
@@ -12,7 +12,6 @@ uniform vec4 ColorModulator;
 uniform vec2 ScreenSize;
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
-uniform mat3 IViewRotMat;
 uniform vec4 FogColor;
 uniform float FogStart;
 uniform float FogEnd;
@@ -58,7 +57,7 @@ void main() {
                     vec3 p1 = pos1.rgb / pos1.a;
                     vec3 p2 = pos2.rgb / pos2.a;
                     vec3 p3 = pos3.rgb / pos3.a;
-                    vec4 sunDir = mat4(IViewRotMat) * vec4(normalize(p1 + p3 + normalize(p2 - p1)), 0.0);
+                    vec4 sunDir = vec4(normalize(p1 + p3 + normalize(p2 - p1)), 0.0) * ModelViewMat;
                     color = vec4(encode_float(sunDir[index]), 1.0);
                 }
                 // store sun alpha (RainStrength)
diff --git a/assets/minecraft/shaders/core/render/leash.vsh b/assets/minecraft/shaders/core/render/leash.vsh
@@ -11,7 +11,6 @@ uniform sampler2D Sampler2;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
-uniform mat3 IViewRotMat;
 uniform vec4 ColorModulator;
 uniform int FogShape;
 
@@ -23,6 +22,6 @@ out vec4 glpos;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
     glpos = gl_Position;
-    fogDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     vertexColor = Color * ColorModulator * getlight(Sampler2, UV2);
 }
diff --git a/assets/minecraft/shaders/core/render/lightning.vsh b/assets/minecraft/shaders/core/render/lightning.vsh
@@ -7,7 +7,6 @@ in vec4 Color;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
-uniform mat3 IViewRotMat;
 uniform int FogShape;
 
 out float fogDistance;
@@ -16,6 +15,6 @@ out vec4 vertexColor;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
 
-    fogDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     vertexColor = Color;
 }
diff --git a/assets/minecraft/shaders/core/render/lines.vsh b/assets/minecraft/shaders/core/render/lines.vsh
@@ -54,6 +54,6 @@ void main() {
     }
     glpos = gl_Position;
 
-    fogDistance = fog_distance(ModelViewMat, Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     vertexColor = col;
 }
diff --git a/assets/minecraft/shaders/core/render/particle.vsh b/assets/minecraft/shaders/core/render/particle.vsh
@@ -21,7 +21,7 @@ out vec2 texCoord0;
 
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
-    fogDistance = fog_distance(ModelViewMat, Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     texCoord0 = UV0;
     vertexColor = Color;
     lightColor = getlight(Sampler2, UV2);
diff --git a/assets/minecraft/shaders/core/render/shadow.vsh b/assets/minecraft/shaders/core/render/shadow.vsh
@@ -8,7 +8,6 @@ in vec2 UV0;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
-uniform mat3 IViewRotMat;
 uniform int FogShape;
 
 out float fogDistance;
@@ -19,7 +18,7 @@ out vec4 glpos;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
     glpos = gl_Position;
-    fogDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     vertexColor = Color;
     texCoord0 = UV0;
 }
diff --git a/assets/minecraft/shaders/core/render/text.vsh b/assets/minecraft/shaders/core/render/text.vsh
@@ -12,7 +12,6 @@ uniform sampler2D Sampler2;
 
 uniform mat4 ModelViewMat;
 uniform mat4 ProjMat;
-uniform mat3 IViewRotMat;
 uniform int FogShape;
 
 out float fogDistance;
@@ -24,7 +23,7 @@ out vec4 glpos;
 void main() {
     gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);
     glpos = gl_Position;
-    fogDistance = fog_distance(ModelViewMat, IViewRotMat * Position, FogShape);
+    fogDistance = fog_distance(Position, FogShape);
     vertexColor = Color;
     lightColor = getlight(Sampler2, UV2);
     texCoord0 = UV0;
diff --git a/assets/minecraft/shaders/core/rendertype_entity_cutout.json b/assets/minecraft/shaders/core/rendertype_entity_cutout.json
@@ -22,7 +22,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "Light0_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
         { "name": "Light1_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
diff --git a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.json b/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull.json
@@ -22,7 +22,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "Light0_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
         { "name": "Light1_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
diff --git a/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull_z_offset.json b/assets/minecraft/shaders/core/rendertype_entity_cutout_no_cull_z_offset.json
@@ -22,7 +22,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "Light0_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
         { "name": "Light1_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
diff --git a/assets/minecraft/shaders/core/rendertype_entity_glint.json b/assets/minecraft/shaders/core/rendertype_entity_glint.json
@@ -16,7 +16,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "GlintAlpha", "type": "float", "count": 1, "values": [ 1.0 ] },
         { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] },
diff --git a/assets/minecraft/shaders/core/rendertype_entity_glint_direct.json b/assets/minecraft/shaders/core/rendertype_entity_glint_direct.json
@@ -16,7 +16,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "GlintAlpha", "type": "float", "count": 1, "values": [ 1.0 ] },
         { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] },
diff --git a/assets/minecraft/shaders/core/rendertype_entity_no_outline.json b/assets/minecraft/shaders/core/rendertype_entity_no_outline.json
@@ -20,7 +20,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "Light0_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
         { "name": "Light1_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
diff --git a/assets/minecraft/shaders/core/rendertype_entity_shadow.json b/assets/minecraft/shaders/core/rendertype_entity_shadow.json
@@ -17,7 +17,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] },
         { "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] },
diff --git a/assets/minecraft/shaders/core/rendertype_entity_smooth_cutout.json b/assets/minecraft/shaders/core/rendertype_entity_smooth_cutout.json
@@ -22,7 +22,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "Light0_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
         { "name": "Light1_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
diff --git a/assets/minecraft/shaders/core/rendertype_entity_solid.json b/assets/minecraft/shaders/core/rendertype_entity_solid.json
@@ -22,7 +22,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "Light0_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
         { "name": "Light1_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
diff --git a/assets/minecraft/shaders/core/rendertype_entity_translucent.json b/assets/minecraft/shaders/core/rendertype_entity_translucent.json
@@ -22,7 +22,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "Light0_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
         { "name": "Light1_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
diff --git a/assets/minecraft/shaders/core/rendertype_entity_translucent_cull.json b/assets/minecraft/shaders/core/rendertype_entity_translucent_cull.json
@@ -21,7 +21,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "Light0_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
         { "name": "Light1_Direction", "type": "float", "count": 3, "values": [0.0, 0.0, 0.0] },
diff --git a/assets/minecraft/shaders/core/rendertype_eyes.json b/assets/minecraft/shaders/core/rendertype_eyes.json
@@ -20,7 +20,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] },
         { "name": "FogEnd", "type": "float", "count": 1, "values": [ 1.0 ] },
diff --git a/assets/minecraft/shaders/core/rendertype_glint_direct.json b/assets/minecraft/shaders/core/rendertype_glint_direct.json
@@ -16,7 +16,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "GlintAlpha", "type": "float", "count": 1, "values": [ 1.0 ] },
         { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] },
diff --git a/assets/minecraft/shaders/core/rendertype_glint_translucent.json b/assets/minecraft/shaders/core/rendertype_glint_translucent.json
@@ -16,7 +16,6 @@
     "uniforms": [
         { "name": "ModelViewMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ProjMat", "type": "matrix4x4", "count": 16, "values": [ 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 1.0 ] },
-        { "name": "IViewRotMat", "type": "matrix3x3", "count": 9, "values": [ 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0 ] },
         { "name": "ColorModulator", "type": "float", "count": 4, "values": [ 1.0, 1.0, 1.0, 1.0 ] },
         { "name": "GlintAlpha", "type": "float", "count": 1, "values": [ 1.0 ] },
         { "name": "FogStart", "type": "float", "count": 1, "values": [ 0.0 ] },
diff --git a/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.json b/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.json
diff --git a/assets/minecraft/shaders/core/rendertype_leash.json b/assets/minecraft/shaders/core/rendertype_leash.json
diff --git a/assets/minecraft/shaders/core/rendertype_lightning.json b/assets/minecraft/shaders/core/rendertype_lightning.json
diff --git a/assets/minecraft/shaders/core/rendertype_text.json b/assets/minecraft/shaders/core/rendertype_text.json
diff --git a/assets/minecraft/shaders/include/fog.glsl b/assets/minecraft/shaders/include/fog.glsl
diff --git a/assets/minecraft/shaders/include/render/block.vsh b/assets/minecraft/shaders/include/render/block.vsh
diff --git a/assets/minecraft/shaders/include/render/entity.vsh b/assets/minecraft/shaders/include/render/entity.vsh
diff --git a/assets/minecraft/shaders/post/transparency.json b/assets/minecraft/shaders/post/transparency.json
diff --git a/assets/minecraft/shaders/program/blur.vsh b/assets/minecraft/shaders/program/blur.vsh
diff --git a/assets/minecraft/shaders/program/blur1.fsh b/assets/minecraft/shaders/program/blur1.fsh
diff --git a/assets/minecraft/shaders/program/blur1.json b/assets/minecraft/shaders/program/blur1.json
diff --git a/assets/minecraft/shaders/program/blur2.fsh b/assets/minecraft/shaders/program/blur2.fsh
diff --git a/assets/minecraft/shaders/program/blur2.json b/assets/minecraft/shaders/program/blur2.json
diff --git a/changelog.txt b/changelog.txt
diff --git a/pack.mcmeta b/pack.mcmeta

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ out float fogDistance;`
`14`	`14`
`15`	`15`	`void main() {`
`16`	`16`	`gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);`
`17`		`- fogDistance = fog_distance(ModelViewMat, Position, FogShape);`
	`17`	`+ fogDistance = fog_distance(Position, FogShape);`
`18`	`18`	`vertexColor = Color;`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ void main() {`
`20`	`20`	`gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);`
`21`	`21`	`glpos = gl_Position;`
`22`	`22`
`23`		`- fogDistance = fog_distance(ModelViewMat, Position, FogShape);`
	`23`	`+ fogDistance = fog_distance(Position, FogShape);`
`24`	`24`	`vertexColor = Color;`
`25`	`25`	`texCoord0 = (TextureMat * vec4(UV0, 0.0, 1.0)).xy;`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,6 @@ out vec4 glpos;`
`17`	`17`	`void main() {`
`18`	`18`	`gl_Position = ProjMat * ModelViewMat * vec4(Position, 1.0);`
`19`	`19`	`glpos = gl_Position;`
`20`		`- fogDistance = fog_distance(ModelViewMat, Position, FogShape);`
	`20`	`+ fogDistance = fog_distance(Position, FogShape);`
`21`	`21`	`texCoord0 = (TextureMat * vec4(UV0, 0.0, 1.0)).xy;`
`22`	`22`	`}`