mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-20 04:19:40 +00:00
Integrate Sodium animation system with Angelica's (#147)
This commit is contained in:
1 parent
a0646456d3
commit
14c09770eb
9 files changed
+37
-163
No files matched your search
@@ -115,10 +115,6 @@ public enum Mixins {
|
||||
,"sodium.MixinGuiIngameForge"
|
||||
,"sodium.MixinEffectRenderer"
|
||||
,"sodium.MixinTileEntityRendererDispatcher"
|
||||
// TODO Doesn't work correctly
|
||||
//,"sodium.MixinTextureAtlasSprite"
|
||||
//,"sodium.MixinTextureMap"
|
||||
//,"sodium.MixinEntityFX"
|
||||
,"sodium.MixinLongHashMap"
|
||||
,"sodium.MixinRender"
|
||||
)
|
||||
|
||||
+18
-1
@@ -1,6 +1,8 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.angelica.animation;
|
||||
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.ITexturesCache;
|
||||
import com.gtnewhorizons.angelica.utils.AnimationsRenderUtils;
|
||||
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockFire;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
@@ -14,8 +16,10 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
@Mixin(RenderBlocks.class)
|
||||
public class MixinRenderBlocks {
|
||||
public class MixinRenderBlocks implements ITexturesCache {
|
||||
|
||||
@Shadow
|
||||
public IBlockAccess blockAccess;
|
||||
@@ -23,6 +27,8 @@ public class MixinRenderBlocks {
|
||||
@Shadow
|
||||
public IIcon overrideBlockTexture;
|
||||
|
||||
private Set<IIcon> renderedSprites = new ReferenceOpenHashSet<>();
|
||||
|
||||
/**
|
||||
* @author laetansky Here where things get very tricky. We can't just mark blocks textures for update because this
|
||||
* method gets called only when chunk render cache needs an update (that happens when a state of any block
|
||||
@@ -39,11 +45,15 @@ public class MixinRenderBlocks {
|
||||
}
|
||||
|
||||
AnimationsRenderUtils.markBlockTextureForUpdate(icon, blockAccess);
|
||||
|
||||
this.renderedSprites.add(icon);
|
||||
}
|
||||
|
||||
@Inject(method = "renderBlockFire", at = @At("HEAD"))
|
||||
public void angelica$markFireBlockAnimationForUpdate(BlockFire instance, int x, int y, int z,
|
||||
CallbackInfoReturnable<Boolean> cir) {
|
||||
this.renderedSprites.add(instance.getFireIcon(0));
|
||||
this.renderedSprites.add(instance.getFireIcon(1));
|
||||
AnimationsRenderUtils.markBlockTextureForUpdate(instance.getFireIcon(0), blockAccess);
|
||||
AnimationsRenderUtils.markBlockTextureForUpdate(instance.getFireIcon(1), blockAccess);
|
||||
}
|
||||
@@ -52,6 +62,13 @@ public class MixinRenderBlocks {
|
||||
public IIcon angelica$markFluidAnimationForUpdate(IIcon icon) {
|
||||
AnimationsRenderUtils.markBlockTextureForUpdate(icon, blockAccess);
|
||||
|
||||
this.renderedSprites.add(icon);
|
||||
|
||||
return icon;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Set<IIcon> getRenderedTextures() {
|
||||
return renderedSprites;
|
||||
}
|
||||
}
|
||||
@@ -1,35 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.sodium;
|
||||
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.ISpriteExt;
|
||||
import me.jellysquid.mods.sodium.client.render.texture.SpriteUtil;
|
||||
import net.minecraft.client.particle.EntityFX;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.util.IIcon;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(EntityFX.class)
|
||||
public class MixinEntityFX {
|
||||
|
||||
@Shadow
|
||||
protected IIcon particleIcon;
|
||||
|
||||
private boolean shouldTickSprite;
|
||||
|
||||
@Inject(method = "setParticleIcon", at = @At("RETURN"))
|
||||
public void afterSetSprite(IIcon icon, CallbackInfo ci) {
|
||||
this.shouldTickSprite = icon instanceof ISpriteExt atlasSprite && atlasSprite.isAnimation();
|
||||
}
|
||||
|
||||
@Inject(method = "renderParticle", at = @At("HEAD"))
|
||||
public void renderParticle(Tessellator tessellator, float offset, float x, float y, float z, float u, float v, CallbackInfo ci) {
|
||||
if (this.shouldTickSprite && this.particleIcon instanceof TextureAtlasSprite atlasSprite) {
|
||||
SpriteUtil.markSpriteActive(atlasSprite);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
-79
@@ -1,79 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.sodium;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.SodiumClientMod;
|
||||
import me.jellysquid.mods.sodium.client.render.texture.SpriteExtended;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureUtil;
|
||||
import net.minecraft.client.resources.data.AnimationMetadataSection;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Overwrite;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Mixin(TextureAtlasSprite.class)
|
||||
public class MixinTextureAtlasSprite implements SpriteExtended {
|
||||
private boolean forceNextUpdate;
|
||||
|
||||
@Shadow
|
||||
protected List<int[][]> framesTextureData;
|
||||
|
||||
@Shadow
|
||||
private AnimationMetadataSection animationMetadata;
|
||||
|
||||
@Shadow
|
||||
protected int originX;
|
||||
|
||||
@Shadow
|
||||
protected int originY;
|
||||
|
||||
@Shadow
|
||||
protected int width;
|
||||
|
||||
@Shadow
|
||||
protected int height;
|
||||
|
||||
@Shadow
|
||||
protected int frameCounter;
|
||||
|
||||
@Shadow
|
||||
protected int tickCounter;
|
||||
|
||||
/**
|
||||
* @author JellySquid & Asek3
|
||||
* @reason To optimal solution it's better to overwrite
|
||||
*/
|
||||
@Overwrite
|
||||
public void updateAnimation() {
|
||||
++this.tickCounter;
|
||||
|
||||
boolean onDemand = SodiumClientMod.options().advanced.animateOnlyVisibleTextures;
|
||||
|
||||
if (!onDemand || this.forceNextUpdate) {
|
||||
this.uploadTexture();
|
||||
}
|
||||
}
|
||||
|
||||
private void uploadTexture() {
|
||||
if (this.tickCounter >= this.animationMetadata.getFrameTimeSingle(this.frameCounter)) {
|
||||
int prevFrameIndex = this.animationMetadata.getFrameIndex(this.frameCounter);
|
||||
int frameCount = this.animationMetadata.getFrameCount() == 0 ? this.framesTextureData.size() : this.animationMetadata.getFrameCount();
|
||||
|
||||
this.frameCounter = (this.frameCounter + 1) % frameCount;
|
||||
this.tickCounter = 0;
|
||||
|
||||
int frameIndex = this.animationMetadata.getFrameIndex(this.frameCounter);
|
||||
|
||||
if (prevFrameIndex != frameIndex && frameIndex >= 0 && frameIndex < this.framesTextureData.size()) {
|
||||
TextureUtil.uploadTextureMipmap(this.framesTextureData.get(frameIndex), this.width, this.height, this.originX, this.originY, false, false);
|
||||
}
|
||||
}
|
||||
|
||||
this.forceNextUpdate = false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void markActive() {
|
||||
this.forceNextUpdate = true;
|
||||
}
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.sodium;
|
||||
|
||||
import me.jellysquid.mods.sodium.client.render.texture.SpriteUtil;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
|
||||
|
||||
@Mixin(TextureMap.class)
|
||||
public class MixinTextureMap {
|
||||
|
||||
@Inject(method = "getAtlasSprite", at = @At("RETURN"))
|
||||
private void preReturnSprite(CallbackInfoReturnable<TextureAtlasSprite> cir) {
|
||||
TextureAtlasSprite sprite = cir.getReturnValue();
|
||||
|
||||
if (sprite != null) {
|
||||
SpriteUtil.markSpriteActive(sprite);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
+2
-2
@@ -2,13 +2,13 @@ package me.jellysquid.mods.sodium.client.render.chunk;
|
||||
|
||||
import com.gtnewhorizons.angelica.compat.mojang.BlockPos;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos;
|
||||
import com.gtnewhorizons.angelica.utils.AnimationsRenderUtils;
|
||||
import lombok.Getter;
|
||||
import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
|
||||
import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkRenderBounds;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.data.ChunkRenderData;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.passes.BlockRenderPass;
|
||||
import me.jellysquid.mods.sodium.client.render.texture.SpriteUtil;
|
||||
import me.jellysquid.mods.sodium.client.util.math.FrustumExtended;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
|
||||
@@ -196,7 +196,7 @@ public class ChunkRenderContainer<T extends ChunkGraphicsState> {
|
||||
*/
|
||||
public void tick() {
|
||||
for (TextureAtlasSprite sprite : this.data.getAnimatedSprites()) {
|
||||
SpriteUtil.markSpriteActive(sprite);
|
||||
AnimationsRenderUtils.markBlockTextureForUpdate(sprite);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+17
-2
@@ -3,6 +3,7 @@ package me.jellysquid.mods.sodium.client.render.chunk.tasks;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.BlockPos;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.ChunkOcclusionDataBuilder;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.ITexturesCache;
|
||||
import com.gtnewhorizons.angelica.rendering.AngelicaBlockSafetyRegistry;
|
||||
import com.gtnewhorizons.angelica.rendering.AngelicaRenderQueue;
|
||||
import me.jellysquid.mods.sodium.client.SodiumClientMod;
|
||||
@@ -23,10 +24,12 @@ import net.coderbot.iris.vertices.ExtendedDataHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.RenderBlocks;
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.fluids.IFluidBlock;
|
||||
import org.joml.Vector3d;
|
||||
|
||||
@@ -89,6 +92,14 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
return type < 42 && type != 22 && AngelicaBlockSafetyRegistry.canBlockRenderOffThread(block);
|
||||
}
|
||||
|
||||
private void handleRenderBlocksTextures(RenderBlocks rb, ChunkRenderData.Builder builder) {
|
||||
for(IIcon texture : ((ITexturesCache)rb).getRenderedTextures()) {
|
||||
if(texture instanceof TextureAtlasSprite) {
|
||||
builder.addSprite((TextureAtlasSprite)texture);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ChunkBuildResult<T> performBuild(ChunkRenderCacheLocal cache, ChunkBuildBuffers buffers, CancellationSource cancellationSource) {
|
||||
// COMPATIBLITY NOTE: Oculus relies on the LVT of this method being unchanged, at least in 16.5
|
||||
@@ -182,10 +193,12 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
}
|
||||
}
|
||||
|
||||
handleRenderBlocksTextures(renderBlocks, renderData);
|
||||
|
||||
if(hasMainThreadBlocks) {
|
||||
// Render the other blocks on the main thread
|
||||
try {
|
||||
CompletableFuture.runAsync(() -> this.performMainBuild(cache, buffers, cancellationSource, bounds), AngelicaRenderQueue.executor()).get();
|
||||
CompletableFuture.runAsync(() -> this.performMainBuild(cache, buffers, cancellationSource, bounds, renderData), AngelicaRenderQueue.executor()).get();
|
||||
} catch(InterruptedException e) {
|
||||
Thread.currentThread().interrupt();
|
||||
return null;
|
||||
@@ -218,7 +231,7 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
*
|
||||
* TODO: Deduplicate this with the main method above.
|
||||
*/
|
||||
private void performMainBuild(ChunkRenderCacheLocal cache, ChunkBuildBuffers buffers, CancellationSource cancellationSource, ChunkRenderBounds.Builder bounds) {
|
||||
private void performMainBuild(ChunkRenderCacheLocal cache, ChunkBuildBuffers buffers, CancellationSource cancellationSource, ChunkRenderBounds.Builder bounds, ChunkRenderData.Builder renderData) {
|
||||
final WorldSlice slice = cache.getWorldSlice();
|
||||
final BlockPos.Mutable pos = new BlockPos.Mutable();
|
||||
final int baseX = this.render.getOriginX();
|
||||
@@ -264,6 +277,8 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
handleRenderBlocksTextures(rb, renderData);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
package me.jellysquid.mods.sodium.client.render.texture;
|
||||
|
||||
public interface SpriteExtended {
|
||||
void markActive();
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
package me.jellysquid.mods.sodium.client.render.texture;
|
||||
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
|
||||
|
||||
public class SpriteUtil {
|
||||
public static void markSpriteActive(TextureAtlasSprite sprite) {
|
||||
if (sprite instanceof SpriteExtended) {
|
||||
((SpriteExtended) sprite).markActive();
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user