mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-19 20:09:39 +00:00
Add support for dimension.properties (#1283)
This commit is contained in:
1 parent
26300bbb1b
commit
2f2fc22df3
5 files changed
+350
-73
No files matched your search
@@ -3,7 +3,6 @@ package net.coderbot.iris.pipeline;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import lombok.Getter;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.shaderpack.DimensionId;
|
||||
import net.coderbot.iris.uniforms.SystemTimeUniforms;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
@@ -16,21 +15,21 @@ import java.util.function.Function;
|
||||
|
||||
public class PipelineManager {
|
||||
|
||||
private final Function<DimensionId, WorldRenderingPipeline> pipelineFactory;
|
||||
private final Map<DimensionId, WorldRenderingPipeline> pipelinesPerDimension = new HashMap<>();
|
||||
private final Function<String, WorldRenderingPipeline> pipelineFactory;
|
||||
private final Map<String, WorldRenderingPipeline> pipelinesPerDimension = new HashMap<>();
|
||||
private WorldRenderingPipeline pipeline = new FixedFunctionWorldRenderingPipeline();
|
||||
private DimensionId lastPreparedDimension = null;
|
||||
private String lastPreparedDimension = null;
|
||||
@Getter
|
||||
private int versionCounterForSodiumShaderReload = 0;
|
||||
|
||||
public PipelineManager(Function<DimensionId, WorldRenderingPipeline> pipelineFactory) {
|
||||
public PipelineManager(Function<String, WorldRenderingPipeline> pipelineFactory) {
|
||||
this.pipelineFactory = pipelineFactory;
|
||||
}
|
||||
|
||||
public WorldRenderingPipeline preparePipeline(DimensionId currentDimension) {
|
||||
public WorldRenderingPipeline preparePipeline(String currentDimension) {
|
||||
// Detect dimension change and do full teardown/recreation
|
||||
if (lastPreparedDimension != null && lastPreparedDimension != currentDimension) {
|
||||
Iris.logger.info("Dimension changed from {} to {}, reloading pipeline", lastPreparedDimension, currentDimension);
|
||||
if (lastPreparedDimension != null && !lastPreparedDimension.equals(currentDimension)) {
|
||||
Iris.logger.info("Dimension changed from '{}' to '{}', reloading pipeline", lastPreparedDimension, currentDimension);
|
||||
destroyPipeline();
|
||||
}
|
||||
lastPreparedDimension = currentDimension;
|
||||
@@ -39,7 +38,7 @@ public class PipelineManager {
|
||||
SystemTimeUniforms.COUNTER.reset();
|
||||
SystemTimeUniforms.TIMER.reset();
|
||||
|
||||
Iris.logger.info("Creating pipeline for dimension {}", currentDimension);
|
||||
Iris.logger.info("Creating pipeline for dimension '{}'", currentDimension);
|
||||
pipeline = pipelineFactory.apply(currentDimension);
|
||||
pipelinesPerDimension.put(currentDimension, pipeline);
|
||||
} else {
|
||||
@@ -71,8 +70,8 @@ public class PipelineManager {
|
||||
* @see <a href="https://github.com/IrisShaders/Iris/issues/1330">this GitHub issue</a>
|
||||
*/
|
||||
public void destroyPipeline() {
|
||||
pipelinesPerDimension.forEach((dimensionId, pipeline) -> {
|
||||
Iris.logger.info("Destroying pipeline {}", dimensionId);
|
||||
pipelinesPerDimension.forEach((dimensionName, pipeline) -> {
|
||||
Iris.logger.info("Destroying pipeline for dimension '{}'", dimensionName);
|
||||
resetTextureState();
|
||||
pipeline.destroy();
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user