diff --git a/engine/src/test-data/TerrainGrid/TerrainGrid.j3o b/engine/src/test-data/TerrainGrid/TerrainGrid.j3o index 67889d357..a9134f0d6 100644 Binary files a/engine/src/test-data/TerrainGrid/TerrainGrid.j3o and b/engine/src/test-data/TerrainGrid/TerrainGrid.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-1_0_-1.j3o b/engine/src/test-data/TerrainGrid/testgrid_-1_0_-1.j3o index 28d051615..ad25512a7 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-1_0_-1.j3o and b/engine/src/test-data/TerrainGrid/testgrid_-1_0_-1.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-1_0_-2.j3o b/engine/src/test-data/TerrainGrid/testgrid_-1_0_-2.j3o deleted file mode 100644 index e2894e1c2..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-1_0_-2.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-1_0_-3.j3o b/engine/src/test-data/TerrainGrid/testgrid_-1_0_-3.j3o deleted file mode 100644 index c7aa76b47..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-1_0_-3.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-1_0_0.j3o b/engine/src/test-data/TerrainGrid/testgrid_-1_0_0.j3o index 5c2e68def..2753ecbd1 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-1_0_0.j3o and b/engine/src/test-data/TerrainGrid/testgrid_-1_0_0.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-1_0_1.j3o b/engine/src/test-data/TerrainGrid/testgrid_-1_0_1.j3o index bdd3ffe88..a9dbc62a6 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-1_0_1.j3o and b/engine/src/test-data/TerrainGrid/testgrid_-1_0_1.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-1_0_2.j3o b/engine/src/test-data/TerrainGrid/testgrid_-1_0_2.j3o index 877d8d895..ecb84fc14 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-1_0_2.j3o and b/engine/src/test-data/TerrainGrid/testgrid_-1_0_2.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-1_0_3.j3o b/engine/src/test-data/TerrainGrid/testgrid_-1_0_3.j3o index f34a4e819..952774413 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-1_0_3.j3o and b/engine/src/test-data/TerrainGrid/testgrid_-1_0_3.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-2_0_-1.j3o b/engine/src/test-data/TerrainGrid/testgrid_-2_0_-1.j3o deleted file mode 100644 index 02f491d3f..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-2_0_-1.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-2_0_-2.j3o b/engine/src/test-data/TerrainGrid/testgrid_-2_0_-2.j3o deleted file mode 100644 index 945375240..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-2_0_-2.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-2_0_0.j3o b/engine/src/test-data/TerrainGrid/testgrid_-2_0_0.j3o deleted file mode 100644 index 476e5a288..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-2_0_0.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-2_0_1.j3o b/engine/src/test-data/TerrainGrid/testgrid_-2_0_1.j3o deleted file mode 100644 index bb7cbbeab..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-2_0_1.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-2_0_2.j3o b/engine/src/test-data/TerrainGrid/testgrid_-2_0_2.j3o deleted file mode 100644 index f40f68ef6..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-2_0_2.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_-2_0_3.j3o b/engine/src/test-data/TerrainGrid/testgrid_-2_0_3.j3o deleted file mode 100644 index 3a90f7241..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_-2_0_3.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_0_0_-1.j3o b/engine/src/test-data/TerrainGrid/testgrid_0_0_-1.j3o index 0928b3334..9a597f426 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_0_0_-1.j3o and b/engine/src/test-data/TerrainGrid/testgrid_0_0_-1.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_0_0_-2.j3o b/engine/src/test-data/TerrainGrid/testgrid_0_0_-2.j3o deleted file mode 100644 index 30f591eb7..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_0_0_-2.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_0_0_-3.j3o b/engine/src/test-data/TerrainGrid/testgrid_0_0_-3.j3o deleted file mode 100644 index 04c47458d..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_0_0_-3.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_0_0_-4.j3o b/engine/src/test-data/TerrainGrid/testgrid_0_0_-4.j3o deleted file mode 100644 index 411f49d88..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_0_0_-4.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_0_0_-5.j3o b/engine/src/test-data/TerrainGrid/testgrid_0_0_-5.j3o deleted file mode 100644 index 6c0793880..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_0_0_-5.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_0_0_0.j3o b/engine/src/test-data/TerrainGrid/testgrid_0_0_0.j3o index bec5c0e73..289d32cf5 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_0_0_0.j3o and b/engine/src/test-data/TerrainGrid/testgrid_0_0_0.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_0_0_1.j3o b/engine/src/test-data/TerrainGrid/testgrid_0_0_1.j3o index 75d4ef9f5..bd2157fa2 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_0_0_1.j3o and b/engine/src/test-data/TerrainGrid/testgrid_0_0_1.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_0_0_2.j3o b/engine/src/test-data/TerrainGrid/testgrid_0_0_2.j3o index b956c967a..60c67b5df 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_0_0_2.j3o and b/engine/src/test-data/TerrainGrid/testgrid_0_0_2.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_0_0_3.j3o b/engine/src/test-data/TerrainGrid/testgrid_0_0_3.j3o index fecb642a8..729fdad6e 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_0_0_3.j3o and b/engine/src/test-data/TerrainGrid/testgrid_0_0_3.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_1_0_-1.j3o b/engine/src/test-data/TerrainGrid/testgrid_1_0_-1.j3o index 956326d17..514d8b929 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_1_0_-1.j3o and b/engine/src/test-data/TerrainGrid/testgrid_1_0_-1.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_1_0_-2.j3o b/engine/src/test-data/TerrainGrid/testgrid_1_0_-2.j3o deleted file mode 100644 index 8ca3077de..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_1_0_-2.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_1_0_-3.j3o b/engine/src/test-data/TerrainGrid/testgrid_1_0_-3.j3o deleted file mode 100644 index b6d701bfa..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_1_0_-3.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_1_0_-4.j3o b/engine/src/test-data/TerrainGrid/testgrid_1_0_-4.j3o deleted file mode 100644 index 7b32c18e8..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_1_0_-4.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_1_0_-5.j3o b/engine/src/test-data/TerrainGrid/testgrid_1_0_-5.j3o deleted file mode 100644 index 924a01186..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_1_0_-5.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_1_0_2.j3o b/engine/src/test-data/TerrainGrid/testgrid_1_0_2.j3o index 0736dac7b..85b5e8148 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_1_0_2.j3o and b/engine/src/test-data/TerrainGrid/testgrid_1_0_2.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_1_0_3.j3o b/engine/src/test-data/TerrainGrid/testgrid_1_0_3.j3o index eb30d64f8..3055eba9a 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_1_0_3.j3o and b/engine/src/test-data/TerrainGrid/testgrid_1_0_3.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_2_0_-1.j3o b/engine/src/test-data/TerrainGrid/testgrid_2_0_-1.j3o index 368a20d57..c6464a7e1 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_2_0_-1.j3o and b/engine/src/test-data/TerrainGrid/testgrid_2_0_-1.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_2_0_-2.j3o b/engine/src/test-data/TerrainGrid/testgrid_2_0_-2.j3o deleted file mode 100644 index 4d746e105..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_2_0_-2.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_2_0_-3.j3o b/engine/src/test-data/TerrainGrid/testgrid_2_0_-3.j3o deleted file mode 100644 index aa7a0bc70..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_2_0_-3.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_2_0_-4.j3o b/engine/src/test-data/TerrainGrid/testgrid_2_0_-4.j3o deleted file mode 100644 index 0a7686273..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_2_0_-4.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_2_0_-5.j3o b/engine/src/test-data/TerrainGrid/testgrid_2_0_-5.j3o deleted file mode 100644 index f5cbb37c0..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_2_0_-5.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_2_0_0.j3o b/engine/src/test-data/TerrainGrid/testgrid_2_0_0.j3o index 8cae48a63..f88b1cea5 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_2_0_0.j3o and b/engine/src/test-data/TerrainGrid/testgrid_2_0_0.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_2_0_1.j3o b/engine/src/test-data/TerrainGrid/testgrid_2_0_1.j3o index e6548689f..5e09cfcd3 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_2_0_1.j3o and b/engine/src/test-data/TerrainGrid/testgrid_2_0_1.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_2_0_2.j3o b/engine/src/test-data/TerrainGrid/testgrid_2_0_2.j3o index 171a112a4..9aa45ea05 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_2_0_2.j3o and b/engine/src/test-data/TerrainGrid/testgrid_2_0_2.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_2_0_3.j3o b/engine/src/test-data/TerrainGrid/testgrid_2_0_3.j3o deleted file mode 100644 index 9b9e4c71d..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_2_0_3.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_3_0_-1.j3o b/engine/src/test-data/TerrainGrid/testgrid_3_0_-1.j3o deleted file mode 100644 index aa287eace..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_3_0_-1.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_3_0_-2.j3o b/engine/src/test-data/TerrainGrid/testgrid_3_0_-2.j3o deleted file mode 100644 index 483c75019..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_3_0_-2.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_3_0_-3.j3o b/engine/src/test-data/TerrainGrid/testgrid_3_0_-3.j3o deleted file mode 100644 index ea4efec55..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_3_0_-3.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_3_0_-4.j3o b/engine/src/test-data/TerrainGrid/testgrid_3_0_-4.j3o deleted file mode 100644 index af266e686..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_3_0_-4.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_3_0_-5.j3o b/engine/src/test-data/TerrainGrid/testgrid_3_0_-5.j3o deleted file mode 100644 index 8cc63aa97..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_3_0_-5.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_3_0_0.j3o b/engine/src/test-data/TerrainGrid/testgrid_3_0_0.j3o index 737a8f901..830b6cba5 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_3_0_0.j3o and b/engine/src/test-data/TerrainGrid/testgrid_3_0_0.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_3_0_1.j3o b/engine/src/test-data/TerrainGrid/testgrid_3_0_1.j3o index cea76f5fd..bf5a0a395 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_3_0_1.j3o and b/engine/src/test-data/TerrainGrid/testgrid_3_0_1.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_3_0_2.j3o b/engine/src/test-data/TerrainGrid/testgrid_3_0_2.j3o index 5994019a0..718a79b93 100644 Binary files a/engine/src/test-data/TerrainGrid/testgrid_3_0_2.j3o and b/engine/src/test-data/TerrainGrid/testgrid_3_0_2.j3o differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_3_0_3.j3o b/engine/src/test-data/TerrainGrid/testgrid_3_0_3.j3o deleted file mode 100644 index 43fe44eeb..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_3_0_3.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_4_0_-2.j3o b/engine/src/test-data/TerrainGrid/testgrid_4_0_-2.j3o deleted file mode 100644 index 66b3447e1..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_4_0_-2.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_4_0_-3.j3o b/engine/src/test-data/TerrainGrid/testgrid_4_0_-3.j3o deleted file mode 100644 index f8825db29..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_4_0_-3.j3o and /dev/null differ diff --git a/engine/src/test-data/TerrainGrid/testgrid_4_0_-4.j3o b/engine/src/test-data/TerrainGrid/testgrid_4_0_-4.j3o deleted file mode 100644 index ccf3ed74c..000000000 Binary files a/engine/src/test-data/TerrainGrid/testgrid_4_0_-4.j3o and /dev/null differ diff --git a/engine/src/test/jme3test/terrain/TerrainQuadGridSerializationTest.java b/engine/src/test/jme3test/terrain/TerrainGridSerializationTest.java similarity index 88% rename from engine/src/test/jme3test/terrain/TerrainQuadGridSerializationTest.java rename to engine/src/test/jme3test/terrain/TerrainGridSerializationTest.java index 268fb6ed5..3d05f5bfb 100644 --- a/engine/src/test/jme3test/terrain/TerrainQuadGridSerializationTest.java +++ b/engine/src/test/jme3test/terrain/TerrainGridSerializationTest.java @@ -22,13 +22,13 @@ import com.jme3.terrain.geomipmap.TerrainQuad; import com.jme3.terrain.geomipmap.lodcalc.DistanceLodCalculator; import java.io.File; -public class TerrainQuadGridSerializationTest extends SimpleApplication { +public class TerrainGridSerializationTest extends SimpleApplication { private TerrainGrid terrain; private boolean usePhysics = true; public static void main(final String[] args) { - TerrainQuadGridSerializationTest app = new TerrainQuadGridSerializationTest(); + TerrainGridSerializationTest app = new TerrainGridSerializationTest(); app.start(); } private CharacterControl player3; @@ -124,30 +124,30 @@ public class TerrainQuadGridSerializationTest extends SimpleApplication { public void onAction(final String name, final boolean keyPressed, final float tpf) { if (name.equals("Lefts")) { if (keyPressed) { - TerrainQuadGridSerializationTest.this.left = true; + TerrainGridSerializationTest.this.left = true; } else { - TerrainQuadGridSerializationTest.this.left = false; + TerrainGridSerializationTest.this.left = false; } } else if (name.equals("Rights")) { if (keyPressed) { - TerrainQuadGridSerializationTest.this.right = true; + TerrainGridSerializationTest.this.right = true; } else { - TerrainQuadGridSerializationTest.this.right = false; + TerrainGridSerializationTest.this.right = false; } } else if (name.equals("Ups")) { if (keyPressed) { - TerrainQuadGridSerializationTest.this.up = true; + TerrainGridSerializationTest.this.up = true; } else { - TerrainQuadGridSerializationTest.this.up = false; + TerrainGridSerializationTest.this.up = false; } } else if (name.equals("Downs")) { if (keyPressed) { - TerrainQuadGridSerializationTest.this.down = true; + TerrainGridSerializationTest.this.down = true; } else { - TerrainQuadGridSerializationTest.this.down = false; + TerrainGridSerializationTest.this.down = false; } } else if (name.equals("Jumps")) { - TerrainQuadGridSerializationTest.this.player3.jump(); + TerrainGridSerializationTest.this.player3.jump(); } } }; diff --git a/engine/src/test/jme3test/terrain/TerrainQuadGridTest.java b/engine/src/test/jme3test/terrain/TerrainGridTileLoaderTest.java similarity index 93% rename from engine/src/test/jme3test/terrain/TerrainQuadGridTest.java rename to engine/src/test/jme3test/terrain/TerrainGridTileLoaderTest.java index c2abfb93a..a162ef042 100644 --- a/engine/src/test/jme3test/terrain/TerrainQuadGridTest.java +++ b/engine/src/test/jme3test/terrain/TerrainGridTileLoaderTest.java @@ -29,7 +29,7 @@ import java.io.IOException; import java.util.logging.Level; import java.util.logging.Logger; -public class TerrainQuadGridTest extends SimpleApplication { +public class TerrainGridTileLoaderTest extends SimpleApplication { private Material mat_terrain; private TerrainGrid terrain; @@ -40,7 +40,7 @@ public class TerrainQuadGridTest extends SimpleApplication { private boolean physicsAdded = false; public static void main(final String[] args) { - TerrainQuadGridTest app = new TerrainQuadGridTest(); + TerrainGridTileLoaderTest app = new TerrainGridTileLoaderTest(); app.start(); } private CharacterControl player3; @@ -185,30 +185,30 @@ public class TerrainQuadGridTest extends SimpleApplication { public void onAction(final String name, final boolean keyPressed, final float tpf) { if (name.equals("Lefts")) { if (keyPressed) { - TerrainQuadGridTest.this.left = true; + TerrainGridTileLoaderTest.this.left = true; } else { - TerrainQuadGridTest.this.left = false; + TerrainGridTileLoaderTest.this.left = false; } } else if (name.equals("Rights")) { if (keyPressed) { - TerrainQuadGridTest.this.right = true; + TerrainGridTileLoaderTest.this.right = true; } else { - TerrainQuadGridTest.this.right = false; + TerrainGridTileLoaderTest.this.right = false; } } else if (name.equals("Ups")) { if (keyPressed) { - TerrainQuadGridTest.this.up = true; + TerrainGridTileLoaderTest.this.up = true; } else { - TerrainQuadGridTest.this.up = false; + TerrainGridTileLoaderTest.this.up = false; } } else if (name.equals("Downs")) { if (keyPressed) { - TerrainQuadGridTest.this.down = true; + TerrainGridTileLoaderTest.this.down = true; } else { - TerrainQuadGridTest.this.down = false; + TerrainGridTileLoaderTest.this.down = false; } } else if (name.equals("Jumps")) { - TerrainQuadGridTest.this.player3.jump(); + TerrainGridTileLoaderTest.this.player3.jump(); } } };