Compare commits

..
Author SHA1 Message Date
Ruling-0 586cce1c40 Translucency Layers and Terrain Split (#2332)
* Replace translucency sorting toggle with an Off/Fast/Fancy setting

* Add premultiplied layer blending to GLSMBlend

* Add translucency layer targets and depth-sorted composite

* Draw translucent terrain and tile entities into composited layers

* Draw particles, weather and clouds into composited layers

* Composite terrain behind block entities under Fancy translucency
2026-11-21 22:13:43 -05:00
Ruling-0 ef8648cdc0 Draw translucent-pass block entities before translucent terrain (#2331) 2026-11-21 22:01:53 -05:00
Ruling-0andChitak 985 eff6697583 Translucency Sorting Improvements (#2330)
* Add translucent test TESR blocks and flyby scene

* Sort block entities back to front before dispatch

---------

Co-authored-by: Chitak 985 <[email protected]>
2026-11-21 21:57:04 -05:00
78 changed files with 1906 additions and 2011 deletions

No files matched your search

@@ -149,19 +149,46 @@ public final class GLSMBlend {
}
static void issueBlendFunc(BlendStateStack blend) {
if (GLSMConfig.hudCacheOverride) {
RENDER_BACKEND.blendFuncSeparate(blend.getSrcRgb(), blend.getDstRgb(), GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
} else {
RENDER_BACKEND.blendFuncSeparate(blend.getSrcRgb(), blend.getDstRgb(), blend.getSrcAlpha(), blend.getDstAlpha());
}
RENDER_BACKEND.blendFuncSeparate(blend.getSrcRgb(), blend.getDstRgb(), emittedSrcAlpha(blend), emittedDstAlpha(blend));
}
private static boolean addsWithoutCoverage(BlendStateStack blend) {
return blend.getDstRgb() == GL11.GL_ONE;
}
private static int emittedSrcAlpha(BlendStateStack blend) {
if (GLSMConfig.layerBlending) return addsWithoutCoverage(blend) ? GL11.GL_ZERO : GL11.GL_ONE;
return GLSMConfig.hudCacheOverride ? GL11.GL_ONE : blend.getSrcAlpha();
}
private static int emittedDstAlpha(BlendStateStack blend) {
if (GLSMConfig.layerBlending) return addsWithoutCoverage(blend) ? GL11.GL_ONE : GL11.GL_ONE_MINUS_SRC_ALPHA;
return GLSMConfig.hudCacheOverride ? GL11.GL_ONE_MINUS_SRC_ALPHA : blend.getDstAlpha();
}
public static void setHudCacheOverride(boolean enabled) {
if (GLSMConfig.hudCacheOverride == enabled) return;
GLSMConfig.hudCacheOverride = enabled;
final DeferredBlendHandler bh = GLSMHooks.blendHandler;
if (bh != null && bh.isOverrideHeld()) return;
reissueBlendFunc();
}
public static void setLayerBlending(boolean enabled) {
if (GLSMConfig.layerBlending == enabled) return;
GLSMConfig.layerBlending = enabled;
reissueBlendFunc();
}
public static boolean isLayerBlending() {
return GLSMConfig.layerBlending;
}
private static void reissueBlendFunc() {
final BlendStateStack blend = ctx().blendState;
final DeferredBlendHandler bh = GLSMHooks.blendHandler;
if (bh != null && bh.isOverrideHeld()) {
blend.setFuncUnknownState();
return;
}
issueBlendFunc(blend);
blend.clearFuncUnknownState();
}
@@ -226,11 +253,10 @@ public final class GLSMBlend {
glCtx.blendState.clearFuncUnknownState();
issueBlendFunc(glCtx.blendState);
if (GLSMHooks.BLEND_FUNC_CHANGE.hasListeners()) {
final boolean hudCache = GLSMConfig.hudCacheOverride;
GLSMHooks.blendFuncChangeEvent.srcRgb = srcRgb;
GLSMHooks.blendFuncChangeEvent.dstRgb = dstRgb;
GLSMHooks.blendFuncChangeEvent.srcAlpha = hudCache ? GL11.GL_ONE : srcAlpha;
GLSMHooks.blendFuncChangeEvent.dstAlpha = hudCache ? GL11.GL_ONE_MINUS_SRC_ALPHA : dstAlpha;
GLSMHooks.blendFuncChangeEvent.srcAlpha = emittedSrcAlpha(glCtx.blendState);
GLSMHooks.blendFuncChangeEvent.dstAlpha = emittedDstAlpha(glCtx.blendState);
GLSMHooks.BLEND_FUNC_CHANGE.post(GLSMHooks.blendFuncChangeEvent);
}
}
@@ -6,6 +6,8 @@ import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
import org.lwjgl.opengl.GL11;
import java.util.Arrays;
public final class StateSet {
public static final int R_DEPTH = 1;
@@ -79,28 +81,47 @@ public final class StateSet {
public static final StateSet CUTOUT = buildCutout();
public static final StateSet MASKS = buildMasks();
public static final StateSet CULL = buildCull();
public static final StateSet BLOCK_ENTITY_PASS = buildBlockEntityPass();
private static CowStateStack<?>[] batchMembers() {
return new CowStateStack<?>[] {
GLSMBlend.getBlendState(), GLSMDepthStencilAlpha.getAlphaState(), GLSMDepthStencilAlpha.getDepthState(),
GLSMBlend.getColorMask(), GLSMRasterizer.getPolygonState(),
GLSMTextures.getTextures().getTextureUnitBindings(0), GLSMTextures.getTextures().getTextureUnitBindings(1),
GLSMTextures.getActiveTextureUnitStack(),
GLSMBlend.getBlendMode(), GLSMDepthStencilAlpha.getAlphaTest(), GLSMDepthStencilAlpha.getDepthTest(),
GLSMLighting.getLightingState(), GLSMRasterizer.getCullState(), GLSMRasterizer.getPolygonOffsetFillState(),
GLSMTextures.getTextures().getTextureUnitStates(0), GLSMTextures.getTextures().getTextureUnitStates(1),
GLSMLighting.getLightStates()[0], GLSMLighting.getLightStates()[1],
GLSMLighting.getLightDataStates()[0], GLSMLighting.getLightDataStates()[1],
GLSMLighting.getColorMaterial(), GLSMLighting.getColorMaterialFace(), GLSMLighting.getColorMaterialParameter(),
GLSMLighting.getLightModel(), GLSMLighting.getFrontMaterial(), GLSMLighting.getBackMaterial(),
GLSMLighting.getNormalizeState(), GLSMLighting.getRescaleNormalState()
};
}
private static StateSet buildBatch() {
return new StateSet(0,
ids(
GLSMBlend.getBlendState(), GLSMDepthStencilAlpha.getAlphaState(), GLSMDepthStencilAlpha.getDepthState(),
GLSMBlend.getColorMask(), GLSMRasterizer.getPolygonState(),
GLSMTextures.getTextures().getTextureUnitBindings(0), GLSMTextures.getTextures().getTextureUnitBindings(1),
GLSMTextures.getActiveTextureUnitStack(),
GLSMBlend.getBlendMode(), GLSMDepthStencilAlpha.getAlphaTest(), GLSMDepthStencilAlpha.getDepthTest(),
GLSMLighting.getLightingState(), GLSMRasterizer.getCullState(), GLSMRasterizer.getPolygonOffsetFillState(),
GLSMTextures.getTextures().getTextureUnitStates(0), GLSMTextures.getTextures().getTextureUnitStates(1),
GLSMLighting.getLightStates()[0], GLSMLighting.getLightStates()[1],
GLSMLighting.getLightDataStates()[0], GLSMLighting.getLightDataStates()[1],
GLSMLighting.getColorMaterial(), GLSMLighting.getColorMaterialFace(), GLSMLighting.getColorMaterialParameter(),
GLSMLighting.getLightModel(), GLSMLighting.getFrontMaterial(), GLSMLighting.getBackMaterial(),
GLSMLighting.getNormalizeState(), GLSMLighting.getRescaleNormalState()
),
ids(batchMembers()),
R_BLEND | R_DEPTH | R_COLOR_MASK | R_POLYGON | R_TEXTURE | R_ACTIVE_UNIT,
B_FRAG_COLORBUF | B_LIGHTING,
true);
}
private static StateSet buildBlockEntityPass() {
final CowStateStack<?>[] batch = batchMembers();
final CowStateStack<?>[] all = Arrays.copyOf(batch, batch.length + 4);
all[batch.length] = GLSMCurrentAttribs.getColor();
all[batch.length + 1] = GLSMFog.getFogState();
all[batch.length + 2] = GLSMFog.getFogMode();
all[batch.length + 3] = GLSMRasterizer.getShadeModelState();
return new StateSet(0,
ids(all),
R_BLEND | R_DEPTH | R_COLOR_MASK | R_POLYGON | R_TEXTURE | R_ACTIVE_UNIT,
B_FRAG_COLORBUF | B_LIGHTING | B_CURRENT | B_FRAG_FOG,
true);
}
private static StateSet buildFont() {
return new StateSet(0,
ids(
@@ -15,6 +15,7 @@ public final class GLSMConfig {
}
public static boolean hudCacheOverride;
public static boolean layerBlending;
public static boolean extendedAttribsExpected;
public static volatile boolean expandVertexFormats;
@@ -12,7 +12,8 @@ final class GLSMOwners {
"getColorLogicOpState", "getColorMask", "getEffectiveBlendState", "getEffectiveColorMask",
"getIndexLogicOpState", "getLogicOpMode", "glBlendColor", "glBlendEquation", "glBlendEquationSeparate",
"glBlendFunc", "glBlendFuncSeparate", "glBlendFuncSeparatei", "glClearColor", "glColorMask", "glLogicOp",
"isEffectiveBlendEnabled", "setHudCacheOverride", "tryBlendFuncSeparate"},
"isEffectiveBlendEnabled", "isLayerBlending", "setHudCacheOverride", "setLayerBlending",
"tryBlendFuncSeparate"},
{"com/gtnewhorizons/angelica/glsm/GLSMBuffers",
"getBoundCopyReadBuffer", "getBoundCopyWriteBuffer", "getBoundVBO", "getIndexedBufferBinding",
"glBindBuffer", "glBindBufferBase", "glBindBufferRange", "glBufferData", "glBufferStorage",
@@ -0,0 +1,119 @@
package com.gtnewhorizons.angelica.glsm;
import com.gtnewhorizons.angelica.glsm.hooks.DeferredBlendHandler;
import com.gtnewhorizons.angelica.glsm.hooks.GLSMHooks;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL14;
import java.util.stream.Stream;
import static org.junit.jupiter.api.Assertions.assertEquals;
@GLCoreTest
public class GLSM_BlendAlphaOverride_GLTest {
private static void assertDriverFunc(int srcRgb, int dstRgb, int srcAlpha, int dstAlpha) {
assertEquals(srcRgb, GL11.glGetInteger(GL14.GL_BLEND_SRC_RGB));
assertEquals(dstRgb, GL11.glGetInteger(GL14.GL_BLEND_DST_RGB));
assertEquals(srcAlpha, GL11.glGetInteger(GL14.GL_BLEND_SRC_ALPHA));
assertEquals(dstAlpha, GL11.glGetInteger(GL14.GL_BLEND_DST_ALPHA));
}
private static void assertCachedFunc(int srcRgb, int dstRgb, int srcAlpha, int dstAlpha) {
assertEquals(srcRgb, GLSMQueries.glGetInteger(GL14.GL_BLEND_SRC_RGB));
assertEquals(dstRgb, GLSMQueries.glGetInteger(GL14.GL_BLEND_DST_RGB));
assertEquals(srcAlpha, GLSMQueries.glGetInteger(GL14.GL_BLEND_SRC_ALPHA));
assertEquals(dstAlpha, GLSMQueries.glGetInteger(GL14.GL_BLEND_DST_ALPHA));
}
@AfterEach
void resetOverrides() {
GLSMHooks.blendHandler = null;
GLSMBlend.setHudCacheOverride(false);
GLSMBlend.setLayerBlending(false);
GLSMBlend.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
}
@Test
void overrideChangesTheDriverFuncButNotTheCache() {
GLSMBlend.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
GLSMBlend.setHudCacheOverride(true);
assertCachedFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
GLSMBlend.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
assertCachedFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_SRC_ALPHA, GL11.GL_ONE);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
GLSMBlend.tryBlendFuncSeparate(GL11.GL_DST_COLOR, GL11.GL_ZERO, GL11.GL_ZERO, GL11.GL_ONE);
assertCachedFunc(GL11.GL_DST_COLOR, GL11.GL_ZERO, GL11.GL_ZERO, GL11.GL_ONE);
assertDriverFunc(GL11.GL_DST_COLOR, GL11.GL_ZERO, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
GLSMBlend.setHudCacheOverride(false);
assertCachedFunc(GL11.GL_DST_COLOR, GL11.GL_ZERO, GL11.GL_ZERO, GL11.GL_ONE);
assertDriverFunc(GL11.GL_DST_COLOR, GL11.GL_ZERO, GL11.GL_ZERO, GL11.GL_ONE);
}
@Test
void popUnderOverrideKeepsTheOverriddenAlphaOnTheDriver() {
GLSMBlend.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
final int d = GLSMAttribStack.pushState(StateSet.BLEND);
GLSMBlend.setHudCacheOverride(true);
GLSMBlend.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
GLSMAttribStack.popStateTo(d);
assertCachedFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
GLSMBlend.setHudCacheOverride(false);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
}
@Test
void separateAlphaIsForcedEvenWhenDstAlphaAlreadyMatches() {
GLSMBlend.setHudCacheOverride(true);
GLSMBlend.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO, GL11.GL_ONE_MINUS_SRC_ALPHA);
assertCachedFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO, GL11.GL_ONE_MINUS_SRC_ALPHA);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
}
static Stream<Arguments> layerBlendRows() {
return Stream.of(
Arguments.of("translucent over", GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA),
Arguments.of("alpha additive", GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO, GL11.GL_ONE));
}
@ParameterizedTest(name = "{0}")
@MethodSource("layerBlendRows")
void layerBlendingAccumulatesCoverageAndKeepsAdditiveCoverageFree(String name, int srcRgb, int dstRgb, int srcAlpha, int dstAlpha) {
GLSMBlend.setLayerBlending(true);
GLSMBlend.glBlendFunc(srcRgb, dstRgb);
assertCachedFunc(srcRgb, dstRgb, srcRgb, dstRgb);
assertDriverFunc(srcRgb, dstRgb, srcAlpha, dstAlpha);
GLSMBlend.setLayerBlending(false);
assertDriverFunc(srcRgb, dstRgb, srcRgb, dstRgb);
}
@Test
void togglingWhileABlendOverrideIsHeldReemitsOnTheNextUnchangedFunc() {
GLSMBlend.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GLSMHooks.blendHandler = new HeldOverride();
GLSMBlend.setLayerBlending(true);
GLSMHooks.blendHandler = null;
GLSMBlend.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
}
private static final class HeldOverride implements DeferredBlendHandler {
@Override public boolean isBlendLocked() { return false; }
@Override public boolean isOverrideHeld() { return true; }
@Override public void deferBlendModeToggle(boolean enabled) {}
@Override public void deferBlendFunc(int srcRgb, int dstRgb, int srcAlpha, int dstAlpha) {}
@Override public void flushDeferredBlend() {}
}
}
@@ -1,83 +0,0 @@
package com.gtnewhorizons.angelica.glsm;
import org.junit.jupiter.api.Test;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL14;
import static org.junit.jupiter.api.Assertions.assertEquals;
@GLCoreTest
public class GLSM_HudCacheBlendOverride_GLTest {
private static void assertDriverFunc(int srcRgb, int dstRgb, int srcAlpha, int dstAlpha) {
assertEquals(srcRgb, GL11.glGetInteger(GL14.GL_BLEND_SRC_RGB));
assertEquals(dstRgb, GL11.glGetInteger(GL14.GL_BLEND_DST_RGB));
assertEquals(srcAlpha, GL11.glGetInteger(GL14.GL_BLEND_SRC_ALPHA));
assertEquals(dstAlpha, GL11.glGetInteger(GL14.GL_BLEND_DST_ALPHA));
}
private static void assertCachedFunc(int srcRgb, int dstRgb, int srcAlpha, int dstAlpha) {
assertEquals(srcRgb, GLSMQueries.glGetInteger(GL14.GL_BLEND_SRC_RGB));
assertEquals(dstRgb, GLSMQueries.glGetInteger(GL14.GL_BLEND_DST_RGB));
assertEquals(srcAlpha, GLSMQueries.glGetInteger(GL14.GL_BLEND_SRC_ALPHA));
assertEquals(dstAlpha, GLSMQueries.glGetInteger(GL14.GL_BLEND_DST_ALPHA));
}
@Test
void overrideChangesTheDriverFuncButNotTheCache() {
try {
GLSMBlend.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
GLSMBlend.setHudCacheOverride(true);
assertCachedFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
GLSMBlend.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE);
assertCachedFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_SRC_ALPHA, GL11.GL_ONE);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
GLSMBlend.tryBlendFuncSeparate(GL11.GL_DST_COLOR, GL11.GL_ZERO, GL11.GL_ZERO, GL11.GL_ONE);
assertCachedFunc(GL11.GL_DST_COLOR, GL11.GL_ZERO, GL11.GL_ZERO, GL11.GL_ONE);
assertDriverFunc(GL11.GL_DST_COLOR, GL11.GL_ZERO, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
GLSMBlend.setHudCacheOverride(false);
assertCachedFunc(GL11.GL_DST_COLOR, GL11.GL_ZERO, GL11.GL_ZERO, GL11.GL_ONE);
assertDriverFunc(GL11.GL_DST_COLOR, GL11.GL_ZERO, GL11.GL_ZERO, GL11.GL_ONE);
} finally {
GLSMBlend.setHudCacheOverride(false);
GLSMBlend.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
}
}
@Test
void popUnderOverrideKeepsTheOverriddenAlphaOnTheDriver() {
try {
GLSMBlend.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
final int d = GLSMAttribStack.pushState(StateSet.BLEND);
GLSMBlend.setHudCacheOverride(true);
GLSMBlend.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
GLSMAttribStack.popStateTo(d);
assertCachedFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
GLSMBlend.setHudCacheOverride(false);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
} finally {
GLSMBlend.setHudCacheOverride(false);
GLSMBlend.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
}
}
@Test
void separateAlphaIsForcedEvenWhenDstAlphaAlreadyMatches() {
try {
GLSMBlend.setHudCacheOverride(true);
GLSMBlend.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO, GL11.GL_ONE_MINUS_SRC_ALPHA);
assertCachedFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO, GL11.GL_ONE_MINUS_SRC_ALPHA);
assertDriverFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA);
} finally {
GLSMBlend.setHudCacheOverride(false);
GLSMBlend.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO);
}
}
}
@@ -167,6 +167,33 @@ public class GLSM_StateSet_GLTest {
|| GLSMBlend.getColorMask().blue || GLSMBlend.getColorMask().alpha, "cache color mask - not a HAND member, must stay toggled");
}
@Test
void blockEntityPassRestoresColorFogAndShadeModelOnTopOfBatchButNotStencil() {
GLSMCurrentAttribs.glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
GLSMFog.disableFog();
GLSMFog.glFogf(GL11.GL_FOG_END, 64.0f);
GLSMRasterizer.glShadeModel(GL11.GL_SMOOTH);
GLSMDepthStencilAlpha.glDepthMask(true);
GLSMEnable.glDisable(GL11.GL_STENCIL_TEST);
final int d = GLSMAttribStack.pushState(StateSet.BLOCK_ENTITY_PASS);
GLSMCurrentAttribs.glColor4f(0.2f, 0.4f, 0.6f, 0.8f);
GLSMFog.enableFog();
GLSMFog.glFogf(GL11.GL_FOG_END, 8.0f);
GLSMRasterizer.glShadeModel(GL11.GL_FLAT);
GLSMDepthStencilAlpha.glDepthMask(false);
GLSMEnable.glEnable(GL11.GL_STENCIL_TEST);
GLSMAttribStack.popStateTo(d);
assertEquals(1.0f, GLSMCurrentAttribs.getColor().getRed(), "cache color red");
assertEquals(1.0f, GLSMCurrentAttribs.getColor().getAlpha(), "cache color alpha");
assertFalse(GLSMFog.getFogMode().isEnabled(), "fog enable restored by BLOCK_ENTITY_PASS pop");
assertEquals(64.0f, GLSMFog.getFogState().getEnd(), "cache fog end");
assertEquals(GL11.GL_SMOOTH, GLSMRasterizer.getShadeModelState().getValue(), "cache shade model");
assertTrue(GLSMDepthStencilAlpha.getDepthState().isEnabled(), "depth mask restored, as in BATCH");
verifyIsEnabled(GL11.GL_STENCIL_TEST, true, "Stencil test - not a BLOCK_ENTITY_PASS member, must stay toggled");
}
@Test
void masksRestoresDepthMaskAndColorMaskButNotDepthTestEnable() {
GLSMDepthStencilAlpha.glDepthMask(true);
@@ -0,0 +1,83 @@
# Translucent TESR ordering scene for a generated superflat (windows-flyby-kit/make_world.py). Needs
# -Dangelica.debug.testBlocks=true. $x $y $z is the flight start; ground-standing level is $y-2. Start facing south (yaw 0),
# pitch 15. Blocks: test_tesr_provider (0 translucent red, 1 additive purple), test_tesr_model (0 box pane,
# 1 Tessellator pane, 2 stacked A/B/A panes), test_tesr_decal, test_tesr_glow; metadata + 8 draws in the solid pass.
gamerule doMobSpawning false
# translucent pass: three rows, materials shifted per row so every column stacks three different ones
setblock $x-2 $y $z+6 angelica:test_tesr_provider 0 replace
setblock $x-1 $y $z+6 angelica:test_tesr_provider 1 replace
setblock $x+0 $y $z+6 angelica:test_tesr_model 0 replace
setblock $x+1 $y $z+6 angelica:test_tesr_model 1 replace
setblock $x-2 $y $z+8 angelica:test_tesr_provider 1 replace
setblock $x-1 $y $z+8 angelica:test_tesr_model 0 replace
setblock $x+0 $y $z+8 angelica:test_tesr_model 1 replace
setblock $x+1 $y $z+8 angelica:test_tesr_provider 0 replace
setblock $x-2 $y $z+10 angelica:test_tesr_model 0 replace
setblock $x-1 $y $z+10 angelica:test_tesr_model 1 replace
setblock $x+0 $y $z+10 angelica:test_tesr_provider 0 replace
setblock $x+1 $y $z+10 angelica:test_tesr_provider 1 replace
# solid pass: the same rows two blocks higher
setblock $x-2 $y+2 $z+6 angelica:test_tesr_provider 8 replace
setblock $x-1 $y+2 $z+6 angelica:test_tesr_provider 9 replace
setblock $x+0 $y+2 $z+6 angelica:test_tesr_model 8 replace
setblock $x+1 $y+2 $z+6 angelica:test_tesr_model 9 replace
setblock $x-2 $y+2 $z+8 angelica:test_tesr_provider 9 replace
setblock $x-1 $y+2 $z+8 angelica:test_tesr_model 8 replace
setblock $x+0 $y+2 $z+8 angelica:test_tesr_model 9 replace
setblock $x+1 $y+2 $z+8 angelica:test_tesr_provider 8 replace
setblock $x-2 $y+2 $z+10 angelica:test_tesr_model 8 replace
setblock $x-1 $y+2 $z+10 angelica:test_tesr_model 9 replace
setblock $x+0 $y+2 $z+10 angelica:test_tesr_provider 8 replace
setblock $x+1 $y+2 $z+10 angelica:test_tesr_provider 9 replace
# one tile entity submitting translucent A, additive B, translucent A; a depth-equal decal
setblock $x-7 $y $z+8 angelica:test_tesr_model 2 replace
setblock $x-7 $y+1 $z+8 angelica:test_tesr_decal 0 replace
# light blue glass wall: glow and provider panes in front, a provider pane behind. The panes behind the wall and
# under the water show only when block entities draw before translucent terrain.
setblock $x+5 $y-1 $z+14 stained_glass 3 replace
setblock $x+5 $y $z+14 stained_glass 3 replace
setblock $x+5 $y+1 $z+14 stained_glass 3 replace
setblock $x+6 $y-1 $z+14 stained_glass 3 replace
setblock $x+6 $y $z+14 stained_glass 3 replace
setblock $x+6 $y+1 $z+14 stained_glass 3 replace
setblock $x+7 $y-1 $z+14 stained_glass 3 replace
setblock $x+7 $y $z+14 stained_glass 3 replace
setblock $x+7 $y+1 $z+14 stained_glass 3 replace
setblock $x+8 $y-1 $z+14 stained_glass 3 replace
setblock $x+8 $y $z+14 stained_glass 3 replace
setblock $x+8 $y+1 $z+14 stained_glass 3 replace
setblock $x+9 $y-1 $z+14 stained_glass 3 replace
setblock $x+9 $y $z+14 stained_glass 3 replace
setblock $x+9 $y+1 $z+14 stained_glass 3 replace
setblock $x+6 $y $z+13 angelica:test_tesr_glow 0 replace
setblock $x+8 $y $z+13 angelica:test_tesr_provider 0 replace
setblock $x+7 $y $z+15 angelica:test_tesr_provider 0 replace
# water pool with a provider pane under the surface
setblock $x-10 $y-4 $z+12 water 0 replace
setblock $x-10 $y-3 $z+12 water 0 replace
setblock $x-10 $y-4 $z+13 water 0 replace
setblock $x-10 $y-3 $z+13 water 0 replace
setblock $x-10 $y-4 $z+14 water 0 replace
setblock $x-10 $y-3 $z+14 water 0 replace
setblock $x-9 $y-4 $z+12 water 0 replace
setblock $x-9 $y-3 $z+12 water 0 replace
setblock $x-9 $y-4 $z+13 water 0 replace
setblock $x-9 $y-3 $z+13 water 0 replace
setblock $x-9 $y-4 $z+14 water 0 replace
setblock $x-9 $y-3 $z+14 water 0 replace
setblock $x-8 $y-4 $z+12 water 0 replace
setblock $x-8 $y-3 $z+12 water 0 replace
setblock $x-8 $y-4 $z+13 water 0 replace
setblock $x-8 $y-3 $z+13 water 0 replace
setblock $x-8 $y-4 $z+14 water 0 replace
setblock $x-8 $y-3 $z+14 water 0 replace
setblock $x-9 $y-4 $z+13 angelica:test_tesr_provider 0 replace
# control: a lone pane with sky behind it
setblock $x+5 $y+2 $z+8 angelica:test_tesr_provider 0 replace
@@ -0,0 +1,58 @@
# Translucency layer scene for a generated superflat (windows-flyby-kit/make_world.py). $x $y $z is the flight start;
# ground-standing level is $y-2. Start facing south (yaw 0), pitch 15. Use with -Dangelica.flyby.weather=RAIN. Torch
# flame and smoke and rain fall in front of a light blue glass wall and a water pool; one torch row stands behind the glass.
gamerule doMobSpawning false
# glass wall
setblock $x-1 $y-2 $z+9 stained_glass 3 replace
setblock $x-1 $y-1 $z+9 stained_glass 3 replace
setblock $x-1 $y+0 $z+9 stained_glass 3 replace
setblock $x+0 $y-2 $z+9 stained_glass 3 replace
setblock $x+0 $y-1 $z+9 stained_glass 3 replace
setblock $x+0 $y+0 $z+9 stained_glass 3 replace
setblock $x+1 $y-2 $z+9 stained_glass 3 replace
setblock $x+1 $y-1 $z+9 stained_glass 3 replace
setblock $x+1 $y+0 $z+9 stained_glass 3 replace
setblock $x+2 $y-2 $z+9 stained_glass 3 replace
setblock $x+2 $y-1 $z+9 stained_glass 3 replace
setblock $x+2 $y+0 $z+9 stained_glass 3 replace
setblock $x+3 $y-2 $z+9 stained_glass 3 replace
setblock $x+3 $y-1 $z+9 stained_glass 3 replace
setblock $x+3 $y+0 $z+9 stained_glass 3 replace
# torches in front of and behind the glass
setblock $x-1 $y-2 $z+7 torch 5 replace
setblock $x-1 $y-2 $z+11 torch 5 replace
setblock $x+0 $y-2 $z+7 torch 5 replace
setblock $x+0 $y-2 $z+11 torch 5 replace
setblock $x+1 $y-2 $z+7 torch 5 replace
setblock $x+1 $y-2 $z+11 torch 5 replace
setblock $x+2 $y-2 $z+7 torch 5 replace
setblock $x+2 $y-2 $z+11 torch 5 replace
setblock $x+3 $y-2 $z+7 torch 5 replace
setblock $x+3 $y-2 $z+11 torch 5 replace
# water pool with torches in front of it
setblock $x-6 $y-3 $z+7 water 0 replace
setblock $x-6 $y-3 $z+8 water 0 replace
setblock $x-6 $y-3 $z+9 water 0 replace
setblock $x-6 $y-3 $z+10 water 0 replace
setblock $x-5 $y-3 $z+7 water 0 replace
setblock $x-5 $y-3 $z+8 water 0 replace
setblock $x-5 $y-3 $z+9 water 0 replace
setblock $x-5 $y-3 $z+10 water 0 replace
setblock $x-4 $y-3 $z+7 water 0 replace
setblock $x-4 $y-3 $z+8 water 0 replace
setblock $x-4 $y-3 $z+9 water 0 replace
setblock $x-4 $y-3 $z+10 water 0 replace
setblock $x-3 $y-3 $z+7 water 0 replace
setblock $x-3 $y-3 $z+8 water 0 replace
setblock $x-3 $y-3 $z+9 water 0 replace
setblock $x-3 $y-3 $z+10 water 0 replace
setblock $x-2 $y-3 $z+7 water 0 replace
setblock $x-2 $y-3 $z+8 water 0 replace
setblock $x-2 $y-3 $z+9 water 0 replace
setblock $x-2 $y-3 $z+10 water 0 replace
setblock $x-5 $y-2 $z+6 torch 5 replace
setblock $x-3 $y-2 $z+6 torch 5 replace
@@ -1,61 +0,0 @@
package com.gtnewhorizons.angelica.api.dynamiclights;
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
import com.gtnewhorizons.angelica.dynamiclights.PositionalLightSource;
public final class DynamicLightsApi {
private DynamicLightsApi() {}
/** True when dynamic lights are on (the setting is on, and there's no shaderpack or shader force is on). */
public static boolean isEnabled() {
return DynamicLights.isEnabled();
}
/**
* True when lights made with this {@link PositionalLight#setLitUnderShaderpacks} setting give light right now. With
* true that's whenever dynamic lights are on, shaderpack or not.
*/
public static boolean isEnabled(boolean litUnderShaderpacks) {
return DynamicLights.isEnabled(litUnderShaderpacks);
}
/** A new light, off until it gets a luminance. */
public static PositionalLight createLight() {
return new PositionalLightSource();
}
/**
* Calls the visitor for every dynamic light within radius blocks of the point that gives light right now, entities
* included. Positional lights are passed as themselves, other lights as null. Under a shaderpack without shader
* force that's only the lights lit under shaderpacks.
*/
public static void forEachLightNear(double x, double y, double z, double radius, LightVisitor visitor) {
if (!DynamicLights.isActive()) return;
DynamicLights.get().forEachSourceNear(x, y, z, radius, source -> visitor.visit(
source instanceof PositionalLight light ? light : null,
source.angelica$getDynamicLightX(),
source.angelica$getDynamicLightY(),
source.angelica$getDynamicLightZ(),
source.angelica$getLuminance()));
}
/** How bright a held torch reach dynamic light of this luminance is at this distance, 0 past 7.75 blocks. */
public static double lightLevelAt(int luminance, double distance) {
return DynamicLights.falloff(luminance, distance);
}
/**
* How bright a dynamic light of this luminance and reach (see {@link PositionalLight#setReach}) is at this distance.
* Other lights from {@link #forEachLightNear} come with null and light like {@link PositionalLight#TORCH_REACH}.
*/
public static double lightLevelAt(int luminance, float reach, double distance) {
return DynamicLights.falloff(luminance, reach, distance);
}
@FunctionalInterface
public interface LightVisitor {
void visit(PositionalLight light, double x, double y, double z, int luminance);
}
}
@@ -1,54 +0,0 @@
package com.gtnewhorizons.angelica.api.dynamiclights;
/**
* A dynamic light at a position, for moving things that aren't entities. Make one with
* {@link DynamicLightsApi#createLight}. Lights terrain and entities like a held torch, so only while dynamic lights are
* on (see {@link #setLitUnderShaderpacks} for shaderpacks). Main thread only.
*/
public interface PositionalLight {
/** Moves the light. Cheap enough to call every frame, chunks only rebuild once it's moved a bit. */
void setPosition(double x, double y, double z);
/** Brightness 0-15. 0 switches it off. */
void setLuminance(int luminance);
double getX();
double getY();
double getZ();
int getLuminance();
/**
* Under a shaderpack dynamic lights only show with the player's shader force option, since packs do their own
* held item and entity light. A light that stands in for real blocks (a rendered structure's lamps) has nothing
* else to light the world round it, so set this and it lights things under a pack too, like it does without one.
* Dynamic lights turned off still means off. False by default.
*/
void setLitUnderShaderpacks(boolean lit);
boolean isLitUnderShaderpacks();
/** {@link #setReach} for Angelica's held torch falloff, the default. */
float TORCH_REACH = -1;
/**
* How far it lights at full brightness, 0-15, like block light: a luminance 15 light falls 15 / reach levels a
* block, so 15 lights exactly like a real block of that luminance and smaller reaches fade out sooner. Dimmer lights
* get as far as their luminance allows. {@link #TORCH_REACH} (the default) lights like a held torch instead,
* straight down to nothing at 7.75 blocks whatever the luminance. Fractions are fine, e.g. for a lamp in something
* drawn at an eighth of its size. Like a move under 0.1 blocks, a change under 0.1 doesn't rebuild the terrain it
* lights.
* <p>
* Further costs more: a moving light rebuilds every chunk section its light gets into, up to 27 at reach 15 against
* 8 or so for a torch, and never more than 8 at reach 7 or less.
*/
void setReach(float reach);
float getReach();
/** Switches it off for good and drops it from Angelica's lights. */
void remove();
}
@@ -1,4 +0,0 @@
@API(owner = "angelica", provides = "angelica|dynamiclights", apiVersion = "1")
package com.gtnewhorizons.angelica.api.dynamiclights;
import cpw.mods.fml.common.API;
@@ -1,72 +0,0 @@
package com.gtnewhorizons.angelica.api.particles;
import net.coderbot.iris.layer.GbufferPrograms;
import net.minecraft.client.particle.EntityFX;
import java.util.Arrays;
/** For mods that draw particles themselves or change their size. */
public final class ParticleRendering {
private ParticleRendering() {}
/** A size factor per particle, 1 for a normal one. */
@FunctionalInterface
public interface RenderScale {
float of(EntityFX fx);
}
private static final RenderScale[] NO_SCALES = new RenderScale[0];
// Swapped for a new array on every change, so the per particle read is one field and a length check
private static volatile RenderScale[] renderScales = NO_SCALES;
/**
* Scales the particles Angelica batches straight from their fields without calling {@code renderParticle}, which
* is the ones that don't override it plus the vanilla and BoP ones it knows. Particles that do go through
* {@code renderParticle} keep whatever size that gives, so scale those there. Every source added gets asked about
* every batched particle and the factors multiply, so return 1 for particles that aren't yours.
*/
public static synchronized void addRenderScale(RenderScale source) {
for (RenderScale existing : renderScales) {
if (existing == source) return;
}
final RenderScale[] next = Arrays.copyOf(renderScales, renderScales.length + 1);
next[next.length - 1] = source;
renderScales = next;
}
public static synchronized void removeRenderScale(RenderScale source) {
final RenderScale[] old = renderScales;
for (int i = 0; i < old.length; i++) {
if (old[i] != source) continue;
final RenderScale[] next = new RenderScale[old.length - 1];
System.arraycopy(old, 0, next, 0, i);
System.arraycopy(old, i + 1, next, i, old.length - i - 1);
renderScales = next.length == 0 ? NO_SCALES : next;
return;
}
}
/** The size factor for this particle from every {@link #addRenderScale} source, 1 without any. */
public static float renderScale(EntityFX fx) {
final RenderScale[] sources = renderScales;
if (sources.length == 0) return 1;
float scale = 1;
for (RenderScale source : sources) scale *= source.of(fx);
return scale;
}
/**
* Particles drawn outside the effect renderer (e.g. a mod's own list) get the pack's particle program between this
* and {@link #endParticleDraw}, like the world's particles. Pass the returned token to the end call. Nests. Without
* a pack nothing changes.
*/
public static int beginParticleDraw() {
return GbufferPrograms.beginParticles();
}
public static void endParticleDraw(int token) {
GbufferPrograms.endParticles(token);
}
}
@@ -1,4 +0,0 @@
@API(owner = "angelica", provides = "angelica|particles", apiVersion = "1")
package com.gtnewhorizons.angelica.api.particles;
import cpw.mods.fml.common.API;
@@ -1,20 +0,0 @@
package com.gtnewhorizons.angelica.api.shadows;
/**
* Draws extra geometry into the shaderpack shadow map, for things that should cast shadows but aren't terrain or
* entities. RenderWorldLastEvent geometry never gets there, and TESRs only do when the pack shadows block entities.
* Register with {@link ShadowCasters#register}.
*/
@FunctionalInterface
public interface ShadowCaster {
/**
* Called once per shadow pass for each stage, with the shadow modelview loaded and the block entity shadow program
* bound. Positions are relative to the camera position passed in, so translate by worldX - cameraX etc. Put back
* any GL state you change.
*
* @param stage {@link ShadowStage#SOLID} with the other solid shadows, {@link ShadowStage#TRANSLUCENT} after
* translucent terrain for things the pack should tint light through instead of blocking it
*/
void renderShadow(ShadowStage stage, double cameraX, double cameraY, double cameraZ, float partialTicks);
}
@@ -1,44 +0,0 @@
package com.gtnewhorizons.angelica.api.shadows;
import com.gtnewhorizons.angelica.AngelicaMod;
import net.coderbot.iris.pipeline.ShadowRenderer;
import java.util.concurrent.CopyOnWriteArrayList;
/** Where {@link ShadowCaster}s are registered. Main thread only. */
public final class ShadowCasters {
private static final CopyOnWriteArrayList<ShadowCaster> CASTERS = new CopyOnWriteArrayList<>();
private ShadowCasters() {}
public static void register(ShadowCaster caster) {
CASTERS.addIfAbsent(caster);
}
public static void unregister(ShadowCaster caster) {
CASTERS.remove(caster);
}
/** True while the shaderpack shadow pass is drawing, e.g. to skip work in a TESR that also feeds a caster. */
public static boolean isRenderingShadows() {
return ShadowRenderer.ACTIVE;
}
public static boolean hasCasters() {
return !CASTERS.isEmpty();
}
/** Internal, called by the shadow renderer with its state set up. A caster that throws is dropped. */
public static void renderAll(ShadowStage stage, double cameraX, double cameraY, double cameraZ,
float partialTicks) {
for (ShadowCaster caster : CASTERS) {
try {
caster.renderShadow(stage, cameraX, cameraY, cameraZ, partialTicks);
} catch (Throwable t) {
AngelicaMod.LOGGER.error("Shadow caster {} threw, removing it", caster, t);
CASTERS.remove(caster);
}
}
}
}
@@ -1,8 +0,0 @@
package com.gtnewhorizons.angelica.api.shadows;
public enum ShadowStage {
/** After the shadow pass's entities and tile entities, before translucent depth is split off. */
SOLID,
/** After translucent terrain. Only runs when the pack draws translucent shadows. */
TRANSLUCENT
}
@@ -1,4 +0,0 @@
@API(owner = "angelica", provides = "angelica|shadows", apiVersion = "1")
package com.gtnewhorizons.angelica.api.shadows;
import cpw.mods.fml.common.API;
@@ -1,108 +0,0 @@
package com.gtnewhorizons.angelica.api.terrain;
import com.gtnewhorizons.angelica.rendering.celeritas.VertexArrayQuadView;
import com.gtnewhorizons.angelica.rendering.celeritas.light.LightDataCache;
import com.gtnewhorizons.angelica.rendering.celeritas.light.VanillaDiffuseProvider;
import net.minecraft.client.Minecraft;
import net.minecraft.world.IBlockAccess;
import org.embeddedt.embeddium.impl.model.light.LightPipeline;
import org.embeddedt.embeddium.impl.model.light.data.LightDataAccess;
import org.embeddedt.embeddium.impl.model.light.data.QuadLightData;
import org.embeddedt.embeddium.impl.model.light.flat.FlatLightPipeline;
import org.embeddedt.embeddium.impl.model.light.smooth.SmoothLightPipeline;
import org.embeddedt.embeddium.impl.model.quad.properties.ModelQuadFacing;
import org.embeddedt.embeddium.impl.model.quad.properties.ModelQuadFlags;
import org.embeddedt.embeddium.impl.render.chunk.vertex.format.ChunkVertexEncoder;
import org.embeddedt.embeddium.impl.util.QuadUtil;
/**
* Per-vertex AO and lightmap for block quads, worked out like the chunk mesher lights terrain (same light pipeline and
* light data) but over any block access. For mods baking block geometry outside the chunk renderer.
* <p>
* Not thread safe, use one per thread. Light data is cached per 16 block region, so quads from the same region in a
* row are cheapest. The cache doesn't notice world changes, call {@link #reset} before each bake.
*/
public final class TerrainLighter {
private final LightDataCache cache = new LightDataCache();
private final SmoothLightPipeline smooth;
private final FlatLightPipeline flat;
private final ChunkVertexEncoder.Vertex[] vertices = ChunkVertexEncoder.Vertex.uninitializedQuad();
private final VertexArrayQuadView quad = new VertexArrayQuadView(vertices);
private final QuadLightData out = new QuadLightData();
private int regionX = Integer.MIN_VALUE, regionY, regionZ;
// The last fluid quad, to spot the back face vanilla draws straight after it
private ModelQuadFacing fluidLightFace;
private final float[] fluidXyz = new float[12];
private static final int[] REVERSED = { 0, 3, 2, 1 };
public TerrainLighter(IBlockAccess world) {
cache.setWorld(world);
smooth = new SmoothLightPipeline(cache, VanillaDiffuseProvider.INSTANCE, true);
flat = new FlatLightPipeline(cache, VanillaDiffuseProvider.INSTANCE, true);
}
/** Drops the cached light data so the next quad reads the world again. Call it before each bake. */
public void reset() {
regionX = Integer.MIN_VALUE;
fluidLightFace = null;
}
/**
* Lights one quad of the block at x, y, z.
*
* @param xyz the four corners as x y z, in the block access's coordinates and the quad's vertex order
* @param shade also multiply in the face's directional shading, like terrain unless the pack turns it off.
* False gives AO alone
* @param fluid the block is a fluid (see {@code TerrainRendering.isFluid}). Lit like the mesher lights fluids,
* where the back face vanilla draws right after each face gets its light from the same side as
* the front. Pass a block's quads in the order they were made. Only use the light for fluids,
* the mesher gives them no AO
* @param brightness out, per vertex AO (times shading if asked), 0 to 1
* @param light out, per vertex lightmap, {@code sky << 16 | block}, each 0-240
*/
public void light(float[] xyz, int x, int y, int z, boolean shade, boolean fluid, float[] brightness,
int[] light) {
final int rx = x & ~15, ry = y & ~15, rz = z & ~15;
if (rx != regionX || ry != regionY || rz != regionZ) {
regionX = rx;
regionY = ry;
regionZ = rz;
cache.reset(rx, ry, rz);
}
smooth.reset();
flat.reset();
for (int i = 0; i < 4; i++) {
vertices[i].x = xyz[i * 3];
vertices[i].y = xyz[i * 3 + 1];
vertices[i].z = xyz[i * 3 + 2];
}
final boolean flippedCopy = fluid && fluidLightFace != null && isReversedFluidQuad(xyz);
quad.setup(QuadUtil.calculateNormal(vertices), x, y, z, fluid ? ModelQuadFlags.IS_VANILLA_SHADED : 0,
flippedCopy ? fluidLightFace : null);
// Same rule as the mesher, smooth lighting on and the block doesn't give off light
final boolean smoothLighting = Minecraft.getMinecraft().gameSettings.ambientOcclusion != 0
&& LightDataAccess.unpackLU(cache.get(x, y, z)) == 0;
final LightPipeline pipeline = smoothLighting ? smooth : flat;
pipeline.calculate(quad, x, y, z, out, quad.getCullFace(), quad.getLightFace(), shade, true);
System.arraycopy(out.br, 0, brightness, 0, 4);
System.arraycopy(out.lm, 0, light, 0, 4);
if (fluid && !flippedCopy) {
fluidLightFace = quad.getLightFace();
System.arraycopy(xyz, 0, fluidXyz, 0, 12);
} else if (!fluid) {
fluidLightFace = null;
}
}
private boolean isReversedFluidQuad(float[] xyz) {
for (int i = 0; i < 4; i++) {
final int src = REVERSED[i] * 3;
if (xyz[i * 3] != fluidXyz[src] || xyz[i * 3 + 1] != fluidXyz[src + 1]
|| xyz[i * 3 + 2] != fluidXyz[src + 2]) {
return false;
}
}
return true;
}
}
@@ -1,340 +0,0 @@
package com.gtnewhorizons.angelica.api.terrain;
import com.gtnewhorizons.angelica.AngelicaMod;
import com.gtnewhorizons.angelica.api.glstate.GLState;
import com.gtnewhorizons.angelica.api.shaders.ShaderPacks;
import com.gtnewhorizons.angelica.glsm.backend.BackendManager;
import com.gtnewhorizons.angelica.glsm.ffp.FfpExtendedAttribs;
import com.gtnewhorizons.angelica.glsm.hooks.GLSMHooks;
import com.gtnewhorizons.angelica.proxy.ClientProxy;
import com.gtnewhorizons.angelica.rendering.BlockMaterialAttribute;
import com.gtnewhorizons.angelica.rendering.StateAwareTessellator;
import com.gtnewhorizons.angelica.rendering.celeritas.BlockRenderLayer;
import com.gtnewhorizons.angelica.utils.AnimationsRenderUtils;
import com.prupe.mcpatcher.mal.block.RenderBlocksUtils;
import net.coderbot.iris.Iris;
import net.coderbot.iris.block_rendering.BlockMaterialMapping;
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
import net.coderbot.iris.gl.shader.ProgramCreator;
import net.coderbot.iris.layer.GbufferPrograms;
import net.coderbot.iris.pipeline.DeferredWorldRenderingPipeline;
import net.coderbot.iris.pipeline.WorldRenderingPhase;
import net.coderbot.iris.shadows.ShadowRenderingState;
import net.coderbot.iris.uniforms.LocalGridFrame;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDoublePlant;
import net.minecraft.block.BlockDynamicLiquid;
import net.minecraft.block.BlockStaticLiquid;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.world.IBlockAccess;
import org.joml.Matrix4f;
import java.util.Map;
/**
* For mods that bake block geometry outside the chunk renderer (moving structures, in-world previews) and want it to
* look like terrain, shaderpacks included.
* <p>
* Under a shaderpack terrain gets the pack's terrain programs, its block.properties materials (mc_Entity) and the
* pack's own AO and directional shading. Draw between {@link #beginTerrainDraw} and {@link #endTerrainDraw} to get the
* terrain programs, and use the getters here to bake the way the pack wants. Without a shaderpack nothing changes.
*/
public final class TerrainRendering {
private static int terrainDrawDepth;
private static boolean terrainDrawPushed;
private static int localGridId;
private TerrainRendering() {}
/**
* Draws until {@link #endTerrainDraw} use the pack's terrain program instead of the one for the current phase
* (entities, block entities). Main thread, end it in a finally block. Nests, the outermost call picks the program.
*
* @param translucent true for render pass 1 geometry (glass, water), false for solid and cutout
*/
public static void beginTerrainDraw(boolean translucent) {
if (terrainDrawDepth++ > 0) return;
terrainDrawPushed = ShaderPacks.isInUse();
if (terrainDrawPushed) {
GbufferPrograms.pushOverridePhase(translucent ? WorldRenderingPhase.TERRAIN_TRANSLUCENT : WorldRenderingPhase.TERRAIN_CUTOUT);
}
}
public static void endTerrainDraw() {
if (terrainDrawDepth == 0) return;
// While the terrain program is still bound, so it gets the real uniforms back
if (terrainDrawDepth == 1) endLocalGrid();
if (--terrainDrawDepth > 0) return;
if (terrainDrawPushed) GbufferPrograms.popOverridePhase();
terrainDrawPushed = false;
}
/** Internal, start of each frame. Ends a terrain draw that never got ended (e.g. the caller threw). */
public static void resetForFrame() {
if (terrainDrawDepth == 0) return;
AngelicaMod.LOGGER.warn("A terrain draw was never ended, ending it");
LocalGridFrame.end();
if (terrainDrawPushed) GbufferPrograms.popOverridePhase();
terrainDrawPushed = false;
terrainDrawDepth = 0;
}
/**
* Call inside {@link #beginTerrainDraw}, in a try-with-resources. Until the grid is closed or the terrain draw
* ends, the pack sees the current modelview's model space as the world. For geometry drawn rotated or off the block
* grid: packs pick out parts of some blocks by where a pixel is inside its world block (cauldron water, end portal
* frame eyes), and off the grid that lands in the wrong spot.
* <p>
* Only the uniforms a pack works out world space from change (camera, matrices, upPosition, eyePosition and the
* like), plus the pack's own custom uniforms made from them. View space and shadows come out the same. Model space
* up counts as up. Draws in between must use the modelview it was started with.
* <p>
* Does nothing without a pack, in the shadow pass, on the SDL GPU backend, if a grid is already on or if the
* modelview can't be inverted. Packs that go by at_midBlock instead get it right from the vertex data alone, see
* {@link #getMidBlockAttributeLocation}.
*
* @return the grid, {@link LocalGrid#isActive} says whether it's on
*/
public static LocalGrid beginLocalGrid() {
if (!terrainDrawPushed || LocalGridFrame.isActive() || BackendManager.RENDER_BACKEND.isSDLGPU()
|| ShadowRenderingState.areShadowsCurrentlyBeingRendered()) {
return LocalGrid.OFF;
}
final Matrix4f modelView = GLState.getModelViewMatrix(new Matrix4f());
if (!LocalGridFrame.begin(modelView)) return LocalGrid.OFF;
refreshBoundUniforms();
return new LocalGrid(++localGridId, modelView);
}
private static void endLocalGrid() {
if (!LocalGridFrame.isActive()) return;
LocalGridFrame.end();
refreshBoundUniforms();
}
// The camera and matrix uniforms are only worked out once a frame, so work them out again and push them to the
// terrain program (binding it first if it's still pending)
private static void refreshBoundUniforms() {
GLSMHooks.resolvePendingProgram();
if (Iris.getPipelineManager().getPipelineNullable() instanceof DeferredWorldRenderingPipeline drp) {
drp.refreshUniforms(LocalGridFrame.UNIFORMS);
}
}
/**
* True when the pack wants AO in the vertex color's alpha instead of multiplied into the color, so it can apply it
* itself. Put the AO from {@link TerrainLighter} in alpha when this is set.
*/
public static boolean usesSeparateAo() {
return ShaderPacks.isInUse() && BlockRenderingSettings.INSTANCE.shouldUseSeparateAo();
}
/**
* True when the chunk mesher runs its own light pipeline over terrain, the same one {@link TerrainLighter} runs. It
* only relights the faces {@link #isSmoothLit} marks (and fluids under a pack), everything else keeps the light it
* was baked with. AO goes in the color's alpha when {@link #usesSeparateAo}, multiplied into the color otherwise.
*/
public static boolean usesTerrainLighting() {
return ShaderPacks.isInUse() || BlockRenderingSettings.INSTANCE.shouldUseSeparateAo()
|| ClientProxy.options().quality.useCeleritasSmoothLighting;
}
/** True when the pack does its own directional shading, so terrain is baked without vanilla's per-face shading. */
public static boolean disablesDirectionalShading() {
return ShaderPacks.isInUse() && BlockRenderingSettings.INSTANCE.shouldDisableDirectionalShading();
}
/**
* The Forge render pass the pack moves this block to (e.g. {@code layer.translucent} in block.properties), or -1 if
* it doesn't move it or there's no pack. The chunk mesher only draws a moved block in that pass, so do the same.
*/
public static int getRenderPassOverride(Block block) {
if (!ShaderPacks.isInUse()) return -1;
final Map<Block, BlockRenderLayer> overrides = BlockRenderingSettings.INSTANCE.getBlockTypeIds();
if (overrides == null) return -1;
final BlockRenderLayer layer = overrides.get(block);
return layer == null ? -1 : layer.toVanillaPass();
}
/** The pack's block.properties id for this block, -1 if it's unmapped or there's no pack. */
public static int getBlockMaterialId(Block block, int metadata) {
return ShaderPacks.isInUse() ? BlockMaterialAttribute.blockMaterialId(block, metadata) : -1;
}
/**
* The id the chunk mesher gives this block where it stands, which isn't always the plain lookup. A fluid with no
* entry uses its still or flowing twin's, grass under snow gets the pack's snowy entry and the top half of a double
* plant is looked up as the plant its bottom half says. -1 if it's unmapped or there's no pack.
*/
public static int getBlockMaterialId(IBlockAccess world, Block block, int metadata, int x, int y, int z) {
if (!ShaderPacks.isInUse()) return -1;
if (isFluid(block)) {
int id = BlockMaterialAttribute.blockMaterialId(block, metadata);
if (id == -1) {
Block twin = null;
if (block instanceof BlockStaticLiquid) twin = Block.getBlockById(Block.getIdFromBlock(block) - 1);
else if (block instanceof BlockDynamicLiquid) twin = Block.getBlockById(Block.getIdFromBlock(block) + 1);
if (twin != null) id = BlockMaterialAttribute.blockMaterialId(twin, metadata);
}
return id;
}
int effectiveMeta = metadata;
if (BlockRenderingSettings.INSTANCE.hasSnowyEntries()
&& BlockRenderingSettings.INSTANCE.getSnowyBlocks().contains(block)
&& RenderBlocksUtils.isSnowCovered(world, x, y, z)) {
effectiveMeta |= BlockMaterialMapping.SNOWY_META_BIT;
} else if (block instanceof BlockDoublePlant doublePlant && BlockDoublePlant.func_149887_c(metadata)) {
effectiveMeta = 0x8 | (doublePlant.func_149885_e(world, x, y, z) & 7);
}
return BlockMaterialAttribute.blockMaterialId(block, effectiveMeta);
}
/**
* What the chunk mesher counts as a fluid, water or lava material. Under a pack it lights fluid quads with its
* light pipeline but leaves out the AO, pass that on to {@link TerrainLighter#light}.
*/
public static boolean isFluid(Block block) {
final Material material = block.getMaterial();
return material == Material.water || material == Material.lava;
}
/**
* While on, RenderBlocks draws into this tessellator like it does for the chunk mesher. Pass the one it draws into
* ({@code Tessellator.instance} on the main thread). Standard blocks that would take vanilla's smooth lighting path
* are drawn flat instead, with no AO or face shading, and their vertices get marked (see {@link #isSmoothLit}).
* Light those with {@link TerrainLighter} and leave the rest alone, that's all the mesher does. Only kicks in when
* the mesher would do it too: smooth lighting with Celeritas smooth lighting on, or a pack using separate AO. Turn
* it off again in a finally block.
*/
public static void setMeshing(Tessellator tessellator, boolean meshing) {
((StateAwareTessellator) tessellator).angelica$setCeleritasMeshing(meshing);
}
/**
* True while the vertices being added are from a face the chunk mesher would relight (see {@link #setMeshing}),
* vanilla's smooth lighting path or a renderer that asked for the same. Check it per vertex as they're added.
*/
public static boolean isSmoothLit(Tessellator tessellator) {
return ((StateAwareTessellator) tessellator).angelica$isAppliedAo();
}
/** True while the vertices being added are from a renderer that wants no directional shading on them. */
public static boolean hasNoDirectionalShading(Tessellator tessellator) {
return ((StateAwareTessellator) tessellator).angelica$isNoDirectionalShading();
}
/**
* Vertex attribute location the pack's programs read mc_Entity from. Bake two shorts per vertex here, the material
* id and 0 (1 for fluids, like the mesher). Only bind it while a shaderpack is in use.
*/
public static int getMaterialAttributeLocation() {
return ProgramCreator.MC_ENTITY;
}
/**
* Vertex attribute location the pack's programs read mc_midTexCoord from, the middle of the vertex's sprite. Packs
* use it for sprite bounds (e.g. POM). Two floats per vertex. Only bind it while a shaderpack is in use, and
* between {@link #beginOwnExtendedAttributes} and {@link #endOwnExtendedAttributes}.
*/
public static int getMidTexCoordAttributeLocation() {
return ProgramCreator.MC_MID_TEX_COORD;
}
/**
* Vertex attribute location the pack's programs read at_tangent from. Four floats per vertex, xyz plus w for the
* handedness. Same rules as {@link #getMidTexCoordAttributeLocation}.
*/
public static int getTangentAttributeLocation() {
return ProgramCreator.AT_TANGENT;
}
/**
* Vertex attribute location the pack's programs read at_midBlock from. Four bytes per vertex, not normalized: the
* offset from the vertex to the middle of its block times 64, then the block's light emission (0-15). Bake the
* offset in model space and packs that use it get blocks right even off the grid, no {@link #beginLocalGrid}
* needed. Only bind it while a shaderpack is in use.
*/
public static int getMidBlockAttributeLocation() {
return ProgramCreator.AT_MIDBLOCK;
}
/**
* Angelica fills in mc_midTexCoord and at_tangent itself for client array draws out of a VBO, guessing from the
* buffer layout, and binds that over whatever the draw set. Draws until {@link #endOwnExtendedAttributes} bring
* their own and are left alone. Nests, main thread.
*/
public static void beginOwnExtendedAttributes() {
FfpExtendedAttribs.beginInternalDraw();
}
public static void endOwnExtendedAttributes() {
FfpExtendedAttribs.endInternalDraw();
}
/**
* Angelica only animates sprites it saw drawn this frame, and geometry baked once and drawn from a buffer never
* goes through the tessellator again. This records the sprites used on this thread until it's closed.
* Call {@link SpriteCapture#markUsed} each frame the baked geometry is drawn. Close it on the same thread, in a
* finally block.
*/
public static SpriteCapture captureSprites() {
return new SpriteCapture(AnimationsRenderUtils.captureSprites());
}
/** See {@link #beginLocalGrid}. */
public static final class LocalGrid implements AutoCloseable {
private static final LocalGrid OFF = new LocalGrid(0, null);
private static boolean warnedModelView;
private final int id;
private final Matrix4f modelView;
private LocalGrid(int id, Matrix4f modelView) {
this.id = id;
this.modelView = modelView;
}
public boolean isActive() {
return id != 0 && id == localGridId && LocalGridFrame.isActive();
}
/** Ends it. Does nothing if it never started or the terrain draw already ended it. */
@Override
public void close() {
if (!isActive()) return;
// The one rule callers can break without noticing. Only catches a modelview left changed, not one changed
// and put back, but that's cheap enough to always check
if (!warnedModelView && !GLState.getModelViewMatrix(new Matrix4f()).equals(modelView, 1e-4f)) {
warnedModelView = true;
AngelicaMod.LOGGER.warn("Modelview changed during a local grid, draws in it have to use the one it "
+ "started with", new Throwable());
}
endLocalGrid();
}
}
/** See {@link #captureSprites}. */
public static final class SpriteCapture implements AutoCloseable {
private final AnimationsRenderUtils.SpriteCapture capture;
private SpriteCapture(AnimationsRenderUtils.SpriteCapture capture) {
this.capture = capture;
}
/** Marks the recorded sprites as drawn this frame so they keep animating. */
public void markUsed() {
capture.markUsed();
}
/** Stops recording. The sprites recorded so far stay. */
@Override
public void close() {
capture.close();
}
}
}
@@ -1,4 +0,0 @@
@API(owner = "angelica", provides = "angelica|terrain", apiVersion = "1")
package com.gtnewhorizons.angelica.api.terrain;
import cpw.mods.fml.common.API;
@@ -1,59 +0,0 @@
package com.gtnewhorizons.angelica.api.world;
import com.gtnewhorizons.angelica.AngelicaMod;
import net.minecraftforge.client.MinecraftForgeClient;
import java.util.concurrent.CopyOnWriteArrayList;
/**
* A spot in the world pass for mods that draw their own world geometry (moving structures, previews, effects).
* <p>
* Forge's {@code RenderWorldLastEvent} fires after Angelica has run the pack's composite and final passes, so anything
* drawn there misses the pack's lighting, fog and shadows. Drawers registered here run right after block entities,
* once per Forge render pass, with the pack's block entity program active like for a TESR. Without a pack they still
* run there.
* <p>
* The modelview is the camera's like for TESRs, so draw relative to the camera
* ({@code TileEntityRendererDispatcher.staticPlayerX/Y/Z}). Put back any GL state you change. Main thread only.
*/
public final class WorldDrawStage {
/** Draws world geometry for one Forge render pass. */
@FunctionalInterface
public interface Drawer {
/**
* @param pass Forge render pass, 0 for solid and cutout, 1 for translucent. Same as
* {@code MinecraftForgeClient.getRenderPass()}
* @param partialTicks the frame's partial ticks
*/
void draw(int pass, float partialTicks);
}
private static final CopyOnWriteArrayList<Drawer> drawers = new CopyOnWriteArrayList<>();
private WorldDrawStage() {}
public static void register(Drawer drawer) {
drawers.addIfAbsent(drawer);
}
public static void unregister(Drawer drawer) {
drawers.remove(drawer);
}
/** Internal, called by Angelica's renderer after block entities. */
public static void run(float partialTicks) {
if (drawers.isEmpty()) return;
final int pass = MinecraftForgeClient.getRenderPass();
for (Drawer drawer : drawers) {
try {
drawer.draw(pass, partialTicks);
} catch (Throwable t) {
// One broken drawer shouldn't take the frame down or spam the log every frame
drawers.remove(drawer);
AngelicaMod.LOGGER.error("World drawer {} threw, removed it", drawer, t);
}
}
}
}
@@ -1,4 +0,0 @@
@API(owner = "angelica", provides = "angelica|world", apiVersion = "1")
package com.gtnewhorizons.angelica.api.world;
import cpw.mods.fml.common.API;
@@ -0,0 +1,45 @@
package com.gtnewhorizons.angelica.common;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import java.util.function.Supplier;
public class BlockTesrTranslucentTest extends Block {
private final Supplier<TileEntity> tile;
public BlockTesrTranslucentTest(Supplier<TileEntity> tile) {
super(Material.glass);
this.tile = tile;
setHardness(0.3f);
setLightOpacity(0);
}
@Override
public boolean isOpaqueCube() {
return false;
}
@Override
public boolean renderAsNormalBlock() {
return false;
}
@Override
public int getRenderType() {
return -1;
}
@Override
public boolean hasTileEntity(int metadata) {
return true;
}
@Override
public TileEntity createTileEntity(World world, int metadata) {
return tile.get();
}
}
@@ -0,0 +1,30 @@
package com.gtnewhorizons.angelica.common;
import net.minecraft.tileentity.TileEntity;
public abstract class TileTesrTranslucentTest extends TileEntity {
private static final int SOLID_PASS = 8;
public int variant() {
return getBlockMetadata() & ~SOLID_PASS;
}
@Override
public boolean shouldRenderInPass(int pass) {
return pass == ((getBlockMetadata() & SOLID_PASS) != 0 ? 0 : 1);
}
@Override
public boolean canUpdate() {
return false;
}
public static class Provider extends TileTesrTranslucentTest {}
public static class Model extends TileTesrTranslucentTest {}
public static class Decal extends TileTesrTranslucentTest {}
public static class Glow extends TileTesrTranslucentTest {}
}
@@ -22,7 +22,7 @@ public final class AngelicaEntries {
}
public static void dynamicLights(DebugScreenDisplayer displayer, DebugContext context) {
if (!DynamicLights.configEnabled || !DynamicLights.isActive()) return;
if (!DynamicLights.configEnabled || !DynamicLights.isEnabled()) return;
final DynamicLights lights = DynamicLights.get();
final DebugFact fact = displayer.fact(DebugGroup.ANGELICA, "Dynamic Lights");
fact.value(lights.getLightSourcesCount()).text(" sources, ").value(lights.getLastUpdateCount()).text(" updated");
@@ -40,7 +40,6 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Consumer;
import java.util.function.Predicate;
public class DynamicLights {
@@ -54,50 +53,18 @@ public class DynamicLights {
public static final boolean configEnabled = AngelicaConfig.enableDynamicLights;
private static final double MAX_RADIUS = 7.75;
private static final double MAX_RADIUS_SQUARED = MAX_RADIUS * MAX_RADIUS;
private final Set<IDynamicLightSource> dynamicLightSources = new ObjectOpenHashSet<>();
private static final IDynamicLightSource[] NO_SOURCES = new IDynamicLightSource[0];
private IDynamicLightSource[] lightSourceArray = NO_SOURCES;
// The sources that light things under a shaderpack without shader force, see isActive
private IDynamicLightSource[] shaderpackSourceArray = NO_SOURCES;
private IDynamicLightSource[] lightSourceArray = new IDynamicLightSource[0];
private final ReentrantReadWriteLock lightSourcesLock = new ReentrantReadWriteLock();
private volatile int lightSourceCount = 0;
private volatile int shaderpackSourceCount = 0;
private final ChunkRebuildManager chunkRebuildManager = new ChunkRebuildManager();
private long lastUpdate = System.currentTimeMillis();
private int lastUpdateCount = 0;
// Which sources gave light at the last update: 0 none, 1 the ones lit under shaderpacks, 2 all of them
private int litState = -1;
/** Must be called under write lock. */
private void rebuildLightSourceArray() {
this.lightSourceArray = this.dynamicLightSources.toArray(NO_SOURCES);
int count = 0;
for (IDynamicLightSource source : this.lightSourceArray) {
if (source.angelica$isLitUnderShaderpacks()) count++;
}
final IDynamicLightSource[] shaderpackSources = new IDynamicLightSource[count];
int i = 0;
for (IDynamicLightSource source : this.lightSourceArray) {
if (source.angelica$isLitUnderShaderpacks()) shaderpackSources[i++] = source;
}
this.shaderpackSourceArray = shaderpackSources;
this.shaderpackSourceCount = count;
}
/** The sources that give light right now. Call under the read lock. */
private IDynamicLightSource[] activeSources() {
if (isEnabled()) return this.lightSourceArray;
return configEnabled && Mode.isEnabled() ? this.shaderpackSourceArray : NO_SOURCES;
}
/** A tracked source changed whether it's lit under shaderpacks. */
public void onShaderpackLitChanged(IDynamicLightSource lightSource) {
this.lightSourcesLock.writeLock().lock();
try {
if (this.dynamicLightSources.contains(lightSource)) rebuildLightSourceArray();
} finally {
this.lightSourcesLock.writeLock().unlock();
}
this.lightSourceArray = this.dynamicLightSources.toArray(new IDynamicLightSource[0]);
}
public static DynamicLights get() {
@@ -114,22 +81,6 @@ public class DynamicLights {
(ShaderForce || !IrisApi.getInstance().isShaderPackInUse());
}
/**
* True when a light that's lit under shaderpacks (or not, see {@link IDynamicLightSource#angelica$isLitUnderShaderpacks})
* gives light right now. Those only skip the shaderpack check, dynamic lights turned off still means off.
*/
public static boolean isEnabled(boolean litUnderShaderpacks) {
return isEnabled() || litUnderShaderpacks && configEnabled && Mode.isEnabled();
}
/**
* True when any light gives light right now: all of them ({@link #isEnabled()}), or only the ones lit under
* shaderpacks when a pack turned the rest off. What the light pipeline checks before it does any dynamic light work.
*/
public static boolean isActive() {
return isEnabled() || configEnabled && Mode.isEnabled() && get().shaderpackSourceCount > 0;
}
public boolean hasLightSources() {
return lightSourceCount > 0;
}
@@ -148,13 +99,7 @@ public class DynamicLights {
* @param renderer the renderer
*/
public void updateAll(@NotNull IDynamicLightWorldRenderer renderer) {
final int state = isEnabled() ? 2 : configEnabled && Mode.isEnabled() ? 1 : 0;
if (state != this.litState) {
if (this.litState != -1) relightAll(renderer);
this.litState = state;
}
if (!isActive())
if (!isEnabled())
return;
final long now = System.currentTimeMillis();
@@ -184,7 +129,7 @@ public class DynamicLights {
}
this.lightSourcesLock.readLock().lock();
for (var lightSource : activeSources()) {
for (var lightSource : this.lightSourceArray) {
// Entity type filter
if (!EntityLightConfig.isEntityTypeEnabled(lightSource)) {
continue;
@@ -206,23 +151,6 @@ public class DynamicLights {
}
}
/**
* The player switched dynamic lights, shader force or the shaderpack, so which sources give light changed. The
* sections they lit rebuild, and every source starts over on its next update. Without this a light that went dark
* stays in the terrain until something else rebuilds it, and one that sits still never comes back.
*/
private void relightAll(@NotNull IDynamicLightWorldRenderer renderer) {
this.lightSourcesLock.readLock().lock();
try {
for (IDynamicLightSource source : this.lightSourceArray) {
source.angelica$scheduleTrackedChunksRebuild(renderer);
source.angelica$resetDynamicLight();
}
} finally {
this.lightSourcesLock.readLock().unlock();
}
}
public int getLastUpdateCount() {
return this.lastUpdateCount;
}
@@ -317,7 +245,7 @@ public class DynamicLights {
}
}
this.lightSourceCount = 0;
rebuildLightSourceArray();
this.lightSourceArray = new IDynamicLightSource[0];
this.lightSourcesLock.writeLock().unlock();
}
@@ -354,7 +282,7 @@ public class DynamicLights {
public double getDynamicLightLevel(int x, int y, int z) {
double result = 0;
this.lightSourcesLock.readLock().lock();
for (var lightSource : activeSources()) {
for (var lightSource : this.lightSourceArray) {
result = maxDynamicLightLevel(x, y, z, lightSource, result);
}
this.lightSourcesLock.readLock().unlock();
@@ -368,7 +296,7 @@ public class DynamicLights {
public double getDynamicLightLevel(double x, double y, double z) {
double result = 0;
this.lightSourcesLock.readLock().lock();
for (var lightSource : activeSources()) {
for (var lightSource : this.lightSourceArray) {
result = maxDynamicLightLevelExact(x, y, z, lightSource, result);
}
this.lightSourcesLock.readLock().unlock();
@@ -389,11 +317,14 @@ public class DynamicLights {
final double dz = z - lightSource.angelica$getDynamicLightZ() + 0.5;
final double distanceSquared = dx * dx + dy * dy + dz * dz;
// Held torch reach is 7.75 because else we would have to update more chunks and that's not a good idea.
// Lights that ask for more get it (see angelica$getReach), and rebuild more chunks for it.
final double lightLevel = levelAt(lightSource, luminance, distanceSquared);
if (lightLevel > currentLightLevel) {
return lightLevel;
// 7.75 because else we would have to update more chunks and that's not a good idea.
// 15 (max range for blocks) would be too much and a bit cheaty.
if (distanceSquared <= MAX_RADIUS_SQUARED) {
final double multiplier = 1.0 - Math.sqrt(distanceSquared) / MAX_RADIUS;
final double lightLevel = multiplier * (double) luminance;
if (lightLevel > currentLightLevel) {
return lightLevel;
}
}
}
return currentLightLevel;
@@ -411,9 +342,12 @@ public class DynamicLights {
final double dz = z - lightSource.angelica$getDynamicLightZ();
final double distanceSquared = dx * dx + dy * dy + dz * dz;
final double lightLevel = levelAt(lightSource, luminance, distanceSquared);
if (lightLevel > currentLightLevel) {
return lightLevel;
if (distanceSquared <= MAX_RADIUS_SQUARED) {
final double multiplier = 1.0 - Math.sqrt(distanceSquared) / MAX_RADIUS;
final double lightLevel = multiplier * (double) luminance;
if (lightLevel > currentLightLevel) {
return lightLevel;
}
}
}
return currentLightLevel;
@@ -436,7 +370,7 @@ public class DynamicLights {
}
public static int addDynamicLight(IBlockAccess world, int x, int y, int z, int lightmap) {
if (!isActive()) return lightmap;
if (!isEnabled()) return lightmap;
final DynamicLights dl = get();
if (!dl.hasLightSources()) return lightmap;
final double dynamicLightLevel = dl.getDynamicLightLevel(x, y, z);
@@ -444,81 +378,27 @@ public class DynamicLights {
return lightmap;
}
/**
* Calls the consumer for every lit light source within radius of the point. Runs on a snapshot of the sources, so
* the consumer may add or remove lights.
*/
public void forEachSourceNear(double x, double y, double z, double radius, Consumer<IDynamicLightSource> consumer) {
final IDynamicLightSource[] sources;
this.lightSourcesLock.readLock().lock();
try {
sources = activeSources();
} finally {
this.lightSourcesLock.readLock().unlock();
}
final double radiusSq = radius * radius;
for (IDynamicLightSource source : sources) {
if (source.angelica$getLuminance() <= 0) continue;
final double dx = source.angelica$getDynamicLightX() - x;
final double dy = source.angelica$getDynamicLightY() - y;
final double dz = source.angelica$getDynamicLightZ() - z;
if (dx * dx + dy * dy + dz * dz <= radiusSq) consumer.accept(source);
}
}
/** Light level of a source of this luminance at this distance, with the held torch reach. */
public static double falloff(int luminance, double distance) {
return falloff(luminance, -1, distance);
}
/**
* Light level of a source of this luminance and reach (see {@link IDynamicLightSource#angelica$getReach}) at this
* distance.
*/
public static double falloff(int luminance, float reach, double distance) {
if (luminance <= 0 || reach == 0) return 0;
// Held torch: straight down to 0 at 7.75 blocks, whatever the luminance
if (reach < 0) return distance > MAX_RADIUS ? 0 : (1.0 - distance / MAX_RADIUS) * luminance;
// Like block light: down 15 / reach levels a block, so 15 is vanilla
return Math.max(0, luminance - distance * 15.0 / reach);
}
/** How far the source's light gets at its current luminance, 0 when it's dark. */
public static double reachOf(@NotNull IDynamicLightSource source) {
final int luminance = source.angelica$getLuminance();
if (luminance <= 0) return 0;
final float reach = source.angelica$getReach();
return reach < 0 ? MAX_RADIUS : reach * luminance / 15.0;
}
private static double levelAt(@NotNull IDynamicLightSource source, int luminance, double distanceSquared) {
final double reach = reachOf(source);
if (distanceSquared >= reach * reach) return 0;
return falloff(luminance, source.angelica$getReach(), Math.sqrt(distanceSquared));
}
public List<IDynamicLightSource> getSourcesForChunk(int chunkMinX, int chunkMinY, int chunkMinZ) {
// Chunk center
final double centerX = chunkMinX + 8.0;
final double centerY = chunkMinY + 8.0;
final double centerZ = chunkMinZ + 8.0;
// Smooth lighting reads the cells a block outside the section too, and the middle of the furthest of those is
// sqrt(3) * 8.5 ≈ 14.72 from the chunk center. Plus the source's reach (7.75 for a held torch), slightly padded
// for safety
// Max distance from chunk center to any corner is sqrt(3) * 8 ≈ 13.86
// Add MAX_RADIUS to get the search radius (13.86 + 7.75)^2 ≈ 467
final double searchRadiusSq = 470.0; // Slightly padded for safety
List<IDynamicLightSource> result = null;
this.lightSourcesLock.readLock().lock();
try {
for (var source : activeSources()) {
for (var source : this.lightSourceArray) {
final double dx = source.angelica$getDynamicLightX() - centerX;
final double dy = source.angelica$getDynamicLightY() - centerY;
final double dz = source.angelica$getDynamicLightZ() - centerZ;
final double distSq = dx * dx + dy * dy + dz * dz;
final double searchRadius = 14.8 + reachOf(source);
if (distSq <= searchRadius * searchRadius) {
if (distSq <= searchRadiusSq) {
if (result == null) {
result = new ArrayList<>();
}
@@ -536,7 +416,7 @@ public class DynamicLights {
int accum = 0;
this.lightSourcesLock.readLock().lock();
try {
for (var lightSource : activeSources()) {
for (var lightSource : this.lightSourceArray) {
accum = accumulateSourceRGB(x, y, z, lightSource, accum);
}
} finally {
@@ -566,8 +446,9 @@ public class DynamicLights {
final double dz = z - source.angelica$getDynamicLightZ();
final double distSq = dx * dx + dy * dy + dz * dz;
final double multiplier = levelAt(source, luminance, distSq) / luminance;
if (multiplier <= 0) return accum;
if (distSq > MAX_RADIUS_SQUARED) return accum;
final double multiplier = 1.0 - Math.sqrt(distSq) / MAX_RADIUS;
final int r = (int) (BlockLightProvider.unpackR(rgb) * multiplier);
final int g = (int) (BlockLightProvider.unpackG(rgb) * multiplier);
final int b = (int) (BlockLightProvider.unpackB(rgb) * multiplier);
@@ -44,24 +44,6 @@ public interface IDynamicLightSource {
return DynamicLights.isEnabled() && DynamicLights.get().containsLightSource(this);
}
/**
* Whether this gives light under a shaderpack without the player's shader force option, for lights that stand in
* for real blocks a pack has no other way to light. False for entities and held items, the pack does those.
*/
default boolean angelica$isLitUnderShaderpacks() {
return false;
}
/**
* How far a luminance 15 light of this source gets, 0-15, falling 15 / reach levels a block like block light (15
* is vanilla). -1 for Angelica's held torch falloff, straight down to 0 at 7.75 blocks. The source has to track and
* rebuild every chunk section its light gets into (plus a block, smooth lighting reads the cells next to a face),
* see {@link DynamicLights#reachOf}.
*/
default float angelica$getReach() {
return -1;
}
/**
* Sets whether the dynamic light is enabled or not.
* <p>
@@ -1,202 +0,0 @@
package com.gtnewhorizons.angelica.dynamiclights;
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
import com.gtnewhorizon.gtnhlib.blockpos.IBlockPos;
import com.gtnewhorizons.angelica.api.dynamiclights.PositionalLight;
import it.unimi.dsi.fastutil.longs.LongIterator;
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import net.minecraft.util.MathHelper;
import org.jetbrains.annotations.NotNull;
/**
* {@link PositionalLight} for mods. Tracks chunks like entity lights do (see MixinEntity), but only the sections its
* light gets into, worked out from its reach: 8 or fewer up to reach 7, mostly 8 for a held torch, up to 27 for a long
* one. Plus the ones it left.
*/
public final class PositionalLightSource implements IDynamicLightSource, PositionalLight {
private volatile double x, y, z;
private volatile int luminance;
private volatile boolean litUnderShaderpacks;
private volatile float reach = TORCH_REACH;
private boolean removed;
private int lastLuminance;
private float lastReach = TORCH_REACH;
private double prevX, prevY, prevZ;
private LongOpenHashSet tracked = new LongOpenHashSet();
private LongOpenHashSet prevTracked = new LongOpenHashSet();
@Override
public void setPosition(double x, double y, double z) {
this.x = x;
this.y = y;
this.z = z;
// Also adds it back after a world unload drops Angelica's lights
syncTracking();
}
@Override
public void setLuminance(int luminance) {
if (removed) return;
this.luminance = Math.max(0, Math.min(15, luminance));
syncTracking();
}
@Override
public double getX() {
return x;
}
@Override
public double getY() {
return y;
}
@Override
public double getZ() {
return z;
}
@Override
public int getLuminance() {
return luminance;
}
@Override
public void setLitUnderShaderpacks(boolean lit) {
if (litUnderShaderpacks == lit) return;
litUnderShaderpacks = lit;
DynamicLights.get().onShaderpackLitChanged(this);
// It may have just gone dark (or lit) under a pack. Redo its chunks either way, the next update puts the light
// back in where it still counts
angelica$resetDynamicLight();
final IDynamicLightWorldRenderer renderer = DynamicLights.getActiveRenderer();
if (renderer != null) angelica$scheduleTrackedChunksRebuild(renderer);
}
@Override
public void setReach(float reach) {
// Anything under 0 (or NaN) is the held torch
this.reach = reach >= 0 ? Math.min(15, reach) : TORCH_REACH;
}
@Override
public float getReach() {
return reach;
}
@Override
public float angelica$getReach() {
return reach;
}
@Override
public boolean isLitUnderShaderpacks() {
return litUnderShaderpacks;
}
@Override
public boolean angelica$isLitUnderShaderpacks() {
return litUnderShaderpacks;
}
@Override
public void remove() {
if (removed) return;
removed = true;
luminance = 0;
syncTracking();
}
// In Angelica's lights while lit and out of them otherwise, dynamic lights on or not. DynamicLights.updateTracking
// only removes while they're on, and re-adds on every call while they're off
private void syncTracking() {
final DynamicLights lights = DynamicLights.get();
final boolean lit = luminance > 0;
if (lit == lights.containsLightSource(this)) return;
angelica$resetDynamicLight();
if (lit) lights.addLightSource(this);
else lights.removeLightSource(this);
}
@Override
public double angelica$getDynamicLightX() {
return x;
}
@Override
public double angelica$getDynamicLightY() {
return y;
}
@Override
public double angelica$getDynamicLightZ() {
return z;
}
@Override
public void angelica$resetDynamicLight() {
lastLuminance = 0;
}
@Override
public int angelica$getLuminance() {
return luminance;
}
@Override
public void angelica$dynamicLightTick() {}
@Override
public boolean angelica$updateDynamicLight(@NotNull IDynamicLightWorldRenderer renderer) {
final double x = this.x, y = this.y, z = this.z;
final int luminance = this.luminance;
final float reach = this.reach;
// Small changes in reach count like small moves, a structure being scaled changes it every frame
if (Math.abs(x - prevX) <= 0.1 && Math.abs(y - prevY) <= 0.1 && Math.abs(z - prevZ) <= 0.1
&& luminance == lastLuminance && Math.abs(reach - lastReach) <= 0.1) {
return false;
}
prevX = x;
prevY = y;
prevZ = z;
lastLuminance = luminance;
lastReach = reach;
final LongOpenHashSet newTracked = prevTracked;
newTracked.clear();
// Every section the light gets into, plus a block: smooth lighting on a face reads the cells in front of it,
// which can be in the next section. Reach is at most 15, so never past the sections right next to this one
final double far = DynamicLights.reachOf(this) + 1;
if (far > 1) {
final int cx = MathHelper.floor_double(x) >> 4, cy = MathHelper.floor_double(y) >> 4,
cz = MathHelper.floor_double(z) >> 4;
final int x0 = x - (cx << 4) < far ? -1 : 0, x1 = ((cx + 1) << 4) - x < far ? 1 : 0;
final int y0 = y - (cy << 4) < far ? -1 : 0, y1 = ((cy + 1) << 4) - y < far ? 1 : 0;
final int z0 = z - (cz << 4) < far ? -1 : 0, z1 = ((cz + 1) << 4) - z < far ? 1 : 0;
for (int dx = x0; dx <= x1; dx++) {
for (int dy = y0; dy <= y1; dy++) {
for (int dz = z0; dz <= z1; dz++) track(renderer, new BlockPos(cx + dx, cy + dy, cz + dz), newTracked);
}
}
}
// Whatever's left in the old set is out of range now
angelica$scheduleTrackedChunksRebuild(renderer);
prevTracked = tracked;
tracked = newTracked;
return true;
}
private void track(IDynamicLightWorldRenderer renderer, IBlockPos chunk, LongOpenHashSet newTracked) {
DynamicLights.scheduleChunkRebuild(renderer, chunk);
DynamicLights.updateTrackedChunks(chunk, tracked, newTracked);
}
@Override
public void angelica$scheduleTrackedChunksRebuild(@NotNull IDynamicLightWorldRenderer renderer) {
final LongIterator it = tracked.iterator();
while (it.hasNext()) DynamicLights.scheduleChunkRebuildForRemoval(renderer, it.nextLong());
}
}
@@ -551,6 +551,8 @@ public enum Mixins implements IMixins {
, "shaders.MixinEntityRenderer"
, "shaders.MixinGuiIngameForge"
, "shaders.MixinFramebuffer"
, "angelica.rendering.MixinEntityRenderer_TranslucencyLayers"
, "angelica.rendering.MixinFramebuffer_TranslucencyLayers"
, "shaders.MixinItem"
, "shaders.MixinItemRenderer_ItemId"
, "shaders.MixinLocale"
@@ -304,7 +304,7 @@ public final class TracyFramePlots {
Tracy.plotInt(P_QUEUE_TASKS_RAN, AngelicaRenderQueue.getLastFrameTasksRan());
Tracy.plotInt(P_QUEUE_TIME_NS, AngelicaRenderQueue.getLastFrameTimeNs());
if (DynamicLights.isActive()) {
if (DynamicLights.isEnabled()) {
final DynamicLights dl = DynamicLights.get();
Tracy.plotInt(P_DYN_LIGHT_SOURCES, dl.getLightSourcesCount());
Tracy.plotInt(P_DYN_UPDATES, dl.getLastUpdateCount());
@@ -40,6 +40,7 @@ import com.gtnewhorizons.angelica.AngelicaMod;
import com.gtnewhorizons.angelica.common.BlockError;
import com.gtnewhorizons.angelica.common.BlockIsbrhTest;
import com.gtnewhorizons.angelica.common.TileEntityClipPlaneTest;
import com.gtnewhorizons.angelica.common.TileTesrTranslucentTest;
import com.gtnewhorizons.angelica.compat.ModStatus;
import com.gtnewhorizons.angelica.compat.bettercrashes.BetterCrashesCompat;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
@@ -75,6 +76,7 @@ import com.gtnewhorizons.angelica.rendering.ClipPlaneTestRenderer;
import com.gtnewhorizons.angelica.rendering.FpsReducer;
import com.gtnewhorizons.angelica.rendering.FramePacer;
import com.gtnewhorizons.angelica.rendering.IsbrhTestRenderer;
import com.gtnewhorizons.angelica.rendering.TesrTranslucentTestRenderers;
import com.gtnewhorizons.angelica.rendering.TextureSamplers;
import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasSetup;
import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasWorldRenderer;
@@ -150,6 +152,10 @@ public final class ClientProxy extends CommonProxy {
BlockIsbrhTest.renderId = RenderingRegistry.getNextAvailableRenderId();
RenderingRegistry.registerBlockHandler(BlockIsbrhTest.renderId, new IsbrhTestRenderer());
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityClipPlaneTest.class, new ClipPlaneTestRenderer());
ClientRegistry.bindTileEntitySpecialRenderer(TileTesrTranslucentTest.Provider.class, new TesrTranslucentTestRenderers.Provider());
ClientRegistry.bindTileEntitySpecialRenderer(TileTesrTranslucentTest.Model.class, new TesrTranslucentTestRenderers.Model());
ClientRegistry.bindTileEntitySpecialRenderer(TileTesrTranslucentTest.Decal.class, new TesrTranslucentTestRenderers.Decal());
ClientRegistry.bindTileEntitySpecialRenderer(TileTesrTranslucentTest.Glow.class, new TesrTranslucentTestRenderers.Glow());
}
AngelicaJar.configureShaderDiskCache(event.getSourceFile());
if (AngelicaConfig.enableIris) {
@@ -2,13 +2,18 @@ package com.gtnewhorizons.angelica.proxy;
import com.gtnewhorizons.angelica.common.BlockClipPlaneTest;
import com.gtnewhorizons.angelica.common.BlockIsbrhTest;
import com.gtnewhorizons.angelica.common.BlockTesrTranslucentTest;
import com.gtnewhorizons.angelica.common.BlockTest;
import com.gtnewhorizons.angelica.common.TileEntityClipPlaneTest;
import com.gtnewhorizons.angelica.common.TileTesrTranslucentTest;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.tileentity.TileEntity;
import java.util.function.Supplier;
public class CommonProxy {
@@ -18,9 +23,18 @@ public class CommonProxy {
GameRegistry.registerBlock(new BlockIsbrhTest(), "test_isbrh");
GameRegistry.registerBlock(new BlockClipPlaneTest(), "test_clip_plane");
GameRegistry.registerTileEntity(TileEntityClipPlaneTest.class, "angelica:test_clip_plane");
registerTesrTest("test_tesr_provider", TileTesrTranslucentTest.Provider.class, TileTesrTranslucentTest.Provider::new);
registerTesrTest("test_tesr_model", TileTesrTranslucentTest.Model.class, TileTesrTranslucentTest.Model::new);
registerTesrTest("test_tesr_decal", TileTesrTranslucentTest.Decal.class, TileTesrTranslucentTest.Decal::new);
registerTesrTest("test_tesr_glow", TileTesrTranslucentTest.Glow.class, TileTesrTranslucentTest.Glow::new);
}
}
private static void registerTesrTest(String name, Class<? extends TileEntity> tile, Supplier<TileEntity> factory) {
GameRegistry.registerBlock(new BlockTesrTranslucentTest(factory), name);
GameRegistry.registerTileEntity(tile, "angelica:" + name);
}
public void init(FMLInitializationEvent event) {}
public void postInit(FMLPostInitializationEvent event) {}
@@ -103,8 +103,12 @@ public class PanoramaRenderer {
}
public static <T> GlProgram<T> loadProgram(String name, String vertBase, String fragBase, Function<ShaderBindingContext, T> factory) {
return loadProgram(name, vertBase, fragBase, ShaderConstants.EMPTY, factory);
}
public static <T> GlProgram<T> loadProgram(String name, String vertBase, String fragBase, ShaderConstants fragConstants, Function<ShaderBindingContext, T> factory) {
final GlShader vert = ShaderLoader.loadShader(ShaderType.VERTEX, vertBase + ".vert", ShaderConstants.EMPTY);
final GlShader frag = ShaderLoader.loadShader(ShaderType.FRAGMENT, fragBase + ".frag", ShaderConstants.EMPTY);
final GlShader frag = ShaderLoader.loadShader(ShaderType.FRAGMENT, fragBase + ".frag", fragConstants);
try {
final GlProgram<T> program = GlProgram.builder(name).attachShader(vert).attachShader(frag).link(factory);
program.bind();
@@ -15,15 +15,6 @@ public interface StateAwareTessellator {
void angelica$setAppliedAo(boolean flag);
void angelica$setNoDirectionalShading(boolean flag);
/// The state the next vertex gets. False for tessellators that don't track it.
default boolean angelica$isAppliedAo() {
return false;
}
default boolean angelica$isNoDirectionalShading() {
return false;
}
/// Sets whether we're doing terrain meshing as part of celeritas -- collects additional information.
///
/// Enables per-vertex AO state collection into [#angelica$getVertexStates()].
@@ -0,0 +1,215 @@
package com.gtnewhorizons.angelica.rendering;
import com.gtnewhorizon.gtnhlib.client.renderer.vertex.DefaultVertexFormat;
import com.gtnewhorizons.angelica.api.tesr.TesrMaterial;
import com.gtnewhorizons.angelica.api.tesr.TesrMeshProvider;
import com.gtnewhorizons.angelica.api.tesr.TesrMeshSink;
import com.gtnewhorizons.angelica.common.TileTesrTranslucentTest;
import com.gtnewhorizons.angelica.glsm.GLSMBlend;
import com.gtnewhorizons.angelica.glsm.GLSMCurrentAttribs;
import com.gtnewhorizons.angelica.glsm.GLSMDepthStencilAlpha;
import com.gtnewhorizons.angelica.glsm.GLSMEnable;
import com.gtnewhorizons.angelica.glsm.GLSMMatrices;
import com.gtnewhorizons.angelica.utils.WorkaroundUtils;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
import org.lwjgl.opengl.GL11;
public final class TesrTranslucentTestRenderers {
private static final double HALF = 0.4375;
private TesrTranslucentTestRenderers() {}
private static void pane(Tessellator t, double half) {
rect(t, -half, -half, half, half);
}
private static void rect(Tessellator t, double x0, double y0, double x1, double y1) {
t.setNormal(0f, 0f, -1f);
t.addVertexWithUV(0.5 + x0, 0.5 + y0, 0.5, 0, 1);
t.addVertexWithUV(0.5 + x0, 0.5 + y1, 0.5, 0, 0);
t.addVertexWithUV(0.5 + x1, 0.5 + y1, 0.5, 1, 0);
t.addVertexWithUV(0.5 + x1, 0.5 + y0, 0.5, 1, 1);
}
private static void drawPane(double half) {
final Tessellator t = Tessellator.instance;
t.startDrawingQuads();
pane(t, half);
t.draw();
}
private static void apply(TesrMaterial material) {
if (material.transparency() == TesrMaterial.Transparency.ADDITIVE) {
GLSMBlend.glBlendFunc(GL11.GL_ONE, GL11.GL_ONE);
} else {
GLSMBlend.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
}
GLSMCurrentAttribs.glColor4f(material.colorRed(), material.colorGreen(), material.colorBlue(), material.colorAlpha());
}
private abstract static class PaneRenderer extends TileEntitySpecialRenderer {
void begin(double x, double y, double z) {
bindTexture(WorkaroundUtils.GL_TEXTURE_2D_WORKAROUND);
GLSMMatrices.glPushMatrix();
GLSMMatrices.glTranslated(x, y, z);
GLSMEnable.glDisable(GL11.GL_CULL_FACE);
GLSMEnable.glEnable(GL11.GL_BLEND);
}
static void end() {
GLSMCurrentAttribs.glColor4f(1f, 1f, 1f, 1f);
GLSMBlend.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
GLSMEnable.glDisable(GL11.GL_BLEND);
GLSMEnable.glEnable(GL11.GL_CULL_FACE);
GLSMMatrices.glPopMatrix();
}
}
public static final class Provider extends PaneRenderer implements TesrMeshProvider {
private static final TesrMaterial[] MATERIALS = {
TesrMaterial.builder().color(1f, 0f, 0f, 0.5f).translucent().noCull().build(),
TesrMaterial.builder().color(0.5f, 0f, 0.5f, 1f).additive().noCull().build() };
private static final Object[] KEYS = { new Object(), new Object() };
private static int kind(TileEntity te) {
return ((TileTesrTranslucentTest) te).variant() == 1 ? 1 : 0;
}
@Override
public Object angelica$meshKey(TileEntity te) {
return KEYS[kind(te)];
}
@Override
public void angelica$build(TesrMeshSink sink, TileEntity te) {
pane(sink.angelica$bucket(DefaultVertexFormat.POSITION_TEXTURE_NORMAL, WorkaroundUtils.GL_TEXTURE_2D_WORKAROUND, MATERIALS[kind(te)]), HALF);
}
@Override
public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks) {
begin(x, y, z);
apply(MATERIALS[kind(te)]);
drawPane(HALF);
end();
}
}
public static final class Model extends PaneRenderer {
private static final TesrMaterial TRANSLUCENT_GREEN = TesrMaterial.builder().color(0f, 1f, 0f, 0.5f).translucent().build();
private static final TesrMaterial TRANSLUCENT_YELLOW = TesrMaterial.builder().color(1f, 1f, 0f, 0.5f).translucent().build();
private static final TesrMaterial TRANSLUCENT_MAGENTA = TesrMaterial.builder().color(1f, 0f, 1f, 0.5f).translucent().build();
private static final TesrMaterial ADDITIVE_CYAN = TesrMaterial.builder().color(0f, 0.6f, 0.6f, 1f).additive().build();
private final ModelBase model = new ModelBase() {};
private final ModelRenderer base = new ModelRenderer(model, 0, 0);
private final ModelRenderer pane = paneAt(0f);
private final ModelRenderer paneFar = paneAt(0.16f);
private final ModelRenderer paneNear = paneAt(-0.16f);
public Model() {
base.addBox(-1f, 7f, -1f, 2, 1, 2);
}
private ModelRenderer paneAt(float z) {
final ModelRenderer renderer = new ModelRenderer(model, 0, 0);
renderer.addBox(-7f, -7f, z, 14, 14, 0);
return renderer;
}
@Override
public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks) {
final float scale = 1f / 16f;
bindTexture(WorkaroundUtils.GL_TEXTURE_2D_WORKAROUND);
GLSMMatrices.glPushMatrix();
GLSMMatrices.glTranslated(x + 0.5, y + 0.5, z + 0.5);
GLSMCurrentAttribs.glColor4f(1f, 1f, 1f, 1f);
base.render(scale);
GLSMEnable.glEnable(GL11.GL_BLEND);
switch (((TileTesrTranslucentTest) te).variant()) {
case 0 -> {
apply(TRANSLUCENT_GREEN);
pane.render(scale);
}
case 1 -> {
apply(TRANSLUCENT_YELLOW);
GLSMMatrices.glTranslated(-0.5, -0.5, -0.5);
drawPane(HALF);
}
default -> {
apply(TRANSLUCENT_MAGENTA);
paneFar.render(scale);
apply(ADDITIVE_CYAN);
pane.render(scale);
apply(TRANSLUCENT_GREEN);
paneNear.render(scale);
}
}
end();
}
}
public static final class Decal extends PaneRenderer implements TesrMeshProvider {
private static final TesrMaterial WRITER = TesrMaterial.builder().color(1f, 1f, 1f, 0.5f).translucent().noCull().build();
private static final TesrMaterial DECAL = TesrMaterial.builder().color(0f, 0f, 0f, 0.8f).translucent().depthEqual().noCull().build();
private static final Object KEY = new Object();
private static final double INNER = HALF / 2;
private static void writer(Tessellator t) {
rect(t, -HALF, INNER, HALF, HALF);
rect(t, -HALF, -HALF, HALF, -INNER);
rect(t, -HALF, -INNER, -INNER, INNER);
rect(t, INNER, -INNER, HALF, INNER);
pane(t, INNER);
}
@Override
public Object angelica$meshKey(TileEntity te) {
return KEY;
}
@Override
public void angelica$build(TesrMeshSink sink, TileEntity te) {
writer(sink.angelica$bucket(DefaultVertexFormat.POSITION_TEXTURE_NORMAL, WorkaroundUtils.GL_TEXTURE_2D_WORKAROUND, WRITER));
pane(sink.angelica$bucket(DefaultVertexFormat.POSITION_TEXTURE_NORMAL, WorkaroundUtils.GL_TEXTURE_2D_WORKAROUND, DECAL), INNER);
}
@Override
public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks) {
begin(x, y, z);
apply(WRITER);
final Tessellator t = Tessellator.instance;
t.startDrawingQuads();
writer(t);
t.draw();
GLSMDepthStencilAlpha.glDepthFunc(GL11.GL_EQUAL);
apply(DECAL);
drawPane(INNER);
GLSMDepthStencilAlpha.glDepthFunc(GL11.GL_LEQUAL);
end();
}
}
public static final class Glow extends PaneRenderer {
private static final TesrMaterial TRANSLUCENT_ORANGE = TesrMaterial.builder().color(1f, 0.5f, 0f, 0.6f).translucent().build();
@Override
public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks) {
begin(x, y, z);
apply(TRANSLUCENT_ORANGE);
GLSMDepthStencilAlpha.glDepthMask(false);
drawPane(HALF);
GLSMDepthStencilAlpha.glDepthMask(true);
end();
}
}
}
@@ -112,7 +112,7 @@ public class AngelicaChunkBuildContext extends ChunkBuildContext {
}
public void setupDynamicLights(int chunkOriginX, int chunkOriginY, int chunkOriginZ) {
if (DynamicLights.isActive()) {
if (DynamicLights.isEnabled()) {
this.dynamicLightsInstance = DynamicLights.get();
this.chunkLightSources = dynamicLightsInstance.getSourcesForChunk(chunkOriginX, chunkOriginY, chunkOriginZ);
} else {
@@ -13,6 +13,7 @@ import com.gtnewhorizons.angelica.rendering.TextureSamplers;
import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProvider;
import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHolder;
import com.gtnewhorizons.angelica.rendering.culling.GpuCulling;
import com.gtnewhorizons.angelica.rendering.translucency.TranslucencyLayers;
import me.jellysquid.mods.sodium.client.gui.SodiumGameOptions;
import me.jellysquid.mods.sodium.client.gui.options.named.MultiDrawMode;
import com.gtnewhorizons.angelica.rendering.voxelization.SdlShadowVoxelizationSink;
@@ -196,6 +197,7 @@ class AngelicaChunkRenderer extends DefaultChunkRenderer {
if (program != null) {
program.bind();
program.getInterface().setupState(pass);
if (pass == AngelicaRenderPassConfiguration.TRANSLUCENT_PASS) TranslucencyLayers.INSTANCE.beginTerrainSplit(program.handle());
}
}
@@ -204,6 +206,7 @@ class AngelicaChunkRenderer extends DefaultChunkRenderer {
if (irisProgram != null) {
endIrisPass(pass);
} else {
if (pass == AngelicaRenderPassConfiguration.TRANSLUCENT_PASS) TranslucencyLayers.INSTANCE.endTerrainSplit();
super.end(pass);
}
}
@@ -80,7 +80,8 @@ public class AngelicaRenderPassConfiguration {
TRANSLUCENT_PASS = builderForRenderType(1, false, translucentCutoff, vertexType)
.name("translucent")
.useReverseOrder(true)
.useTranslucencySorting(ClientProxy.options().performance.translucencySorting)
.useTranslucencySorting(ClientProxy.options().performance.translucencyMode.sorts())
.extraDefine("TRANSLUCENCY_SPLIT", "")
.build();
TRANSLUCENT_MATERIAL = new Material(TRANSLUCENT_PASS, translucentCutoff, true);
@@ -1,19 +1,19 @@
package com.gtnewhorizons.angelica.rendering.celeritas;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
import com.gtnewhorizons.angelica.compat.bop.FogBiomeCache;
import com.gtnewhorizons.angelica.render.CloudRenderer;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.MinecraftForgeClient;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
@@ -37,15 +37,21 @@ import org.embeddedt.embeddium.impl.render.viewport.frustum.SimpleFrustum;
import org.joml.FrustumIntersection;
import org.joml.Matrix4f;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL13;
import com.gtnewhorizons.angelica.compat.ModStatus;
import com.gtnewhorizons.angelica.compat.cubicchunks.CubicChunksAPI;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
import com.gtnewhorizons.angelica.dynamiclights.IDynamicLightWorldRenderer;
import com.gtnewhorizons.angelica.glsm.GLSMAttribStack;
import com.gtnewhorizons.angelica.glsm.GLSMBlend;
import com.gtnewhorizons.angelica.glsm.GLSMCurrentAttribs;
import com.gtnewhorizons.angelica.glsm.GLSMDepthStencilAlpha;
import com.gtnewhorizons.angelica.glsm.GLSMMatrices;
import com.gtnewhorizons.angelica.glsm.GLSMRasterizer;
import com.gtnewhorizons.angelica.glsm.GLSMTextures;
import com.gtnewhorizons.angelica.glsm.StateSet;
import com.gtnewhorizons.angelica.glsm.ffp.FfpExtendedAttribs;
import com.gtnewhorizons.angelica.glsm.profiling.Tracy;
import com.gtnewhorizons.angelica.mixins.interfaces.ITileEntityBoundingBoxCache;
@@ -66,6 +72,10 @@ import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHold
import com.gtnewhorizons.angelica.rendering.tesr.TesrAttribution;
import com.gtnewhorizons.angelica.rendering.tesr.TesrBatchRenderer;
import com.gtnewhorizons.angelica.rendering.tesr.TesrLifecycle;
import com.gtnewhorizons.angelica.rendering.translucency.TranslucencyLayers;
import com.gtnewhorizons.angelica.rendering.translucency.TranslucentLayer;
import net.coderbot.iris.Iris;
import net.coderbot.iris.layer.GbufferPrograms;
import net.coderbot.iris.pipeline.ShadowRenderer;
public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, AngelicaRenderSectionManager, BlockRenderLayer, TileEntity, CeleritasWorldRenderer.TileEntityRenderContext> implements IDynamicLightWorldRenderer {
@@ -75,6 +85,7 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
private static final Tracy.ZoneId Z_TESR_DISPATCH = Tracy.zoneId("tesrDispatch", Tracy.COLOR_CLIENT);
private static final Tracy.ZoneId Z_TESR_MODEL_PARTS = Tracy.zoneId("tesrModelParts", Tracy.COLOR_CLIENT);
private static final Tracy.ZoneId Z_TESR_RENDER_TE = Tracy.zoneId("tesrRenderTE", Tracy.COLOR_CLIENT);
private static final long P_BLOCK_ENTITIES_RENDERED = Tracy.plotHandle("blockEntitiesRendered");
private final Minecraft mc;
private static CeleritasWorldRenderer instance;
@@ -95,9 +106,11 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
private final ObjectArrayList<TileEntity> frameTEs = new ObjectArrayList<>();
private final ObjectArrayList<TileEntity> frameOverride = new ObjectArrayList<>();
// For sorting transparent TESRs
private final TileEntityOrderer tileEntityOrderer = new TileEntityOrderer();
private final ArrayList<TileEntity> sortedTileEntities = new ArrayList<>();
private final TileEntityDepthOrder depthOrder = new TileEntityDepthOrder();
private final Matrix4f savedTextureMatrix = new Matrix4f();
private PassOne passOne = PassOne.NONE;
private enum PassOne { NONE, PENDING, DRAWN_EARLY }
private CeleritasWorldRenderer(Minecraft mc) {
// Private constructor for singleton
@@ -172,7 +185,6 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
DynamicLights.setActiveRenderer(null);
this.frameTEs.clear();
this.frameOverride.clear();
this.sortedTileEntities.clear();
ShadowRenderer.visibleTileEntities.clear();
ShadowRenderer.globalTileEntities.clear();
TesrLifecycle.reset();
@@ -298,7 +310,7 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
IrisShaderProviderHolder.shouldUseFaceCulling());
}
if (DynamicLights.isActive() && DynamicLights.FrustumCullingEnabled) {
if (DynamicLights.isEnabled() && DynamicLights.FrustumCullingEnabled) {
DynamicLights.get().processChunkRebuilds(viewport);
}
}
@@ -331,7 +343,7 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
super.setupShadowTerrain(playerViewport, shadowViewport, cameraState, frame, spectator);
if (DynamicLights.isActive() && DynamicLights.FrustumCullingEnabled) {
if (DynamicLights.isEnabled() && DynamicLights.FrustumCullingEnabled) {
DynamicLights.get().processChunkRebuilds(shadowViewport);
}
@@ -385,6 +397,15 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
return camera;
}
public boolean hasVisibleLayer(BlockRenderLayer renderLayer) {
final Collection<TerrainRenderPass> passes = this.renderSectionManager.getRenderPassConfiguration().vanillaRenderStages().get(renderLayer);
if (passes == null) return false;
for (final TerrainRenderPass pass : passes) {
if (this.renderSectionManager.getRenderLists().hasPass(pass)) return true;
}
return false;
}
@Override
public void drawChunkLayer(BlockRenderLayer renderLayer, double x, double y, double z) {
if (DEBUG_WIREFRAME_MODE) {
@@ -408,6 +429,75 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
GLSMCurrentAttribs.glColor4f(1, 1, 1, 1);
}
public void renderBlockEntitiesBeforeTranslucent(float partialTicks) {
if (passOne != PassOne.PENDING) return;
passOne = PassOne.DRAWN_EARLY;
if (!anyRendersInPassOne()) return;
final Minecraft mc = Minecraft.getMinecraft();
final boolean layered = TranslucencyLayers.INSTANCE.active();
final int previousPass = MinecraftForgeClient.getRenderPass();
final int depth = GLSMAttribStack.pushState(StateSet.BLOCK_ENTITY_PASS);
savedTextureMatrix.set(GLSMTextures.getTextures().getTextureUnitMatrix(0));
GLSMMatrices.glMatrixMode(GL11.GL_MODELVIEW);
GLSMMatrices.glPushMatrix();
try {
GLSMDepthStencilAlpha.glDepthMask(true);
GLSMDepthStencilAlpha.enableAlphaTest();
GLSMTextures.glActiveTexture(GL13.GL_TEXTURE0);
GLSMTextures.enableTexture();
GLSMCurrentAttribs.glColor4f(1f, 1f, 1f, 1f);
// A layer reads its color as premultiplied, which a blend-disabled draw does not write (TranslucencyLayers).
if (layered) {
GLSMBlend.enableBlend();
GLSMBlend.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
} else if (mc.gameSettings.fancyGraphics) {
GLSMBlend.disableBlend();
}
if (mc.gameSettings.fancyGraphics) GLSMRasterizer.glShadeModel(GL11.GL_FLAT);
RenderHelper.enableStandardItemLighting();
mc.entityRenderer.enableLightmap(partialTicks);
ForgeHooksClient.setRenderPass(1);
if (layered) TranslucencyLayers.INSTANCE.begin(TranslucentLayer.BLOCK_ENTITIES);
try {
renderBlockEntitiesInPhase(partialTicks);
} finally {
if (layered) TranslucencyLayers.INSTANCE.end();
}
} finally {
ForgeHooksClient.setRenderPass(previousPass);
GLSMMatrices.glMatrixMode(GL11.GL_MODELVIEW);
GLSMMatrices.glPopMatrix();
GLSMMatrices.setTextureMatrix(0, savedTextureMatrix);
GLSMAttribStack.popStateTo(depth);
}
}
private boolean anyRendersInPassOne() {
for (int i = 0; i < frameOverride.size(); i++) {
if (frameOverride.get(i).shouldRenderInPass(1)) return true;
}
return false;
}
public boolean takeLatePassOne() {
final boolean late = passOne != PassOne.DRAWN_EARLY;
passOne = PassOne.NONE;
return late;
}
public void renderBlockEntitiesInPhase(float partialTicks) {
if (Iris.enabled) {
GbufferPrograms.beginBlockEntities();
GbufferPrograms.setBlockEntityDefaults();
}
try {
final int rendered = renderBlockEntities(partialTicks);
if (Tracy.ENABLED) Tracy.plotInt(P_BLOCK_ENTITIES_RENDERED, rendered);
} finally {
if (Iris.enabled) GbufferPrograms.endBlockEntities();
}
}
public int renderBlockEntities(float partialTicks) {
AngelicaTesrMeshCache.INSTANCE.tick();
final int pass = MinecraftForgeClient.getRenderPass();
@@ -442,6 +532,9 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
this.teTransform = null;
if (Tracy.ENABLED) Tracy.beginZone(Z_TESR_DISPATCH);
try {
if (ClientProxy.options().performance.translucencyMode.sorts()) {
depthOrder.sortBackToFront(frameTEs, teCamX, teCamY, teCamZ);
}
for (int i = 0; i < frameTEs.size(); i++) {
final TileEntity te = frameTEs.get(i);
if (!(te instanceof OverridesShouldRenderInPass)) {
@@ -458,23 +551,17 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
} finally {
if (Tracy.ENABLED) Tracy.endZone();
}
passOne = PassOne.PENDING;
} else {
if (Tracy.ENABLED) Tracy.beginZone(Z_TESR_DISPATCH);
try {
sortedTileEntities.clear();
for (int i = 0; i < frameOverride.size(); i++) {
final TileEntity te = frameOverride.get(i);
if (te.shouldRenderInPass(pass)) {
sortedTileEntities.add(te);
dispatchTE(te, partialTicks);
count++;
}
}
if (sortedTileEntities.size() > 1 && ClientProxy.options().performance.translucencySorting) {
sortedTileEntities.sort(tileEntityOrderer.setLastCameraState(lastCameraState));
}
for (int i = 0; i < sortedTileEntities.size(); i++) {
dispatchTE(sortedTileEntities.get(i), partialTicks);
}
count = sortedTileEntities.size();
} finally {
if (Tracy.ENABLED) Tracy.endZone();
}
@@ -673,27 +760,4 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
return this;
}
}
private static class TileEntityOrderer implements Comparator<TileEntity> {
public CameraState lastCameraState;
public TileEntityOrderer() {
super();
}
public TileEntityOrderer setLastCameraState(CameraState lastCameraState) {
this.lastCameraState = lastCameraState;
return this;
}
@Override
public int compare(TileEntity te1, TileEntity te2) {
final double x = this.lastCameraState.x();
final double y = this.lastCameraState.y();
final double z = this.lastCameraState.z();
final double d1 = te1.getDistanceFrom(x, y, z);
final double d2 = te2.getDistanceFrom(x, y, z);
return Double.compare(d2, d1);
}
}
}
@@ -0,0 +1,79 @@
package com.gtnewhorizons.angelica.rendering.celeritas;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import net.minecraft.tileentity.TileEntity;
import java.util.Arrays;
final class TileEntityDepthOrder {
private static final int RADIX_BITS = 8;
private static final int BUCKETS = 1 << RADIX_BITS;
private final int[] counts = new int[BUCKETS];
private int[] keys = new int[0];
private int[] keysScratch = new int[0];
private int[] order = new int[0];
private int[] orderScratch = new int[0];
private TileEntity[] entities = new TileEntity[0];
void sortBackToFront(ObjectArrayList<TileEntity> list, double camX, double camY, double camZ) {
final int n = list.size();
if (n < 2) return;
final Object[] source = list.elements();
if (keys.length < n) {
final int capacity = source.length;
keys = new int[capacity];
keysScratch = new int[capacity];
order = new int[capacity];
orderScratch = new int[capacity];
entities = new TileEntity[capacity];
}
for (int i = 0; i < n; i++) {
final TileEntity te = (TileEntity) source[i];
final double dx = te.xCoord + 0.5 - camX;
final double dy = te.yCoord + 0.5 - camY;
final double dz = te.zCoord + 0.5 - camZ;
keys[i] = Integer.MAX_VALUE - Float.floatToRawIntBits((float) (dx * dx + dy * dy + dz * dz));
order[i] = i;
entities[i] = te;
}
final int[] sorted = sortOrder(n);
for (int i = 0; i < n; i++) {
source[i] = entities[sorted[i]];
entities[sorted[i]] = null;
}
}
private int[] sortOrder(int n) {
int[] keyIn = keys, keyOut = keysScratch;
int[] idxIn = order, idxOut = orderScratch;
for (int shift = 0; shift < Integer.SIZE; shift += RADIX_BITS) {
Arrays.fill(counts, 0);
for (int i = 0; i < n; i++) counts[(keyIn[i] >>> shift) & (BUCKETS - 1)]++;
if (counts[(keyIn[0] >>> shift) & (BUCKETS - 1)] == n) continue;
int sum = 0;
for (int b = 0; b < BUCKETS; b++) {
final int c = counts[b];
counts[b] = sum;
sum += c;
}
for (int i = 0; i < n; i++) {
final int dst = counts[(keyIn[i] >>> shift) & (BUCKETS - 1)]++;
keyOut[dst] = keyIn[i];
idxOut[dst] = idxIn[i];
}
final int[] k = keyIn;
keyIn = keyOut;
keyOut = k;
final int[] x = idxIn;
idxIn = idxOut;
idxOut = x;
}
keys = keyIn;
keysScratch = keyOut;
order = idxIn;
orderScratch = idxOut;
return idxIn;
}
}
@@ -227,7 +227,7 @@ public class WorldSlice implements IBlockAccessExtended, FLBlockAccess, LiquidLo
Arrays.fill(this.biomeData, null);
// Pre-filter dynamic light sources for this chunk section
if (DynamicLights.isActive()) {
if (DynamicLights.isEnabled()) {
this.dynamicLightsInstance = DynamicLights.get();
this.chunkLightSources = dynamicLightsInstance.getSourcesForChunk(this.origin.getMinX(), this.origin.getMinY(), this.origin.getMinZ());
} else {
@@ -1,7 +1,6 @@
package com.gtnewhorizons.angelica.rendering.particles;
import com.gtnewhorizons.angelica.rendering.RenderFailures;
import com.gtnewhorizons.angelica.api.particles.ParticleRendering;
import com.gtnewhorizons.angelica.client.rendering.DeferredDrawBatcher;
import com.gtnewhorizons.angelica.glsm.GLSMAttribStack;
import com.gtnewhorizons.angelica.glsm.GLSMBuffers;
@@ -139,8 +138,6 @@ public final class ParticleInstancer {
STATE.sample();
SCRATCH.brightness = runTessellator.brightness;
if (!descriptor.describe(fx, partialTicks, SCRATCH, STATE)) return;
// Drawn from its fields, so a mod's size factor goes on here. The capture path below gets it from renderParticle
SCRATCH.half *= ParticleRendering.renderScale(fx);
runTessellator.color = SCRATCH.colorABGR;
runTessellator.hasColor = true;
@@ -0,0 +1,391 @@
package com.gtnewhorizons.angelica.rendering.translucency;
import com.gtnewhorizons.angelica.glsm.GLSMAttribStack;
import com.gtnewhorizons.angelica.glsm.GLSMBlend;
import com.gtnewhorizons.angelica.glsm.GLSMDepthStencilAlpha;
import com.gtnewhorizons.angelica.glsm.GLSMDraws;
import com.gtnewhorizons.angelica.glsm.GLSMFramebuffer;
import com.gtnewhorizons.angelica.glsm.GLSMPrograms;
import com.gtnewhorizons.angelica.glsm.GLSMQueries;
import com.gtnewhorizons.angelica.glsm.GLSMRasterizer;
import com.gtnewhorizons.angelica.glsm.GLSMTextures;
import com.gtnewhorizons.angelica.glsm.GLSMVertexInput;
import com.gtnewhorizons.angelica.glsm.RenderSystem;
import com.gtnewhorizons.angelica.glsm.StateSet;
import com.gtnewhorizons.angelica.glsm.hooks.BatchStateGuard;
import com.gtnewhorizons.angelica.glsm.stacks.ColorMaskStack;
import com.gtnewhorizons.angelica.glsm.texture.DepthBufferFormat;
import com.gtnewhorizons.angelica.glsm.texture.TextureInfoCache;
import com.gtnewhorizons.angelica.proxy.ClientProxy;
import com.gtnewhorizons.angelica.render.PanoramaRenderer;
import net.coderbot.iris.Iris;
import net.coderbot.iris.gl.framebuffer.GlFramebuffer;
import net.coderbot.iris.pipeline.FixedFunctionWorldRenderingPipeline;
import net.coderbot.iris.rendertarget.IRenderTargetExt;
import net.minecraft.client.Minecraft;
import net.minecraft.client.shader.Framebuffer;
import org.embeddedt.embeddium.impl.gl.shader.GlProgram;
import org.embeddedt.embeddium.impl.gl.shader.ShaderConstants;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12;
import org.lwjgl.opengl.GL13;
import org.lwjgl.opengl.GL30;
import java.nio.ByteBuffer;
/// Draws each [TranslucentLayer] into its own target, seeded with the main depth, and composites the drawn layers over
/// the main framebuffer per pixel, farthest first. Layers hold premultiplied color with coverage alpha (GLSM layer
/// blending), and the composite writes the nearest layer depth.
///
/// The terrain layer has a second sheet for fragments behind the block-entity layer, so a tile entity inside a
/// block's own translucent model is covered only by the faces in front of it.
public final class TranslucencyLayers {
private static final int LAYERS = TranslucentLayer.values().length;
private static final int FIRST_LAYER_UNIT = 1;
private static final int TERRAIN_BEHIND_UNIT = FIRST_LAYER_UNIT + 2 * LAYERS;
private static final int SPLIT_DEPTH_UNIT = TERRAIN_BEHIND_UNIT + 1;
private static final int[] SINGLE_BUFFER = { 0 };
private static final int[] SPLIT_BUFFERS = { 0, 1 };
private static final int[] BEHIND_BUFFER = { 1 };
public static final TranslucencyLayers INSTANCE = new TranslucencyLayers(new MinecraftTarget());
interface MainTarget {
int framebuffer();
int depthTexture();
int width();
int height();
int depthVersion();
}
private final MainTarget main;
private final Target[] layers = new Target[LAYERS];
private Target depthSnapshot;
private int width;
private int height;
private int depthVersion = -1;
private DepthBufferFormat depthFormat;
private boolean decided;
private boolean active;
private int drawnMask;
private TranslucentLayer open;
private int savedDraw;
private int savedRead;
private boolean alphaMasked;
private boolean splitting;
private boolean behindDrawn;
private CompositeProgram program;
private CompositeProgram behindProgram;
private int vao;
private StateSet prepareState;
private StateSet compositeState;
TranslucencyLayers(MainTarget main) {
this.main = main;
}
/// Whether layering applies is decided on the first [#active] call, once Iris has prepared the frame's pipeline.
public void beginFrame() {
decided = false;
drawnMask = 0;
behindDrawn = false;
}
void beginFrame(boolean active) {
this.active = active;
decided = true;
drawnMask = 0;
behindDrawn = false;
}
public boolean active() {
if (!decided) {
active = ClientProxy.options().performance.translucencyMode.composites() && Iris.enabled
&& Iris.getPipelineManager().getPipelineNullable() instanceof FixedFunctionWorldRenderingPipeline;
decided = true;
}
return active;
}
public boolean beginIfActive(TranslucentLayer layer) {
if (!active()) return false;
begin(layer);
return true;
}
public void begin(TranslucentLayer layer) {
if (open != null) throw new IllegalStateException("Translucency layer " + open + " is still open");
BatchStateGuard.beforeChange();
savedDraw = GLSMFramebuffer.getDrawFramebuffer();
savedRead = GLSMFramebuffer.getReadFramebuffer();
syncSize();
final Target target = layer(layer);
final int bit = 1 << layer.ordinal();
if ((drawnMask & bit) == 0) {
drawnMask |= bit;
prepare(target);
}
target.framebuffer.bind();
open = layer;
GLSMBlend.setLayerBlending(true);
final ColorMaskStack mask = GLSMBlend.getColorMask();
alphaMasked = !mask.alpha;
if (alphaMasked) GLSMBlend.glColorMask(mask.red, mask.green, mask.blue, true);
}
public void end() {
BatchStateGuard.beforeChange();
if (alphaMasked) {
final ColorMaskStack mask = GLSMBlend.getColorMask();
GLSMBlend.glColorMask(mask.red, mask.green, mask.blue, false);
}
GLSMBlend.setLayerBlending(false);
GLSMFramebuffer.glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, savedDraw);
GLSMFramebuffer.glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, savedRead);
open = null;
}
public boolean redirectsMainBind() {
return open != null;
}
public void bindOpenLayer() {
layers[open.ordinal()].framebuffer.bind();
}
public void beginTerrainSplit(int program) {
splitting = open == TranslucentLayer.TERRAIN && (drawnMask & (1 << TranslucentLayer.BLOCK_ENTITIES.ordinal())) != 0;
GLSMPrograms.glUniform1i(GLSMPrograms.glGetUniformLocation(program, "u_SplitEnabled"), splitting ? 1 : 0);
if (!splitting) return;
GLSMPrograms.glUniform1i(GLSMPrograms.glGetUniformLocation(program, "u_SplitDepth"), SPLIT_DEPTH_UNIT);
final Target terrain = layers[TranslucentLayer.TERRAIN.ordinal()];
if (!behindDrawn) {
behindDrawn = true;
terrain.attachBehind(width, height);
terrain.framebuffer.drawBuffers(BEHIND_BUFFER);
clear(terrain);
}
final int unit = GLSMTextures.getActiveTextureUnit();
bindTexture(SPLIT_DEPTH_UNIT, layers[TranslucentLayer.BLOCK_ENTITIES.ordinal()].depth);
GLSMTextures.glActiveTexture(GL13.GL_TEXTURE0 + unit);
terrain.framebuffer.drawBuffers(SPLIT_BUFFERS);
}
public void endTerrainSplit() {
if (!splitting) return;
splitting = false;
layers[TranslucentLayer.TERRAIN.ordinal()].framebuffer.drawBuffers(SINGLE_BUFFER);
final int unit = GLSMTextures.getActiveTextureUnit();
bindTexture(SPLIT_DEPTH_UNIT, 0);
GLSMTextures.glActiveTexture(GL13.GL_TEXTURE0 + unit);
}
public void composite() {
if (drawnMask == 0) return;
BatchStateGuard.beforeChange();
final int draw = GLSMFramebuffer.getDrawFramebuffer();
final int read = GLSMFramebuffer.getReadFramebuffer();
final int activeProgram = GLSMPrograms.getActiveProgram();
final int activeVao = GLSMQueries.glGetInteger(GL30.GL_VERTEX_ARRAY_BINDING);
if (program == null) initProgram();
syncSize();
if (drawnMask == 0) return;
final Target snapshot = depthSnapshot();
final int depth = GLSMAttribStack.pushState(compositeState);
try {
GLSMRasterizer.disableScissorTest();
blit(main.framebuffer(), snapshot.framebuffer.getId(), GL11.GL_DEPTH_BUFFER_BIT);
GLSMFramebuffer.glBindFramebuffer(GL30.GL_FRAMEBUFFER, main.framebuffer());
GLSMRasterizer.glViewport(0, 0, width, height);
GLSMBlend.enableBlend();
GLSMBlend.tryBlendFuncSeparate(GL11.GL_ONE, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ZERO, GL11.GL_ONE);
GLSMRasterizer.disableCull();
GLSMDepthStencilAlpha.enableDepthTest();
GLSMDepthStencilAlpha.glDepthFunc(GL11.GL_ALWAYS);
GLSMDepthStencilAlpha.glDepthMask(true);
bindTexture(0, snapshot.depth);
for (int i = 0; i < LAYERS; i++) {
if ((drawnMask & (1 << i)) == 0) continue;
bindTexture(FIRST_LAYER_UNIT + i, layers[i].color);
bindTexture(FIRST_LAYER_UNIT + LAYERS + i, layers[i].depth);
}
if (behindDrawn) bindTexture(TERRAIN_BEHIND_UNIT, layers[TranslucentLayer.TERRAIN.ordinal()].behind);
final CompositeProgram composite = behindDrawn ? behindProgram : program;
GLSMPrograms.glUseProgram(composite.program.handle());
GLSMPrograms.glUniform1i(composite.maskUniform, drawnMask);
GLSMVertexInput.glBindVertexArray(vao);
GLSMDraws.glDrawArrays(GL11.GL_TRIANGLES, 0, 3);
} finally {
GLSMVertexInput.glBindVertexArray(activeVao);
GLSMPrograms.glUseProgram(activeProgram);
GLSMFramebuffer.glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, draw);
GLSMFramebuffer.glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, read);
GLSMAttribStack.popStateTo(depth);
drawnMask = 0;
behindDrawn = false;
}
}
public void destroy() {
destroyTargets();
if (program != null) {
program.program.delete();
behindProgram.program.delete();
GLSMVertexInput.glDeleteVertexArrays(vao);
program = null;
behindProgram = null;
}
}
private void initProgram() {
program = new CompositeProgram("angelica:translucency_composite", ShaderConstants.EMPTY);
behindProgram = new CompositeProgram("angelica:translucency_composite_behind", ShaderConstants.builder().add("TERRAIN_BEHIND").build());
vao = GLSMVertexInput.glGenVertexArrays();
compositeState = StateSet.forMask(GL11.GL_ALL_ATTRIB_BITS);
}
private void prepare(Target target) {
clear(target);
blit(main.framebuffer(), target.framebuffer.getId(), depthFormat.isCombinedStencil() ? GL11.GL_DEPTH_BUFFER_BIT | GL11.GL_STENCIL_BUFFER_BIT : GL11.GL_DEPTH_BUFFER_BIT);
}
private void clear(Target target) {
if (prepareState == null) prepareState = StateSet.forMask(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_SCISSOR_BIT);
final int depth = GLSMAttribStack.pushState(prepareState);
try {
GLSMRasterizer.disableScissorTest();
GLSMBlend.glColorMask(true, true, true, true);
target.framebuffer.bind();
GLSMBlend.glClearColor(0f, 0f, 0f, 0f);
GLSMFramebuffer.glClear(GL11.GL_COLOR_BUFFER_BIT);
} finally {
GLSMAttribStack.popStateTo(depth);
}
}
private void blit(int from, int to, int mask) {
GLSMFramebuffer.glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, from);
GLSMFramebuffer.glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, to);
GLSMFramebuffer.glBlitFramebuffer(0, 0, width, height, 0, 0, width, height, mask, GL11.GL_NEAREST);
}
private static void bindTexture(int unit, int texture) {
GLSMTextures.glActiveTexture(GL13.GL_TEXTURE0 + unit);
GLSMTextures.glBindTexture(GL11.GL_TEXTURE_2D, texture);
}
private void syncSize() {
if (main.width() == width && main.height() == height && main.depthVersion() == depthVersion) return;
destroyTargets();
width = main.width();
height = main.height();
depthVersion = main.depthVersion();
depthFormat = DepthBufferFormat.fromGlEnumOrDefault(TextureInfoCache.INSTANCE.getInfo(main.depthTexture()).getInternalFormat());
}
private Target layer(TranslucentLayer layer) {
final int i = layer.ordinal();
if (layers[i] == null) layers[i] = new Target(width, height, depthFormat, true);
return layers[i];
}
private Target depthSnapshot() {
if (depthSnapshot == null) depthSnapshot = new Target(width, height, depthFormat, false);
return depthSnapshot;
}
private void destroyTargets() {
for (int i = 0; i < LAYERS; i++) {
if (layers[i] != null) layers[i].destroy();
layers[i] = null;
}
if (depthSnapshot != null) depthSnapshot.destroy();
depthSnapshot = null;
drawnMask = 0;
behindDrawn = false;
}
private static final class CompositeProgram {
final GlProgram<Object> program;
final int maskUniform;
CompositeProgram(String name, ShaderConstants constants) {
program = PanoramaRenderer.loadProgram(name, "angelica:panorama_blur", "angelica:translucency_composite", constants, ctx -> ctx);
final int handle = program.handle();
GLSMPrograms.glUseProgram(handle);
GLSMPrograms.glUniform1i(GLSMPrograms.glGetUniformLocation(handle, "u_Depth"), 0);
for (int i = 0; i < LAYERS; i++) {
GLSMPrograms.glUniform1i(GLSMPrograms.glGetUniformLocation(handle, "u_Layer" + i), FIRST_LAYER_UNIT + i);
GLSMPrograms.glUniform1i(GLSMPrograms.glGetUniformLocation(handle, "u_LayerDepth" + i), FIRST_LAYER_UNIT + LAYERS + i);
}
GLSMPrograms.glUniform1i(GLSMPrograms.glGetUniformLocation(handle, "u_TerrainBehind"), TERRAIN_BEHIND_UNIT);
maskUniform = GLSMPrograms.glGetUniformLocation(handle, "u_LayerMask");
GLSMPrograms.glUseProgram(0);
}
}
private static final class Target {
final int color;
final int depth;
final GlFramebuffer framebuffer;
int behind;
Target(int width, int height, DepthBufferFormat depthFormat, boolean withColor) {
depth = texture(width, height, depthFormat.getGlInternalFormat(), depthFormat.getGlType(), depthFormat.getGlFormat());
framebuffer = new GlFramebuffer();
framebuffer.addDepthAttachment(depth);
if (withColor) {
color = texture(width, height, GL11.GL_RGBA8, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE);
framebuffer.addColorAttachment(0, color);
framebuffer.drawBuffers(SINGLE_BUFFER);
framebuffer.readBuffer(0);
} else {
color = 0;
framebuffer.noDrawBuffers();
RenderSystem.readBuffer(framebuffer.getId(), GL11.GL_NONE);
}
}
void attachBehind(int width, int height) {
if (behind != 0) return;
behind = texture(width, height, GL11.GL_RGBA8, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE);
framebuffer.addColorAttachment(1, behind);
}
private static int texture(int width, int height, int internalFormat, int format, int type) {
final int previous = GLSMQueries.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
final int texture = GLSMTextures.glGenTextures();
GLSMTextures.glBindTexture(GL11.GL_TEXTURE_2D, texture);
GLSMTextures.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
GLSMTextures.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
GLSMTextures.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, GL12.GL_CLAMP_TO_EDGE);
GLSMTextures.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_T, GL12.GL_CLAMP_TO_EDGE);
GLSMTextures.glTexImage2D(GL11.GL_TEXTURE_2D, 0, internalFormat, width, height, 0, format, type, (ByteBuffer) null);
GLSMTextures.glBindTexture(GL11.GL_TEXTURE_2D, previous);
return texture;
}
void destroy() {
framebuffer.destroy();
if (color != 0) GLSMTextures.glDeleteTextures(color);
if (behind != 0) GLSMTextures.glDeleteTextures(behind);
GLSMTextures.glDeleteTextures(depth);
}
}
private static final class MinecraftTarget implements MainTarget {
private static Framebuffer fb() {
return Minecraft.getMinecraft().getFramebuffer();
}
@Override public int framebuffer() { return fb().framebufferObject; }
@Override public int depthTexture() { return ((IRenderTargetExt) fb()).iris$getDepthTextureId(); }
@Override public int width() { return fb().framebufferWidth; }
@Override public int height() { return fb().framebufferHeight; }
@Override public int depthVersion() { return ((IRenderTargetExt) fb()).iris$getDepthBufferVersion(); }
}
}
@@ -0,0 +1,9 @@
package com.gtnewhorizons.angelica.rendering.translucency;
public enum TranslucentLayer {
TERRAIN,
BLOCK_ENTITIES,
PARTICLES,
WEATHER,
CLOUDS
}
@@ -47,6 +47,7 @@ import me.jellysquid.mods.sodium.client.gui.options.named.MultiDrawMode;
import me.jellysquid.mods.sodium.client.gui.options.named.ParticleMode;
import me.jellysquid.mods.sodium.client.gui.options.named.TexelSampling;
import me.jellysquid.mods.sodium.client.gui.options.named.TextureFilterMode;
import me.jellysquid.mods.sodium.client.gui.options.named.TranslucencyMode;
import me.jellysquid.mods.sodium.client.gui.options.storage.AngelicaOptionsStorage;
import me.jellysquid.mods.sodium.client.gui.options.storage.CubicChunksOptionStorage;
import me.jellysquid.mods.sodium.client.gui.options.storage.MinecraftOptionsStorage;
@@ -403,15 +404,23 @@ public class SodiumGameOptionPages {
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
.build()
)
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
.setName(I18n.format("sodium.options.translucency_sorting.name"))
.setTooltip(I18n.format("sodium.options.translucency_sorting.tooltip"))
.setControl(TickBoxControl::new)
.setBinding((opts, value) -> opts.performance.translucencySorting = value, opts -> opts.performance.translucencySorting)
.add(OptionImpl.createBuilder(TranslucencyMode.class, sodiumOpts)
.setName(I18n.format("sodium.options.translucency_mode.name"))
.setTooltip(I18n.format("sodium.options.translucency_mode.tooltip"))
.setControl(o -> new CyclingControl<>(o, TranslucencyMode.class))
.setBinding((opts, value) -> opts.performance.translucencyMode = value, opts -> opts.performance.translucencyMode)
.setImpact(OptionImpact.MEDIUM)
.setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD)
.build()
)
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
.setName(I18n.format("sodium.options.block_entities_before_translucent_terrain.name"))
.setTooltip(I18n.format("sodium.options.block_entities_before_translucent_terrain.tooltip"))
.setControl(TickBoxControl::new)
.setBinding((opts, value) -> opts.performance.blockEntitiesBeforeTranslucentTerrain = value, opts -> opts.performance.blockEntitiesBeforeTranslucentTerrain)
.setImpact(OptionImpact.LOW)
.build()
)
.add(OptionImpl.createBuilder(boolean.class, sodiumOpts)
.setName(I18n.format("sodium.options.use_entity_culling.name"))
.setTooltip(I18n.format("sodium.options.use_entity_culling.tooltip"))
@@ -15,6 +15,7 @@ import me.jellysquid.mods.sodium.client.gui.options.named.MipmapGeneration;
import me.jellysquid.mods.sodium.client.gui.options.named.MultiDrawMode;
import me.jellysquid.mods.sodium.client.gui.options.named.TexelSampling;
import me.jellysquid.mods.sodium.client.gui.options.named.TextureFilterMode;
import me.jellysquid.mods.sodium.client.gui.options.named.TranslucencyMode;
import net.coderbot.iris.Iris;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.OpenGlHelper;
@@ -24,6 +25,7 @@ import org.embeddedt.embeddium.impl.render.chunk.occlusion.AsyncOcclusionMode;
import java.io.FileReader;
import java.io.IOException;
import java.io.Reader;
import java.lang.reflect.Modifier;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -124,7 +126,7 @@ public class SodiumGameOptions {
if (Files.exists(path)) {
try (FileReader reader = new FileReader(path.toFile())) {
config = GSON.fromJson(reader, SodiumGameOptions.class);
config = read(reader);
} catch (IOException e) {
throw new RuntimeException("Could not parse config", e);
} catch (JsonSyntaxException e) {
@@ -142,23 +144,6 @@ public class SodiumGameOptions {
config.configPath = path;
if (config.advanced.streamingUploadStrategy == null) {
config.advanced.streamingUploadStrategy = StreamingUploader.UploadStrategy.MAP_BUFFER_RANGE;
}
if (config.quality.textureFilterMode == null) {
config.quality.textureFilterMode = TextureFilterMode.RGSS_ANISOTROPIC;
}
if (config.quality.texelSampling == null) {
config.quality.texelSampling = TexelSampling.LINEAR;
}
config.quality.guiBlockSupersampling = Integer.highestOneBit(MathHelper.clamp_int(config.quality.guiBlockSupersampling, 1, 16));
if (config.quality.mipmapGeneration == null) {
config.quality.mipmapGeneration = MipmapGeneration.MODERN_VANILLA;
}
if (GLStateManager.capabilities != null) {
if (!GLStateManager.capabilities.OpenGL32) {
config.performance.cpuRenderAheadLimit = 0;
@@ -179,6 +164,43 @@ public class SodiumGameOptions {
return config;
}
static SodiumGameOptions read(Reader reader) {
final SodiumGameOptions config = GSON.fromJson(reader, SodiumGameOptions.class);
config.normalize();
return config;
}
private void normalize() {
if (this.advanced.streamingUploadStrategy == null) {
this.advanced.streamingUploadStrategy = StreamingUploader.UploadStrategy.MAP_BUFFER_RANGE;
}
if (this.quality.textureFilterMode == null) {
this.quality.textureFilterMode = TextureFilterMode.RGSS_ANISOTROPIC;
}
if (this.quality.texelSampling == null) {
this.quality.texelSampling = TexelSampling.LINEAR;
}
this.quality.guiBlockSupersampling = Integer.highestOneBit(MathHelper.clamp_int(this.quality.guiBlockSupersampling, 1, 16));
if (this.quality.mipmapGeneration == null) {
this.quality.mipmapGeneration = MipmapGeneration.MODERN_VANILLA;
}
if (this.performance.translucencySorting != null) {
this.performance.translucencyMode = this.performance.translucencySorting ? TranslucencyMode.FAST : TranslucencyMode.OFF;
this.performance.translucencySorting = null;
}
if (this.performance.translucencyMode == null) {
this.performance.translucencyMode = TranslucencyMode.FAST;
}
}
String toJson() {
return GSON.toJson(this);
}
private static boolean isLwjgl2() {
return SodiumGameOptions.class.getClassLoader().getResource("org/lwjgl/Sys.class") != null;
}
@@ -196,7 +218,7 @@ public class SodiumGameOptions {
throw new IOException("Not a directory: " + dir);
}
Files.writeString(this.configPath, GSON.toJson(this));
Files.writeString(this.configPath, toJson());
if (Iris.enabled) {
try {
if (Iris.getIrisConfig() != null) {
@@ -233,7 +255,9 @@ public class SodiumGameOptions {
public boolean useFogOcclusion = true;
public boolean useBlockFaceCulling = true;
public boolean useCompactVertexFormat = true;
public boolean translucencySorting = true;
public TranslucencyMode translucencyMode = TranslucencyMode.FAST;
public Boolean translucencySorting;
public boolean blockEntitiesBeforeTranslucentTerrain = true;
public boolean useRenderPassOptimization = true;
public int cpuRenderAheadLimit = 3;
}
@@ -0,0 +1,26 @@
package me.jellysquid.mods.sodium.client.gui.options.named;
public enum TranslucencyMode implements NamedState {
OFF("options.off"),
FAST("options.graphics.fast"),
FANCY("options.graphics.fancy");
private final String name;
TranslucencyMode(String name) {
this.name = name;
}
@Override
public String getKey() {
return this.name;
}
public boolean sorts() {
return this != OFF;
}
public boolean composites() {
return this == FANCY;
}
}
@@ -30,12 +30,6 @@ public class SmoothFloat {
private float cachedHalfLifeDown;
private float cachedDecayDown;
// What the accumulator was at the start of this frame. Custom uniforms can be evaluated again mid-frame (see
// LocalGridFrame), and each of those calls has to smooth from the same point instead of stepping again.
private int frame = -1;
private float frameStartAccumulator;
private boolean frameStartHasInitialValue;
/**
* Computes an exponential decay factor based on the given decay constant and time value
*
@@ -64,16 +58,6 @@ public class SmoothFloat {
* Takes one value from the unsmoothed value sequence, and smooths it into our accumulator
*/
public float updateAndGet(float value, float halfLifeUp, float halfLifeDown) {
final int now = SystemTimeUniforms.COUNTER.getAsInt();
if (now != frame) {
frame = now;
frameStartAccumulator = accumulator;
frameStartHasInitialValue = hasInitialValue;
} else {
accumulator = frameStartAccumulator;
hasInitialValue = frameStartHasInitialValue;
}
if (halfLifeUp != cachedHalfLifeUp) {
cachedHalfLifeUp = halfLifeUp;
if (halfLifeUp == 0.0f) {
@@ -967,15 +967,6 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
return current;
}
/** Evaluates these built-in uniforms again and pushes them to the bound pass, see LocalGridFrame. */
public void refreshUniforms(String[] names) {
customUniforms.refreshInputs(names);
if (current != null && current.liveProgram != null
&& GLSMPrograms.getActiveProgram() == current.liveProgram.getProgramId()) {
current.pushCustomUniforms();
}
}
public int getActivePassProgramId() {
if (current == null) return -1;
final Program p = current.boundProgram();
@@ -1506,10 +1497,6 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
}
}
void pushCustomUniforms() {
DeferredWorldRenderingPipeline.this.customUniforms.push(liveProgram == program ? this : liveProgram);
}
private void bindSelected() {
final Program selected = select(activeInstancing, GLSMRasterizer.clipEmulationActive());
liveProgram = selected;
@@ -1,8 +1,6 @@
package net.coderbot.iris.pipeline;
import com.google.common.collect.ImmutableList;
import com.gtnewhorizons.angelica.api.shadows.ShadowCasters;
import com.gtnewhorizons.angelica.api.shadows.ShadowStage;
import com.gtnewhorizons.angelica.compat.mojang.Camera;
import com.gtnewhorizons.angelica.compat.mojang.GameModeUtil;
import com.gtnewhorizons.angelica.compat.toremove.MatrixStack;
@@ -871,24 +869,6 @@ public class ShadowRenderer {
profiler.endSection();
}
private void renderShadowCasters(ShadowStage stage, MatrixStack modelView, double cameraX, double cameraY, double cameraZ, float partialTicks) {
if (!ShadowCasters.hasCasters()) return;
try (GLDebug.Scope s = GLDebug.scope("shadow:casters")) {
GLSMMatrices.glPushMatrix();
MODELVIEW_BUFFER.clear().rewind();
modelView.peek().getModel().get(MODELVIEW_BUFFER);
GLSMMatrices.glLoadMatrix(MODELVIEW_BUFFER);
GbufferPrograms.beginBlockEntities();
GbufferPrograms.setBlockEntityDefaults();
try {
ShadowCasters.renderAll(stage, cameraX, cameraY, cameraZ, partialTicks);
} finally {
GbufferPrograms.endBlockEntities();
GLSMMatrices.glPopMatrix();
}
}
}
public void renderShadows(EntityRenderer levelRenderer, Camera playerCamera) {
final Minecraft mc = Minecraft.getMinecraft();
final RenderGlobal rg = mc.renderGlobal;
@@ -1047,9 +1027,6 @@ public class ShadowRenderer {
}
}
// Mod geometry that should shadow like terrain, so not tied to the pack's block entity shadow setting
renderShadowCasters(ShadowStage.SOLID, modelView, entityX, entityY, entityZ, tickDelta);
profiler.endStartSection("iris_shadow_draw_entities");
// NB: Don't try to draw the translucent parts of entities afterwards. It'll cause problems since some
@@ -1067,7 +1044,6 @@ public class ShadowRenderer {
try (GLDebug.Scope s = GLDebug.scope("shadow:translucent")) {
rg.sortAndRender(mc.renderViewEntity, 1, playerCamera.getPartialTicks());
}
renderShadowCasters(ShadowStage.TRANSLUCENT, modelView, entityX, entityY, entityZ, tickDelta);
}
// Note: Apparently tripwire isn't rendered in the shadow pass.
@@ -29,7 +29,6 @@ public class CameraUniforms {
public static void addCameraUniforms(UniformHolder uniforms, FrameUpdateNotifier notifier) {
final CameraPositionTracker tracker = new CameraPositionTracker(notifier);
LocalGridFrame.trackCamera(tracker);
uniforms
.uniform1f(ONCE, "near", () -> 0.05)
@@ -1,260 +0,0 @@
package net.coderbot.iris.uniforms;
import org.joml.Matrix3d;
import org.joml.Matrix4f;
import org.joml.Matrix4fc;
import org.joml.Vector3d;
import org.joml.Vector3dc;
import org.joml.Vector3f;
import org.joml.Vector3fc;
import org.joml.Vector3ic;
import org.joml.Vector4f;
import org.joml.Vector4fc;
import java.util.HashMap;
import java.util.Map;
import java.util.function.DoubleSupplier;
import java.util.function.DoubleUnaryOperator;
import java.util.function.Supplier;
import java.util.function.UnaryOperator;
import java.util.stream.Stream;
/**
* Lets a draw's own model space stand in for the world's block grid, for geometry drawn rotated or off the grid
* (structures, previews).
* <p>
* Packs pick out parts of some blocks by where a pixel is inside its world block, {@code fract(playerPos +
* cameraPosition)}, e.g. the water in a cauldron or the eye of an end portal frame. Off the grid that cuts through the
* block in the wrong place. While this is active the uniforms describe a world where the draw's model coordinates are
* world coordinates, moved by whole blocks to stay near the real position. View space, clip space and the shadow map
* come out exactly the same, so only what a pack works out in world space changes.
* <p>
* Every uniform that changes is in the remap tables below, keyed by name. The custom uniform input holder wraps those
* suppliers when it's built (see the wrap methods), so the uniform classes themselves don't know about any of this. A
* new world space uniform only needs a line here. The uniforms are worked out once a frame, so starting or ending this
* works them out again and pushes them to the bound program, see {@link #UNIFORMS}.
*/
public final class LocalGridFrame {
private static final Map<String, UnaryOperator<Vector3d>> VEC3D = new HashMap<>();
private static final Map<String, UnaryOperator<Vector3fc>> VEC3F = new HashMap<>();
private static final Map<String, UnaryOperator<Vector3ic>> VEC3I = new HashMap<>();
private static final Map<String, UnaryOperator<Vector4fc>> VEC4F = new HashMap<>();
private static final Map<String, UnaryOperator<Matrix4fc>> MATRIX = new HashMap<>();
private static final Map<String, DoubleUnaryOperator> DOUBLE = new HashMap<>();
/** Every uniform that changes under the frame. */
public static final String[] UNIFORMS;
private static boolean active;
private static CameraUniforms.CameraPositionTracker tracker;
// Model to player space is T = V^-1 * M, linear part L and translation t. Everything below comes from that
private static final Matrix4f postfix = new Matrix4f();
private static final Matrix4f postfixInverse = new Matrix4f();
private static final Matrix3d linearInverse = new Matrix3d();
private static final Vector3d eye = new Vector3d();
private static final Vector3d modelCamera = new Vector3d();
private static final Vector3d modelOrigin = new Vector3d();
private static final Vector4f up = new Vector4f();
// What the remaps hand back. Like the suppliers they wrap (CameraUniforms and MatrixUniforms keep scratch objects
// too), a value is only good until the next remap runs. The cached uniforms in the input holder all copy it
// straight away, anything new that takes a wrapped supplier has to do the same
private static final Matrix4f scratch = new Matrix4f();
private static final Vector3d current = new Vector3d();
private static final Vector3d previous = new Vector3d();
private static final Vector3d point = new Vector3d();
private static final Vector3d offset = new Vector3d();
private static final Vector3d direction = new Vector3d();
private static final Vector3f offset3f = new Vector3f();
private static final Vector4f offset4f = new Vector4f();
static {
// World positions. The shifted ones keep Iris's shift, the unshifted ones read the real camera directly
VEC3D.put("cameraPosition", LocalGridFrame::camera);
DOUBLE.put("eyeAltitude", y -> Math.rint(y + modelOrigin.y) + modelCamera.y);
VEC3D.put("previousCameraPosition", real -> tracker == null ? real
: previousCamera(tracker.getCurrentCameraPosition(), real));
VEC3I.put("cameraPositionInt", real -> CameraUniforms.getCameraPositionInt(unshiftedCamera()));
VEC3F.put("cameraPositionFract", real -> CameraUniforms.getCameraPositionFract(unshiftedCamera()));
VEC3I.put("previousCameraPositionInt", real -> tracker == null ? real
: CameraUniforms.getCameraPositionInt(unshiftedPreviousCamera()));
VEC3F.put("previousCameraPositionFract", real -> tracker == null ? real
: CameraUniforms.getCameraPositionFract(unshiftedPreviousCamera()));
VEC3D.put("eyePosition", real -> worldPosition(CameraUniforms.getUnshiftedCameraPosition(), real));
// Offsets from the unshifted camera
VEC3D.put("relativeEyePosition", LocalGridFrame::offset);
VEC3D.put("relativeVehiclePosition", LocalGridFrame::offset);
// -256 on every axis means nothing is selected
VEC3F.put("currentSelectedBlockPos", real -> real.x() == -256.0f && real.y() == -256.0f && real.z() == -256.0f
? real : offset3f.set(offset(point.set(real.x(), real.y(), real.z()))));
// w is 0 when there's no bolt
VEC4F.put("lightningBoltPosition", real -> {
if (real.w() == 0.0f) return real;
final Vector3d moved = offset(point.set(real.x(), real.y(), real.z()));
return offset4f.set((float) moved.x, (float) moved.y, (float) moved.z, real.w());
});
// Directions in the world
VEC3D.put("playerLookVector", LocalGridFrame::direction);
VEC3D.put("playerBodyVector", LocalGridFrame::direction);
VEC3D.put("vehicleLookVector", LocalGridFrame::direction);
// View space, so only up changes
VEC4F.put("upPosition", real -> up);
// Matrices that take world space positions relative to the camera
MATRIX.put("gbufferModelView", LocalGridFrame::modelView);
MATRIX.put("gbufferPreviousModelView", LocalGridFrame::modelView);
MATRIX.put("shadowModelView", LocalGridFrame::modelView);
MATRIX.put("gbufferModelViewInverse", LocalGridFrame::modelViewInverse);
MATRIX.put("shadowModelViewInverse", LocalGridFrame::modelViewInverse);
UNIFORMS = Stream.of(VEC3D, VEC3F, VEC3I, VEC4F, MATRIX, DOUBLE).flatMap(m -> m.keySet().stream())
.toArray(String[]::new);
}
private LocalGridFrame() {}
public static boolean isActive() {
return active;
}
/** The pipeline's camera tracker, for the uniforms that need the camera rather than their own value. */
static void trackCamera(CameraUniforms.CameraPositionTracker cameraTracker) {
tracker = cameraTracker;
}
/**
* @param drawModelView the modelview the geometry is drawn with
* @return false when it can't be done (a modelview that can't be inverted)
*/
public static boolean begin(Matrix4fc drawModelView) {
final Matrix4f view = new Matrix4f(MatrixUniforms.getGbufferModelView());
final Matrix4f viewInverse = new Matrix4f(view).invert();
final Matrix4f model = new Matrix4f(viewInverse).mul(drawModelView);
if (!Float.isFinite(model.determinant()) || Math.abs(model.determinant3x3()) < 1e-8f) return false;
// The camera's eye in player space, and in model space
eye.set(viewInverse.m30(), viewInverse.m31(), viewInverse.m32());
final Matrix3d linear = new Matrix3d(model.m00(), model.m01(), model.m02(), model.m10(), model.m11(),
model.m12(), model.m20(), model.m21(), model.m22());
linearInverse.set(linear).invert();
modelOrigin.set(model.m30(), model.m31(), model.m32());
modelCamera.set(eye).sub(modelOrigin);
linearInverse.transform(modelCamera);
// gbufferModelView' = V * translate(eye) * L, so V' * (p - camera) lands where M * p does
postfix.identity().translate((float) eye.x, (float) eye.y, (float) eye.z)
.mul(new Matrix4f().set3x3(model));
postfix.invert(postfixInverse);
// Model space up in view space, 100 long like the real upPosition
final Vector3f modelUp = model.transformDirection(new Vector3f(0, 1, 0)).normalize(100);
view.transformDirection(modelUp);
up.set(modelUp, 0);
active = true;
return true;
}
public static void end() {
active = false;
}
// The wrap methods are for the custom uniform input holder, each hands back the supplier with the remap applied
// while the frame is active, or the same supplier if that uniform doesn't change
public static Supplier<Vector3d> wrap3d(String name, Supplier<Vector3d> real) {
return wrap(VEC3D.get(name), real);
}
public static Supplier<Vector3fc> wrap3f(String name, Supplier<Vector3fc> real) {
return wrap(VEC3F.get(name), real);
}
public static Supplier<Vector3ic> wrap3i(String name, Supplier<Vector3ic> real) {
return wrap(VEC3I.get(name), real);
}
public static Supplier<Vector4fc> wrap4f(String name, Supplier<Vector4fc> real) {
return wrap(VEC4F.get(name), real);
}
public static Supplier<Matrix4fc> wrapMatrix(String name, Supplier<Matrix4fc> real) {
return wrap(MATRIX.get(name), real);
}
public static DoubleSupplier wrapDouble(String name, DoubleSupplier real) {
final DoubleUnaryOperator remap = DOUBLE.get(name);
if (remap == null) return real;
return () -> active ? remap.applyAsDouble(real.getAsDouble()) : real.getAsDouble();
}
private static <T> Supplier<T> wrap(UnaryOperator<T> remap, Supplier<T> real) {
if (remap == null) return real;
return () -> active ? remap.apply(real.get()) : real.get();
}
/** Where the model origin really is, rounded to whole blocks, so the frame's world stays near the real one. */
private static Vector3d shift(Vector3dc realCamera, Vector3d dest) {
return dest.set(
Math.rint(realCamera.x() + modelOrigin.x),
Math.rint(realCamera.y() + modelOrigin.y),
Math.rint(realCamera.z() + modelOrigin.z));
}
/** cameraPosition (or its unshifted twin) for a real one. */
private static Vector3d camera(Vector3d realCamera) {
return shift(realCamera, current).add(modelCamera);
}
private static Vector3d unshiftedCamera() {
return camera(CameraUniforms.getUnshiftedCameraPosition());
}
private static Vector3d unshiftedPreviousCamera() {
final Vector3d realPrevious = tracker.getPreviousCameraPositionUnshifted();
return previousCamera(CameraUniforms.getUnshiftedCameraPosition(), realPrevious);
}
/** previousCameraPosition, from the camera's last step turned into model space. */
private static Vector3d previousCamera(Vector3d realCamera, Vector3d realPrevious) {
previous.set(realCamera).sub(realPrevious);
linearInverse.transform(previous);
return previous.negate().add(camera(realCamera));
}
/** A real world position (eyePosition) moved into the frame's world, against the unshifted camera. */
private static Vector3d worldPosition(Vector3dc realCamera, Vector3dc realPosition) {
point.set(realPosition).sub(realCamera).sub(modelOrigin);
linearInverse.transform(point);
return shift(realCamera, current).add(point);
}
/**
* An offset from the unshifted camera (relativeEyePosition and co), as the same offset in the frame's world. Works
* out to {@link #worldPosition} minus the unshifted cameraPosition.
*/
private static Vector3d offset(Vector3d realOffset) {
return linearInverse.transform(offset.set(realOffset).sub(eye));
}
/** A world space direction turned into model space, same length. */
private static Vector3d direction(Vector3d real) {
final double length = real.length();
if (length == 0) return real;
return linearInverse.transform(direction.set(real)).normalize(length);
}
/** gbufferModelView, gbufferPreviousModelView or shadowModelView for a real one. */
private static Matrix4fc modelView(Matrix4fc real) {
return scratch.set(real).mul(postfix);
}
/** Their inverses, (R * P)^-1 = P^-1 * R^-1 for the real inverse. */
private static Matrix4fc modelViewInverse(Matrix4fc realInverse) {
return scratch.set(postfixInverse).mul(realInverse);
}
}
@@ -22,7 +22,7 @@ public final class MatrixUniforms {
}
private static final Matrix4f GBUFFER_MODELVIEW_SCRATCH = new Matrix4f();
static Matrix4fc getGbufferModelView() {
private static Matrix4fc getGbufferModelView() {
final Matrix4fc raw = RenderingState.INSTANCE.getModelViewMatrix();
final Entity view = Minecraft.getMinecraft().renderViewEntity;
if (view == null) {
@@ -8,7 +8,6 @@ import net.coderbot.iris.gl.uniform.FloatSupplier;
import net.coderbot.iris.gl.uniform.UniformHolder;
import com.gtnewhorizons.angelica.glsm.shader.UniformType;
import net.coderbot.iris.gl.uniform.UniformUpdateFrequency;
import net.coderbot.iris.uniforms.LocalGridFrame;
import net.coderbot.iris.uniforms.custom.cached.BooleanCachedUniform;
import net.coderbot.iris.uniforms.custom.cached.CachedUniform;
import net.coderbot.iris.uniforms.custom.cached.Float2VectorCachedUniform;
@@ -95,8 +94,7 @@ public class CustomUniformFixedInputUniformsHolder {
@Override
public Builder uniform1f(UniformUpdateFrequency updateFrequency, String name, DoubleSupplier value) {
final DoubleSupplier wrapped = LocalGridFrame.wrapDouble(name, value);
return this.put(name, new FloatCachedUniform(name, updateFrequency, () -> (float) wrapped.getAsDouble()));
return this.put(name, new FloatCachedUniform(name, updateFrequency, () -> (float) value.getAsDouble()));
}
@Override
@@ -121,13 +119,11 @@ public class CustomUniformFixedInputUniformsHolder {
@Override
public Builder uniform3f(UniformUpdateFrequency updateFrequency, String name, Supplier<Vector3fc> value) {
value = LocalGridFrame.wrap3f(name, value);
return this.put(name, new Float3VectorCachedUniform(name, updateFrequency, value));
}
@Override
public Builder uniform3i(UniformUpdateFrequency updateFrequency, String name, Supplier<Vector3ic> value) {
value = LocalGridFrame.wrap3i(name, value);
return this.put(name, new Int3VectorCachedUniform(name, updateFrequency, value));
}
@@ -138,10 +134,9 @@ public class CustomUniformFixedInputUniformsHolder {
@Override
public Builder uniformTruncated3f(UniformUpdateFrequency updateFrequency, String name, Supplier<Vector4fc> value) {
final Supplier<Vector4fc> wrapped = LocalGridFrame.wrap4f(name, value);
Vector3f held = new Vector3f();
return this.put(name, new Float3VectorCachedUniform(name, updateFrequency, () -> {
final Vector4fc vec = wrapped.get();
final Vector4fc vec = value.get();
held.set(vec.x(), vec.y(), vec.z());
return held;
}));
@@ -149,10 +144,9 @@ public class CustomUniformFixedInputUniformsHolder {
@Override
public UniformHolder uniform3d(UniformUpdateFrequency updateFrequency, String name, Supplier<Vector3d> value) {
final Supplier<Vector3d> wrapped = LocalGridFrame.wrap3d(name, value);
Vector3f held = new Vector3f();
return this.put(name, new Float3VectorCachedUniform(name, updateFrequency, () -> {
Vector3d vec = wrapped.get();
Vector3d vec = value.get();
held.set(vec.x(), vec.y(), vec.z());
return held;
}));
@@ -160,10 +154,9 @@ public class CustomUniformFixedInputUniformsHolder {
@Override
public UniformHolder uniform4f(UniformUpdateFrequency updateFrequency, String name, Supplier<Vector4fc> value) {
final Supplier<Vector4fc> wrapped = LocalGridFrame.wrap4f(name, value);
Vector4f held = new Vector4f();
return this.put(name, new Float4VectorCachedUniform(name, updateFrequency, () -> {
final Vector4fc vec = wrapped.get();
final Vector4fc vec = value.get();
held.set(vec.x(), vec.y(), vec.z(), vec.w());
return held;
}));
@@ -182,7 +175,6 @@ public class CustomUniformFixedInputUniformsHolder {
@Override
public UniformHolder uniformMatrix(
UniformUpdateFrequency updateFrequency, String name, Supplier<Matrix4fc> value) {
value = LocalGridFrame.wrapMatrix(name, value);
return this.put(name, new Float4MatrixCachedUniform(name, updateFrequency, value));
}
@@ -48,9 +48,6 @@ public class CustomUniforms implements FunctionContext {
private final Object2LongOpenHashMap<Object> lastPushedGen = new Object2LongOpenHashMap<>();
private long generation;
private String[] refreshNames;
private CachedUniform[] refreshOrder;
private static final long PLOT_CUSTOM_PUSHED = Tracy.ENABLED ? Tracy.plotHandle("iris.customPushed") : 0;
private static final long PLOT_CUSTOM_SKIPPED = Tracy.ENABLED ? Tracy.plotHandle("iris.customSkipped") : 0;
private int pushedThisFrame;
@@ -257,41 +254,6 @@ public class CustomUniforms implements FunctionContext {
}
}
/**
* Evaluates these built-in uniforms again mid-frame, along with every custom uniform made from them, so the next
* push picks them up (see LocalGridFrame).
*/
public void refreshInputs(String[] names) {
if (names != refreshNames) {
refreshNames = names;
refreshOrder = readersInOrder(names);
}
for (CachedUniform uniform : refreshOrder) {
uniform.update();
}
generation++;
}
// The named inputs that are still used and every custom uniform that reads them, directly or not, in the order
// they're evaluated. uniformOrder is already sorted so each uniform comes after what it reads.
private CachedUniform[] readersInOrder(String[] names) {
final Set<CachedUniform> affected = new ObjectOpenHashSet<>();
for (String name : names) {
final CachedUniform uniform = this.inputHolder.getUniform(name);
if (uniform != null) affected.add(uniform);
}
final List<CachedUniform> ordered = new ObjectArrayList<>();
for (CachedUniform uniform : this.uniformOrder) {
if (!affected.contains(uniform)) {
final List<CachedUniform> dependencies = this.dependsOn.get(uniform);
if (dependencies == null || dependencies.stream().noneMatch(affected::contains)) continue;
affected.add(uniform);
}
ordered.add(uniform);
}
return ordered.toArray(new CachedUniform[0]);
}
public void push(Object pass) {
final PassUniforms pu = this.locationMap.get(pass);
if (pu == null) return;
@@ -57,8 +57,7 @@ sodium.options.use_particle_culling.name=Partikel-Culling
sodium.options.use_particle_culling.tooltip=Zeigt nur Partikel innerhalb des Spielersichtfeldes an. Dies kann die Performance bemerkbar verbessern, wenn viele Partikel in der Nähe sind.
sodium.options.animate_only_visible_textures.name=Nur sichtbare Texturen animieren
sodium.options.animate_only_visible_textures.tooltip=Animiert nur Texturen, die auch im Sichtfeld des Spielers sind. Dies kann die Framerate mancher Hardware stark verbessern, besonders bei "schwereren" Ressourcenpaketen. Wenn du Probleme damit hast, dass Texturen nicht animiert werden, versuch, ob das hier auszuschalten hilft.
sodium.options.translucency_sorting.name=Durchsichtigkeits-Sortierung
sodium.options.translucency_sorting.tooltip=Aktiviert die korrekte Sortierung durchsichtiger Blöcke von hinten nach vorne für bessered Rendern,insbesondere bei überlappenden durchsichtigen Blöcken. Dies kann die Rechenlast erhöhen.
sodium.options.translucency_mode.name=Durchsichtigkeits-Sortierung
sodium.options.cpu_render_ahead_limit.name=CPU-Vorausrendern begrenzen
sodium.options.cpu_render_ahead_limit.tooltip=Die maximale Anzahl an Frames, die der CPU auf das Rendern des GPU warten darf. Sehr niedrige oder hohe Werte können die Bildrate destabilisieren.
sodium.options.cpu_render_ahead_limit.value=%s Frame(s)
@@ -89,8 +89,10 @@ sodium.options.use_particle_culling.name=Particle Culling
sodium.options.use_particle_culling.tooltip=If enabled, only particles which are determined to be visible will be rendered. This can provide a significant improvement to frame rates when many particles are nearby.
sodium.options.animate_only_visible_textures.name=Animate Only Visible Textures
sodium.options.animate_only_visible_textures.tooltip=If enabled, only animated textures determined to be visible will be updated. This can provide a significant boost to frame rates on some hardware, especially with heavier resource packs. If you experience issues with some textures not being animated, try disabling this option.
sodium.options.translucency_sorting.name=Translucency Sorting
sodium.options.translucency_sorting.tooltip=If enabled, translucent terrain (water, stained glass, ice) and translucent tile entities are sorted back to front so overlapping layers draw correctly. Disabling improves performance in scenes with lots of translucent blocks but causes layering artifacts. Changing this reloads chunks.
sodium.options.translucency_mode.name=Translucency Sorting
sodium.options.translucency_mode.tooltip=Fast sorts translucent terrain (water, stained glass, ice) and translucent tile entities back to front so overlapping layers draw correctly. Fancy also draws translucent terrain, translucent tile entities, particles, weather and clouds into separate layers that blend correctly over one another; it uses more video memory and GPU time and has no effect with a shader pack. Off is fastest but causes layering artifacts. Changing this reloads chunks.
sodium.options.block_entities_before_translucent_terrain.name=Tile Entities Before Translucent Terrain
sodium.options.block_entities_before_translucent_terrain.tooltip=If enabled, translucent tile entities are drawn before translucent terrain (water, stained glass, ice), so that the latter does not hide the former behind it. Tile Entities in front of terrain may hide the terrain, and glows in front of terrain may appear behind it. Always on with Fancy translucency sorting.
sodium.options.cpu_render_ahead_limit.name=CPU Render-Ahead Limit
sodium.options.cpu_render_ahead_limit.tooltip=How many frames the CPU may run ahead of the GPU. Lower values cut input latency, higher values smooth out uneven frame times. Very low or high values may create frame rate instability. 0 disables it; the SDL-GPU backend ignores it and applies its own backpressure.
sodium.options.cpu_render_ahead_limit.value=%s frame(s)
@@ -82,8 +82,7 @@ sodium.options.use_particle_culling.name=パーティクルカリング
sodium.options.use_particle_culling.tooltip=有効にすると、見えると判断されたパーティクルのみが描画されるようになります。近くに多数のパーティクルがある場合にFPSが大幅に向上する可能性があります。
sodium.options.animate_only_visible_textures.name=見えるアニメーションのみ描画
sodium.options.animate_only_visible_textures.tooltip=有効にすると、表示可能と判断されたアニメーションのみが描画されます。特にリソースパックの負荷が高い場合、一部のハードウェアでFPSが大幅に向上する可能性があります。一部のアニメーションが動かないなどの問題が発生した場合は、この設定を無効にしてください。
sodium.options.translucency_sorting.name=半透明ブロックの整理
sodium.options.translucency_sorting.tooltip=有効にすると、半透明ブロックは奥から手前へと正しく並べ替えられ、特に複数の半透明ブロックが重なっている場合の品質が向上しますが、代わりに負荷が上昇します。
sodium.options.translucency_mode.name=半透明ブロックの整理
sodium.options.cpu_render_ahead_limit.name=CPUの先読み処理制限
sodium.options.cpu_render_ahead_limit.tooltip=CPUがGPUの描画完了まで待機できる最大フレーム数を設定します。極端に低い値、または高い値を設定すると、FPSが不安定になる可能性があります。
sodium.options.cpu_render_ahead_limit.value=%s フレーム
@@ -89,8 +89,7 @@ sodium.options.use_particle_culling.name=Culling cząstek
sodium.options.use_particle_culling.tooltip=Jeśli włączone, tylko cząstki, które uważane są za widoczne, będą renderowane. To może skutkować znaczną poprawą klatek na sekundę, gdy wiele cząstek znajduje się w polu widzenia.
sodium.options.animate_only_visible_textures.name=Animuj tylko widoczne tekstury
sodium.options.animate_only_visible_textures.tooltip=Jeśli włączone, tylko animowane tekstury, które uważane są za widoczne, będą aktualizowane. To może pomóc z wydajnością na niektórych systemach, szczególnie z cięższymi paczkami zasobów. Jeśli zauważyłeś, że niektóre tekstury nie są animowane, spróbuj wyłączyć tę opcję.
sodium.options.translucency_sorting.name=Sortowanie przezroczystości
sodium.options.translucency_sorting.tooltip=Jeśli włączone, przezroczysty teren (woda, kolorowe szkło, lód) i przezroczyste byty-bloki będą sortowane od tyłu do przodu, aby nakładające się warstwy były poprawnie wyświetlone. Wyłączenie tej opcji zwiększa wdyajność w sytuacjach z dużą ilością przezroczystych bloków, ale powoduje artefakty. Zmienienie tej opcji przeładowuje chunki.
sodium.options.translucency_mode.name=Sortowanie przezroczystości
sodium.options.cpu_render_ahead_limit.name=Limit renderowania klatek z wyprzedzeniem przez CPU
sodium.options.cpu_render_ahead_limit.tooltip=Określa maksymalną liczbę klatek na które CPU może czekać, aby zostały wyrenderowane przez GPU. Bardzo niskie lub wysokie wartości mogą powodować niestabilność klatek. 0 wyłącza tą opcję; Backend SDL-GPU ignoruje ją i stosuje własne rozwiązanie.
sodium.options.cpu_render_ahead_limit.value=%s klat(ki/ek)
@@ -55,8 +55,7 @@ sodium.options.use_particle_culling.name=Отсечение Частиц
sodium.options.use_particle_culling.tooltip=Если включено, будут отрисовываться только те частицы, которые определены как видимые. Это может значительно улучшить частоту кадров, когда рядом находится много частиц.
sodium.options.animate_only_visible_textures.name=Анимировать Только Видимые Текстуры
sodium.options.animate_only_visible_textures.tooltip=Если включено, будут обновляться только анимированные текстуры, определенные как видимые. Это может значительно увеличить частоту кадров на некотором оборудовании, особенно с более тяжелыми ресурс-паками. Если у вас возникают проблемы с некоторыми текстурами, которые не анимируются, попробуйте отключить эту опцию.
sodium.options.translucency_sorting.name=Сортировка Прозрачности
sodium.options.translucency_sorting.tooltip=Если включено, прозрачные блоки будут правильно отсортированы сзади вперед для обеспечения лучшей отрисовки, особенно когда в поле зрения находится несколько прозрачных блоков и они слоены. Это немного дорогостоящая операция.
sodium.options.translucency_mode.name=Сортировка Прозрачности
sodium.options.cpu_render_ahead_limit.name=Предел Предварительной Отрисовки CPU
sodium.options.cpu_render_ahead_limit.tooltip=Определяет максимальное количество кадров, которые CPU может ожидать завершения отрисовки на GPU. Очень низкие или высокие значения могут создать нестабильность частоты кадров.
sodium.options.cpu_render_ahead_limit.value=%s кадр(ов)
@@ -73,8 +73,7 @@ sodium.options.use_particle_culling.name=Відсікання частинок
sodium.options.use_particle_culling.tooltip=Якщо увімкнено, рендеритися будуть лише ті частинки, які є безпосередньо видимими. Це дозволяє суттєво підвищити частоту кадрів, коли поруч є велика кількість частинок.
sodium.options.animate_only_visible_textures.name=Анімувати лише видимі текстури
sodium.options.animate_only_visible_textures.tooltip=Якщо увімкнено, оновлюватимуться лише ті анімовані текстури, які є видимими для гравця. Це може суттєво підвищити частоту кадрів на деякому залізі, особливо з важкими ресурспаками. Якщо ви помітили, що деякі текстури перестали анімуватися, спробуйте вимкнути цю опцію.
sodium.options.translucency_sorting.name=Сортування напівпрозорості
sodium.options.translucency_sorting.tooltip=Якщо увімкнено, напівпрозорі блоки сортуватимуться у правильному порядку (від дальніх до ближніх) для коректнішого рендерингу. Це особливо важливо, коли кілька таких блоків накладаються один на одного шарами. Ця операція є досить ресурсомісткою.
sodium.options.translucency_mode.name=Сортування напівпрозорості
sodium.options.cpu_render_ahead_limit.name=Ліміт заздалегідь підготовлених кадрів CPU
sodium.options.cpu_render_ahead_limit.tooltip=Визначає, скільки кадрів процесор може підготувати наперед для відеокарти. Нижчі значення зменшують затримку введення, а вищі — згладжують нерівномірний час кадру. Занадто низькі або високі значення можуть викликати нестабільність частоти кадрів. Значення 0 вимикає цей параметр; бекенд SDL-GPU ігнорує його та застосовує власний механізм зворотного тиску.
sodium.options.cpu_render_ahead_limit.value=%s кадр(ів)
@@ -59,8 +59,7 @@ sodium.options.use_particle_culling.name=使用粒子剔除
sodium.options.use_particle_culling.tooltip=如果启用,则只会渲染可见的粒子。当附近有许多粒子时,可以显著提高帧率。
sodium.options.animate_only_visible_textures.name=仅绘制可见动画纹理
sodium.options.animate_only_visible_textures.tooltip=如果启用,则只会更新确定为可见的纹理动画。这可以显著提高某些硬件的帧率(FPS),尤其是对于大型的资源包。如果你遇到某些纹理失去动画的问题,请尝试禁用此选项。
sodium.options.translucency_sorting.name=半透明排序
sodium.options.translucency_sorting.tooltip=如果启用,半透明方块将从后向前正确排序,当多个分层的半透明方块在视野中时,可以提供更好的渲染效果。这个选项性能花销较大。
sodium.options.translucency_mode.name=半透明排序
sodium.options.cpu_render_ahead_limit.name=CPU 预渲染限制
sodium.options.cpu_render_ahead_limit.tooltip=指定CPU可以在GPU上等待完成渲染的最大帧数。非常低或非常高的值都可能会导致帧率(FPS)不稳定。
sodium.options.cpu_render_ahead_limit.value=%s 帧
@@ -54,6 +54,13 @@ out vec4 fragColor; // The output fragment for the color framebuffer
#define fragColor gl_FragColor
#endif
#if !defined(LEGACY) && defined(TRANSLUCENCY_SPLIT)
// Fragments behind the block-entity layer's depth go to a second sheet (TranslucencyLayers).
uniform bool u_SplitEnabled;
uniform sampler2D u_SplitDepth;
layout(location = 1) out vec4 fragBehind;
#endif
vec2 snapToTexelCentre(vec2 uv, vec2 texelSize, vec2 texelsPerPixel) {
vec2 centreCoords = uv / texelSize - 0.5;
vec2 lowerCentre = floor(centreCoords);
@@ -237,4 +244,12 @@ void main() {
#else // No fog
fragColor = diffuseColor;
#endif
#if !defined(LEGACY) && defined(TRANSLUCENCY_SPLIT)
fragBehind = vec4(0.0);
if (u_SplitEnabled && gl_FragCoord.z > texelFetch(u_SplitDepth, ivec2(gl_FragCoord.xy), 0).r) {
fragBehind = fragColor;
fragColor = vec4(0.0);
}
#endif
}
@@ -0,0 +1,85 @@
#version 330 core
// A sample is skipped only when all zero, so additive light with no coverage still counts. The TERRAIN_BEHIND sheet
// sorts at the block-entity depth where the front sheet has terrain, inserted first so a tie keeps it behind.
in vec2 v_TexCoord;
uniform sampler2D u_Depth;
uniform sampler2D u_Layer0;
uniform sampler2D u_Layer1;
uniform sampler2D u_Layer2;
uniform sampler2D u_Layer3;
uniform sampler2D u_Layer4;
uniform sampler2D u_LayerDepth0;
uniform sampler2D u_LayerDepth1;
uniform sampler2D u_LayerDepth2;
uniform sampler2D u_LayerDepth3;
uniform sampler2D u_LayerDepth4;
uniform int u_LayerMask;
#ifdef TERRAIN_BEHIND
uniform sampler2D u_TerrainBehind;
#define SHEETS 6
#else
#define SHEETS 5
#endif
out vec4 fragColor;
vec4 colors[SHEETS];
float depths[SHEETS];
int count = 0;
float mainDepth;
void insertSheet(vec4 color, float depth) {
if (depth > mainDepth) return;
int j = count++;
colors[j] = color;
depths[j] = depth;
while (j > 0 && depths[j] > depths[j - 1]) {
vec4 c = colors[j];
colors[j] = colors[j - 1];
colors[j - 1] = c;
float d = depths[j];
depths[j] = depths[j - 1];
depths[j - 1] = d;
j--;
}
}
void insert(int bit, sampler2D colorTexture, sampler2D depthTexture) {
if ((u_LayerMask & bit) == 0) return;
vec4 color = texture(colorTexture, v_TexCoord);
if (color == vec4(0.0)) return;
insertSheet(color, texture(depthTexture, v_TexCoord).r);
}
#ifdef TERRAIN_BEHIND
void insertTerrain() {
vec4 behind = texture(u_TerrainBehind, v_TexCoord);
vec4 front = texture(u_Layer0, v_TexCoord);
if (behind != vec4(0.0)) {
insertSheet(behind, front == vec4(0.0) ? texture(u_LayerDepth0, v_TexCoord).r : texture(u_LayerDepth1, v_TexCoord).r);
}
if (front != vec4(0.0)) insertSheet(front, texture(u_LayerDepth0, v_TexCoord).r);
}
#endif
void main() {
mainDepth = texture(u_Depth, v_TexCoord).r;
#ifdef TERRAIN_BEHIND
insertTerrain();
#else
insert(1, u_Layer0, u_LayerDepth0);
#endif
insert(2, u_Layer1, u_LayerDepth1);
insert(4, u_Layer2, u_LayerDepth2);
insert(8, u_Layer3, u_LayerDepth3);
insert(16, u_Layer4, u_LayerDepth4);
vec4 result = vec4(0.0);
for (int i = 0; i < count; i++) {
result = result * (1.0 - colors[i].a) + colors[i];
}
fragColor = result;
gl_FragDepth = count > 0 ? depths[count - 1] : mainDepth;
}
@@ -50,8 +50,7 @@
"sodium.options.use_particle_culling.tooltip": "启用后,将仅渲染可见的颗粒。当周围有许多颗粒时,这可以显著地提高帧率。",
"sodium.options.animate_only_visible_textures.name": "仅渲染可见的动态材质",
"sodium.options.animate_only_visible_textures.tooltip": "启用后,将只会更新可见的动画材质。 这可以显着提高某些低配电脑的帧率。 尤其是对于较大的资源包。因此如果你看到动态材质不生效,请尝试禁用此选项。",
"sodium.options.translucency_sorting.name": "透明度排序",
"sodium.options.translucency_sorting.tooltip": "启用后,透明方块将被正确排序,从后向前渲染,以提供更好的渲染效果,特别是当你的视野中有多个重叠的透明方块时。此操作在性能上相对较昂贵。",
"sodium.options.translucency_mode.name": "透明度排序",
"sodium.options.cpu_render_ahead_limit.name": "CPU提前渲染限制",
"sodium.options.cpu_render_ahead_limit.tooltip": "指定CPU可以在GPU上等待完成渲染的最大帧数。很低或很高的值可能会导致帧速率不稳定。",
"sodium.options.cpu_render_ahead_limit.value": "%s帧",
@@ -15,7 +15,7 @@ public class MixinItemRenderer {
@Surround.Return
private int angelica$dynamiclights_renderItemInFirstPersonResult(int lightmap, WorldClient theWorld, int posX, int posY, int posZ){
if (DynamicLights.isActive()) {
if (DynamicLights.isEnabled()) {
final DynamicLights dl = DynamicLights.get();
if (dl.hasLightSources()) {
final double dynamicLightLevel = dl.getDynamicLightLevel(posX, posY, posZ);
@@ -0,0 +1,63 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.rendering;
import com.gtnewhorizons.angelica.experimental.surround.Surround;
import com.gtnewhorizons.angelica.glsm.GLSMDepthStencilAlpha;
import com.gtnewhorizons.angelica.rendering.translucency.TranslucencyLayers;
import com.gtnewhorizons.angelica.rendering.translucency.TranslucentLayer;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.EntityRenderer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(EntityRenderer.class)
public class MixinEntityRenderer_TranslucencyLayers {
@Inject(method = "renderWorld(FJ)V", at = @At("HEAD"))
private void angelica$beginTranslucencyLayers(float partialTicks, long finishTimeNano, CallbackInfo ci) {
TranslucencyLayers.INSTANCE.beginFrame();
}
@Inject(method = "renderWorld(FJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/ForgeHooksClient;dispatchRenderLast(Lnet/minecraft/client/renderer/RenderGlobal;F)V", remap = false))
private void angelica$compositeTranslucencyLayers(float partialTicks, long finishTimeNano, CallbackInfo ci) {
TranslucencyLayers.INSTANCE.composite();
}
@Surround(id = "translucencyParticles", method = "renderWorld(FJ)V", expect = 2, at = {
@At(value = "INVOKE", target = "Lnet/minecraft/client/particle/EffectRenderer;renderLitParticles(Lnet/minecraft/entity/Entity;F)V"),
@At(value = "INVOKE", target = "Lnet/minecraft/client/particle/EffectRenderer;renderParticles(Lnet/minecraft/entity/Entity;F)V") })
private void angelica$particlesLayer() {
@Surround.Carry boolean layered = TranslucencyLayers.INSTANCE.beginIfActive(TranslucentLayer.PARTICLES);
}
@Surround.Finally("translucencyParticles")
private void angelica$particlesLayerEnd(@Surround.Carry boolean layered) {
if (layered) TranslucencyLayers.INSTANCE.end();
}
@Surround(id = "translucencyWeather", method = "renderWorld(FJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/EntityRenderer;renderRainSnow(F)V"))
private void angelica$weatherLayer(@Surround.Local(argsOnly = true) float partialTicks) {
final WorldClient world = Minecraft.getMinecraft().theWorld;
@Surround.Carry boolean layered = (world.getRainStrength(partialTicks) > 0.0F || world.provider.getWeatherRenderer() != null)
&& TranslucencyLayers.INSTANCE.beginIfActive(TranslucentLayer.WEATHER);
// Rain writes no depth, which would leave the layer sorting at the opaque depth behind it.
if (layered) GLSMDepthStencilAlpha.glDepthMask(true);
}
@Surround.Finally("translucencyWeather")
private void angelica$weatherLayerEnd(@Surround.Carry boolean layered) {
if (layered) TranslucencyLayers.INSTANCE.end();
}
@Surround(id = "translucencyClouds", method = "renderWorld(FJ)V", at = @At(value = "INVOKE", ordinal = 1, target = "Lnet/minecraft/client/renderer/EntityRenderer;renderCloudsCheck(Lnet/minecraft/client/renderer/RenderGlobal;F)V"))
private void angelica$cloudsLayer() {
@Surround.Carry boolean layered = Minecraft.getMinecraft().gameSettings.shouldRenderClouds() && TranslucencyLayers.INSTANCE.beginIfActive(TranslucentLayer.CLOUDS);
}
@Surround.Finally("translucencyClouds")
private void angelica$cloudsLayerEnd(@Surround.Carry boolean layered) {
if (layered) TranslucencyLayers.INSTANCE.end();
}
}
@@ -0,0 +1,23 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.rendering;
import com.gtnewhorizons.angelica.glsm.GLSMRasterizer;
import com.gtnewhorizons.angelica.rendering.translucency.TranslucencyLayers;
import net.minecraft.client.Minecraft;
import net.minecraft.client.shader.Framebuffer;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(Framebuffer.class)
public class MixinFramebuffer_TranslucencyLayers {
@Inject(method = "bindFramebuffer", at = @At("HEAD"), cancellable = true)
private void angelica$bindOpenTranslucencyLayer(boolean viewport, CallbackInfo ci) {
final Framebuffer framebuffer = (Framebuffer) (Object) this;
if (!TranslucencyLayers.INSTANCE.redirectsMainBind() || framebuffer != Minecraft.getMinecraft().getFramebuffer()) return;
TranslucencyLayers.INSTANCE.bindOpenLayer();
if (viewport) GLSMRasterizer.glViewport(0, 0, framebuffer.framebufferWidth, framebuffer.framebufferHeight);
ci.cancel();
}
}
@@ -189,7 +189,7 @@ public abstract class MixinLightDataAccess implements ExtLightDataAccess {
int brgb = provider.getBlockLightRGB(blockAccess, x, y, z);
final int srgb = provider.getSkyLightRGB(blockAccess, x, y, z);
if (DynamicLights.isActive()) {
if (DynamicLights.isEnabled()) {
final int dlRGB = DynamicLights.get().getDynamicLightRGB(x + 0.5, y + 0.5, z + 0.5);
if (dlRGB != 0) {
brgb = angelica$mergeMaxRGB(brgb, dlRGB);
@@ -1,7 +1,6 @@
package com.gtnewhorizons.angelica.mixins.early.celeritas.terrain;
import com.gtnewhorizons.angelica.client.rendering.AngelicaFogService;
import com.gtnewhorizons.angelica.api.world.WorldDrawStage;
import com.gtnewhorizons.angelica.compat.mojang.Camera;
import com.gtnewhorizons.angelica.compat.mojang.GameModeUtil;
import com.gtnewhorizons.angelica.event.RenderChunkEvent;
@@ -10,6 +9,7 @@ import com.gtnewhorizons.angelica.glsm.GLSMEnable;
import com.gtnewhorizons.angelica.glsm.GLSMTextures;
import com.gtnewhorizons.angelica.glsm.profiling.Tracy;
import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalExt;
import com.gtnewhorizons.angelica.proxy.ClientProxy;
import com.gtnewhorizons.angelica.rendering.AngelicaRenderQueue;
import com.gtnewhorizons.angelica.rendering.RenderingState;
import com.gtnewhorizons.angelica.rendering.celeritas.BlockRenderLayer;
@@ -17,9 +17,10 @@ import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasSetup;
import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasWorldRenderer;
import com.gtnewhorizons.angelica.rendering.tesr.ModelPartBatcher;
import com.gtnewhorizons.angelica.rendering.tesr.TesrBatchRenderer;
import com.gtnewhorizons.angelica.rendering.translucency.TranslucencyLayers;
import com.gtnewhorizons.angelica.rendering.translucency.TranslucentLayer;
import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
import net.coderbot.iris.Iris;
import net.coderbot.iris.layer.GbufferPrograms;
import net.coderbot.iris.pipeline.HandRenderer;
import net.coderbot.iris.pipeline.WorldRenderingPhase;
import net.coderbot.iris.pipeline.WorldRenderingPipeline;
@@ -35,6 +36,7 @@ import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.client.MinecraftForgeClient;
import org.embeddedt.embeddium.impl.gl.device.RenderDevice;
import org.embeddedt.embeddium.impl.render.terrain.SimpleWorldRenderer;
import org.embeddedt.embeddium.impl.render.viewport.Viewport;
@@ -64,7 +66,6 @@ import static org.joml.Math.lerp;
*/
@Mixin(value = RenderGlobal.class, priority = 900)
public class MixinRenderGlobal implements IRenderGlobalExt {
@Unique private static final long P_BLOCK_ENTITIES_RENDERED = Tracy.plotHandle("blockEntitiesRendered");
@Unique private static final Tracy.ZoneId Z_MT_QUEUE = Tracy.zoneId("mtQueue", Tracy.COLOR_TERRAIN);
@Shadow public Minecraft mc;
@@ -147,10 +148,13 @@ public class MixinRenderGlobal implements IRenderGlobalExt {
pipeline = Iris.getPipelineManager().getPipelineNullable();
if (pass == 0) {
pipeline.setPhase(WorldRenderingPhase.TERRAIN_SOLID);
} else if (pass == 1) {
if (!ShadowRenderingState.areShadowsCurrentlyBeingRendered()) {
iris$beginTranslucents(pipeline, Camera.INSTANCE);
}
} else if (pass == 1 && !ShadowRenderingState.areShadowsCurrentlyBeingRendered()) {
iris$beginTranslucents(pipeline, Camera.INSTANCE);
}
}
if (pass == 1) {
celeritas$renderBlockEntitiesBeforeTranslucent(partialTicks);
if (pipeline != null) {
pipeline.setPhase(WorldRenderingPhase.TERRAIN_TRANSLUCENT);
this.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
}
@@ -188,8 +192,13 @@ public class MixinRenderGlobal implements IRenderGlobalExt {
this.celeritas$renderer.drawChunkLayer(BlockRenderLayer.CUTOUT_MIPPED, camX, camY, camZ);
} else {
mc.mcProfiler.endStartSection(shadow ? SECTION_SHADOW_TRANSLUCENT : SECTION_TRANSLUCENT);
this.celeritas$renderer.drawChunkLayer(BlockRenderLayer.TRANSLUCENT, camX, camY, camZ);
RenderChunkEvent.post();
final boolean layered = (this.celeritas$renderer.hasVisibleLayer(BlockRenderLayer.TRANSLUCENT) || RenderChunkEvent.BUS.hasListeners()) && TranslucencyLayers.INSTANCE.beginIfActive(TranslucentLayer.TERRAIN);
try {
this.celeritas$renderer.drawChunkLayer(BlockRenderLayer.TRANSLUCENT, camX, camY, camZ);
RenderChunkEvent.post();
} finally {
if (layered) TranslucencyLayers.INSTANCE.end();
}
}
} finally {
RenderDevice.exitManagedCode();
@@ -277,19 +286,18 @@ public class MixinRenderGlobal implements IRenderGlobalExt {
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderHelper;enableStandardItemLighting()V", ordinal = 0))
private void celeritas$enterBlockEntities() {}
@Unique
private void celeritas$renderBlockEntitiesBeforeTranslucent(double partialTicks) {
if (ShadowRenderingState.areShadowsCurrentlyBeingRendered()) return;
if (!ClientProxy.options().performance.blockEntitiesBeforeTranslucentTerrain && !TranslucencyLayers.INSTANCE.active()) return;
if (this.mc.entityRenderer.debugViewDirection != 0) return;
this.celeritas$renderer.renderBlockEntitiesBeforeTranslucent((float) partialTicks);
}
@Surround.Return("blockEntities")
private void celeritas$renderTileEntities(@Surround.Local(argsOnly = true) float partialTicks) {
if (Iris.enabled) {
GbufferPrograms.beginBlockEntities();
GbufferPrograms.setBlockEntityDefaults();
}
final int blockEntitiesRendered = this.celeritas$renderer.renderBlockEntities(partialTicks);
if (Tracy.ENABLED) Tracy.plotInt(P_BLOCK_ENTITIES_RENDERED, blockEntitiesRendered);
// Mods drawing their own world geometry, still in the block entity phase so a shaderpack lights it
WorldDrawStage.run(partialTicks);
if (Iris.enabled) {
GbufferPrograms.endBlockEntities();
}
if (MinecraftForgeClient.getRenderPass() == 1 && !this.celeritas$renderer.takeLatePassOne()) return;
this.celeritas$renderer.renderBlockEntitiesInPhase(partialTicks);
}
@ModifyExpressionValue(method = "renderEntities", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/RenderGlobal;tileEntities:Ljava/util/List;", opcode = Opcodes.GETFIELD))
@@ -103,16 +103,6 @@ public class MixinTessellator implements StateAwareTessellator, BiomeBlendTessel
this.angelica$noDirectionalShading = flag;
}
@Override
public boolean angelica$isAppliedAo() {
return this.appliedAo;
}
@Override
public boolean angelica$isNoDirectionalShading() {
return this.angelica$noDirectionalShading;
}
@Override
public int[] angelica$getVertexStates() {
return this.vertexStates.elements();
@@ -1,6 +1,5 @@
package com.gtnewhorizons.angelica.mixins.early.shaders;
import com.gtnewhorizons.angelica.api.terrain.TerrainRendering;
import com.gtnewhorizons.angelica.compat.mojang.Camera;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.experimental.surround.Surround;
@@ -56,8 +55,6 @@ public abstract class MixinEntityRenderer implements IResourceManagerReloadListe
SystemTimeUniforms.TIMER.beginFrame(System.nanoTime());
Program.unbind();
// Before the frame's uniforms are worked out, so a stuck local grid can't leak into them
TerrainRendering.resetForFrame();
mc.mcProfiler.startSection("iris_prepare_pipeline");
final WorldRenderingPipeline pipeline = Iris.getPipelineManager().preparePipeline(Iris.getCurrentDimensionName());
@@ -1,81 +0,0 @@
package com.gtnewhorizons.angelica.dynamiclights;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
class DynamicLightsFalloffTest {
private static final double EPS = 1e-9;
@Test
void reachFifteenIsVanillaBlockLight() {
// A real block of luminance L lights L - distance
for (int luminance = 1; luminance <= 15; luminance++) {
for (int d = 0; d <= 16; d++) {
assertEquals(Math.max(0, luminance - d), DynamicLights.falloff(luminance, 15, d), EPS);
}
}
}
@Test
void shorterReachFadesSooner() {
assertEquals(15, DynamicLights.falloff(15, 5, 0), EPS);
assertEquals(6, DynamicLights.falloff(15, 5, 3), EPS);
assertEquals(0, DynamicLights.falloff(15, 5, 5), EPS);
assertEquals(0, DynamicLights.falloff(15, 5, 6), EPS);
}
@Test
void torchReachIsTheOldFalloff() {
assertEquals(15, DynamicLights.falloff(15, -1, 0), EPS);
assertEquals((1 - 4 / 7.75) * 15, DynamicLights.falloff(15, -1, 4), EPS);
assertEquals(0, DynamicLights.falloff(15, -1, 7.8), EPS);
assertEquals(DynamicLights.falloff(12, -1, 3), DynamicLights.falloff(12, 3), EPS);
}
@Test
void zeroReachOrLuminanceGivesNothing() {
assertEquals(0, DynamicLights.falloff(15, 0, 0), EPS);
assertEquals(0, DynamicLights.falloff(0, 15, 0), EPS);
}
@Test
void fractionalReach() {
// An eighth size glowstone: 15 / 1.875 = 8 levels a block
assertEquals(15, DynamicLights.falloff(15, 1.875f, 0), EPS);
assertEquals(7, DynamicLights.falloff(15, 1.875f, 1), EPS);
assertEquals(0, DynamicLights.falloff(15, 1.875f, 1.875), EPS);
assertEquals(0, DynamicLights.falloff(15, 1.875f, 2), EPS);
}
@Test
void reachOfFollowsLuminance() {
final PositionalLightSource light = new PositionalLightSource();
assertEquals(0, DynamicLights.reachOf(light), EPS);
light.setReach(15);
setLuminanceWithoutTracking(light, 15);
assertEquals(15, DynamicLights.reachOf(light), EPS);
setLuminanceWithoutTracking(light, 6);
assertEquals(6, DynamicLights.reachOf(light), EPS);
light.setReach(-1);
assertEquals(7.75, DynamicLights.reachOf(light), EPS);
light.setReach(99);
assertEquals(15, light.getReach(), EPS);
light.setReach(1.875f);
assertEquals(0.75, DynamicLights.reachOf(light), EPS);
light.setReach(-0.5f);
assertEquals(-1, light.getReach(), EPS);
}
// setLuminance adds the light to Angelica's lights, which needs a game. The field is all reachOf reads
private static void setLuminanceWithoutTracking(PositionalLightSource light, int luminance) {
try {
final java.lang.reflect.Field f = PositionalLightSource.class.getDeclaredField("luminance");
f.setAccessible(true);
f.setInt(light, luminance);
} catch (ReflectiveOperationException e) {
throw new AssertionError(e);
}
}
}
@@ -1,166 +0,0 @@
package com.gtnewhorizons.angelica.dynamiclights;
import com.gtnewhorizon.gtnhlib.util.CoordinatePacker;
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import java.lang.reflect.Field;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
/** A positional light has to rebuild every chunk section its light shows up in, and the ones it leaves. */
class PositionalLightTrackingTest {
private static final float[] REACHES = { -1, 0.4f, 1, 1.875f, 5, 7, 7.5f, 8, 11, 15 };
private static final int[] LUMINANCES = { 1, 6, 11, 15 };
// Section middles, edges and corners, and either side of the middle where a torch reach just gets out both ways
private static final double[] OFFSETS = { 0, 0.05, 0.6, 3, 7.3, 8, 8.7, 13, 15.4, 15.95 };
private boolean frustumCulling;
@BeforeEach
void rebuildStraightAway() {
// Otherwise rebuilds queue up in the rebuild manager until a frame runs
frustumCulling = DynamicLights.FrustumCullingEnabled;
DynamicLights.FrustumCullingEnabled = false;
}
@AfterEach
void restore() {
DynamicLights.FrustumCullingEnabled = frustumCulling;
}
@Test
void rebuildsEverySectionTheLightGetsInto() {
for (float reach : REACHES) {
for (int luminance : LUMINANCES) {
for (double ox : OFFSETS) {
for (double oy : OFFSETS) {
for (double oz : OFFSETS) {
check(reach, luminance, -32 + ox, 64 + oy, 160 + oz);
}
}
}
}
}
}
private static void check(float reach, int luminance, double x, double y, double z) {
final PositionalLightSource light = new PositionalLightSource();
light.setReach(reach);
set(light, "luminance", luminance);
set(light, "x", x);
set(light, "y", y);
set(light, "z", z);
final Recorder rebuilt = new Recorder();
assertTrue(light.angelica$updateDynamicLight(rebuilt));
final String what = "reach " + reach + " luminance " + luminance + " at " + x + " " + y + " " + z;
final int cx = (int) Math.floor(x) >> 4, cy = (int) Math.floor(y) >> 4, cz = (int) Math.floor(z) >> 4;
for (int dx = -2; dx <= 2; dx++) {
for (int dy = -2; dy <= 2; dy++) {
for (int dz = -2; dz <= 2; dz++) {
final boolean tracked = rebuilt.sections.contains(CoordinatePacker.pack(cx + dx, cy + dy, cz + dz));
if (tracked) {
assertTrue(Math.max(Math.abs(dx), Math.max(Math.abs(dy), Math.abs(dz))) <= 1, what);
} else {
assertFalse(lights(light, cx + dx, cy + dy, cz + dz),
what + " misses section " + dx + " " + dy + " " + dz);
}
}
}
}
if (reach >= 0 && reach <= 7) assertTrue(rebuilt.sections.size() <= 8, what);
}
// What the mesher reads for a section: the light in the middle of each of its cells and the cells a block outside
// it (smooth lighting reads those for faces on the edge)
private static boolean lights(PositionalLightSource light, int sx, int sy, int sz) {
for (int x = -1; x <= 16; x++) {
for (int y = -1; y <= 16; y++) {
for (int z = -1; z <= 16; z++) {
if (DynamicLights.maxDynamicLightLevel((sx << 4) + x, (sy << 4) + y, (sz << 4) + z, light, 0) > 0) {
return true;
}
}
}
}
return false;
}
@Test
void rebuildsWhatItLeaves() {
final PositionalLightSource light = new PositionalLightSource();
light.setReach(5);
set(light, "luminance", 15);
set(light, "x", 8.0);
set(light, "y", 8.0);
set(light, "z", 8.0);
final Recorder first = new Recorder();
light.angelica$updateDynamicLight(first);
assertEquals(1, first.sections.size());
// Three sections along, nothing in common with where it was
set(light, "x", 56.0);
final Recorder second = new Recorder();
assertTrue(light.angelica$updateDynamicLight(second));
assertTrue(second.sections.contains(CoordinatePacker.pack(0, 0, 0)), "the section it left");
assertTrue(second.sections.contains(CoordinatePacker.pack(3, 0, 0)), "the section it went to");
assertEquals(2, second.sections.size());
}
@Test
void sittingStillRebuildsNothing() {
final PositionalLightSource light = new PositionalLightSource();
set(light, "luminance", 15);
set(light, "x", 8.0);
set(light, "y", 8.0);
set(light, "z", 8.0);
final Recorder rebuilt = new Recorder();
assertTrue(light.angelica$updateDynamicLight(rebuilt));
rebuilt.sections.clear();
assertFalse(light.angelica$updateDynamicLight(rebuilt));
assertTrue(rebuilt.sections.isEmpty());
// A new reach counts as a change
light.setReach(15);
assertTrue(light.angelica$updateDynamicLight(rebuilt));
assertEquals(27, rebuilt.sections.size());
// A tiny one doesn't, like a tiny move
rebuilt.sections.clear();
light.setReach(14.95f);
assertFalse(light.angelica$updateDynamicLight(rebuilt));
assertTrue(rebuilt.sections.isEmpty());
}
private static final class Recorder implements IDynamicLightWorldRenderer {
final LongOpenHashSet sections = new LongOpenHashSet();
@Override
public void scheduleRebuildForChunk(int x, int y, int z, boolean important) {
sections.add(CoordinatePacker.pack(x, y, z));
}
@Override
public boolean isActive() {
return true;
}
}
// The setters add the light to Angelica's lights, which needs a game. Tracking only reads the fields
private static void set(PositionalLightSource light, String field, Object value) {
try {
final Field f = PositionalLightSource.class.getDeclaredField(field);
f.setAccessible(true);
f.set(light, value);
} catch (ReflectiveOperationException e) {
throw new AssertionError(e);
}
}
}
@@ -0,0 +1,31 @@
package com.gtnewhorizons.angelica.rendering.celeritas;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import net.minecraft.tileentity.TileEntity;
import org.junit.jupiter.api.Test;
import java.util.Arrays;
import static org.junit.jupiter.api.Assertions.assertEquals;
class TileEntityDepthOrderTest {
private static TileEntity at(int x, int y, int z) {
final TileEntity te = new TileEntity();
te.xCoord = x;
te.yCoord = y;
te.zCoord = z;
return te;
}
@Test
void sortsFarthestFirstAndKeepsTiesInListOrder() {
final TileEntity near = at(0, 0, 2);
final TileEntity far = at(0, 0, 181);
final TileEntity mid = at(0, 0, 5);
final TileEntity midOpposite = at(0, 0, -5);
final ObjectArrayList<TileEntity> list = new ObjectArrayList<>(Arrays.asList(near, far, mid, midOpposite));
new TileEntityDepthOrder().sortBackToFront(list, 0.5, 0.5, 0.5);
assertEquals(Arrays.asList(far, mid, midOpposite, near), list);
}
}
@@ -0,0 +1,230 @@
package com.gtnewhorizons.angelica.rendering.translucency;
import com.gtnewhorizons.angelica.glsm.GLCoreTest;
import com.gtnewhorizons.angelica.glsm.GLSMBlend;
import com.gtnewhorizons.angelica.glsm.GLSMDepthStencilAlpha;
import com.gtnewhorizons.angelica.glsm.GLSMDraws;
import com.gtnewhorizons.angelica.glsm.GLSMFramebuffer;
import com.gtnewhorizons.angelica.glsm.GLSMPrograms;
import com.gtnewhorizons.angelica.glsm.GLSMRasterizer;
import com.gtnewhorizons.angelica.glsm.GLSMTextures;
import com.gtnewhorizons.angelica.glsm.GLSMVertexInput;
import com.gtnewhorizons.angelica.glsm.GlTestSupport;
import net.coderbot.iris.gl.framebuffer.GlFramebuffer;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL30;
import java.nio.ByteBuffer;
import java.nio.FloatBuffer;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.junit.jupiter.api.Assertions.assertEquals;
@GLCoreTest
class TranslucencyCompositeGLTest {
private static final int WIDTH = 4;
private static final String QUAD_VS = """
#version 330 core
uniform float u_Depth;
void main() {
vec2 p = vec2((gl_VertexID << 1) & 2, gl_VertexID & 2);
gl_Position = vec4(p * 2.0 - 1.0, u_Depth * 2.0 - 1.0, 1.0);
}
""";
private static final String QUAD_FS = """
#version 330 core
uniform vec4 u_Color;
out vec4 color;
void main() { color = u_Color; }
""";
private static final String SPLIT_FS = """
#version 330 core
uniform vec4 u_Color;
uniform bool u_SplitEnabled;
uniform sampler2D u_SplitDepth;
layout(location = 0) out vec4 front;
layout(location = 1) out vec4 behind;
void main() {
bool back = u_SplitEnabled && gl_FragCoord.z > texelFetch(u_SplitDepth, ivec2(gl_FragCoord.xy), 0).r;
front = back ? vec4(0.0) : u_Color;
behind = back ? u_Color : vec4(0.0);
}
""";
private int colorTex;
private int depthTex;
private GlFramebuffer main;
private int quadProgram;
private int splitProgram;
private int vao;
private TranslucencyLayers layers;
@BeforeEach
void setUp() {
colorTex = texture(GL11.GL_RGBA8, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE);
depthTex = texture(GL30.GL_DEPTH24_STENCIL8, GL30.GL_DEPTH_STENCIL, GL30.GL_UNSIGNED_INT_24_8);
main = new GlFramebuffer();
main.addColorAttachment(0, colorTex);
main.addDepthAttachment(depthTex);
main.drawBuffers(new int[] { 0 });
main.readBuffer(0);
main.bind();
GLSMRasterizer.glViewport(0, 0, WIDTH, 1);
quadProgram = GlTestSupport.program(QUAD_VS, QUAD_FS);
splitProgram = GlTestSupport.program(QUAD_VS, SPLIT_FS);
vao = GLSMVertexInput.glGenVertexArrays();
layers = new TranslucencyLayers(new TranslucencyLayers.MainTarget() {
@Override public int framebuffer() { return main.getId(); }
@Override public int depthTexture() { return depthTex; }
@Override public int width() { return WIDTH; }
@Override public int height() { return 1; }
@Override public int depthVersion() { return 0; }
});
GLSMDepthStencilAlpha.enableDepthTest();
GLSMDepthStencilAlpha.glDepthFunc(GL11.GL_LEQUAL);
GLSMDepthStencilAlpha.glDepthMask(true);
GLSMBlend.glClearColor(1f, 0f, 0f, 1f);
GLSMDepthStencilAlpha.glClearDepth(0.9);
GLSMFramebuffer.glClear(GL11.GL_COLOR_BUFFER_BIT | GL11.GL_DEPTH_BUFFER_BIT);
}
@AfterEach
void tearDown() {
layers.destroy();
GLSMFramebuffer.glBindFramebuffer(GL30.GL_FRAMEBUFFER, 0);
main.destroy();
GLSMTextures.glDeleteTextures(colorTex);
GLSMTextures.glDeleteTextures(depthTex);
GLSMPrograms.glUseProgram(0);
GLSMPrograms.glDeleteProgram(quadProgram);
GLSMPrograms.glDeleteProgram(splitProgram);
GLSMVertexInput.glDeleteVertexArrays(vao);
GLSMBlend.disableBlend();
GLSMDepthStencilAlpha.disableDepthTest();
GLSMDepthStencilAlpha.glDepthFunc(GL11.GL_LESS);
GLSMBlend.glClearColor(0f, 0f, 0f, 0f);
GLSMDepthStencilAlpha.glClearDepth(1.0);
}
private static int texture(int internalFormat, int format, int type) {
final int tex = GLSMTextures.glGenTextures();
GLSMTextures.glBindTexture(GL11.GL_TEXTURE_2D, tex);
GLSMTextures.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
GLSMTextures.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
GLSMTextures.glTexImage2D(GL11.GL_TEXTURE_2D, 0, internalFormat, WIDTH, 1, 0, format, type, (ByteBuffer) null);
GLSMTextures.glBindTexture(GL11.GL_TEXTURE_2D, 0);
return tex;
}
private void drawInto(TranslucentLayer layer, int column, float depth, float r, float g, float b, float a) {
drawInto(layer, column, depth, r, g, b, a, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
}
private void drawInto(TranslucentLayer layer, int column, float depth, float r, float g, float b, float a, int srcRgb, int dstRgb) {
layers.begin(layer);
drawBlended(quadProgram, column, depth, r, g, b, a, srcRgb, dstRgb);
layers.end();
}
private void drawBlended(int program, int column, float depth, float r, float g, float b, float a, int srcRgb, int dstRgb) {
GLSMBlend.enableBlend();
GLSMBlend.glBlendFunc(srcRgb, dstRgb);
draw(program, column, depth, r, g, b, a);
GLSMBlend.disableBlend();
}
private void drawTerrain(int column, float depth, float r, float g, float b, float a) {
drawBlended(splitProgram, column, depth, r, g, b, a, GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
}
private void draw(int column, float depth, float r, float g, float b, float a) {
draw(quadProgram, column, depth, r, g, b, a);
}
private void draw(int program, int column, float depth, float r, float g, float b, float a) {
GLSMRasterizer.glViewport(column, 0, 1, 1);
GLSMPrograms.glUseProgram(program);
GLSMPrograms.glUniform1f(GLSMPrograms.glGetUniformLocation(program, "u_Depth"), depth);
GLSMPrograms.glUniform4f(GLSMPrograms.glGetUniformLocation(program, "u_Color"), r, g, b, a);
GLSMVertexInput.glBindVertexArray(vao);
GLSMDraws.glDrawArrays(GL11.GL_TRIANGLES, 0, 3);
GLSMVertexInput.glBindVertexArray(0);
GLSMPrograms.glUseProgram(0);
GLSMRasterizer.glViewport(0, 0, WIDTH, 1);
}
private static void assertColumn(ByteBuffer rgba, int column, int r, int g, int b) {
final int at = column * 4;
assertEquals(r, rgba.get(at) & 0xFF, 2, "column " + column + " red");
assertEquals(g, rgba.get(at + 1) & 0xFF, 2, "column " + column + " green");
assertEquals(b, rgba.get(at + 2) & 0xFF, 2, "column " + column + " blue");
}
private static ByteBuffer readColor() {
final ByteBuffer rgba = BufferUtils.createByteBuffer(WIDTH * 4);
GLSMFramebuffer.glReadPixels(0, 0, WIDTH, 1, GL11.GL_RGBA, GL11.GL_UNSIGNED_BYTE, rgba);
return rgba;
}
private static FloatBuffer readDepth() {
final FloatBuffer depth = BufferUtils.createFloatBuffer(WIDTH);
GLSMFramebuffer.glReadPixels(0, 0, WIDTH, 1, GL11.GL_DEPTH_COMPONENT, GL11.GL_FLOAT, depth);
return depth;
}
@Test
void sharedInstanceIsBuiltAfterTheConstantsItSizesFrom() {
assertDoesNotThrow(TranslucencyLayers.INSTANCE::destroy);
}
@Test
void compositesLayersByDepthAndWritesNearestDepth() {
layers.beginFrame(true);
drawInto(TranslucentLayer.TERRAIN, 0, 0.3f, 0f, 1f, 0f, 0.5f);
drawInto(TranslucentLayer.PARTICLES, 0, 0.5f, 0f, 0f, 1f, 0.5f);
drawInto(TranslucentLayer.TERRAIN, 1, 0.95f, 0f, 0f, 1f, 0.5f);
drawInto(TranslucentLayer.CLOUDS, 2, 0.5f, 0f, 0.4f, 0f, 0f, GL11.GL_ONE, GL11.GL_ONE);
drawInto(TranslucentLayer.TERRAIN, 3, 0.5f, 0f, 1f, 0f, 0.5f);
draw(3, 0.2f, 0f, 0f, 1f, 1f);
layers.composite();
final ByteBuffer color = readColor();
assertColumn(color, 0, 64, 128, 64);
assertColumn(color, 1, 255, 0, 0);
assertColumn(color, 2, 255, 102, 0);
assertColumn(color, 3, 0, 0, 255);
final FloatBuffer depth = readDepth();
final float[] expected = { 0.3f, 0.9f, 0.5f, 0.2f };
for (int i = 0; i < WIDTH; i++) assertEquals(expected[i], depth.get(i), 1e-4f, "column " + i + " depth");
layers.composite();
final ByteBuffer again = readColor();
for (int i = 0; i < WIDTH * 4; i++) assertEquals(color.get(i), again.get(i), "a composite with no new layer draws changes nothing");
}
@Test
void terrainBehindTheBlockEntityLayerCompositesBehindIt() {
layers.beginFrame(true);
drawInto(TranslucentLayer.BLOCK_ENTITIES, 0, 0.5f, 0f, 0f, 1f, 0.5f);
drawInto(TranslucentLayer.BLOCK_ENTITIES, 1, 0.5f, 0f, 0f, 1f, 0.5f);
drawInto(TranslucentLayer.PARTICLES, 1, 0.55f, 0f, 1f, 0f, 0.5f);
layers.begin(TranslucentLayer.TERRAIN);
GLSMPrograms.glUseProgram(splitProgram);
layers.beginTerrainSplit(splitProgram);
drawTerrain(0, 0.6f, 0f, 1f, 0f, 0.5f);
drawTerrain(0, 0.3f, 1f, 1f, 1f, 0.5f);
drawTerrain(1, 0.6f, 1f, 1f, 1f, 0.5f);
layers.endTerrainSplit();
layers.end();
layers.composite();
final ByteBuffer color = readColor();
assertColumn(color, 0, 159, 159, 191);
assertColumn(color, 1, 64, 96, 159);
}
}
@@ -0,0 +1,27 @@
package me.jellysquid.mods.sodium.client.gui;
import me.jellysquid.mods.sodium.client.gui.options.named.TranslucencyMode;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
import java.io.StringReader;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
class SodiumGameOptionsMigrationTest {
@ParameterizedTest(name = "{0} -> {2}")
@CsvSource(delimiter = '|', value = {
"legacy on | \"translucency_sorting\": true | FAST",
"legacy off | \"translucency_sorting\": false | OFF",
"mode stored | \"translucency_mode\": \"FANCY\" | FANCY",
"unknown mode | \"translucency_mode\": \"BOGUS\" | FAST",
})
void migratesTranslucencySetting(String name, String stored, TranslucencyMode expected) {
final SodiumGameOptions options = SodiumGameOptions.read(new StringReader("{ \"performance\": { " + stored + " } }"));
assertEquals(expected, options.performance.translucencyMode);
assertFalse(options.toJson().contains("translucency_sorting"), "the legacy key is dropped on save");
}
}