Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-01-04 07:28:19 +01:00
Code Issues Projects Releases Wiki Activity

Add Pos#withLookAt (#945)

Browse Source
This commit is contained in:
Zak Shearman 2022-04-19 19:31:05 +01:00 committed by GitHub
parent 21e6ed4918
commit 64f617c81c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 56 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/net/minestom/server/coordinate/Pos.java
View File

@ -2,6 +2,7 @@ package net.minestom.server.coordinate;
import net.minestom.server.instance.block.BlockFace;
import net.minestom.server.utils.MathUtils;
import net.minestom.server.utils.position.PositionUtils;
import org.jetbrains.annotations.Contract;
import org.jetbrains.annotations.NotNull;
@ -112,6 +113,14 @@ public record Pos(double x, double y, double z, float yaw, float pitch) implemen
return new Pos(x, y, z, yaw, pitch);
}
@Contract(pure = true)
public @NotNull Pos withLookAt(@NotNull Point point) {
if (samePoint(point)) return this;
final Vec delta = Vec.fromPoint(point.sub(this)).normalize();
return withView(PositionUtils.getLookYaw(delta.x(), delta.z()),
PositionUtils.getLookPitch(delta.x(), delta.y(), delta.z()));
}
@Contract(pure = true)
public @NotNull Pos withPitch(@NotNull DoubleUnaryOperator operator) {
return withPitch((float) operator.applyAsDouble(pitch));

12
src/main/java/net/minestom/server/entity/Entity.java
View File

@ -56,7 +56,6 @@ import net.minestom.server.utils.chunk.ChunkCache;
import net.minestom.server.utils.chunk.ChunkUtils;
import net.minestom.server.utils.entity.EntityUtils;
import net.minestom.server.utils.player.PlayerUtils;
import net.minestom.server.utils.position.PositionUtils;
import net.minestom.server.utils.time.Cooldown;
import net.minestom.server.utils.time.TimeUnit;
import net.minestom.server.utils.validate.Check;
@ -336,15 +335,8 @@ public class Entity implements Viewable, Tickable, Schedulable, Snapshotable, Ev
* @param position the position to look at.
*/
public void lookAt(@NotNull Pos position) {
if (this.position.samePoint(position)) {
return;
}
Vec delta = position.sub(getPosition()).asVec().normalize();
setView(
PositionUtils.getLookYaw(delta.x(), delta.z()),
PositionUtils.getLookPitch(delta.x(), delta.y(), delta.z())
);
final Pos newPosition = this.position.withLookAt(position);
if (!newPosition.sameView(this.position)) setView(newPosition.yaw(), newPosition.pitch());
}
/**

45
src/test/java/net/minestom/server/coordinate/PosViewDirectionTest.java Normal file
View File

@ -0,0 +1,45 @@
package net.minestom.server.coordinate;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class PosViewDirectionTest {
private static final float EPSILON = 0.01f;
@Test
public void withLookAtPos() {
Pos initialPosition = new Pos(0, 40, 0);
Pos position;
// look at itself, direction should not change
position = initialPosition.withLookAt(initialPosition);
assertEquals(initialPosition.yaw(), position.yaw());
assertEquals(initialPosition.pitch(), position.pitch());
position = initialPosition.withLookAt(new Pos(16, 40, 16));
assertEquals(-45f, position.yaw());
assertEquals(0f, position.pitch(), EPSILON);
position = initialPosition.withLookAt(new Pos(-16, 40, 56));
assertEquals(15.94f, position.yaw(), EPSILON);
assertEquals(0f, position.pitch(), EPSILON);
position = initialPosition.withLookAt(new Pos(48, 36, 48));
assertEquals(-45f, position.yaw(), EPSILON);
assertEquals(4.76f, position.pitch(), EPSILON);
position = initialPosition.withLookAt(new Pos(48, 36, -17));
assertEquals(-109.50f, position.yaw(), EPSILON);
// should have the same pitch as the previous position
assertEquals(4.76f, position.pitch(), EPSILON);
position = initialPosition.withLookAt(new Pos(0, 87, 0));
// looking from below, not checking the yaw
assertEquals(-90f, position.pitch(), EPSILON);
position = initialPosition.withLookAt(new Pos(-25, 42, 4));
assertEquals(80.90f, position.yaw(), EPSILON);
assertEquals(-4.57f, position.pitch(), EPSILON);
}
}