Browse Source

SDK:
- use new Nifty ResourceLocators

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@8929 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

nor..67 13 years ago
parent
commit
86eb9e4346

+ 2 - 3
jme3-gui/src/com/jme3/gde/gui/multiview/NiftyJmeDisplay.java

@@ -49,7 +49,6 @@ import com.jme3.texture.FrameBuffer;
 import de.lessvoid.nifty.Nifty;
 import de.lessvoid.nifty.Nifty;
 import de.lessvoid.nifty.spi.input.InputSystem;
 import de.lessvoid.nifty.spi.input.InputSystem;
 import de.lessvoid.nifty.tools.TimeProvider;
 import de.lessvoid.nifty.tools.TimeProvider;
-import de.lessvoid.nifty.tools.resourceloader.ResourceLoader;
 import de.lessvoid.nifty.tools.resourceloader.ResourceLocation;
 import de.lessvoid.nifty.tools.resourceloader.ResourceLocation;
 import java.io.InputStream;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URL;
@@ -92,7 +91,7 @@ public class NiftyJmeDisplay extends com.jme3.niftygui.NiftyJmeDisplay implement
 
 
     @Override
     @Override
     public void initialize(RenderManager rm, ViewPort vp) {
     public void initialize(RenderManager rm, ViewPort vp) {
-        ResourceLoader.addResourceLocation(resourceLocation);
+        nifty.getResourceLoader().addResourceLocation(resourceLocation);
         this.renderManager = rm;
         this.renderManager = rm;
         renderDev.setRenderManager(rm);
         renderDev.setRenderManager(rm);
         inited = true;
         inited = true;
@@ -160,7 +159,7 @@ public class NiftyJmeDisplay extends com.jme3.niftygui.NiftyJmeDisplay implement
 
 
     @Override
     @Override
     public void cleanup() {
     public void cleanup() {
-        ResourceLoader.removeResourceLocation(resourceLocation);
+        nifty.getResourceLoader().removeResourceLocation(resourceLocation);
         inited = false;
         inited = false;
 //        nifty.exit();
 //        nifty.exit();
     }
     }

+ 5 - 0
jme3-gui/src/com/jme3/gde/gui/multiview/NiftyPreviewInputHandler.java

@@ -6,6 +6,7 @@ package com.jme3.gde.gui.multiview;
 
 
 import de.lessvoid.nifty.NiftyInputConsumer;
 import de.lessvoid.nifty.NiftyInputConsumer;
 import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent;
 import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent;
+import de.lessvoid.nifty.tools.resourceloader.NiftyResourceLoader;
 import java.util.Iterator;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.List;
@@ -45,4 +46,8 @@ public class NiftyPreviewInputHandler implements de.lessvoid.nifty.spi.input.Inp
     public void setMousePosition(int i, int i1) {
     public void setMousePosition(int i, int i1) {
 //        throw new UnsupportedOperationException("Not supported yet.");
 //        throw new UnsupportedOperationException("Not supported yet.");
     }
     }
+
+    public void setResourceLoader(NiftyResourceLoader nrl) {
+    }
+    
 }
 }