andrew
/
ace-of-shades-2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added slightly improved jump mechanisms

This commit is contained in:
Andrew Lalis 2022-07-09 20:48:20 +02:00
parent 45834af62d
commit eb40c3df79
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
server/src/main/java/nl/andrewl/aos2_server/ServerPlayer.java
View File

@ -6,7 +6,6 @@ import nl.andrewl.aos_core.net.udp.ClientInputState;
import org.joml.Math; import org.joml.Math;
import org.joml.Vector2i; import org.joml.Vector2i;
import org.joml.Vector3f; import org.joml.Vector3f;
import org.joml.Vector3fc;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -53,8 +52,6 @@ public class ServerPlayer extends Player {
public void tick(float dt, World world) { public void tick(float dt, World world) {
updated = false; // Reset the updated flag. This will be set to true if the player was updated in this tick. updated = false; // Reset the updated flag. This will be set to true if the player was updated in this tick.
checkBlockCollisions(dt, world);
if (isGrounded(world)) { if (isGrounded(world)) {
tickHorizontalVelocity(); tickHorizontalVelocity();
if (lastInputState.jumping()) velocity.y = JUMP_SPEED; if (lastInputState.jumping()) velocity.y = JUMP_SPEED;
@ -65,8 +62,10 @@ public class ServerPlayer extends Player {
// Apply updated velocity to the player. // Apply updated velocity to the player.
if (velocity.lengthSquared() > 0) { if (velocity.lengthSquared() > 0) {
Vector3f scaledVelocity = new Vector3f(velocity).mul(dt); Vector3f movement = new Vector3f(velocity).mul(dt);
position.add(scaledVelocity); // Check for collisions if we try to move according to what the player wants.
checkBlockCollisions(dt, movement, world);
position.add(movement);
updated = true; updated = true;
} }
} }
@ -86,6 +85,7 @@ public class ServerPlayer extends Player {
acceleration.normalize(); acceleration.normalize();
acceleration.rotateAxis(orientation.x, 0, 1, 0); acceleration.rotateAxis(orientation.x, 0, 1, 0);
acceleration.mul(MOVEMENT_ACCELERATION); acceleration.mul(MOVEMENT_ACCELERATION);
System.out.println(acceleration);
horizontalVelocity.add(acceleration); horizontalVelocity.add(acceleration);
final float maxSpeed; final float maxSpeed;
if (lastInputState.crouching()) { if (lastInputState.crouching()) {
@ -138,8 +138,8 @@ public class ServerPlayer extends Player {
return points; return points;
} }
private void checkBlockCollisions(float dt, World world) { private void checkBlockCollisions(float dt, Vector3f movement, World world) {
final Vector3fc nextTickPosition = new Vector3f(position).add(new Vector3f(velocity).mul(dt)); final Vector3f nextTickPosition = new Vector3f(position).add(movement);
List<Vector2i> horizontalSpaces = getHorizontalSpaceOccupied(); List<Vector2i> horizontalSpaces = getHorizontalSpaceOccupied();
int minXNextTick = (int) Math.floor(nextTickPosition.x() - RADIUS); int minXNextTick = (int) Math.floor(nextTickPosition.x() - RADIUS);
int minZNextTick = (int) Math.floor(nextTickPosition.z() - RADIUS); int minZNextTick = (int) Math.floor(nextTickPosition.z() - RADIUS);
@ -148,12 +148,16 @@ public class ServerPlayer extends Player {
// Check if the player is about to hit a wall. // Check if the player is about to hit a wall.
// -Z // -Z
if (world.getBlockAt(nextTickPosition.x(), nextTickPosition.y() + 1, minZNextTick) != 0) { if (nextTickPosition.z < position.z && world.getBlockAt(nextTickPosition) != 0) {
System.out.println("wall -z"); Vector3f normal = new Vector3f(0, 0, 1);
position.z = ((float) minZNextTick) + RADIUS + 0.001f; movement.sub(normal.mul(movement.dot(normal)));
velocity.z = 0;
updated = true;
} }
// if (world.getBlockAt(nextTickPosition.x(), nextTickPosition.y() + 1, minZNextTick) != 0) {
// System.out.println("wall -z");
// position.z = ((float) minZNextTick) + RADIUS + 0.001f;
// velocity.z = 0;
// updated = true;
// }
// +Z // +Z
// if ( // if (
// world.getBlockAt(nextTickPosition.x(), nextTickPosition.y(), maxZNextTick) != 0 && // world.getBlockAt(nextTickPosition.x(), nextTickPosition.y(), maxZNextTick) != 0 &&
@ -200,21 +204,18 @@ public class ServerPlayer extends Player {
.anyMatch(point -> world.getBlockAt(point.x, position.y, point.y) != 0 || .anyMatch(point -> world.getBlockAt(point.x, position.y, point.y) != 0 ||
world.getBlockAt(point.x, nextTickPosition.y(), point.y) != 0); world.getBlockAt(point.x, nextTickPosition.y(), point.y) != 0);
if (playerFootInBlock) { if (playerFootInBlock) {
// System.out.println("Player foot in block.");
int nextY = (int) Math.floor(nextTickPosition.y()); int nextY = (int) Math.floor(nextTickPosition.y());
while (true) { while (true) {
// System.out.println("Checking y = " + nextY);
int finalNextY = nextY; int finalNextY = nextY;
boolean isOpen = horizontalSpaces.stream() boolean isOpen = horizontalSpaces.stream()
.allMatch(point -> { .allMatch(point -> {
// System.out.printf("[%d, %d, %d] -> %d%n", point.x, finalNextY, point.y, world.getBlockAt(point.x, finalNextY, point.y));
return world.getBlockAt(point.x, finalNextY, point.y) == 0; return world.getBlockAt(point.x, finalNextY, point.y) == 0;
}); });
if (isOpen) { if (isOpen) {
// System.out.println("It's clear to move player to y = " + nextY);
// Move the player to that spot, and cancel out their velocity. // Move the player to that spot, and cancel out their velocity.
position.y = nextY; position.y = nextY;
velocity.y = 0; velocity.y = 0;
movement.y = 0; // Cancel out y movement for this tick.
updated = true; updated = true;
break; break;
} }