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

* SceneLoader will no longer crash on missing material

Browse Source 
* Compressed ManyLights texture 

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7206 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..rd 2011-04-06 20:33:21 +00:00
parent 36c51e12c6
commit 2effd8cc25
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
engine/src/ogre/com/jme3/scene/plugins/ogre/SceneLoader.java
View File

@ -37,6 +37,7 @@ import com.jme3.asset.AssetInfo;
import com.jme3.asset.AssetKey;
import com.jme3.asset.AssetLoader;
import com.jme3.asset.AssetManager;
import com.jme3.asset.AssetNotFoundException;
import com.jme3.light.DirectionalLight;
import com.jme3.light.Light;
import com.jme3.light.PointLight;
@ -206,9 +207,13 @@ public class SceneLoader extends DefaultHandler implements AssetLoader {
assert elementStack.peek().equals("externals");
}else if (qName.equals("file")){
assert elementStack.peek().equals("item");
materialList = (MaterialList)
assetManager.loadAsset(folderName+attribs.getValue("name"));
String matFile = folderName+attribs.getValue("name");
try {
materialList = (MaterialList) assetManager.loadAsset(matFile);
} catch (AssetNotFoundException ex){
materialList = null;
logger.log(Level.WARNING, "Cannot locate material file: {0}", matFile);
}
}else if (qName.equals("node")){
String curElement = elementStack.peek();
assert curElement.equals("nodes") || curElement.equals("node");

BIN
engine/src/test-data/Scenes/ManyLights/AO.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 462 KiB

After

Width:  |  Height:  |  Size: 105 KiB

2
engine/src/test-data/Scenes/ManyLights/Main.material
View File

@ -11,7 +11,7 @@ material Material
emissive 0.000000 0.000000 0.000000 1.000000
texture_unit
{
texture AO.tga
texture AO.jpg
tex_address_mode wrap
filtering trilinear
}