sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Nifty will now set the BitmapText base color instead of using the material's color (which could override the color of the shared font)

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9995 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
Sha..rd 2012-11-13 03:16:16 +00:00
parent 4aea96f4b9
commit 2e35519182
2 changed files with 38 additions and 32 deletions
engine/src
core/com/jme3/font
BitmapText.java
niftygui/com/jme3/niftygui
RenderDeviceJme.java

15
engine/src/core/com/jme3/font/BitmapText.java

@ -418,19 +418,18 @@ public class BitmapText extends Node {
} }
public void render(RenderManager rm, ColorRGBA color) { public void render(RenderManager rm, ColorRGBA color) {
for (BitmapTextPage page : textPages) { for (BitmapTextPage page : textPages) {
Material mat = page.getMaterial(); Material mat = page.getMaterial();
mat.setTexture("ColorMap", page.getTexture()); mat.setTexture("ColorMap", page.getTexture());
ColorRGBA original = getColor(mat, "Color"); //ColorRGBA original = getColor(mat, "Color");
mat.setColor("Color", color); //mat.setColor("Color", color);
mat.render(page, rm); mat.render(page, rm);
if( original == null ) { //if( original == null ) {
mat.clearParam("Color"); // mat.clearParam("Color");
} else { //} else {
mat.setColor("Color", original); // mat.setColor("Color", original);
} //}
} }
} }
} }

53
engine/src/niftygui/com/jme3/niftygui/RenderDeviceJme.java

@ -68,7 +68,6 @@ public class RenderDeviceJme implements RenderDevice {
private HashMap<CachedTextKey, BitmapText> textCacheCurrentFrame = new HashMap<CachedTextKey, BitmapText>(); private HashMap<CachedTextKey, BitmapText> textCacheCurrentFrame = new HashMap<CachedTextKey, BitmapText>();
private final Quad quad = new Quad(1, -1, true); private final Quad quad = new Quad(1, -1, true);
private final Geometry quadGeom = new Geometry("nifty-quad", quad); private final Geometry quadGeom = new Geometry("nifty-quad", quad);
private final Material unshadedMat;
private boolean clipWasSet = false; private boolean clipWasSet = false;
private VertexBuffer quadDefaultTC = quad.getBuffer(Type.TexCoord); private VertexBuffer quadDefaultTC = quad.getBuffer(Type.TexCoord);
private VertexBuffer quadModTC = quadDefaultTC.clone(); private VertexBuffer quadModTC = quadDefaultTC.clone();
@ -77,6 +76,10 @@ public class RenderDeviceJme implements RenderDevice {
private ColorRGBA tempColor = new ColorRGBA(); private ColorRGBA tempColor = new ColorRGBA();
private RenderState renderState = new RenderState(); private RenderState renderState = new RenderState();
private Material colorMaterial;
private Material textureColorMaterial;
private Material vertexColorMaterial;
private static class CachedTextKey { private static class CachedTextKey {
BitmapFont font; BitmapFont font;
@ -118,10 +121,20 @@ public class RenderDeviceJme implements RenderDevice {
quadModTC.setUsage(Usage.Stream); quadModTC.setUsage(Usage.Stream);
// GUI material // Load the 3 material types separately to avoid
unshadedMat = new Material(display.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md"); // reloading the shader when the defines change.
// Shared render state // Material with a single color (no texture or vertex color)
colorMaterial = new Material(display.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
// Material with a texture and a color (no vertex color)
textureColorMaterial = new Material(display.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
// Material with vertex color, used for gradients (no texture)
vertexColorMaterial = new Material(display.getAssetManager(), "Common/MatDefs/Misc/Unshaded.j3md");
vertexColorMaterial.setBoolean("VertexColor", true);
// Shared render state for all materials
renderState.setDepthTest(false); renderState.setDepthTest(false);
renderState.setDepthWrite(false); renderState.setDepthWrite(false);
} }
@ -226,9 +239,9 @@ public class RenderDeviceJme implements RenderDevice {
} }
textCacheCurrentFrame.put(key, text); textCacheCurrentFrame.put(key, text);
float width = text.getLineWidth(); // float width = text.getLineWidth();
// float height = text.getLineHeight(); // float height = text.getLineHeight();
float x0 = x + 0.5f * width * (1f - sizeX); float x0 = x; //+ 0.5f * width * (1f - sizeX);
float y0 = y; // + 0.5f * height * (1f - sizeY); float y0 = y; // + 0.5f * height * (1f - sizeY);
tempMat.loadIdentity(); tempMat.loadIdentity();
@ -237,6 +250,8 @@ public class RenderDeviceJme implements RenderDevice {
rm.setWorldMatrix(tempMat); rm.setWorldMatrix(tempMat);
rm.setForcedRenderState(renderState); rm.setForcedRenderState(renderState);
text.setColor(colorRgba);
text.updateLogicalState(0);
text.render(rm, colorRgba); text.render(rm, colorRgba);
// System.out.format("renderFont(%s, %s, %d, %d, %s, %f, %f)\n", jmeFont.getFont(), str, x, y, color.toString(), sizeX, sizeY); // System.out.format("renderFont(%s, %s, %d, %d, %s, %f, %f)\n", jmeFont.getFont(), str, x, y, color.toString(), sizeX, sizeY);
@ -250,9 +265,8 @@ public class RenderDeviceJme implements RenderDevice {
RenderImageJme jmeImage = (RenderImageJme) image; RenderImageJme jmeImage = (RenderImageJme) image;
Texture2D texture = jmeImage.getTexture(); Texture2D texture = jmeImage.getTexture();
unshadedMat.setColor("Color", convertColor(color, tempColor)); textureColorMaterial.setColor("Color", convertColor(color, tempColor));
unshadedMat.setTexture("ColorMap", texture); textureColorMaterial.setTexture("ColorMap", texture);
unshadedMat.setBoolean("VertexColor", false);
float imageWidth = jmeImage.getWidth(); float imageWidth = jmeImage.getWidth();
float imageHeight = jmeImage.getHeight(); float imageHeight = jmeImage.getHeight();
@ -286,7 +300,7 @@ public class RenderDeviceJme implements RenderDevice {
rm.setWorldMatrix(tempMat); rm.setWorldMatrix(tempMat);
rm.setForcedRenderState(renderState); rm.setForcedRenderState(renderState);
unshadedMat.render(quadGeom, rm); textureColorMaterial.render(quadGeom, rm);
//System.out.format("renderImage2(%s, %d, %d, %d, %d, %d, %d, %d, %d, %s, %f, %d, %d)\n", texture.getKey().toString(), //System.out.format("renderImage2(%s, %d, %d, %d, %d, %d, %d, %d, %d, %s, %f, %d, %d)\n", texture.getKey().toString(),
// x, y, w, h, srcX, srcY, srcW, srcH, // x, y, w, h, srcX, srcY, srcW, srcH,
@ -298,9 +312,8 @@ public class RenderDeviceJme implements RenderDevice {
RenderImageJme jmeImage = (RenderImageJme) image; RenderImageJme jmeImage = (RenderImageJme) image;
unshadedMat.setColor("Color", convertColor(color, tempColor)); textureColorMaterial.setColor("Color", convertColor(color, tempColor));
unshadedMat.setTexture("ColorMap", jmeImage.getTexture()); textureColorMaterial.setTexture("ColorMap", jmeImage.getTexture());
unshadedMat.setBoolean("VertexColor", false);
quad.clearBuffer(Type.TexCoord); quad.clearBuffer(Type.TexCoord);
quad.setBuffer(quadDefaultTC); quad.setBuffer(quadDefaultTC);
@ -314,15 +327,13 @@ public class RenderDeviceJme implements RenderDevice {
rm.setWorldMatrix(tempMat); rm.setWorldMatrix(tempMat);
rm.setForcedRenderState(renderState); rm.setForcedRenderState(renderState);
unshadedMat.render(quadGeom, rm); textureColorMaterial.render(quadGeom, rm);
//System.out.format("renderImage1(%s, %d, %d, %d, %d, %s, %f)\n", jmeImage.getTexture().getKey().toString(), x, y, width, height, color.toString(), imageScale); //System.out.format("renderImage1(%s, %d, %d, %d, %d, %s, %f)\n", jmeImage.getTexture().getKey().toString(), x, y, width, height, color.toString(), imageScale);
} }
public void renderQuad(int x, int y, int width, int height, Color color) { public void renderQuad(int x, int y, int width, int height, Color color) {
unshadedMat.setColor("Color", convertColor(color, tempColor)); colorMaterial.setColor("Color", convertColor(color, tempColor));
unshadedMat.setTexture("ColorMap", null);
unshadedMat.setBoolean("VertexColor", false);
tempMat.loadIdentity(); tempMat.loadIdentity();
tempMat.setTranslation(x, getHeight() - y, 0); tempMat.setTranslation(x, getHeight() - y, 0);
@ -330,7 +341,7 @@ public class RenderDeviceJme implements RenderDevice {
rm.setWorldMatrix(tempMat); rm.setWorldMatrix(tempMat);
rm.setForcedRenderState(renderState); rm.setForcedRenderState(renderState);
unshadedMat.render(quadGeom, rm); colorMaterial.render(quadGeom, rm);
//System.out.format("renderQuad1(%d, %d, %d, %d, %s)\n", x, y, width, height, color.toString()); //System.out.format("renderQuad1(%d, %d, %d, %d, %s)\n", x, y, width, height, color.toString());
} }
@ -350,17 +361,13 @@ public class RenderDeviceJme implements RenderDevice {
buf.flip(); buf.flip();
quadColor.updateData(buf); quadColor.updateData(buf);
unshadedMat.setColor("Color", ColorRGBA.White);
unshadedMat.setTexture("ColorMap", null);
unshadedMat.setBoolean("VertexColor", true);
tempMat.loadIdentity(); tempMat.loadIdentity();
tempMat.setTranslation(x, getHeight() - y, 0); tempMat.setTranslation(x, getHeight() - y, 0);
tempMat.setScale(width, height, 0); tempMat.setScale(width, height, 0);
rm.setWorldMatrix(tempMat); rm.setWorldMatrix(tempMat);
rm.setForcedRenderState(renderState); rm.setForcedRenderState(renderState);
unshadedMat.render(quadGeom, rm); vertexColorMaterial.render(quadGeom, rm);
//System.out.format("renderQuad2(%d, %d, %d, %d, %s, %s, %s, %s)\n", x, y, width, height, topLeft.toString(), //System.out.format("renderQuad2(%d, %d, %d, %d, %s, %s, %s, %s)\n", x, y, width, height, topLeft.toString(),
// topRight.toString(), // topRight.toString(),