From a2af1e02bbd468818556f5016cac9a456b98c98d Mon Sep 17 00:00:00 2001 From: Dejvino Date: Sat, 14 Jan 2017 03:01:01 +0100 Subject: [PATCH] Refactor: major moving around, trying to minimize RoadTrip.java (TODO: enable vehicles back) --- src/roadtrip/RoadTrip.java | 225 ++++-------------- src/roadtrip/model/TerrainDataProvider.java | 18 ++ src/roadtrip/{ => model}/VehicleInstance.java | 2 +- src/roadtrip/view/GameWorldView.java | 134 +++++++++++ src/roadtrip/view/TerrainView.java | 21 ++ src/roadtrip/{ => view}/VehicleNode.java | 3 +- src/roadtrip/view/model/GameWorldState.java | 13 + src/roadtrip/view/model/Player.java | 17 ++ 8 files changed, 254 insertions(+), 179 deletions(-) create mode 100644 src/roadtrip/model/TerrainDataProvider.java rename src/roadtrip/{ => model}/VehicleInstance.java (94%) create mode 100644 src/roadtrip/view/GameWorldView.java create mode 100644 src/roadtrip/view/TerrainView.java rename src/roadtrip/{ => view}/VehicleNode.java (87%) create mode 100644 src/roadtrip/view/model/GameWorldState.java create mode 100644 src/roadtrip/view/model/Player.java diff --git a/src/roadtrip/RoadTrip.java b/src/roadtrip/RoadTrip.java index 234d85c..d688dbe 100644 --- a/src/roadtrip/RoadTrip.java +++ b/src/roadtrip/RoadTrip.java @@ -25,33 +25,18 @@ import com.jme3.math.FastMath; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; import com.jme3.renderer.queue.RenderQueue; -import com.jme3.scene.CameraNode; import com.jme3.scene.Geometry; import com.jme3.scene.Node; import com.jme3.scene.Spatial; -import com.jme3.scene.control.CameraControl.ControlDirection; import com.jme3.scene.debug.Arrow; import com.jme3.scene.shape.Box; import com.jme3.scene.shape.Cylinder; -import com.jme3.scene.shape.Quad; -import com.jme3.terrain.geomipmap.TerrainGrid; import com.jme3.terrain.geomipmap.TerrainGridListener; -import com.jme3.terrain.geomipmap.TerrainGridLodControl; -import com.jme3.terrain.geomipmap.TerrainLodControl; import com.jme3.terrain.geomipmap.TerrainQuad; -import com.jme3.terrain.geomipmap.grid.FractalTileLoader; -import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator; -import com.jme3.terrain.noise.ShaderUtils; -import com.jme3.terrain.noise.basis.FilteredBasis; -import com.jme3.terrain.noise.filter.IterativeFilter; -import com.jme3.terrain.noise.filter.OptimizedErode; -import com.jme3.terrain.noise.filter.PerturbFilter; -import com.jme3.terrain.noise.filter.SmoothFilter; -import com.jme3.terrain.noise.fractal.FractalSum; -import com.jme3.terrain.noise.modulator.NoiseModulator; -import com.jme3.texture.Texture; -import java.util.LinkedList; -import java.util.List; +import roadtrip.model.VehicleInstance; +import roadtrip.view.GameWorldView; +import roadtrip.view.VehicleNode; +import roadtrip.view.model.Player; /** * @@ -59,44 +44,21 @@ import java.util.List; */ public class RoadTrip extends SimpleApplication implements ActionListener { - public static void main(String[] args) - { + public static void main(String[] args) { RoadTrip app = new RoadTrip(); app.start(); } - + public static boolean DEBUG = false;//true; - + private BulletAppState bulletAppState; - - private ChaseCamera chaseCam; - - // START Terrain - private Material mat_terrain; - private TerrainGrid terrain; - private float grassScale = 64; - private float dirtScale = 64; - private float rockScale = 64; - private FractalSum base; - private PerturbFilter perturb; - private OptimizedErode therm; - private SmoothFilter smooth; - private IterativeFilter iterate; - // END Terrain - - private List vehicles = new LinkedList<>(); + private GameWorldView gameWorldView; + + private ChaseCamera chaseCam; - private static class Player - { - Node node; - BetterCharacterControl characterControl; - Vector3f jumpForce = new Vector3f(0, 3000, 0); - Vector3f walkDir = new Vector3f(); - VehicleNode vehicleNode; - } private Player player = new Player(); - + private Vector3f journeyTarget = new Vector3f(50, 0f, 50f); private Node targetNode; private Node compassNode; @@ -126,13 +88,37 @@ public class RoadTrip extends SimpleApplication implements ActionListener { dl.setDirection(new Vector3f(1, -1, 1)); rootNode.addLight(dl); - addMap(); - - addCar(); - addCar(); + gameWorldView = GameWorldView.create(assetManager, cam, rootNode); + gameWorldView.terrain.terrainGrid.addListener(new TerrainGridListener() { + + @Override + public void gridMoved(Vector3f newCenter) { + } + + @Override + public void tileAttached(Vector3f cell, TerrainQuad quad) { + while(quad.getControl(RigidBodyControl.class)!=null){ + quad.removeControl(RigidBodyControl.class); + } + quad.addControl(new RigidBodyControl(new HeightfieldCollisionShape(quad.getHeightMap(), gameWorldView.terrain.terrainGrid.getLocalScale()), 0)); + bulletAppState.getPhysicsSpace().add(quad); + } + + @Override + public void tileDetached(Vector3f cell, TerrainQuad quad) { + if (quad.getControl(RigidBodyControl.class) != null) { + bulletAppState.getPhysicsSpace().remove(quad); + quad.removeControl(RigidBodyControl.class); + } + } + + }); + + /*addCar(); addCar(); addCar(); addCar(); + addCar();*/ addPerson(); addPerson(); addPerson(); @@ -140,7 +126,7 @@ public class RoadTrip extends SimpleApplication implements ActionListener { addPerson(); addPerson(); addPerson(); - + addPlayer(); addTarget(); @@ -171,7 +157,7 @@ public class RoadTrip extends SimpleApplication implements ActionListener { inputManager.addListener(this, "Esc"); } - private void addCar() + /*private void addCar() { Node vehicleModel = new Node("VehicleModel"); VehicleInstance vehicleInstance = VehicleInstance.createVehicle(vehicles.size() % VehicleInstance.getVehicleTypesCount()); @@ -351,7 +337,7 @@ public class RoadTrip extends SimpleApplication implements ActionListener { vehicles.add(vehicle); rootNode.attachChild(vehicle); - } + }*/ private Node addPerson() { Spatial personModel = assetManager.loadModel("Models/person.j3o"); @@ -435,117 +421,7 @@ public class RoadTrip extends SimpleApplication implements ActionListener { rootNode.attachChild(compassNode); } - private void addMap() { - // TERRAIN TEXTURE material - this.mat_terrain = new Material(this.assetManager, "Common/MatDefs/Terrain/HeightBasedTerrain.j3md"); - - // Parameters to material: - // regionXColorMap: X = 1..4 the texture that should be appliad to state X - // regionX: a Vector3f containing the following information: - // regionX.x: the start height of the region - // regionX.y: the end height of the region - // regionX.z: the texture scale for the region - // it might not be the most elegant way for storing these 3 values, but it packs the data nicely :) - // slopeColorMap: the texture to be used for cliffs, and steep mountain sites - // slopeTileFactor: the texture scale for slopes - // terrainSize: the total size of the terrain (used for scaling the texture) - // GRASS texture - Texture grass = this.assetManager.loadTexture("Textures/solid-grass.png"); - grass.setWrap(Texture.WrapMode.Repeat); - Texture dirt = this.assetManager.loadTexture("Textures/solid-road.png"); - dirt.setWrap(Texture.WrapMode.Repeat); - Texture rock = this.assetManager.loadTexture("Textures/solid-stone.png"); - rock.setWrap(Texture.WrapMode.Repeat); - - this.mat_terrain.setTexture("region1ColorMap", dirt); - this.mat_terrain.setVector3("region1", new Vector3f(0, 80, this.dirtScale)); - - this.mat_terrain.setTexture("region2ColorMap", grass); - this.mat_terrain.setVector3("region2", new Vector3f(100, 160, this.grassScale)); - - this.mat_terrain.setTexture("region3ColorMap", rock); - this.mat_terrain.setVector3("region3", new Vector3f(190, 240, this.rockScale)); - - this.mat_terrain.setTexture("region4ColorMap", dirt); - this.mat_terrain.setVector3("region4", new Vector3f(250, 350, this.dirtScale)); - - this.mat_terrain.setTexture("slopeColorMap", rock); - this.mat_terrain.setFloat("slopeTileFactor", 32); - - this.mat_terrain.setFloat("terrainSize", 513); - - this.base = new FractalSum(); - this.base.setRoughness(0.7f); - this.base.setFrequency(1.0f); - this.base.setAmplitude(1.0f); - this.base.setLacunarity(2.12f); - this.base.setOctaves(8); - this.base.setScale(0.02125f); - this.base.addModulator(new NoiseModulator() { - - @Override - public float value(float... in) { - return ShaderUtils.clamp(in[0] * 0.5f + 0.5f, 0, 1); - } - }); - - FilteredBasis ground = new FilteredBasis(this.base); - - this.perturb = new PerturbFilter(); - this.perturb.setMagnitude(0.119f); - - this.therm = new OptimizedErode(); - this.therm.setRadius(5); - this.therm.setTalus(0.011f); - - this.smooth = new SmoothFilter(); - this.smooth.setRadius(1); - this.smooth.setEffect(0.7f); - this.iterate = new IterativeFilter(); - this.iterate.addPreFilter(this.perturb); - this.iterate.addPostFilter(this.smooth); - this.iterate.setFilter(this.therm); - this.iterate.setIterations(2); - - ground.addPreFilter(this.iterate); - - this.terrain = new TerrainGrid("terrain", 64 + 1, 256 + 1, new FractalTileLoader(ground, 300f)); - - this.terrain.setMaterial(this.mat_terrain); - this.terrain.setLocalTranslation(0, -200, 0); - this.terrain.setLocalScale(2f, 1f, 2f); - this.rootNode.attachChild(this.terrain); - - TerrainLodControl control = new TerrainGridLodControl(this.terrain, this.getCamera()); - control.setLodCalculator(new DistanceLodCalculator(64 + 1, 2.7f)); // patch size, and a multiplier - this.terrain.addControl(control); - - terrain.addListener(new TerrainGridListener() { - - @Override - public void gridMoved(Vector3f newCenter) { - } - - @Override - public void tileAttached(Vector3f cell, TerrainQuad quad) { - while(quad.getControl(RigidBodyControl.class)!=null){ - quad.removeControl(RigidBodyControl.class); - } - quad.addControl(new RigidBodyControl(new HeightfieldCollisionShape(quad.getHeightMap(), terrain.getLocalScale()), 0)); - bulletAppState.getPhysicsSpace().add(quad); - } - - @Override - public void tileDetached(Vector3f cell, TerrainQuad quad) { - if (quad.getControl(RigidBodyControl.class) != null) { - bulletAppState.getPhysicsSpace().remove(quad); - quad.removeControl(RigidBodyControl.class); - } - } - - }); - } @Override public void simpleUpdate(float tpf) { @@ -554,7 +430,7 @@ public class RoadTrip extends SimpleApplication implements ActionListener { /*cam.setLocation(new Vector3f(cam.getLocation()).interpolate(newLocation, Math.min(tpf, 1f))); cam.lookAt(playerLocation, Vector3f.UNIT_Y);*/ - for (VehicleNode vehicle : vehicles) { + /*for (VehicleNode vehicle : gameWorldState.vehicles) { vehicle.vehicleInstance.accelerationSmooth = (vehicle.vehicleInstance.accelerationSmooth + vehicle.vehicleInstance.accelerationValue * (tpf * 10f)) / (1 + tpf * 10f); vehicle.engineAudio.setVelocity(new Vector3f(0, 0, 0)); vehicle.engineAudio.updateGeometricState(); @@ -590,7 +466,7 @@ public class RoadTrip extends SimpleApplication implements ActionListener { // TODO: pitch //wheelsAudio.setPitch(Math.max(0.5f, Math.min(wheelRot * 4f, 2.0f))); vehicle.wheelSlipAudio.setVolume(Math.max(0.0001f, Math.min(wheelSlip, 1.0f)) - 0.0001f); - } + }*/ listener.setLocation(cam.getLocation()); listener.setRotation(cam.getRotation()); @@ -651,7 +527,7 @@ public class RoadTrip extends SimpleApplication implements ActionListener { if (value) { System.out.println("Reset - to car"); Vector3f playerPos = player.node.getWorldTranslation(); - for (VehicleNode vehicle : vehicles) { + /*for (VehicleNode vehicle : vehicles) { Vector3f vehiclePos = vehicle.getWorldTranslation(); float dist = playerPos.distance(vehiclePos); System.out.println(" .. dist: " + dist); @@ -668,11 +544,11 @@ public class RoadTrip extends SimpleApplication implements ActionListener { player.walkDir = new Vector3f(); break; } - } + }*/ } } } else { - VehicleInstance playerVehicle = player.vehicleNode.vehicleInstance; + /*VehicleInstance playerVehicle = player.vehicleNode.vehicleInstance; VehicleControl playerVehicleControl = player.vehicleNode.vehicleControl; int playerCarType = playerVehicle.carType; float steerMax = 0.5f; @@ -739,14 +615,9 @@ public class RoadTrip extends SimpleApplication implements ActionListener { rootNode.attachChild(player.node); player.vehicleNode = null; player.walkDir = new Vector3f(); - /*playerVehicleControl.setPhysicsLocation(Vector3f.ZERO); - playerVehicleControl.setPhysicsRotation(new Matrix3f()); - playerVehicleControl.setLinearVelocity(Vector3f.ZERO); - playerVehicleControl.setAngularVelocity(Vector3f.ZERO); - playerVehicleControl.resetSuspension();*/ } else { } - } + }*/ } if (binding.equals("Esc")) { stop(); diff --git a/src/roadtrip/model/TerrainDataProvider.java b/src/roadtrip/model/TerrainDataProvider.java new file mode 100644 index 0000000..09126a0 --- /dev/null +++ b/src/roadtrip/model/TerrainDataProvider.java @@ -0,0 +1,18 @@ +package roadtrip.model; + +import com.jme3.terrain.noise.filter.IterativeFilter; +import com.jme3.terrain.noise.filter.OptimizedErode; +import com.jme3.terrain.noise.filter.PerturbFilter; +import com.jme3.terrain.noise.filter.SmoothFilter; +import com.jme3.terrain.noise.fractal.FractalSum; + +/** + * Created by dejvino on 14.01.2017. + */ +public class TerrainDataProvider { + public FractalSum base; + public PerturbFilter perturb; + public OptimizedErode therm; + public SmoothFilter smooth; + public IterativeFilter iterate; +} diff --git a/src/roadtrip/VehicleInstance.java b/src/roadtrip/model/VehicleInstance.java similarity index 94% rename from src/roadtrip/VehicleInstance.java rename to src/roadtrip/model/VehicleInstance.java index 0b75cf7..4032092 100644 --- a/src/roadtrip/VehicleInstance.java +++ b/src/roadtrip/model/VehicleInstance.java @@ -1,6 +1,6 @@ /* */ -package roadtrip; +package roadtrip.model; /** * diff --git a/src/roadtrip/view/GameWorldView.java b/src/roadtrip/view/GameWorldView.java new file mode 100644 index 0000000..dd73e21 --- /dev/null +++ b/src/roadtrip/view/GameWorldView.java @@ -0,0 +1,134 @@ +package roadtrip.view; + +import com.jme3.asset.AssetManager; +import com.jme3.bullet.collision.shapes.HeightfieldCollisionShape; +import com.jme3.bullet.control.RigidBodyControl; +import com.jme3.material.Material; +import com.jme3.math.Vector3f; +import com.jme3.renderer.Camera; +import com.jme3.scene.Node; +import com.jme3.terrain.geomipmap.*; +import com.jme3.terrain.geomipmap.grid.FractalTileLoader; +import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator; +import com.jme3.terrain.noise.ShaderUtils; +import com.jme3.terrain.noise.basis.FilteredBasis; +import com.jme3.terrain.noise.filter.IterativeFilter; +import com.jme3.terrain.noise.filter.OptimizedErode; +import com.jme3.terrain.noise.filter.PerturbFilter; +import com.jme3.terrain.noise.filter.SmoothFilter; +import com.jme3.terrain.noise.fractal.FractalSum; +import com.jme3.terrain.noise.modulator.NoiseModulator; +import com.jme3.texture.Texture; +import roadtrip.model.TerrainDataProvider; +import roadtrip.view.model.GameWorldState; + +/** + * Created by dejvino on 14.01.2017. + */ +public class GameWorldView { + + private GameWorldState state = new GameWorldState(); + + private AssetManager assetManager; + private Camera camera; + private Node rootNode; + + public TerrainView terrain = new TerrainView(new TerrainDataProvider()); + + public static GameWorldView create(AssetManager assetManager, Camera camera, Node rootNode) { + GameWorldView gameWorldView = new GameWorldView(); + gameWorldView.assetManager = assetManager; + gameWorldView.camera = camera; + gameWorldView.rootNode = rootNode; + gameWorldView.initialize(); + return gameWorldView; + } + + private void initialize() + { + // TERRAIN TEXTURE material + terrain.mat_terrain = new Material(assetManager, "Common/MatDefs/Terrain/HeightBasedTerrain.j3md"); + + // Parameters to material: + // regionXColorMap: X = 1..4 the texture that should be appliad to state X + // regionX: a Vector3f containing the following information: + // regionX.x: the start height of the region + // regionX.y: the end height of the region + // regionX.z: the texture scale for the region + // it might not be the most elegant way for storing these 3 values, but it packs the data nicely :) + // slopeColorMap: the texture to be used for cliffs, and steep mountain sites + // slopeTileFactor: the texture scale for slopes + // terrainSize: the total size of the terrain (used for scaling the texture) + // GRASS texture + Texture grass = this.assetManager.loadTexture("Textures/solid-grass.png"); + grass.setWrap(Texture.WrapMode.Repeat); + Texture dirt = this.assetManager.loadTexture("Textures/solid-road.png"); + dirt.setWrap(Texture.WrapMode.Repeat); + Texture rock = this.assetManager.loadTexture("Textures/solid-stone.png"); + rock.setWrap(Texture.WrapMode.Repeat); + + terrain.mat_terrain.setTexture("region1ColorMap", dirt); + terrain.mat_terrain.setVector3("region1", new Vector3f(0, 80, terrain.dirtScale)); + + terrain.mat_terrain.setTexture("region2ColorMap", grass); + terrain.mat_terrain.setVector3("region2", new Vector3f(100, 160, terrain.grassScale)); + + terrain.mat_terrain.setTexture("region3ColorMap", rock); + terrain.mat_terrain.setVector3("region3", new Vector3f(190, 240, terrain.rockScale)); + + terrain.mat_terrain.setTexture("region4ColorMap", dirt); + terrain.mat_terrain.setVector3("region4", new Vector3f(250, 350, terrain.dirtScale)); + + terrain.mat_terrain.setTexture("slopeColorMap", rock); + terrain.mat_terrain.setFloat("slopeTileFactor", 32); + + terrain.mat_terrain.setFloat("terrainSize", 513); + + terrain.terrainDataProvider.base = new FractalSum(); + terrain.terrainDataProvider.base.setRoughness(0.7f); + terrain.terrainDataProvider.base.setFrequency(1.0f); + terrain.terrainDataProvider.base.setAmplitude(1.0f); + terrain.terrainDataProvider.base.setLacunarity(2.12f); + terrain.terrainDataProvider.base.setOctaves(8); + terrain.terrainDataProvider.base.setScale(0.02125f); + terrain.terrainDataProvider.base.addModulator(new NoiseModulator() { + + @Override + public float value(float... in) { + return ShaderUtils.clamp(in[0] * 0.5f + 0.5f, 0, 1); + } + }); + + FilteredBasis ground = new FilteredBasis(terrain.terrainDataProvider.base); + + terrain.terrainDataProvider.perturb = new PerturbFilter(); + terrain.terrainDataProvider.perturb.setMagnitude(0.119f); + + terrain.terrainDataProvider.therm = new OptimizedErode(); + terrain.terrainDataProvider.therm.setRadius(5); + terrain.terrainDataProvider.therm.setTalus(0.011f); + + terrain.terrainDataProvider.smooth = new SmoothFilter(); + terrain.terrainDataProvider.smooth.setRadius(1); + terrain.terrainDataProvider.smooth.setEffect(0.7f); + + terrain.terrainDataProvider.iterate = new IterativeFilter(); + terrain.terrainDataProvider.iterate.addPreFilter(terrain.terrainDataProvider.perturb); + terrain.terrainDataProvider.iterate.addPostFilter(terrain.terrainDataProvider.smooth); + terrain.terrainDataProvider.iterate.setFilter(terrain.terrainDataProvider.therm); + terrain.terrainDataProvider.iterate.setIterations(2); + + ground.addPreFilter(terrain.terrainDataProvider.iterate); + + terrain.terrainGrid = new TerrainGrid("terrain", 64 + 1, 256 + 1, new FractalTileLoader(ground, 300f)); + + terrain.terrainGrid.setMaterial(terrain.mat_terrain); + terrain.terrainGrid.setLocalTranslation(0, -200, 0); + terrain.terrainGrid.setLocalScale(2f, 1f, 2f); + this.rootNode.attachChild(terrain.terrainGrid); + + TerrainLodControl control = new TerrainGridLodControl(terrain.terrainGrid, camera); + control.setLodCalculator(new DistanceLodCalculator(64 + 1, 2.7f)); // patch size, and a multiplier + terrain.terrainGrid.addControl(control); + } +} diff --git a/src/roadtrip/view/TerrainView.java b/src/roadtrip/view/TerrainView.java new file mode 100644 index 0000000..2371f12 --- /dev/null +++ b/src/roadtrip/view/TerrainView.java @@ -0,0 +1,21 @@ +package roadtrip.view; + +import com.jme3.material.Material; +import com.jme3.terrain.geomipmap.TerrainGrid; +import roadtrip.model.TerrainDataProvider; + +/** + * Created by dejvino on 14.01.2017. + */ +public class TerrainView { + public Material mat_terrain; + public TerrainGrid terrainGrid; + public float grassScale = 64; + public float dirtScale = 64; + public float rockScale = 64; + public TerrainDataProvider terrainDataProvider; + + public TerrainView(TerrainDataProvider terrainDataProvider) { + this.terrainDataProvider = terrainDataProvider; + } +} diff --git a/src/roadtrip/VehicleNode.java b/src/roadtrip/view/VehicleNode.java similarity index 87% rename from src/roadtrip/VehicleNode.java rename to src/roadtrip/view/VehicleNode.java index 643acc9..dfc8fee 100644 --- a/src/roadtrip/VehicleNode.java +++ b/src/roadtrip/view/VehicleNode.java @@ -1,11 +1,12 @@ /* */ -package roadtrip; +package roadtrip.view; import com.jme3.audio.AudioNode; import com.jme3.bullet.control.VehicleControl; import com.jme3.scene.Node; import com.jme3.scene.Spatial; +import roadtrip.model.VehicleInstance; /** * diff --git a/src/roadtrip/view/model/GameWorldState.java b/src/roadtrip/view/model/GameWorldState.java new file mode 100644 index 0000000..2b9e0e4 --- /dev/null +++ b/src/roadtrip/view/model/GameWorldState.java @@ -0,0 +1,13 @@ +package roadtrip.view.model; + +import roadtrip.view.VehicleNode; + +import java.util.LinkedList; +import java.util.List; + +/** + * Created by dejvino on 14.01.2017. + */ +public class GameWorldState { + private List vehicles = new LinkedList<>(); +} diff --git a/src/roadtrip/view/model/Player.java b/src/roadtrip/view/model/Player.java new file mode 100644 index 0000000..92f54d3 --- /dev/null +++ b/src/roadtrip/view/model/Player.java @@ -0,0 +1,17 @@ +package roadtrip.view.model; + +import com.jme3.bullet.control.BetterCharacterControl; +import com.jme3.math.Vector3f; +import com.jme3.scene.Node; +import roadtrip.view.VehicleNode; + +/** + * Created by dejvino on 14.01.2017. + */ +public class Player { + public Node node; + public BetterCharacterControl characterControl; + public Vector3f jumpForce = new Vector3f(0, 3000, 0); + public Vector3f walkDir = new Vector3f(); + public VehicleNode vehicleNode; +}