Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Convert spriteUtil into a api #2747

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

Convert spriteUtil into a api #2747

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
61a874a
Convert spriteUtil into a api
IThundxr Sep 13, 2024
10d2295
Make it experimental
IThundxr Sep 15, 2024
dbb5bb5
Require NotNull
IThundxr Sep 15, 2024
db3c901
address reviews
IThundxr Sep 15, 2024
5574827
Fix imports
IThundxr Sep 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions common/src/api/java/net/caffeinemc/mods/sodium/api/texture/SpriteUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package net.caffeinemc.mods.sodium.api.texture;

import net.caffeinemc.mods.sodium.api.internal.DependencyInjection;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import org.jetbrains.annotations.ApiStatus;
import org.jetbrains.annotations.NotNull;

@ApiStatus.Experimental
@ApiStatus.AvailableSince("0.6.0")
IThundxr marked this conversation as resolved.
Show resolved Hide resolved
public interface SpriteUtil {
SpriteUtil INSTANCE = DependencyInjection.load(SpriteUtil.class,
"net.caffeinemc.mods.sodium.client.render.texture.SpriteUtilImpl");

/**
* Marks a provided sprite as active
* @param sprite The sprite you want to mark as active
*/
void markSpriteActive(@NotNull TextureAtlasSprite sprite);

/**
* Checks if the provided sprite has an animation
*
* @param sprite The sprite you want to check
* @return true if the provided sprite has an animation, false if it doesn't
*/
boolean hasAnimation(TextureAtlasSprite sprite);
IThundxr marked this conversation as resolved.
Show resolved Hide resolved
}
4 changes: 2 additions & 2 deletions ...on/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/RenderSectionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet;
import it.unimi.dsi.fastutil.objects.ReferenceSet;
import it.unimi.dsi.fastutil.objects.ReferenceSets;
import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.client.SodiumClientMod;
import net.caffeinemc.mods.sodium.client.gl.device.CommandList;
import net.caffeinemc.mods.sodium.client.gl.device.RenderDevice;
Expand Down Expand Up @@ -37,7 +38,6 @@
import net.caffeinemc.mods.sodium.client.render.chunk.translucent_sorting.trigger.CameraMovement;
import net.caffeinemc.mods.sodium.client.render.chunk.translucent_sorting.trigger.SortTriggering;
import net.caffeinemc.mods.sodium.client.render.chunk.vertex.format.ChunkMeshFormats;
import net.caffeinemc.mods.sodium.client.render.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.client.render.util.RenderAsserts;
import net.caffeinemc.mods.sodium.client.render.viewport.CameraTransform;
import net.caffeinemc.mods.sodium.client.render.viewport.Viewport;
Expand Down Expand Up @@ -274,7 +274,7 @@ public void tickVisibleRenders() {
}

for (TextureAtlasSprite sprite : sprites) {
SpriteUtil.markSpriteActive(sprite);
SpriteUtil.INSTANCE.markSpriteActive(sprite);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...n/src/main/java/net/caffeinemc/mods/sodium/client/render/chunk/data/BuiltSectionInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package net.caffeinemc.mods.sodium.client.render.chunk.data;

import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.client.render.chunk.RenderSectionFlags;
import net.caffeinemc.mods.sodium.client.render.chunk.occlusion.VisibilityEncoding;
import net.caffeinemc.mods.sodium.client.render.chunk.terrain.TerrainRenderPass;
import net.caffeinemc.mods.sodium.client.render.texture.SpriteUtil;
import net.minecraft.client.renderer.chunk.VisibilitySet;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.core.Direction;
Expand Down Expand Up @@ -79,7 +79,7 @@ public void setOcclusionData(VisibilitySet data) {
* @param sprite The sprite
*/
public void addSprite(TextureAtlasSprite sprite) {
if (SpriteUtil.hasAnimation(sprite)) {
if (SpriteUtil.INSTANCE.hasAnimation(sprite)) {
this.animatedSprites.add(sprite);
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/net/caffeinemc/mods/sodium/client/render/frapi/render/ItemRenderContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.math.MatrixUtil;
import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.client.render.frapi.helper.ColorHelper;
import net.caffeinemc.mods.sodium.client.render.frapi.mesh.EncodingFormat;
import net.caffeinemc.mods.sodium.client.render.frapi.mesh.MutableQuadViewImpl;
import net.caffeinemc.mods.sodium.client.render.texture.SpriteFinderCache;
import net.caffeinemc.mods.sodium.client.render.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.mixin.features.render.frapi.ItemRendererAccessor;
import net.fabricmc.fabric.api.renderer.v1.material.BlendMode;
import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial;
Expand Down Expand Up @@ -223,7 +223,7 @@ private void shadeQuad(MutableQuadViewImpl quad, boolean emissive) {

private void bufferQuad(MutableQuadViewImpl quad, VertexConsumer vertexConsumer) {
QuadEncoder.writeQuadVertices(quad, vertexConsumer, overlay, matPosition, trustedNormals, matNormal);
SpriteUtil.markSpriteActive(quad.sprite(SpriteFinderCache.forBlockAtlas()));
SpriteUtil.INSTANCE.markSpriteActive(quad.sprite(SpriteFinderCache.forBlockAtlas()));
}

/**
Expand Down
4 changes: 2 additions & 2 deletions ...a/net/caffeinemc/mods/sodium/client/render/frapi/render/NonTerrainBlockRenderContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.client.model.light.LightMode;
import net.caffeinemc.mods.sodium.client.model.light.LightPipelineProvider;
import net.caffeinemc.mods.sodium.client.model.light.data.SingleBlockLightDataCache;
import net.caffeinemc.mods.sodium.client.render.frapi.helper.ColorHelper;
import net.caffeinemc.mods.sodium.client.render.frapi.mesh.MutableQuadViewImpl;
import net.caffeinemc.mods.sodium.client.render.texture.SpriteFinderCache;
import net.caffeinemc.mods.sodium.client.render.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.client.services.SodiumModelData;
import net.fabricmc.fabric.api.renderer.v1.material.RenderMaterial;
import net.fabricmc.fabric.api.renderer.v1.material.ShadeMode;
Expand Down Expand Up @@ -127,6 +127,6 @@ protected void shadeQuad(MutableQuadViewImpl quad, LightMode lightMode, boolean

private void bufferQuad(MutableQuadViewImpl quad) {
QuadEncoder.writeQuadVertices(quad, vertexConsumer, overlay, matPosition, trustedNormals, matNormal);
SpriteUtil.markSpriteActive(quad.sprite(SpriteFinderCache.forBlockAtlas()));
SpriteUtil.INSTANCE.markSpriteActive(quad.sprite(SpriteFinderCache.forBlockAtlas()));
IThundxr marked this conversation as resolved.
Show resolved Hide resolved
}
}
20 changes: 0 additions & 20 deletions common/src/main/java/net/caffeinemc/mods/sodium/client/render/texture/SpriteUtil.java
View file
Open in desktop

This file was deleted.

21 changes: 21 additions & 0 deletions common/src/main/java/net/caffeinemc/mods/sodium/client/render/texture/SpriteUtilImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package net.caffeinemc.mods.sodium.client.render.texture;

import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import org.jetbrains.annotations.NotNull;

import java.util.Objects;

public class SpriteUtilImpl implements SpriteUtil {
@Override
public void markSpriteActive(@NotNull TextureAtlasSprite sprite) {
Objects.requireNonNull(sprite);

((SpriteContentsExtension) sprite.contents()).sodium$setActive(true);
}

@Override
public boolean hasAnimation(TextureAtlasSprite sprite) {
return ((SpriteContentsExtension) sprite.contents()).sodium$hasAnimation();
}
}
16 changes: 9 additions & 7 deletions .../sodium/mixin/features/render/immediate/buffer_builder/intrinsics/BufferBuilderMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
import com.mojang.blaze3d.vertex.BufferBuilder;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.client.model.quad.ModelQuadView;
import net.caffeinemc.mods.sodium.client.render.immediate.model.BakedModelEncoder;
import net.caffeinemc.mods.sodium.client.render.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.api.util.ColorABGR;
import net.caffeinemc.mods.sodium.api.vertex.buffer.VertexBufferWriter;
import net.minecraft.client.renderer.block.model.BakedQuad;
Expand All @@ -24,8 +24,8 @@ public abstract class BufferBuilderMixin implements VertexConsumer {
public void putBulkData(PoseStack.Pose matrices, BakedQuad bakedQuad, float r, float g, float b, float a, int light, int overlay) {
if (!this.fastFormat) {
VertexConsumer.super.putBulkData(matrices, bakedQuad, r, g, b, a, light, overlay);

SpriteUtil.markSpriteActive(bakedQuad.getSprite());
SpriteUtil.INSTANCE.markSpriteActive(bakedQuad.getSprite());
IThundxr marked this conversation as resolved.
Show resolved Hide resolved

return;
}
Expand All @@ -41,15 +41,16 @@ public void putBulkData(PoseStack.Pose matrices, BakedQuad bakedQuad, float r, f
int color = ColorABGR.pack(r, g, b, a);
BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay);

SpriteUtil.markSpriteActive(quad.getSprite());
if (quad.getSprite() != null)
IThundxr marked this conversation as resolved.
Show resolved Hide resolved
SpriteUtil.INSTANCE.markSpriteActive(quad.getSprite());
IThundxr marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
public void putBulkData(PoseStack.Pose matrices, BakedQuad bakedQuad, float[] brightnessTable, float r, float g, float b, float a, int[] light, int overlay, boolean colorize) {
if (!this.fastFormat) {
VertexConsumer.super.putBulkData(matrices, bakedQuad, brightnessTable, r, g, b, a, light, overlay, colorize);

SpriteUtil.markSpriteActive(bakedQuad.getSprite());
SpriteUtil.INSTANCE.markSpriteActive(bakedQuad.getSprite());
IThundxr marked this conversation as resolved.
Show resolved Hide resolved

return;
}
Expand All @@ -64,6 +65,7 @@ public void putBulkData(PoseStack.Pose matrices, BakedQuad bakedQuad, float[] br

BakedModelEncoder.writeQuadVertices(writer, matrices, quad, r, g, b, a, brightnessTable, colorize, light, overlay);

SpriteUtil.markSpriteActive(quad.getSprite());
if (quad.getSprite() != null)
IThundxr marked this conversation as resolved.
Show resolved Hide resolved
SpriteUtil.INSTANCE.markSpriteActive(quad.getSprite());
}
}
5 changes: 3 additions & 2 deletions ...n/java/net/caffeinemc/mods/sodium/mixin/features/render/model/item/ItemRendererMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package net.caffeinemc.mods.sodium.mixin.features.render.model.item;

import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.client.model.quad.BakedQuadView;
import net.caffeinemc.mods.sodium.client.render.immediate.model.BakedModelEncoder;
import net.caffeinemc.mods.sodium.client.render.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.client.render.vertex.VertexConsumerUtils;
import net.caffeinemc.mods.sodium.client.model.color.interop.ItemColorsExtension;
import net.caffeinemc.mods.sodium.client.util.DirectionUtil;
Expand Down Expand Up @@ -94,7 +94,8 @@ private void renderBakedItemQuads(PoseStack.Pose matrices, VertexBufferWriter wr

BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay);

SpriteUtil.markSpriteActive(quad.getSprite());
if (quad.getSprite() != null)
IThundxr marked this conversation as resolved.
Show resolved Hide resolved
SpriteUtil.INSTANCE.markSpriteActive(quad.getSprite());
}
}
}
6 changes: 3 additions & 3 deletions .../caffeinemc/mods/sodium/mixin/features/textures/animations/tracking/GuiGraphicsMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.caffeinemc.mods.sodium.mixin.features.textures.animations.tracking;

import net.caffeinemc.mods.sodium.client.render.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.minecraft.client.gui.GuiGraphics;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import org.spongepowered.asm.mixin.Mixin;
Expand All @@ -16,7 +16,7 @@ private void preDrawSprite(int x, int y, int z,
TextureAtlasSprite sprite,
CallbackInfo ci)
{
SpriteUtil.markSpriteActive(sprite);
SpriteUtil.INSTANCE.markSpriteActive(sprite);
}

@Inject(method = "blit(IIIIILnet/minecraft/client/renderer/texture/TextureAtlasSprite;FFFF)V", at = @At("HEAD"))
Expand All @@ -26,6 +26,6 @@ private void preDrawSprite(int x, int y, int z,
float red, float green, float blue, float alpha,
CallbackInfo ci)
{
SpriteUtil.markSpriteActive(sprite);
SpriteUtil.INSTANCE.markSpriteActive(sprite);
}
}
4 changes: 2 additions & 2 deletions ...nemc/mods/sodium/mixin/features/textures/animations/tracking/ModelBlockRendererMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.caffeinemc.mods.sodium.client.render.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.minecraft.client.renderer.block.ModelBlockRenderer;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.core.BlockPos;
Expand All @@ -22,6 +22,6 @@ public class ModelBlockRendererMixin {
*/
@Inject(method = "putQuadData", at = @At("HEAD"))
private void preRenderQuad(BlockAndTintGetter level, BlockState state, BlockPos pos, VertexConsumer vertexConsumer, PoseStack.Pose matrices, BakedQuad quad, float brightness0, float brightness1, float brightness2, float brightness3, int light0, int light1, int light2, int light3, int overlay, CallbackInfo ci) {
SpriteUtil.markSpriteActive(quad.getSprite());
SpriteUtil.INSTANCE.markSpriteActive(quad.getSprite());
}
}
4 changes: 2 additions & 2 deletions ...caffeinemc/mods/sodium/mixin/features/textures/animations/tracking/TextureAtlasMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package net.caffeinemc.mods.sodium.mixin.features.textures.animations.tracking;

import net.caffeinemc.mods.sodium.client.render.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.minecraft.client.renderer.texture.TextureAtlas;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import org.spongepowered.asm.mixin.Mixin;
Expand All @@ -15,7 +15,7 @@ private void preReturnSprite(CallbackInfoReturnable<TextureAtlasSprite> cir) {
TextureAtlasSprite sprite = cir.getReturnValue();

if (sprite != null) {
SpriteUtil.markSpriteActive(sprite);
SpriteUtil.INSTANCE.markSpriteActive(sprite);
}
}
}
6 changes: 3 additions & 3 deletions ...mc/mods/sodium/mixin/features/textures/animations/tracking/TextureSheetParticleMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package net.caffeinemc.mods.sodium.mixin.features.textures.animations.tracking;

import com.mojang.blaze3d.vertex.VertexConsumer;
import net.caffeinemc.mods.sodium.client.render.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.minecraft.client.Camera;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.client.particle.SingleQuadParticle;
Expand All @@ -28,13 +28,13 @@ protected TextureSheetParticleMixin(ClientLevel level, double x, double y, doubl

@Inject(method = "setSprite(Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;)V", at = @At("RETURN"))
private void afterSetSprite(TextureAtlasSprite sprite, CallbackInfo ci) {
this.shouldTickSprite = sprite != null && SpriteUtil.hasAnimation(sprite);
this.shouldTickSprite = sprite != null && SpriteUtil.INSTANCE.hasAnimation(sprite);
}

@Override
public void render(VertexConsumer vertexConsumer, Camera camera, float tickDelta) {
if (this.shouldTickSprite) {
SpriteUtil.markSpriteActive(this.sprite);
SpriteUtil.INSTANCE.markSpriteActive(this.sprite);
}

super.render(vertexConsumer, camera, tickDelta);
Expand Down
5 changes: 3 additions & 2 deletions ...feinemc/mods/sodium/mixin/fabric/features/render/model/block/ModelBlockRendererMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.api.util.ColorABGR;
import net.caffeinemc.mods.sodium.api.vertex.buffer.VertexBufferWriter;
import net.caffeinemc.mods.sodium.client.model.quad.BakedQuadView;
import net.caffeinemc.mods.sodium.client.render.immediate.model.BakedModelEncoder;
import net.caffeinemc.mods.sodium.client.render.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.client.render.vertex.VertexConsumerUtils;
import net.caffeinemc.mods.sodium.client.util.DirectionUtil;
import net.minecraft.client.renderer.block.ModelBlockRenderer;
Expand Down Expand Up @@ -46,7 +46,8 @@ private static void renderQuads(PoseStack.Pose matrices, VertexBufferWriter writ

BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay);

SpriteUtil.markSpriteActive(quad.getSprite());
if (quad.getSprite() != null)
IThundxr marked this conversation as resolved.
Show resolved Hide resolved
SpriteUtil.INSTANCE.markSpriteActive(quad.getSprite());
}
}

Expand Down
5 changes: 3 additions & 2 deletions ...inemc/mods/sodium/neoforge/mixin/features/render/model/block/ModelBlockRendererMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer;
import net.caffeinemc.mods.sodium.api.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.api.util.ColorABGR;
import net.caffeinemc.mods.sodium.api.vertex.buffer.VertexBufferWriter;
import net.caffeinemc.mods.sodium.client.model.quad.BakedQuadView;
import net.caffeinemc.mods.sodium.client.render.immediate.model.BakedModelEncoder;
import net.caffeinemc.mods.sodium.client.render.texture.SpriteUtil;
import net.caffeinemc.mods.sodium.client.render.vertex.VertexConsumerUtils;
import net.caffeinemc.mods.sodium.client.util.DirectionUtil;
import net.minecraft.client.renderer.RenderType;
Expand Down Expand Up @@ -48,7 +48,8 @@ private static void renderQuads(PoseStack.Pose matrices, VertexBufferWriter writ

BakedModelEncoder.writeQuadVertices(writer, matrices, quad, color, light, overlay);

SpriteUtil.markSpriteActive(quad.getSprite());
if (quad.getSprite() != null)
IThundxr marked this conversation as resolved.
Show resolved Hide resolved
SpriteUtil.INSTANCE.markSpriteActive(quad.getSprite());
}
}

Expand Down