From 39ee364418759e47f47bb308939a8fd1455173b2 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 14 Mar 2026 15:06:30 -0700 Subject: [PATCH] Improvements (#1516) --- dependencies.gradle | 4 +- .../client/font/BatchingFontRenderer.java | 19 +-- .../angelica/glsm/GLStateManager.java | 2 + .../glsm/streaming/StreamingUploader.java | 2 +- .../gtnewhorizons/angelica/mixins/Mixins.java | 1 + .../angelica/proxy/ClientProxy.java | 1 + .../angelica/render/SelectionBoxRenderer.java | 109 ++++++++++++++++++ .../iris/postprocess/CenterDepthSampler.java | 18 +-- .../angelica/shaders}/centerDepth.fsh | 0 .../angelica/shaders}/centerDepth.vsh | 0 .../angelica/shaders/selection_box.frag.glsl | 8 ++ .../angelica/shaders/selection_box.geom.glsl | 28 +++++ .../angelica/shaders/selection_box.vert.glsl | 19 +++ .../MixinRenderGlobal_SelectionBox.java | 20 ++++ 14 files changed, 201 insertions(+), 30 deletions(-) create mode 100644 src/main/java/com/gtnewhorizons/angelica/render/SelectionBoxRenderer.java rename src/main/resources/{ => assets/angelica/shaders}/centerDepth.fsh (100%) rename src/main/resources/{ => assets/angelica/shaders}/centerDepth.vsh (100%) create mode 100644 src/main/resources/assets/angelica/shaders/selection_box.frag.glsl create mode 100644 src/main/resources/assets/angelica/shaders/selection_box.geom.glsl create mode 100644 src/main/resources/assets/angelica/shaders/selection_box.vert.glsl create mode 100644 src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/rendering/MixinRenderGlobal_SelectionBox.java diff --git a/dependencies.gradle b/dependencies.gradle index aa28f288d..943174690 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -82,8 +82,8 @@ dependencies { compileOnly "org.apache.ant:ant:1.8.2" // Celeritas (transitive=false: deps provided by GTNHLib/runtime) - embedOnly("org.embeddedt.celeritas:celeritas-common:2.5.2-GTNH") { transitive = false } - embedOnly("org.embeddedt.celeritas:celeritas-lwjgl2-service:2.5.2-GTNH") { transitive = false } + embedOnly("org.embeddedt.celeritas:celeritas-common:2.5.3-GTNH") { transitive = false } + embedOnly("org.embeddedt.celeritas:celeritas-lwjgl2-service:2.5.3-GTNH") { transitive = false } // Because who doesn't want NEI devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.35-GTNH:dev') diff --git a/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java b/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java index fb5eecb4b..22449b3e4 100644 --- a/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java +++ b/src/main/java/com/gtnewhorizons/angelica/client/font/BatchingFontRenderer.java @@ -15,17 +15,17 @@ import net.coderbot.iris.gl.program.ProgramBuilder; import net.minecraft.client.gui.FontRenderer; import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; -import org.apache.commons.io.IOUtils; +import org.embeddedt.embeddium.impl.render.shader.ShaderLoader; import org.joml.Matrix4f; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL15; import org.lwjgl.opengl.GL20; import org.lwjgl.opengl.GL30; -import java.io.IOException; + import java.nio.ByteBuffer; import java.nio.FloatBuffer; -import java.nio.charset.StandardCharsets; + import java.util.Comparator; import java.util.Objects; @@ -68,16 +68,9 @@ public class BatchingFontRenderer { private static Program fontShader = null; public static Program getProgram() { if (fontShader == null) { - String vsh, fsh; - try { - fsh = new String(IOUtils.toByteArray(Objects.requireNonNull(FontAAShader.class.getResourceAsStream("/assets/angelica/shaders/fontFilter.fsh"))), StandardCharsets.UTF_8); - vsh = new String(IOUtils.toByteArray(Objects.requireNonNull(FontAAShader.class.getResourceAsStream("/assets/angelica/shaders/fontFilter.vsh"))), StandardCharsets.UTF_8); - } catch (IOException e) { - throw new RuntimeException(e); - } - - ProgramBuilder builder = ProgramBuilder.begin("fontFilter", vsh, null, fsh, ImmutableSet.of(0)); - fontShader = builder.build(); + final String vsh = ShaderLoader.getShaderSource("angelica:fontFilter.vsh"); + final String fsh = ShaderLoader.getShaderSource("angelica:fontFilter.fsh"); + fontShader = ProgramBuilder.begin("fontFilter", vsh, null, fsh, ImmutableSet.of(0)).build(); } return fontShader; } diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java index d5ec82807..89993bcb6 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/GLStateManager.java @@ -8,6 +8,7 @@ import com.gtnewhorizon.gtnhlib.client.renderer.DirectTessellator; import com.gtnewhorizon.gtnhlib.client.renderer.stacks.IStateStack; import com.gtnewhorizons.angelica.AngelicaMod; import com.gtnewhorizons.angelica.glsm.DisplayListManager.RecordMode; +import com.gtnewhorizons.angelica.render.SelectionBoxRenderer; import com.gtnewhorizons.angelica.glsm.ffp.ShaderManager; import com.gtnewhorizons.angelica.glsm.ffp.TessellatorStreamingDrawer; import com.gtnewhorizons.angelica.glsm.recording.CompiledDisplayList; @@ -583,6 +584,7 @@ public class GLStateManager { GL30.glBindVertexArray(defaultVAO); boundVAO = defaultVAO; VertexAttribState.init(defaultVAO); + SelectionBoxRenderer.init(); // Drain any pending GL errors from initialization. In core profile, some legacy queries may generate GL_INVALID_ENUM. The splash thread inherits the // DrawableGL context and its error state, so stale errors here would cause SplashProgress.checkGLError() to fail. diff --git a/src/main/java/com/gtnewhorizons/angelica/glsm/streaming/StreamingUploader.java b/src/main/java/com/gtnewhorizons/angelica/glsm/streaming/StreamingUploader.java index 53fcbd699..8ac72297b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/glsm/streaming/StreamingUploader.java +++ b/src/main/java/com/gtnewhorizons/angelica/glsm/streaming/StreamingUploader.java @@ -31,7 +31,7 @@ public final class StreamingUploader { } } - private static final int MAP_WRITE_INVALIDATE_BUFFER = GL30.GL_MAP_WRITE_BIT | GL30.GL_MAP_INVALIDATE_BUFFER_BIT | GL30.GL_MAP_UNSYNCHRONIZED_BIT; + private static final int MAP_WRITE_INVALIDATE_BUFFER = GL30.GL_MAP_WRITE_BIT | GL30.GL_MAP_INVALIDATE_BUFFER_BIT; public static int upload(ByteBuffer data, int capacity) { return upload(AngelicaMod.options().advanced.streamingUploadStrategy, data, capacity); diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 7305473eb..5e16e84e8 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -40,6 +40,7 @@ public enum Mixins implements IMixins { , "angelica.glsm.MixinSplashProgressCaching" , "angelica.gui.MixinGuiOptions" , "angelica.optimizations.MixinRendererLivingEntity" + , "angelica.rendering.MixinRenderGlobal_SelectionBox" ) ), diff --git a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java index 87e81ce27..1123fe137 100644 --- a/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java +++ b/src/main/java/com/gtnewhorizons/angelica/proxy/ClientProxy.java @@ -16,6 +16,7 @@ import com.gtnewhorizons.angelica.dynamiclights.config.EntityLightConfig; import com.gtnewhorizons.angelica.glsm.GLStateManager; import com.gtnewhorizons.angelica.glsm.debug.OpenGLDebugging; import com.gtnewhorizons.angelica.hudcaching.HUDCaching; + import com.gtnewhorizons.angelica.loading.AngelicaTweaker; import com.gtnewhorizons.angelica.mixins.interfaces.IGameSettingsExt; import com.gtnewhorizons.angelica.render.CloudRenderer; diff --git a/src/main/java/com/gtnewhorizons/angelica/render/SelectionBoxRenderer.java b/src/main/java/com/gtnewhorizons/angelica/render/SelectionBoxRenderer.java new file mode 100644 index 000000000..d61e55da3 --- /dev/null +++ b/src/main/java/com/gtnewhorizons/angelica/render/SelectionBoxRenderer.java @@ -0,0 +1,109 @@ +package com.gtnewhorizons.angelica.render; + +import com.gtnewhorizons.angelica.glsm.GLStateManager; +import com.gtnewhorizons.angelica.glsm.states.Color4; +import com.gtnewhorizons.angelica.glsm.uniform.GlUniformFloat2v; +import net.minecraft.util.AxisAlignedBB; +import org.embeddedt.embeddium.impl.gl.shader.GlProgram; +import org.embeddedt.embeddium.impl.gl.shader.GlShader; +import org.embeddedt.embeddium.impl.gl.shader.ShaderConstants; +import org.embeddedt.embeddium.impl.gl.shader.ShaderType; +import org.embeddedt.embeddium.impl.gl.shader.uniform.GlUniformFloat; +import org.embeddedt.embeddium.impl.gl.shader.uniform.GlUniformFloat3v; +import org.embeddedt.embeddium.impl.gl.shader.uniform.GlUniformFloat4v; +import org.embeddedt.embeddium.impl.gl.shader.uniform.GlUniformMatrix4f; +import org.embeddedt.embeddium.impl.render.shader.ShaderLoader; +import org.joml.Matrix4f; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL30; + +public final class SelectionBoxRenderer { + + private static GlProgram program; + private static int emptyVao; + private static final Matrix4f mvpMatrix = new Matrix4f(); + private static final float[] colorBuf = new float[4]; + + private SelectionBoxRenderer() {} + + public static void init() { + final boolean needsGS = GLStateManager.wideLineEmulationEnabled; + + final GlShader vs = ShaderLoader.loadShader(ShaderType.VERTEX, "angelica:selection_box.vert.glsl", ShaderConstants.EMPTY); + final GlShader fs = ShaderLoader.loadShader(ShaderType.FRAGMENT, "angelica:selection_box.frag.glsl", ShaderConstants.EMPTY); + final GlProgram.Builder builder = GlProgram.builder("SelectionBox").attachShader(vs).attachShader(fs); + + GlShader gs = null; + if (needsGS) { + gs = ShaderLoader.loadShader(ShaderType.GEOM, "angelica:selection_box.geom.glsl", ShaderConstants.EMPTY); + builder.attachShader(gs); + } + + program = builder.link(ctx -> new SelectionBoxUniforms( + ctx.bindUniform("u_MVP", GlUniformMatrix4f::new), + ctx.bindUniform("u_Min", GlUniformFloat3v::new), + ctx.bindUniform("u_Max", GlUniformFloat3v::new), + ctx.bindUniform("u_Color", GlUniformFloat4v::new), + needsGS ? ctx.bindUniform("u_ViewportSize", GlUniformFloat2v::new) : null, + needsGS ? ctx.bindUniform("u_LineWidth", GlUniformFloat::new) : null)); + + vs.destroy(); + fs.destroy(); + if (gs != null) gs.destroy(); + + emptyVao = GL30.glGenVertexArrays(); + } + + public static void draw(AxisAlignedBB aabb, int color) { + if (program == null) return; + + final SelectionBoxUniforms uniforms = program.getInterface(); + + program.bind(); + + GLStateManager.getProjectionMatrix().mul(GLStateManager.getModelViewMatrix(), mvpMatrix); + uniforms.mvp.set(mvpMatrix); + uniforms.min.set((float) aabb.minX, (float) aabb.minY, (float) aabb.minZ); + uniforms.max.set((float) aabb.maxX, (float) aabb.maxY, (float) aabb.maxZ); + + if (color != -1) { + colorBuf[0] = ((color >> 16) & 0xFF) / 255.0f; + colorBuf[1] = ((color >> 8) & 0xFF) / 255.0f; + colorBuf[2] = (color & 0xFF) / 255.0f; + colorBuf[3] = 1.0f; + } else { + final Color4 c = GLStateManager.getColor(); + colorBuf[0] = c.getRed(); + colorBuf[1] = c.getGreen(); + colorBuf[2] = c.getBlue(); + colorBuf[3] = c.getAlpha(); + } + uniforms.color.set(colorBuf); + + if (uniforms.viewportSize != null) { + uniforms.viewportSize.set(GLStateManager.getViewportState().width, GLStateManager.getViewportState().height); + uniforms.lineWidth.setFloat(GLStateManager.getLineState().getWidth()); + } + + GLStateManager.glBindVertexArray(emptyVao); + GL11.glDrawArrays(GL11.GL_LINES, 0, 24); + GLStateManager.glBindVertexArray(0); + + program.unbind(); + } + + public static void destroy() { + if (program != null) { + program.destroy(); + program = null; + } + if (emptyVao != 0) { + GL30.glDeleteVertexArrays(emptyVao); + emptyVao = 0; + } + } + + private record SelectionBoxUniforms(GlUniformMatrix4f mvp, GlUniformFloat3v min, GlUniformFloat3v max, GlUniformFloat4v color, GlUniformFloat2v viewportSize, GlUniformFloat lineWidth) { + + } +} diff --git a/src/main/java/net/coderbot/iris/postprocess/CenterDepthSampler.java b/src/main/java/net/coderbot/iris/postprocess/CenterDepthSampler.java index b13872ce3..e03fda742 100644 --- a/src/main/java/net/coderbot/iris/postprocess/CenterDepthSampler.java +++ b/src/main/java/net/coderbot/iris/postprocess/CenterDepthSampler.java @@ -14,13 +14,10 @@ import net.coderbot.iris.gl.texture.PixelType; import net.coderbot.iris.gl.uniform.UniformUpdateFrequency; import net.coderbot.iris.uniforms.SystemTimeUniforms; import net.minecraft.client.Minecraft; -import org.apache.commons.io.IOUtils; +import org.embeddedt.embeddium.impl.render.shader.ShaderLoader; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; -import java.io.IOException; -import java.nio.charset.StandardCharsets; -import java.util.Objects; import java.util.function.IntSupplier; public class CenterDepthSampler { @@ -45,16 +42,9 @@ public class CenterDepthSampler { GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, 0); this.framebuffer.addColorAttachment(0, texture); - ProgramBuilder builder; - - try { - String fsh = new String(IOUtils.toByteArray(Objects.requireNonNull(getClass().getResourceAsStream("/centerDepth.fsh"))), StandardCharsets.UTF_8); - String vsh = new String(IOUtils.toByteArray(Objects.requireNonNull(getClass().getResourceAsStream("/centerDepth.vsh"))), StandardCharsets.UTF_8); - - builder = ProgramBuilder.begin("centerDepthSmooth", vsh, null, fsh, ImmutableSet.of(0, 1, 2)); - } catch (IOException e) { - throw new RuntimeException(e); - } + String vsh = ShaderLoader.getShaderSource("angelica:centerDepth.vsh"); + String fsh = ShaderLoader.getShaderSource("angelica:centerDepth.fsh"); + ProgramBuilder builder = ProgramBuilder.begin("centerDepthSmooth", vsh, null, fsh, ImmutableSet.of(0, 1, 2)); builder.addDynamicSampler(depthSupplier, "depth"); builder.addDynamicSampler(() -> altTexture, "altDepth"); diff --git a/src/main/resources/centerDepth.fsh b/src/main/resources/assets/angelica/shaders/centerDepth.fsh similarity index 100% rename from src/main/resources/centerDepth.fsh rename to src/main/resources/assets/angelica/shaders/centerDepth.fsh diff --git a/src/main/resources/centerDepth.vsh b/src/main/resources/assets/angelica/shaders/centerDepth.vsh similarity index 100% rename from src/main/resources/centerDepth.vsh rename to src/main/resources/assets/angelica/shaders/centerDepth.vsh diff --git a/src/main/resources/assets/angelica/shaders/selection_box.frag.glsl b/src/main/resources/assets/angelica/shaders/selection_box.frag.glsl new file mode 100644 index 000000000..06177b991 --- /dev/null +++ b/src/main/resources/assets/angelica/shaders/selection_box.frag.glsl @@ -0,0 +1,8 @@ +#version 330 core + +uniform vec4 u_Color; +out vec4 fragColor; + +void main() { + fragColor = u_Color; +} diff --git a/src/main/resources/assets/angelica/shaders/selection_box.geom.glsl b/src/main/resources/assets/angelica/shaders/selection_box.geom.glsl new file mode 100644 index 000000000..f44bd8a51 --- /dev/null +++ b/src/main/resources/assets/angelica/shaders/selection_box.geom.glsl @@ -0,0 +1,28 @@ +#version 330 core + +layout(lines) in; +layout(triangle_strip, max_vertices = 4) out; + +uniform vec2 u_ViewportSize; +uniform float u_LineWidth; + +void main() { + vec4 c0 = gl_in[0].gl_Position; + vec4 c1 = gl_in[1].gl_Position; + + vec2 n0 = c0.xy / c0.w; + vec2 n1 = c1.xy / c1.w; + + vec2 dir = normalize((n1 - n0) * u_ViewportSize); + vec2 offset = vec2(-dir.y, dir.x) * u_LineWidth / u_ViewportSize; + + gl_Position = vec4((n0 + offset) * c0.w, c0.z, c0.w); + EmitVertex(); + gl_Position = vec4((n0 - offset) * c0.w, c0.z, c0.w); + EmitVertex(); + gl_Position = vec4((n1 + offset) * c1.w, c1.z, c1.w); + EmitVertex(); + gl_Position = vec4((n1 - offset) * c1.w, c1.z, c1.w); + EmitVertex(); + EndPrimitive(); +} diff --git a/src/main/resources/assets/angelica/shaders/selection_box.vert.glsl b/src/main/resources/assets/angelica/shaders/selection_box.vert.glsl new file mode 100644 index 000000000..ed19761ff --- /dev/null +++ b/src/main/resources/assets/angelica/shaders/selection_box.vert.glsl @@ -0,0 +1,19 @@ +#version 330 core + +uniform mat4 u_MVP; +uniform vec3 u_Min; +uniform vec3 u_Max; + +const vec3 edges[24] = vec3[24]( + vec3(0,0,0), vec3(1,0,0), vec3(1,0,0), vec3(1,0,1), + vec3(1,0,1), vec3(0,0,1), vec3(0,0,1), vec3(0,0,0), + vec3(0,1,0), vec3(1,1,0), vec3(1,1,0), vec3(1,1,1), + vec3(1,1,1), vec3(0,1,1), vec3(0,1,1), vec3(0,1,0), + vec3(0,0,0), vec3(0,1,0), vec3(1,0,0), vec3(1,1,0), + vec3(1,0,1), vec3(1,1,1), vec3(0,0,1), vec3(0,1,1) +); + +void main() { + vec3 pos = mix(u_Min, u_Max, edges[gl_VertexID]); + gl_Position = u_MVP * vec4(pos, 1.0); +} diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/rendering/MixinRenderGlobal_SelectionBox.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/rendering/MixinRenderGlobal_SelectionBox.java new file mode 100644 index 000000000..b412acbf2 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/angelica/rendering/MixinRenderGlobal_SelectionBox.java @@ -0,0 +1,20 @@ +package com.gtnewhorizons.angelica.mixins.early.angelica.rendering; + +import com.gtnewhorizons.angelica.render.SelectionBoxRenderer; +import net.minecraft.client.renderer.RenderGlobal; +import net.minecraft.util.AxisAlignedBB; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +@Mixin(RenderGlobal.class) +public class MixinRenderGlobal_SelectionBox { + + /** + * @author Angelica + * @reason Optimize selection box rendering + */ + @Overwrite + public static void drawOutlinedBoundingBox(AxisAlignedBB aabb, int color) { + SelectionBoxRenderer.draw(aabb, color); + } +}