コミット: 42f9b6aee5d7ccc57402ed35b746ca145ca9105d - MikuMikuStudio (git)

Main repository of MikuMikuStudio

コミットメタ情報

• リビジョン: 42f9b6aee5d7ccc57402ed35b746ca145ca9105d (tree)
• 日時: 2013-12-28 14:10:51
• 作者: kobayasi <kobayasi@pscn...>
• コミッター: kobayasi

ログメッセージ

Update niftygui 1.3.3

変更サマリ

• modified: engine/lib/niftygui/VERSION.txt
• add: engine/lib/niftygui/jglfont-core-javadoc.jar
• add: engine/lib/niftygui/jglfont-core.jar
• modified: engine/lib/niftygui/nifty-default-controls-javadoc.jar
• modified: engine/lib/niftygui/nifty-default-controls.jar
• modified: engine/lib/niftygui/nifty-examples-javadoc.jar
• modified: engine/lib/niftygui/nifty-examples.jar
• modified: engine/lib/niftygui/nifty-javadoc.jar
• modified: engine/lib/niftygui/nifty-style-black.jar
• modified: engine/lib/niftygui/nifty.jar
• modified: engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java
• modified: engine/src/niftygui/com/jme3/niftygui/NiftyJmeDisplay.java
• modified: engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java
• modified: engine/src/niftygui/com/jme3/niftygui/RenderFontJme.java
• modified: engine/src/niftygui/com/jme3/niftygui/SoundDeviceJme.java

差分

--- a/engine/lib/niftygui/VERSION.txt
+++ b/engine/lib/niftygui/VERSION.txt
@@ -1,8 +1,9 @@
-Last Updated 6/30/2011
+Last Updated 22/6/2013
 
 Component		Version
 ---------------------------------------------------------------------
-nifty			nifty-1.3
-nifty-default-controls	nifty-default-controls-1.3
-nifty-style-black	nifty-style-black-1.3
-nifty-examples		nifty-examples-1.3
\ No newline at end of file
+nifty			1.3.3 (2013-06-20 23:54:54)
+nifty-default-controls	1.3.3 (2013-06-20 23:54:54)
+nifty-style-black	1.3.3 (2013-06-20 23:54:54)
+nifty-examples		1.3.3 (2013-06-20 23:54:54)
+jglfont-core            1.3

Binary files /dev/null and b/engine/lib/niftygui/jglfont-core-javadoc.jar differ

Binary files /dev/null and b/engine/lib/niftygui/jglfont-core.jar differ

Binary files a/engine/lib/niftygui/nifty-default-controls-javadoc.jar and b/engine/lib/niftygui/nifty-default-controls-javadoc.jar differ

Binary files a/engine/lib/niftygui/nifty-default-controls.jar and b/engine/lib/niftygui/nifty-default-controls.jar differ

Binary files a/engine/lib/niftygui/nifty-examples-javadoc.jar and b/engine/lib/niftygui/nifty-examples-javadoc.jar differ

Binary files a/engine/lib/niftygui/nifty-examples.jar and b/engine/lib/niftygui/nifty-examples.jar differ

Binary files a/engine/lib/niftygui/nifty-javadoc.jar and b/engine/lib/niftygui/nifty-javadoc.jar differ

Binary files a/engine/lib/niftygui/nifty-style-black.jar and b/engine/lib/niftygui/nifty-style-black.jar differ

Binary files a/engine/lib/niftygui/nifty.jar and b/engine/lib/niftygui/nifty.jar differ

--- a/engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java
+++ b/engine/src/niftygui/com/jme3/niftygui/InputSystemJme.java
@@ -47,6 +47,7 @@ import de.lessvoid.nifty.Nifty;
 import de.lessvoid.nifty.NiftyInputConsumer;
 import de.lessvoid.nifty.input.keyboard.KeyboardInputEvent;
 import de.lessvoid.nifty.spi.input.InputSystem;
+import de.lessvoid.nifty.tools.resourceloader.NiftyResourceLoader;
 import java.util.ArrayList;
 
 public class InputSystemJme implements InputSystem, RawInputListener {
@@ -70,6 +71,9 @@ public class InputSystemJme implements InputSystem, RawInputListener {
         this.inputManager = inputManager;
     }
 
+    public void setResourceLoader(NiftyResourceLoader niftyResourceLoader) {
+    }
+
     public void setNifty(Nifty nifty) {
         this.nifty = nifty;
     }

--- a/engine/src/niftygui/com/jme3/niftygui/NiftyJmeDisplay.java
+++ b/engine/src/niftygui/com/jme3/niftygui/NiftyJmeDisplay.java
@@ -45,8 +45,8 @@ import com.jme3.renderer.ViewPort;
 import com.jme3.renderer.queue.RenderQueue;
 import com.jme3.texture.FrameBuffer;
 import de.lessvoid.nifty.Nifty;
+import de.lessvoid.nifty.spi.time.impl.FastTimeProvider;
 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,18 +97,18 @@ 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);
         if (inputManager != null)
             inputManager.addRawInputListener(inputSys);
         
-        nifty = new Nifty(renderDev, soundDev, inputSys, new TimeProvider());
+        nifty = new Nifty(renderDev, soundDev, inputSys, new FastTimeProvider());
         inputSys.setNifty(nifty);
+
+        resourceLocation = new ResourceLocationJme();
+        nifty.getResourceLoader().removeAllResourceLocations();
+        nifty.getResourceLoader().addResourceLocation(resourceLocation);
     }
 
     public void initialize(RenderManager rm, ViewPort vp) {

--- a/engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java
+++ b/engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java
@@ -51,6 +51,7 @@ import de.lessvoid.nifty.elements.render.TextRenderer.RenderFontNull;
 import de.lessvoid.nifty.render.BlendMode;
 import de.lessvoid.nifty.spi.render.*;
 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;
@@ -93,6 +94,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();
@@ -187,7 +191,7 @@ public class RenderDeviceJme implements RenderDevice {
         quadColor.updateData(buf);
     }
 
-    public void renderFont(RenderFont font, String str, int x, int y, Color color, float size){
+    public void renderFont(RenderFont font, String str, int x, int y, Color color, float sizeX, float sizeY) {        
         if (str.length() == 0)
             return;
 
@@ -214,12 +218,12 @@ public class RenderDeviceJme implements RenderDevice {
         float width = text.getLineWidth();
         float height = text.getLineHeight();
 
-        float x0 = x + 0.5f * width  * (1f - size);
-        float y0 = y + 0.5f * height * (1f - size);
+        float x0 = x + 0.5f * width  * (1f - sizeX);
+        float y0 = y + 0.5f * height * (1f - sizeY);
 
         tempMat.loadIdentity();
         tempMat.setTranslation(x0, getHeight() - y0, 0);
-        tempMat.setScale(size, size, 0);
+        tempMat.setScale(sizeX, sizeY, 0);
 
         rm.setWorldMatrix(tempMat);
         text.render(rm);

--- 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

--- 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);