diff --git a/engine/lib/niftygui/nifty-default-controls-javadoc.jar b/engine/lib/niftygui/nifty-default-controls-javadoc.jar index 4c46a5cb9..99a75ec9e 100644 Binary files a/engine/lib/niftygui/nifty-default-controls-javadoc.jar and b/engine/lib/niftygui/nifty-default-controls-javadoc.jar differ diff --git a/engine/lib/niftygui/nifty-default-controls.jar b/engine/lib/niftygui/nifty-default-controls.jar index c7c957ac1..7ca0c23d9 100644 Binary files a/engine/lib/niftygui/nifty-default-controls.jar and b/engine/lib/niftygui/nifty-default-controls.jar differ diff --git a/engine/lib/niftygui/nifty-examples-javadoc.jar b/engine/lib/niftygui/nifty-examples-javadoc.jar index 9ef65f7d7..65e5c2478 100644 Binary files a/engine/lib/niftygui/nifty-examples-javadoc.jar and b/engine/lib/niftygui/nifty-examples-javadoc.jar differ diff --git a/engine/lib/niftygui/nifty-examples.jar b/engine/lib/niftygui/nifty-examples.jar index 039450769..b75130fde 100644 Binary files a/engine/lib/niftygui/nifty-examples.jar and b/engine/lib/niftygui/nifty-examples.jar differ diff --git a/engine/lib/niftygui/nifty-javadoc.jar b/engine/lib/niftygui/nifty-javadoc.jar index 657de30da..c2cd07636 100644 Binary files a/engine/lib/niftygui/nifty-javadoc.jar and b/engine/lib/niftygui/nifty-javadoc.jar differ diff --git a/engine/lib/niftygui/nifty-style-black.jar b/engine/lib/niftygui/nifty-style-black.jar index 838642dd4..d47091b1f 100644 Binary files a/engine/lib/niftygui/nifty-style-black.jar and b/engine/lib/niftygui/nifty-style-black.jar differ diff --git a/engine/lib/niftygui/nifty.jar b/engine/lib/niftygui/nifty.jar index b8b09034f..ef3e5dad2 100644 Binary files a/engine/lib/niftygui/nifty.jar and b/engine/lib/niftygui/nifty.jar differ diff --git a/engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java b/engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java index f8a8c8656..937ce64e0 100644 --- a/engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java +++ b/engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java @@ -38,6 +38,7 @@ import com.jme3.input.RawInputListener; import com.jme3.input.event.*; import de.lessvoid.nifty.Nifty; import de.lessvoid.nifty.NiftyInputConsumer; +import de.lessvoid.nifty.tools.resourceloader.NiftyResourceLoader; import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent; import de.lessvoid.nifty.spi.input.InputSystem; import java.util.ArrayList; @@ -63,6 +64,9 @@ public class InputSystemJme implements InputSystem, RawInputListener { this.inputManager = inputManager; } + public void setResourceLoader(NiftyResourceLoader niftyResourceLoader) { + } + public void setNifty(Nifty nifty) { this.nifty = nifty; } diff --git a/engine/src/niftygui/com/jme3/niftygui/NiftyJmeDisplay.java b/engine/src/niftygui/com/jme3/niftygui/NiftyJmeDisplay.java index 72c529596..97ddf9d20 100644 --- a/engine/src/niftygui/com/jme3/niftygui/NiftyJmeDisplay.java +++ b/engine/src/niftygui/com/jme3/niftygui/NiftyJmeDisplay.java @@ -46,7 +46,6 @@ import com.jme3.renderer.queue.RenderQueue; import com.jme3.texture.FrameBuffer; import de.lessvoid.nifty.Nifty; import de.lessvoid.nifty.tools.TimeProvider; -import de.lessvoid.nifty.tools.resourceloader.ResourceLoader; import de.lessvoid.nifty.tools.resourceloader.ResourceLocation; import java.io.InputStream; import java.net.URL; @@ -97,10 +96,6 @@ public class NiftyJmeDisplay implements SceneProcessor { w = vp.getCamera().getWidth(); h = vp.getCamera().getHeight(); - resourceLocation = new ResourceLocationJme(); - ResourceLoader.removeAllResourceLocations(); - ResourceLoader.addResourceLocation(resourceLocation); - soundDev = new SoundDeviceJme(assetManager, audioRenderer); renderDev = new RenderDeviceJme(this); inputSys = new InputSystemJme(inputManager); @@ -109,6 +104,10 @@ public class NiftyJmeDisplay implements SceneProcessor { nifty = new Nifty(renderDev, soundDev, inputSys, new TimeProvider()); inputSys.setNifty(nifty); + + resourceLocation = new ResourceLocationJme(); + nifty.getResourceLoader().removeAllResourceLocations(); + nifty.getResourceLoader().addResourceLocation(resourceLocation); } public void initialize(RenderManager rm, ViewPort vp) { diff --git a/engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java b/engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java index 0f0aa7162..8977ed64c 100644 --- a/engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java +++ b/engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java @@ -54,6 +54,7 @@ import de.lessvoid.nifty.spi.render.RenderDevice; import de.lessvoid.nifty.spi.render.RenderFont; import de.lessvoid.nifty.spi.render.RenderImage; import de.lessvoid.nifty.tools.Color; +import de.lessvoid.nifty.tools.resourceloader.NiftyResourceLoader; import java.nio.ByteBuffer; import java.nio.FloatBuffer; import java.util.HashMap; @@ -96,6 +97,9 @@ public class RenderDeviceJme implements RenderDevice { niftyMat.getAdditionalRenderState().setDepthTest(false); } + public void setResourceLoader(NiftyResourceLoader niftyResourceLoader) { + } + public void setRenderManager(RenderManager rm){ this.rm = rm; this.r = rm.getRenderer(); diff --git a/engine/src/niftygui/com/jme3/niftygui/RenderFontJme.java b/engine/src/niftygui/com/jme3/niftygui/RenderFontJme.java index 0bf421eaa..0945f2cc7 100644 --- a/engine/src/niftygui/com/jme3/niftygui/RenderFontJme.java +++ b/engine/src/niftygui/com/jme3/niftygui/RenderFontJme.java @@ -97,6 +97,14 @@ public class RenderFontJme implements RenderFont { return result; } + public int getWidth(final String str, final float size) { + // Note: This is supposed to return the width of the String when scaled + // with the size factor. Since I don't know how to do that with + // the font rendering in jme this will only work correctly with + // a size value of 1.f and will return inaccurate values otherwise. + return getWidth(str); + } + /** * Return the width of the given character including kerning information. * @param currentCharacter current character diff --git a/engine/src/niftygui/com/jme3/niftygui/SoundDeviceJme.java b/engine/src/niftygui/com/jme3/niftygui/SoundDeviceJme.java index 8471eb41a..a936e033a 100644 --- a/engine/src/niftygui/com/jme3/niftygui/SoundDeviceJme.java +++ b/engine/src/niftygui/com/jme3/niftygui/SoundDeviceJme.java @@ -38,6 +38,7 @@ import com.jme3.audio.AudioRenderer; import de.lessvoid.nifty.sound.SoundSystem; import de.lessvoid.nifty.spi.sound.SoundDevice; import de.lessvoid.nifty.spi.sound.SoundHandle; +import de.lessvoid.nifty.tools.resourceloader.NiftyResourceLoader; public class SoundDeviceJme implements SoundDevice { @@ -49,6 +50,9 @@ public class SoundDeviceJme implements SoundDevice { this.ar = ar; } + public void setResourceLoader(NiftyResourceLoader niftyResourceLoader) { + } + public SoundHandle loadSound(SoundSystem soundSystem, String filename) { AudioNode an = new AudioNode(assetManager, filename, false); an.setPositional(false);