Browse Source

- fix preview of material in material editor

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7934 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
nor..67 14 years ago
parent
commit
7ad872fc1f

+ 2 - 5
jme3-materialeditor/src/com/jme3/gde/materials/multiview/MaterialEditorTopComponent.java

@@ -4,8 +4,7 @@
  */
  */
 package com.jme3.gde.materials.multiview;
 package com.jme3.gde.materials.multiview;
 
 
-import com.jme3.asset.AssetKey;
-import com.jme3.asset.DesktopAssetManager;
+import com.jme3.asset.MaterialKey;
 import com.jme3.gde.core.assets.AssetDataObject;
 import com.jme3.gde.core.assets.AssetDataObject;
 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;
@@ -24,7 +23,6 @@ import com.jme3.util.TangentBinormalGenerator;
 import java.awt.Component;
 import java.awt.Component;
 import java.io.File;
 import java.io.File;
 import java.io.IOException;
 import java.io.IOException;
-import java.io.OutputStreamWriter;
 import java.util.Iterator;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.List;
@@ -41,7 +39,6 @@ import org.openide.windows.WindowManager;
 //import org.openide.util.ImageUtilities;
 //import org.openide.util.ImageUtilities;
 import org.netbeans.api.settings.ConvertAsProperties;
 import org.netbeans.api.settings.ConvertAsProperties;
 import org.openide.cookies.SaveCookie;
 import org.openide.cookies.SaveCookie;
-import org.openide.filesystems.FileObject;
 import org.openide.filesystems.FileUtil;
 import org.openide.filesystems.FileUtil;
 import org.openide.loaders.DataObject;
 import org.openide.loaders.DataObject;
 import org.openide.nodes.Node;
 import org.openide.nodes.Node;
@@ -623,7 +620,7 @@ public final class MaterialEditorTopComponent extends CloneableTopComponent impl
     @SuppressWarnings("unchecked")
     @SuppressWarnings("unchecked")
     private void showMaterial() {
     private void showMaterial() {
         try {
         try {
-            AssetKey key = new AssetKey(manager.getRelativeAssetPath(materialFileName));
+            MaterialKey key = new MaterialKey(manager.getRelativeAssetPath(materialFileName));
             Geometry geom = new Geometry("TestSphere", sphMesh);
             Geometry geom = new Geometry("TestSphere", sphMesh);
             manager.deleteFromCache(key);
             manager.deleteFromCache(key);
             geom.setMaterial((Material) manager.loadAsset(key));
             geom.setMaterial((Material) manager.loadAsset(key));