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

- make OgreMeshKey-based import not fail on missing material

Browse Source 
- add actual OgreMeshKey.setMaterialName() setter

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8114 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-08-26 16:59:51 +00:00
parent c6d72764cd
commit 59f9f09e5f
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine/src/ogre/com/jme3/scene/plugins/ogre/MeshLoader.java
View File

@ -784,9 +784,17 @@ public class MeshLoader extends DefaultHandler implements AssetLoader {
String materialName = meshKey.getMaterialName();
if (materialList == null) {
if (materialName != null) {
materialList = (MaterialList) assetManager.loadAsset(new OgreMaterialKey(folderName + materialName + ".material"));
try {
materialList = (MaterialList) assetManager.loadAsset(new OgreMaterialKey(folderName + materialName + ".material"));
} catch (AssetNotFoundException e) {
logger.log(Level.WARNING, "Cannot locate {0}{1}.material for model {2}{3}.{4}", new Object[]{folderName, materialName, folderName, meshName, ext});
}
} else {
materialList = (MaterialList) assetManager.loadAsset(new OgreMaterialKey(folderName + meshName + ".material"));
try {
materialList = (MaterialList) assetManager.loadAsset(new OgreMaterialKey(folderName + meshName + ".material"));
} catch (AssetNotFoundException e) {
logger.log(Level.WARNING, "Cannot locate {0}{1}.material for model {2}{3}.{4}", new Object[]{folderName, meshName, folderName, meshName, ext});
}
}
}
} else {

4
engine/src/ogre/com/jme3/scene/plugins/ogre/OgreMeshKey.java
View File

@ -65,5 +65,9 @@ public class OgreMeshKey extends ModelKey {
public String getMaterialName() {
return materialName;
}
public void setMaterialName(String name) {
materialName = name;
}
}