From 8ae04fd1fbb66a7feaacc00f54ebf53fcdc65c71 Mon Sep 17 00:00:00 2001
From: shadowislord <shadowislord@gmail.com>
Date: Tue, 10 Feb 2015 20:10:43 -0500
Subject: [PATCH] PlaceholderAssets: when assets fail to load, try to make the
 error appear visually

---
 .../main/java/com/jme3/texture/Texture.java    |   2 +-
 .../java/com/jme3/util/PlaceholderAssets.java  |  17 ++++++++++++++---
 .../Common/Textures/MissingMaterial.png        | Bin 0 -> 3714 bytes
 .../resources/Common/Textures/MissingModel.png | Bin 0 -> 3272 bytes
 .../Common/Textures/MissingTexture.png         | Bin 0 -> 3321 bytes
 .../com/jme3/material/plugins/J3MLoader.java   |   2 +-
 .../java/com/jme3/scene/plugins/MTLLoader.java |   2 +-
 7 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 jme3-core/src/main/resources/Common/Textures/MissingMaterial.png
 create mode 100644 jme3-core/src/main/resources/Common/Textures/MissingModel.png
 create mode 100644 jme3-core/src/main/resources/Common/Textures/MissingTexture.png

diff --git a/jme3-core/src/main/java/com/jme3/texture/Texture.java b/jme3-core/src/main/java/com/jme3/texture/Texture.java
index 45cda623f..b41d2ac10 100644
--- a/jme3-core/src/main/java/com/jme3/texture/Texture.java
+++ b/jme3-core/src/main/java/com/jme3/texture/Texture.java
@@ -620,7 +620,7 @@ public abstract class Texture implements CloneableSmartAsset, Savable, Cloneable
                 image = loadedTex.getImage();
             } catch (AssetNotFoundException ex){
                 Logger.getLogger(Texture.class.getName()).log(Level.SEVERE, "Cannot locate texture {0}", key);
-                image = PlaceholderAssets.getPlaceholderImage();
+                image = PlaceholderAssets.getPlaceholderImage(e.getAssetManager());
             }
         }else{
             // no key is set on the texture. Attempt to load an embedded image
diff --git a/jme3-core/src/main/java/com/jme3/util/PlaceholderAssets.java b/jme3-core/src/main/java/com/jme3/util/PlaceholderAssets.java
index c485b00ba..4fa0ca157 100644
--- a/jme3-core/src/main/java/com/jme3/util/PlaceholderAssets.java
+++ b/jme3-core/src/main/java/com/jme3/util/PlaceholderAssets.java
@@ -35,12 +35,12 @@ import com.jme3.asset.AssetManager;
 import com.jme3.audio.AudioBuffer;
 import com.jme3.audio.AudioData;
 import com.jme3.material.Material;
-import com.jme3.math.ColorRGBA;
 import com.jme3.scene.Geometry;
 import com.jme3.scene.Spatial;
 import com.jme3.scene.shape.Box;
 import com.jme3.texture.Image;
 import com.jme3.texture.Image.Format;
+import com.jme3.texture.Texture;
 import com.jme3.texture.image.ColorSpace;
 import java.nio.ByteBuffer;
 
@@ -71,15 +71,22 @@ public class PlaceholderAssets {
         (byte)0xFF, (byte)0xFF, (byte)0xFF,
     };
     
+    @Deprecated
     public static Image getPlaceholderImage(){
         ByteBuffer tempData = BufferUtils.createByteBuffer(3 * 4 * 4);
         tempData.put(imageData).flip();
         return new Image(Format.RGB8, 4, 4, tempData, null, ColorSpace.Linear);
     }
     
+    public static Image getPlaceholderImage(AssetManager assetManager){
+        return assetManager.loadTexture("Common/Textures/MissingTexture.png").getImage();
+    }
+    
     public static Material getPlaceholderMaterial(AssetManager assetManager){
         Material mat = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
-        mat.setColor("Color", ColorRGBA.Red);
+        Texture tex = assetManager.loadTexture("Common/Textures/MissingMaterial.png");
+        tex.setWrap(Texture.WrapMode.Repeat);
+        mat.setTexture("ColorMap", tex);
         return mat;
     }
     
@@ -88,7 +95,11 @@ public class PlaceholderAssets {
         // the user's expected scale...
         Box box = new Box(1, 1, 1);
         Geometry geom = new Geometry("placeholder", box);
-        geom.setMaterial(getPlaceholderMaterial(assetManager));
+        Material mat = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
+        Texture tex = assetManager.loadTexture("Common/Textures/MissingModel.png");
+        tex.setWrap(Texture.WrapMode.Repeat);
+        mat.setTexture("ColorMap", tex);
+        geom.setMaterial(mat);
         return geom;
     }
     
diff --git a/jme3-core/src/main/resources/Common/Textures/MissingMaterial.png b/jme3-core/src/main/resources/Common/Textures/MissingMaterial.png
new file mode 100644
index 0000000000000000000000000000000000000000..799b70c18f5cb6c015ec9ef7dec9cc345ee6a175
GIT binary patch
literal 3714
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
RgMZx;a<X%?ZD6v~{|l!aS)2d>

literal 0
HcmV?d00001

diff --git a/jme3-core/src/main/resources/Common/Textures/MissingModel.png b/jme3-core/src/main/resources/Common/Textures/MissingModel.png
new file mode 100644
index 0000000000000000000000000000000000000000..d59a78ce7edc96893041c86816dd3e8371840fa9
GIT binary patch
literal 3272
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
NU~A<>Vp;lS{|^s<zr_Fm

literal 0
HcmV?d00001

diff --git a/jme3-core/src/main/resources/Common/Textures/MissingTexture.png b/jme3-core/src/main/resources/Common/Textures/MissingTexture.png
new file mode 100644
index 0000000000000000000000000000000000000000..3b46d2894366aa9f26e9e96844ecd65a4d9b4250
GIT binary patch
literal 3321
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

literal 0
HcmV?d00001

diff --git a/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java b/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
index dc8592abe..23310f12f 100644
--- a/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
+++ b/jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
@@ -165,7 +165,7 @@ public class J3MLoader implements AssetLoader {
                     tex.setWrap(WrapMode.Repeat);
                 }                
             }else{
-                tex = new Texture2D(PlaceholderAssets.getPlaceholderImage());
+                tex = new Texture2D(PlaceholderAssets.getPlaceholderImage(assetManager));
                 if (repeat){
                     tex.setWrap(WrapMode.Repeat);
                 }
diff --git a/jme3-core/src/plugins/java/com/jme3/scene/plugins/MTLLoader.java b/jme3-core/src/plugins/java/com/jme3/scene/plugins/MTLLoader.java
index 8ee833346..f09eae150 100644
--- a/jme3-core/src/plugins/java/com/jme3/scene/plugins/MTLLoader.java
+++ b/jme3-core/src/plugins/java/com/jme3/scene/plugins/MTLLoader.java
@@ -182,7 +182,7 @@ public class MTLLoader implements AssetLoader {
             texture.setWrap(WrapMode.Repeat);
         } catch (AssetNotFoundException ex){
             logger.log(Level.WARNING, "Cannot locate {0} for material {1}", new Object[]{texKey, key});
-            texture = new Texture2D(PlaceholderAssets.getPlaceholderImage());
+            texture = new Texture2D(PlaceholderAssets.getPlaceholderImage(assetManager));
             texture.setWrap(WrapMode.Repeat);
             texture.setKey(key);
         }