Added the ability to sprint
When you double-tap the W key, the character starts moving faster
This commit is contained in:
parent
9d305890d1
commit
a67d3ba1bb
@ -64,7 +64,12 @@ public class LayerTestGUI extends GUILayer {
|
|||||||
"IsFlyingDisplay", font,
|
"IsFlyingDisplay", font,
|
||||||
() -> String.format("Flying: %5s (Space bar x2)", TestPlayerControls.getInstance().isFlying())
|
() -> String.format("Flying: %5s (Space bar x2)", TestPlayerControls.getInstance().isFlying())
|
||||||
));
|
));
|
||||||
|
|
||||||
|
panel.addChild(new Label(
|
||||||
|
"IsSprintDisplay", font,
|
||||||
|
() -> String.format("Sprint: %5s (W x2)", TestPlayerControls.getInstance().isSprint())
|
||||||
|
));
|
||||||
|
|
||||||
panel.addChild(new Label(
|
panel.addChild(new Label(
|
||||||
"IsMouseCapturedDisplay", font,
|
"IsMouseCapturedDisplay", font,
|
||||||
() -> String.format("Mouse captured: %5s (esc)", TestPlayerControls.getInstance().isMouseCaptured())
|
() -> String.format("Mouse captured: %5s (esc)", TestPlayerControls.getInstance().isMouseCaptured())
|
||||||
|
|||||||
@ -1,11 +1,10 @@
|
|||||||
package ru.windcorp.progressia.test;
|
package ru.windcorp.progressia.test;
|
||||||
|
|
||||||
import org.lwjgl.glfw.GLFW;
|
|
||||||
|
|
||||||
import glm.Glm;
|
import glm.Glm;
|
||||||
import glm.mat._3.Mat3;
|
import glm.mat._3.Mat3;
|
||||||
import glm.vec._2.Vec2;
|
import glm.vec._2.Vec2;
|
||||||
import glm.vec._3.Vec3;
|
import glm.vec._3.Vec3;
|
||||||
|
import org.lwjgl.glfw.GLFW;
|
||||||
import ru.windcorp.progressia.client.ClientState;
|
import ru.windcorp.progressia.client.ClientState;
|
||||||
import ru.windcorp.progressia.client.graphics.backend.GraphicsBackend;
|
import ru.windcorp.progressia.client.graphics.backend.GraphicsBackend;
|
||||||
import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface;
|
import ru.windcorp.progressia.client.graphics.backend.GraphicsInterface;
|
||||||
@ -24,334 +23,364 @@ import ru.windcorp.progressia.common.world.tile.TileData;
|
|||||||
import ru.windcorp.progressia.server.ServerState;
|
import ru.windcorp.progressia.server.ServerState;
|
||||||
|
|
||||||
public class TestPlayerControls {
|
public class TestPlayerControls {
|
||||||
|
|
||||||
private static final TestPlayerControls INSTANCE = new TestPlayerControls();
|
|
||||||
|
|
||||||
public static TestPlayerControls getInstance() {
|
|
||||||
return INSTANCE;
|
|
||||||
}
|
|
||||||
|
|
||||||
private TestPlayerControls() {}
|
|
||||||
|
|
||||||
private static final double MODE_SWITCH_MAX_DELAY = 300 * Units.MILLISECONDS;
|
|
||||||
private static final double MIN_JUMP_DELAY = 300 * Units.MILLISECONDS;
|
|
||||||
|
|
||||||
// Horizontal and vertical max control speed when flying
|
private static final TestPlayerControls INSTANCE = new TestPlayerControls();
|
||||||
private static final float FLYING_SPEED = 6.0f * Units.METERS_PER_SECOND;
|
|
||||||
|
|
||||||
// (0; 1], 1 is instant change, 0 is no control authority
|
|
||||||
private static final float FLYING_CONTROL_AUTHORITY = Units.get("2 1/s");
|
|
||||||
|
|
||||||
// Horizontal and vertical max control speed when walking
|
|
||||||
private static final float WALKING_SPEED = 4.0f * Units.METERS_PER_SECOND;
|
|
||||||
|
|
||||||
// (0; 1], 1 is instant change, 0 is no control authority
|
|
||||||
private static final float WALKING_CONTROL_AUTHORITY = Units.get("15 1/s");
|
|
||||||
|
|
||||||
// Vertical velocity instantly add to player when they jump
|
|
||||||
private static final float JUMP_VELOCITY = 5f * Units.METERS_PER_SECOND;
|
|
||||||
|
|
||||||
private boolean isFlying = true;
|
|
||||||
|
|
||||||
private int movementForward = 0;
|
|
||||||
private int movementRight = 0;
|
|
||||||
private int movementUp = 0;
|
|
||||||
|
|
||||||
private double lastSpacePress = Double.NEGATIVE_INFINITY;
|
|
||||||
|
|
||||||
private boolean captureMouse = true;
|
|
||||||
private boolean useMinecraftGravity = false;
|
|
||||||
|
|
||||||
private int selectedBlock = 0;
|
|
||||||
private int selectedTile = 0;
|
|
||||||
private boolean isBlockSelected = true;
|
|
||||||
|
|
||||||
private Runnable updateCallback = null;
|
|
||||||
|
|
||||||
public void applyPlayerControls() {
|
|
||||||
if (ClientState.getInstance() == null || !ClientState.getInstance().isReady()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
EntityData player = getEntity();
|
|
||||||
|
|
||||||
final float speed, authority;
|
|
||||||
|
|
||||||
if (isFlying) {
|
|
||||||
speed = FLYING_SPEED;
|
|
||||||
authority = FLYING_CONTROL_AUTHORITY;
|
|
||||||
} else {
|
|
||||||
speed = WALKING_SPEED;
|
|
||||||
authority = WALKING_CONTROL_AUTHORITY;
|
|
||||||
}
|
|
||||||
|
|
||||||
Mat3 angMat = new Mat3().identity().rotateZ(player.getYaw());
|
|
||||||
Vec3 desiredVelocity = new Vec3(movementForward, -movementRight, 0);
|
|
||||||
|
|
||||||
if (movementForward != 0 && movementRight != 0) desiredVelocity.normalize();
|
|
||||||
angMat.mul_(desiredVelocity); // bug in jglm, .mul() and mul_() are swapped
|
|
||||||
desiredVelocity.z = movementUp;
|
|
||||||
desiredVelocity.mul(speed);
|
|
||||||
|
|
||||||
Vec3 change = new Vec3()
|
|
||||||
.set(desiredVelocity)
|
|
||||||
.sub(player.getVelocity())
|
|
||||||
.mul((float) Math.exp(-authority * GraphicsInterface.getFrameLength()))
|
|
||||||
.negate()
|
|
||||||
.add(desiredVelocity);
|
|
||||||
|
|
||||||
if (!isFlying) {
|
|
||||||
change.z = player.getVelocity().z;
|
|
||||||
}
|
|
||||||
|
|
||||||
player.getVelocity().set(change);
|
|
||||||
|
|
||||||
// THIS IS TERRIBLE TEST
|
|
||||||
EntityData serverEntity = ServerState.getInstance().getWorld().getData().getEntity(TestContent.PLAYER_ENTITY_ID);
|
|
||||||
if (serverEntity != null) {
|
|
||||||
serverEntity.setPosition(player.getPosition());
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
public void handleInput(Input input) {
|
|
||||||
InputEvent event = input.getEvent();
|
|
||||||
|
|
||||||
if (event instanceof KeyEvent) {
|
|
||||||
if (onKeyEvent((KeyEvent) event)) {
|
|
||||||
input.consume();
|
|
||||||
}
|
|
||||||
} else if (event instanceof CursorMoveEvent) {
|
|
||||||
onMouseMoved((CursorMoveEvent) event);
|
|
||||||
input.consume();
|
|
||||||
} else if (event instanceof WheelScrollEvent) {
|
|
||||||
onWheelScroll((WheelScrollEvent) event);
|
|
||||||
input.consume();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private boolean onKeyEvent(KeyEvent event) {
|
public static TestPlayerControls getInstance() {
|
||||||
if (event.isRepeat()) return false;
|
return INSTANCE;
|
||||||
|
}
|
||||||
int multiplier = event.isPress() ? 1 : -1;
|
|
||||||
|
|
||||||
switch (event.getKey()) {
|
|
||||||
case GLFW.GLFW_KEY_W:
|
|
||||||
movementForward += +1 * multiplier;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_KEY_S:
|
|
||||||
movementForward += -1 * multiplier;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_KEY_A:
|
|
||||||
movementRight += -1 * multiplier;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_KEY_D:
|
|
||||||
movementRight += +1 * multiplier;
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_KEY_SPACE:
|
|
||||||
handleSpace(multiplier);
|
|
||||||
break;
|
|
||||||
case GLFW.GLFW_KEY_LEFT_SHIFT:
|
|
||||||
handleShift(multiplier);
|
|
||||||
break;
|
|
||||||
|
|
||||||
case GLFW.GLFW_KEY_ESCAPE:
|
|
||||||
if (!event.isPress()) return false;
|
|
||||||
handleEscape();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case GLFW.GLFW_KEY_F5:
|
|
||||||
if (!event.isPress()) return false;
|
|
||||||
handleCameraMode();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case GLFW.GLFW_KEY_G:
|
|
||||||
if (!event.isPress()) return false;
|
|
||||||
handleGravitySwitch();
|
|
||||||
break;
|
|
||||||
|
|
||||||
case GLFW.GLFW_MOUSE_BUTTON_3:
|
|
||||||
if (!event.isPress()) return false;
|
|
||||||
switchPlacingMode();
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleSpace(int multiplier) {
|
private TestPlayerControls() {
|
||||||
boolean isPressed = multiplier > 0;
|
}
|
||||||
|
|
||||||
double timeSinceLastSpacePress = GraphicsInterface.getTime() - lastSpacePress;
|
|
||||||
|
|
||||||
if (isPressed && timeSinceLastSpacePress < MODE_SWITCH_MAX_DELAY) {
|
|
||||||
isFlying = !isFlying;
|
|
||||||
updateGUI();
|
|
||||||
movementUp = +1;
|
|
||||||
} else {
|
|
||||||
if (isFlying) {
|
|
||||||
movementUp += +1 * multiplier;
|
|
||||||
} else {
|
|
||||||
if (isPressed && timeSinceLastSpacePress > MIN_JUMP_DELAY) {
|
|
||||||
jump();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
lastSpacePress = GraphicsInterface.getTime();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void jump() {
|
private static final double MODE_SWITCH_MAX_DELAY = 300 * Units.MILLISECONDS;
|
||||||
if (ClientState.getInstance() == null || !ClientState.getInstance().isReady()) {
|
private static final double MODE_SPRINT_SWITCH_MAX_DELAY = 100 * Units.MILLISECONDS;
|
||||||
return;
|
private static final double MIN_JUMP_DELAY = 300 * Units.MILLISECONDS;
|
||||||
}
|
|
||||||
|
|
||||||
getEntity().getVelocity().add(0, 0, JUMP_VELOCITY * (useMinecraftGravity ? 2 : 1));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleShift(int multiplier) {
|
// Horizontal and vertical max control speed when flying
|
||||||
if (isFlying) {
|
private static final float FLYING_SPEED = 6.0f * Units.METERS_PER_SECOND;
|
||||||
movementUp += -1 * multiplier;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleEscape() {
|
// (0; 1], 1 is instant change, 0 is no control authority
|
||||||
if (captureMouse) {
|
private static final float FLYING_CONTROL_AUTHORITY = Units.get("2 1/s");
|
||||||
GLFW.glfwSetInputMode(GraphicsBackend.getWindowHandle(), GLFW.GLFW_CURSOR, GLFW.GLFW_CURSOR_NORMAL);
|
|
||||||
} else {
|
|
||||||
GLFW.glfwSetInputMode(GraphicsBackend.getWindowHandle(), GLFW.GLFW_CURSOR, GLFW.GLFW_CURSOR_DISABLED);
|
|
||||||
}
|
|
||||||
|
|
||||||
captureMouse = !captureMouse;
|
|
||||||
updateGUI();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleCameraMode() {
|
|
||||||
if (ClientState.getInstance() == null || !ClientState.getInstance().isReady()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ClientState.getInstance().getCamera().hasAnchor()) {
|
|
||||||
ClientState.getInstance().getCamera().selectNextMode();
|
|
||||||
updateGUI();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void handleGravitySwitch() {
|
// Horizontal and vertical max control speed when walking
|
||||||
useMinecraftGravity = !useMinecraftGravity;
|
private static final float WALKING_SPEED = 4.0f * Units.METERS_PER_SECOND;
|
||||||
updateGUI();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void onMouseMoved(CursorMoveEvent event) {
|
// Horizontal and vertical max control speed when run
|
||||||
if (!captureMouse) return;
|
private static final float RUN_SPEED = 6.0f * Units.METERS_PER_SECOND;
|
||||||
|
|
||||||
if (ClientState.getInstance() == null || !ClientState.getInstance().isReady()) {
|
// (0; 1], 1 is instant change, 0 is no control authority
|
||||||
return;
|
private static final float WALKING_CONTROL_AUTHORITY = Units.get("15 1/s");
|
||||||
}
|
|
||||||
|
|
||||||
final float yawScale = -0.002f;
|
|
||||||
final float pitchScale = yawScale;
|
|
||||||
|
|
||||||
EntityData player = getEntity();
|
// Vertical velocity instantly add to player when they jump
|
||||||
|
private static final float JUMP_VELOCITY = 5f * Units.METERS_PER_SECOND;
|
||||||
normalizeAngles(player.getDirection().add(
|
|
||||||
(float) (event.getChangeX() * yawScale),
|
|
||||||
(float) (event.getChangeY() * pitchScale)
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void normalizeAngles(Vec2 dir) {
|
private boolean isFlying = true;
|
||||||
// Normalize yaw
|
private boolean isSprint = false;
|
||||||
dir.x = FloatMathUtils.normalizeAngle(dir.x);
|
|
||||||
|
|
||||||
// Clamp pitch
|
|
||||||
dir.y = Glm.clamp(
|
|
||||||
dir.y, -FloatMathUtils.PI_F/2, +FloatMathUtils.PI_F/2
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void onWheelScroll(WheelScrollEvent event) {
|
private int movementForward = 0;
|
||||||
if (event.hasHorizontalMovement()) {
|
private int movementRight = 0;
|
||||||
switchPlacingMode();
|
private int movementUp = 0;
|
||||||
}
|
|
||||||
if (InputTracker.isKeyPressed(GLFW.GLFW_KEY_LEFT_CONTROL)) {
|
private double lastSpacePress = Double.NEGATIVE_INFINITY;
|
||||||
switchPlacingMode();
|
private double lastSprintPress = Double.NEGATIVE_INFINITY;
|
||||||
return;
|
|
||||||
}
|
private boolean captureMouse = true;
|
||||||
|
private boolean useMinecraftGravity = false;
|
||||||
if (isBlockSelected) {
|
|
||||||
selectedBlock += event.isUp() ? +1 : -1;
|
private int selectedBlock = 0;
|
||||||
|
private int selectedTile = 0;
|
||||||
int size = TestContent.PLACEABLE_BLOCKS.size();
|
private boolean isBlockSelected = true;
|
||||||
|
|
||||||
if (selectedBlock < 0) {
|
private Runnable updateCallback = null;
|
||||||
selectedBlock = size - 1;
|
|
||||||
} else if (selectedBlock >= size) {
|
public void applyPlayerControls() {
|
||||||
selectedBlock = 0;
|
if (ClientState.getInstance() == null || !ClientState.getInstance().isReady()) {
|
||||||
}
|
return;
|
||||||
} else {
|
}
|
||||||
selectedTile += event.isUp() ? +1 : -1;
|
|
||||||
|
EntityData player = getEntity();
|
||||||
int size = TestContent.PLACEABLE_TILES.size();
|
|
||||||
|
final float speed, authority;
|
||||||
if (selectedTile < 0) {
|
|
||||||
selectedTile = size - 1;
|
if (isFlying) {
|
||||||
} else if (selectedTile >= size) {
|
speed = FLYING_SPEED;
|
||||||
selectedTile = 0;
|
authority = FLYING_CONTROL_AUTHORITY;
|
||||||
}
|
} else if (isSprint) {
|
||||||
}
|
speed = RUN_SPEED;
|
||||||
|
authority = WALKING_CONTROL_AUTHORITY;
|
||||||
updateGUI();
|
} else {
|
||||||
}
|
speed = WALKING_SPEED;
|
||||||
|
authority = WALKING_CONTROL_AUTHORITY;
|
||||||
|
}
|
||||||
|
|
||||||
|
Mat3 angMat = new Mat3().identity().rotateZ(player.getYaw());
|
||||||
|
Vec3 desiredVelocity = new Vec3(movementForward, -movementRight, 0);
|
||||||
|
|
||||||
|
if (movementForward != 0 && movementRight != 0) desiredVelocity.normalize();
|
||||||
|
angMat.mul_(desiredVelocity); // bug in jglm, .mul() and mul_() are swapped
|
||||||
|
desiredVelocity.z = movementUp;
|
||||||
|
desiredVelocity.mul(speed);
|
||||||
|
|
||||||
|
Vec3 change = new Vec3()
|
||||||
|
.set(desiredVelocity)
|
||||||
|
.sub(player.getVelocity())
|
||||||
|
.mul((float) Math.exp(-authority * GraphicsInterface.getFrameLength()))
|
||||||
|
.negate()
|
||||||
|
.add(desiredVelocity);
|
||||||
|
|
||||||
|
if (!isFlying) {
|
||||||
|
change.z = player.getVelocity().z;
|
||||||
|
}
|
||||||
|
|
||||||
|
player.getVelocity().set(change);
|
||||||
|
|
||||||
|
// THIS IS TERRIBLE TEST
|
||||||
|
EntityData serverEntity = ServerState.getInstance().getWorld().getData().getEntity(TestContent.PLAYER_ENTITY_ID);
|
||||||
|
if (serverEntity != null) {
|
||||||
|
serverEntity.setPosition(player.getPosition());
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
public void handleInput(Input input) {
|
||||||
|
InputEvent event = input.getEvent();
|
||||||
|
|
||||||
|
if (event instanceof KeyEvent) {
|
||||||
|
if (onKeyEvent((KeyEvent) event)) {
|
||||||
|
input.consume();
|
||||||
|
}
|
||||||
|
} else if (event instanceof CursorMoveEvent) {
|
||||||
|
onMouseMoved((CursorMoveEvent) event);
|
||||||
|
input.consume();
|
||||||
|
} else if (event instanceof WheelScrollEvent) {
|
||||||
|
onWheelScroll((WheelScrollEvent) event);
|
||||||
|
input.consume();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private boolean onKeyEvent(KeyEvent event) {
|
||||||
|
if (event.isRepeat()) return false;
|
||||||
|
int multiplier = event.isPress() ? 1 : -1;
|
||||||
|
switch (event.getKey()) {
|
||||||
|
case GLFW.GLFW_KEY_W:
|
||||||
|
movementForward += +1 * multiplier;
|
||||||
|
handleSprint(event);
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_KEY_S:
|
||||||
|
movementForward += -1 * multiplier;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_KEY_A:
|
||||||
|
movementRight += -1 * multiplier;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_KEY_D:
|
||||||
|
movementRight += +1 * multiplier;
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_KEY_SPACE:
|
||||||
|
handleSpace(multiplier);
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_KEY_LEFT_SHIFT:
|
||||||
|
handleShift(multiplier);
|
||||||
|
break;
|
||||||
|
case GLFW.GLFW_KEY_ESCAPE:
|
||||||
|
if (!event.isPress()) return false;
|
||||||
|
handleEscape();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case GLFW.GLFW_KEY_F5:
|
||||||
|
if (!event.isPress()) return false;
|
||||||
|
handleCameraMode();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case GLFW.GLFW_KEY_G:
|
||||||
|
if (!event.isPress()) return false;
|
||||||
|
handleGravitySwitch();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case GLFW.GLFW_MOUSE_BUTTON_3:
|
||||||
|
if (!event.isPress()) return false;
|
||||||
|
switchPlacingMode();
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleSpace(int multiplier) {
|
||||||
|
boolean isPressed = multiplier > 0;
|
||||||
|
|
||||||
|
double timeSinceLastSpacePress = GraphicsInterface.getTime() - lastSpacePress;
|
||||||
|
|
||||||
|
if (isPressed && timeSinceLastSpacePress < MODE_SWITCH_MAX_DELAY) {
|
||||||
|
isSprint = false;
|
||||||
|
isFlying = !isFlying;
|
||||||
|
updateGUI();
|
||||||
|
movementUp = +1;
|
||||||
|
} else {
|
||||||
|
if (isFlying) {
|
||||||
|
movementUp += +1 * multiplier;
|
||||||
|
} else {
|
||||||
|
if (isPressed && timeSinceLastSpacePress > MIN_JUMP_DELAY) {
|
||||||
|
jump();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
lastSpacePress = GraphicsInterface.getTime();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleSprint(KeyEvent event) {
|
||||||
|
|
||||||
|
double timeSinceLastSpacePress = GraphicsInterface.getTime() - lastSprintPress;
|
||||||
|
|
||||||
|
if (event.isPress() && timeSinceLastSpacePress < MODE_SPRINT_SWITCH_MAX_DELAY && !isFlying) {
|
||||||
|
isSprint = !isSprint;
|
||||||
|
updateGUI();
|
||||||
|
}
|
||||||
|
|
||||||
|
lastSprintPress = GraphicsInterface.getTime();
|
||||||
|
|
||||||
|
if (isSprint && event.isRelease()) {
|
||||||
|
isSprint = false;
|
||||||
|
updateGUI();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void jump() {
|
||||||
|
if (ClientState.getInstance() == null || !ClientState.getInstance().isReady()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
getEntity().getVelocity().add(0, 0, JUMP_VELOCITY * (useMinecraftGravity ? 2 : 1));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleShift(int multiplier) {
|
||||||
|
if (isFlying) {
|
||||||
|
movementUp += -1 * multiplier;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleEscape() {
|
||||||
|
if (captureMouse) {
|
||||||
|
GLFW.glfwSetInputMode(GraphicsBackend.getWindowHandle(), GLFW.GLFW_CURSOR, GLFW.GLFW_CURSOR_NORMAL);
|
||||||
|
} else {
|
||||||
|
GLFW.glfwSetInputMode(GraphicsBackend.getWindowHandle(), GLFW.GLFW_CURSOR, GLFW.GLFW_CURSOR_DISABLED);
|
||||||
|
}
|
||||||
|
|
||||||
|
captureMouse = !captureMouse;
|
||||||
|
updateGUI();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleCameraMode() {
|
||||||
|
if (ClientState.getInstance() == null || !ClientState.getInstance().isReady()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ClientState.getInstance().getCamera().hasAnchor()) {
|
||||||
|
ClientState.getInstance().getCamera().selectNextMode();
|
||||||
|
updateGUI();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void handleGravitySwitch() {
|
||||||
|
useMinecraftGravity = !useMinecraftGravity;
|
||||||
|
updateGUI();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onMouseMoved(CursorMoveEvent event) {
|
||||||
|
if (!captureMouse) return;
|
||||||
|
|
||||||
|
if (ClientState.getInstance() == null || !ClientState.getInstance().isReady()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final float yawScale = -0.002f;
|
||||||
|
final float pitchScale = yawScale;
|
||||||
|
|
||||||
|
EntityData player = getEntity();
|
||||||
|
|
||||||
|
normalizeAngles(player.getDirection().add(
|
||||||
|
(float) (event.getChangeX() * yawScale),
|
||||||
|
(float) (event.getChangeY() * pitchScale)
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
private void normalizeAngles(Vec2 dir) {
|
||||||
|
// Normalize yaw
|
||||||
|
dir.x = FloatMathUtils.normalizeAngle(dir.x);
|
||||||
|
|
||||||
|
// Clamp pitch
|
||||||
|
dir.y = Glm.clamp(
|
||||||
|
dir.y, -FloatMathUtils.PI_F / 2, +FloatMathUtils.PI_F / 2
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void onWheelScroll(WheelScrollEvent event) {
|
||||||
|
if (event.hasHorizontalMovement()) {
|
||||||
|
switchPlacingMode();
|
||||||
|
}
|
||||||
|
if (InputTracker.isKeyPressed(GLFW.GLFW_KEY_LEFT_CONTROL)) {
|
||||||
|
switchPlacingMode();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isBlockSelected) {
|
||||||
|
selectedBlock += event.isUp() ? +1 : -1;
|
||||||
|
|
||||||
|
int size = TestContent.PLACEABLE_BLOCKS.size();
|
||||||
|
|
||||||
|
if (selectedBlock < 0) {
|
||||||
|
selectedBlock = size - 1;
|
||||||
|
} else if (selectedBlock >= size) {
|
||||||
|
selectedBlock = 0;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
selectedTile += event.isUp() ? +1 : -1;
|
||||||
|
|
||||||
|
int size = TestContent.PLACEABLE_TILES.size();
|
||||||
|
|
||||||
|
if (selectedTile < 0) {
|
||||||
|
selectedTile = size - 1;
|
||||||
|
} else if (selectedTile >= size) {
|
||||||
|
selectedTile = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
updateGUI();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void switchPlacingMode() {
|
||||||
|
isBlockSelected = !isBlockSelected;
|
||||||
|
updateGUI();
|
||||||
|
}
|
||||||
|
|
||||||
|
public EntityData getEntity() {
|
||||||
|
return getPlayer().getEntity();
|
||||||
|
}
|
||||||
|
|
||||||
|
public LocalPlayer getPlayer() {
|
||||||
|
return ClientState.getInstance().getLocalPlayer();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUpdateCallback(Runnable updateCallback) {
|
||||||
|
this.updateCallback = updateCallback;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateGUI() {
|
||||||
|
if (this.updateCallback != null) {
|
||||||
|
this.updateCallback.run();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isFlying() {
|
||||||
|
return isFlying;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isSprint() {
|
||||||
|
return isSprint;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isMouseCaptured() {
|
||||||
|
return captureMouse;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean useMinecraftGravity() {
|
||||||
|
return useMinecraftGravity;
|
||||||
|
}
|
||||||
|
|
||||||
|
public BlockData getSelectedBlock() {
|
||||||
|
return TestContent.PLACEABLE_BLOCKS.get(selectedBlock);
|
||||||
|
}
|
||||||
|
|
||||||
|
public TileData getSelectedTile() {
|
||||||
|
return TestContent.PLACEABLE_TILES.get(selectedTile);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isBlockSelected() {
|
||||||
|
return isBlockSelected;
|
||||||
|
}
|
||||||
|
|
||||||
private void switchPlacingMode() {
|
|
||||||
isBlockSelected = !isBlockSelected;
|
|
||||||
updateGUI();
|
|
||||||
}
|
|
||||||
|
|
||||||
public EntityData getEntity() {
|
|
||||||
return getPlayer().getEntity();
|
|
||||||
}
|
|
||||||
|
|
||||||
public LocalPlayer getPlayer() {
|
|
||||||
return ClientState.getInstance().getLocalPlayer();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUpdateCallback(Runnable updateCallback) {
|
|
||||||
this.updateCallback = updateCallback;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateGUI() {
|
|
||||||
if (this.updateCallback != null) {
|
|
||||||
this.updateCallback.run();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isFlying() {
|
|
||||||
return isFlying;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isMouseCaptured() {
|
|
||||||
return captureMouse;
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean useMinecraftGravity() {
|
|
||||||
return useMinecraftGravity;
|
|
||||||
}
|
|
||||||
|
|
||||||
public BlockData getSelectedBlock() {
|
|
||||||
return TestContent.PLACEABLE_BLOCKS.get(selectedBlock);
|
|
||||||
}
|
|
||||||
|
|
||||||
public TileData getSelectedTile() {
|
|
||||||
return TestContent.PLACEABLE_TILES.get(selectedTile);
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isBlockSelected() {
|
|
||||||
return isBlockSelected;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user