Skip to content

Commit 401ebe2

Browse files
author
eaglercraft
committed
u23
1 parent 2ebb5d6 commit 401ebe2

File tree

1,261 files changed

+12766
-138431
lines changed

Some content is hidden

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

1,261 files changed

+12766
-138431
lines changed

‎CompileJS.bat‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
@echo off
2+
title gradlew generateJavascript
3+
gradlew generateJavascript
4+
pause

‎CompileJS.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/bin/sh
2+
chmod +x gradlew
3+
./gradlew generateJavascript

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

Lines changed: 116 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,116 @@
1-
#line 2
2-
3-
/*
4-
* Copyright (c) 2023 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-
in vec3 a_position3f;
20-
21-
#ifdef COMPILE_TEXTURE_ATTRIB
22-
in vec2 a_texture2f;
23-
out vec2 v_texture2f;
24-
uniform mat4 u_textureMat4f01;
25-
#endif
26-
27-
#ifdef COMPILE_COLOR_ATTRIB
28-
in vec4 a_color4f;
29-
out vec4 v_color4f;
30-
#endif
31-
32-
#ifdef COMPILE_NORMAL_ATTRIB
33-
in vec4 a_normal4f;
34-
out vec3 v_normal3f;
35-
out float v_block1f;
36-
#endif
37-
38-
#ifdef COMPILE_STATE_WAVING_BLOCKS
39-
uniform mat4 u_modelMatrix4f;
40-
uniform mat4 u_viewMatrix4f;
41-
uniform vec3 u_wavingBlockOffset3f;
42-
uniform vec4 u_wavingBlockParam4f;
43-
#ifndef COMPILE_NORMAL_ATTRIB
44-
uniform float u_blockConstant1f;
45-
#endif
46-
#define DO_COMPILE_STATE_WAVING_BLOCKS
47-
#define FAKE_SIN(valueIn, valueOut)\
48-
valueOut = abs(1.0 - fract(valueIn * 0.159155) * 2.0);\
49-
valueOut = valueOut * valueOut * (3.0 - 2.0 * valueOut) * 2.0 - 1.0;
50-
#define LIB_INCLUDE_WAVING_BLOCKS_FUNCTION
51-
#endif
52-
53-
#EAGLER INCLUDE (2) "eagler:glsl/deferred/lib/waving_blocks.glsl"
54-
55-
#ifdef COMPILE_NORMAL_MATERIAL_TEXTURE
56-
out vec3 v_viewdir3f;
57-
#endif
58-
59-
#ifdef COMPILE_LIGHTMAP_ATTRIB
60-
in vec2 a_lightmap2f;
61-
out vec2 v_lightmap2f;
62-
uniform mat4 u_textureMat4f02;
63-
#endif
64-
65-
uniform mat4 u_modelviewMat4f;
66-
uniform mat4 u_projectionMat4f;
67-
68-
#define TEX_MAT3(mat4In) mat3(mat4In[0].xyw,mat4In[1].xyw,mat4In[3].xyw)
69-
70-
void main() {
71-
72-
#ifdef COMPILE_TEXTURE_ATTRIB
73-
vec3 v_textureTmp3f = TEX_MAT3(u_textureMat4f01) * vec3(a_texture2f, 1.0);
74-
v_texture2f = v_textureTmp3f.xy / v_textureTmp3f.z;
75-
#endif
76-
77-
#ifdef COMPILE_COLOR_ATTRIB
78-
v_color4f = a_color4f;
79-
#endif
80-
81-
#ifdef COMPILE_NORMAL_ATTRIB
82-
v_normal3f = normalize(mat3(u_modelviewMat4f) * a_normal4f.xyz);
83-
float blockId = v_block1f = floor((a_normal4f.w + 1.0) * 127.0 + 0.5);
84-
#endif
85-
86-
#ifdef COMPILE_LIGHTMAP_ATTRIB
87-
vec3 v_lightmapTmp3f = TEX_MAT3(u_textureMat4f02) * vec3(a_lightmap2f, 1.0);
88-
v_lightmap2f = v_lightmapTmp3f.xy / v_lightmapTmp3f.z;
89-
#endif
90-
91-
vec4 pos = vec4(a_position3f, 1.0);
92-
93-
#ifdef DO_COMPILE_STATE_WAVING_BLOCKS
94-
#ifndef COMPILE_NORMAL_ATTRIB
95-
float blockId = u_blockConstant1f;
96-
#endif
97-
#ifdef COMPILE_LIGHTMAP_ATTRIB
98-
if(v_lightmap2f.y > 0.33) {
99-
COMPUTE_WAVING_BLOCKS(pos, min(v_lightmap2f.y * 3.0 - 1.0, 1.0), 24.0, blockId, u_modelMatrix4f, u_viewMatrix4f, u_modelviewMat4f, u_wavingBlockOffset3f, u_wavingBlockParam4f)
100-
}else {
101-
pos = u_modelviewMat4f * pos;
102-
}
103-
#else
104-
COMPUTE_WAVING_BLOCKS(pos, 1.0, 32.0, blockId, u_modelMatrix4f, u_viewMatrix4f, u_modelviewMat4f, u_wavingBlockOffset3f, u_wavingBlockParam4f)
105-
#endif
106-
#else
107-
pos = u_modelviewMat4f * pos;
108-
#endif
109-
110-
#ifdef COMPILE_NORMAL_MATERIAL_TEXTURE
111-
v_viewdir3f = pos.xyz / pos.w;
112-
#endif
113-
114-
gl_Position = u_projectionMat4f * pos;
115-
116-
}
1+
#line 2
2+
3+
/*
4+
* Copyright (c) 2023 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+
in vec3 a_position3f;
20+
21+
#ifdef COMPILE_TEXTURE_ATTRIB
22+
in vec2 a_texture2f;
23+
out vec2 v_texture2f;
24+
uniform mat4 u_textureMat4f01;
25+
#endif
26+
27+
#ifdef COMPILE_COLOR_ATTRIB
28+
in vec4 a_color4f;
29+
out vec4 v_color4f;
30+
#endif
31+
32+
#ifdef COMPILE_NORMAL_ATTRIB
33+
in vec4 a_normal4f;
34+
out vec3 v_normal3f;
35+
out float v_block1f;
36+
#endif
37+
38+
#ifdef COMPILE_STATE_WAVING_BLOCKS
39+
uniform mat4 u_modelMatrix4f;
40+
uniform mat4 u_viewMatrix4f;
41+
uniform vec3 u_wavingBlockOffset3f;
42+
uniform vec4 u_wavingBlockParam4f;
43+
#ifndef COMPILE_NORMAL_ATTRIB
44+
uniform float u_blockConstant1f;
45+
#endif
46+
#define DO_COMPILE_STATE_WAVING_BLOCKS
47+
#define FAKE_SIN(valueIn, valueOut)\
48+
valueOut = abs(1.0 - fract(valueIn * 0.159155) * 2.0);\
49+
valueOut = valueOut * valueOut * (3.0 - 2.0 * valueOut) * 2.0 - 1.0;
50+
#define LIB_INCLUDE_WAVING_BLOCKS_FUNCTION
51+
#endif
52+
53+
#EAGLER INCLUDE (2) "eagler:glsl/deferred/lib/waving_blocks.glsl"
54+
55+
#ifdef COMPILE_NORMAL_MATERIAL_TEXTURE
56+
out vec3 v_viewdir3f;
57+
#endif
58+
59+
#ifdef COMPILE_LIGHTMAP_ATTRIB
60+
in vec2 a_lightmap2f;
61+
out vec2 v_lightmap2f;
62+
uniform mat4 u_textureMat4f02;
63+
#endif
64+
65+
uniform mat4 u_modelviewMat4f;
66+
uniform mat4 u_projectionMat4f;
67+
68+
#define TEX_MAT3(mat4In) mat3(mat4In[0].xyw,mat4In[1].xyw,mat4In[3].xyw)
69+
70+
void main() {
71+
72+
#ifdef COMPILE_TEXTURE_ATTRIB
73+
vec3 v_textureTmp3f = TEX_MAT3(u_textureMat4f01) * vec3(a_texture2f, 1.0);
74+
v_texture2f = v_textureTmp3f.xy / v_textureTmp3f.z;
75+
#endif
76+
77+
#ifdef COMPILE_COLOR_ATTRIB
78+
v_color4f = a_color4f;
79+
#endif
80+
81+
#ifdef COMPILE_NORMAL_ATTRIB
82+
v_normal3f = normalize(mat3(u_modelviewMat4f) * a_normal4f.xyz);
83+
float blockId = v_block1f = floor((a_normal4f.w + 1.0) * 127.0 + 0.5);
84+
#endif
85+
86+
#ifdef COMPILE_LIGHTMAP_ATTRIB
87+
vec3 v_lightmapTmp3f = TEX_MAT3(u_textureMat4f02) * vec3(a_lightmap2f, 1.0);
88+
v_lightmap2f = v_lightmapTmp3f.xy / v_lightmapTmp3f.z;
89+
#endif
90+
91+
vec4 pos = vec4(a_position3f, 1.0);
92+
93+
#ifdef DO_COMPILE_STATE_WAVING_BLOCKS
94+
#ifndef COMPILE_NORMAL_ATTRIB
95+
float blockId = u_blockConstant1f;
96+
#endif
97+
#ifdef COMPILE_LIGHTMAP_ATTRIB
98+
if(v_lightmap2f.y > 0.33) {
99+
COMPUTE_WAVING_BLOCKS(pos, min(v_lightmap2f.y * 3.0 - 1.0, 1.0), 24.0, blockId, u_modelMatrix4f, u_viewMatrix4f, u_modelviewMat4f, u_wavingBlockOffset3f, u_wavingBlockParam4f)
100+
}else {
101+
pos = u_modelviewMat4f * pos;
102+
}
103+
#else
104+
COMPUTE_WAVING_BLOCKS(pos, 1.0, 32.0, blockId, u_modelMatrix4f, u_viewMatrix4f, u_modelviewMat4f, u_wavingBlockOffset3f, u_wavingBlockParam4f)
105+
#endif
106+
#else
107+
pos = u_modelviewMat4f * pos;
108+
#endif
109+
110+
#ifdef COMPILE_NORMAL_MATERIAL_TEXTURE
111+
v_viewdir3f = pos.xyz / pos.w;
112+
#endif
113+
114+
gl_Position = u_projectionMat4f * pos;
115+
116+
}

‎desktopRuntime/resources/assets/eagler/glsl/deferred/skybox_render_end.fsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ in vec3 v_position3f;
2424

2525
layout(location = 0) out vec4 output4f;
2626

27-
#define SKY_BRIGHTNESS 0.015
27+
#define SKY_BRIGHTNESS 0.05
2828

2929
uniform sampler2D u_skyTexture;
3030

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
org.gradle.jvmargs=-Xmx2G -Xms2G

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎src/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData;
88
import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem;
99
import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.DesktopClientConfigAdapter;
10-
import net.lax1dude.eaglercraft.v1_8.sp.server.classes.EaglerServerBootstrap;
1110
import net.lax1dude.eaglercraft.v1_8.sp.server.internal.lwjgl.MemoryConnection;
1211

1312
/**
@@ -29,7 +28,6 @@ public class ServerPlatformSingleplayer {
2928

3029
public static void initializeContext() {
3130
PlatformFilesystem.initialize();
32-
EaglerServerBootstrap.staticInit();
3331
}
3432

3533
public static void sendPacket(IPCPacketData packet) {

‎src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,17 @@ public class EaglercraftVersion {
1010
/// Customize these to fit your fork:
1111

1212
public static final String projectForkName = "EaglercraftX";
13-
public static final String projectForkVersion = "u22";
13+
public static final String projectForkVersion = "u23";
1414
public static final String projectForkVendor = "lax1dude";
1515

1616
public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8";
1717

1818
//////////////////////////////////////////////////////////////////////
1919

20-
21-
22-
// Do not change these, they must stay as credit to lax1dude's
23-
// original repository for maintaining the project:
24-
2520
public static final String projectOriginName = "EaglercraftX";
2621
public static final String projectOriginAuthor = "lax1dude";
2722
public static final String projectOriginRevision = "1.8";
28-
public static final String projectOriginVersion = "u22";
23+
public static final String projectOriginVersion = "u23";
2924

3025
public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; // rest in peace
3126

@@ -36,7 +31,7 @@ public class EaglercraftVersion {
3631
public static final boolean enableUpdateService = true;
3732

3833
public static final String updateBundlePackageName = "net.lax1dude.eaglercraft.v1_8.client";
39-
public static final int updateBundlePackageVersionInt = 22;
34+
public static final int updateBundlePackageVersionInt = 23;
4035

4136
public static final String updateLatestLocalStorageKey = "latestUpdate_" + updateBundlePackageName;
4237

‎src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f;
1818

1919
/**
20-
* Copyright (c) 2023 lax1dude. All Rights Reserved.
20+
* Copyright (c) 2022 lax1dude. All Rights Reserved.
2121
*
2222
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
2323
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

‎src/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,6 +1620,24 @@ public void combineGBuffersAndIlluminate() {
16201620

16211621
DeferredStateManager.checkGLError("combineGBuffersAndIlluminate(): NETHER SKY IRRADIANCE MAP");
16221622

1623+
}else if(dim == 1) {
1624+
1625+
// =============== END SKY REFLECTION MAP ================ //
1626+
1627+
_wglBindFramebuffer(_GL_FRAMEBUFFER, envMapSkyFramebuffer);
1628+
GlStateManager.clearColor(0.1f, 0.06f, 0.19f, 1.0f);
1629+
GlStateManager.clear(GL_COLOR_BUFFER_BIT);
1630+
1631+
DeferredStateManager.checkGLError("combineGBuffersAndIlluminate(): END SKY REFLECTION MAP");
1632+
1633+
// =============== END SKY IRRADIANCE MAP ================ //
1634+
1635+
_wglBindFramebuffer(_GL_FRAMEBUFFER, skyIrradianceFramebuffer);
1636+
GlStateManager.clearColor(0.05f, 0.03f, 0.09f, 1.0f);
1637+
GlStateManager.clear(GL_COLOR_BUFFER_BIT);
1638+
1639+
DeferredStateManager.checkGLError("combineGBuffersAndIlluminate(): END SKY IRRADIANCE MAP");
1640+
16231641
}
16241642

16251643
}

0 commit comments

Comments
 (0)