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

opengl fond rendering is working

Browse Source
This commit is contained in:
codeanticode
2010-05-30 23:42:18 +00:00
parent 02b5c756ff
commit f27d68adf1
3 changed files with 43 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/core/src/processing/core/PFont.java
+5 -67
View File
@@ -686,6 +686,7 @@ public class PFont implements PConstants {
public void addTexture(GL10 gl) {
int[] textures = new int[1];
gl.glEnable(GL10.GL_TEXTURE_2D);
gl.glGenTextures(1, textures, 0);
gl.glBindTexture(GL10.GL_TEXTURE_2D, textures[0]);
@@ -698,6 +699,9 @@ public class PFont implements PConstants {
gl.glTexEnvf(GL10.GL_TEXTURE_ENV, GL10.GL_TEXTURE_ENV_MODE, GL10.GL_REPLACE);
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);
if (texIDList == null) {
texIDList = new int[1];
texIDList[0] = textures[0];
@@ -893,14 +897,12 @@ public class PFont implements PConstants {
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
rgba[t++] = 0xFFFFFF00 | image.pixels[p++];
//rgba[t++] = 255 << 24 | 255 << 16 | 0 << 8 | 0;
}
}
} else {
for (int y = 0; y < height; y++) {
for (int x = 0; x < width; x++) {
rgba[t++] = (image.pixels[p++] << 24) | 0x00FFFFFF;
//rgba[t++] = 255 << 24 | 0 << 16 | 0 << 8 | 0;
}
}
}
@@ -933,72 +935,8 @@ public class PFont implements PConstants {
gl.glTexSubImage2D(GL10.GL_TEXTURE_2D, 0, offsetX, offsetY, width, height, GL10.GL_RGBA, GL10.GL_UNSIGNED_BYTE, IntBuffer.wrap(rgba));
texture = new TextureInfo(currentTexID, offsetX, offsetY, width, height);
texture = new TextureInfo(currentTexID, offsetX, offsetY + height, width, -height);
offsetX += width;
/*
String text = String.valueOf((char)value);
int ascent = 0;
int descent = 0;
int measuredTextWidth = 0;
if (!fromStream) {
// Paint.ascent is negative, so negate it.
ascent = (int) Math.ceil(-lazyPaint.ascent());
descent = (int) Math.ceil(lazyPaint.descent());
measuredTextWidth = (int) Math.ceil(lazyPaint.measureText(text));
}
int textHeight = ascent + descent;
int textWidth = Math.min(texWidth,measuredTextWidth);
int u = texU;
int v = texV;
int lineHeight = texLineHeight;
if (textWidth > texWidth) {
textWidth = texWidth;
}
// Is there room for this string on the current line?
if (u + textWidth > texWidth) {
// No room, go to the next line:
u = 0;
v += lineHeight;
lineHeight = 0;
}
lineHeight = Math.max(lineHeight, textHeight);
if (v + lineHeight > texHeight) {
// Create new texture...
addTexture(gl);
// Reseting texture coordinates and line
u = texU = offsetU = 0;
v = texV = offsetV = 0;
lineHeight = texLineHeight = 0;
}
int vBase = v + ascent;
if (fromStream) {
// Draw from pixels, this is used when the font was loaded from stream and not created from a system font.
lazyCanvas.drawBitmap(image.pixels, 0, 0, 0, 0, width, height, true, lazyPaint);
} else {
mCanvas.drawText(text, u, vBase, lazyPaint);
//lazyCanvas.drawText(text, 0, 0, lazyPaint);
}
offsetU = u;
offsetV = vBase;
texU = u + textWidth;
texV = v;
texLineHeight = lineHeight;
texture = new TextureInfo(currentID, textWidth, textHeight, ascent,
u, v + textHeight, textWidth, -textHeight);
*/
}
public class TextureInfo {
android/core/src/processing/core/PGraphicsAndroid3D.java
+36 -6
View File
@@ -2272,9 +2272,19 @@ public class PGraphicsAndroid3D extends PGraphics {
gl.glBindTexture(GL10.GL_TEXTURE_2D, textFontTexID);
//gl.glShadeModel(GL10.GL_FLAT); // Should be restored to default shade model after text rendering.
//gl.glEnable(GL10.GL_BLEND);
//gl.glBlendFunc(GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA);
//gl.glColor4x(0x10000, 0x10000, 0x10000, 0x10000);
/*
gl.glEnable(GL10.GL_BLEND);
gl.glBlendFunc(GL10.GL_SRC_ALPHA, GL10.GL_ONE_MINUS_SRC_ALPHA);
*/
//
// 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(0x10000, 0x10000, 0x10000, 0x10000);
gl.glMatrixMode(GL10.GL_PROJECTION);
gl.glPushMatrix();
@@ -2354,13 +2364,23 @@ public class PGraphicsAndroid3D extends PGraphics {
//float snappedX = (float) Math.floor(x1);
//float snappedY = (float) Math.floor(y1);
//gl.glTranslatef(snappedX, snappedY, 0.0f);
boolean savedTint = tint;
int savedTintColor = tintColor;
tint(fillColor);
((GL11)gl).glTexParameteriv(GL10.GL_TEXTURE_2D, GL11Ext.GL_TEXTURE_CROP_RECT_OES, tex.crop, 0);
//((GL11Ext)gl).glDrawTexiOES((int) snappedX, height - (int) snappedY, 0, (int) tex.width, (int) tex.height);
((GL11Ext)gl).glDrawTexiOES((int)x1, height - (int)y1, 0, (int)(x2 - x1), (int)(y2 - y1));
//gl.glPopMatrix();
if (savedTint) {
tint(savedTintColor);
} else {
noTint();
}
/*
boolean savedTint = tint;
int savedTintColor = tintColor;
@@ -2395,11 +2415,21 @@ public class PGraphicsAndroid3D extends PGraphics {
//float snappedY = (float) Math.floor(y1);
//gl.glTranslatef(snappedX, snappedY, 0.0f);
boolean savedTint = tint;
int savedTintColor = tintColor;
tint(fillColor);
((GL11)gl).glTexParameteriv(GL10.GL_TEXTURE_2D, GL11Ext.GL_TEXTURE_CROP_RECT_OES, tex.crop, 0);
//((GL11Ext)gl).glDrawTexiOES((int) snappedX, height - (int) snappedY, 0, (int) tex.width, (int) tex.height);
((GL11Ext)gl).glDrawTexiOES((int)xx, (int)yy, 0, (int)w0, (int)h0);
if (savedTint) {
tint(savedTintColor);
} else {
noTint();
}
/*
if (textFontTexID != textFont.currentID) {
textFontTexID = textFont.currentID;
android/core/src/processing/core/PTexture.java
+2
View File
@@ -728,6 +728,8 @@ public class PTexture implements PConstants {
gl.glTexParameterf(glTarget, GL10.GL_TEXTURE_WRAP_S, GL10.GL_CLAMP_TO_EDGE);
gl.glTexParameterf(glTarget, GL10.GL_TEXTURE_WRAP_T, GL10.GL_CLAMP_TO_EDGE);
gl.glTexImage2D(glTarget, 0, glInternalFormat, glWidth, glHeight, 0, GL10.GL_RGBA, GL10.GL_UNSIGNED_BYTE, null);
// TODO: check what is the correct way of unbind textures, the following or glDisable(glTarget);
gl.glBindTexture(glTarget, 0);
flippedX = false;