Skip to content

Commit

Permalink
positional lerping fixed, rotation still sus
Browse files Browse the repository at this point in the history
  • Loading branch information
@ThePlasticPotato
ThePlasticPotato committed Dec 15, 2024
1 parent aaa7a38 commit f0c9bbf
Show file tree
Hide file tree
Showing 8 changed files with 207 additions and 61 deletions.
21 changes: 15 additions & 6 deletions common/src/main/java/org/valkyrienskies/mod/mixin/feature/entity_collision/MixinEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,10 @@ public Vec3 collideWithShips(final Entity entity, Vec3 movement, final Operation
if (collisionResultWithWorld.distanceToSqr(movement) > 1e-12) {
// We collided with the world? Set the dragging ship to null.
final EntityDraggingInformation entityDraggingInformation = getDraggingInformation();
if (entityDraggingInformation.getIgnoreNextGroundStand()) {
entityDraggingInformation.setIgnoreNextGroundStand(false);
return collisionResultWithWorld;
}
entityDraggingInformation.setLastShipStoodOn(null);
entityDraggingInformation.setAddedMovementLastTick(new Vector3d());
entityDraggingInformation.setAddedYawRotLastTick(0.0);
Expand Down Expand Up @@ -266,12 +270,17 @@ private void postBaseTick(final CallbackInfo ci) {
});
} else {
if (!level.getBlockState(getOnPos()).isAir()) {
entityDraggingInformation.setLastShipStoodOn(null);
getIndirectPassengers().forEach(entity -> {
final EntityDraggingInformation passengerDraggingInformation =
((IEntityDraggingInformationProvider) entity).getDraggingInformation();
passengerDraggingInformation.setLastShipStoodOn(null);
});
if (entityDraggingInformation.getIgnoreNextGroundStand()) {
entityDraggingInformation.setIgnoreNextGroundStand(false);
} else {
entityDraggingInformation.setLastShipStoodOn(null);
getIndirectPassengers().forEach(entity -> {
final EntityDraggingInformation passengerDraggingInformation =
((IEntityDraggingInformationProvider) entity).getDraggingInformation();
passengerDraggingInformation.setLastShipStoodOn(null);
});
}

}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/java/org/valkyrienskies/mod/mixin/feature/entity_collision/MixinLivingEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ private void preAiStep(CallbackInfo ci) {
if (dragInfo != null && dragInfo.getLastShipStoodOn() != null) {
final ClientShip ship = VSGameUtilsKt.getShipObjectWorld((ClientLevel) level).getAllShips().getById(dragInfo.getLastShipStoodOn());
if (ship != null) {
//EntityLerper.INSTANCE.lerpStep(dragInfo, ship, (LivingEntity) (Object) this);
EntityLerper.INSTANCE.lerpStep(dragInfo, ship, (LivingEntity) (Object) this);
EntityLerper.INSTANCE.lerpHeadStep(dragInfo, ship, (LivingEntity) (Object) this);
}
}
}
Expand Down
46 changes: 39 additions & 7 deletions ...rc/main/java/org/valkyrienskies/mod/mixin/feature/entity_collision/MixinServerEntity.java
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
package org.valkyrienskies.mod.mixin.feature.entity_collision;

import static org.valkyrienskies.mod.common.util.VectorConversionsMCKt.toJOML;

import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import java.util.function.Consumer;
import net.minecraft.network.protocol.game.ClientboundMoveEntityPacket;
import net.minecraft.network.protocol.game.ClientboundRotateHeadPacket;
import net.minecraft.network.protocol.game.ClientboundSetEntityMotionPacket;
import net.minecraft.network.protocol.game.ClientboundTeleportEntityPacket;
import net.minecraft.server.level.ServerEntity;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.player.Player;
import org.joml.Vector3d;
import org.slf4j.Logger;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.injection.At;
import org.valkyrienskies.core.api.ships.ServerShip;
import org.valkyrienskies.core.impl.networking.simple.SimplePacket;
import org.valkyrienskies.mod.common.VSGameUtilsKt;
import org.valkyrienskies.mod.common.ValkyrienSkiesMod;
import org.valkyrienskies.mod.common.networking.PacketEntityShipMotion;
import org.valkyrienskies.mod.common.networking.PacketMobShipRotation;
import org.valkyrienskies.mod.common.util.EntityDraggingInformation;
import org.valkyrienskies.mod.common.util.EntityLerper;
import org.valkyrienskies.mod.common.util.IEntityDraggingInformationProvider;

@Mixin(ServerEntity.class)
Expand All @@ -32,29 +40,53 @@ public class MixinServerEntity {
@Final
private ServerLevel level;

@Shadow
@Final
private static Logger LOGGER;

@WrapOperation(
method = "sendChanges",
at = @At(
value = "INVOKE",
target = "Ljava/util/function/Consumer;accept(Ljava/lang/Object;)V")
)
private void wrapBroadcastAccept(Consumer instance, Object t, Operation<Void> original) {
if (t instanceof ClientboundSetEntityMotionPacket || t instanceof ClientboundTeleportEntityPacket || t instanceof ClientboundMoveEntityPacket) {
if (t instanceof ClientboundSetEntityMotionPacket || t instanceof ClientboundTeleportEntityPacket || t instanceof ClientboundMoveEntityPacket || t instanceof ClientboundRotateHeadPacket) {
if (entity instanceof IEntityDraggingInformationProvider draggedEntity) {
EntityDraggingInformation dragInfo = draggedEntity.getDraggingInformation();

if (dragInfo != null && dragInfo.isEntityBeingDraggedByAShip() && dragInfo.getLastShipStoodOn() != null) {
ServerShip ship = VSGameUtilsKt.getShipObjectWorld(level).getAllShips().getById(dragInfo.getLastShipStoodOn());
if (ship != null) {
// if (!(entity instanceof Player)) LOGGER.info("Entity is rotated {}", entity.getYRot());

Vector3d position = ship.getWorldToShip().transformPosition(new Vector3d(entity.getX(), entity.getY(), entity.getZ()));
Vector3d motion = ship.getTransform().transformDirectionNoScalingFromWorldToShip(new Vector3d(entity.getDeltaMovement().x(), entity.getDeltaMovement().y(), entity.getDeltaMovement().z()), new Vector3d());
Vector3d entityLookYawOnly = new Vector3d(Math.sin(-Math.toRadians(entity.getYRot())), 0.0, Math.cos(-Math.toRadians(entity.getYRot())));
double yaw = ship.getTransform().transformDirectionNoScalingFromWorldToShip(entityLookYawOnly, new Vector3d()).y;

// Vector3d entityLookYawOnly = new Vector3d(Math.sin(-Math.toRadians(entity.getYRot())), 0.0, Math.cos(-Math.toRadians(entity.getYRot())));
// Vector3d newLookIdeal = ship.getTransform().getShipToWorld().transformDirection(entityLookYawOnly);
//
//// Get the X and Y rotation from [newLookIdeal]
// double newXRot = Math.asin(-newLookIdeal.y());
// double xRotCos = Math.cos(newXRot);
// double newYRot = -Math.atan2(newLookIdeal.x() / xRotCos, newLookIdeal.z() / xRotCos);

double yaw;
if (!(t instanceof ClientboundRotateHeadPacket)) {
yaw = EntityLerper.INSTANCE.yawToShip(ship, entity.getYRot());
} else {
yaw = EntityLerper.INSTANCE.yawToShip(ship, entity.getYHeadRot());
}
double pitch = entity.getXRot();
PacketEntityShipMotion vsPacket = new PacketEntityShipMotion(entity.getId(), ship.getId(),
position.x, position.y, position.z,
motion.x, motion.y, motion.z,
yaw, pitch);
SimplePacket vsPacket;
if (!(t instanceof ClientboundRotateHeadPacket)) {
vsPacket = new PacketEntityShipMotion(entity.getId(), ship.getId(),
position.x, position.y, position.z,
motion.x, motion.y, motion.z,
yaw, pitch);
} else {
vsPacket = new PacketMobShipRotation(entity.getId(), ship.getId(), yaw);
}

ValkyrienSkiesMod.getVsCore().getSimplePacketNetworking().sendToAllClients(vsPacket);
return;
Expand Down
5 changes: 5 additions & 0 deletions common/src/main/kotlin/org/valkyrienskies/mod/common/networking/PacketMobShipRotation.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.valkyrienskies.mod.common.networking

import org.valkyrienskies.core.impl.networking.simple.SimplePacket

data class PacketMobShipRotation(val entityID: Int, val shipID: Long, val yaw: Double): SimplePacket
52 changes: 40 additions & 12 deletions common/src/main/kotlin/org/valkyrienskies/mod/common/networking/VSGamePackets.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ import org.valkyrienskies.mod.common.entity.ShipMountingEntity
import org.valkyrienskies.mod.common.entity.handling.VSEntityManager
import org.valkyrienskies.mod.common.getShipObjectManagingPos
import org.valkyrienskies.mod.common.shipObjectWorld
import org.valkyrienskies.mod.common.util.EntityLerper
import org.valkyrienskies.mod.common.util.IEntityDraggingInformationProvider
import org.valkyrienskies.mod.common.util.MinecraftPlayer
import org.valkyrienskies.mod.common.vsCore
import kotlin.math.cos
import kotlin.math.sin

object VSGamePackets {

Expand All @@ -28,6 +27,7 @@ object VSGamePackets {
PacketRestartChunkUpdates::class.register()
PacketSyncVSEntityTypes::class.register()
PacketEntityShipMotion::class.register()
PacketMobShipRotation::class.register()
}

fun registerHandlers() = with(vsCore.simplePacketNetworking) {
Expand Down Expand Up @@ -72,28 +72,56 @@ object VSGamePackets {
?: return@registerClientHandler

if (entity is IEntityDraggingInformationProvider) {
entity.draggingInformation.previousRelativePositionOnShip = entity.draggingInformation.relativePositionOnShip
if (entity.draggingInformation.lastShipStoodOn == null || entity.draggingInformation.lastShipStoodOn != setMotion.shipID) {
entity.draggingInformation.lastShipStoodOn = setMotion.shipID
entity.draggingInformation.ignoreNextGroundStand = true
}

entity.draggingInformation.relativePositionOnShip = ship.worldToShip.transformPosition(
Vector3d(entity.x, entity.y, entity.z)
);
entity.draggingInformation.previousRelativeVelocityOnShip = entity.draggingInformation.relativeVelocityOnShip
entity.draggingInformation.previousRelativeYawOnShip = entity.draggingInformation.relativeYawOnShip
entity.draggingInformation.relativeYawOnShip = EntityLerper.yawToShip(ship, entity.yRot.toDouble())

entity.draggingInformation.relativePositionOnShip = Vector3d(setMotion.z, setMotion.y, setMotion.z)
entity.draggingInformation.relativeVelocityOnShip = Vector3d(setMotion.zVel, setMotion.yVel, setMotion.zVel)
entity.draggingInformation.relativeYawOnShip = setMotion.yRot
entity.draggingInformation.lerpPositionOnShip = Vector3d(setMotion.x, setMotion.y, setMotion.z)
entity.draggingInformation.relativeVelocityOnShip = Vector3d(setMotion.xVel, setMotion.yVel, setMotion.zVel)
entity.draggingInformation.lerpYawOnShip = setMotion.yRot

val previousWorldPosition = if (entity.draggingInformation.previousRelativePositionOnShip != null) {
ship.renderTransform.shipToWorld.transformPosition(Vector3d(entity.draggingInformation.previousRelativePositionOnShip))
val previousWorldPosition = if (entity.draggingInformation.relativePositionOnShip != null) {
ship.renderTransform.shipToWorld.transformPosition(Vector3d(entity.draggingInformation.relativePositionOnShip))
} else {
Vector3d(entity.x, entity.y, entity.z)
}
val worldPosition = ship.renderTransform.shipToWorld.transformPosition(Vector3d(setMotion.x, setMotion.y, setMotion.z))
entity.setPacketCoordinates(worldPosition.x, worldPosition.y, worldPosition.z)
val worldVelocity = ship.renderTransform.shipToWorld.transformDirection(Vector3d(setMotion.xVel, setMotion.yVel, setMotion.zVel))
entity.setDeltaMovement(worldVelocity.x, worldVelocity.y, worldVelocity.z)
entity.xRot = Math.toDegrees(setMotion.xRot).toFloat()
entity.xRot = setMotion.xRot.toFloat()
entity.draggingInformation.lerpSteps = 3

entity.setPos(previousWorldPosition.x, previousWorldPosition.y, previousWorldPosition.z)
entity.lerpTo(worldPosition.x, worldPosition.y, worldPosition.z, Math.toDegrees(setMotion.yRot).toFloat(), Math.toDegrees(setMotion.xRot).toFloat(), 3, true)
// entity.setPos(previousWorldPosition.x, previousWorldPosition.y, previousWorldPosition.z)
// entity.lerpTo(worldPosition.x, worldPosition.y, worldPosition.z, Math.toDegrees(setMotion.yRot).toFloat(), Math.toDegrees(setMotion.xRot).toFloat(), 3, true)
}
}

PacketMobShipRotation::class.registerClientHandler { setRotation ->
val mc = Minecraft.getInstance()
val level = mc.level ?: return@registerClientHandler
val entity = level.getEntity(setRotation.entityID) ?: return@registerClientHandler

if (entity is LocalPlayer && entity.isLocalPlayer) return@registerClientHandler

val ship = level.shipObjectWorld.allShips.getById(setRotation.shipID)
?: return@registerClientHandler

if (entity is IEntityDraggingInformationProvider) {
if (entity.draggingInformation.lastShipStoodOn == null || entity.draggingInformation.lastShipStoodOn != setRotation.shipID) {
entity.draggingInformation.lastShipStoodOn = setRotation.shipID
entity.draggingInformation.ignoreNextGroundStand = true
}
entity.draggingInformation.relativeHeadYawOnShip = EntityLerper.yawToShip(ship, entity.yHeadRot.toDouble())
entity.draggingInformation.lerpHeadYawOnShip = setRotation.yaw
entity.draggingInformation.headLerpSteps = 3
}
}
}
Expand Down
6 changes: 1 addition & 5 deletions common/src/main/kotlin/org/valkyrienskies/mod/common/util/EntityDragger.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,7 @@ object EntityDragger {
// endregion

// region Compute look dragging
val yViewRot = if (preTick) {
entity.yRot
} else {
entity.yRotO
}.toDouble()
val yViewRot = entity.getViewYRot(if (preTick) 0f else 1f).toDouble()

// Get the y-look vector of the entity only using y-rotation, ignore x-rotation
val entityLookYawOnly =
Expand Down
12 changes: 8 additions & 4 deletions common/src/main/kotlin/org/valkyrienskies/mod/common/util/EntityDraggingInformation.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,21 @@ class EntityDraggingInformation {
field = value
}
var ticksSinceStoodOnShip: Int = 0
var ignoreNextGroundStand = false
var mountedToEntity: Boolean = false

var relativePositionOnShip: Vector3dc? = null
var lerpPositionOnShip: Vector3dc? = null
var relativeVelocityOnShip: Vector3dc? = null
var relativeYawOnShip: Double? = null
var lerpYawOnShip: Double? = null
var lerpHeadYawOnShip: Double? = null

var previousRelativePositionOnShip: Vector3dc? = null
var relativePositionOnShip: Vector3dc? = null
var previousRelativeVelocityOnShip: Vector3dc? = null
var previousRelativeYawOnShip: Double? = null
var relativeYawOnShip: Double? = null
var relativeHeadYawOnShip: Double? = null

var lerpSteps: Int = 0
var headLerpSteps: Int = 0

// Used by the client rendering code only
var cachedLastPosition: Vector3dc? = null
Expand Down
Loading

0 comments on commit f0c9bbf

Please sign in to comment.