Skip to content
This repository has been archived by the owner on Dec 12, 2024. It is now read-only.

Commit

Permalink
update to 1.21
Browse files Browse the repository at this point in the history
  • Loading branch information
Godlander committed Jun 21, 2024
1 parent 4e8a8d6 commit 4a7fb18
Show file tree
Hide file tree
Showing 47 changed files with 34 additions and 175 deletions.
2 changes: 1 addition & 1 deletion assets/minecraft/shaders/core/position_color.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
1 change: 0 additions & 1 deletion assets/minecraft/shaders/core/position_tex.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] },
Expand Down
3 changes: 1 addition & 2 deletions assets/minecraft/shaders/core/render/armor.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ uniform sampler2D Sampler2;

uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform mat3 IViewRotMat;
uniform int FogShape;

uniform vec3 Light0_Direction;
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion assets/minecraft/shaders/core/render/clouds.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 4 additions & 5 deletions assets/minecraft/shaders/core/render/crumbling.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ uniform sampler2D Sampler0;

uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform mat3 IViewRotMat;

out vec4 vertexColor;
out vec2 texCoord0;
Expand All @@ -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);
}

Expand Down
3 changes: 1 addition & 2 deletions assets/minecraft/shaders/core/render/end_crystal_beam.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ uniform sampler2D Sampler2;

uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform mat3 IViewRotMat;
uniform int FogShape;

uniform vec3 Light0_Direction;
Expand All @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions assets/minecraft/shaders/core/render/end_portal.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ in vec3 Position;

uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform mat3 IViewRotMat;
uniform int FogShape;

out float fogDistance;
Expand All @@ -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);
}
2 changes: 1 addition & 1 deletion assets/minecraft/shaders/core/render/energy_swirl.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
3 changes: 1 addition & 2 deletions assets/minecraft/shaders/core/render/eyes.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ in vec2 UV0;

uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform mat3 IViewRotMat;
uniform int FogShape;

out float fogDistance;
Expand All @@ -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;
}
2 changes: 1 addition & 1 deletion assets/minecraft/shaders/core/render/glint_armor.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
3 changes: 1 addition & 2 deletions assets/minecraft/shaders/core/render/glint_item.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ in vec2 UV0;

uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform mat3 IViewRotMat;
uniform mat4 TextureMat;
uniform int FogShape;

Expand All @@ -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;
}
3 changes: 1 addition & 2 deletions assets/minecraft/shaders/core/render/gui_texture.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions assets/minecraft/shaders/core/render/leash.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ uniform sampler2D Sampler2;

uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform mat3 IViewRotMat;
uniform vec4 ColorModulator;
uniform int FogShape;

Expand All @@ -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);
}
3 changes: 1 addition & 2 deletions assets/minecraft/shaders/core/render/lightning.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ in vec4 Color;

uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform mat3 IViewRotMat;
uniform int FogShape;

out float fogDistance;
Expand All @@ -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;
}
2 changes: 1 addition & 1 deletion assets/minecraft/shaders/core/render/lines.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,6 @@ void main() {
}
glpos = gl_Position;

fogDistance = fog_distance(ModelViewMat, Position, FogShape);
fogDistance = fog_distance(Position, FogShape);
vertexColor = col;
}
2 changes: 1 addition & 1 deletion assets/minecraft/shaders/core/render/particle.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions assets/minecraft/shaders/core/render/shadow.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ in vec2 UV0;

uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform mat3 IViewRotMat;
uniform int FogShape;

out float fogDistance;
Expand All @@ -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;
}
3 changes: 1 addition & 2 deletions assets/minecraft/shaders/core/render/text.vsh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ uniform sampler2D Sampler2;

uniform mat4 ModelViewMat;
uniform mat4 ProjMat;
uniform mat3 IViewRotMat;
uniform int FogShape;

out float fogDistance;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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] },
Expand Down
1 change: 0 additions & 1 deletion assets/minecraft/shaders/core/rendertype_entity_glint.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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] },
Expand Down
1 change: 0 additions & 1 deletion assets/minecraft/shaders/core/rendertype_entity_solid.json
Original file line number Diff line number Diff line change
Expand Up @@ -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] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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] },
Expand Down
1 change: 0 additions & 1 deletion assets/minecraft/shaders/core/rendertype_eyes.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] },
Expand Down
1 change: 0 additions & 1 deletion assets/minecraft/shaders/core/rendertype_glint_direct.json
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ] },
Expand Down
Loading

0 comments on commit 4a7fb18

Please sign in to comment.