From a15ef68de8e33df296c565d12994df2ee965626e Mon Sep 17 00:00:00 2001 From: Vixid <52578495+VixidDev@users.noreply.github.com> Date: Sat, 27 Apr 2024 12:07:55 +0100 Subject: Improvement: Added Outline to Custom Scoreboard (#1461) Co-authored-by: J10a1n15 <45315647+j10a1n15@users.noreply.github.com> Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com> --- src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt | 6 ++++++ src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt | 3 +++ 2 files changed, 9 insertions(+) (limited to 'src/main/java/at/hannibal2/skyhanni/utils/shader') diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt index 03b2fb3ac..8bbe5bba3 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/Shader.kt @@ -100,6 +100,12 @@ abstract class Shader(val vertex: String, val fragment: String) { fun disable() = ShaderHelper.glUseProgram(0) + /** + * @param uniformType Type of uniform, there should be a 1 to 1 equivalent to that in the shader file + * @param name The name of the uniform in the shader file. This should match exactly to the name given + * to the uniform in the shader file. + * @param uniformValuesSupplier The supplier that changes / sets the uniform's value + */ fun registerUniform(uniformType: Uniform.UniformType, name: String, uniformValuesSupplier: Supplier) { uniforms.add(Uniform(this, uniformType, name, uniformValuesSupplier)) } diff --git a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt index 3c6bc5ce0..3efcb0b77 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/shader/ShaderManager.kt @@ -2,6 +2,7 @@ package at.hannibal2.skyhanni.utils.shader import at.hannibal2.skyhanni.features.chroma.StandardChromaShader import at.hannibal2.skyhanni.features.chroma.TexturedChromaShader +import at.hannibal2.skyhanni.features.misc.RoundedRectangleOutlineShader import at.hannibal2.skyhanni.features.misc.RoundedRectangleShader import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.LorenzUtils @@ -25,6 +26,7 @@ object ShaderManager { STANDARD_CHROMA(StandardChromaShader.INSTANCE), TEXTURED_CHROMA(TexturedChromaShader.INSTANCE), ROUNDED_RECTANGLE(RoundedRectangleShader.INSTANCE), + ROUNDED_RECT_OUTLINE(RoundedRectangleOutlineShader.INSTANCE), ; companion object { @@ -33,6 +35,7 @@ object ShaderManager { "standard_chroma" -> STANDARD_CHROMA.shader "textured_chroma" -> TEXTURED_CHROMA.shader "rounded_rect" -> ROUNDED_RECTANGLE.shader + "rounded_rect_outline" -> ROUNDED_RECT_OUTLINE.shader else -> { null } -- cgit