Skip to content

Commit 0c711a9

Browse files
henkelmaxhenkelmax
committed
Fix shaders not working
1 parent d6118ea commit 0c711a9

9 files changed

+264
-60
lines changed

‎changelog.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- Updated to 1.21.5
1+
- Fixed shaders not working

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jei_version=tAKVQHzc
1717
jade_version=15.1.6+neoforge
1818

1919
# Mod information
20-
mod_version=1.21.5-1.1.0
20+
mod_version=1.21.5-1.1.1
2121
mod_id=camera
2222
mod_display_name=Camera Mod
2323

‎src/main/resources/assets/camera/post_effect/black_and_white.json

+40-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
},
55
"passes": [
66
{
7-
"program": "minecraft:post/color_convolve",
7+
"vertex_shader": "minecraft:post/sobel",
8+
"fragment_shader": "minecraft:post/color_convolve",
89
"inputs": [
910
{
1011
"sampler_name": "In",
@@ -14,22 +15,56 @@
1415
"output": "swap",
1516
"uniforms": [
1617
{
17-
"name": "Saturation",
18+
"name": "RedMatrix",
19+
"type": "vec3",
1820
"values": [
19-
0
21+
0.3333,
22+
0.3333,
23+
0.3333
24+
]
25+
},
26+
{
27+
"name": "GreenMatrix",
28+
"type": "vec3",
29+
"values": [
30+
0.3333,
31+
0.3333,
32+
0.3333
33+
]
34+
},
35+
{
36+
"name": "BlueMatrix",
37+
"type": "vec3",
38+
"values": [
39+
0.3333,
40+
0.3333,
41+
0.3333
2042
]
2143
}
2244
]
2345
},
2446
{
25-
"program": "minecraft:post/blit",
47+
"vertex_shader": "minecraft:post/blit",
48+
"fragment_shader": "minecraft:post/blit",
2649
"inputs": [
2750
{
2851
"sampler_name": "In",
2952
"target": "swap"
3053
}
3154
],
55+
"uniforms": [
56+
{
57+
"name": "ColorModulate",
58+
"type": "vec4",
59+
"values": [
60+
1.0,
61+
1.0,
62+
1.0,
63+
1.0
64+
]
65+
}
66+
],
3267
"output": "minecraft:main"
3368
}
3469
]
35-
}
70+
}

‎src/main/resources/assets/camera/post_effect/blurry.json

+76-26
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
},
55
"passes": [
66
{
7-
"program": "minecraft:post/box_blur",
7+
"vertex_shader": "minecraft:post/blur",
8+
"fragment_shader": "minecraft:post/box_blur",
89
"inputs": [
910
{
1011
"sampler_name": "In",
@@ -16,15 +17,24 @@
1617
"uniforms": [
1718
{
1819
"name": "BlurDir",
20+
"type": "vec2",
1921
"values": [
20-
1,
21-
0
22+
1.0,
23+
0.0
24+
]
25+
},
26+
{
27+
"name": "Radius",
28+
"type": "float",
29+
"values": [
30+
10.0
2231
]
2332
}
2433
]
2534
},
2635
{
27-
"program": "minecraft:post/box_blur",
36+
"vertex_shader": "minecraft:post/blur",
37+
"fragment_shader": "minecraft:post/box_blur",
2838
"inputs": [
2939
{
3040
"sampler_name": "In",
@@ -36,15 +46,24 @@
3646
"uniforms": [
3747
{
3848
"name": "BlurDir",
49+
"type": "vec2",
50+
"values": [
51+
0.0,
52+
1.0
53+
]
54+
},
55+
{
56+
"name": "Radius",
57+
"type": "float",
3958
"values": [
40-
0,
41-
1
59+
10.0
4260
]
4361
}
4462
]
4563
},
4664
{
47-
"program": "minecraft:post/box_blur",
65+
"vertex_shader": "minecraft:post/blur",
66+
"fragment_shader": "minecraft:post/box_blur",
4867
"inputs": [
4968
{
5069
"sampler_name": "In",
@@ -56,16 +75,24 @@
5675
"uniforms": [
5776
{
5877
"name": "BlurDir",
78+
"type": "vec2",
5979
"values": [
60-
1,
61-
0
62-
],
63-
"RadiusMultiplier": 0.5
80+
1.0,
81+
0.0
82+
]
83+
},
84+
{
85+
"name": "Radius",
86+
"type": "float",
87+
"values": [
88+
5.0
89+
]
6490
}
6591
]
6692
},
6793
{
68-
"program": "minecraft:post/box_blur",
94+
"vertex_shader": "minecraft:post/blur",
95+
"fragment_shader": "minecraft:post/box_blur",
6996
"inputs": [
7097
{
7198
"sampler_name": "In",
@@ -77,16 +104,24 @@
77104
"uniforms": [
78105
{
79106
"name": "BlurDir",
107+
"type": "vec2",
108+
"values": [
109+
0.0,
110+
1.0
111+
]
112+
},
113+
{
114+
"name": "Radius",
115+
"type": "float",
80116
"values": [
81-
0,
82-
1
83-
],
84-
"RadiusMultiplier": 0.5
117+
5.0
118+
]
85119
}
86120
]
87121
},
88122
{
89-
"program": "minecraft:post/box_blur",
123+
"vertex_shader": "minecraft:post/blur",
124+
"fragment_shader": "minecraft:post/box_blur",
90125
"inputs": [
91126
{
92127
"sampler_name": "In",
@@ -98,16 +133,24 @@
98133
"uniforms": [
99134
{
100135
"name": "BlurDir",
136+
"type": "vec2",
137+
"values": [
138+
1.0,
139+
0.0
140+
]
141+
},
142+
{
143+
"name": "Radius",
144+
"type": "float",
101145
"values": [
102-
1,
103-
0
104-
],
105-
"RadiusMultiplier": 0.25
146+
2.5
147+
]
106148
}
107149
]
108150
},
109151
{
110-
"program": "minecraft:post/box_blur",
152+
"vertex_shader": "minecraft:post/blur",
153+
"fragment_shader": "minecraft:post/box_blur",
111154
"inputs": [
112155
{
113156
"sampler_name": "In",
@@ -119,11 +162,18 @@
119162
"uniforms": [
120163
{
121164
"name": "BlurDir",
165+
"type": "vec2",
122166
"values": [
123-
0,
124-
1
125-
],
126-
"RadiusMultiplier": 0.25
167+
0.0,
168+
1.0
169+
]
170+
},
171+
{
172+
"name": "Radius",
173+
"type": "float",
174+
"values": [
175+
2.5
176+
]
127177
}
128178
]
129179
}

‎src/main/resources/assets/camera/post_effect/desaturated.json

+40-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
},
55
"passes": [
66
{
7-
"program": "minecraft:post/color_convolve",
7+
"vertex_shader": "minecraft:post/sobel",
8+
"fragment_shader": "minecraft:post/color_convolve",
89
"inputs": [
910
{
1011
"sampler_name": "In",
@@ -14,22 +15,56 @@
1415
"output": "swap",
1516
"uniforms": [
1617
{
17-
"name": "Saturation",
18+
"name": "RedMatrix",
19+
"type": "vec3",
1820
"values": [
19-
0.4
21+
0.5,
22+
0.25,
23+
0.25
24+
]
25+
},
26+
{
27+
"name": "GreenMatrix",
28+
"type": "vec3",
29+
"values": [
30+
0.25,
31+
0.5,
32+
0.25
33+
]
34+
},
35+
{
36+
"name": "BlueMatrix",
37+
"type": "vec3",
38+
"values": [
39+
0.25,
40+
0.25,
41+
0.5
2042
]
2143
}
2244
]
2345
},
2446
{
25-
"program": "minecraft:post/blit",
47+
"vertex_shader": "minecraft:post/blit",
48+
"fragment_shader": "minecraft:post/blit",
2649
"inputs": [
2750
{
2851
"sampler_name": "In",
2952
"target": "swap"
3053
}
3154
],
55+
"uniforms": [
56+
{
57+
"name": "ColorModulate",
58+
"type": "vec4",
59+
"values": [
60+
1.0,
61+
1.0,
62+
1.0,
63+
1.0
64+
]
65+
}
66+
],
3267
"output": "minecraft:main"
3368
}
3469
]
35-
}
70+
}

‎src/main/resources/assets/camera/post_effect/inverted.json

+18-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
},
55
"passes": [
66
{
7-
"program": "minecraft:post/invert",
7+
"vertex_shader": "minecraft:post/blit",
8+
"fragment_shader": "minecraft:post/invert",
89
"inputs": [
910
{
1011
"sampler_name": "In",
@@ -15,20 +16,34 @@
1516
"uniforms": [
1617
{
1718
"name": "InverseAmount",
19+
"type": "float",
1820
"values": [
19-
1
21+
0.8
2022
]
2123
}
2224
]
2325
},
2426
{
25-
"program": "minecraft:post/blit",
27+
"vertex_shader": "minecraft:post/blit",
28+
"fragment_shader": "minecraft:post/blit",
2629
"inputs": [
2730
{
2831
"sampler_name": "In",
2932
"target": "swap"
3033
}
3134
],
35+
"uniforms": [
36+
{
37+
"name": "ColorModulate",
38+
"type": "vec4",
39+
"values": [
40+
1.0,
41+
1.0,
42+
1.0,
43+
1.0
44+
]
45+
}
46+
],
3247
"output": "minecraft:main"
3348
}
3449
]

0 commit comments

Comments
 (0)