mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-19 03:49:22 +00:00
Ambient Occlusion Fixes (#575)
* Disable broken optimizations for Sodium AO * Use Sodium AO by default for standard block rendering
This commit is contained in:
1 parent
ff8315270b
commit
29072ee3f8
3 files changed
+16
-18
No files matched your search
+1
-11
@@ -1,13 +1,7 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.sodium;
|
||||
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
|
||||
@@ -15,10 +9,6 @@ import org.spongepowered.asm.mixin.injection.Redirect;
|
||||
public abstract class MixinRenderBlocks {
|
||||
@Redirect(method = "renderStandardBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;isAmbientOcclusionEnabled()Z"))
|
||||
private boolean checkAOEnabled() {
|
||||
if(AngelicaConfig.enableIris && BlockRenderingSettings.INSTANCE.shouldUseSeparateAo()) {
|
||||
return false; // force Sodium pipeline
|
||||
}
|
||||
|
||||
return Minecraft.isAmbientOcclusionEnabled();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
+13
-6
@@ -3,6 +3,7 @@ package me.jellysquid.mods.sodium.client.model.light.smooth;
|
||||
import com.google.common.math.DoubleMath;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.BlockPosImpl;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import me.jellysquid.mods.sodium.client.SodiumClientMod;
|
||||
import me.jellysquid.mods.sodium.client.model.light.LightPipeline;
|
||||
import me.jellysquid.mods.sodium.client.model.light.data.LightDataAccess;
|
||||
import me.jellysquid.mods.sodium.client.model.light.data.QuadLightData;
|
||||
@@ -40,6 +41,8 @@ import net.minecraftforge.common.util.ForgeDirection;
|
||||
*/
|
||||
public class SmoothLightPipeline implements LightPipeline {
|
||||
public static final double TOLERANCE = 1.0E-5F;
|
||||
|
||||
public static final boolean useSmoothLightingOptimizations = false;
|
||||
/**
|
||||
* The cache which light data will be accessed from.
|
||||
*/
|
||||
@@ -80,14 +83,18 @@ public class SmoothLightPipeline implements LightPipeline {
|
||||
// map the corner values onto this quad's vertices. This covers most situations during rendering and provides
|
||||
// a modest speed-up.
|
||||
// To match vanilla behavior, also treat the face as aligned if it is parallel and the block state is a full cube
|
||||
if ((flags & ModelQuadFlags.IS_ALIGNED) != 0 || ((flags & ModelQuadFlags.IS_PARALLEL) != 0 && LightDataAccess.unpackFC(this.lightCache.get(pos)))) {
|
||||
if ((flags & ModelQuadFlags.IS_PARTIAL) == 0) {
|
||||
this.applyAlignedFullFace(neighborInfo, pos, face, out);
|
||||
if (useSmoothLightingOptimizations) {
|
||||
if ((flags & ModelQuadFlags.IS_ALIGNED) != 0 || ((flags & ModelQuadFlags.IS_PARALLEL) != 0 && LightDataAccess.unpackFC(this.lightCache.get(pos)))) {
|
||||
if ((flags & ModelQuadFlags.IS_PARTIAL) == 0) {
|
||||
this.applyAlignedFullFace(neighborInfo, pos, face, out);
|
||||
} else {
|
||||
this.applyAlignedPartialFace(neighborInfo, quad, pos, face, out);
|
||||
}
|
||||
} else if ((flags & ModelQuadFlags.IS_PARALLEL) != 0) {
|
||||
this.applyParallelFace(neighborInfo, quad, pos, face, out);
|
||||
} else {
|
||||
this.applyAlignedPartialFace(neighborInfo, quad, pos, face, out);
|
||||
this.applyNonParallelFace(neighborInfo, quad, pos, face, out);
|
||||
}
|
||||
} else if ((flags & ModelQuadFlags.IS_PARALLEL) != 0) {
|
||||
this.applyParallelFace(neighborInfo, quad, pos, face, out);
|
||||
} else {
|
||||
this.applyNonParallelFace(neighborInfo, quad, pos, face, out);
|
||||
}
|
||||
|
||||
@@ -8,6 +8,7 @@ import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.glsm.TessellatorManager;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.ModeledBlock;
|
||||
import com.gtnewhorizons.angelica.utils.ObjectPooler;
|
||||
import me.jellysquid.mods.sodium.client.SodiumClientMod;
|
||||
import me.jellysquid.mods.sodium.client.model.light.LightMode;
|
||||
import me.jellysquid.mods.sodium.client.model.light.LightPipeline;
|
||||
import me.jellysquid.mods.sodium.client.model.light.LightPipelineProvider;
|
||||
@@ -101,7 +102,7 @@ public class BlockRenderer {
|
||||
|
||||
for (ModelQuadFacing facing : ModelQuadFacing.VALUES) {
|
||||
this.random.setSeed(seed);
|
||||
this.renderQuadList(pos, lighter, buffers, quads, facing, false);
|
||||
this.renderQuadList(pos, lighter, buffers, quads, facing, block.getRenderType() == 0);
|
||||
}
|
||||
|
||||
if (!quads.isEmpty()) rendered = true;
|
||||
|
||||
Reference in new issue
Block a user