LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.4.2: fixed some race conditions involving rendered text

Browse Source
This commit is contained in:
Evan Debenham 2016-08-27 13:46:34 -04:00 committed by Evan Debenham
parent 8d7eac940b
commit 0b30263236
1 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
SPD-classes/src/main/java/com/watabou/noosa/RenderedText.java
View File

@ -103,14 +103,14 @@ public class RenderedText extends Image {
this.size = size; this.size = size;
needsRender = true; needsRender = true;
measure(); measure(this);
} }
public void text( String text ){ public void text( String text ){
this.text = text; this.text = text;
needsRender = true; needsRender = true;
measure(); measure(this);
} }
public String text(){ public String text(){
@ -120,25 +120,25 @@ public class RenderedText extends Image {
public void size( int size ){ public void size( int size ){
this.size = size; this.size = size;
needsRender = true; needsRender = true;
measure(); measure(this);
} }
public float baseLine(){ public float baseLine(){
return size * scale.y; return size * scale.y;
} }
private void measure(){ private static synchronized void measure(RenderedText r){
if ( text == null || text.equals("") ) { if ( r.text == null || r.text.equals("") ) {
text = ""; r.text = "";
width=height=0; r.width=r.height=0;
visible = false; r.visible = false;
return; return;
} else { } else {
visible = true; r.visible = true;
} }
painter.setTextSize(size); painter.setTextSize(r.size);
painter.setAntiAlias(true); painter.setAntiAlias(true);
if (font != null) { if (font != null) {
@ -150,56 +150,56 @@ public class RenderedText extends Image {
//paint outer strokes //paint outer strokes
painter.setARGB(0xff, 0, 0, 0); painter.setARGB(0xff, 0, 0, 0);
painter.setStyle(Paint.Style.STROKE); painter.setStyle(Paint.Style.STROKE);
painter.setStrokeWidth(size / 5f); painter.setStrokeWidth(r.size / 5f);
width = (painter.measureText(text)+ (size/5f)); r.width = (painter.measureText(r.text)+ (r.size/5f));
height = (-painter.ascent() + painter.descent()+ (size/5f)); r.height = (-painter.ascent() + painter.descent()+ (r.size/5f));
} }
private void render(){ private static synchronized void render(RenderedText r){
needsRender = false; r.needsRender = false;
if (cache != null) if (r.cache != null)
cache.activeTexts.remove(this); r.cache.activeTexts.remove(r);
String key = "text:" + size + " " + text; String key = "text:" + r.size + " " + r.text;
if (textCache.containsKey(key)){ if (textCache.containsKey(key)){
cache = textCache.get(key); r.cache = textCache.get(key);
texture = cache.texture; r.texture = r.cache.texture;
frame(cache.rect); r.frame(r.cache.rect);
cache.activeTexts.add(this); r.cache.activeTexts.add(r);
} else { } else {
measure(); measure(r);
if (width == 0 || height == 0) if (r.width == 0 || r.height == 0)
return; return;
//bitmap has to be in a power of 2 for some devices (as we're using openGL methods to render to texture) //bitmap has to be in a power of 2 for some devices (as we're using openGL methods to render to texture)
Bitmap bitmap = Bitmap.createBitmap(Integer.highestOneBit((int)width)*2, Integer.highestOneBit((int)height)*2, Bitmap.Config.ARGB_4444); Bitmap bitmap = Bitmap.createBitmap(Integer.highestOneBit((int)r.width)*2, Integer.highestOneBit((int)r.height)*2, Bitmap.Config.ARGB_4444);
bitmap.eraseColor(0x00000000); bitmap.eraseColor(0x00000000);
canvas.setBitmap(bitmap); canvas.setBitmap(bitmap);
canvas.drawText(text, (size/10f), size, painter); canvas.drawText(r.text, (r.size/10f), r.size, painter);
//paint inner text //paint inner text
painter.setARGB(0xff, 0xff, 0xff, 0xff); painter.setARGB(0xff, 0xff, 0xff, 0xff);
painter.setStyle(Paint.Style.FILL); painter.setStyle(Paint.Style.FILL);
canvas.drawText(text, (size/10f), size, painter); canvas.drawText(r.text, (r.size/10f), r.size, painter);
texture = new SmartTexture(bitmap, Texture.NEAREST, Texture.CLAMP, true); r.texture = new SmartTexture(bitmap, Texture.NEAREST, Texture.CLAMP, true);
RectF rect = texture.uvRect(0, 0, (int)width, (int)height); RectF rect = r.texture.uvRect(0, 0, (int)r.width, (int)r.height);
frame(rect); r.frame(rect);
cache = new CachedText(); r.cache = new CachedText();
cache.rect = rect; r.cache.rect = rect;
cache.texture = texture; r.cache.texture = r.texture;
cache.length = text.length(); r.cache.length = r.text.length();
cache.activeTexts = new HashSet<>(); r.cache.activeTexts = new HashSet<>();
cache.activeTexts.add(this); r.cache.activeTexts.add(r);
textCache.put("text:" + size + " " + text, cache); textCache.put("text:" + r.size + " " + r.text, r.cache);
} }
} }
@ -213,7 +213,7 @@ public class RenderedText extends Image {
@Override @Override
public void draw() { public void draw() {
if (needsRender) if (needsRender)
render(); render(this);
super.draw(); super.draw();
} }
@ -242,7 +242,7 @@ public class RenderedText extends Image {
clearCache(); clearCache();
} }
private class CachedText{ private static class CachedText{
public SmartTexture texture; public SmartTexture texture;
public RectF rect; public RectF rect;
public int length; public int length;