mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 06:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Lily pad manners

Browse source 
- Fix the package/rigging initially appearing inside the frog's mouth
  when it's retrieving a package
- Lazily update the body/head/tongue so we don't have to upload it every
  frame when not animating
This commit is contained in:
Jozufozu 2025-01-11 20:33:53 -08:00
parent 4c5688a055
commit 1fbfeb6f00
1 changed files with 50 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
src/main/java/com/simibubi/create/content/logistics/packagePort/frogport/FrogportVisual.java
View file

@ -3,6 +3,7 @@ package com.simibubi.create.content.logistics.packagePort.frogport;
import java.util.function.Consumer;
import org.jetbrains.annotations.Nullable;
import org.joml.Matrix4f;
import com.simibubi.create.AllPartialModels;
@ -17,6 +18,7 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.registries.ForgeRegistries;
public class FrogportVisual extends AbstractBlockEntityVisual<FrogportBlockEntity> implements SimpleDynamicVisual {
@ -26,6 +28,12 @@ public class FrogportVisual extends AbstractBlockEntityVisual<FrogportBlockEntit
private final TransformedInstance rig;
private final TransformedInstance box;
private final Matrix4f basePose = new Matrix4f();
private float lastYaw = Float.NaN;
private float lastHeadPitch = Float.NaN;
private float lastTonguePitch = Float.NaN;
private float lastTongueLength = Float.NaN;
public FrogportVisual(VisualizationContext ctx, FrogportBlockEntity blockEntity, float partialTick) {
super(ctx, blockEntity, partialTick);
@ -112,40 +120,56 @@ public class FrogportVisual extends AbstractBlockEntityVisual<FrogportBlockEntit
float anticipation = blockEntity.anticipationProgress.getValue(partialTicks);
headPitchModifier =
anticipation > 0 ? (float) Math.max(0, 1 - Math.pow((anticipation * 1.25) * 2 - 1, 4)) : 0;
rig.handle()
.setVisible(false);
box.handle()
.setVisible(false);
}
headPitch *= headPitchModifier;
headPitch = Math.max(headPitch, blockEntity.manualOpenAnimationProgress.getValue(partialTicks) * 60);
tongueLength = Math.max(tongueLength, blockEntity.manualOpenAnimationProgress.getValue(partialTicks) * 0.25f);
body.setIdentityTransform()
.translate(getVisualPosition())
.center()
.rotateYDegrees(yaw)
.uncenter()
.setChanged();
head.setIdentityTransform()
.translate(getVisualPosition())
.center()
.rotateYDegrees(yaw)
.uncenter()
.translate(8 / 16f, 10 / 16f, 11 / 16f)
.rotateXDegrees(headPitch)
.translateBack(8 / 16f, 10 / 16f, 11 / 16f)
.setChanged();
if (yaw != lastYaw) {
body.setIdentityTransform()
.translate(getVisualPosition())
.center()
.rotateYDegrees(yaw)
.uncenter()
.setChanged();
tongue.setIdentityTransform()
.translate(getVisualPosition())
.center()
.rotateYDegrees(yaw)
.uncenter()
.translate(8 / 16f, 10 / 16f, 11 / 16f)
.rotateXDegrees(tonguePitch)
.scale(1f, 1f, tongueLength / (7 / 16f))
.translateBack(8 / 16f, 10 / 16f, 11 / 16f)
.setChanged();
// Save the base pose to avoid recalculating it twice every frame
basePose.set(body.pose)
.translate(8 / 16f, 10 / 16f, 11 / 16f);
// I'm not entirely sure that yaw ever changes
lastYaw = yaw;
// Force the head and tongue to update
lastTonguePitch = Float.NaN;
lastHeadPitch = Float.NaN;
}
if (headPitch != lastHeadPitch) {
head.setTransform(basePose)
.rotateXDegrees(headPitch)
.translateBack(8 / 16f, 10 / 16f, 11 / 16f)
.setChanged();
lastHeadPitch = headPitch;
}
if (tonguePitch != lastTonguePitch || tongueLength != lastTongueLength) {
tongue.setTransform(basePose)
.rotateXDegrees(tonguePitch)
.scale(1f, 1f, tongueLength / (7 / 16f))
.translateBack(8 / 16f, 10 / 16f, 11 / 16f)
.setChanged();
lastTonguePitch = tonguePitch;
lastTongueLength = tongueLength;
}
}
private void renderPackage(Vec3 diff, float scale, float itemDistance) {