diff --git a/assets/minecraft/shaders/core/position_color.vsh b/assets/minecraft/shaders/core/position_color.vsh index 8d95440..056b377 100644 --- 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; } \ No newline at end of file diff --git a/assets/minecraft/shaders/core/position_tex.json b/assets/minecraft/shaders/core/position_tex.json index ac26dae..a1e9f54 100644 --- 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 index 475233e..4b3124f 100644 --- 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 index 21a2480..760f38f 100644 --- 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 index 0ee5c52..1b01f04 100644 --- 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 index 6ca643e..6cdd09c 100644 --- 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 index 10a8969..d53c83c 100644 --- 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); } \ No newline at end of file diff --git a/assets/minecraft/shaders/core/render/energy_swirl.vsh b/assets/minecraft/shaders/core/render/energy_swirl.vsh index b161eb3..99b12e2 100644 --- 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; } \ No newline at end of file diff --git a/assets/minecraft/shaders/core/render/eyes.vsh b/assets/minecraft/shaders/core/render/eyes.vsh index 5e0e533..3d7c2e4 100644 --- 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; } \ No newline at end of file diff --git a/assets/minecraft/shaders/core/render/glint_armor.vsh b/assets/minecraft/shaders/core/render/glint_armor.vsh index 482c327..d5611ba 100644 --- 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; } \ No newline at end of file diff --git a/assets/minecraft/shaders/core/render/glint_item.vsh b/assets/minecraft/shaders/core/render/glint_item.vsh index 414f668..13bfc56 100644 --- 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; } \ No newline at end of file diff --git a/assets/minecraft/shaders/core/render/gui_texture.fsh b/assets/minecraft/shaders/core/render/gui_texture.fsh index d15c751..61fef61 100644 --- 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 index 428472d..a78d7ee 100644 --- 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); } \ No newline at end of file diff --git a/assets/minecraft/shaders/core/render/lightning.vsh b/assets/minecraft/shaders/core/render/lightning.vsh index 9046ac3..568aad3 100644 --- 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 index 71f585c..7f419eb 100644 --- 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; } \ No newline at end of file diff --git a/assets/minecraft/shaders/core/render/particle.vsh b/assets/minecraft/shaders/core/render/particle.vsh index 82ad5dd..68a93f5 100644 --- 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 index 1222562..278ed05 100644 --- 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 index f218f02..352bc13 100644 --- 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 index b030c6e..fd27c65 100644 --- 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 index 7642ac1..954f144 100644 --- 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 index c391517..bb33ab1 100644 --- 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 index 0d5a0c2..3ee3cc2 100644 --- 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 index 0d5a0c2..3ee3cc2 100644 --- 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 index 25b03aa..689d5fb 100644 --- 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 index 3db018c..7380d61 100644 --- 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 index 233daef..90a0f82 100644 --- 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 index 069f9c9..177488e 100644 --- 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 index ca3458b..f81b7eb 100644 --- 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 index e9c04a1..6f9a716 100644 --- 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 index d6de05d..d291723 100644 --- 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 index 0d5a0c2..3ee3cc2 100644 --- 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 index 0d5a0c2..3ee3cc2 100644 --- 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 index a5c35fc..316cac6 100644 --- a/assets/minecraft/shaders/core/rendertype_item_entity_translucent_cull.json +++ b/assets/minecraft/shaders/core/rendertype_item_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_leash.json b/assets/minecraft/shaders/core/rendertype_leash.json index 07b533f..77b35f4 100644 --- a/assets/minecraft/shaders/core/rendertype_leash.json +++ b/assets/minecraft/shaders/core/rendertype_leash.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_lightning.json b/assets/minecraft/shaders/core/rendertype_lightning.json index 3776dab..a4262a9 100644 --- a/assets/minecraft/shaders/core/rendertype_lightning.json +++ b/assets/minecraft/shaders/core/rendertype_lightning.json @@ -14,7 +14,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_text.json b/assets/minecraft/shaders/core/rendertype_text.json index ac823fb..0709088 100644 --- a/assets/minecraft/shaders/core/rendertype_text.json +++ b/assets/minecraft/shaders/core/rendertype_text.json @@ -19,7 +19,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/include/fog.glsl b/assets/minecraft/shaders/include/fog.glsl index bb30cdb..fd6b9dd 100644 --- a/assets/minecraft/shaders/include/fog.glsl +++ b/assets/minecraft/shaders/include/fog.glsl @@ -35,12 +35,12 @@ float linear_fog_fade(float fogDistance, float fogStart, float fogEnd) { return smoothstep(fogEnd, fogStart, fogDistance); } -float fog_distance(mat4 modelViewMat, vec3 pos, int shape) { +float fog_distance(vec3 pos, int shape) { if (shape == 0) { - return length((modelViewMat * vec4(pos, 1.0)).xyz); + return length(pos); } else { - float distXZ = length((modelViewMat * vec4(pos.x, 0.0, pos.z, 1.0)).xyz); - float distY = length((modelViewMat * vec4(0.0, pos.y, 0.0, 1.0)).xyz); + float distXZ = length(pos.xz); + float distY = abs(pos.y); return max(distXZ, distY); } } @@ -51,11 +51,4 @@ float fog_end_comp(vec4 fogColor, float fogStart, float fogEnd, float fogEndTarg fogEnd = mix(fogEnd, max(fogEndTarget, fogEnd), val); } return fogEnd; -} - -//backwards compatibility for pre 1.18.2 fog -float cylindrical_distance(mat4 ModelViewMat, vec3 pos) { - float distXZ = length((ModelViewMat * vec4(pos.x, 0.0, pos.z, 1.0)).xyz); - float distY = length((ModelViewMat * vec4(0.0, pos.y, 0.0, 1.0)).xyz); - return max(distXZ, distY); } \ No newline at end of file diff --git a/assets/minecraft/shaders/include/render/block.vsh b/assets/minecraft/shaders/include/render/block.vsh index fc59732..4766208 100644 --- a/assets/minecraft/shaders/include/render/block.vsh +++ b/assets/minecraft/shaders/include/render/block.vsh @@ -126,7 +126,7 @@ void main() { texCoord0 = UV0; vertexColor = Color; lightColor = getlight(Sampler2, UV2); - fogDistance = fog_distance(ModelViewMat, pos, FogShape); + fogDistance = fog_distance(pos, FogShape); gl_Position = ProjMat * ModelViewMat * vec4(pos, 1.0); glpos = gl_Position; } \ No newline at end of file diff --git a/assets/minecraft/shaders/include/render/entity.vsh b/assets/minecraft/shaders/include/render/entity.vsh index 604278d..c7ff99d 100644 --- a/assets/minecraft/shaders/include/render/entity.vsh +++ b/assets/minecraft/shaders/include/render/entity.vsh @@ -19,7 +19,6 @@ uniform sampler2D Sampler2; uniform float GameTime; uniform mat4 ModelViewMat; uniform mat4 ProjMat; -uniform mat3 IViewRotMat; uniform int FogShape; uniform float FogStart; uniform float FogEnd; @@ -66,7 +65,7 @@ void main() { #endif Distance = length(pos); - fogDistance = fog_distance(ModelViewMat, IViewRotMat * pos, FogShape); + fogDistance = fog_distance(pos, FogShape); vertexColor = minecraft_mix_light(Light0_Direction, Light1_Direction, normal, Color); lightColor = getlight(Sampler2, UV2); gl_Position = ProjMat * ModelViewMat * vec4(pos, 1.0); diff --git a/assets/minecraft/shaders/post/transparency.json b/assets/minecraft/shaders/post/transparency.json index 663301a..871f2a7 100644 --- a/assets/minecraft/shaders/post/transparency.json +++ b/assets/minecraft/shaders/post/transparency.json @@ -14,17 +14,9 @@ "weather", "temporalFrame", { "name": "temporals1", "width": 64, "height": 1, "bilinear": false }, - { "name": "temporals2", "width": 64, "height": 1, "bilinear": false }, - { "name": "time", "width": 2, "height": 1, "bilinear": false }, - { "name": "timeswap", "width": 2, "height": 1, "bilinear": false } + { "name": "temporals2", "width": 64, "height": 1, "bilinear": false } ], "passes": [ - {"name": "time", "intarget": "timeswap", "outtarget": "time", - "auxtargets": [ - {"name": "MainSampler", "id": "minecraft:main"} - ] - }, - {"name": "copy", "intarget": "time", "outtarget": "timeswap"}, {"name": "preprocess0", "intarget": "minecraft:main", "outtarget": "temporals2", "auxtargets": [ {"name": "PrevDataSampler","id": "temporals1"}, @@ -157,15 +149,6 @@ {"name":"Curve","values": [1.0]} ] }, - {"name": "blur1", "intarget": "swap1", "outtarget": "swap2", - "auxtargets": [ - {"name": "TimeSampler", "id": "time"} - ] - }, - {"name": "blur2", "intarget": "swap2", "outtarget": "minecraft:main", - "auxtargets": [ - {"name": "TimeSampler", "id": "time"} - ] - } + {"name": "copy", "intarget": "swap1", "outtarget": "minecraft:main"} ] } diff --git a/assets/minecraft/shaders/program/blur.vsh b/assets/minecraft/shaders/program/blur.vsh deleted file mode 100644 index 6305935..0000000 --- a/assets/minecraft/shaders/program/blur.vsh +++ /dev/null @@ -1,22 +0,0 @@ -#version 150 - -in vec4 Position; - -uniform sampler2D TimeSampler; -uniform vec2 OutSize; - -out vec2 texCoord; -flat out float blur; - -void main() { - float x = -1.0; - float y = -1.0; - - if (Position.x > 0.001) {x = 1;} - if (Position.y > 0.001) {y = 1;} - - blur = texelFetch(TimeSampler, ivec2(1,0), 0).r * 1.5; - - gl_Position = vec4(x, y, 0.2, 1.0); - texCoord = Position.xy / OutSize; -} \ No newline at end of file diff --git a/assets/minecraft/shaders/program/blur1.fsh b/assets/minecraft/shaders/program/blur1.fsh deleted file mode 100644 index 902bc93..0000000 --- a/assets/minecraft/shaders/program/blur1.fsh +++ /dev/null @@ -1,17 +0,0 @@ -#version 150 - -uniform sampler2D DiffuseSampler; -uniform vec2 OutSize; - -flat in float blur; - -out vec4 fragColor; - -const float[21] gauss = float[](0.04395898518126313, 0.04501528145376974, 0.045981873661850185, 0.0468519572388689, 0.047619322425857036, 0.04827842934039481, 0.04882447632370965, 0.049253460498130903, 0.04956222959597895, 0.04974852427081081, 0.04981092001873177, 0.04974852427081081, 0.04956222959597895, 0.049253460498130903, 0.04882447632370965, 0.04827842934039481, 0.047619322425857036, 0.0468519572388689, 0.045981873661850185, 0.04501528145376974, 0.04395898518126313); - -void main() { - fragColor = vec4(0); - for (int i = -10; i <=10; i++) { - fragColor += gauss[i+10]*texelFetch(DiffuseSampler, ivec2(clamp(gl_FragCoord.xy + vec2(i*blur,0), vec2(0), OutSize-1.0)), 0); - } -} diff --git a/assets/minecraft/shaders/program/blur1.json b/assets/minecraft/shaders/program/blur1.json deleted file mode 100644 index 2cbf848..0000000 --- a/assets/minecraft/shaders/program/blur1.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "blend": { - "func": "add", - "srcrgb": "one", - "dstrgb": "zero" - }, - "vertex": "blur", - "fragment": "blur1", - "attributes": [ "Position" ], - "samplers": [ - { "name": "DiffuseSampler" }, - { "name": "TimeSampler" } - ], - "uniforms": [ - { "name": "OutSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] } - ] -} diff --git a/assets/minecraft/shaders/program/blur2.fsh b/assets/minecraft/shaders/program/blur2.fsh deleted file mode 100644 index 1b5f485..0000000 --- a/assets/minecraft/shaders/program/blur2.fsh +++ /dev/null @@ -1,17 +0,0 @@ -#version 150 - -uniform sampler2D DiffuseSampler; -uniform vec2 OutSize; - -flat in float blur; - -out vec4 fragColor; - -const float[21] gauss = float[](0.04395898518126313, 0.04501528145376974, 0.045981873661850185, 0.0468519572388689, 0.047619322425857036, 0.04827842934039481, 0.04882447632370965, 0.049253460498130903, 0.04956222959597895, 0.04974852427081081, 0.04981092001873177, 0.04974852427081081, 0.04956222959597895, 0.049253460498130903, 0.04882447632370965, 0.04827842934039481, 0.047619322425857036, 0.0468519572388689, 0.045981873661850185, 0.04501528145376974, 0.04395898518126313); - -void main() { - fragColor = vec4(0); - for (int i = -10; i <=10; i++) { - fragColor += gauss[i+10]*texelFetch(DiffuseSampler, ivec2(clamp(gl_FragCoord.xy + vec2(0,i*blur), vec2(0), OutSize-1.0)), 0); - } -} diff --git a/assets/minecraft/shaders/program/blur2.json b/assets/minecraft/shaders/program/blur2.json deleted file mode 100644 index 5df9b5c..0000000 --- a/assets/minecraft/shaders/program/blur2.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "blend": { - "func": "add", - "srcrgb": "one", - "dstrgb": "zero" - }, - "vertex": "blur", - "fragment": "blur2", - "attributes": [ "Position" ], - "samplers": [ - { "name": "DiffuseSampler" }, - { "name": "TimeSampler" } - ], - "uniforms": [ - { "name": "OutSize", "type": "float", "count": 2, "values": [ 1.0, 1.0 ] } - ] -} diff --git a/changelog.txt b/changelog.txt index b056f94..ef99e78 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,10 @@ v++ -3.1 +3.2 ++Update to 1.21 + + +3.1 Blocks: +Nether Portal waves diff --git a/pack.mcmeta b/pack.mcmeta index cb32823..405d037 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 18, + "pack_format": 34, "description": "by Godlander" } } \ No newline at end of file