DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rewrote Camera Movement to only respect previous motion direction | Fixes https://trello.com/c/y7nIqj47/

Browse Source
This commit is contained in:
CrushedPixel
2015-06-29 12:54:56 +02:00
parent d6aadcaf94
commit 36c38ddfd3
2 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/eu/crushedpixel/replaymod/entities/CameraEntity.java
View File

@@ -42,6 +42,7 @@ public class CameraEntity extends EntityPlayer {
}
private Vec3 direction;
private Vec3 dirBefore;
private double motion;
private final Minecraft mc = Minecraft.getMinecraft();
@@ -125,8 +126,6 @@ public class CameraEntity extends EntityPlayer {
}
public void setMovement(MoveDirection dir) {
Vec3 oldDir = direction;
switch(dir) {
case BACKWARD:
direction = this.getVectorForRotation(-rotationPitch, rotationYaw - 180);
@@ -148,8 +147,15 @@ public class CameraEntity extends EntityPlayer {
break;
}
if(oldDir != null)
direction = direction.normalize().add(new Vec3(oldDir.xCoord * (motion / 4f), oldDir.yCoord * (motion / 4f), oldDir.zCoord * (motion / 4f)).normalize());
Vec3 dbf = direction;
if(dirBefore != null) {
direction = dirBefore.normalize().add(direction);
}
dirBefore = dbf;
updateMovement();
}
public void moveAbsolute(Position pos) {

36
src/main/java/eu/crushedpixel/replaymod/events/handlers/KeyInputHandler.java
View File

@@ -33,6 +33,8 @@ public class KeyInputHandler {
boolean speedup = false;
if(mc.currentScreen == null) {
boolean forward = false, backward = false, left = false, right = false, up = false, down = false;
for(KeyBinding kb : keyBindings) {
//don't act on Mouse inputs
if(kb.getKeyCode() < 0) continue;
@@ -42,37 +44,36 @@ public class KeyInputHandler {
if(ReplayMod.replaySender.paused() && !Keyboard.isKeyDown(kb.getKeyCode()))
continue;
try {
if(ReplayHandler.isCamera()) {
if(kb.getKeyDescription().equals("key.forward")) {
ReplayHandler.getCameraEntity().setMovement(MoveDirection.FORWARD);
forward = true;
speedup = true;
}
if(kb.getKeyDescription().equals("key.back")) {
ReplayHandler.getCameraEntity().setMovement(MoveDirection.BACKWARD);
backward = true;
speedup = true;
}
if(kb.getKeyDescription().equals("key.jump")) {
ReplayHandler.getCameraEntity().setMovement(MoveDirection.UP);
up = true;
speedup = true;
}
if(kb.getKeyDescription().equals("key.left")) {
ReplayHandler.getCameraEntity().setMovement(MoveDirection.LEFT);
left = true;
speedup = true;
}
if(kb.getKeyDescription().equals("key.right")) {
ReplayHandler.getCameraEntity().setMovement(MoveDirection.RIGHT);
right = true;
speedup = true;
}
}
if(kb.getKeyDescription().equals("key.sneak")) {
if(ReplayHandler.isCamera()) {
ReplayHandler.getCameraEntity().setMovement(MoveDirection.DOWN);
down = true;
speedup = true;
} else {
ReplayHandler.spectateCamera();
@@ -83,6 +84,8 @@ public class KeyInputHandler {
e.printStackTrace();
}
}
forwardCameraMovement(forward, backward, left, right, up, down);
}
if(ReplayHandler.getCameraEntity() != null) {
@@ -115,7 +118,26 @@ public class KeyInputHandler {
handleCustomKeybindings(kb, found, -1);
found = true;
}
}
private void forwardCameraMovement(boolean forward, boolean backward, boolean left, boolean right, boolean up, boolean down) {
if(forward && !backward) {
ReplayHandler.getCameraEntity().setMovement(MoveDirection.FORWARD);
} else if(backward && !forward) {
ReplayHandler.getCameraEntity().setMovement(MoveDirection.BACKWARD);
}
if(left && !right) {
ReplayHandler.getCameraEntity().setMovement(MoveDirection.LEFT);
} else if(right && !left) {
ReplayHandler.getCameraEntity().setMovement(MoveDirection.RIGHT);
}
if(up && !down) {
ReplayHandler.getCameraEntity().setMovement(MoveDirection.UP);
} else if(down && !up) {
ReplayHandler.getCameraEntity().setMovement(MoveDirection.DOWN);
}
}
public void handleCustomKeybindings(KeyBinding kb, boolean found, int keyCode) {