sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #581 from Ev1lbl0w/master

Browse Source 
Fix some problems in issue #96 (SDK branch)
This commit is contained in:
empirephoenix 2016-12-31 23:27:50 +01:00 committed by GitHub
commit b31ccf31d7
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jme3-examples/src/main/java/jme3test/asset/TestOnlineJar.java
View File

@ -60,9 +60,9 @@ public class TestOnlineJar extends SimpleApplication {
Geometry quad = new Geometry("Textured Quad", quadMesh); Geometry quad = new Geometry("Textured Quad", quadMesh);
assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/town.zip", assetManager.registerLocator("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jmonkeyengine/town.zip",
HttpZipLocator.class); HttpZipLocator.class);
assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", assetManager.registerLocator("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jmonkeyengine/wildhouse.zip",
HttpZipLocator.class); HttpZipLocator.class);
Picture pic1 = new Picture("Picture1"); Picture pic1 = new Picture("Picture1");

2
jme3-examples/src/main/java/jme3test/asset/TestUrlLoading.java
View File

@ -60,7 +60,7 @@ public class TestUrlLoading extends SimpleApplication {
Geometry quad = new Geometry("Textured Quad", quadMesh); Geometry quad = new Geometry("Textured Quad", quadMesh);
assetManager.registerLocator("https://jmonkeyengine.googlecode.com/svn/BookSamples/assets/Textures/", assetManager.registerLocator("https://raw.githubusercontent.com/jMonkeyEngine/BookSamples/master/assets/Textures/",
UrlLocator.class); UrlLocator.class);
TextureKey key = new TextureKey("mucha-window.png", false); TextureKey key = new TextureKey("mucha-window.png", false);
key.setGenerateMips(true); key.setGenerateMips(true);

2
jme3-examples/src/main/java/jme3test/material/TestColoredTexture.java
View File

@ -57,7 +57,7 @@ public class TestColoredTexture extends SimpleApplication {
Geometry quad = new Geometry("Quad", quadMesh); Geometry quad = new Geometry("Quad", quadMesh);
quad.setQueueBucket(Bucket.Gui); quad.setQueueBucket(Bucket.Gui);
mat = new Material(assetManager, "Common/MatDefs/Misc/ColoredTextured.j3md"); mat = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
mat.setTexture("ColorMap", assetManager.loadTexture("Textures/ColoredTex/Monkey.png")); mat.setTexture("ColorMap", assetManager.loadTexture("Textures/ColoredTex/Monkey.png"));
quad.setMaterial(mat); quad.setMaterial(mat);
guiNode.attachChildAt(quad, 0); guiNode.attachChildAt(quad, 0);

2
jme3-examples/src/main/java/jme3test/scene/TestSceneLoading.java
View File

@ -75,7 +75,7 @@ public class TestSceneLoading extends SimpleApplication {
// create the geometry and attach it // create the geometry and attach it
// load the level from zip or http zip // load the level from zip or http zip
if (useHttp) { if (useHttp) {
assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class); assetManager.registerLocator("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jmonkeyengine/wildhouse.zip", HttpZipLocator.class);
} else { } else {
assetManager.registerLocator("wildhouse.zip", ZipLocator.class); assetManager.registerLocator("wildhouse.zip", ZipLocator.class);
} }

2
jme3-examples/src/main/java/jme3test/terrain/TerrainGridAlphaMapTest.java
View File

@ -75,7 +75,7 @@ public class TerrainGridAlphaMapTest extends SimpleApplication {
File file = new File("TerrainGridTestData.zip"); File file = new File("TerrainGridTestData.zip");
if (!file.exists()) { if (!file.exists()) {
assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/TerrainGridTestData.zip", HttpZipLocator.class); assetManager.registerLocator("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jmonkeyengine/TerrainGridTestData.zip", HttpZipLocator.class);
} else { } else {
assetManager.registerLocator("TerrainGridTestData.zip", ZipLocator.class); assetManager.registerLocator("TerrainGridTestData.zip", ZipLocator.class);
} }

2
jme3-examples/src/main/java/jme3test/terrain/TerrainGridTest.java
View File

@ -48,7 +48,7 @@ public class TerrainGridTest extends SimpleApplication {
public void simpleInitApp() { public void simpleInitApp() {
File file = new File("TerrainGridTestData.zip"); File file = new File("TerrainGridTestData.zip");
if (!file.exists()) { if (!file.exists()) {
assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/TerrainGridTestData.zip", HttpZipLocator.class); assetManager.registerLocator("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jmonkeyengine/TerrainGridTestData.zip", HttpZipLocator.class);
} else { } else {
assetManager.registerLocator("TerrainGridTestData.zip", ZipLocator.class); assetManager.registerLocator("TerrainGridTestData.zip", ZipLocator.class);
} }

2
jme3-examples/src/main/java/jme3test/water/TestSceneWater.java
View File

@ -76,7 +76,7 @@ public class TestSceneWater extends SimpleApplication {
// create the geometry and attach it // create the geometry and attach it
// load the level from zip or http zip // load the level from zip or http zip
if (useHttp) { if (useHttp) {
assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class); assetManager.registerLocator("https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jmonkeyengine/wildhouse.zip", HttpZipLocator.class);
} else { } else {
assetManager.registerLocator("wildhouse.zip", ZipLocator.class); assetManager.registerLocator("wildhouse.zip", ZipLocator.class);
} }