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

* Fixed AssertionError in SceneLoader when loading multiple scenes

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7989 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
sha..rd 2011-08-07 19:15:29 +00:00
parent 984721cc75
commit c5aba505fc
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,6 @@ import com.jme3.math.Quaternion;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;
import com.jme3.scene.Node; import com.jme3.scene.Node;
import com.jme3.scene.Spatial; import com.jme3.scene.Spatial;
import com.jme3.system.JmeSystem;
import com.jme3.util.xml.SAXUtil; import com.jme3.util.xml.SAXUtil;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
@ -62,7 +61,6 @@ import org.xml.sax.SAXException;
import org.xml.sax.XMLReader; import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.DefaultHandler;
import org.xml.sax.helpers.XMLReaderFactory;
import static com.jme3.util.xml.SAXUtil.*; import static com.jme3.util.xml.SAXUtil.*;
public class SceneLoader extends DefaultHandler implements AssetLoader { public class SceneLoader extends DefaultHandler implements AssetLoader {
@ -93,6 +91,19 @@ public class SceneLoader extends DefaultHandler implements AssetLoader {
public void endDocument() { public void endDocument() {
} }
private void reset(){
elementStack.clear();
nodeIdx = 0;
// NOTE: Setting some of those to null is only needed
// if the parsed file had an error e.g. startElement was called
// but not endElement
root = null;
node = null;
entityNode = null;
light = null;
}
private Quaternion parseQuat(Attributes attribs) throws SAXException{ private Quaternion parseQuat(Attributes attribs) throws SAXException{
if (attribs.getValue("x") != null){ if (attribs.getValue("x") != null){
// defined as quaternion // defined as quaternion
@ -353,8 +364,10 @@ public class SceneLoader extends DefaultHandler implements AssetLoader {
assetManager.loadAsset(new OgreMaterialKey(sceneName+".material")); assetManager.loadAsset(new OgreMaterialKey(sceneName+".material"));
} catch (AssetNotFoundException ex){ } catch (AssetNotFoundException ex){
logger.log(Level.WARNING, "Cannot locate material file {0}", ex.getMessage()); logger.log(Level.WARNING, "Cannot locate material file {0}", ex.getMessage());
materialList = null;
} }
reset();
// Added by larynx 25.06.2011 // Added by larynx 25.06.2011
// Android needs the namespace aware flag set to true // Android needs the namespace aware flag set to true