From fafe8a74fe0d77dc397186143177e753456d1116 Mon Sep 17 00:00:00 2001 From: Grabli66 Date: Mon, 6 Apr 2020 17:55:48 +0300 Subject: [PATCH] Fixes error of loading assets --- .../src/main/java/jme3test/bullet/TestQ3.java | 11 ++++++----- .../java/jme3test/post/TestMultiplesFilters.java | 11 ++++++----- .../java/jme3test/scene/TestSceneLoading.java | 11 ++++++----- .../java/jme3test/water/TestPostWaterLake.java | 16 ++++++---------- .../main/java/jme3test/water/TestSceneWater.java | 13 +++++++------ 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestQ3.java b/jme3-examples/src/main/java/jme3test/bullet/TestQ3.java index c38b89b9f..068ec5dc0 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestQ3.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestQ3.java @@ -61,17 +61,18 @@ public class TestQ3 extends SimpleApplication implements ActionListener { private static boolean useHttp = false; private boolean left=false,right=false,up=false,down=false; - public static void main(String[] args) { - File file = new File("quake3level.zip"); - if (!file.exists()) { - useHttp = true; - } + public static void main(String[] args) { TestQ3 app = new TestQ3(); app.start(); } @Override public void simpleInitApp() { + File file = new File("quake3level.zip"); + if (!file.exists()) { + useHttp = true; + } + bulletAppState = new BulletAppState(); stateManager.attach(bulletAppState); flyCam.setMoveSpeed(100); diff --git a/jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java b/jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java index c83ecdf84..9cb6386f6 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java +++ b/jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java @@ -54,11 +54,7 @@ public class TestMultiplesFilters extends SimpleApplication { private static boolean useHttp = false; - public static void main(String[] args) { - File file = new File("wildhouse.zip"); - if (!file.exists()) { - useHttp = true; - } + public static void main(String[] args) { TestMultiplesFilters app = new TestMultiplesFilters(); app.start(); } @@ -68,6 +64,11 @@ public class TestMultiplesFilters extends SimpleApplication { @Override public void simpleInitApp() { + File file = new File("wildhouse.zip"); + if (!file.exists()) { + useHttp = true; + } + this.flyCam.setMoveSpeed(10); cam.setLocation(new Vector3f(6.0344796f, 1.5054002f, 55.572033f)); cam.setRotation(new Quaternion(0.0016069f, 0.9810479f, -0.008143323f, 0.19358753f)); diff --git a/jme3-examples/src/main/java/jme3test/scene/TestSceneLoading.java b/jme3-examples/src/main/java/jme3test/scene/TestSceneLoading.java index b3bc05d90..94824cc55 100644 --- a/jme3-examples/src/main/java/jme3test/scene/TestSceneLoading.java +++ b/jme3-examples/src/main/java/jme3test/scene/TestSceneLoading.java @@ -64,17 +64,18 @@ public class TestSceneLoading extends SimpleApplication { @Override public void simpleInitApp() { + File file = new File("wildhouse.zip"); + if (!file.exists()) { + useHttp = true; + } + this.flyCam.setMoveSpeed(10); // load sky rootNode.attachChild(SkyFactory.createSky(assetManager, "Textures/Sky/Bright/BrightSky.dds", SkyFactory.EnvMapType.CubeMap)); - - File file = new File("wildhouse.zip"); - if (!file.exists()) { - useHttp = true; - } + // create the geometry and attach it // load the level from zip or http zip if (useHttp) { diff --git a/jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java b/jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java index 8437290e5..a91d96e0a 100644 --- a/jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java +++ b/jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java @@ -49,17 +49,18 @@ public class TestPostWaterLake extends SimpleApplication { private static boolean useHttp = false; - public static void main(String[] args) { - File file = new File("wildhouse.zip"); - if (!file.exists()) { - useHttp = true; - } + public static void main(String[] args) { TestPostWaterLake app = new TestPostWaterLake(); app.start(); } @Override public void simpleInitApp() { + File file = new File("wildhouse.zip"); + if (!file.exists()) { + useHttp = true; + } + this.flyCam.setMoveSpeed(10); cam.setLocation(new Vector3f(-27.0f, 1.0f, 75.0f)); // cam.setRotation(new Quaternion(0.03f, 0.9f, 0f, 0.4f)); @@ -68,12 +69,7 @@ public class TestPostWaterLake extends SimpleApplication { rootNode.attachChild(SkyFactory.createSky(assetManager, "Textures/Sky/Bright/BrightSky.dds", SkyFactory.EnvMapType.CubeMap)); - - File file = new File("wildhouse.zip"); - if (file.exists()) { - useHttp = false; - } // create the geometry and attach it // load the level from zip or http zip if (useHttp) { diff --git a/jme3-examples/src/main/java/jme3test/water/TestSceneWater.java b/jme3-examples/src/main/java/jme3test/water/TestSceneWater.java index 62584e545..ec084adae 100644 --- a/jme3-examples/src/main/java/jme3test/water/TestSceneWater.java +++ b/jme3-examples/src/main/java/jme3test/water/TestSceneWater.java @@ -51,7 +51,7 @@ import java.io.File; public class TestSceneWater extends SimpleApplication { // set default for applets - private static boolean useHttp = true; + private static boolean useHttp = false; public static void main(String[] args) { @@ -61,6 +61,11 @@ public class TestSceneWater extends SimpleApplication { @Override public void simpleInitApp() { + File file = new File("wildhouse.zip"); + if (!file.exists()) { + useHttp = true; + } + this.flyCam.setMoveSpeed(10); Node mainScene=new Node(); cam.setLocation(new Vector3f(-27.0f, 1.0f, 75.0f)); @@ -71,11 +76,7 @@ public class TestSceneWater extends SimpleApplication { "Textures/Sky/Bright/BrightSky.dds", SkyFactory.EnvMapType.CubeMap)); - - File file = new File("wildhouse.zip"); - if (file.exists()) { - useHttp = false; - } + // create the geometry and attach it // load the level from zip or http zip if (useHttp) {