diff --git a/README.md b/README.md index ab418b6..cd2d87d 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,14 @@ A game about a journey involving vehicles and obstacles. ## Status ### DONE * Physics-based vehicle +* Driving controls (UHJKM) * Camera following the player * Hilly ground -* Collidable objects (testing) +* Collidable objects - static and dynamic ### TODO * Orbit camera -* Rigid objects (fences, houses) * People +* Walking around - NPCs +* Walking around - Player +* Enter / Exit a car \ No newline at end of file diff --git a/assets-src/Models/fence.blend b/assets-src/Models/fence.blend new file mode 100644 index 0000000..65fd2e4 Binary files /dev/null and b/assets-src/Models/fence.blend differ diff --git a/assets/Models/fence.j3o b/assets/Models/fence.j3o new file mode 100644 index 0000000..1422a62 Binary files /dev/null and b/assets/Models/fence.j3o differ diff --git a/assets/Models/fence.j3odata b/assets/Models/fence.j3odata new file mode 100644 index 0000000..200a73e --- /dev/null +++ b/assets/Models/fence.j3odata @@ -0,0 +1,3 @@ +# +#Sat Dec 31 15:42:32 CET 2016 +ORIGINAL_PATH=Models/fence.scene diff --git a/assets/Scenes/TestMap.j3o b/assets/Scenes/TestMap.j3o index fa70d15..f4d6044 100644 Binary files a/assets/Scenes/TestMap.j3o and b/assets/Scenes/TestMap.j3o differ diff --git a/screenshot.png b/screenshot.png index 5bc57fd..8bcbcf0 100644 Binary files a/screenshot.png and b/screenshot.png differ diff --git a/src/roadtrip/RoadTrip.java b/src/roadtrip/RoadTrip.java index 4107cbb..6e0753f 100644 --- a/src/roadtrip/RoadTrip.java +++ b/src/roadtrip/RoadTrip.java @@ -72,12 +72,14 @@ public class RoadTrip extends SimpleApplication implements ActionListener { inputManager.addMapping("Rights", new KeyTrigger(KeyInput.KEY_K)); inputManager.addMapping("Ups", new KeyTrigger(KeyInput.KEY_U)); inputManager.addMapping("Downs", new KeyTrigger(KeyInput.KEY_J)); + inputManager.addMapping("Revs", new KeyTrigger(KeyInput.KEY_M)); inputManager.addMapping("Space", new KeyTrigger(KeyInput.KEY_SPACE)); inputManager.addMapping("Reset", new KeyTrigger(KeyInput.KEY_RETURN)); inputManager.addListener(this, "Lefts"); inputManager.addListener(this, "Rights"); inputManager.addListener(this, "Ups"); inputManager.addListener(this, "Downs"); + inputManager.addListener(this, "Revs"); inputManager.addListener(this, "Space"); inputManager.addListener(this, "Reset"); } @@ -255,6 +257,18 @@ public class RoadTrip extends SimpleApplication implements ActionListener { } vehicle.brake(0, b); vehicle.brake(1, b); + } else if (binding.equals("Revs")) { + if (value) { + accelerationValue += accelerationForce; + } else { + accelerationValue -= accelerationForce; + } + vehicle.accelerate(2, -accelerationValue); + vehicle.accelerate(3, -accelerationValue); + if (carType == TRUCK) { + vehicle.accelerate(4, -accelerationValue); + vehicle.accelerate(5, -accelerationValue); + } } else if (binding.equals("Space")) { if (value) { vehicle.applyImpulse(jumpForce, Vector3f.ZERO);