mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-19 20:09:39 +00:00
Many bug fixes (#2017)
Co-authored-by: Martin Robertz <[email protected]>
This commit is contained in:
1 parent
b2f597a73a
commit
22c9479946
89 files changed
+2820
-735
No files matched your search
@@ -1,24 +1,32 @@
|
||||
package net.coderbot.iris.layer;
|
||||
|
||||
import lombok.Getter;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.states.AlphaState;
|
||||
import com.gtnewhorizons.angelica.glsm.states.BlendState;
|
||||
import net.coderbot.iris.gl.shader.ProgramCreator;
|
||||
import net.coderbot.iris.gl.state.StateUpdateNotifiers;
|
||||
import net.coderbot.iris.pipeline.WorldRenderingPhase;
|
||||
import net.coderbot.iris.pipeline.WorldRenderingPipeline;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL13;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
||||
public class GbufferPrograms {
|
||||
private static boolean entities;
|
||||
private static boolean blockEntities;
|
||||
private static boolean particles;
|
||||
private static boolean outline;
|
||||
private static boolean entityLoop;
|
||||
private static Runnable phaseChangeListener;
|
||||
|
||||
|
||||
static {
|
||||
StateUpdateNotifiers.phaseChangeNotifier = listener -> phaseChangeListener = listener;
|
||||
}
|
||||
|
||||
|
||||
private static void checkReentrancy() {
|
||||
if (entities || blockEntities || outline) {
|
||||
throw new IllegalStateException("GbufferPrograms in weird state, tried to call begin function when entities = "
|
||||
@@ -61,8 +69,18 @@ public class GbufferPrograms {
|
||||
throw new IllegalStateException("GbufferPrograms in weird state, tried to call endEntities when entities = false");
|
||||
}
|
||||
|
||||
setPhase(WorldRenderingPhase.NONE);
|
||||
entities = false;
|
||||
endPhase();
|
||||
}
|
||||
|
||||
private static void endPhase() {
|
||||
if (particles) {
|
||||
setPhase(WorldRenderingPhase.PARTICLES);
|
||||
} else if (entityLoop) {
|
||||
setPhase(WorldRenderingPhase.ENTITIES);
|
||||
} else {
|
||||
setPhase(WorldRenderingPhase.NONE);
|
||||
}
|
||||
}
|
||||
|
||||
public static void beginOutline() {
|
||||
@@ -76,10 +94,41 @@ public class GbufferPrograms {
|
||||
throw new IllegalStateException("GbufferPrograms in weird state, tried to call endOutline when outline = false");
|
||||
}
|
||||
|
||||
setPhase(WorldRenderingPhase.NONE);
|
||||
outline = false;
|
||||
endPhase();
|
||||
}
|
||||
|
||||
public static int beginParticles() {
|
||||
if (particleDepth == particlePhaseSaves.length) {
|
||||
particlePhaseSaves = Arrays.copyOf(particlePhaseSaves, particleDepth * 2);
|
||||
particleTranslucencySaves = Arrays.copyOf(particleTranslucencySaves, particleDepth * 2);
|
||||
}
|
||||
|
||||
particlePhaseSaves[particleDepth] = getCurrentPhase();
|
||||
particleTranslucencySaves[particleDepth] = beginTranslucencyDeclaration(Boolean.FALSE);
|
||||
|
||||
setPhase(WorldRenderingPhase.PARTICLES);
|
||||
particles = true;
|
||||
|
||||
return particleDepth++;
|
||||
}
|
||||
|
||||
public static void endParticles(int depth) {
|
||||
particleDepth = depth;
|
||||
|
||||
endTranslucencyDeclaration(particleTranslucencySaves[depth]);
|
||||
particleTranslucencySaves[depth] = null;
|
||||
|
||||
setPhase(particlePhaseSaves[depth]);
|
||||
particlePhaseSaves[depth] = null;
|
||||
|
||||
particles = particleDepth > 0;
|
||||
}
|
||||
|
||||
private static WorldRenderingPhase[] particlePhaseSaves = new WorldRenderingPhase[4];
|
||||
private static Boolean[] particleTranslucencySaves = new Boolean[4];
|
||||
private static int particleDepth;
|
||||
|
||||
public static void beginBlockEntities() {
|
||||
checkReentrancy();
|
||||
setPhase(WorldRenderingPhase.BLOCK_ENTITIES);
|
||||
@@ -92,8 +141,101 @@ public class GbufferPrograms {
|
||||
throw new IllegalStateException("GbufferPrograms in weird state, tried to call endBlockEntities when blockEntities = false");
|
||||
}
|
||||
|
||||
setPhase(WorldRenderingPhase.NONE);
|
||||
blockEntities = false;
|
||||
endPhase();
|
||||
}
|
||||
|
||||
public static void setCutoutDefaults() {
|
||||
GLStateManager.enableAlphaTest();
|
||||
GLStateManager.glAlphaFunc(GL11.GL_GREATER, 0.1F);
|
||||
|
||||
final int previousUnit = GLStateManager.getActiveTextureUnitForServerState();
|
||||
GLStateManager.glActiveTexture(GL13.GL_TEXTURE1);
|
||||
GLStateManager.enableTexture();
|
||||
GLStateManager.glActiveTexture(GL13.GL_TEXTURE0 + previousUnit);
|
||||
}
|
||||
|
||||
public static long pushCutoutDefaults() {
|
||||
final long saved = packCutoutState();
|
||||
setCutoutDefaults();
|
||||
return saved;
|
||||
}
|
||||
|
||||
public static void popCutoutDefaults(long saved) {
|
||||
if ((saved & ALPHA_ENABLED_BIT) != 0) {
|
||||
GLStateManager.enableAlphaTest();
|
||||
} else {
|
||||
GLStateManager.disableAlphaTest();
|
||||
}
|
||||
GLStateManager.glAlphaFunc((int) ((saved >>> 32) & 0xFFFF), Float.intBitsToFloat((int) saved));
|
||||
|
||||
if ((saved & LIGHTMAP_ENABLED_BIT) == 0) {
|
||||
final int previousUnit = GLStateManager.getActiveTextureUnitForServerState();
|
||||
GLStateManager.glActiveTexture(GL13.GL_TEXTURE1);
|
||||
GLStateManager.disableTexture();
|
||||
GLStateManager.glActiveTexture(GL13.GL_TEXTURE0 + previousUnit);
|
||||
}
|
||||
}
|
||||
|
||||
public static int pushBlendState() {
|
||||
if (blendDepth == blendSaves.length) {
|
||||
blendSaves = Arrays.copyOf(blendSaves, blendDepth * 2);
|
||||
blendEnabledSaves = Arrays.copyOf(blendEnabledSaves, blendDepth * 2);
|
||||
}
|
||||
|
||||
BlendState saved = blendSaves[blendDepth];
|
||||
if (saved == null) {
|
||||
saved = new BlendState();
|
||||
blendSaves[blendDepth] = saved;
|
||||
}
|
||||
|
||||
GLStateManager.getEffectiveBlendState(saved);
|
||||
blendEnabledSaves[blendDepth] = GLStateManager.isEffectiveBlendEnabled();
|
||||
|
||||
return blendDepth++;
|
||||
}
|
||||
public static void popBlendState(int depth) {
|
||||
blendDepth = depth;
|
||||
|
||||
final boolean enabled = blendEnabledSaves[depth];
|
||||
if (enabled != GLStateManager.isEffectiveBlendEnabled()) {
|
||||
if (enabled) {
|
||||
GLStateManager.enableBlend();
|
||||
} else {
|
||||
GLStateManager.disableBlend();
|
||||
}
|
||||
}
|
||||
|
||||
final BlendState saved = blendSaves[depth];
|
||||
GLStateManager.getEffectiveBlendState(blendScratch);
|
||||
if (blendScratch.getSrcRgb() != saved.getSrcRgb() || blendScratch.getDstRgb() != saved.getDstRgb()
|
||||
|| blendScratch.getSrcAlpha() != saved.getSrcAlpha() || blendScratch.getDstAlpha() != saved.getDstAlpha()) {
|
||||
GLStateManager.tryBlendFuncSeparate(saved.getSrcRgb(), saved.getDstRgb(), saved.getSrcAlpha(), saved.getDstAlpha());
|
||||
}
|
||||
}
|
||||
|
||||
public static void popBlendStateTop() {
|
||||
if (blendDepth > 0) {
|
||||
popBlendState(blendDepth - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private static BlendState[] blendSaves = new BlendState[4];
|
||||
private static boolean[] blendEnabledSaves = new boolean[4];
|
||||
private static int blendDepth;
|
||||
private static final BlendState blendScratch = new BlendState();
|
||||
|
||||
private static final long ALPHA_ENABLED_BIT = 1L << 48;
|
||||
private static final long LIGHTMAP_ENABLED_BIT = 1L << 49;
|
||||
private static final AlphaState alphaScratch = new AlphaState();
|
||||
|
||||
private static long packCutoutState() {
|
||||
GLStateManager.getEffectiveAlphaState(alphaScratch);
|
||||
|
||||
return (Float.floatToRawIntBits(alphaScratch.getReference()) & 0xFFFFFFFFL)
|
||||
| ((long) (alphaScratch.getFunction() & 0xFFFF) << 32)
|
||||
| (GLStateManager.isEffectiveAlphaTestEnabled() ? ALPHA_ENABLED_BIT : 0L)
|
||||
| (GLStateManager.getTextures().getTextureUnitStates(1).isEnabled() ? LIGHTMAP_ENABLED_BIT : 0L);
|
||||
}
|
||||
|
||||
public static void setBlockEntityDefaults() {
|
||||
@@ -121,7 +263,23 @@ public class GbufferPrograms {
|
||||
}
|
||||
}
|
||||
|
||||
public static boolean beginNestedEntityPhase() {
|
||||
if (getCurrentPhase() != WorldRenderingPhase.BLOCK_ENTITIES) {
|
||||
return false;
|
||||
}
|
||||
setOverridePhase(WorldRenderingPhase.ENTITIES);
|
||||
return true;
|
||||
}
|
||||
|
||||
public static void endNestedEntityPhase(boolean pushed) {
|
||||
if (pushed) {
|
||||
setOverridePhase(null);
|
||||
}
|
||||
}
|
||||
|
||||
public static void setOverridePhase(WorldRenderingPhase phase) {
|
||||
overridePhase = phase;
|
||||
|
||||
final WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable();
|
||||
|
||||
if (pipeline != null) {
|
||||
@@ -129,20 +287,62 @@ public class GbufferPrograms {
|
||||
}
|
||||
}
|
||||
|
||||
@Getter
|
||||
private static WorldRenderingPhase overridePhase;
|
||||
|
||||
public static Boolean beginTranslucencyDeclaration(Boolean translucent) {
|
||||
final Boolean previous = declaredTranslucent;
|
||||
declaredTranslucent = translucent;
|
||||
applyTranslucencyDeclaration();
|
||||
return previous;
|
||||
}
|
||||
|
||||
public static void endTranslucencyDeclaration(Boolean previous) {
|
||||
declaredTranslucent = previous;
|
||||
applyTranslucencyDeclaration();
|
||||
}
|
||||
|
||||
public static void setTranslucencyDeclaration(Boolean translucent) {
|
||||
declaredTranslucent = translucent;
|
||||
applyTranslucencyDeclaration();
|
||||
}
|
||||
|
||||
private static Boolean declaredTranslucent;
|
||||
|
||||
private static void applyTranslucencyDeclaration() {
|
||||
final WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable();
|
||||
|
||||
if (pipeline != null) {
|
||||
pipeline.setDeclaredTranslucency(declaredTranslucent);
|
||||
}
|
||||
}
|
||||
|
||||
private static SpecialCondition currentSpecial;
|
||||
|
||||
public static SpecialCondition getSpecialCondition() {
|
||||
return currentSpecial;
|
||||
}
|
||||
|
||||
public static Boolean getDeclaredTranslucency() {
|
||||
return declaredTranslucent;
|
||||
}
|
||||
|
||||
public static void setupSpecialRenderCondition(SpecialCondition override) {
|
||||
currentSpecial = override;
|
||||
Iris.getPipelineManager().getPipeline().ifPresent(p -> p.setSpecialCondition(override));
|
||||
}
|
||||
|
||||
public static void teardownSpecialRenderCondition() {
|
||||
currentSpecial = null;
|
||||
Iris.getPipelineManager().getPipeline().ifPresent(p -> p.setSpecialCondition(null));
|
||||
}
|
||||
|
||||
|
||||
public static void runPhaseChangeNotifier() {
|
||||
if (phaseChangeListener != null) {
|
||||
phaseChangeListener.run();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public static void init() {
|
||||
// Empty initializer to run static
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user