OSDN Git Service
(root)
/
mikumikustudio
/
MikuMikuStudio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update niftygui 1.3.3
[mikumikustudio/MikuMikuStudio.git]
/
engine
/
src
/
niftygui
/
com
/
jme3
/
niftygui
/
RenderDeviceJme.java
diff --git
a/engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java
b/engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java
index
9e2cc77
..
07f3287
100644
(file)
--- 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;
\r
import de.lessvoid.nifty.spi.render.*;
\r
import de.lessvoid.nifty.tools.Color;
\r
import de.lessvoid.nifty.render.BlendMode;
\r
import de.lessvoid.nifty.spi.render.*;
\r
import de.lessvoid.nifty.tools.Color;
\r
+import de.lessvoid.nifty.tools.resourceloader.NiftyResourceLoader;
\r
import java.nio.ByteBuffer;
\r
import java.nio.FloatBuffer;
\r
import java.util.HashMap;
\r
import java.nio.ByteBuffer;
\r
import java.nio.FloatBuffer;
\r
import java.util.HashMap;
\r
@@
-93,6
+94,9
@@
public class RenderDeviceJme implements RenderDevice {
niftyMat.getAdditionalRenderState().setDepthTest(false);
\r
}
\r
\r
niftyMat.getAdditionalRenderState().setDepthTest(false);
\r
}
\r
\r
+ public void setResourceLoader(NiftyResourceLoader niftyResourceLoader) {
\r
+ }
\r
+
\r
public void setRenderManager(RenderManager rm){
\r
this.rm = rm;
\r
this.r = rm.getRenderer();
\r
public void setRenderManager(RenderManager rm){
\r
this.rm = rm;
\r
this.r = rm.getRenderer();
\r
@@
-187,7
+191,7
@@
public class RenderDeviceJme implements RenderDevice {
quadColor.updateData(buf);
\r
}
\r
\r
quadColor.updateData(buf);
\r
}
\r
\r
- public void renderFont(RenderFont font, String str, int x, int y, Color color, float size
){
\r
+ public void renderFont(RenderFont font, String str, int x, int y, Color color, float size
X, float sizeY) {
\r
if (str.length() == 0)
\r
return;
\r
\r
if (str.length() == 0)
\r
return;
\r
\r
@@
-214,12
+218,12
@@
public class RenderDeviceJme implements RenderDevice {
float width = text.getLineWidth();
\r
float height = text.getLineHeight();
\r
\r
float width = text.getLineWidth();
\r
float height = text.getLineHeight();
\r
\r
- float x0 = x + 0.5f * width * (1f - size);
\r
- float y0 = y + 0.5f * height * (1f - size);
\r
+ float x0 = x + 0.5f * width * (1f - size
X
);
\r
+ float y0 = y + 0.5f * height * (1f - size
Y
);
\r
\r
tempMat.loadIdentity();
\r
tempMat.setTranslation(x0, getHeight() - y0, 0);
\r
\r
tempMat.loadIdentity();
\r
tempMat.setTranslation(x0, getHeight() - y0, 0);
\r
- tempMat.setScale(size
, size
, 0);
\r
+ tempMat.setScale(size
X, sizeY
, 0);
\r
\r
rm.setWorldMatrix(tempMat);
\r
text.render(rm);
\r
\r
rm.setWorldMatrix(tempMat);
\r
text.render(rm);
\r