R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optimize block item rendering as well

Browse Source
This commit is contained in:
embeddedt 2023-05-07 21:07:56 -04:00
parent b55129a8ca
commit 604c3687ef
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_item_rendering/ItemRendererMixin.java
View File

@ -11,7 +11,9 @@ import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.resources.model.SimpleBakedModel; import net.minecraft.client.resources.model.SimpleBakedModel;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import org.embeddedt.modernfix.render.FastItemRenderType;
import org.embeddedt.modernfix.render.RenderState; import org.embeddedt.modernfix.render.RenderState;
import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
@ -38,6 +40,17 @@ public abstract class ItemRendererMixin {
this.transformType = transformType; this.transformType = transformType;
} }
private static final Direction[] ITEM_DIRECTIONS = new Direction[] { Direction.SOUTH };
private static final Direction[] BLOCK_DIRECTIONS = new Direction[] { Direction.UP, Direction.EAST, Direction.NORTH };
private boolean isCorrectDirectionForType(FastItemRenderType type, Direction direction) {
if(type == FastItemRenderType.SIMPLE_ITEM)
return direction == Direction.SOUTH;
else {
return direction == Direction.UP || direction == Direction.EAST || direction == Direction.NORTH;
}
}
/** /**
* If a model * If a model
* - is a vanilla item model (SimpleBakedModel), * - is a vanilla item model (SimpleBakedModel),
@ -48,25 +61,42 @@ public abstract class ItemRendererMixin {
*/ */
@Inject(method = "renderModelLists", at = @At("HEAD"), cancellable = true) @Inject(method = "renderModelLists", at = @At("HEAD"), cancellable = true)
private void fasterItemRender(BakedModel model, ItemStack stack, int combinedLight, int combinedOverlay, PoseStack matrixStack, VertexConsumer buffer, CallbackInfo ci) { private void fasterItemRender(BakedModel model, ItemStack stack, int combinedLight, int combinedOverlay, PoseStack matrixStack, VertexConsumer buffer, CallbackInfo ci) {
if(!RenderState.IS_RENDERING_LEVEL && !stack.isEmpty() && model.getClass() == SimpleBakedModel.class && transformType == ItemTransforms.TransformType.GUI && model.getTransforms().gui == ItemTransform.NO_TRANSFORM) { if(!RenderState.IS_RENDERING_LEVEL && !stack.isEmpty() && model.getClass() == SimpleBakedModel.class && transformType == ItemTransforms.TransformType.GUI) {
FastItemRenderType type;
ItemTransform transform = model.getTransforms().gui;
if(transform == ItemTransform.NO_TRANSFORM)
type = FastItemRenderType.SIMPLE_ITEM;
else if(stack.getItem() instanceof BlockItem && isBlockTransforms(transform))
type = FastItemRenderType.SIMPLE_BLOCK;
else
return;
ci.cancel(); ci.cancel();
PoseStack.Pose pose = matrixStack.last(); PoseStack.Pose pose = matrixStack.last();
int[] combinedLights = new int[] {combinedLight, combinedLight, combinedLight, combinedLight}; int[] combinedLights = new int[] {combinedLight, combinedLight, combinedLight, combinedLight};
List<BakedQuad> culledFaces = model.getQuads(null, Direction.SOUTH, dummyRandom); Direction[] directions = type == FastItemRenderType.SIMPLE_ITEM ? ITEM_DIRECTIONS : BLOCK_DIRECTIONS;
List<BakedQuad> unculledFaces = model.getQuads(null, null, dummyRandom); for(Direction direction : directions) {
/* check size to avoid instantiating iterator when the list is empty */ List<BakedQuad> culledFaces = model.getQuads(null, direction, dummyRandom);
if(culledFaces.size() > 0) { /* check size to avoid instantiating iterator when the list is empty */
for(BakedQuad quad : culledFaces) { if(culledFaces.size() > 0) {
render2dItemFace(quad, stack, buffer, pose, combinedLights, combinedOverlay); for(BakedQuad quad : culledFaces) {
render2dItemFace(quad, stack, buffer, pose, combinedLights, combinedOverlay);
}
} }
} }
List<BakedQuad> unculledFaces = model.getQuads(null, null, dummyRandom);
for(BakedQuad quad : unculledFaces) { for(BakedQuad quad : unculledFaces) {
if(quad.getDirection() == Direction.SOUTH) if(isCorrectDirectionForType(type, quad.getDirection()))
render2dItemFace(quad, stack, buffer, pose, combinedLights, combinedOverlay); render2dItemFace(quad, stack, buffer, pose, combinedLights, combinedOverlay);
} }
} }
} }
private boolean isBlockTransforms(ItemTransform transform) {
return transform.rotation.x() == 30f
&& transform.rotation.y() == 225f
&& transform.rotation.z() == 0f;
}
private void render2dItemFace(BakedQuad quad, ItemStack stack, VertexConsumer buffer, PoseStack.Pose pose, int[] combinedLights, int combinedOverlay) { private void render2dItemFace(BakedQuad quad, ItemStack stack, VertexConsumer buffer, PoseStack.Pose pose, int[] combinedLights, int combinedOverlay) {
int i = -1; int i = -1;
if (quad.isTinted()) { if (quad.isTinted()) {

6
common/src/main/java/org/embeddedt/modernfix/render/FastItemRenderType.java Normal file
View File

@ -0,0 +1,6 @@
package org.embeddedt.modernfix.render;
public enum FastItemRenderType {
SIMPLE_ITEM,
SIMPLE_BLOCK
}