Graphics but without Vulkan and FoW changes

build.gradle

@@ -62,6 +62,9 @@ subprojects {
             into sourceSets.test.output.classesDir
         }
         processTestResources.dependsOn copyTestResources
+
+        compileJava.options.encoding = "UTF-8"
+        compileTestJava.options.encoding = "UTF-8"
     }
     plugins.withType(ApplicationPlugin).whenPluginAdded {
         startScripts {

go.graphics.android/src/main/java/go/graphics/android/AndroidTextDrawer.java

@@ -1,339 +1,87 @@
-/*******************************************************************************
- * Copyright (c) 2015 - 2017
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *******************************************************************************/
 package go.graphics.android;
 
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.util.Arrays;
-
-import go.graphics.AbstractColor;
-import go.graphics.EGeometryFormatType;
-import go.graphics.EGeometryType;
-import go.graphics.GeometryHandle;
-import go.graphics.IllegalBufferException;
-import go.graphics.TextureHandle;
-import go.graphics.text.EFontSize;
-import go.graphics.text.TextDrawer;
-
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Paint;
-import android.util.TypedValue;
-import android.widget.TextView;
-
-public class AndroidTextDrawer implements TextDrawer {
-
-	private static final int TEXTURE_HEIGHT = 512;
-	private static final int TEXTURE_WIDTH = 512;
-
-	private static AndroidTextDrawer[] instances = new AndroidTextDrawer[EFontSize.values().length];
-
-	private final EFontSize size;
-	private final GLES11DrawContext context;
-	private TextureHandle texture = null;
-	/**
-	 * The number of lines we use on our texture.
-	 */
-	private int lines;
-	/**
-	 * The current string starting in line i.
-	 * <p>
-	 */
-	private String[] linestrings;
-
-	/**
-	 * The width of line i. This width can be higher than TEXTURE_WIDTH. Then the string is split to multiple lines.
-	 */
-	private int[] linewidths;
-
-	/**
-	 * An index of the next tile if the width of the current line is bigger than TEXTURE_WIDTH. This forms an linked list. -1 means no next tile.
-	 */
-	private int[] nextTile;
-
-	private int lineheight;
-
-	/**
-	 * Data to do LRU
-	 */
-	private int lastUsedCount = 0;
-	private int[] lastused;
-
-	private TextView renderer;
-	private float pixelScale;
-	private GeometryHandle texturepos;
-
-	private static final float[] textureposarray = {
-			// top left
-			0,
-			0,
-			0,
-			0,
-
-			// bottom left
-			0,
-			0,
-			0,
-			0,
 
-			// bottom right
-			TEXTURE_WIDTH,
-			0,
-			1,
-			0,
-
-			// top right
-			TEXTURE_WIDTH,
-			0,
-			1,
-			0,
-	};
+import go.graphics.text.AbstractTextDrawer;
+import go.graphics.text.EFontSize;
 
-	private AndroidTextDrawer(EFontSize size, GLES11DrawContext context) {
-		this.size = size;
-		this.context = context;
-		pixelScale = context.getAndroidContext().getResources().getDisplayMetrics().scaledDensity;
-		initGeometry();
-	}
+import static android.opengl.GLES20.*;
 
-	private final ByteBuffer updateBfr = ByteBuffer.allocateDirect(4).order(ByteOrder.nativeOrder());
+public class AndroidTextDrawer extends AbstractTextDrawer<GLESDrawContext> {
 
-	private void updateTexturePos(int pos, float value) throws IllegalBufferException {
-		updateBfr.rewind();
-		updateBfr.putFloat(value);
-		context.updateGeometryAt(texturepos, pos*4, updateBfr);
-	}
-
-	private void checkInvariants() {
-		boolean[] isNextTile = new boolean[lines];
-		for (int i = 0; i < lines; i++) {
-			int next = nextTile[i];
-			if (next >= 0) {
-				if (isNextTile[next]) {
-					System.err.println("WARNING: The line " + next + " is linked multiple times as next line.");
-				}
-				isNextTile[next] = true;
-			}
-		}
-		for (int i = 0; i < lines; i++) {
-			if (isNextTile[i]) {
-				if (linestrings[i] != null) {
-					System.out.println("Linestring should be null for line " + i);
-				}
-				if (lastused[i] != Integer.MAX_VALUE) {
-					System.out.println("Last used should not be set for line " + i);
-				}
-			}
-		}
+	public AndroidTextDrawer(GLESDrawContext gl) {
+		super(gl, 0);
 	}
 
 	@Override
-	public void renderCentered(float cx, float cy, String text) {
-		// TODO: we may want to optimize this.
-		drawString(cx - getWidth(text) / 2, cy - getHeight(text) / 2, text);
+	protected float calculateScalingFactor() {
+		return drawContext.getAndroidContext().getResources().getDisplayMetrics().density;
 	}
 
-	@Override
-	public void drawString(float x, float y, String string) {
-		initialize();
-
-		int line = findLineFor(string);
-
-		for (; line >= 0; line = nextTile[line], x += TEXTURE_WIDTH) {
-			// texture mirrored
-			float bottom = (float) ((line + 1) * lineheight) / TEXTURE_HEIGHT;
-			float top = (float) (line * lineheight) / TEXTURE_HEIGHT;
-			try {
-				updateTexturePos(3, top);
-				updateTexturePos(7, bottom);
-				updateTexturePos(11, bottom);
-				updateTexturePos(15, top);
-			} catch (IllegalBufferException e) {
-				e.printStackTrace();
-			}
-
-			context.draw2D(texturepos, texture, EGeometryType.Quad, 0, 4, x, y, 0f, 1f, 1f, 1f, color, 1);
-		}
-	}
+	private Paint paint;
 
-	private int findExistingString(String string) {
-		int length = lines;
-		for (int i = 0; i < length; i++) {
-			if (string.equals(linestrings[i])) {
-				lastused[i] = lastUsedCount++;
-				return i;
-			}
-		}
-		return -1;
-	}
+	@Override
+	protected int init() {
+		paint = new Paint();
+		paint.setTextSize(TEXTURE_GENERATION_SIZE);
 
-	private int findLineToUse() {
-		int unnededline = 0;
-		int unnededrating = Integer.MAX_VALUE;
+		float[] float_char_widths = new float[CHARACTER_COUNT];
+		paint.getTextWidths(CHARACTERS, float_char_widths);
+		for(int i = 0;i != CHARACTER_COUNT; i++) char_widths[i] = (int)float_char_widths[i];
 
-		for (int i = 0; i < lines; i++) {
-			if (lastused[i] < unnededrating) {
-				unnededline = i;
-				unnededrating = lastused[i];
-			}
-		}
+		Paint.FontMetricsInt fm = paint.getFontMetricsInt();
+		gentex_line_height = fm.leading-fm.ascent+fm.descent;
 
-		// now free the next lines
-		for (int next = unnededline; next > -1; next = nextTile[next]) {
-			nextTile[next] = -1;
-			lastused[next] = 0;
-			linestrings[next] = null;
-		}
 
-		return unnededline;
-	}
+		Paint sizedFont = new Paint(paint);
 
-	private int findLineFor(String string) {
-		int line = findExistingString(string);
-		if (line >= 0) {
-			return line;
-		}
+		EFontSize[] values = EFontSize.values();
+		for(int i = 0; i != values.length; i++) {
+			sizedFont.setTextSize(values[i].getSize());
 
-		int width = (int) Math.ceil(computeWidth(string) + 25);
-		renderer = new TextView(context.getAndroidContext());
-		renderer.setTextColor(Color.WHITE);
-		renderer.setSingleLine(true);
-		renderer.setTextSize(TypedValue.COMPLEX_UNIT_PX, getScaledSize());
-		renderer.setText(string);
+			Paint.FontMetricsInt sized_fm = sizedFont.getFontMetricsInt();
 
-		int firstLine = findLineToUse();
-		// System.out.println("string cache miss for " + string +
-		// ", allocating new line: " + firstLine);
-		int lastLine = firstLine;
-
-		for (int x = 0; x < width; x += TEXTURE_WIDTH) {
-			if (x == 0) {
-				line = firstLine;
-			} else {
-				line = findLineToUse();
-				nextTile[lastLine] = line;
-				linestrings[line] = null;
-				linewidths[line] = -1;
-			}
-			// important to not allow cycles.
-			lastused[line] = Integer.MAX_VALUE;
-			// just to be sure.
-			nextTile[line] = -1;
-
-			// render the new text to that line.
-			Bitmap bitmap = Bitmap.createBitmap(TEXTURE_WIDTH, lineheight, Bitmap.Config.ALPHA_8);
-			Canvas canvas = new Canvas(bitmap);
-			renderer.layout(0, 0, width, lineheight);
-			canvas.translate(-x, 0);
-			renderer.draw(canvas);
-			// canvas.translate(50, .8f * lineheight);
-			int points = lineheight * TEXTURE_WIDTH;
-			ByteBuffer alpha8 = ByteBuffer.allocateDirect(points);
-			bitmap.copyPixelsToBuffer(alpha8);
-			ByteBuffer updateBuffer;
-			if(context instanceof GLES20DrawContext) {
-				updateBuffer = ByteBuffer.allocateDirect(points*4);
-				for(int i = 0;i != points;i++) {
-					updateBuffer.putInt(0xFFFFFF00|alpha8.get(i));
-				}
-			} else {
-				updateBuffer = alpha8;
-			}
-			updateBuffer.rewind();
-			context.updateFontTexture(texture, 0, line*lineheight, TEXTURE_WIDTH, lineheight, updateBuffer);
-			lastLine = line;
+			heightPerSize[i] = (sized_fm.leading-sized_fm.ascent+sized_fm.descent);
 		}
-		lastused[firstLine] = lastUsedCount++;
-		linestrings[firstLine] = string;
-		linewidths[firstLine] = width;
-
-		checkInvariants();
-		return firstLine;
-	}
 
-	private void initGeometry() {
-		if(texturepos == null || !texturepos.isValid()) texturepos = context.storeGeometry(textureposarray, EGeometryFormatType.Texture2D, true, "android-textdrawer" + size.getSize());
+		return fm.descent;
 	}
 
-	private void initialize() {
-		if (texture == null || !texture.isValid()) {
-			texture = context.generateFontTexture(TEXTURE_WIDTH, TEXTURE_HEIGHT);
-			lineheight = (int) (getScaledSize() * 1.3);
-			lines = TEXTURE_HEIGHT / lineheight;
-			linestrings = new String[lines];
-			linewidths = new int[lines];
-			lastused = new int[lines];
-			nextTile = new int[lines];
-			Arrays.fill(nextTile, -1);
-
-			try {
-				updateTexturePos(1, lineheight);
-				updateTexturePos(13, lineheight);
-			} catch (IllegalBufferException e) {
-				e.printStackTrace();
-			}
-
-		}
-		initGeometry();
-	}
+	private Bitmap pre_render;
+	private Canvas canvas;
 
 	@Override
-	public float getWidth(String string) {
-		int index = findExistingString(string);
-		if (index < 0) {
-			return computeWidth(string);
-		} else {
-			return linewidths[index];
-		}
-	}
-
-	private float computeWidth(String string) {
-		Paint paint = new Paint();
-		paint.setTextSize(getScaledSize());
-		return paint.measureText(string);
+	protected void setupBitmapDraw() {
+		pre_render = Bitmap.createBitmap(tex_width, tex_height, Bitmap.Config.ALPHA_8);
+		canvas = new Canvas(pre_render);
+		paint.setColor(0);
+		canvas.drawPaint(paint);
+		paint.setColor(0xFFFFFFFF);
 	}
 
 	@Override
-	public float getHeight(String string) {
-		return getScaledSize();
-	}
-
-	private float getScaledSize() {
-		return size.getSize() * pixelScale;
+	protected void drawChar(char[] character, int x, int y) {
+		canvas.drawText(character, 0, 1, x, y, paint);
 	}
 
-	private AbstractColor color;
-
 	@Override
-	public void setColor(AbstractColor color) {
-		this.color = color;
+	protected int[] getRGB() {
+		int[] pixels = new int[tex_width*tex_height];
+		pre_render.getPixels(pixels, 0, tex_width, 0, 0, tex_width, tex_height);
+		return pixels;
 	}
 
-	public static TextDrawer getInstance(EFontSize size, GLES11DrawContext context) {
-		int ordinal = size.ordinal();
-		if (instances[ordinal] == null) {
-			instances[ordinal] = new AndroidTextDrawer(size, context);
-		}
-		return instances[ordinal];
+	@Override
+	protected void endDraw() {
+		pre_render = null;
+		canvas = null;
 	}
 
-	public static void invalidateTextures() {
-		for (int i = 0; i < instances.length; i++) {
-			instances[i] = null;
-		}
+	@Override
+	protected void setTexParams() {
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
 	}
-
 }