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

- make "Add Asset" action of AssetPack browser more robust

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8383 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2011-10-10 23:03:04 +00:00
parent 7e9f4b51b6
commit 82de99ca94
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdk/jme3-assetpack-support/src/com/jme3/gde/assetpack/actions/AddAssetAction.java
View File

@ -8,6 +8,7 @@ import com.jme3.gde.assetpack.AssetConfiguration;
import com.jme3.gde.assetpack.AssetPackLoader; import com.jme3.gde.assetpack.AssetPackLoader;
import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.assets.ProjectAssetManager;
import com.jme3.gde.core.scene.SceneApplication; import com.jme3.gde.core.scene.SceneApplication;
import com.jme3.gde.core.scene.SceneRequest;
import com.jme3.scene.Spatial; import com.jme3.scene.Spatial;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.beans.PropertyChangeListener; import java.beans.PropertyChangeListener;
@ -30,7 +31,11 @@ public final class AddAssetAction implements Action {
public void actionPerformed(ActionEvent ev) { public void actionPerformed(ActionEvent ev) {
ProjectAssetManager pm = context.getLookup().lookup(ProjectAssetManager.class); ProjectAssetManager pm = context.getLookup().lookup(ProjectAssetManager.class);
ProjectAssetManager scenePm = SceneApplication.getApplication().getCurrentSceneRequest().getManager(); SceneRequest req = SceneApplication.getApplication().getCurrentSceneRequest();
ProjectAssetManager scenePm = null;
if (req != null) {
scenePm = req.getManager();
}
if (pm == null) { if (pm == null) {
Logger.getLogger(this.getClass().getName()).log(Level.SEVERE, "AssetManager not found!"); Logger.getLogger(this.getClass().getName()).log(Level.SEVERE, "AssetManager not found!");
return; return;
@ -46,7 +51,7 @@ public final class AddAssetAction implements Action {
Spatial model = AssetPackLoader.loadAssetPackModel(pm, conf); Spatial model = AssetPackLoader.loadAssetPackModel(pm, conf);
if (model != null) { if (model != null) {
SceneComposerTopComponent.findInstance().addModel(model); SceneComposerTopComponent.findInstance().addModel(model);
AssetPackLoader.addModelFiles(pm, scenePm,conf); AssetPackLoader.addModelFiles(pm, scenePm, conf);
} else { } else {
Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "Error loading model"); Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "Error loading model");
} }