eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-09 09:03:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed font coloring in A3D

Browse Source
This commit is contained in:
codeanticode
2010-05-31 15:28:22 +00:00
parent 3e8509c975
commit f017a638f6
2 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/core/src/processing/core/PFont.java
+4 -2
View File
@@ -696,8 +696,10 @@ public class PFont implements PConstants {
gl.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_WRAP_S, GL10.GL_CLAMP_TO_EDGE);
gl.glTexParameterf(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_WRAP_T, GL10.GL_CLAMP_TO_EDGE);
gl.glTexEnvf(GL10.GL_TEXTURE_ENV, GL10.GL_TEXTURE_ENV_MODE, GL10.GL_REPLACE);
// This is the right texture environment mode to use the current fill color to tint the fonts:
// http://www.khronos.org/opengles/documentation/opengles1_0/html/glTexEnv.html
gl.glTexEnvf(GL10.GL_TEXTURE_ENV, GL10.GL_TEXTURE_ENV_MODE, GL10.GL_BLEND);
gl.glTexImage2D(GL10.GL_TEXTURE_2D, 0, GL10.GL_RGBA, texWidth, texHeight, 0, GL10.GL_RGBA, GL10.GL_UNSIGNED_BYTE, null);
gl.glBindTexture(GL10.GL_TEXTURE_2D, 0);
android/core/src/processing/core/PGraphicsAndroid3D.java
+4 -25
View File
@@ -2277,6 +2277,9 @@ public class PGraphicsAndroid3D extends PGraphics {
gl.glMatrixMode(GL10.GL_MODELVIEW);
gl.glPushMatrix();
gl.glLoadIdentity();
// Setting the current fill color as the environment color to multiply the texture color of the font.
gl.glTexEnvfv(GL10.GL_TEXTURE_ENV, GL10.GL_TEXTURE_ENV_COLOR, colorFloats, 0);
super.textLineImpl(buffer, start, stop, x, y);
@@ -2329,23 +2332,9 @@ public class PGraphicsAndroid3D extends PGraphics {
gl.glBindTexture(GL10.GL_TEXTURE_2D, tex.glid);
textFont.currentTexID = tex.glid;
}
boolean savedTint = tint;
int savedTintColor = tintColor;
tint(fillColor);
// TODO: Check this is the right way to set the fill color for the text.
//gl.glColor4f(colorFloats[0], colorFloats[1], colorFloats[2], colorFloats[3]);
//gl.glColor4x(0x00000, 0x00000, 0x00000, 0x10000);
gl11.glTexParameteriv(GL10.GL_TEXTURE_2D, GL11Ext.GL_TEXTURE_CROP_RECT_OES, tex.crop, 0);
gl11x.glDrawTexiOES((int)x1, height - (int)(y2), 0, (int)(x2 - x1), (int)(y2 - y1));
if (savedTint) {
tint(savedTintColor);
} else {
noTint();
}
gl11x.glDrawTexfOES(x1, height - y2, 0, x2 - x1, y2 - y1);
}
protected void textCharScreenImpl(Glyph.TextureInfo tex,
@@ -2356,18 +2345,8 @@ public class PGraphicsAndroid3D extends PGraphics {
textFont.currentTexID = tex.glid;
}
boolean savedTint = tint;
int savedTintColor = tintColor;
tint(fillColor);
gl11.glTexParameteriv(GL10.GL_TEXTURE_2D, GL11Ext.GL_TEXTURE_CROP_RECT_OES, tex.crop, 0);
gl11x.glDrawTexiOES(xx, height - yy, 0, w0, h0);
if (savedTint) {
tint(savedTintColor);
} else {
noTint();
}
}
//////////////////////////////////////////////////////////////