Compare commits

..
104 changed files with 2635 additions and 3585 deletions

No files matched your search

+1 -1
View File
@@ -23,7 +23,7 @@ Targets GL 3.3+ core profile
# Required Dependencies
* [UniMixins](https://github.com/LegacyModdingMC/UniMixins/releases) >= 0.1.23
* [GTNHLib](https://github.com/GTNewHorizons/GTNHLib/releases) >= 0.9.0
* [GTNHLib](https://github.com/GTNewHorizons/GTNHLib/releases) >= 0.11.19
* NOTE: Some mods are not required, but a specific version is required if present - see: `Permanent Incompatibilities` below.
# Known (temporary) Incompatibilities
+5 -5
View File
@@ -12,11 +12,11 @@ tasks.withType<DowngradeFiles>().configureEach { logLevel.set("FATAL") }
minecraft {
extraRunJvmArguments.add("-Dangelica.enableTestBlocks=true")
extraRunJvmArguments.add("-Dangelica.dumpClass=true")
//extraRunJvmArguments.add("-Dangelica.useVulkan=true")
//extraRunJvmArguments.add("-Dangelica.vulkanDebug=true")
//extraRunJvmArguments.add("-Dorg.lwjgl.util.Debug=true")
//extraRunJvmArguments.addAll("-Dlegacy.debugClassLoadingSave=true")
//extraRunJvmArguments.addAll("-Drfb.dumpLoadedClasses=true", "-Drfb.dumpLoadedClassesPerTransformer=true")
// extraRunJvmArguments.add("-Dangelica.useVulkan=true")
// extraRunJvmArguments.add("-Dangelica.vulkanDebug=true")
// extraRunJvmArguments.add("-Dorg.lwjgl.util.Debug=true")
// extraRunJvmArguments.addAll("-Dlegacy.debugClassLoadingSave=true")
// extraRunJvmArguments.addAll("-Drfb.dumpLoadedClasses=true", "-Drfb.dumpLoadedClassesPerTransformer=true")
//extraRunJvmArguments.add("-Dangelica.redirectorLogspam=true")
}
+5 -16
View File
@@ -63,13 +63,10 @@ configurations {
// Exclude self-reference from all configurations - prevents transitive Angelica deps from resolving against this project
configurations.all {
exclude group: "com.github.GTNewHorizons", module: "Angelica"
resolutionStrategy {
force 'com.github.GTNewHorizons:Hodgepodge:9:dev'
}
}
dependencies {
implementation("com.github.GTNewHorizons:Hodgepodge:9:dev")
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.158:dev")
compileOnly("com.gtnewhorizons.retrofuturabootstrap:RetroFuturaBootstrap:1.1.0") { transitive = false }
// runtimeOnlyNonPublishable("com.github.GTNewHorizons:lwjgl3ify:3.0.99")
@@ -79,7 +76,7 @@ dependencies {
// Iris Shaders
compileOnly('org.jetbrains:annotations:26.0.2')
api("com.github.GTNewHorizons:GTNHLib:9:dev")
api("com.github.GTNewHorizons:GTNHLib:0.11.19:dev")
shadowImplementation(project(":glsm")) { transitive = false }
shadowImplementation(project(":lwjgl3-backend")) { transitive = false }
@@ -100,14 +97,6 @@ dependencies {
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.35-GTNH:dev')
devOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.4.7:dev')
api("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
/*
devOnlyNonPublishable('com.github.GTNewHorizons:GT5-Unofficial:9:dev') {
exclude group: 'com.github.GTNewHorizons', module: 'Angelica'
}
*/
// Display List Testing
/*
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-749-GTNH:dev")
@@ -126,9 +115,6 @@ dependencies {
runtimeOnlyNonPublishable("com.github.GTNewHorizons:HoloInventory:2.5.8-GTNH:dev")
*/
// Font Testing
runtimeOnlyNonPublishable("com.github.GTNewHorizons:Nuclear-Control:2.7.9:dev")
//devOnlyNonPublishable('com.github.GTNewHorizons:worldedit-gtnh:v0.0.9')
// Notfine Deps
@@ -187,6 +173,9 @@ dependencies {
testImplementation('org.junit.platform:junit-platform-launcher')
testImplementation('com.tngtech.archunit:archunit-junit5:1.4.1')
testRuntimeOnly("it.unimi.dsi:fastutil:8.5.18")
testRuntimeOnly("org.joml:joml:1.10.8")
}
}
+2
View File
@@ -96,6 +96,8 @@ dependencies {
// Deps (normally from MC) - compile only, but needed at test runtime
compileOnly("com.google.guava:guava:${property("guavaVersion")}")
testRuntimeOnly("com.google.guava:guava:${property("guavaVersion")}")
testRuntimeOnly("it.unimi.dsi:fastutil:${property("fastutilVersion")}")
testRuntimeOnly("org.joml:joml:${property("jomlVersion")}") { isTransitive = false }
// Test
testImplementation(sourceSets["stubs"].output)
+3 -1
View File
@@ -4,7 +4,9 @@ celeritasVersion = 2.5.3-GTNH
lombokVersion = 1.18.42
log4jVersion = 2.0-beta9
guavaVersion = 18.0
gtnhlibVersion = 0.10.0
gtnhlibVersion = 0.11.19
fastutilVersion = 8.5.18
jomlVersion = 1.10.8
glslTransformLibVersion = 0.2.0-26.g5ee7d96-GTNH
antlr4RuntimeVersion = 4.13.2
jcppVersion = 1.4.14
@@ -16,7 +16,7 @@ import com.gtnewhorizons.angelica.glsm.hooks.DeferredDepthColorHandler;
import com.gtnewhorizons.angelica.glsm.hooks.GLSMConfig;
import com.gtnewhorizons.angelica.glsm.hooks.GLSMHooks;
import com.gtnewhorizons.angelica.glsm.hooks.GLSMInitConfig;
import com.gtnewhorizons.angelica.glsm.hooks.events.SplashDestroyEvent;
import com.gtnewhorizons.angelica.glsm.hooks.GlintColorHandler;
import com.gtnewhorizons.angelica.glsm.recording.CommandRecorder;
import com.gtnewhorizons.angelica.glsm.recording.CompiledDisplayList;
import com.gtnewhorizons.angelica.glsm.recording.ImmediateModeRecorder;
@@ -79,7 +79,6 @@ import org.lwjgl.opengl.GL21;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.GL31;
import org.lwjgl.opengl.GL32;
import org.lwjgl.opengl.GL45;
import org.lwjgl.opengl.GLContext;
import org.lwjgl.opengl.KHRDebug;
@@ -98,7 +97,6 @@ import java.util.List;
import java.util.Set;
import java.util.function.IntSupplier;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memAllocFloat;
import static com.gtnewhorizons.angelica.glsm.Vendor.AMD;
import static com.gtnewhorizons.angelica.glsm.Vendor.INTEL;
import static com.gtnewhorizons.angelica.glsm.Vendor.MESA;
@@ -510,22 +508,6 @@ public class GLStateManager {
return DisplayListManager.displayListExists(list);
}
public static long glFenceSync(int flags, int i) {
return RENDER_BACKEND.fenceSync(flags, i);
}
public static int glClientWaitSync(long fence, int flags, long l) {
return RENDER_BACKEND.clientWaitSync(fence, flags, l);
}
public static void glDeleteSync(long fence) {
RENDER_BACKEND.deleteSync(fence);
}
public static ByteBuffer glMapBufferRange(int target, long offset, long length, int access) {
return RENDER_BACKEND.mapBufferRange(target, offset, length, access);
}
public static class GLFeatureSet extends IntOpenHashSet {
private static final long serialVersionUID = 8558779940775721010L;
@@ -1632,6 +1614,11 @@ public class GLStateManager {
ImmediateModeRecorder.setColor(red, green, blue, alpha);
}
dirtyColorAttrib = true;
// Only set while an enchantment-glint span is active
final GlintColorHandler glintHandler = GLSMHooks.glintColorHandler;
if (glintHandler != null) {
glintHandler.onColorChanged(red, green, blue, alpha);
}
return true;
}
return false;
@@ -1817,38 +1804,7 @@ public class GLStateManager {
}
private static int getBoundTexture(int unit) {
return textures.getTextureUnitBindings(unit).getTexture2D();
}
public static void bindTextureToUnit(int unit, int target, int texture) {
final int activeUnit = activeTextureUnit.getValue();
if (unit == activeTextureUnit.getValue()) {
glBindTexture(target, texture);
return;
}
final TextureBinding textureUnit = textures.getTextureUnitBindings(unit);
if (target == GL11.GL_TEXTURE_2D) {
final int cachedBinding = textureUnit.getTexture2D();
if (cachedBinding != texture) {
glActiveTexture(GL13.GL_TEXTURE0 + unit);
glBindTexture(target, texture);
glActiveTexture(GL13.GL_TEXTURE0);
}
} else if (target == GL30.GL_TEXTURE_2D_ARRAY) {
final int cachedBinding = textureUnit.getTexture2DArray();
if (cachedBinding != texture) {
glActiveTexture(GL13.GL_TEXTURE0 + unit);
glBindTexture(target, texture);
glActiveTexture(GL13.GL_TEXTURE0);
}
} else {
glActiveTexture(GL13.GL_TEXTURE0 + unit);
glBindTexture(target, texture);
glActiveTexture(GL13.GL_TEXTURE0);
}
return textures.getTextureUnitBindings(unit).getBinding();
}
public static void glBindTexture(int target, int texture) {
@@ -1864,6 +1820,13 @@ public class GLStateManager {
deferredDeleteTextures.remove(texture);
}
if (target != GL11.GL_TEXTURE_2D) {
// Non-2D targets (e.g. GL_TEXTURE_2D_ARRAY) pass through without caching
logUncachedTextureTarget(target);
RENDER_BACKEND.bindTexture(target, texture);
return;
}
if (!isCachingEnabled()) {
RENDER_BACKEND.bindTexture(target, texture);
return;
@@ -1871,40 +1834,24 @@ public class GLStateManager {
final int activeUnit = GLStateManager.activeTextureUnit.getValue();
final TextureBinding textureUnit = textures.getTextureUnitBindings(activeUnit);
final int cachedBinding = textureUnit.getBinding();
if (target == GL11.GL_TEXTURE_2D) {
final int cachedBinding = textureUnit.getTexture2D();
if (cachedBinding != texture) {
RENDER_BACKEND.bindTexture(target, texture);
textureUnit.setTexture2D(texture);
if (texture != 0 && activeUnit > maxBoundTextureUnit) {
maxBoundTextureUnit = activeUnit;
}
if (!lockBindCallback && activeTextureUnit.getValue() == 0) {
lockBindCallback = true;
if (GLSMHooks.TEXTURE_BIND.hasListeners()) {
GLSMHooks.textureBindEvent.textureId = texture;
GLSMHooks.TEXTURE_BIND.post(GLSMHooks.textureBindEvent);
}
RenderSystem.bindTextureToUnit(0, texture);
lockBindCallback = false;
}
}
} else if (target == GL30.GL_TEXTURE_2D_ARRAY) {
final int cachedBinding = textureUnit.getTexture2DArray();
if (cachedBinding != texture) {
RENDER_BACKEND.bindTexture(target, texture);
textureUnit.setTexture2DArray(texture);
if (texture != 0 && activeUnit > maxBoundTextureUnit) {
maxBoundTextureUnit = activeUnit;
}
}
} else {
// Other targets pass through without caching
logUncachedTextureTarget(target);
if (cachedBinding != texture) {
RENDER_BACKEND.bindTexture(target, texture);
textureUnit.setBinding(texture);
if (texture != 0 && activeUnit > maxBoundTextureUnit) {
maxBoundTextureUnit = activeUnit;
}
if (!lockBindCallback && activeTextureUnit.getValue() == 0) {
lockBindCallback = true;
if (GLSMHooks.TEXTURE_BIND.hasListeners()) {
GLSMHooks.textureBindEvent.textureId = texture;
GLSMHooks.TEXTURE_BIND.post(GLSMHooks.textureBindEvent);
}
RenderSystem.bindTextureToUnit(0, texture);
lockBindCallback = false;
}
}
}
private static int changeFormatIfDeprecated(int internalformat) {
@@ -2105,38 +2052,24 @@ public class GLStateManager {
if (id == 0) return;
final int savedUnit = GLStateManager.activeTextureUnit.getValue();
final int savedBinding = textures.getTextureUnitBindings(savedUnit).getTexture2D();
final int savedBinding = textures.getTextureUnitBindings(savedUnit).getBinding();
boolean changedUnit = false;
boolean isTexture2D = TextureInfoCache.INSTANCE.hasEntry(id);
// Unbind from all units that have this texture
for (int i = 0; i <= maxBoundTextureUnit; i++) {
if (textures.getTextureUnitBindings(i).getTexture2D() == id) {
if (textures.getTextureUnitBindings(i).getBinding() == id) {
if (i != savedUnit) {
RENDER_BACKEND.activeTexture(GL13.GL_TEXTURE0 + i);
changedUnit = true;
}
isTexture2D = true;
RENDER_BACKEND.bindTexture(GL11.GL_TEXTURE_2D, 0);
}
if (textures.getTextureUnitBindings(i).getTexture2DArray() == id) {
if (i != savedUnit) {
RENDER_BACKEND.activeTexture(GL13.GL_TEXTURE0 + i);
changedUnit = true;
}
RENDER_BACKEND.bindTexture(GL30.GL_TEXTURE_2D_ARRAY, 0);
}
}
// Restore active unit, then shrink the texture via a temporary bind
if (changedUnit) {
RENDER_BACKEND.activeTexture(GL13.GL_TEXTURE0 + savedUnit);
}
//GL11.glDeleteTextures(id);
if (!isTexture2D) {
GL11.glDeleteTextures(id); // Only defer delete GL_TEXTURE_2D textures
return;
}
RENDER_BACKEND.bindTexture(GL11.GL_TEXTURE_2D, id);
RENDER_BACKEND.texParameteri(GL11.GL_TEXTURE_2D, GL12.GL_TEXTURE_MAX_LEVEL, 0);
suspendPixelUnpackBuffer();
@@ -3218,7 +3151,9 @@ public class GLStateManager {
// Always delete
for (int i = 0; i <= maxBoundTextureUnit; i++) {
textures.getTextureUnitBindings(i).unbindIfEquals(id);
if (textures.getTextureUnitBindings(i).getBinding() == id) {
textures.getTextureUnitBindings(i).setBinding(0);
}
}
}
@@ -3259,9 +3194,6 @@ public class GLStateManager {
splashComplete = true;
drawableGLHolder = null;
drawableGL = null;
if (GLSMHooks.SPLASH_DESTROY.hasListeners()) {
GLSMHooks.SPLASH_DESTROY.post(new SplashDestroyEvent());
}
}
public static void glNewList(int list, int mode) {
@@ -3423,7 +3355,7 @@ public class GLStateManager {
// Restore texture bindings for all units, then restore active unit. activeTextureUnit stores the 0-based index, glActiveTexture needs GL_TEXTURE0 + index.
for (int i = 0; i < MAX_TEXTURE_UNITS; i++) {
RENDER_BACKEND.activeTexture(GL13.GL_TEXTURE0 + i);
RENDER_BACKEND.bindTexture(GL11.GL_TEXTURE_2D, textures.getTextureUnitBindings(i).getTexture2D());
RENDER_BACKEND.bindTexture(GL11.GL_TEXTURE_2D, textures.getTextureUnitBindings(i).getBinding());
}
RENDER_BACKEND.activeTexture(GL13.GL_TEXTURE0 + activeTextureUnit.getValue());
}
@@ -3841,6 +3773,10 @@ public class GLStateManager {
return activeTextureUnit.getValue();
}
public static int getListMode() {
return DisplayListManager.getListMode();
}
private static boolean handleRemovedTexParam(int target, int pname, int value) {
if (pname == GL14.GL_GENERATE_MIPMAP) {
if (target == GL11.GL_TEXTURE_2D) {
@@ -4725,23 +4661,6 @@ public class GLStateManager {
restorePixelUnpackBuffer();
}
public static void glTexSubImage3D(int target, int level, int xoffset, int yoffset, int zoffset, int width, int height, int depth, int format, int type, IntBuffer pixels) {
if (DisplayListManager.isRecording()) {
throw new UnsupportedOperationException("glTexSubImage3D in display lists not yet implemented - if you see this, please report!");
}
suspendPixelUnpackBuffer();
GL12.glTexSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
//RENDER_BACKEND.texSubImage3D(target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels);
restorePixelUnpackBuffer();
}
public static void glGetTextureSubImage(int texture, int level, int xoffset, int yoffset, int zoffset,
int width, int height, int depth,
int format, int type, int pixels_bufSize, long pixels_buffer_offset
) {
GL45.glGetTextureSubImage(texture, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels_bufSize, pixels_buffer_offset);
}
public static void glCopyTexImage1D(int target, int level, int internalFormat, int x, int y, int width, int border) {
if (DisplayListManager.isRecording()) {
throw DisplayListManager.unsupportedInList("glCopyTexImage1D");
@@ -6168,19 +6087,6 @@ public class GLStateManager {
RENDER_BACKEND.uniformMatrix4(location, transpose, matrices);
}
public static final Matrix4f scratchMvp = new Matrix4f();
public static final FloatBuffer mvpBuffer = memAllocFloat(16);
public static void uploadMVPMatrix(int mvpMatrixLocation) {
getMVPMatrix(scratchMvp);
scratchMvp.get(mvpBuffer);
glUniformMatrix4(mvpMatrixLocation, false, mvpBuffer);
}
public static Matrix4f getMVPMatrix(Matrix4f dest) {
return getProjectionMatrix().mul(getModelViewMatrix(), dest);
}
public static void glGetActiveUniform(int program, int index, IntBuffer length, IntBuffer size, IntBuffer type, ByteBuffer name) {
RENDER_BACKEND.getActiveUniform(program, index, length, size, type, name);
}
@@ -93,7 +93,7 @@ public class DSAARB extends DSAUnsupported {
super.bindTextureToUnit(unit, texture);
} else {
RENDER_BACKEND.bindTextureUnit(unit, texture);
GLStateManager.getTextures().getTextureUnitBindings(unit).setTexture2D(texture);
GLStateManager.getTextures().getTextureUnitBindings(unit).setBinding(texture);
}
}
@@ -78,7 +78,7 @@ public final class FragmentShaderGenerator {
private static void emitTextureSampling(StringBuilder sb, FragmentKey key) {
for (int i = 0; i < key.nrEnabledUnits(); i++) {
if (!key.unitEnabled(i)) continue;
sb.append(" vec4 tex").append(i).append("Color = texture(u_Sampler").append(i).append(", v_TexCoord").append(i).append(".st);\n");
sb.append(" vec4 tex").append(i).append("Color = textureProj(u_Sampler").append(i).append(", v_TexCoord").append(i).append(");\n");
}
}
@@ -385,7 +385,7 @@ public final class VertexShaderGenerator {
emitTexGenComponent(sb, key.texGenModeS(), "s", "S", key);
emitTexGenComponent(sb, key.texGenModeT(), "t", "T", key);
emitTexGenComponent(sb, key.texGenModeR(), "r", "R", key);
emitTexGenComponent(sb, key.texGenModeR(), "p", "R", key);
emitTexGenComponent(sb, key.texGenModeQ(), "q", "Q", key);
// Always apply texture matrix when texgen is active (forced on in VertexKey)
@@ -8,6 +8,7 @@ public final class GLSMHooks {
public static DeferredBlendHandler blendHandler;
public static DeferredAlphaHandler alphaHandler;
public static DeferredDepthColorHandler depthColorHandler;
public static GlintColorHandler glintColorHandler;
// EventBus instances
public static final EventBus<TextureBindEvent> TEXTURE_BIND = EventBus.create(TextureBindEvent.class);
@@ -18,7 +19,6 @@ public final class GLSMHooks {
public static final EventBus<FogStateChangeEvent> FOG_STATE_CHANGE = EventBus.create(FogStateChangeEvent.class);
public static final EventBus<LightmapCoordsEvent> LIGHTMAP_COORDS = EventBus.create(LightmapCoordsEvent.class);
public static final EventBus<AlphaStateChangeEvent> ALPHA_STATE_CHANGE = EventBus.create(AlphaStateChangeEvent.class);
public static final EventBus<SplashDestroyEvent> SPLASH_DESTROY = EventBus.create(SplashDestroyEvent.class);
public static final EventBus<ShaderColorChangeEvent> SHADER_COLOR_CHANGE = EventBus.create(ShaderColorChangeEvent.class);
// Reusable event instances
@@ -0,0 +1,5 @@
package com.gtnewhorizons.angelica.glsm.hooks;
public interface GlintColorHandler {
void onColorChanged(float red, float green, float blue, float alpha);
}
@@ -1,6 +0,0 @@
package com.gtnewhorizons.angelica.glsm.hooks.events;
import net.minecraftforge.eventbus.api.event.MutableEvent;
public final class SplashDestroyEvent extends MutableEvent {
}
@@ -5,13 +5,11 @@ import lombok.Setter;
@Getter
public class TextureBinding implements ISettableState<TextureBinding> {
@Setter protected int texture2D;
@Setter protected int texture2DArray;
@Setter protected int binding;
@Override
public TextureBinding set(TextureBinding state) {
this.texture2D = state.texture2D;
this.texture2DArray = state.texture2DArray;
this.binding = state.binding;
return this;
}
@@ -19,20 +17,10 @@ public class TextureBinding implements ISettableState<TextureBinding> {
public boolean sameAs(Object state) {
if (this == state) return true;
if (!(state instanceof TextureBinding textureBinding)) return false;
return texture2D == textureBinding.texture2D
&& texture2DArray == textureBinding.texture2DArray;
return binding == textureBinding.binding;
}
@Override
public TextureBinding copy() {
return new TextureBinding().set(this);
}
public final void unbindIfEquals(int id) {
if (getTexture2D() == id) {
this.setTexture2D(0);
}
if (getTexture2DArray() == id) {
setTexture2DArray(0);
}
}
}
@@ -19,7 +19,7 @@ public final class StreamingUploader {
MAP_BUFFER_RANGE
}
public static final int MAP_WRITE_INVALIDATE_BUFFER = GL30.GL_MAP_WRITE_BIT | GL30.GL_MAP_INVALIDATE_BUFFER_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(GLStateManager.getInitConfig().getStreamingUploadStrategy(), data, capacity);
@@ -43,11 +43,6 @@ public class TextureInfoCache {
}
}
public boolean hasEntry(int id) {
if (id < 0) return false;
return cache.containsKey(id);
}
public void onTexImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type, @Nullable Buffer pixels) {
if (target == GL11.GL_TEXTURE_2D && level == 0) {
final TextureInfo info = getInfo(GLStateManager.getBoundTextureForServerState());
+4
View File
@@ -34,6 +34,10 @@ repositories {
name = "GTNH Maven"
url = uri("https://nexus.gtnewhorizons.com/repository/public/")
}
maven {
name = "Minecraft Libraries"
url = uri("https://libraries.minecraft.net")
}
maven {
name = "Forge"
url = uri("https://maven.minecraftforge.net/")
@@ -16,7 +16,7 @@ import static com.gtnewhorizons.angelica.AngelicaMod.MOD_ID;
name = "Angelica",
version = Tags.VERSION,
dependencies = """
required-after:gtnhlib@[0.8.21,);\
required-after:gtnhlib@[0.11.19,);\
before:lwjgl3ify@[1.5.3,);\
after:hodgepodge@[2.4.4,);\
after:CodeChickenCore@[1.2.0,);\
@@ -1,16 +0,0 @@
package com.gtnewhorizons.angelica.client.font;
import com.gtnewhorizon.gtnhlib.util.font.FontRendering;
public final class AngelicaTextPreprocessor implements FontRendering.TextPreprocessor {
@Override
public String apply(final String text) {
return ColorCodeUtils.convertImpl(text);
}
@Override
public boolean handlesAmpCodes() {
return true;
}
}
File diff suppressed because it is too large. Load diff
@@ -1,6 +1,5 @@
package com.gtnewhorizons.angelica.client.font;
import com.gtnewhorizon.gtnhlib.util.font.FontRendering;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
/**
@@ -19,7 +18,6 @@ public final class ColorCodeUtils {
private ColorCodeUtils() {}
public static final char FORMATTING_CHAR = '§';
public static final String FORMATTING_CHAR_STRING = String.valueOf(FORMATTING_CHAR);
public static final char ESCAPED_AMPERSAND = '';
public static final int SECTION_X_PAYLOAD = 12;
@@ -27,28 +25,22 @@ public final class ColorCodeUtils {
public static final int GRADIENT_PAYLOAD = 28;
public static final int GRADIENT_LENGTH = 30;
private static final boolean[] isColorCode = new boolean[255];
/** Valid single {@code &} codes. {@code g} is excluded; {@code &g} only converts as part of a gradient. */
public static final String VALID_SINGLE_CODES = "0123456789abcdefklmnorqzvu";
private static final String[] SECTION_PREFIX = new String[128];
static {
/** Valid single {@code &} codes. {@code g} is excluded; {@code &g} only converts as part of a gradient. */
final String s = "0123456789abcdefklmnorqzvu";
for (int i = 0; i < s.length(); i++) {
final char ch = s.charAt(i);
isColorCode[ch] = true;
isColorCode[Character.toUpperCase(ch)] = true;
for (int i = 0; i < VALID_SINGLE_CODES.length(); i++) {
char c = VALID_SINGLE_CODES.charAt(i);
SECTION_PREFIX[c] = String.valueOf(FORMATTING_CHAR) + c;
}
SECTION_PREFIX['x'] = String.valueOf(FORMATTING_CHAR) + 'x';
SECTION_PREFIX['g'] = String.valueOf(FORMATTING_CHAR) + 'g';
}
public static void initPreprocessor() {
if (AngelicaConfig.enableAmpersandConversion) {
FontRendering.setTextPreprocessor(new AngelicaTextPreprocessor());
} else {
FontRendering.setTextPreprocessor((FontRendering.TextPreprocessor) null);
}
}
public static String sectionPrefix(final char code) {
return FORMATTING_CHAR_STRING + code;
public static String sectionPrefix(char code) {
char c = (code < 128) ? Character.toLowerCase(code) : code;
return (c < 128) ? SECTION_PREFIX[c] : null;
}
public static int parseHexPairs(CharSequence str, int start, int count) {
@@ -74,7 +66,21 @@ public final class ColorCodeUtils {
return parseSectionXAt(str, start) != -1;
}
public static String convertImpl(final String text) {
private static String lastConversionInput;
private static String lastConversionOutput;
public static String convertAmpersandToSectionX(String text) {
if (text == null || !AngelicaConfig.enableAmpersandConversion) return text;
if (text == lastConversionInput) return lastConversionOutput;
final String out = convertImpl(text);
lastConversionInput = text;
lastConversionOutput = out;
return out;
}
private static String convertImpl(String text) {
int idx = text.indexOf('&');
if (idx == -1) return text;
@@ -82,16 +88,6 @@ public final class ColorCodeUtils {
StringBuilder sb = null;
int last = 0;
while (idx != -1 && idx + 1 < len) {
final char code = text.charAt(idx + 1);
if (code >= 255) continue;
if (isColorCode[code]) {
if (sb == null) sb = new StringBuilder(len + 16);
sb.append(text, last, idx);
sb.append(FORMATTING_CHAR).append(text.charAt(idx + 1));
last = idx + 2;
idx = text.indexOf('&', last);
continue;
}
if (idx > 0 && text.charAt(idx - 1) == '\\') {
if (sb == null) sb = new StringBuilder(len + 16);
sb.append(text, last, idx - 1);
@@ -100,28 +96,27 @@ public final class ColorCodeUtils {
idx = text.indexOf('&', last);
continue;
}
if (code == '#') {
if (idx + 7 < len) {
boolean validHex = true;
for (int i = 2; i <= 7; i++) {
if (Character.digit(text.charAt(idx + i), 16) == -1) {
validHex = false;
break;
}
}
if (validHex) {
if (sb == null) sb = new StringBuilder(len + 16);
sb.append(text, last, idx);
sb.append(FORMATTING_CHAR).append('x');
for (int i = 2; i <= 7; i++) {
sb.append(FORMATTING_CHAR).append(text.charAt(idx + i));
}
last = idx + 8;
idx = text.indexOf('&', last);
continue;
if (text.charAt(idx + 1) == '#' && idx + 7 < len) {
boolean validHex = true;
for (int i = 2; i <= 7; i++) {
if (Character.digit(text.charAt(idx + i), 16) == -1) {
validHex = false;
break;
}
}
} else if (Character.toLowerCase(code) == 'g' && idx + 17 < len
if (validHex) {
if (sb == null) sb = new StringBuilder(len + 16);
sb.append(text, last, idx);
sb.append(FORMATTING_CHAR).append('x');
for (int i = 2; i <= 7; i++) {
sb.append(FORMATTING_CHAR).append(text.charAt(idx + i));
}
last = idx + 8;
idx = text.indexOf('&', last);
continue;
}
}
if (Character.toLowerCase(text.charAt(idx + 1)) == 'g' && idx + 17 < len
&& text.charAt(idx + 2) == '&' && text.charAt(idx + 3) == '#'
&& text.charAt(idx + 10) == '&' && text.charAt(idx + 11) == '#') {
boolean valid1 = true, valid2 = true;
@@ -142,6 +137,13 @@ public final class ColorCodeUtils {
continue;
}
}
char code = Character.toLowerCase(text.charAt(idx + 1));
if (VALID_SINGLE_CODES.indexOf(code) != -1) {
if (sb == null) sb = new StringBuilder(len + 16);
sb.append(text, last, idx);
sb.append(FORMATTING_CHAR).append(text.charAt(idx + 1));
last = idx + 2;
}
idx = text.indexOf('&', idx + 1);
}
if (sb == null) return text;
@@ -1,199 +0,0 @@
package com.gtnewhorizons.angelica.client.font;
import com.gtnewhorizon.gtnhlib.client.renderer.MatrixHelper;
import com.gtnewhorizon.gtnhlib.client.renderer.postprocessing.CustomFramebuffer;
import com.gtnewhorizon.gtnhlib.client.renderer.shader.IShaderDefinesInjector;
import com.gtnewhorizon.gtnhlib.client.renderer.shader.ShaderProgram;
import com.gtnewhorizons.angelica.AngelicaMod;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.utils.InstancedHelper;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.util.ResourceLocation;
import org.joml.Matrix4f;
import org.joml.Vector4f;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL15;
import java.nio.ByteBuffer;
import static com.gtnewhorizon.gtnhlib.ClientProxy.mc;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memAddress0;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memAlloc;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memPutFloat;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.nmemFree;
//TODO move this + shader to gtnhlib
public final class FontOverlayShader extends ShaderProgram {
private int mvpMatrixLocation;
private int uTexelSize;
private int uScale;
private int uTime;
private int uTexBounds;
private final int padding;
public float xStart;
public float xEnd;
public float yStart;
public float yEnd;
private static CustomFramebuffer framebuffer;
private static int vao;
private static int vbo;
private static ByteBuffer buffer;
// public static FontOverlayShader TEMPLATE = new FontOverlayShader(
// new ResourceLocation(AngelicaMod.MOD_ID, "shaders/font/fontShaderTemplate.fsh")
// );
public FontOverlayShader(ResourceLocation fragShader, IShaderDefinesInjector... defines) {
this(fragShader, 4, defines);
}
public FontOverlayShader(ResourceLocation fragShader, int padding, IShaderDefinesInjector... defines) {
super(
loadShaderSource(getVertexShader()),
loadShaderSource(fragShader, defines)
);
this.padding = padding;
this.bindTextureSlots("textFBO", "sceneFBO");
mvpMatrixLocation = this.getUniformLocation("u_MVPMatrix");
uTexelSize = this.getUniformLocation("uTexelSize");
uScale = this.getUniformLocation("uScale");
uTime = this.getUniformLocation("uTime");
uTexBounds = this.getUniformLocation("uTexBounds");
}
public static ResourceLocation getVertexShader() {
return new ResourceLocation(AngelicaMod.MOD_ID, "shaders/font/fontShader.vsh");
}
public boolean begin(BatchingFontRenderer fontRenderer) {
fontRenderer.flushBatch();
xStart = -1;
return true;
}
public void updateBounds(float x, float y, float width, float height) {
if (xStart == -1) {
xStart = x;
yStart = y;
}
xEnd = x + width;
yEnd = y + height;
}
public boolean end(BatchingFontRenderer fontRenderer) {
if (framebuffer == null) {
framebuffer = new CustomFramebuffer(0);
}
if (framebuffer.framebufferWidth != mc.displayWidth || framebuffer.framebufferHeight != mc.displayHeight) {
framebuffer.createBindFramebuffer(mc.displayWidth, mc.displayHeight);
}
framebuffer.clearBindFramebuffer();
fontRenderer.flushBatch();
framebuffer.unbindFramebuffer();
GLStateManager.glActiveTexture(GL13.GL_TEXTURE1);
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, mc.getFramebuffer().framebufferTexture);
GLStateManager.glActiveTexture(GL13.GL_TEXTURE0);
framebuffer.bindFramebufferTexture();
final int padding = this.padding;
this.use();
if (vao == 0) {
buffer = memAlloc(32);
vao = GLStateManager.glGenVertexArrays();
GLStateManager.glBindVertexArray(vao);
vbo = GLStateManager.glGenBuffers();
GLStateManager.glBindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, InstancedHelper.getQuadEBO());
GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, vbo);
// position
GLStateManager.glVertexAttribPointer(0, 2, GL11.GL_FLOAT, false, 8, 0);
GLStateManager.glEnableVertexAttribArray(0);
}
long address = memAddress0(buffer);
buffer.limit(32);
addVertex(address, xStart - padding, yStart - padding);
addVertex(address + 8, xEnd + padding, yStart - padding);
addVertex(address + 16, xStart - padding, yEnd + padding);
addVertex(address + 24, xEnd + padding, yEnd + padding);
Matrix4f mvp = GLStateManager.getMVPMatrix(new Matrix4f());
Vector4f temp = new Vector4f();
temp.x = xStart;
temp.y = yEnd;
temp.z = 0;
temp.w = 1;
MatrixHelper.transformVertex(mvp, temp);
float boundXStart = temp.x * 0.5f + 0.5f;
float boundYStart = temp.y * 0.5f + 0.5f;
temp.x = xEnd;
temp.y = yStart;
temp.z = 0;
temp.w = 1;
MatrixHelper.transformVertex(mvp, temp);
float boundXEnd = temp.x * 0.5f + 0.5f;
float boundYEnd = temp.y * 0.5f + 0.5f;
this.uploadBounds(boundXStart, boundXEnd, boundYStart, boundYEnd);
GLStateManager.glBindVertexArray(vao);
GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, vbo);
GLStateManager.glBufferData(GL15.GL_ARRAY_BUFFER, buffer, GL15.GL_STREAM_DRAW);
GLStateManager.glDrawElements(GL11.GL_TRIANGLES, 6, GL11.GL_UNSIGNED_SHORT, 0);
GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
GLStateManager.glUseProgram(0);
GLStateManager.glBindVertexArray(0);
nmemFree(address);
return false;
}
private void addVertex(long ptr, float x, float y) {
// v, v
memPutFloat(ptr, x);
memPutFloat(ptr + 4, y);
}
@Override
public void use() {
super.use();
GLStateManager.uploadMVPMatrix(mvpMatrixLocation);
if (uTexelSize != -1) {
GLStateManager.glUniform2f(uTexelSize, 1f / mc.displayWidth, 1f / mc.displayHeight);
}
this.uploadTime(uTime);
if (uScale != -1) {
final ScaledResolution res = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
GLStateManager.glUniform1i(uScale, res.getScaleFactor());
}
}
private void uploadBounds(float minX, float maxX, float minY, float maxY) {
GLStateManager.glUniform4f(uTexBounds, minX, maxX, minY, maxY);
}
public static final class Builder implements IShaderDefinesInjector {
@Override
public void writeDefines(StringBuilder out) {
}
}
}
@@ -0,0 +1,21 @@
package com.gtnewhorizons.angelica.client.font;
import net.minecraft.util.ResourceLocation;
public interface FontProvider {
/**
* For use with §k. Should fetch a character of the same width as provided.
*/
char getRandomReplacement(char chr);
boolean isGlyphAvailable(char chr);
float getUStart(char chr);
float getVStart(char chr);
float getXAdvance(char chr);
float getGlyphW(char chr);
float getUSize(char chr);
float getVSize(char chr);
float getShadowOffset();
ResourceLocation getTexture(char chr);
float getYScaleMultiplier();
}
@@ -0,0 +1,291 @@
package com.gtnewhorizons.angelica.client.font;
import com.gtnewhorizons.angelica.config.FontConfig;
import lombok.Setter;
import lombok.Value;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.texture.ITextureObject;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.renderer.texture.TextureUtil;
import net.minecraft.util.ResourceLocation;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import javax.imageio.ImageIO;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Map;
import java.util.Objects;
public final class FontProviderCustom implements FontProvider {
public static final Logger LOGGER = LogManager.getLogger("Angelica");
public static final String FONT_DIR = "fonts/custom/";
static final int ATLAS_SIZE = 128;
static final int ATLAS_COUNT = 512;
private final byte id; // 0 - primary font, 1 - fallback font
private FontAtlas[] fontAtlases = new FontAtlas[ATLAS_COUNT];
private float currentFontQuality = FontConfig.customFontQuality;
@Setter
private Font font;
private FontProviderCustom(byte id) {
this.id = id;
Font[] availableFonts = FontStrategist.getAvailableFonts();
String myFontName = switch (this.id) {
case 0 -> FontConfig.customFontNamePrimary;
case 1 -> FontConfig.customFontNameFallback;
default -> null;
};
if (Objects.equals(myFontName, "(none)")) {
this.font = null;
return;
}
int fontPos = -1;
for (int i = 0; i < availableFonts.length; i++) {
if (Objects.equals(myFontName, availableFonts[i].getFontName())) {
fontPos = i;
break;
}
}
if (fontPos == -1) {
LOGGER.info("Could not find previously set font \"{}\". ", myFontName);
this.font = null;
return;
}
this.font = availableFonts[fontPos].deriveFont(this.currentFontQuality);
}
private static class InstLoader {
static final FontProviderCustom instance0 = new FontProviderCustom((byte)0);
static final FontProviderCustom instance1 = new FontProviderCustom((byte)1);
}
public static FontProviderCustom getPrimary() { return InstLoader.instance0; }
public static FontProviderCustom getFallback() { return InstLoader.instance1; }
public void reloadFont(int fontID) {
this.currentFontQuality = FontConfig.customFontQuality;
this.font = FontStrategist.getAvailableFonts()[fontID].deriveFont(this.currentFontQuality);
File[] files = new File(getFontDir()).listFiles();
if (files != null) {
for (File f : files) {
if (!Files.isSymbolicLink(f.toPath())) {
f.delete();
}
}
}
TextureManager tm = Minecraft.getMinecraft().getTextureManager();
Map mapTextureObjects = tm.mapTextureObjects;
for (int i = 0; i < ATLAS_COUNT; i++) {
ResourceLocation key = new ResourceLocation(getAtlasResourceName(i));
if (mapTextureObjects.containsKey(key)) {
ITextureObject obj = (ITextureObject) mapTextureObjects.get(key);
TextureUtil.deleteTexture(obj.getGlTextureId());
mapTextureObjects.remove(key);
}
}
this.fontAtlases = new FontAtlas[ATLAS_COUNT];
}
private String getFontDir() {
return FONT_DIR + "f" + this.id + "/";
}
private String getAtlasFilename(int atlasId) {
return "f" + this.id + "p" + atlasId;
}
String getAtlasResourceName(int atlasId) {
return "minecraft:angelica_c" + getAtlasFilename(atlasId);
}
String getAtlasFullPath(int atlasId) {
return getFontDir() + getAtlasFilename(atlasId) + ".png";
}
@Value
private class GlyphData {
float uStart;
float vStart;
float xAdvance;
float glyphW;
float uSz;
float vSz;
}
private class FontAtlas {
GlyphData[] glyphData = new GlyphData[ATLAS_SIZE];
private ResourceLocation texture;
private final int id;
FontAtlas(int id) {
this.id = id;
}
void construct(Font font) {
int atlasChars = 0;
for (int i = 0; i < ATLAS_SIZE; i++) {
final char ch = (char) (i + ATLAS_SIZE * this.id);
if (font.canDisplay(ch)) { atlasChars++; }
}
if (atlasChars == 0) { return; }
BufferedImage image = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
Graphics2D g2d = image.createGraphics();
g2d.setFont(font);
FontMetrics fm = g2d.getFontMetrics();
g2d.dispose();
final int atlasTilesX = (int) Math.ceil(Math.sqrt(atlasChars) * 1.5f);
final int atlasTilesY = (int) Math.ceil((double) atlasChars / atlasTilesX);
final float charSeparator = currentFontQuality / 3f;
int rowWidth = 0;
int maxRowWidth = 0;
atlasChars = 0;
for (int i = 0; i < ATLAS_SIZE; i++) {
if (atlasChars % atlasTilesX == 0) {
maxRowWidth = Math.max(maxRowWidth, rowWidth);
rowWidth = 0;
}
final char ch = (char)(i + ATLAS_SIZE * this.id);
if (font.canDisplay(ch)) {
rowWidth += (int) (charSeparator + fm.charWidth(ch));
atlasChars++;
}
}
maxRowWidth = Math.max(maxRowWidth, rowWidth);
final int lineHeight = fm.getHeight();
final float desc = fm.getDescent();
final int imageWidth = (int) (maxRowWidth + charSeparator);
final int imageHeight = (int) ((charSeparator + lineHeight) * atlasTilesY + charSeparator);
image = new BufferedImage(imageWidth, imageHeight, BufferedImage.TYPE_INT_ARGB);
g2d = image.createGraphics();
g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
g2d.setFont(font);
fm = g2d.getFontMetrics();
int tileX = 0, tileY = 0; // position in atlas tiles
int imgX = (int) charSeparator; // position in pixels
for (int i = 0; i < ATLAS_SIZE; i++) {
final char ch = (char) (i + ATLAS_SIZE * this.id);
if (!font.canDisplay(ch)) { continue; }
if (tileX >= atlasTilesX) {
tileX = 0;
imgX = (int) charSeparator;
tileY++;
}
final int charWidth = fm.charWidth(ch);
final float charAspectRatio = (float) charWidth / lineHeight;
final float inset = currentFontQuality / 16;
g2d.drawString(Character.toString(ch), imgX, (lineHeight + charSeparator) * (tileY + 1) - desc);
final float uStart = (float) (imgX - inset * charAspectRatio) / imageWidth;
final float vStart = ((lineHeight + charSeparator) * (tileY + 1) - lineHeight - inset) / imageHeight;
final float xAdvance = charAspectRatio * 8 * charWidth / (charWidth + 2 * inset * charAspectRatio);
final float glyphW = charAspectRatio * 8 + 1;
final float uSz = (float) (charWidth + 2 * inset * charAspectRatio) / imageWidth;
final float vSz = (float) (lineHeight + 2 * inset) / imageHeight;
this.glyphData[i] = new GlyphData(uStart, vStart, xAdvance, glyphW, uSz, vSz);
imgX += (int) (charWidth + charSeparator);
tileX++;
}
g2d.dispose();
try {
Files.createDirectories(Paths.get(getFontDir()));
ImageIO.write(image, "png", new File(getAtlasFullPath(this.id)));
} catch (IOException e) {
e.printStackTrace();
}
this.texture = new ResourceLocation(getAtlasResourceName(this.id));
}
}
private FontAtlas getAtlas(char chr) {
int id = chr / ATLAS_SIZE;
FontAtlas fa = this.fontAtlases[id];
if (fa == null) {
fa = new FontAtlas(id);
fa.construct(this.font);
this.fontAtlases[id] = fa;
}
return fa;
}
@Override
public boolean isGlyphAvailable(char chr) {
if (this.font == null) { return false; }
return (getAtlas(chr).glyphData[chr % ATLAS_SIZE] != null);
}
@Override
public char getRandomReplacement(char chr) {
return chr;
}
@Override
public float getUStart(char chr) {
return getAtlas(chr).glyphData[chr % ATLAS_SIZE].uStart;
}
@Override
public float getVStart(char chr) {
return getAtlas(chr).glyphData[chr % ATLAS_SIZE].vStart;
}
@Override
public float getXAdvance(char chr) {
return getAtlas(chr).glyphData[chr % ATLAS_SIZE].xAdvance * FontConfig.customFontScale;
}
@Override
public float getGlyphW(char chr) {
return getAtlas(chr).glyphData[chr % ATLAS_SIZE].glyphW * FontConfig.customFontScale;
}
@Override
public float getUSize(char chr) {
return getAtlas(chr).glyphData[chr % ATLAS_SIZE].uSz;
}
@Override
public float getVSize(char chr) {
return getAtlas(chr).glyphData[chr % ATLAS_SIZE].vSz;
}
@Override
public float getShadowOffset() {
return FontConfig.fontShadowOffset;
}
@Override
public ResourceLocation getTexture(char chr) {
return getAtlas(chr).texture;
}
@Override
public float getYScaleMultiplier() {
return FontConfig.customFontScale;
}
}
@@ -0,0 +1,109 @@
package com.gtnewhorizons.angelica.client.font;
import com.gtnewhorizons.angelica.config.FontConfig;
import it.unimi.dsi.fastutil.chars.Char2ShortOpenHashMap;
import jss.util.RandomXoshiro256StarStar;
import net.minecraft.util.ResourceLocation;
public final class FontProviderMC implements FontProvider {
/**
* The full list of characters present in the default Minecraft font, excluding the Unicode font
*/
@SuppressWarnings("UnnecessaryUnicodeEscape")
private static final String MCFONT_CHARS = "\u00c0\u00c1\u00c2\u00c8\u00ca\u00cb\u00cd\u00d3\u00d4\u00d5\u00da\u00df\u00e3\u00f5\u011f\u0130\u0131\u0152\u0153\u015e\u015f\u0174\u0175\u017e\u0207\u0000\u0000\u0000\u0000\u0000\u0000\u0000 !\"#$%&\'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u2302\u00c7\u00fc\u00e9\u00e2\u00e4\u00e0\u00e5\u00e7\u00ea\u00eb\u00e8\u00ef\u00ee\u00ec\u00c4\u00c5\u00c9\u00e6\u00c6\u00f4\u00f6\u00f2\u00fb\u00f9\u00ff\u00d6\u00dc\u00f8\u00a3\u00d8\u00d7\u0192\u00e1\u00ed\u00f3\u00fa\u00f1\u00d1\u00aa\u00ba\u00bf\u00ae\u00ac\u00bd\u00bc\u00a1\u00ab\u00bb\u2591\u2592\u2593\u2502\u2524\u2561\u2562\u2556\u2555\u2563\u2551\u2557\u255d\u255c\u255b\u2510\u2514\u2534\u252c\u251c\u2500\u253c\u255e\u255f\u255a\u2554\u2569\u2566\u2560\u2550\u256c\u2567\u2568\u2564\u2565\u2559\u2558\u2552\u2553\u256b\u256a\u2518\u250c\u2588\u2584\u258c\u2590\u2580\u03b1\u03b2\u0393\u03c0\u03a3\u03c3\u03bc\u03c4\u03a6\u0398\u03a9\u03b4\u221e\u2205\u2208\u2229\u2261\u00b1\u2265\u2264\u2320\u2321\u00f7\u2248\u00b0\u2219\u00b7\u221a\u207f\u00b2\u25a0\u0000";
private FontProviderMC() {}
private static class InstLoader {
static final FontProviderMC instance = new FontProviderMC();
static final FontProviderMC instanceSGA = new FontProviderMC();
}
public static FontProviderMC get(boolean isSGA) {
return (isSGA ? InstLoader.instanceSGA : InstLoader.instance);
}
private static final Char2ShortOpenHashMap MCFONT_ASCII_MAP = new Char2ShortOpenHashMap();
ResourceLocation locationFontTexture = null;
private final RandomXoshiro256StarStar fontRandom = new RandomXoshiro256StarStar();
public int[] charWidth;
static {
MCFONT_ASCII_MAP.defaultReturnValue((short) -1);
for (short i = 0; i < MCFONT_CHARS.length(); i++) {
MCFONT_ASCII_MAP.put(MCFONT_CHARS.charAt(i), i);
}
}
public int lookupMcFontPosition(char ch) {
return MCFONT_ASCII_MAP.get(ch);
}
@Override
public boolean isGlyphAvailable(char chr) {
return MCFONT_ASCII_MAP.containsKey(chr);
}
public char getRandomReplacement(char chr){
int lutIndex = lookupMcFontPosition(chr);
if (lutIndex != -1) {
int randomReplacementIndex;
do {
randomReplacementIndex = fontRandom.nextInt(this.charWidth.length);
} while (this.charWidth[lutIndex] != this.charWidth[randomReplacementIndex]);
lutIndex = randomReplacementIndex;
return MCFONT_CHARS.charAt(lutIndex);
}
return chr;
}
@Override
public float getUStart(char chr) {
int lutIndex = lookupMcFontPosition(chr);
return ((lutIndex % 16) * 8) / 128.0F;
}
@Override
public float getVStart(char chr) {
int lutIndex = lookupMcFontPosition(chr);
return (float) ((lutIndex / 16) * 8) / 128.0F;
}
@Override
public float getXAdvance(char chr) {
int lutIndex = lookupMcFontPosition(chr);
return charWidth[lutIndex];
}
@Override
public float getGlyphW(char chr) {
int lutIndex = lookupMcFontPosition(chr);
return charWidth[lutIndex] - 0.01F;
}
@Override
public float getUSize(char chr) {
int lutIndex = lookupMcFontPosition(chr);
return (charWidth[lutIndex] - 1.01F) / 128.0F;
}
@Override
public float getVSize(char chr) {
return 7.99F / 128.0F;
}
@Override
public float getShadowOffset() {
return FontConfig.fontShadowOffset;
}
@Override
public ResourceLocation getTexture(char chr) {
return locationFontTexture;
}
@Override
public float getYScaleMultiplier() {
return 1;
}
}
@@ -0,0 +1,113 @@
package com.gtnewhorizons.angelica.client.font;
import com.gtnewhorizons.angelica.config.FontConfig;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import java.io.IOException;
import java.io.InputStream;
public final class FontProviderUnicode implements FontProvider {
private FontProviderUnicode() {
try {
InputStream inputstream = Minecraft.getMinecraft().getResourceManager()
.getResource(new ResourceLocation("font/glyph_sizes.bin")).getInputStream();
//noinspection ResultOfMethodCallIgnored
inputstream.read(this.glyphWidth);
}
catch (IOException ioexception) {
throw new RuntimeException(ioexception);
}
}
private static class InstLoader { static final FontProviderUnicode instance = new FontProviderUnicode(); }
public static FontProviderUnicode get() { return FontProviderUnicode.InstLoader.instance; }
private static final ResourceLocation[] unicodePageLocations = new ResourceLocation[256];
private final byte[] glyphWidth = new byte[65536];
private ResourceLocation getUnicodePageLocation(int page) {
final ResourceLocation lookup = unicodePageLocations[page];
if (lookup == null) {
final ResourceLocation rl = new ResourceLocation(String.format(
"textures/font/unicode_page_%02x.png",
page));
unicodePageLocations[page] = rl;
return rl;
} else {
return lookup;
}
}
@Override
public boolean isGlyphAvailable(char chr) {
return true;
}
@Override
public char getRandomReplacement(char chr) {
return chr;
}
@Override
public float getUStart(char chr) {
final float startColumnF = (float)((this.glyphWidth[chr] >>> 4) & 15);
return ((float) (chr % 16 * 16) + startColumnF + 0.21f) / 256.0f;
}
@Override
public float getVStart(char chr) {
return ((float) ((chr & 255) / 16 * 16) + 0.21f) / 256.0f;
}
@Override
public float getXAdvance(char chr) {
final int startColumn = (this.glyphWidth[chr] >>> 4) & 15;
final int endColumn = this.glyphWidth[chr] & 15;
final float startColumnF = (float) startColumn;
final float endColumnF = (float) (endColumn + 1);
return (endColumnF - startColumnF) / 2.0F + 1.0F;
}
@Override
public float getGlyphW(char chr) {
final int startColumn = (this.glyphWidth[chr] >>> 4) & 15;
final int endColumn = this.glyphWidth[chr] & 15;
final float startColumnF = (float) startColumn;
final float endColumnF = (float) (endColumn + 1);
final float chrWidth = endColumnF - startColumnF - 0.02F;
return chrWidth / 2.0f + 1.0f;
}
@Override
public float getUSize(char chr) {
final int startColumn = (this.glyphWidth[chr] >>> 4) & 15;
final int endColumn = this.glyphWidth[chr] & 15;
final float startColumnF = (float) startColumn;
final float endColumnF = (float) (endColumn + 1);
final float chrWidth = endColumnF - startColumnF - 0.02F;
return (chrWidth - 0.42f) / 256.0f;
}
@Override
public float getVSize(char chr) {
return (16.0f - 0.42f) / 256.0f;
}
@Override
public float getShadowOffset() {
return FontConfig.fontShadowOffset * FontConfig.fontShadowOffsetUC;
}
@Override
public ResourceLocation getTexture(char chr) {
final int uniPage = chr / 256;
return getUnicodePageLocation(uniPage);
}
@Override
public float getYScaleMultiplier() {
return 1;
}
}
@@ -1,28 +0,0 @@
package com.gtnewhorizons.angelica.client.font;
import java.util.ArrayList;
import java.util.List;
public final class FontShaderManager {
public static final List<FontOverlayShader> fontShaders = new ArrayList<>();
public static void registerShader(FontOverlayShader shader) {
fontShaders.add(shader);
}
static boolean isOverlayShader(char ch) {
return ((int) ch) < fontShaders.size();
}
public static FontOverlayShader begin(char ch, BatchingFontRenderer fontRenderer) {
final byte index = (byte) ch;
final FontOverlayShader shader = get(index);
shader.begin(fontRenderer);
return shader;
}
public static FontOverlayShader get(byte index) {
return fontShaders.get(index);
}
}
@@ -2,26 +2,29 @@ package com.gtnewhorizons.angelica.client.font;
import com.google.common.collect.HashMultiset;
import com.gtnewhorizons.angelica.config.FontConfig;
import com.gtnewhorizons.angelica.mixins.interfaces.ResourceAccessor;
import cpw.mods.fml.client.SplashProgress;
import lombok.Getter;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.resources.DefaultResourcePack;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import javax.annotation.Nullable;
import java.awt.*;
import java.awt.Font;
import java.awt.GraphicsEnvironment;
import java.io.File;
import java.util.Comparator;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Objects;
import static com.gtnewhorizons.angelica.AngelicaMod.LOGGER;
import static com.gtnewhorizons.angelica.client.font.BatchingFontRenderer.reloadFonts;
public final class FontStrategist {
public class FontStrategist {
@Getter
private static final Font[] availableFonts;
public static Font primaryFont;
public static Font secondaryFont;
public static final Logger LOGGER = LogManager.getLogger("Angelica");
static {
if (GraphicsEnvironment.isHeadless()) {
@@ -57,49 +60,70 @@ public final class FontStrategist {
availableFonts = fontSet.values().stream().sorted(Comparator.comparing(Font::getFontName)).toArray(Font[]::new);
LOGGER.info("Got {} fonts from GraphicsEnvironment ({} after deduplication)", availableFontsDirty.length, availableFonts.length);
reloadCustomFontProviders();
}
// create and add the resource pack that provides fonts
HashMap<String, File> packMap = new HashMap<>();
for (int i = 0; i < FontProviderCustom.ATLAS_COUNT; i++) {
packMap.put(FontProviderCustom.getPrimary().getAtlasResourceName(i), new File(FontProviderCustom.getPrimary().getAtlasFullPath(i)));
packMap.put(FontProviderCustom.getFallback().getAtlasResourceName(i), new File(FontProviderCustom.getFallback().getAtlasFullPath(i)));
}
DefaultResourcePack fontResourcePack = new DefaultResourcePack(packMap);
List defaultResourcePacks = ((ResourceAccessor) Minecraft.getMinecraft()).angelica$getDefaultResourcePacks();
defaultResourcePacks.add(fontResourcePack);
}
public static @Nullable Font[] getConfigFonts() {
if (primaryFont != null && secondaryFont != null) {
return new Font[] { primaryFont, secondaryFont };
/**
Lets you get a FontProvider per char while respecting font priority and fallbacks, the unicode flag, whether
SGA is on, if we're in a splash screen, if a font can even display a character in the first place, etc.
*/
public static FontProvider getFontProvider(BatchingFontRenderer me, char chr, boolean customFontEnabled, boolean forceUnicode) {
if (me.isSGA && FontProviderMC.get(true).isGlyphAvailable(chr)) {
return FontProviderMC.get(true);
}
if (primaryFont != null) {
return new Font[] { primaryFont };
if (me.bookMode) {
return FontProviderUnicode.get();
}
if (secondaryFont != null) {
return new Font[] { secondaryFont };
if (customFontEnabled && !me.isSplash) {
FontProvider fp;
fp = FontProviderCustom.getPrimary();
if (fp.isGlyphAvailable(chr)) { return fp; }
fp = FontProviderCustom.getFallback();
if (fp.isGlyphAvailable(chr)) { return fp; }
return FontProviderUnicode.get();
} else {
if (!forceUnicode && FontProviderMC.get(false).isGlyphAvailable(chr)) {
return FontProviderMC.get(false);
} else {
return FontProviderUnicode.get();
}
}
return null;
}
public static void reloadCustomFontProviders() {
primaryFont = null;
secondaryFont = null;
FontProviderCustom.getPrimary().setFont(null);
FontProviderCustom.getFallback().setFont(null);
for (int i = 0; i < availableFonts.length; i++) {
final Font font = availableFonts[i];
final String fontName = font.getFontName();
if (FontConfig.customFontNamePrimary.equals(fontName)) {
primaryFont = font.deriveFont((float) FontConfig.customFontQuality);
if (Objects.equals(FontConfig.customFontNamePrimary, availableFonts[i].getFontName())) {
FontProviderCustom.getPrimary().reloadFont(i);
}
if (FontConfig.customFontNameFallback.equals(fontName)) {
secondaryFont = font.deriveFont((float) FontConfig.customFontQuality);
if (Objects.equals(FontConfig.customFontNameFallback, availableFonts[i].getFontName())) {
FontProviderCustom.getFallback().reloadFont(i);
}
}
reloadFonts();
}
public static boolean isSplashFontRendererActive(FontRenderer fontRenderer) {
// noinspection deprecation
if (fontRenderer instanceof SplashProgress.SplashFontRenderer) return true;
boolean active = fontRenderer instanceof SplashProgress.SplashFontRenderer;
try {
Class<?> customSplashClass = Class.forName("gkappa.modernsplash.CustomSplash$SplashFontRenderer");
return customSplashClass.isInstance(fontRenderer);
} catch (ClassNotFoundException ignored) {}
active = active || customSplashClass.isInstance(fontRenderer);
} catch (ClassNotFoundException ignored) {
}
return false;
return active;
}
}
@@ -1,28 +0,0 @@
package com.gtnewhorizons.angelica.client.font;
import com.gtnewhorizons.angelica.config.FontConfig;
public final class GlyphData {
public final float uStart;
public final float vStart;
public final float xStart;
public final float xWidth; // The width of the actual char
public final float xAdvance; // The amount to advance
public final float uSize;
public final float vSize;
// For MC Fonts (where xStart = 0, glyphW = charWidth - 1, xAdvance = charWidth)
public GlyphData(float uStart, float vStart, float glyphW, float uSize, float vSize) {
this(uStart, vStart, 0, glyphW, glyphW + 1, uSize, vSize);
}
public GlyphData(float uStart, float vStart, float xStart, float xWidth, float xAdvance, float uSize, float vSize) {
this.uStart = uStart;
this.vStart = vStart;
this.xAdvance = xAdvance + FontConfig.glyphSpacing;
this.xStart = xStart;
this.xWidth = xWidth;
this.uSize = uSize;
this.vSize = vSize;
}
}
@@ -1,252 +0,0 @@
package com.gtnewhorizons.angelica.client.font.atlas;
import com.gtnewhorizon.gtnhlib.util.font.GlyphReplacements;
import com.gtnewhorizons.angelica.client.font.BatchingFontRenderer;
import com.gtnewhorizons.angelica.client.font.GlyphData;
import com.gtnewhorizons.angelica.config.FontConfig;
import net.minecraft.client.Minecraft;
import org.lwjgl.opengl.GL11;
import javax.imageio.ImageIO;
import java.awt.*;
import java.awt.font.GlyphVector;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
public final class FontProviderCustom extends FontTextureArray {
private static final int ATLAS_CHARS = 256;
private final Font[] fonts;
private FontProviderCustom(int size, int layers, short[] layersLookupArray, int filter, Font[] fonts) {
super(size, layers, layersLookupArray, filter);
this.fonts = fonts;
}
public static FontProviderCustom createTextureArray(final Font[] fonts) {
final int fontAmount = fonts.length;
if (fontAmount == 0) return null;
final FontMetrics[] fontMetrics = new FontMetrics[fontAmount];
BufferedImage image = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB);
Graphics2D g2d = image.createGraphics();
for (int i = 0; i < fontAmount; i++) {
g2d.setFont(fonts[i]);
fontMetrics[i] = g2d.getFontMetrics();
}
g2d.dispose();
short[] layerLookup = new short[256];
short layer = 0;
loop:
for (int atlasId = 0; atlasId < 256; atlasId++) {
for (int i = 0; i < 256; i++) {
final char ch = (char) (i + atlasId * 256);
for (Font font : fonts) {
if (font.canDisplay(ch)) {
layerLookup[atlasId] = layer;
layer++;
continue loop;
}
}
// Can't display any chars, skip.
layerLookup[atlasId] = -1;
}
}
final int size = getAtlasSize(fonts, fontMetrics, 2);
return new FontProviderCustom(
size,
layer,
layerLookup,
GL11.GL_LINEAR,
fonts
);
}
private static int getAtlasSize(Font[] fonts, FontMetrics[] fontMetrics, int separator) {
int size = 512;
int maxCharHeight = 0;
for (FontMetrics fm : fontMetrics) {
if (fm.getHeight() > maxCharHeight) maxCharHeight = fm.getHeight();
}
loop:
while (size <= 2048) {
for (int atlasId = 0; atlasId < 256; atlasId++) {
int imgX = 0;
int imgY = 0; //TODO idk
for (int atlasChar = 0; atlasChar < 256; atlasChar++) {
final char ch = (char) (atlasChar + 256 * atlasId);
for (int i = 0; i < fonts.length; i++) {
if (!fonts[i].canDisplay(ch)) continue;
final int lineHeight = fontMetrics[i].getHeight();
final int charHeight = (lineHeight + separator);
final int charWidth = fontMetrics[i].charWidth(ch);
if (imgX + charWidth >= size) {
imgX = 0;
imgY += charHeight;
}
imgX += (charWidth + separator);
}
}
//if (imgX == 0 && imgY == 0) return 0; TODO integrate this somehow
// Total used height includes final row
int usedHeight = imgY + maxCharHeight;
if (usedHeight > size) {
size *= 2;
continue loop;
}
}
return size;
}
System.out.println("Size ended up being over 2048. This is a bug!");
return size;
}
private boolean canDisplayAtlas(int atlasId) {
for (int i = 0; i < ATLAS_CHARS; i++) {
final char ch = (char) (i + ATLAS_CHARS * atlasId);
for (Font font : fonts) {
if (font.canDisplay(ch)) {
return true;
}
}
}
return false;
}
@Override
public ByteBuffer generateGlyphData(int atlasId, GlyphData[] glyphs) {
if (!canDisplayAtlas(atlasId)) return null;
final int imageWidth = textureSize;
final int imageHeight = textureSize;
BufferedImage image = new BufferedImage(imageWidth, imageHeight, BufferedImage.TYPE_INT_ARGB);
Graphics2D g2d = image.createGraphics();
g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION, RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY);
g2d.setRenderingHint(RenderingHints.KEY_DITHERING, RenderingHints.VALUE_DITHER_DISABLE);
g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
g2d.setRenderingHint(RenderingHints.KEY_RENDERING, RenderingHints.VALUE_RENDER_QUALITY);
g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
int maxCharHeight = 0;
final FontMetrics[] fontMetrics = new FontMetrics[fonts.length];
for (int i = 0; i < fontMetrics.length; i++) {
g2d.setFont(fonts[i]);
final FontMetrics fm = g2d.getFontMetrics();
fontMetrics[i] = fm;
if (fm.getHeight() > maxCharHeight) maxCharHeight = fm.getHeight();
}
final int padding = 2;
int imgX = padding; // position in pixels
int imgY = maxCharHeight + padding;
Font lastFont = null; // Store last font to save on repeated setFont() calls
final float height = BatchingFontRenderer.getStringHeight();
final int atlasBegin = ATLAS_CHARS * atlasId;
for (int atlasChar = 0; atlasChar < ATLAS_CHARS; atlasChar++) {
char ch = (char) (atlasChar + atlasBegin);
final char replacement = GlyphReplacements.getReplacementGlyph(ch);
if (replacement != 0) {
if (FontConfig.enableGlyphReplacements) {
for (Font font : fonts) {
if (font.canDisplay(replacement)) {
ch = replacement;
break;
}
}
}
}
for (int i = 0; i < fonts.length; i++) {
final Font font = fonts[i];
if (font.canDisplay(ch)) {
if (lastFont != font) {
g2d.setFont(font);
lastFont = font;
}
final FontMetrics fm = fontMetrics[i];
final int lineHeight = fm.getHeight();
final float desc = fm.getDescent();
final int advanceWidth = fm.charWidth(ch);
final GlyphVector gv = font.createGlyphVector(
g2d.getFontRenderContext(),
Character.toString(ch));
if (imgX + advanceWidth >= imageWidth) {
imgX = padding;
imgY += (maxCharHeight + padding);
}
final Rectangle bounds = gv.getPixelBounds(
g2d.getFontRenderContext(),
0, 0);
g2d.drawGlyphVector(
gv,
imgX - bounds.x,
imgY - desc
);
final float scale = (height / lineHeight) * getGlyphScaleX();
final float glyphW = advanceWidth * scale;
final float xStart = bounds.x * scale;
final float xWidth = bounds.width * scale;
final float uStart = (float) (imgX) / imageWidth;
final float vStart = (float) (imgY - lineHeight) / imageHeight;
final float uSz = bounds.width / (float) imageWidth;
final float vSz = lineHeight / (float) imageHeight;
glyphs[atlasChar] = new GlyphData(uStart, vStart, xStart, xWidth, glyphW, uSz, vSz);
imgX += bounds.width + padding;
break;
}
}
}
g2d.dispose();
if (FontTextureArray.DUMP_ATLASES) {
try {
File dir = new File(Minecraft.getMinecraft().mcDataDir, "debug/fonts");
if (!dir.exists()) dir.mkdirs();
ImageIO.write(image, "png", new File(dir, "custom_font_" + fonts[0].getFontName() + "_" + atlasId + ".png"));
} catch (IOException e) {
e.printStackTrace();
}
}
return getPixelBuffer(image);
}
static float getGlyphScaleX() {
return (FontConfig.glyphScale * (float) Math.pow(2, FontConfig.glyphAspect));
}
}
@@ -1,122 +0,0 @@
package com.gtnewhorizons.angelica.client.font.atlas;
import com.gtnewhorizon.gtnhlib.client.renderer.textures.TextureLoader;
import com.gtnewhorizons.angelica.client.font.BatchingFontRenderer;
import com.gtnewhorizons.angelica.client.font.GlyphData;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL30;
import java.nio.ByteBuffer;
import java.util.Arrays;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memFree;
public final class FontProviderMinecraft extends FontTextureArray {
public static final GlyphData[] unicodeGlyphData = new GlyphData[256];
public static int unicodeLayer;
public static FontProviderMinecraft create() {
short layer = 0;
final int amountLayers = 256 + 1; // 256 + 1 because of Unicode pages.
final short[] layersLookupArray = new short[amountLayers];
for (int i = 0; i < amountLayers; i++) {
if (TextureLoader.resourceExists(getUnicodePage(i))) {
layersLookupArray[i] = layer;
layer++;
} else {
layersLookupArray[i] = -1;
}
}
layersLookupArray[256] = layer;
unicodeLayer = layer;
System.out.println("Amount layers: " + layer);
System.out.println(Arrays.toString(layersLookupArray));
return new FontProviderMinecraft(256, layer + 1, layersLookupArray, GL11.GL_NEAREST);
}
private FontProviderMinecraft(int size, int layers, short[] layersLookupArray, int filter) {
super(size, layers, layersLookupArray, filter);
loadAtlas(0); // Load first texture from bound texture atlas
final ResourceLocation resource = getUnicodePage(0);
final ByteBuffer pixels = getTextureFromResource(resource);
bind();
if (pixels == null) {
return;
}
final int textureSize = (int) Math.sqrt(pixels.capacity());
GLStateManager.glTexSubImage3D(
GL30.GL_TEXTURE_2D_ARRAY,
0,
0, 0, layers - 1,
textureSize, textureSize,
1,
GL11.GL_RED,
GL11.GL_UNSIGNED_BYTE,
pixels
);
memFree(pixels);
}
@Override
public ByteBuffer generateGlyphData(int atlasId, GlyphData[] glyphs) {
if (atlasId == 0) {
final int size = getBoundTextureSize();
final int[] charWidth = BatchingFontRenderer.asciiCharWidths;
for (int i = 0; i < 256; i++) {
final int index = BatchingFontRenderer.lookupMcFontPosition((char) i);
final float uStart = ((index & 15) * 8) / 256.0F;
final float vStart = ((index >> 4) * 8) / 256.0F;
final float glyphW = charWidth[index] - 1F;
final float uSize = (charWidth[index] - 1F) / 256.0F;
final float vSize = 7.99F / 256.0F;
glyphs[i] = new GlyphData(
uStart, vStart,
glyphW,
uSize,
vSize
);
}
populateUnicodeGlyphs(0, unicodeGlyphData);
return getBoundTextureData(size);
}
populateUnicodeGlyphs(atlasId, glyphs);
return getTextureFromResource(getUnicodePage(atlasId));
}
private void populateUnicodeGlyphs(int atlasId, GlyphData[] glyphs) {
final byte[] glyphWidth = BatchingFontRenderer.glyphWidths;
for (int i = 0; i < 256; i++) {
final char chr = (char) ((atlasId * 256) | i);
int row = glyphWidth[chr] >>> 4;
int column = glyphWidth[chr] & 15;
float uStart = ((float)(chr % 16 * 16) + row) / 256F;
float vStart = ((float)((chr & 255) / 16 * 16)) / 256F;
float uSize = ((column + 1) - row - 0.02F) / 256F;
float vSize = 15.98F / 256.0F;
float glyphW = ((column + 1) - row) / 2.0F + 1.0F;
glyphs[i] = new GlyphData(
uStart, vStart,
glyphW - 1,
uSize,
vSize
);
}
}
private static ResourceLocation getUnicodePage(int atlasId) {
return new ResourceLocation(String.format("textures/font/unicode_page_%02x.png", atlasId));
}
}
@@ -1,45 +0,0 @@
package com.gtnewhorizons.angelica.client.font.atlas;
import com.gtnewhorizons.angelica.client.font.BatchingFontRenderer;
import com.gtnewhorizons.angelica.client.font.GlyphData;
import org.lwjgl.opengl.GL11;
import java.nio.ByteBuffer;
public final class FontProviderSGA extends FontTextureArray {
public static FontProviderSGA create() {
final int size = getBoundTextureSize();
return new FontProviderSGA(size, 1, new short[] {0}, GL11.GL_NEAREST);
}
private FontProviderSGA(int size, int layers, short[] layersLookupArray, int filter) {
super(size, layers, layersLookupArray, filter);
loadAtlas(0);
}
@Override
public ByteBuffer generateGlyphData(int atlasId, GlyphData[] glyphs) {
if (atlasId == 0) {
final int[] charWidth = BatchingFontRenderer.sgaCharWidths;
for (int i = 0; i < 256; i++) {
final int index = BatchingFontRenderer.lookupMcFontPosition((char) i);
final float uStart = ((index & 15) * 8) / 256.0F;
final float vStart = ((index >> 4) * 8) / 256.0F;
final float glyphW = charWidth[index] - 1F;
final float uSize = (charWidth[index] - 1F) / 256.0F;
final float vSize = 7.99F / 256.0F;
glyphs[i] = new GlyphData(
uStart, vStart,
glyphW,
uSize,
vSize
);
}
return getBoundTextureData(this.textureSize);
}
return null;
}
}
@@ -1,46 +0,0 @@
package com.gtnewhorizons.angelica.client.font.atlas;
import com.gtnewhorizons.angelica.client.font.BatchingFontRenderer;
import com.gtnewhorizons.angelica.client.font.GlyphData;
import org.lwjgl.opengl.GL11;
import java.nio.ByteBuffer;
public final class FontProviderSplash extends FontTextureArray {
public static FontProviderSplash create() {
final int size = getBoundTextureSize();
return new FontProviderSplash(size, 1, new short[] {0}, GL11.GL_NEAREST);
}
private FontProviderSplash(int size, int layers, short[] layersLookupArray, int filter) {
super(size, layers, layersLookupArray, filter);
}
@Override
public ByteBuffer generateGlyphData(int atlasId, GlyphData[] glyphs) {
if (atlasId == 0) {
final int[] charWidth = BatchingFontRenderer.asciiCharWidths;
for (int i = 0; i < 256; i++) {
final int index = BatchingFontRenderer.lookupMcFontPosition((char) i);
final float size = textureSize;
final float uStart = ((index & 15) * 8) / size;
final float vStart = ((index >> 4) * 8) / size;
final float xAdvance = charWidth[index];
final float glyphW = charWidth[index] - 1F;
final float uSize = (charWidth[index] - 1F) / size;
final float vSize = 7.99F / size;
glyphs[i] = new GlyphData(
uStart, vStart,
glyphW,
uSize,
vSize
);
}
return getBoundTextureData(this.textureSize);
}
return null;
}
}
@@ -1,290 +0,0 @@
package com.gtnewhorizons.angelica.client.font.atlas;
import com.gtnewhorizon.gtnhlib.client.renderer.textures.TextureLoader;
import com.gtnewhorizons.angelica.AngelicaMod;
import com.gtnewhorizons.angelica.client.font.GlyphData;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL30;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.awt.image.ColorModel;
import java.awt.image.DataBufferInt;
import java.awt.image.Raster;
import java.io.File;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memAddress;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memAddress0;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memAlloc;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memAllocFloat;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memFree;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memPutByte;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memPutFloat;
public abstract class FontTextureArray {
protected final int id;
protected final int textureSize;
protected final short[] layersLookup;
protected final GlyphData[][] atlasGlyphs = new GlyphData[256][];
static final boolean DUMP_ATLASES = false;
FontTextureArray(int size, int layers, short[] layersLookupArray, final int filter) {
this.layersLookup = layersLookupArray;
this.id = GLStateManager.glGenTextures();
this.textureSize = size;
bind();
GLStateManager.glTexParameteri(GL30.GL_TEXTURE_2D_ARRAY, GL11.GL_TEXTURE_MIN_FILTER, filter);
GLStateManager.glTexParameteri(GL30.GL_TEXTURE_2D_ARRAY, GL11.GL_TEXTURE_MAG_FILTER, filter);
GLStateManager.glTexParameteri(GL30.GL_TEXTURE_2D_ARRAY, GL11.GL_TEXTURE_WRAP_S, GL13.GL_CLAMP_TO_BORDER);
GLStateManager.glTexParameteri(GL30.GL_TEXTURE_2D_ARRAY, GL11.GL_TEXTURE_WRAP_T, GL13.GL_CLAMP_TO_BORDER);
final FloatBuffer buffer = memAllocFloat(4);
final long ptr = memAddress0(buffer);
memPutFloat(ptr, 1);
memPutFloat(ptr + 4, 1);
memPutFloat(ptr + 8, 1);
memPutFloat(ptr + 12, 1);
GLStateManager.glTexParameter(GL30.GL_TEXTURE_2D_ARRAY, GL11.GL_TEXTURE_BORDER_COLOR, buffer);
memFree(buffer);
GLStateManager.glTexImage3D(
GL30.GL_TEXTURE_2D_ARRAY,
0,
GL30.GL_R8,
size, size, layers,
0,
GL11.GL_RED,
GL11.GL_UNSIGNED_BYTE,
(ByteBuffer) null
);
}
//
// public GlyphData[] addAtlas(int depth, ResourceLocation resource) {
// try {
// InputStream inputstream = Minecraft.getMinecraft().getResourceManager()
// .getResource(resource).getInputStream();
// final GlyphData[] data = addAtlas(depth, ImageIO.read(inputstream));
// inputstream.close();
// return data;
// } catch (Exception e) {
// e.printStackTrace();
// System.out.println("Failed to initialize resource " + resource + ".");
// //initializedLayers[depth] = true;
// final GlyphData[] glyphData = new GlyphData[256];
// atlasGlyphs[depth] = glyphData;
// return glyphData;
// }
// }
public final GlyphData[] getAtlasGlyphs(final int atlasId) {
GlyphData[] glyphs = atlasGlyphs[atlasId];
if (glyphs == null) {
glyphs = addAtlas(atlasId);
}
return glyphs;
}
public final GlyphData getGlyphData(final char ch) {
return getAtlasGlyphs(ch >> 8)[ch & 255];
}
public final boolean isGlyphAvailable(char ch) {
return getAtlasGlyphs(ch >> 8)[ch & 255] != null;
}
public final int getDepth(char ch) {
return layersLookup[ch >> 8];
}
public int getTexture() {
return id;
}
protected final void loadAtlas(int atlasId) {
if (atlasGlyphs[atlasId] == null) {
addAtlas(atlasId);
}
}
public abstract ByteBuffer generateGlyphData(int atlasId, GlyphData[] glyphs);
protected final GlyphData[] addAtlas(int atlasId) {
final GlyphData[] glyphData = new GlyphData[256];
try {
final ByteBuffer pixels = generateGlyphData(atlasId, glyphData);
bind();
atlasGlyphs[atlasId] = glyphData;
if (pixels == null) {
return glyphData;
}
final int size = (int) Math.sqrt(pixels.capacity());
GLStateManager.glTexSubImage3D(
GL30.GL_TEXTURE_2D_ARRAY,
0,
0, 0, layersLookup[atlasId],
size, size,
1,
GL11.GL_RED,
GL11.GL_UNSIGNED_BYTE,
pixels
);
memFree(pixels);
if (DUMP_ATLASES) {
try {
saveLayerAsPNG(layersLookup[atlasId], size, "test" + layersLookup[atlasId] + ".png");
} catch (Exception e) {
e.printStackTrace();
}
}
} catch (Exception e) {
AngelicaMod.LOGGER.error("Failed to initialize glyph data for atlas id " + id + "! Did this get called in another thread?", e);
// Return the data (because it's correct), but don't initialize it (texture is still missing)
return glyphData;
}
return glyphData;
}
public void saveLayerAsPNG(int layer, int size, String fileName) {
ByteBuffer pixels = memAlloc(size * size);
GLStateManager.glGetTextureSubImage(
id,
0,
0, 0, layer,
size, size, 1,
GL11.GL_RED,
GL11.GL_UNSIGNED_BYTE,
size * size,
memAddress(pixels)
);
saveBufferAsPNG(size, pixels, fileName);
}
private void saveBufferAsPNG(int size, ByteBuffer pixels, String fileName) {
File dir = new File(Minecraft.getMinecraft().mcDataDir, "debug/texturearray");
if (!dir.exists()) dir.mkdirs();
BufferedImage image = new BufferedImage(size, size, BufferedImage.TYPE_INT_ARGB);
int[] row = new int[size];
for (int y = 0; y < size; y++) {
int rowOffset = y * size;
for (int x = 0; x < size; x++) {
int i = rowOffset + x;
int c = pixels.get(i) & 0xFF;
row[x] = 0xFF000000 | (c << 16) | (c << 8) | c;
}
// Flip vertically because OpenGL origin is bottom-left
image.setRGB(0, size - 1 - y, size, 1, row, 0, size);
}
// Save PNG
try {
ImageIO.write(image, "PNG", new File(dir, fileName));
} catch (Exception e) {
e.printStackTrace();
}
}
public void bind() {
GLStateManager.glBindTexture(GL30.GL_TEXTURE_2D_ARRAY, id);
}
public void unbind() {
GLStateManager.glBindTexture(GL30.GL_TEXTURE_2D_ARRAY, 0);
}
public void delete() {
GLStateManager.glDeleteTextures(id);
}
static ByteBuffer getBoundTextureData(final int size) {
final ByteBuffer pixels = memAlloc(size * size);
GLStateManager.glGetTexImage(
GL11.GL_TEXTURE_2D,
0,
GL11.GL_RED,
GL11.GL_UNSIGNED_BYTE,
pixels
);
return pixels;
}
static int getBoundTextureSize() {
return GLStateManager.glGetTexLevelParameteri(
GL11.GL_TEXTURE_2D,
0,
GL11.GL_TEXTURE_WIDTH
);
}
static ByteBuffer getPixelBuffer(BufferedImage image) {
final int width = image.getWidth();
final int height = image.getHeight();
final ByteBuffer pixelBuffer = memAlloc(width * height);
long ptr = memAddress0(pixelBuffer);
// Cheap Path
if (image.getRaster().getDataBuffer() instanceof DataBufferInt dataBufferInt) {
final int[] pixelValues = dataBufferInt.getData();
for (int i : pixelValues) {
memPutByte(ptr++, (byte) ((i >> 24) & 0xFF));
}
pixelBuffer.limit(pixelValues.length);
return pixelBuffer;
}
Raster raster = image.getRaster();
ColorModel colorModel = image.getColorModel();
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
Object pixel = raster.getDataElements(x, y, null);
int alpha = colorModel.getAlpha(pixel);
memPutByte(ptr++, (byte) alpha);
}
}
pixelBuffer.limit(image.getHeight() * image.getWidth());
return pixelBuffer;
}
static ByteBuffer getTextureFromResource(ResourceLocation resource) {
try {
final BufferedImage image = TextureLoader.getBufferedImage(Minecraft.getMinecraft().getResourceManager()
.getResource(resource));
if (image.getWidth() != image.getHeight()) {
throw new UnsupportedOperationException(resource + "has a different width and height, they cannot get rendered!");
}
return getPixelBuffer(image);
} catch (IOException e) {
System.out.println("Failed to load resource " + resource + ".");
return null;
}
}
}
@@ -4,7 +4,6 @@ import com.gtnewhorizon.gtnhlib.config.ConfigException;
import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
import com.gtnewhorizons.angelica.client.font.FontStrategist;
import com.gtnewhorizons.angelica.config.FontConfig;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import net.coderbot.iris.gui.element.widget.IrisButton;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiScreen;
@@ -14,9 +13,8 @@ import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.resources.I18n;
import net.minecraft.util.MathHelper;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import java.awt.*;
import java.awt.Font;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -49,9 +47,9 @@ public class FontConfigScreen extends GuiScreen {
private IrisButton fwdButton;
private IrisButton backButton;
SliderClone.Option optFontQuality = new SliderClone.Option(18, 72, 1);
SliderClone.Option optFontQuality = new SliderClone.Option(6, 72, 6);
SliderClone.Option optShadowOffset = new SliderClone.Option(0, 2, 0.05f);
SliderClone.Option optBrightness = new SliderClone.Option(0, 10, 1);
SliderClone.Option optShadowCopies = new SliderClone.Option(1, 8, 1);
SliderClone.Option optBoldCopies = new SliderClone.Option(1, 8, 1);
SliderClone.Option optGlyphAspect = new SliderClone.Option(-1, 1, 0.05f);
SliderClone.Option optGlyphScale = new SliderClone.Option(0.1f, 3, 0.05f);
@@ -85,7 +83,7 @@ public class FontConfigScreen extends GuiScreen {
searchBox = new GuiTextField(this.fontRendererObj, this.width / 2 - 120, 24, 240, 20);
searchBox.setMaxStringLength(64);
fontList = new FontList();
testArea = new GuiTextField(this.fontRendererObj, this.width * 5 / 6 - this.width / 7, 0, this.width * 2 / 7, 20);
testArea = new GuiTextField(this.fontRendererObj, this.width * 5 / 6 - this.width / 7, 63 - 10, this.width * 2 / 7, 20);
testArea.setMaxStringLength(512);
testArea.setText(I18n.format("options.angelica.fontconfig.testareaexample"));
initButtons();
@@ -126,79 +124,11 @@ public class FontConfigScreen extends GuiScreen {
.height(sliderHeight)
.option(optFontQuality)
.initialValue(FontConfig.customFontQuality)
.setter(FontConfig::setCustomFontQuality)
.setter(this::setFontQuality)
.langKey("options.angelica.fontconfig.font_quality")
.formatString("%2.0f")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optBrightness)
.initialValue(FontConfig.fontBrightness)
.setter(FontConfig::setFontBrightness)
.langKey("options.angelica.fontconfig.brightness")
.formatString("%.0f")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optGlyphAspect)
.initialValue(FontConfig.glyphAspect)
.setter(FontConfig::setGlyphAspect)
.langKey("options.angelica.fontconfig.glyph_aspect")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optGlyphScale)
.initialValue(FontConfig.glyphScale)
.setter(FontConfig::setGlyphScale)
.langKey("options.angelica.fontconfig.glyph_scale")
.formatString("x%3.2f")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optFontAAStrength)
.initialValue(FontConfig.fontAAStrength)
.setter(FontConfig::setFontAAStrength)
.langKey("options.angelica.fontconfig.font_aa_strength")
.formatString("%.0f")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optFontAAMode)
.initialValue(FontConfig.fontAAMode)
.setter(FontConfig::setFontAAMode)
.formatter(this::fontAAModeFormat)
.langKey("options.angelica.fontconfig.aamode")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optWhitespaceScale)
.initialValue(FontConfig.whitespaceScale)
.setter(value -> FontConfig.whitespaceScale = value.intValue())
.langKey("options.angelica.fontconfig.whitespace_scale")
.formatString("x%3.2f")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optGlyphSpacing)
.initialValue(FontConfig.glyphSpacing)
.setter(FontConfig::setGlyphSpacing)
.langKey("options.angelica.fontconfig.glyph_spacing")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
@@ -209,6 +139,74 @@ public class FontConfigScreen extends GuiScreen {
.formatString("x%3.2f")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optGlyphAspect)
.initialValue(FontConfig.glyphAspect)
.setter(value -> FontConfig.glyphAspect = value)
.langKey("options.angelica.fontconfig.glyph_aspect")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optGlyphScale)
.initialValue(FontConfig.glyphScale)
.setter(value -> FontConfig.glyphScale = value)
.langKey("options.angelica.fontconfig.glyph_scale")
.formatString("x%3.2f")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optFontAAStrength)
.initialValue(FontConfig.fontAAStrength)
.setter(value -> FontConfig.fontAAStrength = value.intValue())
.langKey("options.angelica.fontconfig.font_aa_strength")
.formatString("%.0f")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optFontAAMode)
.initialValue(FontConfig.fontAAMode)
.setter(value -> FontConfig.fontAAMode = value.intValue())
.formatter(this::fontAAModeFormat)
.langKey("options.angelica.fontconfig.aamode")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optWhitespaceScale)
.initialValue(FontConfig.whitespaceScale)
.setter(value -> FontConfig.whitespaceScale = value)
.langKey("options.angelica.fontconfig.whitespace_scale")
.formatString("x%3.2f")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optGlyphSpacing)
.initialValue(FontConfig.glyphSpacing)
.setter(value -> FontConfig.glyphSpacing = value)
.langKey("options.angelica.fontconfig.glyph_spacing")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
.option(optShadowCopies)
.initialValue(FontConfig.shadowCopies)
.setter(value -> FontConfig.shadowCopies = value.intValue())
.langKey("options.angelica.fontconfig.shadow_copies")
.formatString("%.0f")
.build()
);
sliders.add(new SliderClone.SliderCloneBuilder()
.width(sliderWidth)
.height(sliderHeight)
@@ -224,7 +222,7 @@ public class FontConfigScreen extends GuiScreen {
.height(sliderHeight)
.option(optCustomFontScale)
.initialValue(FontConfig.customFontScale)
.setter(FontConfig::setCustomFontScale)
.setter(value -> FontConfig.customFontScale = value)
.langKey("options.angelica.fontconfig.custom_font_scale")
.formatString("x%3.2f")
.build()
@@ -281,14 +279,10 @@ public class FontConfigScreen extends GuiScreen {
pos = selectedPrimaryFontListPos;
if (pos >= 0 && pos < displayedFonts.size()) {
FontConfig.customFontNamePrimary = displayedFonts.get(pos).getFontName();
} else {
FontConfig.customFontNamePrimary = "(none)";
}
pos = selectedFallbackFontListPos;
if (pos >= 0 && pos < displayedFonts.size()) {
FontConfig.customFontNameFallback = displayedFonts.get(pos).getFontName();
} else {
FontConfig.customFontNameFallback = "(none)";
}
FontStrategist.reloadCustomFontProviders();
@@ -313,7 +307,7 @@ public class FontConfigScreen extends GuiScreen {
}
private void toggleCustomFont(IrisButton button) {
FontConfig.setEnableCustomFont(!FontConfig.enableCustomFont);
FontConfig.enableCustomFont = !FontConfig.enableCustomFont;
applyChanges(false);
button.displayString = FontConfig.enableCustomFont ?
I18n.format("options.angelica.fontconfig.disable_custom_font") :
@@ -344,8 +338,9 @@ public class FontConfigScreen extends GuiScreen {
};
}
private long hoverTimeStart = 0;
private GuiButton hoveredButton;
private float lastMouseX = 0;
private float lastMouseY = 0;
private long lastStillTime = 0;
@Override
public void drawScreen(int mouseX, int mouseY, float delta) {
drawBackground(0);
@@ -379,7 +374,7 @@ public class FontConfigScreen extends GuiScreen {
I18n.format("options.angelica.fontconfig.testareainfo"), this.width / 4
);
}
int cumulativeY = 44 + 5 + 10;
int cumulativeY = 73;
for (String s : this.testAreaInfo) {
drawCenteredString(this.fontRendererObj, s, this.width * 5 / 6, cumulativeY, 0xFFFFFF);
cumulativeY += this.fontRendererObj.FONT_HEIGHT;
@@ -392,38 +387,13 @@ public class FontConfigScreen extends GuiScreen {
this.testArea.xPosition + this.fontRendererObj.getStringWidth(this.testAreaPrompt) / 2 + 4,
this.testArea.yPosition + this.testArea.height / 2 - 4, 0xFFFFFF);
}
final String displayText = this.testArea.getText().replace('&', '§');
List<String> testText = this.fontRendererObj.listFormattedStringToWidth(
displayText, this.width / 4
this.testArea.getText().replace('&', '§'), this.width / 4
);
cumulativeY += this.testArea.height + 4;
for (String s : testText) {
GLStateManager.glPushMatrix();
GLStateManager.glTranslatef(this.width * 5 / 6, cumulativeY, 0);
drawCenteredString(this.fontRendererObj, s + "§r (1.00x Scale)", 0, 0, 0xFFFFFF);
cumulativeY += this.fontRendererObj.FONT_HEIGHT * 2;
GLStateManager.glPopMatrix();
GLStateManager.glPushMatrix();
GLStateManager.glTranslatef(this.width * 5 / 6, cumulativeY, 0);
GLStateManager.glScalef(0.75f, 0.75f, 1);
drawCenteredString(this.fontRendererObj, s + "§r (0.75x Scale)", 0, 0, 0xFFFFFF);
cumulativeY += this.fontRendererObj.FONT_HEIGHT * 2 * 0.75;
GLStateManager.glPopMatrix();
GLStateManager.glPushMatrix();
GLStateManager.glTranslatef(this.width * 5 / 6, cumulativeY, 0);
GLStateManager.glScalef(0.5f, 0.5f, 1);
drawCenteredString(this.fontRendererObj, s + "§r (0.5x Scale)", 0, 0, 0xFFFFFF);
cumulativeY += this.fontRendererObj.FONT_HEIGHT * 2 * 0.5;
GLStateManager.glPopMatrix();
GLStateManager.glPushMatrix();
GLStateManager.glTranslatef(this.width * 5 / 6, cumulativeY, 0);
GLStateManager.glScalef(0.33f, 0.33f, 1);
drawCenteredString(this.fontRendererObj, s + "§r (0.33x Scale)", 0, 0, 0xFFFFFF);
cumulativeY += this.fontRendererObj.FONT_HEIGHT * 2 * 0.33;
GLStateManager.glPopMatrix();
drawCenteredString(this.fontRendererObj, s, this.width * 5 / 6, cumulativeY, 0xFFFFFF);
cumulativeY += this.fontRendererObj.FONT_HEIGHT;
}
super.drawScreen(mouseX, mouseY, delta);
@@ -435,19 +405,20 @@ public class FontConfigScreen extends GuiScreen {
final int left = slider.xPosition;
final int right = slider.xPosition + slider.width;
if (mouseY < top || mouseY >= bot || mouseX < left || mouseX >= right) { continue; }
if (guiButton != hoveredButton) {
hoveredButton = guiButton;
hoverTimeStart = System.currentTimeMillis();
}
if (Mouse.isButtonDown(0) || Mouse.isButtonDown(1)) {
hoverTimeStart = System.currentTimeMillis();
}
if (hoverTimeStart + 300L < System.currentTimeMillis()) {
displayTooltip(mouseX, mouseY, slider.tooltipKey);
if (mouseX == lastMouseX && mouseY == lastMouseY) {
if (lastStillTime == 0) {
lastStillTime = System.currentTimeMillis();
}
if (lastStillTime + 500L < System.currentTimeMillis()) {
displayTooltip(mouseX, mouseY, slider.tooltipKey);
}
} else {
lastStillTime = 0;
}
break;
}
lastMouseX = mouseX;
lastMouseY = mouseY;
}
private void displayTooltip(int x, int y, String langKey) {
@@ -540,21 +511,19 @@ public class FontConfigScreen extends GuiScreen {
if (slotIndex < 0 || slotIndex >= this.getSize()) { return; }
if (mouseButton == 0) {
if (selectedPrimaryFontListPos == slotIndex) {
selectedPrimaryFontListPos = -1;
currentPrimaryFontName = "(none)";
} else {
selectedPrimaryFontListPos = slotIndex;
currentPrimaryFontName = displayedFonts.get(slotIndex).getFontName();
}
onElemClicked(slotIndex, false);
} else if (mouseButton == 1) {
if (selectedFallbackFontListPos == slotIndex) {
selectedFallbackFontListPos = -1;
currentFallbackFontName = "(none)";
} else {
selectedFallbackFontListPos = slotIndex;
currentFallbackFontName = displayedFonts.get(slotIndex).getFontName();
}
onElemClicked(slotIndex, true);
}
}
protected void onElemClicked(int index, boolean rightClick) {
if (!rightClick) {
selectedPrimaryFontListPos = index;
currentPrimaryFontName = displayedFonts.get(index).getFontName();
} else {
selectedFallbackFontListPos = index;
currentFallbackFontName = displayedFonts.get(index).getFontName();
}
applyChanges(false);
}
@@ -151,7 +151,7 @@ public class DeferredDrawBatcher {
*/
static long captureStateKey() {
final int activeUnit = GLStateManager.getActiveTextureUnit();
final int textureId = GLStateManager.getTextures().getTextureUnitBindings(activeUnit).getTexture2D();
final int textureId = GLStateManager.getTextures().getTextureUnitBindings(activeUnit).getBinding();
final int srcRgb = GLStateManager.getBlendState().getSrcRgb();
final int dstRgb = GLStateManager.getBlendState().getDstRgb();
final boolean blendEnabled = GLStateManager.getBlendMode().isEnabled();
@@ -1,86 +0,0 @@
package com.gtnewhorizons.angelica.client.streaming;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL15;
import org.lwjgl.opengl.GL31;
import java.nio.ByteBuffer;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memAddress0;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memAlloc;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.memRealloc;
public final class FallbackStreamingDrawer extends StreamingDrawer {
private int capacity;
private int pendingDataSize;
private int elementCount;
// private ByteBuffer mappedBuffer;
// private long mappedAddress;
private ByteBuffer buffer;
private long basePtr;
private void ensureCapacity(int needed) {
if (needed + pendingDataSize > capacity) {
resize(capacity * 2);
}
}
FallbackStreamingDrawer(int stride, int elementCapacity, VAOConsumer initVAO) {
super(initVAO, stride);
capacity = elementCapacity * stride;
final int totalCapacity = capacity;
buffer = memAlloc(totalCapacity);
basePtr = memAddress0(buffer);
}
@Override
public void drawElementsInstanced(int mode, int indices_count, int type, long indices_buffer_offset) {
if (this.vaoId == 0) {
super.initVAO();
}
buffer.limit(pendingDataSize);
GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, vboId);
GLStateManager.glBufferData(GL15.GL_ARRAY_BUFFER, buffer, GL15.GL_STREAM_DRAW);
GL31.glDrawElementsInstanced(
GL11.GL_TRIANGLES,
6,
GL11.GL_UNSIGNED_SHORT,
0,
elementCount
);
elementCount = 0;
GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
pendingDataSize = 0;
}
@Override
public long writeSection(int needed) {
ensureCapacity(needed);
long pointer = basePtr + pendingDataSize;
pendingDataSize += needed;
elementCount++;
return pointer;
}
public void resize(int newSectionSize) {
capacity = newSectionSize;
buffer = memRealloc(buffer, newSectionSize);
basePtr = memAddress0(buffer);
}
public void destroy() {
GLStateManager.glDeleteBuffers(vboId);
vboId = 0;
}
@Override
public boolean isEmpty() {
return elementCount == 0;
}
}
@@ -1,224 +0,0 @@
package com.gtnewhorizons.angelica.client.streaming;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import org.lwjgl.opengl.GL15;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.GL32;
import org.lwjgl.opengl.GL42;
import org.lwjgl.opengl.GL44;
import java.nio.ByteBuffer;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.*;
/**
* Triple-buffered persistent VAO/VBO streamer.
* <br>
* Unlike {@link com.gtnewhorizons.angelica.glsm.streaming.PersistentStreamingBuffer},
* this provides direct writes into persistently mapped GPU memory, bypassing
* temporary upload buffers for lower-overhead streaming.
*/
public final class PersistentStreamingDrawer extends StreamingDrawer {
private static final int NUM_SECTIONS = 4;
private static final int FLAGS =
GL30.GL_MAP_WRITE_BIT
| GL44.GL_MAP_PERSISTENT_BIT
| GL44.GL_MAP_COHERENT_BIT;
private int sectionSize;
//private int totalCapacity;
private ByteBuffer persistentMapping;
private long baseAddress;
private final long[] fences = new long[NUM_SECTIONS];
private int currentSection;
private int sectionWriteOffset;
private int sectionWriteStart;
private long sectionWritePointer;
private int sectionDrawCount;
private static int globalFPSCount;
PersistentStreamingDrawer(int stride, int elementCapacity, VAOConsumer initVAO) {
super(initVAO, stride);
sectionSize = elementCapacity * stride;
final int totalCapacity = getTotalCapacity();
GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, vboId);
GLStateManager.glBufferStorage(GL15.GL_ARRAY_BUFFER, totalCapacity, FLAGS);
persistentMapping = GLStateManager.glMapBufferRange(
GL15.GL_ARRAY_BUFFER, 0, totalCapacity, FLAGS);
baseAddress = memAddress0(persistentMapping);
sectionWritePointer = baseAddress;
if (persistentMapping == null)
throw new RuntimeException("Persistent mapping failed — check ARB_buffer_storage support.");
}
public static void incrementFPS() { //TODO make this use Display
globalFPSCount = (globalFPSCount + 1) % NUM_SECTIONS;
}
private void ensureCapacity(int needed) {
if (needed + sectionWriteOffset > sectionSize) {
System.out.println("Resizing to " + sectionSize * 2 + " bytes.");
new Exception().printStackTrace();
resize(sectionSize * 2);
}
}
@Override
public long writeSection(int needed) {
if (globalFPSCount != currentSection) {
lockCurrentSection();
advanceSection();
//System.out.println("Moving to section " + currentSection);
}
ensureCapacity(needed);
long pointer = sectionWritePointer + sectionWriteOffset;
sectionWriteOffset += needed;
sectionDrawCount++;
return pointer;
}
// AI slop resize, seems to work well
// Essentially copies any pending draw operations into the new buffer
public void resize(int newSectionSize) {
// Preserve pending batch
int sectionBase = currentSection * sectionSize;
int batchSize = (sectionBase + sectionWriteOffset) - sectionWriteStart;
long tempBuffer = nmemAllocChecked(batchSize);
memCopy(
sectionWritePointer,
tempBuffer,
batchSize
);
// Wait for GPU
for (int i = 0; i < NUM_SECTIONS; i++) {
waitForSection(i);
}
// Destroy old buffer
GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, vboId);
GLStateManager.glUnmapBuffer(GL15.GL_ARRAY_BUFFER);
GLStateManager.glDeleteBuffers(vboId);
// Create new buffer
sectionSize = newSectionSize;
sectionWriteStart = currentSection * sectionSize;
vboId = GLStateManager.glGenBuffers();
final int totalCapacity = getTotalCapacity();
GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, vboId);
GLStateManager.glBufferStorage(
GL15.GL_ARRAY_BUFFER,
totalCapacity,
FLAGS
);
persistentMapping = GLStateManager.glMapBufferRange(
GL15.GL_ARRAY_BUFFER,
0,
totalCapacity,
FLAGS
);
baseAddress = memAddress0(persistentMapping);
sectionWritePointer = baseAddress + sectionWriteStart;
sectionWriteOffset = batchSize;
vaoId = 0;
// Restore pending batch at offset 0
memCopy(
tempBuffer,
sectionWritePointer,
batchSize
);
nmemFree(tempBuffer);
}
public int getTotalCapacity() {
return sectionSize * NUM_SECTIONS;
}
public void destroy() {
for (int i = 0; i < NUM_SECTIONS; i++) {
if (fences[i] != 0) {
GLStateManager.glDeleteSync(fences[i]);
fences[i] = 0;
}
}
GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, vboId);
GLStateManager.glUnmapBuffer(GL15.GL_ARRAY_BUFFER);
GLStateManager.glDeleteBuffers(vboId);
persistentMapping = null;
vboId = 0;
}
private void lockCurrentSection() {
if (fences[currentSection] != 0L)
GLStateManager.glDeleteSync(fences[currentSection]);
fences[currentSection] = GLStateManager.glFenceSync(GL32.GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
}
private void advanceSection() {
currentSection = (currentSection + 1) % NUM_SECTIONS;
sectionWriteOffset = 0;
sectionWriteStart = currentSection * sectionSize;
sectionWritePointer = baseAddress + sectionWriteStart;
waitForSection(currentSection);
}
private void waitForSection(int section) {
if (fences[section] == 0) return;
while (true) {
int result = GLStateManager.glClientWaitSync(
fences[section], GL32.GL_SYNC_FLUSH_COMMANDS_BIT, 1_000_000_000L);
if (result == GL32.GL_ALREADY_SIGNALED || result == GL32.GL_CONDITION_SATISFIED) break;
if (result == GL32.GL_WAIT_FAILED)
throw new RuntimeException("glClientWaitSync failed for section " + section);
// GL_TIMEOUT_EXPIRED — retry
}
GLStateManager.glDeleteSync(fences[section]);
fences[section] = 0;
}
@Override
public void drawElementsInstanced(
int mode, int indices_count, int type, long indices_buffer_offset
) {
if (this.vaoId == 0) {
super.initVAO();
}
final int start = sectionWriteStart;
final int offset = start / stride;
GL42.glDrawElementsInstancedBaseInstance(
mode,
indices_count,
type,
indices_buffer_offset,
sectionDrawCount,
offset
);
sectionDrawCount = 0;
sectionWriteStart = currentSection * sectionSize + sectionWriteOffset;
}
@Override
public boolean isEmpty() {
return sectionDrawCount == 0;
}
}
@@ -1,66 +0,0 @@
package com.gtnewhorizons.angelica.client.streaming;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import org.lwjgl.opengl.ContextCapabilities;
import org.lwjgl.opengl.GL15;
import org.lwjgl.opengl.GL30;
public abstract class StreamingDrawer {
protected int vboId;
protected int vaoId;
protected final VAOConsumer vaoConsumer;
protected final int stride;
private static final boolean supportsPersistent;
static {
final ContextCapabilities caps = GLStateManager.capabilities;
// supportsPersistent = caps.OpenGL44
// || (caps.GL_ARB_buffer_storage && caps.GL_ARB_base_instance);
supportsPersistent = false;
}
public static StreamingDrawer create(int stride, int elementCapacity, VAOConsumer vaoConsumer) {
return supportsPersistent ? new PersistentStreamingDrawer(stride, elementCapacity, vaoConsumer)
: new FallbackStreamingDrawer(stride, elementCapacity, vaoConsumer);
}
StreamingDrawer(VAOConsumer vaoConsumer, int stride) {
this.vboId = GL15.glGenBuffers();
this.vaoConsumer = vaoConsumer;
this.stride = stride;
}
public final void initVAO() {
this.vaoId = GLStateManager.glGenVertexArrays();
vaoConsumer.initialize(vaoId, vboId);
}
public final int getVBO() {
return vboId;
}
public final int getVAO() {
return vaoId;
}
public abstract long writeSection(int needed);
public abstract void drawElementsInstanced(
int mode, int indices_count, int type, long indices_buffer_offset
);
public abstract boolean isEmpty();
public final void delete() {
GL15.glDeleteBuffers(vboId);
GL30.glDeleteVertexArrays(vaoId);
}
public final void switchContext() {
GL30.glDeleteVertexArrays(vaoId);
vaoId = 0;
}
}
@@ -1,11 +0,0 @@
package com.gtnewhorizons.angelica.client.streaming;
public interface VAOConsumer {
/**
* Passes in a vertex array object (VAO) and a vertex buffer object (VBO) and expects the program to initialize
* the VAO with the correct pointers using things such as {@link org.lwjgl.opengl.GL20#glVertexAttribPointer}.
* @return The Data size that the VAO expects
*/
void initialize(int vao, int vbo);
}
@@ -0,0 +1,39 @@
package com.gtnewhorizons.angelica.compat;
import java.util.function.Function;
import com.gtnewhorizon.gtnhlib.util.font.FontRendering;
import com.gtnewhorizons.angelica.client.font.ColorCodeUtils;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
public class GTNHLibCompat {
public static final boolean HAS_TEXT_PREPROCESSOR;
static {
boolean found = false;
try {
FontRendering.class.getMethod("setTextPreprocessor", Function.class);
found = true;
} catch (NoSuchMethodException ignored) {}
HAS_TEXT_PREPROCESSOR = found;
}
/** Only call when {@link #HAS_TEXT_PREPROCESSOR} is true. */
public static void registerPreprocessor() {
FontRendering.setTextPreprocessor(new FontRendering.TextPreprocessor() {
@Override
public String apply(String text) {
return AngelicaConfig.enableAmpersandConversion
? ColorCodeUtils.convertAmpersandToSectionX(text)
: text;
}
@Override
public boolean handlesAmpCodes() {
return AngelicaConfig.enableAmpersandConversion;
}
});
}
}
@@ -30,6 +30,7 @@ public class ModStatus {
public static boolean isCosmeticArmorReworkedLoaded;
public static boolean isFluidLoggedLoaded;
public static boolean isBOPLoaded;
public static boolean isEtFuturumLoaded;
public static void preInit() {
if (Loader.isModLoaded("backhand")) {
@@ -49,6 +50,7 @@ public class ModStatus {
isBaublesLoaded = Loader.isModLoaded("Baubles");
isCosmeticArmorReworkedLoaded = Loader.isModLoaded("cosmeticarmorreworked");
isFluidLoggedLoaded = Loader.isModLoaded("fluidlogged");
isEtFuturumLoaded = Loader.isModLoaded("etfuturum");
isHoloInventoryLoaded = Loader.isModLoaded("holoinventory");
isBOPLoaded = Loader.isModLoaded("BiomesOPlenty");
@@ -0,0 +1,51 @@
package com.gtnewhorizons.angelica.compat.etfuturum;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.ReflectionHelper;
import lombok.Getter;
import net.minecraft.entity.player.EntityPlayer;
import java.lang.invoke.MethodHandle;
import java.lang.invoke.MethodHandles;
import java.lang.invoke.MethodType;
import static com.gtnewhorizons.angelica.compat.ModStatus.LOGGER;
public final class EtFuturumCompat {
private static final String IELYTRA_PLAYER = "ganymedes01.etfuturum.api.elytra.IElytraPlayer";
@Getter
private static boolean loaded;
private static Class<?> elytraPlayerClass;
private static final MethodHandle isElytraFlyingHandle;
static {
MethodHandle handle = null;
try {
if (Loader.isModLoaded("etfuturum")) {
elytraPlayerClass = ReflectionHelper.getClass(EtFuturumCompat.class.getClassLoader(), IELYTRA_PLAYER);
handle = MethodHandles.lookup().findVirtual(elytraPlayerClass, "etfu$isElytraFlying",
MethodType.methodType(boolean.class));
loaded = true;
}
} catch (Throwable t) {
LOGGER.error("Failed to load Et Futurum Requiem elytra compat", t);
loaded = false;
}
isElytraFlyingHandle = handle;
}
private EtFuturumCompat() {
}
public static boolean isElytraFlying(EntityPlayer player) {
if (!loaded || isElytraFlyingHandle == null || !elytraPlayerClass.isInstance(player)) {
return false;
}
try {
return (boolean) isElytraFlyingHandle.invoke(player);
} catch (Throwable t) {
return false;
}
}
}
@@ -357,8 +357,13 @@ public class AngelicaConfig {
@Config.RequiresMcRestart
public static boolean disableErrorChecks;
@Config.Comment("Fixes various issues with entity overlays, such as z-fighting, damage animations and eyes.")
@Config.Comment("Fixes various issues with entity overlays, such as z-fighting and eyes.")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean entityOverlayFixes;
@Config.Comment("Swap the vanilla damage overlay with one similar to modern. Fixes specific issues with z-fighting.")
@Config.DefaultBoolean(true)
@Config.RequiresMcRestart
public static boolean entityModernDamageOverlay;
}
@@ -1,10 +1,6 @@
package com.gtnewhorizons.angelica.config;
import com.gtnewhorizon.gtnhlib.config.Config;
import com.gtnewhorizons.angelica.client.font.BatchingFontRenderer;
import static com.gtnewhorizons.angelica.client.font.BatchingFontRenderer.reloadShaders;
import static com.gtnewhorizons.angelica.client.font.BatchingFontRenderer.reloadFonts;
@Config(modid = "angelica", category = "customfont")
public class FontConfig {
@@ -12,11 +8,6 @@ public class FontConfig {
@Config.DefaultBoolean(false)
public static boolean enableCustomFont;
public static void setEnableCustomFont(boolean enableCustomFont) {
FontConfig.enableCustomFont = enableCustomFont;
reloadFonts();
}
@Config.Comment("Name of the primary custom font. Best not to set it from here.")
@Config.DefaultString("(none)")
public static String customFontNamePrimary;
@@ -26,29 +17,19 @@ public class FontConfig {
public static String customFontNameFallback;
@Config.Comment("The quality at which custom fonts are rendered, making them less pixelated but increasing memory usage.")
@Config.DefaultInt(32)
@Config.DefaultInt(30)
@Config.RangeInt(min = 6, max = 72)
public static int customFontQuality;
public static void setCustomFontQuality(float customFontQuality) {
FontConfig.customFontQuality = (int) customFontQuality;
reloadFonts();
}
@Config.Comment("Controls the distance at which the font's shadow is drawn.")
@Config.DefaultFloat(1F)
@Config.RangeFloat(min = 0F, max = 2F)
public static float fontShadowOffset;
@Config.Comment("Adds extra brightness to fonts. 0 = None, 10 = 2x brighter")
@Config.DefaultInt(0)
@Config.RangeInt(min = 0, max = 10)
public static int fontBrightness;
public static void setFontBrightness(float fontBrightness) {
FontConfig.fontBrightness = (int) fontBrightness;
BatchingFontRenderer.reloadShaders();
}
@Config.Comment("The number of shadows to be drawn behind text at various offsets.")
@Config.DefaultInt(1)
@Config.RangeInt(min = 1, max = 8)
public static int shadowCopies;
@Config.Comment("The number of bold copies to be drawn behind text at various offsets.")
@Config.DefaultInt(2)
@@ -60,70 +41,35 @@ public class FontConfig {
@Config.RangeFloat(min = -1F, max = 1F)
public static float glyphAspect;
public static void setGlyphAspect(float glyphAspect) {
FontConfig.glyphAspect = glyphAspect;
reloadFonts();
}
@Config.Comment("Scale of each glyph, whitespace excluded.")
@Config.DefaultFloat(1F)
@Config.RangeFloat(min = 0.1F, max = 3F)
public static float glyphScale;
public static void setGlyphScale(float glyphScale) {
FontConfig.glyphScale = glyphScale;
reloadFonts();
}
@Config.Comment("Whitespace scale.")
@Config.DefaultInt(1)
@Config.RangeInt(min = 1, max = 3)
public static int whitespaceScale;
public static void setWhitespaceScale(int whitespaceScale) {
FontConfig.whitespaceScale = whitespaceScale;
reloadFonts();
}
@Config.DefaultFloat(1F)
@Config.RangeFloat(min = 0.1F, max = 3F)
public static float whitespaceScale;
@Config.Comment("Adds extra spacing between glyphs.")
@Config.DefaultFloat(0F)
@Config.RangeFloat(min = -2F, max = 2F)
public static float glyphSpacing;
public static void setGlyphSpacing(float glyphSpacing) {
FontConfig.glyphSpacing = glyphSpacing;
reloadFonts();
}
@Config.Comment("Controls font antialiasing. 0 = none, 1 = 4x MSAA, 2 = 16x MSAA.")
@Config.DefaultInt(2)
@Config.RangeInt(min = 0, max = 2)
public static int fontAAMode;
public static void setFontAAMode(float fontAAMode) {
FontConfig.fontAAMode = (int) fontAAMode;
reloadShaders();
}
@Config.Comment("Affects font antialiasing sample spacing. Higher values increase blur.")
@Config.DefaultInt(7)
@Config.RangeInt(min = 1, max = 24)
public static int fontAAStrength;
public static void setFontAAStrength(float fontAAStrength) {
FontConfig.fontAAStrength = (int) fontAAStrength;
reloadShaders();
}
@Config.Comment("Custom font scale multiplier, for bugfixes.")
@Config.DefaultFloat(1.5F)
@Config.RangeFloat(min = 0.1F, max = 3F)
public static float customFontScale; //TODO wat
public static void setCustomFontScale(float customFontScale) {
FontConfig.customFontScale = customFontScale;
reloadFonts();
}
public static float customFontScale;
@Config.Comment("A shadow offset multiplier applied only to the Unicode font.")
@Config.DefaultFloat(0.5F)
@@ -136,9 +82,4 @@ public class FontConfig {
"See for additional details: https://github.com/GTNewHorizons/Angelica/issues/1239#issuecomment-3729877936"})
@Config.DefaultBoolean(true)
public static boolean enableGlyphReplacements;
public static void setEnableGlyphReplacements(boolean enableGlyphReplacements) {
FontConfig.enableGlyphReplacements = enableGlyphReplacements;
reloadFonts();
}
}
@@ -0,0 +1,36 @@
package com.gtnewhorizons.angelica.event;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraftforge.eventbus.api.bus.EventBus;
import net.minecraftforge.eventbus.api.event.MutableEvent;
public class ClientEvent extends MutableEvent {
public static final EventBus<ClientEvent> BUS = EventBus.create(ClientEvent.class);
public final ClientEventType event;
public final EntityRenderer renderer;
public final float partialTicks;
private ClientEvent(ClientEventType event) {
this.event = event;
this.renderer = null;
this.partialTicks = 0;
}
private ClientEvent(ClientEventType event, EntityRenderer renderer, float partialTicks) {
this.event = event;
this.renderer = renderer;
this.partialTicks = partialTicks;
}
public static void post(ClientEventType event, EntityRenderer renderer, float partialTicks) {
if (!BUS.hasListeners()) return;
BUS.post(new ClientEvent(event, renderer, partialTicks));
}
public static void post(ClientEventType event) {
if (!BUS.hasListeners()) return;
BUS.post(new ClientEvent(event));
}
}
@@ -0,0 +1,8 @@
package com.gtnewhorizons.angelica.event;
public enum ClientEventType {
PRE_RENDER_GUI,
PRE_RENDER_HUD,
POST_RENDER_HUD,
ON_TICK,
}
@@ -6,11 +6,12 @@ import com.gtnewhorizon.gtnhlib.client.renderer.postprocessing.CustomFramebuffer
import com.gtnewhorizon.gtnhlib.client.renderer.postprocessing.SharedDepthFramebuffer;
import com.gtnewhorizon.gtnhlib.client.renderer.vao.IVertexArrayObject;
import com.gtnewhorizon.gtnhlib.client.renderer.vao.VertexBufferType;
import com.gtnewhorizon.gtnhlib.client.renderer.vbo.IVertexBuffer;
import com.gtnewhorizon.gtnhlib.client.renderer.vertex.DefaultVertexFormat;
import com.gtnewhorizons.angelica.compat.ModStatus;
import com.gtnewhorizons.angelica.compat.holoinventory.HoloInventoryReflectionCompat;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.event.ClientEvent;
import com.gtnewhorizons.angelica.event.ClientEventType;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.glsm.hooks.GLSMConfig;
import com.gtnewhorizons.angelica.mixins.interfaces.GuiIngameAccessor;
@@ -65,6 +66,8 @@ public class HUDCaching {
}
public static void renderCachedHud(EntityRenderer renderer, GuiIngame ingame, float partialTicks, boolean hasScreen, int mouseX, int mouseY) {
ClientEvent.post(ClientEventType.PRE_RENDER_GUI, renderer, partialTicks);
ClientEvent.post(ClientEventType.PRE_RENDER_HUD, renderer, partialTicks);
if (ModStatus.isXaerosMinimapLoaded && ingame instanceof GuiIngameForge) {
// this used to be called by asming into renderGameOverlay, but we removed it
XaeroMinimapCore.beforeIngameGuiRender(partialTicks);
@@ -78,6 +81,7 @@ public class HUDCaching {
if (!AngelicaConfig.hudCachingActive || mc.displayWidth < 16 || mc.displayHeight < 16) {
ingame.renderGameOverlay(partialTicks, hasScreen, mouseX, mouseY);
ClientEvent.post(ClientEventType.POST_RENDER_HUD, renderer, partialTicks);
return;
}
@@ -170,6 +174,8 @@ public class HUDCaching {
GLStateManager.tryBlendFuncSeparate(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
mc.getTextureManager().bindTexture(Gui.icons);
ClientEvent.post(ClientEventType.POST_RENDER_HUD, renderer, partialTicks);
}
/**
@@ -120,7 +120,10 @@ public final class AngelicaClientTweaker implements IFMLLoadingPlugin, IEarlyMix
"Missing dependency: Angelica requires GTNHLib! Download: https://modrinth.com/mod/gtnhlib"),
new DependencyVerifier.Check(
"/com/gtnewhorizon/gtnhlib/client/renderer/VertexCallbackManager.class",
"GTNHLib is outdated: Angelica requires GTNHLib 0.10.0 or newer! Download: https://modrinth.com/mod/gtnhlib")
"GTNHLib is outdated: Angelica requires GTNHLib 0.10.0 or newer! Download: https://modrinth.com/mod/gtnhlib"),
new DependencyVerifier.Check(
"/it/unimi/dsi/fastutil/objects/ObjectBooleanBiConsumer.class",
"GTNHLib is outdated: Angelica requires GTNHLib 0.11.19 or newer (fastutil 8.5.18+)! Download: https://modrinth.com/mod/gtnhlib")
));
} catch (RuntimeException ex) {
fatalDependencyError(ex.getMessage());
@@ -54,6 +54,7 @@ public enum Mixins implements IMixins {
, "angelica.gui.MixinGuiOptions"
, "angelica.optimizations.MixinRendererLivingEntity"
, "angelica.rendering.MixinRenderGlobal_SelectionBox"
, "angelica.gui.MixinGuiIngameForge_ModernF3"
)
),
@@ -63,7 +64,15 @@ public enum Mixins implements IMixins {
.addExcludedMod(TargetedMod.CUSTOM_PLAYER_MODELS)
.addClientMixins(
"angelica.bugfixes.MixinRendererLivingEntity_EyeDepth"
, "angelica.bugfixes.MixinRendererLivingEntity_OverlayTint"
)
),
ANGELICA_DAMAGE_OVERLAY(new MixinBuilder()
.setPhase(Phase.EARLY)
.setApplyIf(() -> AngelicaConfig.entityModernDamageOverlay)
.addExcludedMod(TargetedMod.CUSTOM_PLAYER_MODELS)
.addClientMixins(
"angelica.bugfixes.MixinRendererLivingEntity_OverlayTint"
)
),
@@ -289,6 +298,7 @@ public enum Mixins implements IMixins {
, "shaders.MixinRenderEndPortal"
, "shaders.MixinTileEntityRendererDispatcher"
, "shaders.MixinGlProgram"
, "shaders.MixinTextureManager_ReloadCount"
)
),
@@ -10,8 +10,4 @@ public interface FontRendererAccessor {
BatchingFontRenderer angelica$getBatcher();
void angelica$bindTexture(ResourceLocation location);
int[] angelica$getCharWidths();
byte[] angelica$getGlyphWidths();
}
@@ -4,7 +4,6 @@ import biomesoplenty.api.content.BOPCBlocks;
import com.google.common.base.Objects;
import com.gtnewhorizon.gtnhlib.client.model.loading.ModelRegistry;
import com.gtnewhorizon.gtnhlib.client.renderer.vao.VAOManager;
import com.gtnewhorizons.angelica.client.font.ColorCodeUtils;
import com.gtnewhorizons.angelica.commands.AngelicaCommand;
import com.gtnewhorizons.angelica.common.BlockError;
import com.gtnewhorizons.angelica.compat.ModStatus;
@@ -110,7 +109,6 @@ public final class ClientProxy extends CommonProxy {
MinecraftForge.EVENT_BUS.register(this);
MinecraftForge.EVENT_BUS.register(new EmissiveTextureAutoloader());
ModelRegistry.registerModid(MOD_ID);
ColorCodeUtils.initPreprocessor();
blockError = new BlockError();
}
@@ -0,0 +1,166 @@
package com.gtnewhorizons.angelica.shadercompat;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.glsm.hooks.GLSMHooks;
import com.gtnewhorizons.angelica.glsm.hooks.GlintColorHandler;
import it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap;
import net.coderbot.iris.pipeline.ShadowRenderer;
import net.irisshaders.iris.api.v0.IrisApi;
import net.minecraft.client.Minecraft;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.InputStream;
import java.nio.ByteBuffer;
/**
* Maybe overcomplicated, but it's required to bridge the gap between the modern glint texture and white texture 1.7.10
* has. Some shaders are able to render the glint just fine as they seem to have some amount of support for older
* Minecraft, but others like AstraLex do *not* render correctly. It expects the color to be within the texture.
* This might introduce some oddities that I'm not seeing, but for now this appears to fix the issue.
*/
public final class ShaderGlint {
private static final ResourceLocation GLINT_MASK = new ResourceLocation("textures/misc/enchanted_item_glint.png");
private static final int MAX_CACHE = 64;
private static boolean maskLoaded;
private static boolean maskFailed;
private static int maskW;
private static int maskH;
private static int[] maskLum;
private static final Int2IntLinkedOpenHashMap colorToTexture = new Int2IntLinkedOpenHashMap();
static {
colorToTexture.defaultReturnValue(0);
}
private static final GlintColorHandler COLOR_HANDLER = ShaderGlint::onColorChanged;
private static boolean injecting;
private static boolean swapped;
private static int depth;
private static int prevTexture;
private static ByteBuffer tintBuffer;
private ShaderGlint() {}
public static void beginGlint() {
if (ShadowRenderer.ACTIVE || !IrisApi.getInstance().isShaderPackInUse()) return;
// If a glint span is already active, keep the outer span's saved state and
// let the nested render ride on its handler.
if (depth++ > 0) return;
swapped = false;
injecting = false;
// Save the texture bound before the glint section so endGlint can put it back if we swap
prevTexture = GLStateManager.getBoundTextureForServerState(0);
// Observe vertex-color changes for the rest of the glint section
GLSMHooks.glintColorHandler = COLOR_HANDLER;
}
public static void endGlint() {
if (depth == 0 || --depth > 0) return;
if (GLSMHooks.glintColorHandler != COLOR_HANDLER) return;
GLSMHooks.glintColorHandler = null;
if (swapped) {
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, prevTexture);
}
swapped = false;
injecting = false;
}
private static void onColorChanged(float red, float green, float blue, float alpha) {
if (injecting) return;
final int texture = getTintedTexture(red, green, blue);
if (texture <= 0) return;
injecting = true;
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, texture);
GLStateManager.glColor4f(1.0F, 1.0F, 1.0F, alpha);
injecting = false;
swapped = true;
}
private static int getTintedTexture(float r, float g, float b) {
ensureMaskLoaded();
if (!maskLoaded) return -1;
final int ri = clamp8(r);
final int gi = clamp8(g);
final int bi = clamp8(b);
final int key = (ri << 16) | (gi << 8) | bi;
final int cached = colorToTexture.getAndMoveToLast(key);
if (cached != 0) return cached;
if (colorToTexture.size() >= MAX_CACHE) {
GLStateManager.glDeleteTextures(colorToTexture.remove(colorToTexture.firstIntKey()));
}
final int texture = uploadTinted(ri / 255.0F, gi / 255.0F, bi / 255.0F);
colorToTexture.putAndMoveToLast(key, texture);
return texture;
}
private static int uploadTinted(float r, float g, float b) {
final ByteBuffer pixels = tintBuffer;
pixels.clear();
for (final int l : maskLum) {
pixels.put((byte) Math.round(l * r));
pixels.put((byte) Math.round(l * g));
pixels.put((byte) Math.round(l * b));
pixels.put((byte) 0xFF);
}
pixels.flip();
final int texture = GLStateManager.glGenTextures();
GLStateManager.glBindTexture(GL11.GL_TEXTURE_2D, texture);
// Match the vanilla glint texture
GLStateManager.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_LINEAR);
GLStateManager.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_LINEAR);
GLStateManager.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL11.GL_REPEAT);
GLStateManager.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL11.GL_REPEAT);
GLStateManager.glTexImage2D(GL11.GL_TEXTURE_2D, 0, GL11.GL_RGBA8, maskW, maskH, 0,
GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, pixels);
return texture;
}
private static void ensureMaskLoaded() {
if (maskLoaded || maskFailed) return;
try (final InputStream in = Minecraft.getMinecraft().getResourceManager().getResource(GLINT_MASK).getInputStream()) {
final BufferedImage img = ImageIO.read(in);
maskW = img.getWidth();
maskH = img.getHeight();
maskLum = new int[maskW * maskH];
final int[] argb = img.getRGB(0, 0, maskW, maskH, null, 0, maskW);
for (int i = 0; i < argb.length; i++) {
final int p = argb[i];
final int rr = (p >> 16) & 0xFF;
final int gg = (p >> 8) & 0xFF;
final int bb = p & 0xFF;
maskLum[i] = (rr + gg + bb) / 3;
}
tintBuffer = BufferUtils.createByteBuffer(maskW * maskH * 4);
maskLoaded = true;
} catch (final Exception e) {
maskFailed = true;
}
}
private static int clamp8(float v) {
final int i = Math.round(v * 255.0F);
if (i < 0) return 0;
return Math.min(i, 255);
}
}
@@ -1,56 +0,0 @@
package com.gtnewhorizons.angelica.utils;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import org.lwjgl.opengl.GL15;
import java.nio.ByteBuffer;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.*;
public final class InstancedHelper {
private static int quadVBO;
private static int quadEBO;
public static int getQuadVBO() {
if (quadVBO > 0) return quadVBO;
quadVBO = GLStateManager.glGenBuffers();
GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, quadVBO);
final ByteBuffer data = memAlloc(32);
final long address = memAddress0(data);
memPutFloat(address, 0); memPutFloat(address + 4, 0);
memPutFloat(address + 8, 1); memPutFloat(address + 12, 0);
memPutFloat(address + 16, 0); memPutFloat(address + 20, 1);
memPutFloat(address + 24, 1); memPutFloat(address + 28, 1);
GLStateManager.glBufferData(GL15.GL_ARRAY_BUFFER, data, GL15.GL_STATIC_DRAW);
memFree(data);
GLStateManager.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
return quadVBO;
}
public static int getQuadEBO() {
if (quadEBO > 0) return quadEBO;
quadEBO = GLStateManager.glGenBuffers();
GLStateManager.glBindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, quadEBO);
final ByteBuffer data = memAlloc(12);
final long address = memAddress0(data);
// triangle 1
memPutShort(address, (short) 0);
memPutShort(address + 2, (short) (2));
memPutShort(address + 4, (short) (1));
// triangle 2
memPutShort(address + 6, (short) (2));
memPutShort(address + 8, (short) (3));
memPutShort(address + 10, (short) (1));
GLStateManager.glBufferData(GL15.GL_ELEMENT_ARRAY_BUFFER, data, GL15.GL_STATIC_DRAW);
memFree(data);
GLStateManager.glBindBuffer(GL15.GL_ELEMENT_ARRAY_BUFFER, 0);
return quadEBO;
}
}
@@ -4,6 +4,8 @@ import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.InputEvent;
import cpw.mods.fml.common.gameevent.TickEvent;
import jss.notfine.core.Settings;
import lombok.Getter;
import net.minecraft.client.Minecraft;
import net.minecraft.client.settings.KeyBinding;
@@ -19,6 +21,13 @@ public class Zoom {
@Getter
private static float zoom = ZOOM_DEFAULT;
public static final float ZOOM_SMOOTH_SNAP_EPSILON = 0.001F;
@Getter
private static float currentZoom = 1.0F;
private static long zoomLerpLastNano = 0L;
@Getter
private static final KeyBinding zoomKey = new KeyBinding("Zoom", 0, "key.categories.misc");
@@ -38,6 +47,29 @@ public class Zoom {
zoom = MathHelper.clamp_float((float) (zoom * Math.pow(ZOOM_STEP, Integer.signum(eventDWheel))), ZOOM_MIN, ZOOM_MAX);
}
public static void updateZoomLerp() {
final long now = System.nanoTime();
float dt = zoomLerpLastNano == 0L ? 0.0F : (now - zoomLerpLastNano) / 1.0e9F;
zoomLerpLastNano = now;
final float target = zoomEnabled ? zoom : 1.0F;
if (dt <= 0.0F || !(boolean) Settings.ZOOM_SMOOTH.option.getStore()) {
currentZoom = target;
return;
}
// Clamp dt so a long frame (alt-tab, GC pause) does not snap the zoom.
dt = Math.min(dt, 0.1F);
final int rate = (int) Settings.ZOOM_SMOOTH_SPEED.option.getStore();
currentZoom += (target - currentZoom) * (1.0F - (float) Math.exp(-dt * rate));
if (Math.abs(target - currentZoom) < ZOOM_SMOOTH_SNAP_EPSILON) {
currentZoom = target;
}
}
private static void resetMouseFilters(Minecraft mc) {
if (mc.entityRenderer != null) {
((IMouseFilterExt) mc.entityRenderer.mouseFilterXAxis).angelica$reset();
@@ -79,4 +111,10 @@ public class Zoom {
handleKeyEvent();
}
}
@SubscribeEvent
public void onRenderTick(TickEvent.RenderTickEvent e) {
if (e.phase != TickEvent.Phase.START) return;
updateZoomLerp();
}
}
+3 -1
View File
@@ -174,7 +174,9 @@ public enum Settings {
RenderStars.reloadStarRenderList(Minecraft.getMinecraft().renderGlobal);
}
},
VOID_FOG(new NotFineOptionTickBox(false, OptionImpact.LOW));
VOID_FOG(new NotFineOptionTickBox(false, OptionImpact.LOW)),
ZOOM_SMOOTH(new NotFineOptionTickBox(true, OptionImpact.LOW)),
ZOOM_SMOOTH_SPEED(new NotFineOptionSlider(14, 1, 30, 1, OptionImpact.LOW));
public final NotFineOption<?> option;
@@ -1,6 +1,7 @@
package jss.notfine.gui;
import com.google.common.collect.ImmutableList;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import jss.notfine.config.NotFineConfig;
import jss.notfine.core.Settings;
@@ -169,6 +170,12 @@ public class NotFineGameOptionPages {
.build());
}
if (AngelicaConfig.enableZoom) {
groups.add(OptionGroup.createBuilder()
.add(Settings.ZOOM_SMOOTH.option)
.add(Settings.ZOOM_SMOOTH_SPEED.option)
.build());
}
return new OptionPage(I18n.format("options.video"), ImmutableList.copyOf(groups));
}
@@ -1,7 +1,6 @@
package me.jellysquid.mods.sodium.client.gui;
import com.google.common.collect.ImmutableList;
import com.gtnewhorizons.angelica.client.font.ColorCodeUtils;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.glsm.streaming.StreamingUploader;
@@ -533,6 +532,13 @@ public class SodiumGameOptionPages {
.build())
.build());
if (AngelicaConfig.enableZoom) {
groups.add(OptionGroup.createBuilder()
.add(Settings.ZOOM_SMOOTH.option)
.add(Settings.ZOOM_SMOOTH_SPEED.option)
.build());
}
return new OptionPage(I18n.format("sodium.options.pages.appearance"), ImmutableList.copyOf(groups));
}
@@ -592,11 +598,8 @@ public class SodiumGameOptionPages {
.setName(I18n.format("options.angelica.texteffects.ampersand_conversion"))
.setTooltip(I18n.format("options.angelica.texteffects.ampersand_conversion.tooltip", "\\&"))
.setControl(TickBoxControl::new)
.setBinding((opts, value) -> {
AngelicaConfig.enableAmpersandConversion = value;
ColorCodeUtils.initPreprocessor();
},
opts -> AngelicaConfig.enableAmpersandConversion)
.setBinding((opts, value) -> AngelicaConfig.enableAmpersandConversion = value,
opts -> AngelicaConfig.enableAmpersandConversion)
.build())
.build());
+8 -4
View File
@@ -36,6 +36,7 @@ import net.coderbot.iris.shaderpack.option.Profile;
import net.coderbot.iris.shaderpack.option.values.MutableOptionValues;
import net.coderbot.iris.shaderpack.option.values.OptionValues;
import net.coderbot.iris.texture.pbr.PBRTextureManager;
import net.coderbot.iris.uniforms.CapturedRenderingState;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
@@ -567,11 +568,11 @@ public class Iris {
// If it's a folder-based shaderpack, just use the shaders subdirectory
shaderPackPath = shaderPackRoot.resolve("shaders");
}
if (!Files.exists(shaderPackPath)) {
logger.error("Could not load the shaderpack \"{}\" because it appears to lack a \"shaders\" directory", name);
return false;
if (!Files.exists(shaderPackPath)) {
logger.error("Could not load the shaderpack \"{}\" because it appears to lack a \"shaders\" directory", name);
return false;
}
}
@SuppressWarnings("unchecked")
@@ -762,6 +763,9 @@ public class Iris {
// allows shaderpacks to be changed at runtime
irisConfig.initialize();
// Reset the texture reload counter
CapturedRenderingState.INSTANCE.resetTextureReloadCount();
// Destroy all allocated resources
destroyEverything();
@@ -10,13 +10,13 @@ import java.util.function.BooleanSupplier;
public enum FeatureFlags {
SEPARATE_HARDWARE_SAMPLERS(() -> true, () -> true),
PER_BUFFER_BLENDING(() -> true, RenderSystem::supportsBufferBlending),
COMPUTE_SHADERS(() -> true, RenderSystem::supportsCompute),
COMPUTE_SHADERS(() -> false, RenderSystem::supportsCompute),
ENTITY_TRANSLUCENT(() -> true, () -> true),
BLOCK_EMISSION_ATTRIBUTE(() -> true, () -> true),
CUSTOM_IMAGES(() -> true, RenderSystem::supportsImageLoadStore),
SSBO(() -> true, RenderSystem::supportsSSBO),
HIGHER_SHADOWCOLOR(() -> true, () -> true),
TESSELLATION_SHADERS(() -> true, RenderSystem::supportsTesselation),
TESSELLATION_SHADERS(() -> false, RenderSystem::supportsTesselation),
REVERSED_CULLING(() -> true, () -> true),
CAN_DISABLE_WEATHER(() -> true, () -> true),
UNKNOWN(() -> false, () -> false);
@@ -4,5 +4,7 @@ public enum GlVersion {
GL_11,
GL_12,
GL_30,
GL_31
GL_31,
GL_33,
GL_41
}
@@ -132,6 +132,11 @@ public class StandardMacros {
getBiomeCategoryDefines().forEach((category, ordinal) -> define(standardDefines, category, ordinal));
getVanillaBiomeDefines().forEach((biome, id) -> define(standardDefines, biome, id));
// rain type constants
define(standardDefines, "PPT_NONE", "0");
define(standardDefines, "PPT_RAIN", "1");
define(standardDefines, "PPT_SNOW", "2");
return ImmutableList.copyOf(standardDefines);
}
@@ -5,6 +5,8 @@ import net.coderbot.iris.gl.GlVersion;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL30;
import org.lwjgl.opengl.GL31;
import org.lwjgl.opengl.GL33;
import org.lwjgl.opengl.GL41;
import java.util.Optional;
@@ -72,10 +74,16 @@ public enum InternalTextureFormat {
RG32UI(GL30.GL_RG32UI, GlVersion.GL_30, PixelFormat.RG_INTEGER),
RGB32UI(GL30.GL_RGB32UI, GlVersion.GL_30, PixelFormat.RGB_INTEGER),
RGBA32UI(GL30.GL_RGBA32UI, GlVersion.GL_30, PixelFormat.RGBA_INTEGER),
// 2-bit normalized
RGBA2(GL11.GL_RGBA2, GlVersion.GL_11, PixelFormat.RGBA),
// 4-bit normalized
RGBA4(GL11.GL_RGBA4, GlVersion.GL_11, PixelFormat.RGBA),
// Mixed
R3_G3_B2(GL11.GL_R3_G3_B2, GlVersion.GL_11, PixelFormat.RGB),
RGB5_A1(GL11.GL_RGB5_A1, GlVersion.GL_11, PixelFormat.RGBA),
RGB565(GL41.GL_RGB565, GlVersion.GL_41, PixelFormat.RGB),
RGB10_A2(GL11.GL_RGB10_A2, GlVersion.GL_11, PixelFormat.RGBA),
RGB10_A2UI(GL33.GL_RGB10_A2UI, GlVersion.GL_33, PixelFormat.RGBA_INTEGER),
R11F_G11F_B10F(GL30.GL_R11F_G11F_B10F, GlVersion.GL_30, PixelFormat.RGB),
RGB9_E5(GL30.GL_RGB9_E5, GlVersion.GL_30, PixelFormat.RGB);
@@ -42,6 +42,7 @@ import net.coderbot.iris.gl.texture.DepthBufferFormat;
import net.coderbot.iris.gl.texture.TextureType;
import net.coderbot.iris.helpers.Tri;
import net.coderbot.iris.layer.GbufferPrograms;
import net.coderbot.iris.pipeline.transform.GlintScrollInjector;
import net.coderbot.iris.pipeline.transform.PatchShaderType;
import net.coderbot.iris.pipeline.transform.TransformPatcher;
import net.coderbot.iris.postprocess.BufferFlipper;
@@ -838,13 +839,16 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
if (transformed == null) {
// Fallback to synchronous transform if not pre-computed
String vertex = source.getVertexSource().orElseThrow(NullPointerException::new);
final boolean scrollGlint = GlintScrollInjector.shouldInject(id, source);
transformed = TransformPatcher.patchAttributes(
source.getVertexSource().orElseThrow(NullPointerException::new),
vertex,
source.getGeometrySource().orElse(null),
source.getTessControlSource().orElse(null),
source.getTessEvalSource().orElse(null),
source.getFragmentSource().orElseThrow(NullPointerException::new),
availability);
availability,
scrollGlint);
}
String vertex = transformed.get(PatchShaderType.VERTEX);
@@ -1784,9 +1788,12 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
ProgramSource source = resolver.resolveNullable(id);
if (source != null && !processedSourceNames.contains(source.getName())) {
processedSourceNames.add(source.getName());
final ProgramSource src = source;
final String vertexSource = src.getVertexSource().orElse(null);
final boolean scrollGlint = GlintScrollInjector.shouldInject(id, src);
for (InputAvailability avail : INPUT_AVAILABILITIES) {
Pair<String, InputAvailability> key = Pair.of(source.getName(), avail);
futures.put(key, Iris.ShaderTransformExecutor.submitTracked(() -> TransformPatcher.patchAttributes(source.getVertexSource().orElse(null), source.getGeometrySource().orElse(null), source.getTessControlSource().orElse(null), source.getTessEvalSource().orElse(null), source.getFragmentSource().orElse(null), avail)));
Pair<String, InputAvailability> key = Pair.of(src.getName(), avail);
futures.put(key, Iris.ShaderTransformExecutor.submitTracked(() -> TransformPatcher.patchAttributes(vertexSource, src.getGeometrySource().orElse(null), src.getTessControlSource().orElse(null), src.getTessEvalSource().orElse(null), src.getFragmentSource().orElse(null), avail, scrollGlint)));
}
}
}
@@ -3,6 +3,7 @@ package net.coderbot.iris.pipeline.transform;
import net.coderbot.iris.gl.shader.ShaderType;
import net.coderbot.iris.pipeline.transform.parameter.AttributeParameters;
import org.taumc.glsl.Transformer;
import org.taumc.glsl.grammar.GLSLParser;
import java.util.HashMap;
import java.util.Map;
@@ -13,6 +14,10 @@ import java.util.Map;
*/
class AttributeTransformer {
public static void transform(Transformer transformer, AttributeParameters parameters, int version) {
if (parameters.scrollGlint && parameters.type == ShaderType.VERTEX) {
transformer.replaceExpression("gl_MultiTexCoord0", "(gl_TextureMatrix[0] * gl_MultiTexCoord0)", GLSLParser::postfix_expression);
}
// Always core profile — minimum GLSL version is 330 (see ShaderTransformer.getStageMinimumVersion)
CommonTransformer.transform(transformer, parameters, true, version);
@@ -46,6 +46,10 @@ class CeleritasTransformer {
vertexReplacements.put("gl_MultiTexCoord2", "iris_LightTexCoord");
vertexReplacements.forEach(transformer::replaceExpression);
if (transformer.hasVariable("chunkOffset")) {
transformer.removeVariable("chunkOffset");
}
final Map<String, String> vertexRenames = new HashMap<>();
vertexRenames.put("gl_Color", "_vert_color");
vertexRenames.put("ftransform", "iris_ftransform");
@@ -4,6 +4,7 @@ import com.gtnewhorizons.angelica.glsm.GlslTransformUtils;
import net.coderbot.iris.gl.shader.ShaderType;
import net.coderbot.iris.pipeline.transform.parameter.Parameters;
import org.taumc.glsl.Transformer;
import org.taumc.glsl.grammar.GLSLParser;
import java.util.HashSet;
import java.util.Set;
@@ -29,6 +30,16 @@ public class CommonTransformer {
root.rename("gl_Color", "iris_FrontColor");
}
if (root.hasVariable("gl_TexCoord")) {
if (parameters.type == ShaderType.VERTEX) {
root.rename("gl_TexCoord", "irs_texCoords");
root.injectVariable("out vec4 irs_texCoords[3];");
} else if (parameters.type == ShaderType.FRAGMENT) {
root.rename("gl_TexCoord", "irs_texCoords");
root.injectVariable("in vec4 irs_texCoords[3];");
}
}
if (parameters.type == ShaderType.FRAGMENT) {
if (root.containsCall("gl_FragColor")) {
root.replaceExpression("gl_FragColor", "gl_FragData[0]");
@@ -91,6 +102,27 @@ public class CommonTransformer {
root.renameAndWrapShadow("shadow2D", "texture");
root.renameAndWrapShadow("shadow2DLod", "textureLod");
if (root.containsCall("textureLodOffset")) {
root.injectFunction("vec4 iris_textureLodOffset(sampler2D iris_tlo_s, vec2 iris_tlo_c, float iris_tlo_l, ivec2 iris_tlo_o) { return textureLod(iris_tlo_s, iris_tlo_c + vec2(iris_tlo_o) / vec2(textureSize(iris_tlo_s, int(iris_tlo_l))), iris_tlo_l); }");
root.injectFunction("float iris_textureLodOffset(sampler2DShadow iris_tlo_s, vec3 iris_tlo_c, float iris_tlo_l, ivec2 iris_tlo_o) { return textureLod(iris_tlo_s, vec3(iris_tlo_c.xy + vec2(iris_tlo_o) / vec2(textureSize(iris_tlo_s, int(iris_tlo_l))), iris_tlo_c.z), iris_tlo_l); }");
root.injectFunction("vec4 iris_textureLodOffset(sampler3D iris_tlo_s, vec3 iris_tlo_c, float iris_tlo_l, ivec3 iris_tlo_o) { return textureLod(iris_tlo_s, iris_tlo_c + vec3(iris_tlo_o) / vec3(textureSize(iris_tlo_s, int(iris_tlo_l))), iris_tlo_l); }");
root.injectFunction("vec4 iris_textureLodOffset(sampler2DArray iris_tlo_s, vec3 iris_tlo_c, float iris_tlo_l, ivec2 iris_tlo_o) { return textureLod(iris_tlo_s, vec3(iris_tlo_c.xy + vec2(iris_tlo_o) / vec2(textureSize(iris_tlo_s, int(iris_tlo_l)).xy), iris_tlo_c.z), iris_tlo_l); }");
root.injectFunction("ivec4 iris_textureLodOffset(isampler2D iris_tlo_s, vec2 iris_tlo_c, float iris_tlo_l, ivec2 iris_tlo_o) { return textureLod(iris_tlo_s, iris_tlo_c + vec2(iris_tlo_o) / vec2(textureSize(iris_tlo_s, int(iris_tlo_l))), iris_tlo_l); }");
root.injectFunction("uvec4 iris_textureLodOffset(usampler2D iris_tlo_s, vec2 iris_tlo_c, float iris_tlo_l, ivec2 iris_tlo_o) { return textureLod(iris_tlo_s, iris_tlo_c + vec2(iris_tlo_o) / vec2(textureSize(iris_tlo_s, int(iris_tlo_l))), iris_tlo_l); }");
root.renameFunctionCall("textureLodOffset", "iris_textureLodOffset");
}
if (parameters.type == ShaderType.VERTEX) {
root.mutateTree(tree -> {
if (tree.children != null) {
tree.children.removeIf(child ->
child instanceof GLSLParser.External_declarationContext
&& ((GLSLParser.External_declarationContext) child).declaration() != null
&& child.getText().contains("gl_PerVertex"));
}
});
}
if (parameters.patch == Patch.ATTRIBUTES && parameters.type == ShaderType.VERTEX) {
root.injectVariable("uniform bool angelica_ClipPlanesEnabled;");
root.injectVariable("uniform vec4 angelica_ClipPlane[8];");
@@ -3,6 +3,7 @@ package net.coderbot.iris.pipeline.transform;
import net.coderbot.iris.gl.shader.ShaderType;
import net.coderbot.iris.pipeline.transform.parameter.Parameters;
import org.antlr.v4.runtime.tree.ParseTree;
import org.taumc.glsl.ShaderPrinter;
import org.taumc.glsl.Transformer;
import org.taumc.glsl.grammar.GLSLLexer;
import org.taumc.glsl.grammar.GLSLParser;
@@ -109,7 +110,10 @@ public class CompatibilityTransformer {
continue;
}
prevTransformer.makeOutDeclaration(inDec.get(in), in);
String outDeclaration = ShaderPrinter.getFormattedShader(inDec.get(in).fully_specified_type())
+ " " + in + ";";
prevTransformer.variable = null;
prevTransformer.injectVariable(outDeclaration.replaceFirst("in", "out"));
if (!prevTransformer.hasAssigment(in)) {
prevTransformer.initialize(inDec.get(in), in);
@@ -126,6 +130,23 @@ public class CompatibilityTransformer {
if (!prevTransformer.hasAssigment(in)) {
prevTransformer.initialize(inDec.get(in), in);
}
} else {
int outComp = vecComponents(outType.getText());
int inComp = vecComponents(inType.getText());
if (outComp < 0 || inComp < 0) {
continue;
}
String temp = "iris_template_" + in;
prevTransformer.rename(in, temp);
String newOut = ShaderPrinter.getFormattedShader(inDec.get(in).fully_specified_type())
+ " " + in + ";";
prevTransformer.variable = null;
prevTransformer.injectVariable(newOut.replaceFirst("in", "out"));
String cast = outComp < inComp
? in + " = " + inType.getText() + "(" + temp + ", vec4(0));"
: in + " = " + inType.getText() + "(" + temp + ");";
prevTransformer.appendMain(cast);
}
}
}
@@ -133,4 +154,13 @@ public class CompatibilityTransformer {
prevType = type;
}
}
private static int vecComponents(String type) {
return switch (type) {
case "vec2" -> 2;
case "vec3" -> 3;
case "vec4" -> 4;
default -> -1;
};
}
}
@@ -18,7 +18,7 @@ class CompositeDepthTransformer {
final int type = transformer.findType("centerDepthSmooth");
if (type != 0) {
transformer.injectVariable("uniform sampler2D iris_centerDepthSmooth;");
transformer.replaceExpression("centerDepthSmooth", "texture2D(iris_centerDepthSmooth, vec2(0.5)).r");
transformer.replaceExpression("centerDepthSmooth", "texture(iris_centerDepthSmooth, vec2(0.5)).r");
}
}
}
@@ -51,6 +51,13 @@ class CoreTransformHelper {
transformer.rename("gl_Vertex", "iris_Vertex");
transformer.rename("gl_MultiTexCoord0", "iris_MultiTexCoord0");
for (int i = 1; i <= 7; i++) {
transformer.replaceExpression("gl_MultiTexCoord" + i, "vec4(0.0, 0.0, 0.0, 1.0)");
}
transformer.replaceExpression("gl_Color", "vec4(1.0, 1.0, 1.0, 1.0)");
transformer.replaceExpression("gl_Normal", "vec3(0.0, 0.0, 1.0)");
transformer.renameFunctionCall("ftransform", "iris_ftransform");
transformer.injectFunction("vec4 iris_ftransform() { return (iris_ProjectionMatrix * iris_ModelViewMatrix) * iris_Vertex; }");
@@ -0,0 +1,24 @@
package net.coderbot.iris.pipeline.transform;
import net.coderbot.iris.shaderpack.ProgramSource;
import net.coderbot.iris.shaderpack.loading.ProgramId;
/**
* For some reason not all shaders read from gl_MultiTexCoord0 through the texture matrix to scroll the enchant glint?
* Maybe a modern thing but a few shaders just look wrong without it. Technically not in spec, but it looks better.
*/
public final class GlintScrollInjector {
private GlintScrollInjector() {}
public static boolean shouldInject(ProgramId id, ProgramSource source) {
if (id != ProgramId.ArmorGlint || source == null) return false;
if (!ProgramId.ArmorGlint.getSourceName().equals(source.getName())) return false;
final String vertex = source.getVertexSource().orElse(null);
if (vertex == null) return false;
// Already scrolls through the texture matrix itself
if (vertex.contains("gl_TextureMatrix[0]")) return false;
return vertex.contains("gl_MultiTexCoord0");
}
}
@@ -104,8 +104,12 @@ public class TransformPatcher {
return result;
}
public static Map<PatchShaderType, String> patchAttributes(String vertex, String geometry, String tessControl, String tessEval, String fragment, InputAvailability inputs, boolean scrollGlint) {
return transform(vertex, geometry, tessControl, tessEval, fragment, new AttributeParameters(Patch.ATTRIBUTES, geometry != null, inputs, scrollGlint));
}
public static Map<PatchShaderType, String> patchAttributes(String vertex, String geometry, String tessControl, String tessEval, String fragment, InputAvailability inputs) {
return transform(vertex, geometry, tessControl, tessEval, fragment, new AttributeParameters(Patch.ATTRIBUTES, geometry != null, inputs));
return patchAttributes(vertex, geometry, tessControl, tessEval, fragment, inputs, false);
}
public static Map<PatchShaderType, String> patchAttributes(String vertex, String geometry, String fragment, InputAvailability inputs) {
@@ -7,12 +7,14 @@ import net.coderbot.iris.shaderpack.texture.TextureStage;
public class AttributeParameters extends Parameters {
public final boolean hasGeometry;
public final InputAvailability inputs;
public final boolean scrollGlint;
// WARNING: adding new fields requires updating hashCode and equals methods!
public AttributeParameters(Patch patch, boolean hasGeometry, InputAvailability inputs) {
public AttributeParameters(Patch patch, boolean hasGeometry, InputAvailability inputs, boolean scrollGlint) {
super(patch, null);
this.hasGeometry = hasGeometry;
this.inputs = inputs;
this.scrollGlint = scrollGlint;
}
@Override
@@ -25,6 +27,7 @@ public class AttributeParameters extends Parameters {
final int prime = 31;
int result = super.hashCode();
result = prime * result + (hasGeometry ? 1231 : 1237);
result = prime * result + (scrollGlint ? 1231 : 1237);
result = prime * result + ((inputs == null) ? 0 : inputs.hashCode());
return result;
}
@@ -40,6 +43,8 @@ public class AttributeParameters extends Parameters {
AttributeParameters other = (AttributeParameters) obj;
if (hasGeometry != other.hasGeometry)
return false;
if (scrollGlint != other.scrollGlint)
return false;
if (inputs == null) {
if (other.inputs != null)
return false;
@@ -77,11 +77,22 @@ public class IdMap {
private static final Pattern LEGACY_DIRECTIVE_PATTERN = Pattern.compile(
"(?m)^\\s*#\\s*(?:if|elif|ifdef|ifndef)\\b[^\\n]*\\bMC_VERSION\\b[^\\n]*\\b10710\\b");
/**
* Detects whether a pack's block.properties has a dedicated 1.7.10 section.
*/
public static boolean detectLegacySection(Path shaderPath) {
String rawBlockProperties = readProperties(shaderPath, "block.properties");
return rawBlockProperties != null && LEGACY_DIRECTIVE_PATTERN.matcher(rawBlockProperties).find();
}
public static String modernFallbackMcVersion() {
return AngelicaConfig.modernFallbackMcVersion > 0
? String.valueOf(AngelicaConfig.modernFallbackMcVersion) : "260101";
}
IdMap(Path shaderPath, ShaderPackOptions shaderPackOptions, Iterable<StringPair> environmentDefines) {
// Check if block.properties has a dedicated 1.7.10 section
String rawBlockProperties = readProperties(shaderPath, "block.properties");
this.hasLegacySection = rawBlockProperties != null
&& LEGACY_DIRECTIVE_PATTERN.matcher(rawBlockProperties).find();
this.hasLegacySection = detectLegacySection(shaderPath);
Iterable<StringPair> resolvedDefines;
if (this.hasLegacySection) {
@@ -100,9 +111,7 @@ public class IdMap {
}
}
String modernVersion = AngelicaConfig.modernFallbackMcVersion > 0
? String.valueOf(AngelicaConfig.modernFallbackMcVersion) : "260101";
modernDefines.add(new StringPair("MC_VERSION", modernVersion));
modernDefines.add(new StringPair("MC_VERSION", modernFallbackMcVersion()));
resolvedDefines = modernDefines;
loadProperties(shaderPath, "block.properties", shaderPackOptions, modernDefines).ifPresent(blockProperties -> {
@@ -55,7 +55,7 @@ public class PackRenderTargetDirectives {
renderTargetSettings.forEach((index, settings) -> {
if (settings.shouldClear()) {
buffersToBeCleared.add(index.intValue());
buffersToBeCleared.add(index);
}
});
@@ -1,6 +1,7 @@
package net.coderbot.iris.shaderpack;
import net.coderbot.iris.Iris;
import net.coderbot.iris.features.FeatureFlags;
import net.coderbot.iris.gl.blending.BlendModeOverride;
import net.coderbot.iris.shaderpack.include.AbsolutePackPath;
import net.coderbot.iris.shaderpack.loading.ProgramId;
@@ -529,7 +530,8 @@ public class ProgramSet {
String tessControlSource = null;
String tessEvalSource = null;
if (programSet.pack.hasFeature(net.coderbot.iris.features.FeatureFlags.TESSELLATION_SHADERS)) {
if (programSet.pack.hasFeature(FeatureFlags.TESSELLATION_SHADERS)
&& FeatureFlags.TESSELLATION_SHADERS.isUsable()) {
AbsolutePackPath tessControlPath = directory.resolve(program + ".tcs");
tessControlSource = sourceProvider.apply(tessControlPath);
@@ -547,6 +549,10 @@ public class ProgramSet {
private static ComputeSource readComputeSource(AbsolutePackPath directory,
Function<AbsolutePackPath, String> sourceProvider, String program,
ProgramSet programSet) {
if (!FeatureFlags.COMPUTE_SHADERS.isUsable()) {
return null;
}
AbsolutePackPath computePath = directory.resolve(program + ".csh");
String computeSource = sourceProvider.apply(computePath);
@@ -207,8 +207,16 @@ public class ShaderPack {
this.shaderPackOptions = new ShaderPackOptions(graph, changedConfigs);
graph = this.shaderPackOptions.getIncludes();
final String mcVersionOverride = IdMap.detectLegacySection(root) ? null : IdMap.modernFallbackMcVersion();
List<StringPair> finalEnvironmentDefines = new ArrayList<>();
environmentDefines.forEach(finalEnvironmentDefines::add);
for (StringPair define : environmentDefines) {
if (mcVersionOverride != null && "MC_VERSION".equals(define.getKey())) {
finalEnvironmentDefines.add(new StringPair("MC_VERSION", mcVersionOverride));
} else {
finalEnvironmentDefines.add(define);
}
}
for (FeatureFlags flag : FeatureFlags.values()) {
boolean usable = flag.isUsable();
Iris.logger.info("FeatureFlag {} usable: {}", flag.name(), usable);
@@ -1,6 +1,8 @@
package net.coderbot.iris.shaderpack.loading;
public enum ProgramArrayId {
Setup(ProgramGroup.Setup, 100),
Begin(ProgramGroup.Begin, 100),
ShadowComposite(ProgramGroup.ShadowComposite, 99),
Prepare(ProgramGroup.Prepare, 99),
Deferred(ProgramGroup.Deferred, 99),
@@ -1,6 +1,11 @@
package net.coderbot.iris.shaderpack.loading;
import lombok.Getter;
@Getter
public enum ProgramGroup {
Setup("setup"),
Begin("begin"),
Shadow("shadow"),
ShadowComposite("shadowcomp"),
Prepare("prepare"),
@@ -17,7 +22,4 @@ public enum ProgramGroup {
this.baseName = baseName;
}
public String getBaseName() {
return baseName;
}
}
@@ -1,9 +1,9 @@
package net.coderbot.iris.shaderpack.materialmap;
import net.coderbot.iris.Iris;
import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
@@ -263,7 +263,19 @@ public final class PropertiesTokenizer {
);
}
final String[] splitStates = baseEntry.split(":");
// Drop empty segments produced by consecutive colons (like "betterendforge::lumecorn")
final String[] splitStates = Arrays.stream(baseEntry.split(":"))
.filter(s -> !s.isEmpty())
.toArray(String[]::new);
if (splitStates.length == 0) {
return new ParsedBlockIdentifier(
new NamespacedId("minecraft", baseEntry),
Collections.emptySet(),
Collections.emptyMap(),
nbtProperties
);
}
// Vanilla block (minecraft namespaced)
if (splitStates.length == 1) {
@@ -277,7 +289,7 @@ public final class PropertiesTokenizer {
// Two-segment with no metas/state properties: "minecraft:stone"
if (splitStates.length == 2
&& !StringUtils.isNumeric(splitStates[1].substring(0, 1))
&& !startsWithDigit(splitStates[1])
&& !splitStates[1].contains("=")) {
return new ParsedBlockIdentifier(
new NamespacedId(splitStates[0], splitStates[1]),
@@ -296,7 +308,7 @@ public final class PropertiesTokenizer {
id = new NamespacedId("minecraft", splitStates[0]);
statesStart = 1;
} else if (StringUtils.isNumeric(splitStates[1].substring(0, 1)) || splitStates[1].contains("=")) {
} else if (startsWithDigit(splitStates[1]) || splitStates[1].contains("=")) {
// "stone:0:something" or "stone:lit=true:something", likely will need this for snowy blocks in the future.
id = new NamespacedId("minecraft", splitStates[0]);
statesStart = 1;
@@ -339,6 +351,10 @@ public final class PropertiesTokenizer {
);
}
private static boolean startsWithDigit(String s) {
return !s.isEmpty() && Character.isDigit(s.charAt(0));
}
private static void appendCurrent(boolean inBracket, boolean readingValue,
StringBuilder blockIdBuilder, StringBuilder nbtKey,
StringBuilder nbtValue, char c) {
@@ -80,7 +80,7 @@ public class PropertiesPreprocessor {
// Not super efficient, but this removes trailing whitespace on lines, fixing an issue with whitespace after
// line continuations (see PreprocessorTest#testWeirdPropertiesLineContinuation)
// Required for Voyager Shader
source = Arrays.stream(source.split("\\R")).map(String::trim).filter(s -> !s.isEmpty())
source = Arrays.stream(source.split("\\r\\n|\\n|\\r")).map(String::trim).filter(s -> !s.isEmpty())
.map(line -> {
if (line.startsWith("#")) {
for (PreprocessorCommand command : PreprocessorCommand.values()) {
@@ -13,6 +13,9 @@ public class CapturedRenderingState {
@Getter
private float tickDelta;
@Getter
private int textureReloadCount;
private Runnable textureReloadListener = null;
@Getter
private int currentRenderedBlockEntity;
private Runnable blockEntityIdListener = null;
@@ -31,6 +34,18 @@ public class CapturedRenderingState {
private CapturedRenderingState() {
}
public void incrementTextureReloadCount() {
this.textureReloadCount++;
if (this.textureReloadListener != null) {
this.textureReloadListener.run();
}
}
public void resetTextureReloadCount() {
this.textureReloadCount = 0;
}
public void setCurrentBlockEntity(int entity) {
this.currentRenderedBlockEntity = entity;
@@ -80,5 +95,9 @@ public class CapturedRenderingState {
return listener -> this.itemIdListener = listener;
}
public ValueUpdateNotifier getTextureReloadNotifier() {
return listener -> this.textureReloadListener = listener;
}
public ValueUpdateNotifier getEntityColorNotifier() { return listener -> this.entityColorListener = listener; }
}
@@ -96,6 +96,12 @@ public final class CommonUniforms {
}, StateUpdateNotifiers.bindTextureNotifier);
uniforms.uniform1i("gtextureId", () -> GLStateManager.getBoundTextureForServerState(0),
StateUpdateNotifiers.bindTextureNotifier);
uniforms.uniform1i("textureReloadCount", CapturedRenderingState.INSTANCE::getTextureReloadCount,
CapturedRenderingState.INSTANCE.getTextureReloadNotifier());
uniforms.uniform4i("blendFunc", () -> {
if(GLStateManager.getBlendMode().isEnabled()) {
final BlendState blend = GLStateManager.getBlendState();
@@ -1,18 +1,27 @@
package net.coderbot.iris.uniforms;
import com.gtnewhorizons.angelica.compat.etfuturum.EtFuturumCompat;
import com.gtnewhorizons.angelica.compat.mojang.Camera;
import com.gtnewhorizons.angelica.compat.mojang.GameModeUtil;
import com.gtnewhorizons.angelica.render.CloudRenderer;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
import net.coderbot.iris.block_rendering.BlockMaterialMapping;
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
import net.coderbot.iris.gl.uniform.UniformHolder;
import net.coderbot.iris.gl.uniform.UniformUpdateFrequency;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.MovingObjectPosition;
import org.joml.Math;
import org.joml.Vector3d;
import org.joml.Vector3dc;
import org.joml.Vector3f;
import org.joml.Vector4f;
import java.util.List;
@@ -21,9 +30,17 @@ public class IrisExclusiveUniforms {
// Reusable vectors to avoid allocations every frame
private static final Vector3d eyePositionCache = new Vector3d();
private static final Vector3d relativeEyePositionCache = new Vector3d();
private static final Vector3d playerLookCache = new Vector3d();
private static final Vector3d playerBodyCache = new Vector3d();
private static final Vector3d vehicleLookCache = new Vector3d();
private static final Vector3d relativeVehiclePositionCache = new Vector3d();
private static final Vector3f selectedBlockPosCache = new Vector3f();
private static final Vector4f lightningBoltPositionCache = new Vector4f();
private static final Vector4f ZERO_VECTOR_4f = new Vector4f(0, 0, 0, 0);
private static int cachedSelectedFrame = -1;
private static int cachedSelectedBlockId;
public static void addIrisExclusiveUniforms(UniformHolder uniforms) {
WorldInfoUniforms.addWorldInfoUniforms(uniforms);
@@ -42,6 +59,21 @@ public class IrisExclusiveUniforms {
uniforms.uniform3d(UniformUpdateFrequency.PER_FRAME, "relativeEyePosition", IrisExclusiveUniforms::getRelativeEyePosition);
uniforms.uniform4f(UniformUpdateFrequency.PER_TICK, "lightningBoltPosition", IrisExclusiveUniforms::getLightningBoltPosition);
uniforms.uniform1f(UniformUpdateFrequency.PER_FRAME, "cloudTime", IrisExclusiveUniforms::getCloudTime);
uniforms.uniform1b(UniformUpdateFrequency.PER_TICK, "feetInWater", IrisExclusiveUniforms::isFeetInWater);
uniforms.uniform1b(UniformUpdateFrequency.PER_TICK, "isRiding", IrisExclusiveUniforms::isRiding);
uniforms.uniform1b(UniformUpdateFrequency.PER_TICK, "vehicleInWater", IrisExclusiveUniforms::isVehicleInWater);
uniforms.uniform1i(UniformUpdateFrequency.PER_TICK, "vehicleId", IrisExclusiveUniforms::getVehicleId);
uniforms.uniform3d(UniformUpdateFrequency.PER_FRAME, "vehicleLookVector", IrisExclusiveUniforms::getVehicleLookVector);
uniforms.uniform3d(UniformUpdateFrequency.PER_FRAME, "relativeVehiclePosition", IrisExclusiveUniforms::getRelativeVehiclePosition);
uniforms.uniform1f(UniformUpdateFrequency.PER_TICK, "currentPlayerArmor", IrisExclusiveUniforms::getCurrentArmor);
uniforms.uniform1f(UniformUpdateFrequency.PER_TICK, "maxPlayerArmor", () -> 50);
uniforms.uniform1i(UniformUpdateFrequency.PER_FRAME, "currentSelectedBlockId", IrisExclusiveUniforms::getCurrentSelectedBlockId);
uniforms.uniform3f(UniformUpdateFrequency.PER_FRAME, "currentSelectedBlockPos", IrisExclusiveUniforms::getCurrentSelectedBlockPos);
uniforms.uniform1i(UniformUpdateFrequency.PER_FRAME, "seaLevel", IrisExclusiveUniforms::getSeaLevel);
uniforms.uniform3d(UniformUpdateFrequency.PER_FRAME, "playerLookVector", IrisExclusiveUniforms::getPlayerLookVector);
uniforms.uniform3d(UniformUpdateFrequency.PER_FRAME, "playerBodyVector", IrisExclusiveUniforms::getPlayerBodyVector);
// Target the Elytra from EFR
uniforms.uniform1b(UniformUpdateFrequency.PER_TICK, "isElytraFlying", IrisExclusiveUniforms::isElytraFlying);
}
private static float getCloudTime() {
@@ -137,6 +169,149 @@ public class IrisExclusiveUniforms {
return ZERO_VECTOR_4f;
}
private static EntityLivingBase cameraEntity() {
return Minecraft.getMinecraft().renderViewEntity;
}
private static Vector3d forwardVector(Vector3d dest, float yawDeg, float pitchDeg) {
final double yr = -yawDeg * 0.017453292 - Math.PI;
final double pr = -pitchDeg * 0.017453292;
final double cy = Math.cos(yr);
final double sy = Math.sin(yr);
final double cp = -Math.cos(pr);
final double sp = Math.sin(pr);
return dest.set(sy * cp, sp, cy * cp);
}
private static boolean isFeetInWater() {
final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
return player != null && player.isInWater();
}
private static boolean isElytraFlying() {
return EtFuturumCompat.isElytraFlying(Minecraft.getMinecraft().thePlayer);
}
private static boolean isRiding() {
final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
return player != null && player.ridingEntity != null;
}
private static boolean isVehicleInWater() {
final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
return player != null && player.ridingEntity != null && player.ridingEntity.isInWater();
}
private static int getVehicleId() {
final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
if (player == null || player.ridingEntity == null) return 0;
final int id = EntityIdHelper.getEntityId(player.ridingEntity);
return Math.max(id, 0);
}
private static Vector3d getVehicleLookVector() {
final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
if (player == null || player.ridingEntity == null) return vehicleLookCache.set(0, 0, 0);
final Entity v = player.ridingEntity;
return forwardVector(vehicleLookCache, v.rotationYaw, v.rotationPitch);
}
private static Vector3d getRelativeVehiclePosition() {
final EntityPlayer player = Minecraft.getMinecraft().thePlayer;
if (player == null || player.ridingEntity == null) return relativeVehiclePositionCache.set(0, 0, 0);
final Entity v = player.ridingEntity;
final float delta = CapturedRenderingState.INSTANCE.getTickDelta();
final double vx = v.prevPosX + (v.posX - v.prevPosX) * delta;
final double vy = v.prevPosY + (v.posY - v.prevPosY) * delta;
final double vz = v.prevPosZ + (v.posZ - v.prevPosZ) * delta;
// Match Angelica's relativeEyePosition convention (entity - camera).
final Vector3dc cam = CameraUniforms.getUnshiftedCameraPosition();
return relativeVehiclePositionCache.set(vx - cam.x(), vy - cam.y(), vz - cam.z());
}
private static float getCurrentArmor() {
final Minecraft mc = Minecraft.getMinecraft();
if (mc.thePlayer == null || !mc.playerController.gameIsSurvivalOrAdventure()) {
return -1;
}
return mc.thePlayer.getTotalArmorValue() / 50.0f;
}
private static Vector3d getPlayerLookVector() {
final EntityLivingBase e = cameraEntity();
if (e == null) return playerLookCache.set(0, 0, 0);
final float delta = CapturedRenderingState.INSTANCE.getTickDelta();
final float yaw = e.prevRotationYaw + (e.rotationYaw - e.prevRotationYaw) * delta;
final float pitch = e.prevRotationPitch + (e.rotationPitch - e.prevRotationPitch) * delta;
return forwardVector(playerLookCache, yaw, pitch);
}
private static Vector3d getPlayerBodyVector() {
final EntityLivingBase e = cameraEntity();
if (e == null) return playerBodyCache.set(0, 0, 0);
return forwardVector(playerBodyCache, e.renderYawOffset, 0.0f);
}
private static int getSeaLevel() {
// 1.7.10 has no per-world sea level accessor, best to guess 63?
return 63;
}
private static void updateSelectedBlock() {
final int frame = SystemTimeUniforms.COUNTER.getAsInt();
if (frame == cachedSelectedFrame) {
return;
}
cachedSelectedFrame = frame;
final Minecraft mc = Minecraft.getMinecraft();
final MovingObjectPosition hit = mc.objectMouseOver;
if (mc.theWorld == null || hit == null || hit.typeOfHit != MovingObjectPosition.MovingObjectType.BLOCK) {
cachedSelectedBlockId = 0;
selectedBlockPosCache.set(-256.0f, -256.0f, -256.0f);
return;
}
final Vector3dc cam = CameraUniforms.getUnshiftedCameraPosition();
selectedBlockPosCache.set(
(float) ((hit.blockX + 0.5) - cam.x()),
(float) ((hit.blockY + 0.5) - cam.y()),
(float) ((hit.blockZ + 0.5) - cam.z()));
final Block block = mc.theWorld.getBlock(hit.blockX, hit.blockY, hit.blockZ);
if (block == null || block.isAir(mc.theWorld, hit.blockX, hit.blockY, hit.blockZ)) {
cachedSelectedBlockId = 0;
return;
}
final Reference2ObjectMap<Block, Int2IntMap> blockMetaMatches = BlockRenderingSettings.INSTANCE.getBlockMetaMatches();
if (blockMetaMatches == null) {
cachedSelectedBlockId = 0;
return;
}
final Int2IntMap metaMap = blockMetaMatches.get(block);
if (metaMap == null) {
cachedSelectedBlockId = 0;
return;
}
final int meta = mc.theWorld.getBlockMetadata(hit.blockX, hit.blockY, hit.blockZ);
cachedSelectedBlockId = Math.max(BlockMaterialMapping.resolveId(metaMap, meta), 0);
}
private static int getCurrentSelectedBlockId() {
updateSelectedBlock();
return cachedSelectedBlockId;
}
private static Vector3f getCurrentSelectedBlockPos() {
updateSelectedBlock();
return selectedBlockPosCache;
}
private static int worldHeight() {
final WorldClient level = Minecraft.getMinecraft().theWorld;
return (level != null && level.provider != null) ? level.provider.getHeight() : 256;
}
public static class WorldInfoUniforms {
public static void addWorldInfoUniforms(UniformHolder uniforms) {
uniforms.uniform1i(UniformUpdateFrequency.PER_FRAME, "bedrockLevel", () -> 0);
@@ -148,14 +323,8 @@ public class IrisExclusiveUniforms {
return 192.0;
}
});
uniforms.uniform1i(UniformUpdateFrequency.PER_FRAME, "heightLimit", () -> {
final WorldClient level = Minecraft.getMinecraft().theWorld;
if (level != null && level.provider != null) {
return level.provider.getHeight();
} else {
return 256;
}
});
uniforms.uniform1i(UniformUpdateFrequency.PER_FRAME, "heightLimit", IrisExclusiveUniforms::worldHeight);
uniforms.uniform1i(UniformUpdateFrequency.PER_FRAME, "logicalHeightLimit", IrisExclusiveUniforms::worldHeight);
uniforms.uniform1b(UniformUpdateFrequency.PER_FRAME, "hasCeiling", () -> {
final WorldClient level = Minecraft.getMinecraft().theWorld;
if (level != null && level.provider != null) {
@@ -3,7 +3,10 @@ package net.coderbot.iris.uniforms;
import lombok.Getter;
import net.coderbot.iris.gl.uniform.UniformHolder;
import net.coderbot.iris.gl.uniform.UniformUpdateFrequency;
import org.joml.Vector2i;
import org.joml.Vector3i;
import java.time.LocalDateTime;
import java.util.OptionalLong;
import java.util.function.IntSupplier;
@@ -16,19 +19,47 @@ public final class SystemTimeUniforms {
public static final Timer TIMER = new Timer();
public static final FrameCounter COUNTER = new FrameCounter();
private static LocalDateTime cachedDateTime = LocalDateTime.now();
private static long cachedDateTimeAtMs = 0L;
private SystemTimeUniforms() {
}
private static LocalDateTime dateTimeSnapshot() {
final long now = System.currentTimeMillis();
if (now - cachedDateTimeAtMs >= 50L) {
cachedDateTime = LocalDateTime.now();
cachedDateTimeAtMs = now;
}
return cachedDateTime;
}
/**
* Makes system time uniforms available to the given program
*
* @param uniforms the program to make the uniforms available to
*/
public static void addSystemTimeUniforms(UniformHolder uniforms) {
final Vector3i date = new Vector3i();
final Vector3i time = new Vector3i();
final Vector2i yearTime = new Vector2i();
uniforms
.uniform1i(UniformUpdateFrequency.PER_FRAME, "frameCounter", COUNTER)
.uniform1f(UniformUpdateFrequency.PER_FRAME, "frameTime", TIMER::getLastFrameTime)
.uniform1f(UniformUpdateFrequency.PER_FRAME, "frameTimeCounter", TIMER::getFrameTimeCounter);
.uniform1f(UniformUpdateFrequency.PER_FRAME, "frameTimeCounter", TIMER::getFrameTimeCounter)
.uniform3i(UniformUpdateFrequency.PER_TICK, "currentDate", () -> {
final LocalDateTime dt = dateTimeSnapshot();
return date.set(dt.getYear(), dt.getMonthValue(), dt.getDayOfMonth());
})
.uniform3i(UniformUpdateFrequency.PER_TICK, "currentTime", () -> {
final LocalDateTime dt = dateTimeSnapshot();
return time.set(dt.getHour(), dt.getMinute(), dt.getSecond());
})
.uniform2i(UniformUpdateFrequency.PER_TICK, "currentYearTime", () -> {
final LocalDateTime dt = dateTimeSnapshot();
final int elapsed = ((dt.getDayOfYear() - 1) * 86400) + (dt.getHour() * 3600) + (dt.getMinute() * 60) + dt.getSecond();
return yearTime.set(elapsed, (dt.toLocalDate().lengthOfYear() * 86400) - elapsed);
});
}
public static void addFloatFrameMod8Uniform(UniformHolder uniforms) {
@@ -166,7 +166,7 @@ options.dynamiclights.entity.tooltip=Toggle dynamic lighting for %s entities. Di
options.angelica.search.no_results=No matching options
options.angelica.fontconfig=Font Configuration...
options.angelica.fontconfig.title=Font Configuration
options.angelica.fontconfig.currentfonts=Primary font: §e%s (LMB)§r Fallback font: §b%s (RMB)
options.angelica.fontconfig.currentfonts=Primary font: §e%s§r Fallback font: §b%s
options.angelica.fontconfig.searchprompt=§7§oSearch fonts...
options.angelica.fontconfig.testareaprompt=§7§oTest area...
options.angelica.fontconfig.testareainfo=Enter text below to see how it renders. Use & for formatting.
@@ -177,7 +177,7 @@ options.angelica.fontconfig.reset_values=Reset Values
options.angelica.fontconfig.no_fonts_warning=Custom fonts are not available on your system. Check logs for details.
options.angelica.fontconfig.font_quality=Custom Font Quality: %s
options.angelica.fontconfig.shadow_offset=Shadow Offset: %s
options.angelica.fontconfig.brightness=Brightness: %s
options.angelica.fontconfig.shadow_copies=Shadow Copies: %s
options.angelica.fontconfig.bold_copies=Bold Copies: %s
options.angelica.fontconfig.glyph_scale=Glyph Scale: %s
options.angelica.fontconfig.glyph_aspect=Glyph Aspect: %s
@@ -191,7 +191,7 @@ options.angelica.fontconfig.custom_font_scale=Custom Font Scale: %s
options.angelica.fontconfig.shadow_offset_unicode=Unicode Shadow Offset: %s
options.angelica.fontconfig.font_quality.tooltip=The quality at which custom fonts are rendered, making them less pixelated at the expense of some performance and memory.
options.angelica.fontconfig.shadow_offset.tooltip=The distance at which the fonts' shadows are drawn. Also affects the way §lbold§r text is drawn.
options.angelica.fontconfig.brightness.tooltip=Increases the brightness of the text, resulting in more readable text for lower resolutions. Most noticeable for custom fonts.
options.angelica.fontconfig.shadow_copies.tooltip=The number of shadows to be drawn behind text, all offset so as to provide a fake 3D effect.
options.angelica.fontconfig.bold_copies.tooltip=The number of text copies drawn when rendering bold text. Can improve the appearance of bold text with thinner custom fonts.
options.angelica.fontconfig.glyph_scale.tooltip=The scale of each individual glyph. Extreme values might make your game unplayable.
options.angelica.fontconfig.glyph_aspect.tooltip=The aspect ratio of each individual glyph.
@@ -1,120 +0,0 @@
#version 330 core
uniform sampler2DArray sampler0; // Minecraft fonts
#ifdef MULTISAMPLING
uniform sampler2DArray sampler1; // Custom fonts
#endif
uniform float strength;
flat in vec4 tB; // uMin, vMin, uMax, vMax
flat in vec4 color;
flat in uint layer;
#ifdef MULTISAMPLING
flat in uint secondTexture;
#endif
in vec2 texCoord;
out vec4 fragColor;
/*
Hacky MSAA and anisotropic filtering. Cursed beyond belief. There _may_ have been simpler means of
achieving the produced effects, but this appears to work without noticeable performance losses.
*/
float totalWt;
float aaSample(vec2 uv, float du, float dv, float factorU, float factorV) {
float distSquared = sqrt(du * du + dv * dv);
float weight = exp(-distSquared / 6);
totalWt += weight;
float finalU = uv.x + factorU * du;
float finalV = uv.y + factorV * dv;
if (finalU < tB.x || finalV < tB.y || finalU > tB.z || finalV > tB.w) return 0.0f;
return weight * texture(sampler0, vec3(finalU, finalV, layer)).r;
}
float easeOut(float t) {
t = clamp(t, 0.0, 1.0);
return 1.0 - pow(1.0 - t, 2.0);
}
void main() {
vec4 col = color;
float alpha = 0;
// For custom fonts, don't apply the AA as it results in a blurry look.
#ifdef MULTISAMPLING
if (secondTexture != 0u) {
alpha = texture(sampler1, vec3(texCoord, layer)).r;
if (alpha < 0.05) discard;
#ifdef FONT_BRIGHTNESS
alpha = min(alpha * FONT_BRIGHTNESS, 1);
#endif
fragColor = vec4(color.rgb, alpha * color.a);
return;
}
#endif
#if AA_MODE == 0
alpha = texture(sampler0, vec3(texCoord, layer)).r;
#else
vec2 texScaled = texCoord * AA_STRENGTH;
float fu = abs(dFdx(texScaled.x)) + abs(dFdy(texScaled.x));
float fv = abs(dFdx(texScaled.y)) + abs(dFdy(texScaled.y));
float res = 0;
totalWt = 0;
#if AA_MODE == 1
res += aaSample(texCoord, 2, 6, fu, fv);
res += aaSample(texCoord, 6, -2, fu, fv);
res += aaSample(texCoord, -2, -6, fu, fv);
res += aaSample(texCoord, -6, 2, fu, fv);
#elif AA_MODE == 2
res += aaSample(texCoord, 1, 1, fu, fv);
res += aaSample(texCoord, -1, -3, fu, fv);
res += aaSample(texCoord, -3, 2, fu, fv);
res += aaSample(texCoord, 4, -1, fu, fv);
res += aaSample(texCoord, -5, -2, fu, fv);
res += aaSample(texCoord, 2, 5, fu, fv);
res += aaSample(texCoord, 5, 3, fu, fv);
res += aaSample(texCoord, 3, -5, fu, fv);
res += aaSample(texCoord, -2, 6, fu, fv);
res += aaSample(texCoord, 0, -7, fu, fv);
res += aaSample(texCoord, -4, -6, fu, fv);
res += aaSample(texCoord, -6, 4, fu, fv);
res += aaSample(texCoord, -8, 0, fu, fv);
res += aaSample(texCoord, 7, -4, fu, fv);
res += aaSample(texCoord, 6, 7, fu, fv);
res += aaSample(texCoord, -7, -8, fu, fv);
#endif
alpha = res / totalWt;
#endif
#ifdef FONT_BRIGHTNESS
alpha = min(alpha * FONT_BRIGHTNESS, 1);
#endif
if (alpha < 0.05) discard;
fragColor = vec4(color.rgb, alpha * color.a);
}
@@ -1,42 +0,0 @@
#version 330 core
layout(location = 0) in vec2 quadCorner;
layout(location = 1) in vec4 glyphRect;
layout(location = 2) in vec4 uvRect; // uMin, vMin, uSize, vSize
layout(location = 3) in vec4 aColor;
layout(location = 4) in uint aLayer;
layout(location = 5) in uint flags;
uniform mat4 u_MVPMatrix;
flat out vec4 tB;
flat out vec4 color;
flat out uint layer;
#ifdef MULTISAMPLING
flat out uint secondTexture;
#endif
out vec2 texCoord;
void main() {
vec2 pos = glyphRect.xy + quadCorner * glyphRect.zw;
if ((flags & FLAG_ITALIC) != 0u) {
pos.x += (1.0 - 2.0 * quadCorner.y);
}
vec2 uv = uvRect.xy + quadCorner * uvRect.zw;
if ((flags & FLAG_DINNERBONE) != 0u) {
uv = vec2(uvRect.x + quadCorner.x * uvRect.z, uvRect.y + (1.0 - quadCorner.y) * uvRect.w);
}
gl_Position = u_MVPMatrix * vec4(pos, 0.0, 1.0);
texCoord = uv;
color = aColor;
tB = vec4(uvRect.xy, uvRect.x + uvRect.z, uvRect.y + uvRect.w);
layer = aLayer;
#ifdef MULTISAMPLING
secondTexture = (flags & FLAG_SECOND_TEXTURE);
#endif
}
@@ -1,320 +0,0 @@
#version 330 core
// ----- GLOW -----
#define USE_GLOW
//#define RGB_GLOW
#define GLOW_COLOR vec3(0.882, 0.686, 1.0)
// ----- SPARKLES -----
#define USE_SPARKLES
#define SPARKLE_COLOR vec3(1)
// ----- WAVE -----
//#define USE_WAVE
#define WAVE_COLOR vec3(1)
// ----- TEXT -----
#define TEXT_COLOR vec3(0, 0, 0)
// ----- SPOTLIGHT -----
#define USE_SPOTLIGHT
#define SPOTLIGHT_COLOR GLOW_COLOR
#define SPOTLIGHT_STRENGTH 0.333
uniform sampler2D textFBO;
uniform sampler2D sceneFBO;
uniform vec2 uTexelSize;
uniform float uTime;
uniform int uScale; //TODO integrate this
uniform vec4 uTexBounds;
const int MAX_RADIUS = 16;
in vec2 texCoord;
out vec4 fragColor;
vec3 mixHexColors(int colorA, int colorB, float t) {
t = clamp(t, 0.0, 1.0);
// Convert packed hex ints to normalized RGB vec3
vec3 a = vec3(
float((colorA >> 16) & 0xFF),
float((colorA >> 8) & 0xFF),
float(colorA & 0xFF)
) / 255.0;
vec3 b = vec3(
float((colorB >> 16) & 0xFF),
float((colorB >> 8) & 0xFF),
float(colorB & 0xFF)
) / 255.0;
return mix(a, b, t);
}
float random(vec2 p) {
return fract(sin(dot(p, vec2(12.9898, 78.233))) * 43758.5453);
}
vec2 random2(vec2 p) {
float r = random(p);
return vec2(r, random(p + r));
}
float glow(vec2 uv) {
int uRadius = 6;
float dist = 1e10;
for (int y = -MAX_RADIUS; y <= MAX_RADIUS; y++) {
for (int x = -MAX_RADIUS; x <= MAX_RADIUS; x++) {
if (abs(x) > uRadius || abs(y) > uRadius) continue;
// Manhatten for better readability
//float currDist = abs(x) + abs(y);
float currDist = max(abs(x), abs(y)) + min(abs(x), abs(y)) * 0.5;
vec2 offset = vec2(x, y) * uTexelSize;
if (texture(textFBO, vec2(uv.x + offset.x, uv.y + offset.y)).a > 0.1) {
if (dist > currDist) {
dist = currDist;
}
}
}
}
if (dist == 1e10) return 0;
dist = dist - 1.5;
//TODO
//float jitter = (fract(sin(uTime + (texCoord.x + texCoord.y) * 2) * 43758.0) - 0.5) * 5;
//dist += jitter;
//TODO
//if (dist <= 0) return 1;
//else return 0;
float timeGlow = (sin(uTime * 2.0)) * 0.2;
float d = dist;
//d = d / (2 + timeGlow);
float glow = exp(-d * 0.7);
//float d = (dist / (1 + (sin(uTime * 2.0)) * 0.1));
//return min(1.0 / pow(d, 1.2), 1);
return min(glow, 1);
}
// Adapted from https://www.shadertoy.com/view/3d33zM
float starfield(vec2 uv) {
vec2 resolution = 1.0 / uTexelSize;
vec2 fragCoord = uv * resolution;
float widthHeightRatio = resolution.x / resolution.y;
float t = uTime * 0.015;
float dist = 0.0;
const float layers = 4.0;
const float scale = 256.0;
const float star_size = 1.0 / 10;
vec2 centre = vec2(0.5);
for (float i = 0.0; i < layers; i++) {
float depth = fract(i/layers);
centre.x = 0.5 + 0.1 * t * depth;
centre.y = 0.5 + 0.1 * t * depth;
vec2 uv = centre - fragCoord / resolution;
uv.y /= widthHeightRatio;
uv *= mix(scale, 0.0, depth);
vec2 index = floor(uv);
vec2 seed = 20.0 * i + index;
vec2 local_uv = fract(i + uv) - 0.5;
vec2 pos = 0.8 * (random2(seed) - 0.5);
float phase = 128.0 * random(seed);
vec2 d = (local_uv - pos) * star_size;
float len = length(d);
// Core
float radial = max(0.0, 1.0 - len * 3.5);
radial = pow(radial, 30.0);
// Fade spikes with distance from center
float spikeFade = pow(max(0.0, 1.0 - len * 6.0), 4.0);
// Compact sparkle spikes
float spikeX = pow(max(0.0, 1.0 - abs(d.x) * 35.0), 8.0);
float spikeY = pow(max(0.0, 1.0 - abs(d.y) * 35.0), 8.0);
float spikeD1 = pow(max(0.0, 1.0 - abs(d.x + d.y) * 25.0), 8.0);
float spikeD2 = pow(max(0.0, 1.0 - abs(d.x - d.y) * 25.0), 8.0);
// Apply radial fade to spikes
float spikes =
(spikeX + spikeY) * 0.12 +
(spikeD1 + spikeD2) * 0.05;
spikes *= spikeFade;
// Final sparkle
float sparkle = radial * 0.9 + spikes;
float speed = mix(0.5, 3.0, random(seed + 17.0));
float twinkle =
sin(uTime * speed + phase) * 0.5 + 0.5;
twinkle = pow(twinkle, 6.0);
float brightness =
mix(0.2, 1.0, random(seed + 42.0));
dist += sparkle * twinkle * brightness * depth;
}
return dist * 2;
}
vec3 hsv2rgb(vec3 c) {
vec4 K = vec4(1.0, 2.0/3.0, 1.0/3.0, 3.0);
vec3 p = abs(fract(c.xxx + K.xyz) * 6.0 - K.www);
return c.z * mix(K.xxx, clamp(p - K.xxx, 0.0, 1.0), c.y);
}
vec3 rgb(vec2 uv) {
float h = (uv.x + uv.y) * 4 + uTime / 10; // 0 → 1 hue
return hsv2rgb(vec3(h, 1.0, 1.0));
}
float wave(vec2 uv) {
float speed = 0.25;
float pos = fract(uTime * speed);
float lines = 5.0;
float x = uv.x * lines;
float id = floor(x);
float local = fract(x);
float dist = abs(local - pos);
float thickness = 0.1;
return 1.0 - smoothstep(0.0, thickness, dist);
}
float spotlight(
vec2 uv,
float minX,
float maxX,
float minY,
float maxY
) {
vec2 center = vec2(
(minX + maxX) * 0.5,
(minY + maxY) * 0.5
);
vec2 radius = vec2(
(maxX - minX) * 0.5,
(maxY - minY) * 0.5
);
vec2 p = abs((uv - center) / radius);
float dist = pow(
pow(p.x, 4.0) + pow(p.y, 4.0),
1.0 / 4.0
);
return (1.0 - smoothstep(0.0, 1.0, dist)) * SPOTLIGHT_STRENGTH;
}
//0xfda63a orang
//0xfda63a
//0xe1afff
void main() {
float minX = uTexBounds.x;
float maxX = uTexBounds.y;
float minY = uTexBounds.z;
float maxY = uTexBounds.w;
vec2 relativeUV = vec2(texCoord.x - minX, texCoord.y - minY);
vec3 overlay = vec3(0);
#ifdef USE_SPARKLES
if (
texCoord.x >= minX - uTexelSize.x * 2 &&
texCoord.x <= maxX + uTexelSize.x * 2 &&
texCoord.y >= minY - uTexelSize.y * 4 &&
texCoord.y <= maxY + uTexelSize.y * 4
) {
float sparkle = starfield(vec2(texCoord.x - minX, texCoord.y - minY));
if (sparkle > 0.05) {
// glow sits in front of sparkle
overlay = mix(overlay, SPARKLE_COLOR, sparkle);
}
}
#endif
#ifdef USE_SPOTLIGHT
overlay = mix(overlay, SPOTLIGHT_COLOR, spotlight(texCoord, minX, maxX, minY, maxY));
#endif
#ifdef USE_GLOW
float glowVal = glow(texCoord);
if (glowVal > 0.1) {
#ifdef RGB_GLOW
vec3 glowColor = rgb(relativeUV);
#else
vec3 glowColor = GLOW_COLOR;
#endif
#ifdef USE_WAVE
glowColor = mix(glowColor, vec3(1, 1, 1), wave(relativeUV));
#endif
overlay = mix(overlay, glowColor, glowVal);
}
#endif
// Since Minecraft doesn't have HDR colors, I need an alternative approach to blending the colors together
vec4 scene = texture(sceneFBO, texCoord);
vec3 base = scene.rgb;
vec3 finalColor = vec3(1.0) - (vec3(1.0) - base) * (vec3(1.0) - overlay);
// Mix based on text color
vec4 textColor = texture(textFBO, texCoord);
if (textColor.a > 0.1) {
finalColor = mix(finalColor, TEXT_COLOR, textColor.a);
}
fragColor = vec4(finalColor, 1.0);
}
@@ -1,12 +0,0 @@
#version 330 core
layout(location = 0) in vec2 a_Position;
uniform mat4 u_MVPMatrix;
out vec2 texCoord;
void main() {
gl_Position = u_MVPMatrix * vec4(a_Position, 0.0, 1.0);
texCoord = (gl_Position.xy / gl_Position.w) * 0.5 + 0.5;
}
@@ -1,24 +0,0 @@
#version 330 core
// Given Uniforms:
uniform sampler2D textFBO; // The texture of the text's Framebuffer (use this for the post-processing)
uniform sampler2D sceneFBO; // The texture of the scene (for better scene blending)
uniform vec2 uTexelSize; // The size of each pixel (1 / displayWidth, 1 / displayHeight)
uniform float uTime; // The time, measured in seconds
uniform int uScale; // The ScaledResolution scale
uniform vec4 uTexBounds; // The bounds of the texture
// In variables:
in vec2 texCoord;
// Out variables:
out vec4 fragColor;
// Example:
void main() {
vec4 scene = texture(sceneFBO, texCoord);
vec4 textColor = texture(textFBO, texCoord);
fragColor = vec4(mix(vec3(0, 0, 0), textColor.rgb, textColor.a), 1);
}
@@ -0,0 +1,79 @@
#version 330 core
uniform sampler2D sampler;
uniform int aaMode;
uniform float strength;
uniform float alphaTestRef;
in vec4 color;
in vec4 tB;
in vec2 texCoord;
out vec4 fragColor;
/*
Hacky MSAA and anisotropic filtering. Cursed beyond belief. There _may_ have been simpler means of
achieving the produced effects, but this appears to work without noticeable performance losses.
*/
float totalWt;
float txSample(vec2 uv, float du, float dv, float factorU, float factorV) {
float distSquared = sqrt(du * du + dv * dv);
float weight = exp(-distSquared / 6);
totalWt += weight;
float finalU = uv.x + factorU * du;
float finalV = uv.y + factorV * dv;
if (finalU < tB.x || finalU > tB.y || finalV < tB.z || finalV > tB.w) {
return 0.0f;
}
return weight * texture(sampler, vec2(finalU, finalV)).a;
}
void main() {
vec4 col = color;
float original_alpha = col.a;
if (texCoord.s != 0 || texCoord.t != 0) {
if (aaMode == 0) {
// No AA - single texture sample
col.a = original_alpha * texture(sampler, texCoord).a;
} else {
vec2 texScaled = texCoord * strength;
float res = 0;
float fu = abs(dFdx(texScaled.x)) + abs(dFdy(texScaled.x));
float fv = abs(dFdx(texScaled.y)) + abs(dFdy(texScaled.y));
totalWt = 0;
if (aaMode == 1) {
res += txSample(texCoord, 2, 6, fu, fv);
res += txSample(texCoord, 6, -2, fu, fv);
res += txSample(texCoord, -2, -6, fu, fv);
res += txSample(texCoord, -6, 2, fu, fv);
} else {
res += txSample(texCoord, 1, 1, fu, fv);
res += txSample(texCoord, -1, -3, fu, fv);
res += txSample(texCoord, -3, 2, fu, fv);
res += txSample(texCoord, 4, -1, fu, fv);
res += txSample(texCoord, -5, -2, fu, fv);
res += txSample(texCoord, 2, 5, fu, fv);
res += txSample(texCoord, 5, 3, fu, fv);
res += txSample(texCoord, 3, -5, fu, fv);
res += txSample(texCoord, -2, 6, fu, fv);
res += txSample(texCoord, 0, -7, fu, fv);
res += txSample(texCoord, -4, -6, fu, fv);
res += txSample(texCoord, -6, 4, fu, fv);
res += txSample(texCoord, -8, 0, fu, fv);
res += txSample(texCoord, 7, -4, fu, fv);
res += txSample(texCoord, 6, 7, fu, fv);
res += txSample(texCoord, -7, -8, fu, fv);
}
res /= totalWt;
col.a = original_alpha * res;
}
}
if (col.a <= alphaTestRef) {
discard;
}
fragColor = col;
}
@@ -0,0 +1,19 @@
#version 330 core
layout(location = 0) in vec2 a_Position;
layout(location = 1) in vec2 a_TexCoord0;
layout(location = 2) in vec4 a_Color;
layout(location = 3) in vec4 a_TexBounds;
uniform mat4 u_MVPMatrix;
out vec4 tB;
out vec4 color;
out vec2 texCoord;
void main() {
gl_Position = u_MVPMatrix * vec4(a_Position, 0.0, 1.0);
texCoord = a_TexCoord0;
color = a_Color;
tB = a_TexBounds;
}
@@ -78,3 +78,7 @@ options.void_fog=Void Fog
options.void_fog.tooltip=Void Fog
options.hurt_shake=Hurt Screen Shake
options.background.random=Random
options.zoom_smooth=Smooth Zoom
options.zoom_smooth.tooltip=Smoothly interpolates the camera toward the zoom level instead of snapping instantly.
options.zoom_smooth_speed=Smooth Zoom Speed
options.zoom_smooth_speed.tooltip=How fast smooth zoom converges to the target zoom. Higher is snappier, lower is floatier. No effect when Smooth Zoom is off.
@@ -1,8 +1,6 @@
package com.gtnewhorizons.angelica.mixins.early.angelica;
import com.gtnewhorizons.angelica.AngelicaMod;
import com.gtnewhorizons.angelica.client.streaming.PersistentStreamingDrawer;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.glsm.streaming.TessellatorStreamingDrawer;
import com.gtnewhorizons.angelica.mixins.interfaces.IGameSettingsExt;
import com.gtnewhorizons.angelica.proxy.ClientProxy;
@@ -11,6 +9,7 @@ import net.minecraft.client.Minecraft;
import net.minecraft.client.settings.GameSettings;
import org.embeddedt.embeddium.impl.render.frame.RenderAheadManager;
import org.lwjgl.input.Keyboard;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
@@ -126,6 +125,5 @@ public abstract class MixinMinecraft {
@Inject(method = "runTick", at = @At("RETURN"))
private void angelica$streamingBufferEndFrame(CallbackInfo ci) {
TessellatorStreamingDrawer.endFrame();
PersistentStreamingDrawer.incrementFPS();
}
}
@@ -1,5 +1,7 @@
package com.gtnewhorizons.angelica.mixins.early.angelica;
import com.gtnewhorizons.angelica.event.ClientEvent;
import com.gtnewhorizons.angelica.event.ClientEventType;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraft.client.shader.Framebuffer;
@@ -15,6 +17,7 @@ public class MixinMinecraft_IconifyGuard {
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/EntityRenderer;updateCameraAndRender(F)V")
)
private void angelica$skipRenderWhenIconified(EntityRenderer entityRenderer, float partialTicks) {
ClientEvent.post(ClientEventType.ON_TICK);
final Framebuffer fb = Minecraft.getMinecraft().getFramebuffer();
if (fb == null || fb.framebufferWidth < 16 || fb.framebufferHeight < 16) {
return;
@@ -13,7 +13,6 @@ import net.minecraft.client.renderer.entity.RendererLivingEntity;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL14;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
@@ -23,6 +22,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
/**
* Single-pass damage-overlay tint, modeled on modern Minecraft's OverlayTexture.
* The tint is applied only while the main body model renders.
*/
@Mixin(RendererLivingEntity.class)
public class MixinRendererLivingEntity_OverlayTint {
@@ -33,8 +33,6 @@ public class MixinRendererLivingEntity_OverlayTint {
@Unique private boolean angelica$ffpOverlayActive;
@Unique private boolean angelica$shaderEntityColorActive;
@Unique private boolean angelica$emissivePass;
@Inject(
method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V",
at = @At(value = "INVOKE",
@@ -64,20 +62,13 @@ public class MixinRendererLivingEntity_OverlayTint {
@Inject(
method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V",
at = @At(value = "INVOKE",
target = "Lnet/minecraft/client/renderer/entity/RendererLivingEntity;renderEquippedItems(Lnet/minecraft/entity/EntityLivingBase;F)V"),
target = "Lnet/minecraft/client/renderer/entity/RendererLivingEntity;renderModel(Lnet/minecraft/entity/EntityLivingBase;FFFFFF)V",
shift = At.Shift.AFTER),
require = 1, expect = 1
)
private void angelica$teardownOverlay(EntityLivingBase entity, double x, double y, double z,
float yaw, float partialTick, CallbackInfo ci) {
if (angelica$ffpOverlayActive) {
GLStateManager.setOverlayColor(0.0F, 0.0F, 0.0F, 0.0F);
angelica$ffpOverlayActive = false;
}
if (angelica$shaderEntityColorActive) {
// Don't tint held items
CapturedRenderingState.INSTANCE.setCurrentEntityColor(0.0F, 0.0F, 0.0F, 0.0F);
angelica$shaderEntityColorActive = false;
}
private void angelica$clearBodyTint(EntityLivingBase entity, double x, double y, double z,
float yaw, float partialTick, CallbackInfo ci) {
angelica$clearOverlayColor();
}
/**
@@ -100,64 +91,17 @@ public class MixinRendererLivingEntity_OverlayTint {
original.call(model, entity, p1, p2, p3, p4, p5, p6);
}
/**
* Prevent bleed by saving last state and comparing with current blend state.
*/
@WrapOperation(
method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V",
at = @At(value = "INVOKE",
target = "Lnet/minecraft/client/renderer/entity/RendererLivingEntity;shouldRenderPass(Lnet/minecraft/entity/EntityLivingBase;IF)I"),
require = 1, expect = 1
)
private int angelica$detectEmissivePass(RendererLivingEntity self, EntityLivingBase entity, int pass,
float partialTick, Operation<Integer> original) {
GLStateManager.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
final int result = original.call(self, entity, pass, partialTick);
final int srcAfter = GLStateManager.glGetInteger(GL14.GL_BLEND_SRC_RGB);
final int dstAfter = GLStateManager.glGetInteger(GL14.GL_BLEND_DST_RGB);
angelica$emissivePass = srcAfter == GL11.GL_ONE && dstAfter == GL11.GL_ONE;
return result;
}
/**
* Skip the overlay on emissive eye pass.
*/
@WrapOperation(
method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V",
at = @At(value = "INVOKE",
target = "Lnet/minecraft/client/model/ModelBase;render(Lnet/minecraft/entity/Entity;FFFFFF)V"),
slice = @Slice(
from = @At(value = "INVOKE",
target = "Lnet/minecraft/client/renderer/entity/RendererLivingEntity;shouldRenderPass(Lnet/minecraft/entity/EntityLivingBase;IF)I"),
to = @At(value = "INVOKE",
target = "Lnet/minecraft/client/renderer/entity/RendererLivingEntity;renderEquippedItems(Lnet/minecraft/entity/EntityLivingBase;F)V")
),
require = 1, expect = 1
)
private void angelica$untintEmissivePass(ModelBase model, Entity entity,
float p1, float p2, float p3, float p4, float p5, float p6, Operation<Void> original) {
if (!angelica$skipReRender || !angelica$emissivePass) {
original.call(model, entity, p1, p2, p3, p4, p5, p6);
return;
}
if (angelica$ffpOverlayActive) {
GLStateManager.setOverlayColor(0.0F, 0.0F, 0.0F, 0.0F);
original.call(model, entity, p1, p2, p3, p4, p5, p6);
GLStateManager.setOverlayColor(1.0F, 0.0F, 0.0F, ANGELICA$RED_MIX);
} else if (angelica$shaderEntityColorActive) {
CapturedRenderingState.INSTANCE.setCurrentEntityColor(0.0F, 0.0F, 0.0F, 0.0F);
original.call(model, entity, p1, p2, p3, p4, p5, p6);
CapturedRenderingState.INSTANCE.setCurrentEntityColor(1.0F, 0.0F, 0.0F, ANGELICA$RED_MIX);
} else {
original.call(model, entity, p1, p2, p3, p4, p5, p6);
}
}
@Inject(
method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V",
at = @At("RETURN")
)
private void angelica$reset(CallbackInfo ci) {
angelica$clearOverlayColor();
angelica$skipReRender = false;
}
@Unique
private void angelica$clearOverlayColor() {
if (angelica$ffpOverlayActive) {
GLStateManager.setOverlayColor(0.0F, 0.0F, 0.0F, 0.0F);
angelica$ffpOverlayActive = false;
@@ -166,8 +110,6 @@ public class MixinRendererLivingEntity_OverlayTint {
CapturedRenderingState.INSTANCE.setCurrentEntityColor(0.0F, 0.0F, 0.0F, 0.0F);
angelica$shaderEntityColorActive = false;
}
angelica$skipReRender = false;
angelica$emissivePass = false;
}
@Unique
@@ -1,11 +1,15 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.fontrenderer;
import com.gtnewhorizon.gtnhlib.util.font.FontRendering;
import com.gtnewhorizon.gtnhlib.util.font.IFontParameters;
import com.gtnewhorizons.angelica.client.font.BatchingFontRenderer;
import static com.gtnewhorizons.angelica.client.font.ColorCodeUtils.FORMATTING_CHAR;
import static com.gtnewhorizons.angelica.client.font.ColorCodeUtils.GRADIENT_LENGTH;
import static com.gtnewhorizons.angelica.client.font.ColorCodeUtils.SECTION_X_LENGTH;
import com.gtnewhorizons.angelica.client.font.ColorCodeUtils;
import com.gtnewhorizons.angelica.compat.GTNHLibCompat;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.glsm.DisplayListManager;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.mixins.interfaces.FontRendererAccessor;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.texture.TextureManager;
@@ -13,26 +17,23 @@ import net.minecraft.client.settings.GameSettings;
import net.minecraft.util.ResourceLocation;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Constant;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.ModifyConstant;
import org.spongepowered.asm.mixin.injection.ModifyVariable;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import java.util.Random;
import static com.gtnewhorizons.angelica.client.font.ColorCodeUtils.FORMATTING_CHAR;
import static com.gtnewhorizons.angelica.client.font.ColorCodeUtils.GRADIENT_LENGTH;
import static com.gtnewhorizons.angelica.client.font.ColorCodeUtils.SECTION_X_LENGTH;
/**
* Fixes the horrible performance of FontRenderer
* @author eigenraven
*/
@Mixin(value = FontRenderer.class, priority = 999)
@Mixin(FontRenderer.class)
public abstract class MixinFontRenderer implements FontRendererAccessor, IFontParameters {
@Shadow
@@ -114,27 +115,21 @@ public abstract class MixinFontRenderer implements FontRendererAccessor, IFontPa
@Shadow(remap = false)
protected abstract void bindTexture(ResourceLocation location);
@Shadow
protected abstract void renderStringAtPos(String p_78255_1_, boolean p_78255_2_);
@Shadow
protected abstract void enableAlpha();
@Shadow
protected abstract void resetStyles();
@Unique
public BatchingFontRenderer angelica$batcher;
@Inject(method = "<init>", at = @At("TAIL"))
private void angelica$injectBatcher(GameSettings settings, ResourceLocation fontLocation, TextureManager texManager,
boolean unicodeMode, CallbackInfo ci) {
angelica$batcher = new BatchingFontRenderer((FontRenderer) (Object) this, this.colorCode, this.locationFontTexture);
angelica$batcher = new BatchingFontRenderer((FontRenderer) (Object) this, this.charWidth, this.colorCode, this.locationFontTexture);
if (GTNHLibCompat.HAS_TEXT_PREPROCESSOR) {
GTNHLibCompat.registerPreprocessor();
}
}
@Inject(method = "readFontTexture", at = @At("RETURN"))
private void angelica$onReadFontTexture(CallbackInfo ci) {
angelica$batcher.initializeTextures();
@Unique
private static boolean angelica$charInRange(char what, char fromInclusive, char toInclusive) {
return (what >= fromInclusive) && (what <= toInclusive);
}
/**
@@ -142,127 +137,101 @@ public abstract class MixinFontRenderer implements FontRendererAccessor, IFontPa
* Batched font renderer is not compatible with display lists, and won't really
* help performance when display lists are already being used anyway.
*/
/**
* @author Sisyphus
* @reason Optimize Font rendering performance
*/
@Overwrite
public int drawString(String text, int x, int y, int argb, boolean dropShadow) {
if (text == null || text.isEmpty()) return 0;
text = FontRendering.preprocessText(text);
if (DisplayListManager.getListMode() == 0) {
return angelica$drawStringBatched(text, x, y, argb, dropShadow);
@Inject(method = "drawString(Ljava/lang/String;IIIZ)I", at = @At("HEAD"), cancellable = true)
public void angelica$BatchedFontRendererDrawString(String text, int x, int y, int argb, boolean dropShadow, CallbackInfoReturnable<Integer> cir)
{
if (GLStateManager.getListMode() == 0) {
cir.setReturnValue(angelica$drawStringBatched(text, x, y, argb, dropShadow));
}
this.enableAlpha();
this.resetStyles();
int width;
if (dropShadow) {
width = this.renderString(text, x + 1, y + 1, argb, true);
width = Math.max(width, this.renderString(text, x, y, argb, false));
} else {
width = this.renderString(text, x, y, argb, false);
}
return width;
}
/**
* @author Sisyphus
* @reason Optimize Font rendering performance
* See above explanation about batched renderer in display lists.
*/
@Overwrite
private int renderString(String text, int x, int y, int argb, boolean dropShadow) {
if (text == null || text.isEmpty()) return 0;
text = FontRendering.preprocessText(text);
if (DisplayListManager.getListMode() == 0) {
return angelica$drawStringBatched(text, x, y, argb, dropShadow);
@Inject(method = "renderString", at = @At("HEAD"), cancellable = true)
public void angelica$BatchedFontRendererRenderString(String text, int x, int y, int argb, boolean dropShadow, CallbackInfoReturnable<Integer> cir) {
if (GLStateManager.getListMode() == 0) {
cir.setReturnValue(angelica$drawStringBatched(text, x, y, argb, dropShadow));
}
if (this.bidiFlag) {
text = this.bidiReorder(text);
}
if ((argb & 0xfc000000) == 0) {
argb |= 0xff000000;
}
this.red = (float) (argb >> 16 & 255) / 255.0F;
this.blue = (float) (argb >> 8 & 255) / 255.0F;
this.green = (float) (argb & 255) / 255.0F;
this.alpha = (float) (argb >> 24 & 255) / 255.0F;
this.posX = (float) x;
this.posY = (float) y;
this.renderStringAtPos(text, dropShadow);
return (int) this.posX;
}
@Override
public final int angelica$drawStringBatched(String text, int x, int y, int argb, boolean dropShadow) {
if (this.bidiFlag) {
text = this.bidiReorder(text);
public int angelica$drawStringBatched(String text, int x, int y, int argb, boolean dropShadow) {
if (text == null)
{
return 0;
}
else
{
text = ColorCodeUtils.convertAmpersandToSectionX(text);
if ((argb & 0xfc000000) == 0) {
argb |= 0xff000000;
if (this.bidiFlag)
{
text = this.bidiReorder(text);
}
if ((argb & 0xfc000000) == 0)
{
argb |= 0xff000000;
}
this.red = (float)(argb >> 16 & 255) / 255.0F;
this.blue = (float)(argb >> 8 & 255) / 255.0F;
this.green = (float)(argb & 255) / 255.0F;
this.alpha = (float)(argb >> 24 & 255) / 255.0F;
GLStateManager.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
this.posX = (float)x;
this.posY = (float)y;
return (int) angelica$batcher.drawString(x, y, argb, dropShadow, unicodeFlag, text, 0, text.length());
}
this.red = (float) (argb >> 16 & 255) / 255.0F;
this.blue = (float) (argb >> 8 & 255) / 255.0F;
this.green = (float) (argb & 255) / 255.0F;
this.alpha = (float) (argb >> 24 & 255) / 255.0F;
this.posX = (float) x;
this.posY = (float) y;
return angelica$batcher.drawString(text, x, y, argb, dropShadow);
}
/**
* @author Sisyphus
* @reason Optimize Font rendering performance
*/
@Overwrite
public int getCharWidth(char c) {
return (int) angelica$batcher.getCharWidthFine(c);
}
@Override
public final byte[] angelica$getGlyphWidths() {
return glyphWidth;
}
@Override
public final int[] angelica$getCharWidths() {
return this.charWidth;
}
@Override
public final void angelica$bindTexture(ResourceLocation location) {
this.bindTexture(location);
}
@Override
public final BatchingFontRenderer angelica$getBatcher() {
public BatchingFontRenderer angelica$getBatcher() {
return angelica$batcher;
}
@Override
public void angelica$bindTexture(ResourceLocation location) { this.bindTexture(location); }
@ModifyConstant(method = "getCharWidth", constant = @Constant(intValue = 7))
private int angelica$maxCharWidth(int original) {
return Integer.MAX_VALUE;
}
@Inject(method = "getCharWidth", at = @At("HEAD"), cancellable = true)
public void getCharWidth(char c, CallbackInfoReturnable<Integer> cir) {
cir.setReturnValue((int) angelica$getBatcher().getCharWidthFine(c));
}
@Override
public float getGlyphScaleX() {
return angelica$getBatcher().getGlyphScaleX();
}
@Override
public float getGlyphScaleY() {
return angelica$getBatcher().getGlyphScaleY();
}
@Override
public float getGlyphSpacing() {
return angelica$getBatcher().getGlyphSpacing();
}
@Override
public float getWhitespaceScale() {
return angelica$batcher.getWhitespaceScale();
return angelica$getBatcher().getWhitespaceScale();
}
@Override
public float getShadowOffset() {
return angelica$batcher.getShadowOffset();
return angelica$getBatcher().getShadowOffset();
}
@Override
public float getCharWidthFine(char chr) {
return angelica$batcher.getCharWidthFine(chr);
return angelica$getBatcher().getCharWidthFine(chr);
}
@Inject(method = "getFormatFromString", at = @At("HEAD"), cancellable = true)
@@ -278,7 +247,7 @@ public abstract class MixinFontRenderer implements FontRendererAccessor, IFontPa
@Unique
private static String angelica$extractFormat(String text) {
text = FontRendering.preprocessText(text);
text = ColorCodeUtils.convertAmpersandToSectionX(text);
final int len = text.length();
if (len < 2) return "";
@@ -348,13 +317,18 @@ public abstract class MixinFontRenderer implements FontRendererAccessor, IFontPa
return result.toString();
}
@ModifyVariable(method = "getStringWidth", at = @At("HEAD"), argsOnly = true, ordinal = 0)
private String angelica$convertBeforeWidth(String str) {
return ColorCodeUtils.convertAmpersandToSectionX(str);
}
@ModifyVariable(method = "listFormattedStringToWidth", at = @At("HEAD"), argsOnly = true, ordinal = 0)
private String angelica$convertBeforeListWrap(String str) {
return FontRendering.preprocessText(str);
return ColorCodeUtils.convertAmpersandToSectionX(str);
}
@ModifyVariable(method = "wrapFormattedStringToWidth", at = @At("HEAD"), argsOnly = true, ordinal = 0)
private String angelica$convertBeforeWrap(String str) {
return FontRendering.preprocessText(str);
return ColorCodeUtils.convertAmpersandToSectionX(str);
}
}
@@ -1,126 +1,35 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.fontrenderer;
import com.gtnewhorizon.gtnhlib.client.renderer.vertex.VertexFlags;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.glsm.streaming.TessellatorStreamingDrawer;
import com.gtnewhorizons.angelica.mixins.interfaces.FontRendererAccessor;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraftforge.client.GuiIngameForge;
import org.lwjgl.opengl.GL11;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Redirect;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import java.nio.ByteBuffer;
import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.*;
@Mixin(GuiIngameForge.class)
public class MixinGuiIngameForge {
@Shadow(remap = false)
private FontRenderer fontrenderer;
@Unique private ByteBuffer angelica$data = memAlloc(2048);
@Unique private int angelica$ptrOffset = 0;
@Unique private long angelica$basePtr = memAddress0(angelica$data);
@Redirect(
method = "renderHUDText",
remap = false,
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/gui/FontRenderer;drawStringWithShadow(Ljava/lang/String;III)I",
ordinal = 0,
remap = true))
private int renderBackgroundLeft(FontRenderer fontRenderer, String text, int x, int y, int color) {
angelica$writeQuad(
x - 1, y - 1,
x + fontRenderer.getStringWidth(text) + 1,
y + fontRenderer.FONT_HEIGHT
);
return fontRenderer.drawString(text, x, y, 0xe0e0e0);
}
@Redirect(
method = "renderHUDText",
remap = false,
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/gui/FontRenderer;drawStringWithShadow(Ljava/lang/String;III)I",
ordinal = 1,
remap = true))
private int renderBackgroundRight(FontRenderer fontRenderer, String text, int x, int y, int color) {
x += 8;
angelica$writeQuad(
x - 1, y - 1,
x + fontRenderer.getStringWidth(text) + 1, y + fontRenderer.FONT_HEIGHT
);
return fontRenderer.drawString(text, x, y, 0xe0e0e0);
}
@Unique
private void angelica$writeQuad(int left, int bottom, int right, int top) {
if ((angelica$ptrOffset + 48) > angelica$data.capacity()) {
angelica$data = memRealloc(angelica$data, angelica$data.capacity() * 2);
angelica$basePtr = memAddress0(angelica$data);
}
final long ptr = angelica$basePtr + angelica$ptrOffset;
memPutFloat(ptr, left);
memPutFloat(ptr + 4, top);
memPutFloat(ptr + 8, 0);
memPutFloat(ptr + 12, right);
memPutFloat(ptr + 16, top);
memPutFloat(ptr + 20, 0);
memPutFloat(ptr + 24, right);
memPutFloat(ptr + 28, bottom);
memPutFloat(ptr + 32, 0);
memPutFloat(ptr + 36, left);
memPutFloat(ptr + 40, bottom);
memPutFloat(ptr + 44, 0);
angelica$ptrOffset += 48;
}
@Inject(
method = "renderHUDText",
at = @At("HEAD"),
at = @At(
value = "INVOKE",
target = "net/minecraftforge/client/event/RenderGameOverlayEvent$Text.<init>(Lnet/minecraftforge/client/event/RenderGameOverlayEvent;Ljava/util/ArrayList;Ljava/util/ArrayList;)V"),
remap = false)
private void angelica$startF3Batching(int width, int height, CallbackInfo ci) {
private void angelica$startF3TextBatching(int width, int height, CallbackInfo ci) {
FontRendererAccessor fra = (FontRendererAccessor) (Object) fontrenderer;
fra.angelica$getBatcher().beginBatch();
angelica$ptrOffset = 0;
}
@Inject(
method = "renderHUDText",
at = @At("RETURN"), remap = false)
private void angelica$endF3Batching(int width, int height, CallbackInfo ci) {
angelica$data.limit(angelica$ptrOffset);
GLStateManager.glColor4f(0.3137f, 0.3137f, 0.3137f, 0.5647f); // 0x90505050
GLStateManager.glEnable(GL11.GL_BLEND);
GLStateManager.glDisable(GL11.GL_TEXTURE_2D);
OpenGlHelper.glBlendFunc(770, 771, 1, 0);
TessellatorStreamingDrawer.drawPacked(
angelica$data,
GL11.GL_QUADS,
VertexFlags.POSITION_BIT,
angelica$ptrOffset / 12
);
GLStateManager.glEnable(GL11.GL_TEXTURE_2D);
GLStateManager.glDisable(GL11.GL_BLEND);
// Font rendering has to go AFTER batched rects
at = @At(value = "INVOKE", target = "net/minecraft/profiler/Profiler.endSection()V"))
private void angelica$endF3TextBatching(int width, int height, CallbackInfo ci) {
FontRendererAccessor fra = (FontRendererAccessor) (Object) fontrenderer;
fra.angelica$getBatcher().endBatch();
}
@@ -0,0 +1,39 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.gui;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.Gui;
import net.minecraftforge.client.GuiIngameForge;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;
@Mixin(GuiIngameForge.class)
public class MixinGuiIngameForge_ModernF3 {
@Redirect(
method = "renderHUDText",
remap = false,
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/gui/FontRenderer;drawStringWithShadow(Ljava/lang/String;III)I",
ordinal = 0,
remap = true))
private int renderBackgroundLeft(FontRenderer fontRenderer, String text, int x, int y, int color) {
Gui.drawRect(x - 1, y - 1, x + fontRenderer.getStringWidth(text) + 1, y + fontRenderer.FONT_HEIGHT, 0x90505050);
return fontRenderer.drawString(text, x, y, 0xe0e0e0);
}
@Redirect(
method = "renderHUDText",
remap = false,
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/gui/FontRenderer;drawStringWithShadow(Ljava/lang/String;III)I",
ordinal = 1,
remap = true))
private int renderBackgroundRight(FontRenderer fontRenderer, String text, int x, int y, int color) {
x += 8;
Gui.drawRect(x - 1, y - 1, x + fontRenderer.getStringWidth(text) + 1, y + fontRenderer.FONT_HEIGHT, 0x90505050);
return fontRenderer.drawString(text, x, y, 0xe0e0e0);
}
}
@@ -16,10 +16,8 @@ public class MixinEntityRenderer_Zoom {
@ModifyReturnValue(method = "getFOVModifier", at = @At("RETURN"))
private float angelica$modifyFOV(float original) {
if (Zoom.getZoomKey().getIsKeyPressed()) {
return original / Zoom.getZoom();
}
return original;
final float current = Zoom.getCurrentZoom();
return current > 1.0001F ? original / current : original;
}
@ModifyConstant(method = "updateCameraAndRender", constant = @Constant(floatValue = 8.0F))
Loaded 100 of 104 files, more files were not shown because too many files have changed in this diff. Show more