From 9a5bb23687b1fb3957a6a6525f9de0d7b4de91c6 Mon Sep 17 00:00:00 2001 From: "nor..67" Date: Wed, 16 Nov 2011 14:18:03 +0000 Subject: [PATCH] - fix FractalTileLoader not implementing TerrainGridTileLoader - change TerrainGrid tests to use new TileLoader classes git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8700 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../jme3/terrain/geomipmap/grid/FractalTileLoader.java | 3 ++- .../test/jme3test/terrain/TerrainFractalGridTest.java | 9 ++------- .../test/jme3test/terrain/TerrainGridAlphaMapTest.java | 7 ++----- engine/src/test/jme3test/terrain/TerrainGridTest.java | 8 ++------ 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/engine/src/terrain/com/jme3/terrain/geomipmap/grid/FractalTileLoader.java b/engine/src/terrain/com/jme3/terrain/geomipmap/grid/FractalTileLoader.java index c52e2e8c1..08ff50375 100644 --- a/engine/src/terrain/com/jme3/terrain/geomipmap/grid/FractalTileLoader.java +++ b/engine/src/terrain/com/jme3/terrain/geomipmap/grid/FractalTileLoader.java @@ -8,6 +8,7 @@ import com.jme3.export.JmeExporter; import com.jme3.export.JmeImporter; import com.jme3.math.Vector3f; import com.jme3.terrain.MapUtils; +import com.jme3.terrain.geomipmap.TerrainGridTileLoader; import com.jme3.terrain.geomipmap.TerrainQuad; import com.jme3.terrain.heightmap.AbstractHeightMap; import com.jme3.terrain.heightmap.Grayscale16BitHeightMap; @@ -23,7 +24,7 @@ import org.novyon.noise.Basis; * * @author Anthyon, normenhansen */ -public class FractalTileLoader { +public class FractalTileLoader implements TerrainGridTileLoader{ public class FloatBufferHeightMap extends AbstractHeightMap { private final FloatBuffer buffer; diff --git a/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java b/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java index c86835295..78d6d4fae 100644 --- a/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java +++ b/engine/src/test/jme3test/terrain/TerrainFractalGridTest.java @@ -9,7 +9,6 @@ import com.jme3.bullet.collision.shapes.CapsuleCollisionShape; import com.jme3.bullet.collision.shapes.HeightfieldCollisionShape; import com.jme3.bullet.control.CharacterControl; import com.jme3.bullet.control.RigidBodyControl; -import com.jme3.export.binary.BinaryExporter; import com.jme3.input.KeyInput; import com.jme3.input.controls.ActionListener; import com.jme3.input.controls.KeyTrigger; @@ -19,14 +18,10 @@ import com.jme3.math.Vector3f; import com.jme3.terrain.geomipmap.TerrainGrid; import com.jme3.terrain.geomipmap.TerrainGridListener; import com.jme3.terrain.geomipmap.TerrainLodControl; +import com.jme3.terrain.geomipmap.grid.FractalTileLoader; import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator; -import com.jme3.terrain.heightmap.FractalHeightMapGrid; import com.jme3.texture.Texture; import com.jme3.texture.Texture.WrapMode; -import java.io.File; -import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; import org.novyon.noise.ShaderUtils; import org.novyon.noise.basis.FilteredBasis; import org.novyon.noise.filter.IterativeFilter; @@ -137,7 +132,7 @@ public class TerrainFractalGridTest extends SimpleApplication { ground.addPreFilter(this.iterate); - this.terrain = new TerrainGrid("terrain", 33, 129, new FractalHeightMapGrid(ground, null, 256f)); + this.terrain = new TerrainGrid("terrain", 33, 129, new FractalTileLoader(ground, null, 256f)); this.terrain.setMaterial(this.mat_terrain); this.terrain.setLocalTranslation(0, 0, 0); diff --git a/engine/src/test/jme3test/terrain/TerrainGridAlphaMapTest.java b/engine/src/test/jme3test/terrain/TerrainGridAlphaMapTest.java index 8715503bd..5bcd004ee 100644 --- a/engine/src/test/jme3test/terrain/TerrainGridAlphaMapTest.java +++ b/engine/src/test/jme3test/terrain/TerrainGridAlphaMapTest.java @@ -21,15 +21,12 @@ import com.jme3.material.Material; import com.jme3.math.ColorRGBA; import com.jme3.math.Vector3f; import com.jme3.renderer.Camera; -import com.jme3.shader.VarType; import com.jme3.terrain.geomipmap.TerrainGrid; import com.jme3.terrain.geomipmap.TerrainGridListener; 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.heightmap.FractalHeightMapGrid; -import com.jme3.terrain.heightmap.ImageBasedHeightMapGrid; -import com.jme3.terrain.heightmap.Namer; import com.jme3.texture.Texture; import com.jme3.texture.Texture.WrapMode; import java.io.File; @@ -149,7 +146,7 @@ public class TerrainGridAlphaMapTest extends SimpleApplication { ground.addPreFilter(this.iterate); - this.terrain = new TerrainGrid("terrain", 33, 257, new FractalHeightMapGrid(ground, null, 256)); + this.terrain = new TerrainGrid("terrain", 33, 257, new FractalTileLoader(ground, null, 256)); this.terrain.setMaterial(this.matRock); this.terrain.setLocalTranslation(0, 0, 0); diff --git a/engine/src/test/jme3test/terrain/TerrainGridTest.java b/engine/src/test/jme3test/terrain/TerrainGridTest.java index ab9b63b63..2f14d2247 100644 --- a/engine/src/test/jme3test/terrain/TerrainGridTest.java +++ b/engine/src/test/jme3test/terrain/TerrainGridTest.java @@ -9,7 +9,6 @@ import com.jme3.bullet.collision.shapes.CapsuleCollisionShape; import com.jme3.bullet.collision.shapes.HeightfieldCollisionShape; import com.jme3.bullet.control.CharacterControl; import com.jme3.bullet.control.RigidBodyControl; -import com.jme3.export.binary.BinaryExporter; import com.jme3.input.KeyInput; import com.jme3.input.controls.ActionListener; import com.jme3.input.controls.KeyTrigger; @@ -20,15 +19,12 @@ import com.jme3.terrain.geomipmap.TerrainGrid; import com.jme3.terrain.geomipmap.TerrainGridListener; import com.jme3.terrain.geomipmap.TerrainLodControl; import com.jme3.terrain.geomipmap.TerrainQuad; +import com.jme3.terrain.geomipmap.grid.ImageTileLoader; import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator; -import com.jme3.terrain.heightmap.ImageBasedHeightMapGrid; import com.jme3.terrain.heightmap.Namer; import com.jme3.texture.Texture; import com.jme3.texture.Texture.WrapMode; import java.io.File; -import java.io.IOException; -import java.util.logging.Level; -import java.util.logging.Logger; public class TerrainGridTest extends SimpleApplication { @@ -98,7 +94,7 @@ public class TerrainGridTest extends SimpleApplication { this.mat_terrain.setFloat("terrainSize", 129); - this.terrain = new TerrainGrid("terrain", 65, 257, new ImageBasedHeightMapGrid(assetManager, new Namer() { + this.terrain = new TerrainGrid("terrain", 65, 257, new ImageTileLoader(assetManager, new Namer() { public String getName(int x, int y) { return "Scenes/TerrainMountains/terrain_" + x + "_" + y + ".png";