Skip to content

Fixes error of loading assets #1330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephengold merged 1 commit into from
Apr 6, 2020
Merged

Fixes error of loading assets #1330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions jme3-examples/src/main/java/jme3test/bullet/TestQ3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
11 changes: 6 additions & 5 deletions jme3-examples/src/main/java/jme3test/post/TestMultiplesFilters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand All @@ -68,6 +64,11 @@ public static void main(String[] args) {

@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));
Expand Down
11 changes: 6 additions & 5 deletions jme3-examples/src/main/java/jme3test/scene/TestSceneLoading.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,18 @@ public void simpleUpdate(float tpf){

@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) {
Expand Down
16 changes: 6 additions & 10 deletions jme3-examples/src/main/java/jme3test/water/TestPostWaterLake.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand All @@ -68,12 +69,7 @@ public void simpleInitApp() {
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) {
Expand Down
13 changes: 7 additions & 6 deletions jme3-examples/src/main/java/jme3test/water/TestSceneWater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
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) {

Expand All @@ -61,6 +61,11 @@ public static void main(String[] args) {

@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));
Expand All @@ -71,11 +76,7 @@ public void simpleInitApp() {
"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) {
Expand Down