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

OgreXML: Use the placeholder texture for missing textures

Browse Source
This commit is contained in:
shadowislord 2015-02-21 15:34:17 -05:00
parent dd66d21147
commit 85bba59541
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MaterialLoader.java
View File

@ -140,7 +140,7 @@ public class MaterialLoader implements AssetLoader {
textures[texUnit].setImage(loadedTexture.getImage());
textures[texUnit].setMinFilter(loadedTexture.getMinFilter());
textures[texUnit].setKey(loadedTexture.getKey());
// XXX: Is this really neccessary?
textures[texUnit].setWrap(WrapMode.Repeat);
if (texName != null){
@ -151,7 +151,7 @@ public class MaterialLoader implements AssetLoader {
}
} catch (AssetNotFoundException ex){
logger.log(Level.WARNING, "Cannot locate {0} for material {1}", new Object[]{texKey, matName});
textures[texUnit].setImage(PlaceholderAssets.getPlaceholderImage());
textures[texUnit].setImage(PlaceholderAssets.getPlaceholderImage(assetManager));
textures[texUnit].setKey(texKey);
}
}

2
jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/matext/MaterialExtensionLoader.java
View File

@ -81,7 +81,7 @@ public class MaterialExtensionLoader {
tex.setWrap(WrapMode.Repeat);
} catch (AssetNotFoundException ex){
logger.log(Level.WARNING, "Cannot locate {0} for material {1}", new Object[]{texKey, key});
tex = new Texture2D( PlaceholderAssets.getPlaceholderImage() );
tex = new Texture2D( PlaceholderAssets.getPlaceholderImage(assetManager) );
tex.setWrap(WrapMode.Repeat);
tex.setKey(texKey);
}