Skip to content

Commit 16648bc

Browse files
author
eaglercraft
committed
u34
1 parent cfab2e8 commit 16648bc

File tree

94 files changed

+2126
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+2126
-172
lines changed

‎desktopRuntime/resources/assets/eagler/glsl/accel_particle.vsh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ out vec4 v_color4f;
3333

3434
uniform mat4 u_matrixTransform;
3535
uniform vec3 u_texCoordSize2f_particleSize1f;
36-
uniform vec4 u_transformParam_1_2_3_4_f;
37-
uniform float u_transformParam_5_f;
36+
uniform vec3 u_transformParam_1_2_5_f;
37+
uniform vec2 u_transformParam_3_4_f;
3838
uniform vec4 u_color4f;
3939

4040
uniform sampler2D u_lightmapTexture;
@@ -51,11 +51,8 @@ void main() {
5151

5252
vec3 pos3f = p_position3f;
5353
vec2 spos2f = a_position2f * particleSize;
54-
pos3f.x += u_transformParam_1_2_3_4_f.x * spos2f.x;
55-
pos3f.x += u_transformParam_1_2_3_4_f.w * spos2f.y;
56-
pos3f.y += u_transformParam_1_2_3_4_f.y * spos2f.y;
57-
pos3f.z += u_transformParam_1_2_3_4_f.z * spos2f.x;
58-
pos3f.z += u_transformParam_5_f * spos2f.y;
54+
pos3f += u_transformParam_1_2_5_f * spos2f.xyy;
55+
pos3f.zx += u_transformParam_3_4_f * spos2f;
5956

6057
gl_Position = u_matrixTransform * vec4(pos3f, 1.0);
6158
}

‎desktopRuntime/resources/assets/eagler/glsl/deferred/accel_particle.vsh‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ uniform mat4 u_matrixTransform;
4343
#endif
4444

4545
uniform vec3 u_texCoordSize2f_particleSize1f;
46-
uniform vec4 u_transformParam_1_2_3_4_f;
47-
uniform float u_transformParam_5_f;
46+
uniform vec3 u_transformParam_1_2_5_f;
47+
uniform vec2 u_transformParam_3_4_f;
4848

4949
void main() {
5050
v_color4f = p_color4f.bgra;
@@ -59,11 +59,8 @@ void main() {
5959

6060
vec3 pos3f = p_position3f;
6161
vec2 spos2f = a_position2f * particleSize;
62-
pos3f.x += u_transformParam_1_2_3_4_f.x * spos2f.x;
63-
pos3f.x += u_transformParam_1_2_3_4_f.w * spos2f.y;
64-
pos3f.y += u_transformParam_1_2_3_4_f.y * spos2f.y;
65-
pos3f.z += u_transformParam_1_2_3_4_f.z * spos2f.x;
66-
pos3f.z += u_transformParam_5_f * spos2f.y;
62+
pos3f += u_transformParam_1_2_5_f * spos2f.xyy;
63+
pos3f.zx += u_transformParam_3_4_f * spos2f;
6764

6865
#ifdef COMPILE_GBUFFER_VSH
6966
gl_Position = u_matrixTransform * vec4(pos3f, 1.0);

‎desktopRuntime/resources/assets/eagler/glsl/deferred/emissive_items.csv‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ minecraft:torch,0,1.0000,0.5983,0.2655,10.0
66
minecraft:redstone_torch,0,1.0000,0.1578,0.0000,4.0
77
minecraft:sea_lantern,0,0.5530,0.6468,1.0000,10.0,
88
minecraft:lava_bucket,0,1.0000,0.4461,0.1054,6.0,
9-
minecraft:nether_star,0,0.5711,0.6611,1.0000,6.0
9+
minecraft:nether_star,0,0.5711,0.6611,1.0000,6.0
10+
minecraft:ender_eye,0,0.1990,0.7750,0.4130,4.0

‎desktopRuntime/resources/assets/eagler/glsl/deferred/shader_pack_info.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "§eHigh Performance PBR",
33
"desc": "Pack made from scratch specifically for this client, designed to give what I call the best balance between quality and performance possible in a browser but obviously that's just my opinion",
4-
"vers": "1.1.0",
4+
"vers": "1.2.0",
55
"author": "lax1dude",
66
"api_vers": 1,
77
"features": [

‎desktopRuntime/resources/assets/eagler/glsl/dynamiclights/accel_particle_dynamiclights.fsh‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
#line 2
2+
3+
/*
4+
* Copyright (c) 2024 lax1dude. All Rights Reserved.
5+
*
6+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
7+
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
8+
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
9+
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
10+
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
11+
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
12+
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
13+
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
14+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
15+
* POSSIBILITY OF SUCH DAMAGE.
16+
*
17+
*/
18+
19+
precision lowp int;
20+
precision mediump float;
21+
precision mediump sampler2D;
22+
23+
in vec4 v_position4f;
24+
in vec2 v_texCoord2f;
25+
in vec4 v_color4f;
26+
in vec2 v_lightmap2f;
27+
28+
layout(location = 0) out vec4 output4f;
29+
30+
uniform sampler2D u_inputTexture;
31+
uniform sampler2D u_lightmapTexture;
32+
33+
uniform mat4 u_inverseViewMatrix4f;
34+
35+
layout(std140) uniform u_chunkLightingData {
36+
mediump int u_dynamicLightCount1i;
37+
mediump int _paddingA_;
38+
mediump int _paddingB_;
39+
mediump int _paddingC_;
40+
mediump vec4 u_dynamicLightArray[12];
41+
};
42+
43+
void main() {
44+
vec4 color = texture(u_inputTexture, v_texCoord2f) * v_color4f;
45+
46+
if(color.a < 0.004) {
47+
discard;
48+
}
49+
50+
vec4 light;
51+
float diffuse = 0.0;
52+
if(u_dynamicLightCount1i > 0) {
53+
vec4 worldPosition4f = u_inverseViewMatrix4f * v_position4f;
54+
worldPosition4f.xyz /= worldPosition4f.w;
55+
vec3 normalVector3f = normalize(u_inverseViewMatrix4f[2].xyz);
56+
int safeLightCount = u_dynamicLightCount1i > 12 ? 0 : u_dynamicLightCount1i;
57+
for(int i = 0; i < safeLightCount; ++i) {
58+
light = u_dynamicLightArray[i];
59+
light.xyz = light.xyz - worldPosition4f.xyz;
60+
diffuse += max(dot(normalize(light.xyz), normalVector3f) * 0.8 + 0.2, 0.0) * max(light.w - sqrt(dot(light.xyz, light.xyz)), 0.0);
61+
}
62+
}
63+
64+
color *= texture(u_lightmapTexture, vec2(min(v_lightmap2f.x + diffuse * 0.066667, 1.0), v_lightmap2f.y));
65+
66+
output4f = color;
67+
}

‎desktopRuntime/resources/assets/eagler/glsl/dynamiclights/accel_particle_dynamiclights.vsh‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
#line 2
2+
3+
/*
4+
* Copyright (c) 2024 lax1dude. All Rights Reserved.
5+
*
6+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
7+
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
8+
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
9+
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
10+
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
11+
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
12+
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
13+
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
14+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
15+
* POSSIBILITY OF SUCH DAMAGE.
16+
*
17+
*/
18+
19+
precision lowp int;
20+
precision highp float;
21+
precision mediump sampler2D;
22+
23+
layout(location = 0) in vec2 a_position2f;
24+
25+
layout(location = 1) in vec3 p_position3f;
26+
layout(location = 2) in vec2 p_texCoords2i;
27+
layout(location = 3) in vec2 p_lightMap2f;
28+
layout(location = 4) in vec2 p_particleSize_texCoordsSize_2i;
29+
layout(location = 5) in vec4 p_color4f;
30+
31+
out vec4 v_position4f;
32+
out vec2 v_texCoord2f;
33+
out vec4 v_color4f;
34+
out vec2 v_lightmap2f;
35+
36+
uniform mat4 u_modelViewMatrix4f;
37+
uniform mat4 u_projectionMatrix4f;
38+
uniform vec3 u_texCoordSize2f_particleSize1f;
39+
uniform vec3 u_transformParam_1_2_5_f;
40+
uniform vec2 u_transformParam_3_4_f;
41+
uniform vec4 u_color4f;
42+
43+
void main() {
44+
v_color4f = u_color4f * p_color4f.bgra;
45+
v_lightmap2f = p_lightMap2f;
46+
47+
vec2 tex2f = a_position2f * 0.5 + 0.5;
48+
tex2f.y = 1.0 - tex2f.y;
49+
tex2f = p_texCoords2i + tex2f * p_particleSize_texCoordsSize_2i.y;
50+
v_texCoord2f = tex2f * u_texCoordSize2f_particleSize1f.xy;
51+
52+
float particleSize = u_texCoordSize2f_particleSize1f.z * p_particleSize_texCoordsSize_2i.x;
53+
54+
vec3 pos3f = p_position3f;
55+
vec2 spos2f = a_position2f * particleSize;
56+
pos3f += u_transformParam_1_2_5_f * spos2f.xyy;
57+
pos3f.zx += u_transformParam_3_4_f * spos2f;
58+
59+
v_position4f = u_modelViewMatrix4f * vec4(pos3f, 1.0);
60+
gl_Position = u_projectionMatrix4f * v_position4f;
61+
}

0 commit comments

Comments
 (0)