OpenSource/GeyserMC
OpenSource/GeyserMC
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-12-22 14:34:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Implement minecart lerping

Browse source
This commit is contained in:
Eclipse 2024-11-08 10:55:00 +00:00
parent 6a0ca6ef4e
commit f4825213c7
No known key found for this signature in database
GPG key ID: 95E6998F82EC938A
2 changed files with 168 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

165
core/src/main/java/org/geysermc/geyser/entity/type/MinecartEntity.java
View file

@ -25,20 +25,42 @@
package org.geysermc.geyser.entity.type;
import org.cloudburstmc.math.vector.Vector3d;
import org.cloudburstmc.math.vector.Vector3f;
import org.cloudburstmc.protocol.bedrock.data.entity.EntityDataTypes;
import org.cloudburstmc.protocol.bedrock.packet.MoveEntityDeltaPacket;
import org.cloudburstmc.protocol.bedrock.packet.SetEntityMotionPacket;
import org.geysermc.geyser.entity.EntityDefinition;
import org.geysermc.geyser.entity.EntityDefinitions;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.util.InteractionResult;
import org.geysermc.geyser.util.InteractiveTag;
import org.geysermc.geyser.util.MathUtils;
import org.geysermc.mcprotocollib.protocol.data.game.entity.MinecartStep;
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.BooleanEntityMetadata;
import org.geysermc.mcprotocollib.protocol.data.game.entity.metadata.type.IntEntityMetadata;
import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundMoveMinecartPacket;
import java.util.LinkedList;
import java.util.List;
import java.util.UUID;
public class MinecartEntity extends Entity {
public class MinecartEntity extends Entity implements Tickable {
private static final int POS_ROT_LERP_TICKS = 3;
private final List<MinecartStep> lerpSteps = new LinkedList<>();
private final List<MinecartStep> currentLerpSteps = new LinkedList<>();
private boolean usesNewLogic = false;
private MinecartStep lastCompletedStep = new MinecartStep(Vector3d.ZERO, Vector3d. ZERO, 0.0F, 0.0F, 0.0F);
private float currentStepsTotalWeight = 0.0F;
private int lerpDelay = 0;
private PartialStep cachedPartialStep;
private int cachedStepDelay;
private float cachedDelta;
public MinecartEntity(GeyserSession session, int entityId, long geyserId, UUID uuid, EntityDefinition<?> definition, Vector3f position, Vector3f motion, float yaw, float pitch, float headYaw) {
super(session, entityId, geyserId, uuid, definition, position.add(0d, definition.offset(), 0d), motion, yaw, pitch, headYaw);
@ -58,6 +80,132 @@ public class MinecartEntity extends Entity {
dirtyMetadata.put(EntityDataTypes.CUSTOM_DISPLAY, (byte) (entityMetadata.getPrimitiveValue() ? 1 : 0));
}
@Override
public void tick() {
if (!usesNewLogic) {
return;
}
// All minecart lerp code here and in the methods below has been based off of the code in the Java NewMinecartBehavior class
lerpDelay--;
if (lerpDelay <= 0) {
updateCompletedStep();
currentLerpSteps.clear();
if (!lerpSteps.isEmpty()) {
currentLerpSteps.addAll(lerpSteps);
lerpSteps.clear();
currentStepsTotalWeight = 0.0F;
for (MinecartStep step : currentLerpSteps) {
currentStepsTotalWeight += step.weight();
}
lerpDelay = currentStepsTotalWeight == 0.0F ? 0 : POS_ROT_LERP_TICKS;
}
}
if (isLerping()) {
float delta = 1.0F; // This is always 1, maybe it should be removed
Vector3f position = getCurrentLerpPosition(delta).toFloat();
Vector3f movement = getCurrentLerpMovement(delta).toFloat();
setPosition(position);
setMotion(movement);
setYaw(180.0F - getCurrentLerpYaw(delta));
setPitch(getCurrentLerpPitch(delta));
MoveEntityDeltaPacket moveEntityPacket = new MoveEntityDeltaPacket();
moveEntityPacket.setRuntimeEntityId(geyserId);
moveEntityPacket.setX(position.getX());
moveEntityPacket.setY(position.getY() + definition.offset());
moveEntityPacket.setZ(position.getZ());
moveEntityPacket.getFlags().add(MoveEntityDeltaPacket.Flag.HAS_X);
moveEntityPacket.getFlags().add(MoveEntityDeltaPacket.Flag.HAS_Y);
moveEntityPacket.getFlags().add(MoveEntityDeltaPacket.Flag.HAS_Z);
moveEntityPacket.setYaw(getYaw());
moveEntityPacket.setPitch(getPitch());
moveEntityPacket.getFlags().add(MoveEntityDeltaPacket.Flag.HAS_YAW);
moveEntityPacket.getFlags().add(MoveEntityDeltaPacket.Flag.HAS_PITCH);
SetEntityMotionPacket entityMotionPacket = new SetEntityMotionPacket();
entityMotionPacket.setRuntimeEntityId(geyserId);
entityMotionPacket.setMotion(movement);
session.sendUpstreamPacket(moveEntityPacket);
session.sendUpstreamPacket(entityMotionPacket);
}
}
public void handleMinecartMovePacket(ClientboundMoveMinecartPacket packet) {
lerpSteps.addAll(packet.getLerpSteps());
usesNewLogic = true;
}
private boolean isLerping() {
return !currentLerpSteps.isEmpty();
}
private float getCurrentLerpPitch(float delta) {
PartialStep partialStep = getCurrentLerpStep(delta);
return lerpRotation(partialStep.delta, partialStep.previousStep.xRot(), partialStep.currentStep.xRot());
}
private float getCurrentLerpYaw(float delta) {
PartialStep partialStep = getCurrentLerpStep(delta);
return lerpRotation(partialStep.delta, partialStep.previousStep.yRot(), partialStep.currentStep.yRot());
}
private Vector3d getCurrentLerpPosition(float delta) {
PartialStep partialStep = getCurrentLerpStep(delta);
return lerp(partialStep.delta, partialStep.previousStep.position(), partialStep.currentStep.position());
}
private Vector3d getCurrentLerpMovement(float delta) {
PartialStep partialStep = getCurrentLerpStep(delta);
return lerp(partialStep.delta, partialStep.previousStep.movement(), partialStep.currentStep.movement());
}
private PartialStep getCurrentLerpStep(float delta) {
if (cachedDelta != delta || lerpDelay != cachedStepDelay || cachedPartialStep == null) {
float g = ((POS_ROT_LERP_TICKS - lerpDelay) + delta) / POS_ROT_LERP_TICKS;
float totalWeight = 0.0F;
float stepDelta = 1.0F;
boolean foundStep = false;
int step;
for (step = 0; step < currentLerpSteps.size(); step++) {
float currentWeight = currentLerpSteps.get(step).weight();
if (!(currentWeight <= 0.0F)) {
totalWeight += currentWeight;
if ((double) totalWeight >= currentStepsTotalWeight * (double) g) {
float h = totalWeight - currentWeight;
stepDelta = (g * currentStepsTotalWeight - h) / currentWeight;
foundStep = true;
break;
}
}
}
if (!foundStep) {
step = currentLerpSteps.size() - 1;
}
MinecartStep currentStep = currentLerpSteps.get(step);
MinecartStep previousStep = step > 0 ? currentLerpSteps.get(step - 1) : lastCompletedStep;
cachedPartialStep = new PartialStep(stepDelta, currentStep, previousStep);
cachedStepDelay = lerpDelay;
cachedDelta = delta;
}
return cachedPartialStep;
}
private void updateCompletedStep() {
lastCompletedStep = new MinecartStep(position.toDouble(), motion.toDouble(), yaw, pitch, 0.0F);
}
@Override
public void moveAbsolute(Vector3f position, float yaw, float pitch, float headYaw, boolean isOnGround, boolean teleported) {
super.moveAbsolute(position.add(0d, this.definition.offset(), 0d), yaw, pitch, headYaw, isOnGround, teleported);
@ -103,4 +251,19 @@ public class MinecartEntity extends Entity {
}
}
}
private static Vector3d lerp(double delta, Vector3d start, Vector3d end) {
return Vector3d.from(lerp(delta, start.getX(), end.getX()), lerp(delta, start.getY(), end.getY()), lerp(delta, start.getZ(), end.getZ()));
}
public static double lerp(double delta, double start, double end) {
return start + delta * (end - start);
}
private static float lerpRotation(float delta, float start, float end) {
return start + delta * MathUtils.wrapDegrees(end - start);
}
private record PartialStep(float delta, MinecartStep currentStep, MinecartStep previousStep) {
}
}

15
core/src/main/java/org/geysermc/geyser/translator/protocol/java/entity/JavaMoveMinecartTranslator.java
View file

@ -25,12 +25,11 @@
package org.geysermc.geyser.translator.protocol.java.entity;
import org.cloudburstmc.protocol.bedrock.packet.SetEntityMotionPacket;
import org.geysermc.geyser.entity.type.Entity;
import org.geysermc.geyser.entity.type.MinecartEntity;
import org.geysermc.geyser.session.GeyserSession;
import org.geysermc.geyser.translator.protocol.PacketTranslator;
import org.geysermc.geyser.translator.protocol.Translator;
import org.geysermc.mcprotocollib.protocol.data.game.entity.MinecartStep;
import org.geysermc.mcprotocollib.protocol.packet.ingame.clientbound.entity.ClientboundMoveMinecartPacket;
@Translator(packet = ClientboundMoveMinecartPacket.class)
@ -40,15 +39,9 @@ public class JavaMoveMinecartTranslator extends PacketTranslator<ClientboundMove
public void translate(GeyserSession session, ClientboundMoveMinecartPacket packet) {
if (!packet.getLerpSteps().isEmpty()) {
Entity entity = session.getEntityCache().getEntityByJavaId(packet.getEntityId());
MinecartStep lastStep = packet.getLerpSteps().get(packet.getLerpSteps().size() - 1);
entity.moveAbsolute(lastStep.position().toFloat(), lastStep.yRot(), lastStep.xRot(), entity.isOnGround(), false);
entity.setMotion(lastStep.movement().toFloat());
SetEntityMotionPacket entityMotionPacket = new SetEntityMotionPacket();
entityMotionPacket.setRuntimeEntityId(entity.getGeyserId());
entityMotionPacket.setMotion(entity.getMotion());
session.sendUpstreamPacket(entityMotionPacket);
if (entity instanceof MinecartEntity minecart) {
minecart.handleMinecartMovePacket(packet);
}
}
}
}