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

AssetManager: adjust usage according to latest changes

Browse Source
This commit is contained in:
shadowislord 2015-03-01 15:14:30 -05:00
parent 40926dc32d
commit a374e73376
7 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jme3-examples/src/main/java/jme3test/asset/TestAbsoluteLocators.java
View File

@ -33,16 +33,16 @@
package jme3test.asset; package jme3test.asset;
import com.jme3.asset.AssetManager; import com.jme3.asset.AssetManager;
import com.jme3.asset.DesktopAssetManager;
import com.jme3.asset.plugins.ClasspathLocator; import com.jme3.asset.plugins.ClasspathLocator;
import com.jme3.audio.AudioData; import com.jme3.audio.AudioData;
import com.jme3.audio.plugins.WAVLoader; import com.jme3.audio.plugins.WAVLoader;
import com.jme3.system.JmeSystem;
import com.jme3.texture.Texture; import com.jme3.texture.Texture;
import com.jme3.texture.plugins.AWTLoader; import com.jme3.texture.plugins.AWTLoader;
public class TestAbsoluteLocators { public class TestAbsoluteLocators {
public static void main(String[] args){ public static void main(String[] args){
AssetManager am = new DesktopAssetManager(); AssetManager am = JmeSystem.newAssetManager();
am.registerLoader(AWTLoader.class, "jpg"); am.registerLoader(AWTLoader.class, "jpg");
am.registerLoader(WAVLoader.class, "wav"); am.registerLoader(WAVLoader.class, "wav");

3
jme3-examples/src/main/java/jme3test/asset/TestManyLocators.java
View File

@ -37,10 +37,11 @@ import com.jme3.asset.plugins.ClasspathLocator;
import com.jme3.asset.plugins.HttpZipLocator; import com.jme3.asset.plugins.HttpZipLocator;
import com.jme3.asset.plugins.UrlLocator; import com.jme3.asset.plugins.UrlLocator;
import com.jme3.asset.plugins.ZipLocator; import com.jme3.asset.plugins.ZipLocator;
import com.jme3.system.JmeSystem;
public class TestManyLocators { public class TestManyLocators {
public static void main(String[] args){ public static void main(String[] args){
AssetManager am = new DesktopAssetManager(); AssetManager am = JmeSystem.newAssetManager();
am.registerLocator("http://www.jmonkeyengine.com/wp-content/uploads/2010/09/", am.registerLocator("http://www.jmonkeyengine.com/wp-content/uploads/2010/09/",
UrlLocator.class); UrlLocator.class);

1
sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPreviewRenderer.java
View File

@ -4,7 +4,6 @@
*/ */
package com.jme3.gde.materials; package com.jme3.gde.materials;
import com.jme3.asset.DesktopAssetManager;
import com.jme3.asset.MaterialKey; import com.jme3.asset.MaterialKey;
import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.assets.ProjectAssetManager;
import com.jme3.gde.core.scene.PreviewRequest; import com.jme3.gde.core.scene.PreviewRequest;

3
sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialPropertyEditor.java
View File

@ -31,7 +31,6 @@
*/ */
package com.jme3.gde.materials; package com.jme3.gde.materials;
import com.jme3.asset.DesktopAssetManager;
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.gde.core.scene.SceneRequest;
@ -148,7 +147,7 @@ public class MaterialPropertyEditor implements PropertyEditor, SceneExplorerProp
SceneApplication.getApplication().enqueue(new Callable<Void>() { SceneApplication.getApplication().enqueue(new Callable<Void>() {
public Void call() throws Exception { public Void call() throws Exception {
SceneRequest request = SceneApplication.getApplication().getCurrentSceneRequest(); SceneRequest request = SceneApplication.getApplication().getCurrentSceneRequest();
((DesktopAssetManager) request.getManager()).deleteFromCache(new MaterialKey(text)); request.getManager().deleteFromCache(new MaterialKey(text));
Material localMaterial = request.getManager().loadMaterial(text); Material localMaterial = request.getManager().loadMaterial(text);
if (localMaterial != null) { if (localMaterial != null) {
material = localMaterial; material = localMaterial;

3
sdk/jme3-navmesh-gen/src/com/jme3/gde/nmgen/NavMeshAction.java
View File

@ -4,7 +4,6 @@
*/ */
package com.jme3.gde.nmgen; package com.jme3.gde.nmgen;
import com.jme3.asset.DesktopAssetManager;
import com.jme3.gde.core.assets.BinaryModelDataObject; import com.jme3.gde.core.assets.BinaryModelDataObject;
import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.assets.ProjectAssetManager;
import com.jme3.scene.Spatial; import com.jme3.scene.Spatial;
@ -46,7 +45,7 @@ public class NavMeshAction implements ActionListener {
java.awt.EventQueue.invokeLater(new Runnable() { java.awt.EventQueue.invokeLater(new Runnable() {
public void run() { public void run() {
((DesktopAssetManager)manager.getManager()).clearCache(); manager.getManager().clearCache();
NavMeshTopComponent composer = NavMeshTopComponent.findInstance(); NavMeshTopComponent composer = NavMeshTopComponent.findInstance();
composer.openScene(asset, context, manager); composer.openScene(asset, context, manager);
} }

2
sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneEditorController.java
View File

@ -620,7 +620,7 @@ public class SceneEditorController implements PropertyChangeListener, NodeListen
AssetLinkNode linkNode = (AssetLinkNode) selected; AssetLinkNode linkNode = (AssetLinkNode) selected;
linkNode.attachLinkedChild(manager, new ModelKey(assetName)); linkNode.attachLinkedChild(manager, new ModelKey(assetName));
} else { } else {
((DesktopAssetManager) manager).clearCache(); manager.clearCache();
ModelKey key = new ModelKey(assetName); ModelKey key = new ModelKey(assetName);
AssetLinkNode linkNode = new AssetLinkNode(key); AssetLinkNode linkNode = new AssetLinkNode(key);
linkNode.attachLinkedChildren(manager); linkNode.attachLinkedChildren(manager);

2
sdk/jme3-terrain-editor/src/com/jme3/gde/terraineditor/EditTerrainAction.java
View File

@ -69,7 +69,7 @@ public final class EditTerrainAction implements ActionListener {
java.awt.EventQueue.invokeLater(new Runnable() { java.awt.EventQueue.invokeLater(new Runnable() {
public void run() { public void run() {
((DesktopAssetManager)manager.getManager()).clearCache(); manager.getManager().clearCache();
TerrainEditorTopComponent composer = TerrainEditorTopComponent.findInstance(); TerrainEditorTopComponent composer = TerrainEditorTopComponent.findInstance();
composer.openScene(asset, context, manager); composer.openScene(asset, context, manager);
} }