* Beta, maybe
* Fixes for entityColor uniform in Iris
* Handle Iris Texture input hook properly in GLSM
* Iris Entity Fixes
* Gbuffer progress
* Wire up BlockEntity gbuffer
* Move Entity gbuffer to a more appropriate place to avoid reentrancy
* Wire up ENTITY_EYES and BEACOM_BEAM
* Clean up unused RenderStateShard files
* This seems marginally more correct?
* Fix shadows from showing on sides of blocks
* Remove overlay
* yeet
* More gl debugging
* Grr, fix water textures
* Add missed enable checks
* Workaround for unset depth texture when using apitrace...
   Use a WrapOperation instead of an Inject with local capture - it wasn't working in dev w/ mixin debug set
* update bs
* Fix crosshair rendering with shaders
* more final
* Disable dynamic lights if shaders are in use
* No light when in water
* Add Void Particle Option + Mixin cleanup
* update bs
* less false

---------

Co-authored-by: Darren Eberly <[email protected]>
Co-authored-by: Caedis <[email protected]>
This commit is contained in:
authored and GitHub committed 2024-07-14 23:09:03 -07:00
1 parent 7e4292bdba
commit 2274bfabfd
51 files changed
+330 -400

No files matched your search

@@ -1,42 +0,0 @@
package net.coderbot.iris.layer;
import com.gtnewhorizons.angelica.compat.toremove.RenderPhase;
import net.coderbot.iris.uniforms.CapturedRenderingState;
public final class BlockEntityRenderStateShard extends RenderPhase {
private static final BlockEntityRenderStateShard UNIDENTIFIED = new BlockEntityRenderStateShard(-1);
private final int entityId;
private BlockEntityRenderStateShard(int entityId) {
super("iris:is_block_entity", () -> {
CapturedRenderingState.INSTANCE.setCurrentBlockEntity(entityId);
GbufferPrograms.beginBlockEntities();
}, () -> {
CapturedRenderingState.INSTANCE.setCurrentBlockEntity(-1);
GbufferPrograms.endBlockEntities();
});
this.entityId = entityId;
}
public static BlockEntityRenderStateShard forId(int entityId) {
if (entityId == -1) {
return UNIDENTIFIED;
} else {
// TODO: Cache all created render phases to avoid allocations?
return new BlockEntityRenderStateShard(entityId);
}
}
@Override
public boolean equals(Object object) {
if (object == null || object.getClass() != this.getClass()) {
return false;
}
BlockEntityRenderStateShard other = (BlockEntityRenderStateShard) object;
return this.entityId == other.entityId;
}
}
@@ -1,42 +0,0 @@
package net.coderbot.iris.layer;
import com.gtnewhorizons.angelica.compat.toremove.RenderPhase;
import net.coderbot.iris.uniforms.CapturedRenderingState;
public final class EntityRenderStateShard extends RenderPhase {
private static final EntityRenderStateShard UNIDENTIFIED = new EntityRenderStateShard(-1);
private final int entityId;
private EntityRenderStateShard(int entityId) {
super("iris:is_entity", () -> {
CapturedRenderingState.INSTANCE.setCurrentEntity(entityId);
GbufferPrograms.beginEntities();
}, () -> {
CapturedRenderingState.INSTANCE.setCurrentEntity(-1);
GbufferPrograms.endEntities();
});
this.entityId = entityId;
}
public static EntityRenderStateShard forId(int entityId) {
if (entityId == -1) {
return UNIDENTIFIED;
} else {
// TODO: Cache all created render phases to avoid allocations?
return new EntityRenderStateShard(entityId);
}
}
@Override
public boolean equals(Object object) {
if (object == null || object.getClass() != this.getClass()) {
return false;
}
EntityRenderStateShard other = (EntityRenderStateShard) object;
return this.entityId == other.entityId;
}
}
@@ -65,7 +65,7 @@ public class GbufferPrograms {
}
public static WorldRenderingPhase getCurrentPhase() {
WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable();
final WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable();
if (pipeline != null) {
return pipeline.getPhase();
@@ -75,7 +75,7 @@ public class GbufferPrograms {
}
private static void setPhase(WorldRenderingPhase phase) {
WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable();
final WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable();
if (pipeline != null) {
pipeline.setPhase(phase);
@@ -83,7 +83,7 @@ public class GbufferPrograms {
}
public static void setOverridePhase(WorldRenderingPhase phase) {
WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable();
final WorldRenderingPipeline pipeline = Iris.getPipelineManager().getPipelineNullable();
if (pipeline != null) {
pipeline.setOverridePhase(phase);
@@ -100,7 +100,7 @@ public class GbufferPrograms {
Iris.getPipelineManager().getPipeline().ifPresent(p -> p.setSpecialCondition(override));
}
public static void teardownSpecialRenderCondition(SpecialCondition override) {
public static void teardownSpecialRenderCondition() {
Iris.getPipelineManager().getPipeline().ifPresent(p -> p.setSpecialCondition(null));
}
@@ -1,11 +0,0 @@
package net.coderbot.iris.layer;
import com.gtnewhorizons.angelica.compat.toremove.RenderPhase;
public class IsBlockEntityRenderStateShard extends RenderPhase {
public static final IsBlockEntityRenderStateShard INSTANCE = new IsBlockEntityRenderStateShard();
private IsBlockEntityRenderStateShard() {
super("iris:is_block_entity", GbufferPrograms::beginBlockEntities, GbufferPrograms::endBlockEntities);
}
}
@@ -1,11 +0,0 @@
package net.coderbot.iris.layer;
import com.gtnewhorizons.angelica.compat.toremove.RenderPhase;
public class IsEntityRenderStateShard extends RenderPhase {
public static final IsEntityRenderStateShard INSTANCE = new IsEntityRenderStateShard();
private IsEntityRenderStateShard() {
super("iris:is_entity", GbufferPrograms::beginEntities, GbufferPrograms::endEntities);
}
}
@@ -1,11 +0,0 @@
package net.coderbot.iris.layer;
import com.gtnewhorizons.angelica.compat.toremove.RenderPhase;
public class IsOutlineRenderStateShard extends RenderPhase {
public static final IsOutlineRenderStateShard INSTANCE = new IsOutlineRenderStateShard();
private IsOutlineRenderStateShard() {
super("iris:is_outline", GbufferPrograms::beginOutline, GbufferPrograms::endOutline);
}
}