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

Save and restore the color in the nifty-optimization

Browse Source 
method: render(RenderManager rm, ColorRGBA color)
So that it doesn't clobber other BitmapText that just
happens to be using the font.


git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9769 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
PSp..om 2012-09-24 18:06:00 +00:00
parent d980519674
commit 86a3b0532c
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
engine/src/core/com/jme3/font/BitmapText.java
View File

@ -33,6 +33,7 @@ package com.jme3.font;
import com.jme3.font.BitmapFont.Align; import com.jme3.font.BitmapFont.Align;
import com.jme3.font.BitmapFont.VAlign; import com.jme3.font.BitmapFont.VAlign;
import com.jme3.material.MatParam;
import com.jme3.material.Material; import com.jme3.material.Material;
import com.jme3.math.ColorRGBA; import com.jme3.math.ColorRGBA;
import com.jme3.renderer.RenderManager; import com.jme3.renderer.RenderManager;
@ -110,7 +111,7 @@ public class BitmapText extends Node {
* *
* @param text String to change text to * @param text String to change text to
*/ */
public void setText(String text) { public void setText(String text) {
text = text == null ? "" : text; text = text == null ? "" : text;
if (text == block.getText() || block.getText().equals(text)) { if (text == block.getText() || block.getText().equals(text)) {
@ -387,12 +388,28 @@ public class BitmapText extends Node {
needRefresh = false; needRefresh = false;
} }
private ColorRGBA getColor( Material mat, String name ) {
MatParam mp = mat.getParam(name);
if( mp == null ) {
return null;
}
return (ColorRGBA)mp.getValue();
}
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");
mat.setColor("Color", color); mat.setColor("Color", color);
mat.render(page, rm); mat.render(page, rm);
if( original == null ) {
mat.clearParam("Color");
} else {
mat.setColor("Color", original);
}
} }
} }
} }