Browse Source

Merge pull request #581 from Ev1lbl0w/master

Fix some problems in issue #96 (SDK branch)
empirephoenix 8 năm trước cách đây
mục cha
commit
b31ccf31d7

+ 2 - 2
jme3-examples/src/main/java/jme3test/asset/TestOnlineJar.java

@@ -60,9 +60,9 @@ public class TestOnlineJar extends SimpleApplication {
 
         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);
-        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);
 
         Picture pic1 = new Picture("Picture1");

+ 1 - 1
jme3-examples/src/main/java/jme3test/asset/TestUrlLoading.java

@@ -60,7 +60,7 @@ public class TestUrlLoading extends SimpleApplication {
 
         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);
         TextureKey key = new TextureKey("mucha-window.png", false);
         key.setGenerateMips(true);

+ 1 - 1
jme3-examples/src/main/java/jme3test/material/TestColoredTexture.java

@@ -57,7 +57,7 @@ public class TestColoredTexture extends SimpleApplication {
         Geometry quad = new Geometry("Quad", quadMesh);
         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"));
         quad.setMaterial(mat);
         guiNode.attachChildAt(quad, 0);

+ 1 - 1
jme3-examples/src/main/java/jme3test/scene/TestSceneLoading.java

@@ -75,7 +75,7 @@ public class TestSceneLoading extends SimpleApplication {
         // create the geometry and attach it
         // load the level from zip or http zip
         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 {
             assetManager.registerLocator("wildhouse.zip", ZipLocator.class);
         }

+ 1 - 1
jme3-examples/src/main/java/jme3test/terrain/TerrainGridAlphaMapTest.java

@@ -75,7 +75,7 @@ public class TerrainGridAlphaMapTest extends SimpleApplication {
 
         File file = new File("TerrainGridTestData.zip");
         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 {
             assetManager.registerLocator("TerrainGridTestData.zip", ZipLocator.class);
         }

+ 1 - 1
jme3-examples/src/main/java/jme3test/terrain/TerrainGridTest.java

@@ -48,7 +48,7 @@ public class TerrainGridTest extends SimpleApplication {
     public void simpleInitApp() {
         File file = new File("TerrainGridTestData.zip");
         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 {
             assetManager.registerLocator("TerrainGridTestData.zip", ZipLocator.class);
         }

+ 1 - 1
jme3-examples/src/main/java/jme3test/water/TestSceneWater.java

@@ -76,7 +76,7 @@ public class TestSceneWater extends SimpleApplication {
         // create the geometry and attach it
         // load the level from zip or http zip
         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 {
             assetManager.registerLocator("wildhouse.zip", ZipLocator.class);
         }