Skip to content

Refactors LetterQuad #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Glinkis wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Refactors LetterQuad #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af1ae58
Refactors LetterQuad
Glinkis Feb 19, 2018
5f4fd67
Renames storeTcToArray to storeTexCoordsToArray
Glinkis Feb 19, 2018
30da4a0
Early returns in computeLineY
Glinkis Feb 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 27 additions & 13 deletions Engine/src/mini/font/LetterQuad.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ protected LetterQuad(char c, LetterQuad prev) {
}

LetterQuad addNextCharacter(char c) {
LetterQuad n = new LetterQuad(c, this);
return n;
return new LetterQuad(c, this);
}

BitmapCharacter getBitmapChar() {
Expand All @@ -88,9 +87,10 @@ void setBitmapChar(BitmapCharacter bitmapChar) {
alignX = 0;
alignY = 0;

BitmapCharacterSet charSet = font.getCharSet();
this.bitmapChar = bitmapChar;
this.bitmapChar = bitmapChar;

if (bitmapChar != null) {
BitmapCharacterSet charSet = font.getCharSet();
u0 = (float) bitmapChar.getX() / charSet.getWidth();
v0 = (float) bitmapChar.getY() / charSet.getHeight();
u1 = u0 + (float) bitmapChar.getWidth() / charSet.getWidth();
Expand Down Expand Up @@ -384,11 +384,11 @@ boolean isLineWrap() {
private float computeLineY(StringBlock block) {
if (isHead()) {
return getBound(block).y;
} else if (previous.eol) {
}
if (previous.eol) {
return previous.getNextLine();
} else {
return previous.lineY;
}
return previous.lineY;
}

boolean isLineStart() {
Expand All @@ -400,7 +400,14 @@ boolean isBlank() {
}

public void storeToArrays(float[] pos, float[] tc, short[] idx, byte[] colors, int quadIdx) {
float x = x0 + alignX;
storePositionToArray(pos);
storeTexCoordsToArray(tc);
storeColorsToArray(colors);
storeIndicesToArray(idx, quadIdx);
}

private void storePositionToArray(float[] pos) {
float x = x0 + alignX;
float y = y0 - alignY;
float xpw = x + width;
float ymh = y - height;
Expand All @@ -417,8 +424,10 @@ public void storeToArrays(float[] pos, float[] tc, short[] idx, byte[] colors, i
pos[9] = xpw;
pos[10] = y;
pos[11] = 0;
}

float v0 = 1f - this.v0;
private void storeTexCoordsToArray(float[] tc) {
float v0 = 1f - this.v0;
float v1 = 1f - this.v1;

tc[0] = u0;
Expand All @@ -429,16 +438,21 @@ public void storeToArrays(float[] pos, float[] tc, short[] idx, byte[] colors, i
tc[5] = v1;
tc[6] = u1;
tc[7] = v0;

colors[3] = (byte) (colorInt & 0xff);
}

private void storeColorsToArray(byte[] colors) {
colors[3] = (byte) (colorInt & 0xff);
colors[2] = (byte) ((colorInt >> 8) & 0xff);
colors[1] = (byte) ((colorInt >> 16) & 0xff);
colors[0] = (byte) ((colorInt >> 24) & 0xff);

System.arraycopy(colors, 0, colors, 4, 4);
System.arraycopy(colors, 0, colors, 8, 4);
System.arraycopy(colors, 0, colors, 12, 4);
}

short i0 = (short) (quadIdx * 4);
private void storeIndicesToArray(short[] idx, int quadIdx) {
short i0 = (short) (quadIdx * 4);
short i1 = (short) (i0 + 1);
short i2 = (short) (i0 + 2);
short i3 = (short) (i0 + 3);
Expand All @@ -449,7 +463,7 @@ public void storeToArrays(float[] pos, float[] tc, short[] idx, byte[] colors, i
idx[3] = i0;
idx[4] = i2;
idx[5] = i3;
}
}

public void appendPositions(FloatBuffer fb) {
float sx = x0 + alignX;
Expand Down