ambientOcclusionLevel constant support (IrisShaders#797)

* Initial support for ambientOcclusionLevel

* Make Indigo and Indium respect ambientOcclusionLevel

* rework ambientOcclusionLevel support

* Return 1.0 if ambientOcclusionLevel is not set

* Rework code again

* Remove unneeded if check

* Use AbstractBlock.getAmbientOcclusionLightLevel

* Remove useless shadow

src/main/java/net/coderbot/iris/block_rendering/BlockRenderingSettings.java

@@ -7,6 +7,7 @@ public class BlockRenderingSettings {
 
 	private boolean reloadRequired;
 	private IdMap idMap;
+	private float ambientOcclusionLevel;
 	private boolean disableDirectionalShading;
 	private boolean useSeparateAo;
 
@@ -38,6 +39,19 @@ public void setIdMap(IdMap idMap) {
 		this.idMap = idMap;
 	}
 
+	public float getAmbientOcclusionLevel() {
+		return ambientOcclusionLevel;
+	}
+
+	public void setAmbientOcclusionLevel(float ambientOcclusionLevel) {
+		if (ambientOcclusionLevel == this.ambientOcclusionLevel) {
+			return;
+		}
+
+		this.reloadRequired = true;
+		this.ambientOcclusionLevel = ambientOcclusionLevel;
+	}
+
 	public boolean shouldDisableDirectionalShading() {
 		return disableDirectionalShading;
 	}

src/main/java/net/coderbot/iris/mixin/MixinAbstractBlockState.java

@@ -0,0 +1,35 @@
+package net.coderbot.iris.mixin;
+
+import net.coderbot.iris.block_rendering.BlockRenderingSettings;
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.BlockView;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Overwrite;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(AbstractBlock.AbstractBlockState.class)
+public abstract class MixinAbstractBlockState {
+	@Shadow
+	public abstract Block getBlock();
+
+	@Shadow
+	protected abstract BlockState asBlockState();
+
+	/**
+	 * @author IMS
+	 * @reason ambientOcclusionLevel support
+	 */
+	@Environment(EnvType.CLIENT)
+	@Deprecated
+	@Overwrite
+	public float getAmbientOcclusionLightLevel(BlockView world, BlockPos pos) {
+		float originalValue = this.getBlock().getAmbientOcclusionLightLevel(this.asBlockState(), world, pos);
+		float aoLightValue = BlockRenderingSettings.INSTANCE.getAmbientOcclusionLevel();
+		return 1.0F - aoLightValue * (1.0F - originalValue);
+	}
+}

src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java

@@ -134,6 +134,7 @@ public DeferredWorldRenderingPipeline(ProgramSet programs) {
 		this.sunPathRotation = programs.getPackDirectives().getSunPathRotation();
 
 		BlockRenderingSettings.INSTANCE.setIdMap(programs.getPack().getIdMap());
+		BlockRenderingSettings.INSTANCE.setAmbientOcclusionLevel(programs.getPackDirectives().getAmbientOcclusionLevel());
 		BlockRenderingSettings.INSTANCE.setDisableDirectionalShading(shouldDisableDirectionalShading());
 		BlockRenderingSettings.INSTANCE.setUseSeparateAo(programs.getPackDirectives().shouldUseSeparateAo());
 

src/main/java/net/coderbot/iris/pipeline/FixedFunctionWorldRenderingPipeline.java

@@ -13,6 +13,7 @@ public class FixedFunctionWorldRenderingPipeline implements WorldRenderingPipeli
 	public FixedFunctionWorldRenderingPipeline() {
 		BlockRenderingSettings.INSTANCE.setDisableDirectionalShading(shouldDisableDirectionalShading());
 		BlockRenderingSettings.INSTANCE.setUseSeparateAo(false);
+		BlockRenderingSettings.INSTANCE.setAmbientOcclusionLevel(1.0f);
 	}
 
 	@Override

src/main/java/net/coderbot/iris/shaderpack/PackDirectives.java

@@ -5,6 +5,7 @@
 public class PackDirectives {
 	private int noiseTextureResolution;
 	private float sunPathRotation;
+	private float ambientOcclusionLevel;
 	private boolean areCloudsEnabled;
 	private boolean separateAo;
 
@@ -14,6 +15,7 @@ public class PackDirectives {
 	private PackDirectives(Set<Integer> supportedRenderTargets) {
 		noiseTextureResolution = 256;
 		sunPathRotation = 0.0F;
+		ambientOcclusionLevel = 1.0F;
 		renderTargetDirectives = new PackRenderTargetDirectives(supportedRenderTargets);
 		shadowDirectives = new PackShadowDirectives();
 	}
@@ -38,6 +40,10 @@ public float getSunPathRotation() {
 		return sunPathRotation;
 	}
 
+	public float getAmbientOcclusionLevel() {
+		return ambientOcclusionLevel;
+	}
+
 	public boolean areCloudsEnabled() {
 		return areCloudsEnabled;
 	}
@@ -63,5 +69,9 @@ public void acceptDirectivesFrom(DirectiveHolder directives) {
 
 		directives.acceptConstFloatDirective("sunPathRotation",
 				sunPathRotation -> this.sunPathRotation = sunPathRotation);
+
+		directives.acceptConstFloatDirective("ambientOcclusionLevel",
+				ambientOcclusionLevel -> this.ambientOcclusionLevel = ambientOcclusionLevel);
+
 	}
 }

src/main/resources/mixins.iris.json

@@ -5,6 +5,7 @@
   "plugin": "net.coderbot.iris.mixin.shadows.IrisShadowsMixinPlugin",
   "compatibilityLevel": "JAVA_8",
   "client": [
+    "MixinAbstractBlockState",
     "MixinBackgroundRenderer",
     "MixinDebugHud",
     "MixinEndPortalBlockEntityRenderer",