diff --git a/assets/Textures/Thumbs.db b/assets/Textures/Thumbs.db index 0b6ab6fc..ed6ca164 100644 Binary files a/assets/Textures/Thumbs.db and b/assets/Textures/Thumbs.db differ diff --git a/assets/Textures/cloudRing.png b/assets/Textures/cloudRing.png index 41dde5bb..f9dd8290 100644 Binary files a/assets/Textures/cloudRing.png and b/assets/Textures/cloudRing.png differ diff --git a/src/main/java/electrosphere/controls/ControlHandler.java b/src/main/java/electrosphere/controls/ControlHandler.java index 0856d239..2beebe60 100644 --- a/src/main/java/electrosphere/controls/ControlHandler.java +++ b/src/main/java/electrosphere/controls/ControlHandler.java @@ -272,16 +272,18 @@ public class ControlHandler { if(Globals.playerCharacter != null){ GroundMovementTree movementTree = CreatureUtils.getEntityMovementTree(Globals.playerCharacter); Vector3f cameraEyeVector = CameraEntityUtils.getCameraEye(Globals.playerCamera); - Vector3d newFacingVector = new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).normalize(); - CreatureUtils.setFacingVector(Globals.playerCharacter, newFacingVector); - if(movementTree.getState()==MovementTreeState.IDLE || movementTree.getState()==MovementTreeState.SLOWDOWN || movementTree.getFacing() != MovementRelativeFacing.FORWARD){ - if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_LEFT).isIsKey() && Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_LEFT).getKeyValue())){ - movementTree.start(MovementRelativeFacing.FORWARD_LEFT); - } else if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_RIGHT).isIsKey() && Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_RIGHT).getKeyValue())){ - movementTree.start(MovementRelativeFacing.FORWARD_RIGHT); - } else { - movementTree.start(MovementRelativeFacing.FORWARD); - } + if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_LEFT).isState()){ + Vector3d newFacingVector = new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(Math.PI/4.0).normalize(); + CreatureUtils.setFacingVector(Globals.playerCharacter, newFacingVector); + movementTree.start(MovementRelativeFacing.FORWARD); + } else if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_RIGHT).isState()){ + Vector3d newFacingVector = new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(-Math.PI/4.0).normalize(); + CreatureUtils.setFacingVector(Globals.playerCharacter, newFacingVector); + movementTree.start(MovementRelativeFacing.FORWARD); + } else { + Vector3d newFacingVector = new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).normalize(); + CreatureUtils.setFacingVector(Globals.playerCharacter, newFacingVector); + movementTree.start(MovementRelativeFacing.FORWARD); } } }}); @@ -289,16 +291,18 @@ public class ControlHandler { if(Globals.playerCharacter != null){ GroundMovementTree movementTree = CreatureUtils.getEntityMovementTree(Globals.playerCharacter); Vector3f cameraEyeVector = CameraEntityUtils.getCameraEye(Globals.playerCamera); - Vector3d newFacingVector = new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).normalize(); - CreatureUtils.setFacingVector(Globals.playerCharacter, newFacingVector); - if(movementTree.getState()==MovementTreeState.IDLE || movementTree.getState()==MovementTreeState.SLOWDOWN || movementTree.getFacing() != MovementRelativeFacing.FORWARD){ - if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_LEFT).isIsKey() && Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_LEFT).getKeyValue())){ - movementTree.start(MovementRelativeFacing.FORWARD_LEFT); - } else if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_RIGHT).isIsKey() && Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_RIGHT).getKeyValue())){ - movementTree.start(MovementRelativeFacing.FORWARD_RIGHT); - } else { - movementTree.start(MovementRelativeFacing.FORWARD); - } + if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_LEFT).isState()){ + Vector3d newFacingVector = new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(Math.PI/4.0).normalize(); + CreatureUtils.setFacingVector(Globals.playerCharacter, newFacingVector); + movementTree.start(MovementRelativeFacing.FORWARD); + } else if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_RIGHT).isState()){ + Vector3d newFacingVector = new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(-Math.PI/4.0).normalize(); + CreatureUtils.setFacingVector(Globals.playerCharacter, newFacingVector); + movementTree.start(MovementRelativeFacing.FORWARD); + } else { + Vector3d newFacingVector = new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).normalize(); + CreatureUtils.setFacingVector(Globals.playerCharacter, newFacingVector); + movementTree.start(MovementRelativeFacing.FORWARD); } } }}); @@ -316,15 +320,15 @@ public class ControlHandler { if(Globals.playerCharacter != null){ GroundMovementTree movementTree = CreatureUtils.getEntityMovementTree(Globals.playerCharacter); Vector3f cameraEyeVector = CameraEntityUtils.getCameraEye(Globals.playerCamera); - CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).normalize()); - if(movementTree.getState()==MovementTreeState.IDLE || movementTree.getState()==MovementTreeState.SLOWDOWN || movementTree.getFacing() != MovementRelativeFacing.BACKWARD){ - if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_LEFT).isIsKey() && Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_LEFT).getKeyValue())){ - movementTree.start(MovementRelativeFacing.BACKWARD_LEFT); - } else if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_RIGHT).isIsKey() && Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_RIGHT).getKeyValue())){ - movementTree.start(MovementRelativeFacing.BACKWARD_RIGHT); - } else { - movementTree.start(MovementRelativeFacing.BACKWARD); - } + if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_LEFT).isState()){ + CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(3.0/4.0*Math.PI).normalize()); + movementTree.start(MovementRelativeFacing.FORWARD); + } else if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_RIGHT).isState()){ + CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(5.0/4.0*Math.PI).normalize()); + movementTree.start(MovementRelativeFacing.FORWARD); + } else { + CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(Math.PI).normalize()); + movementTree.start(MovementRelativeFacing.FORWARD); } } }}); @@ -332,15 +336,15 @@ public class ControlHandler { if(Globals.playerCharacter != null){ GroundMovementTree movementTree = CreatureUtils.getEntityMovementTree(Globals.playerCharacter); Vector3f cameraEyeVector = CameraEntityUtils.getCameraEye(Globals.playerCamera); - CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).normalize()); - if(movementTree.getState()==MovementTreeState.IDLE || movementTree.getState()==MovementTreeState.SLOWDOWN || movementTree.getFacing() != MovementRelativeFacing.BACKWARD){ - if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_LEFT).isIsKey() && Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_LEFT).getKeyValue())){ - movementTree.start(MovementRelativeFacing.BACKWARD_LEFT); - } else if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_RIGHT).isIsKey() && Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_RIGHT).getKeyValue())){ - movementTree.start(MovementRelativeFacing.BACKWARD_RIGHT); - } else { - movementTree.start(MovementRelativeFacing.BACKWARD); - } + if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_LEFT).isState()){ + CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(3.0/4.0*Math.PI).normalize()); + movementTree.start(MovementRelativeFacing.FORWARD); + } else if(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_RIGHT).isState()){ + CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(5.0/4.0*Math.PI).normalize()); + movementTree.start(MovementRelativeFacing.FORWARD); + } else { + CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(Math.PI).normalize()); + movementTree.start(MovementRelativeFacing.FORWARD); } } }}); @@ -358,12 +362,12 @@ public class ControlHandler { if(Globals.playerCharacter != null){ GroundMovementTree movementTree = CreatureUtils.getEntityMovementTree(Globals.playerCharacter); Vector3f cameraEyeVector = CameraEntityUtils.getCameraEye(Globals.playerCamera); - CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(Math.PI/2.0).normalize()); if( (movementTree.getState()==MovementTreeState.IDLE || movementTree.getState()==MovementTreeState.SLOWDOWN) && (controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_FORWARD).isIsKey() && !Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_FORWARD).getKeyValue())) && (controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_BACKWARD).isIsKey() && !Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_BACKWARD).getKeyValue())) ){ + CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(Math.PI/2.0).normalize()); movementTree.start(MovementRelativeFacing.FORWARD); } } @@ -372,12 +376,12 @@ public class ControlHandler { if(Globals.playerCharacter != null){ GroundMovementTree movementTree = CreatureUtils.getEntityMovementTree(Globals.playerCharacter); Vector3f cameraEyeVector = CameraEntityUtils.getCameraEye(Globals.playerCamera); - CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(Math.PI/2.0).normalize()); if( (movementTree.getState()==MovementTreeState.IDLE || movementTree.getState()==MovementTreeState.SLOWDOWN) && (controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_FORWARD).isIsKey() && !Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_FORWARD).getKeyValue())) && (controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_BACKWARD).isIsKey() && !Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_BACKWARD).getKeyValue())) ){ + CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(Math.PI/2.0).normalize()); movementTree.start(MovementRelativeFacing.FORWARD); } } @@ -396,12 +400,12 @@ public class ControlHandler { if(Globals.playerCharacter != null){ GroundMovementTree movementTree = CreatureUtils.getEntityMovementTree(Globals.playerCharacter); Vector3f cameraEyeVector = CameraEntityUtils.getCameraEye(Globals.playerCamera); - CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(-Math.PI/2.0).normalize()); if( (movementTree.getState()==MovementTreeState.IDLE || movementTree.getState()==MovementTreeState.SLOWDOWN) && (controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_FORWARD).isIsKey() && !Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_FORWARD).getKeyValue())) && (controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_BACKWARD).isIsKey() && !Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_BACKWARD).getKeyValue())) ){ + CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(-Math.PI/2.0).normalize()); movementTree.start(MovementRelativeFacing.FORWARD); } } @@ -410,12 +414,12 @@ public class ControlHandler { if(Globals.playerCharacter != null){ GroundMovementTree movementTree = CreatureUtils.getEntityMovementTree(Globals.playerCharacter); Vector3f cameraEyeVector = CameraEntityUtils.getCameraEye(Globals.playerCamera); - CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(-Math.PI/2.0).normalize()); if( (movementTree.getState()==MovementTreeState.IDLE || movementTree.getState()==MovementTreeState.SLOWDOWN) && (controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_FORWARD).isIsKey() && !Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_FORWARD).getKeyValue())) && (controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_BACKWARD).isIsKey() && !Globals.controlCallback.getKey(controls.get(DATA_STRING_INPUT_CODE_MOVEMENT_BACKWARD).getKeyValue())) ){ + CreatureUtils.setFacingVector(Globals.playerCharacter, new Vector3d(-cameraEyeVector.x,0,-cameraEyeVector.z).rotateY(-Math.PI/2.0).normalize()); movementTree.start(MovementRelativeFacing.FORWARD); } }