Skip to content

Commit 41c1b30

Browse files
committed
current error
1 parent b6f0395 commit 41c1b30

File tree

4 files changed

+130
-46
lines changed

4 files changed

+130
-46
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
#version 460
2+
3+
uniform sampler2D DiffuseSampler;
4+
uniform float DesaturateFactor;
5+
uniform float SpreadFactor;
6+
uniform float Severity;
7+
8+
in vec2 texCoord;
9+
out vec4 fragColor;
10+
11+
vec3 spread(vec3 color, float factor) {
12+
float mul = 1.0 + ((color.r + color.g + color.b) * 1.0 - 1.0) * factor;
13+
return color * mul;
14+
}
15+
16+
vec3 desaturate(vec3 color, float factor) {
17+
vec3 luma = vec3(0.299, 0.587, 0.114);
18+
vec3 gray = vec3(dot(luma, color));
19+
return mix(color, gray, factor);
20+
}
21+
22+
void main() {
23+
vec4 color = texture(DiffuseSampler, texCoord);
24+
25+
// spreading and desaturation based on severity
26+
color.rgb = desaturate(spread(color.rgb, SpreadFactor * Severity), DesaturateFactor * Severity);
27+
28+
// tunnel vision
29+
float vignette = smoothstep(0.3, 1.0, length(texCoord - 0.5));
30+
color.rgb *= mix(1.0, 0.4, vignette * Severity);
31+
32+
fragColor = color;
33+
}
Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
{
2+
"targets": [
3+
"swap"
4+
],
5+
"vertex": "minecraft:blit_screen",
6+
"fragment": "qstorage:oxygen_deprivation",
7+
"passes": [
8+
{
9+
"name": "oxygen_deprivation",
10+
"vertex": "minecraft:blit_screen",
11+
"fragment": "qstorage:oxygen_deprivation",
12+
"intarget": "minecraft:main",
13+
"outtarget": "swap",
14+
"use_linear_filter": true,
15+
"uniforms": [
16+
{
17+
"name": "DesaturateFactor",
18+
"values": [0.0]
19+
},
20+
{
21+
"name": "SpreadFactor",
22+
"values": [0.0]
23+
},
24+
{
25+
"name": "Severity",
26+
"values": [0.0]
27+
}
28+
]
29+
},
30+
{
31+
"name": "oxygen_deprivation",
32+
"vertex": "minecraft:blit_screen",
33+
"fragment": "qstorage:oxygen_deprivation",
34+
"intarget": "swap",
35+
"outtarget": "minecraft:main",
36+
"use_linear_filter": true,
37+
"uniforms": [
38+
{
39+
"name": "DesaturateFactor",
40+
"values": [0.0]
41+
},
42+
{
43+
"name": "SpreadFactor",
44+
"values": [0.0]
45+
},
46+
{
47+
"name": "Severity",
48+
"values": [0.0]
49+
}
50+
]
51+
}
52+
]
53+
}

src/main/resources/assets/qstorage/shaders/core/oxygen_deprivation.fsh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#version 460
1+
#version 150
22

33
uniform sampler2D DiffuseSampler;
44
uniform float DesaturateFactor;
Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,53 @@
11
{
2-
"blend": {
3-
"func": "add",
4-
"srcrgb": "srcalpha",
5-
"dstrgb": "1-srcalpha"
6-
},
2+
"targets": [
3+
"swap"
4+
],
75
"vertex": "minecraft:blit_screen",
86
"fragment": "qstorage:oxygen_deprivation",
9-
"attributes": [
10-
"Position"
11-
],
12-
"samplers": [
13-
{
14-
"name": "DiffuseSampler",
15-
"filter": "linear"
16-
}
17-
],
18-
"uniforms": [
7+
"passes": [
198
{
20-
"name": "ProjMat",
21-
"type": "matrix4x4",
22-
"count": 16,
23-
"values": [
24-
1, 0, 0, 0,
25-
0, 1, 0, 0,
26-
0, 0, 1, 0,
27-
0, 0, 0, 1
9+
"name": "oxygen_deprivation",
10+
"vertex": "minecraft:blit_screen",
11+
"fragment": "qstorage:oxygen_deprivation",
12+
"intarget": "minecraft:main",
13+
"outtarget": "swap",
14+
"use_linear_filter": true,
15+
"uniforms": [
16+
{
17+
"name": "DesaturateFactor",
18+
"values": [0.0]
19+
},
20+
{
21+
"name": "SpreadFactor",
22+
"values": [0.0]
23+
},
24+
{
25+
"name": "Severity",
26+
"values": [0.0]
27+
}
2828
]
2929
},
3030
{
31-
"name": "OutSize",
32-
"type": "float",
33-
"count": 2,
34-
"values": [1, 1]
35-
},
36-
{
37-
"name": "DesaturateFactor",
38-
"type": "float",
39-
"count": 1,
40-
"values": [0.0]
41-
},
42-
{
43-
"name": "SpreadFactor",
44-
"type": "float",
45-
"count": 1,
46-
"values": [0.0]
47-
},
48-
{
49-
"name": "Severity",
50-
"type": "float",
51-
"count": 1,
52-
"values": [0.0]
31+
"name": "oxygen_deprivation",
32+
"vertex": "minecraft:blit_screen",
33+
"fragment": "qstorage:oxygen_deprivation",
34+
"intarget": "swap",
35+
"outtarget": "minecraft:main",
36+
"use_linear_filter": true,
37+
"uniforms": [
38+
{
39+
"name": "DesaturateFactor",
40+
"values": [0.0]
41+
},
42+
{
43+
"name": "SpreadFactor",
44+
"values": [0.0]
45+
},
46+
{
47+
"name": "Severity",
48+
"values": [0.0]
49+
}
50+
]
5351
}
5452
]
5553
}

0 commit comments

Comments
 (0)