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

PGraphics3 text working again

Browse Source
This commit is contained in:
benfry
2005-03-01 14:04:11 +00:00
parent 17ca7a3326
commit d0bc034f17
5 changed files with 61 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
processing/core/PFont.java
View File

@@ -177,11 +177,8 @@ public class PFont implements PConstants {
images = new PImage[charCount];
for (int i = 0; i < charCount; i++) {
//int pixels[] = new int[64 * 64];
int pixels[] = new int[twidth * theight];
//images[i] = new PImage(pixels, 64, 64, ALPHA);
images[i] = new PImage(pixels, twidth, theight, ALPHA);
//images[i] = new PImage(pixels, twidth, theight, RGBA);
int bitmapSize = height[i] * width[i];
byte temp[] = new byte[bitmapSize];
@@ -193,23 +190,16 @@ public class PFont implements PConstants {
for (int y = 0; y < h; y++) {
for (int x = 0; x < w; x++) {
int valu = temp[y*w + x] & 0xff;
//images[i].pixels[y * twidth + x] = valu;
images[i].pixels[y * twidth + x] = valu;
//(valu << 24) | 0xFFFFFF; // windows
//0xFFFFFF00 | valu; // macosx
//0xFFFFFF00 | valu; // macosx
//(valu << 24) | (valu << 16) | (valu << 8) | valu;
//0x8040ff40;
//(valu << 24) | (valu << 16) | (valu << 8) | valu;
//System.out.print((images[i].pixels[y*64+x] > 128) ? "*" : ".");
}
//System.out.println();
}
//System.out.println();
}
///cached = false;
//resetSize();
//space = OBJECT_SPACE;
//align = ALIGN_LEFT;
@@ -477,17 +467,30 @@ public class PFont implements PConstants {
//parent.rectImpl(x1, y1, x2, y2);
//boolean savedTint = parent.tint;
//int savedTintColor = parent.tintColor;
//parent.tint = true;
//parent.tintColor = parent.fillColor;
boolean savedTint = parent.tint;
int savedTintColor = parent.tintColor;
float savedTintR = parent.tintR;
float savedTintG = parent.tintG;
float savedTintB = parent.tintB;
float savedTintA = parent.tintA;
parent.tint = true;
parent.tintColor = parent.fillColor;
parent.tintR = parent.fillR;
parent.tintG = parent.fillG;
parent.tintB = parent.fillB;
parent.tintA = parent.fillA;
parent.imageImpl(images[glyph],
x1, y1, x2-x1, y2-y1,
x1, y1, x2, y2, //x2-x1, y2-y1,
0, 0, width[glyph], height[glyph]);
//parent.tint = savedTint;
//parent.tintColor = savedTintColor;
parent.tint = savedTint;
parent.tintColor = savedTintColor;
parent.tintR = savedTintR;
parent.tintG = savedTintG;
parent.tintB = savedTintB;
parent.tintA = savedTintA;
/*
// this code was moved here (instead of using parent.image)
@@ -609,9 +612,9 @@ public class PFont implements PConstants {
}
private void textLine(int start, int stop,
float x, float y, float z,
PGraphics parent) {
protected void textLine(int start, int stop,
float x, float y, float z,
PGraphics parent) {
//float startX = x;
//int index = 0;
//char previous = 0;
@@ -641,15 +644,15 @@ public class PFont implements PConstants {
/**
* Draw text in a box that is constrained to a particular size.
* The current rectMode() determines what the coordinates mean
* (whether x1/y1/x2/y2 or x/y/w/h).
* The parent PApplet will have converted the coords based on
* the current rectMode().
*
* Note that the x,y coords of the start of the box
* will align with the *ascent* of the text, not the baseline,
* as is the case for the other text() functions.
*/
public void text(String str, float boxX1, float boxY1, float boxZ,
float boxX2, float boxY2, PGraphics parent) {
public void text(String str, float boxX1, float boxY1,
float boxX2, float boxY2, float boxZ, PGraphics parent) {
float spaceWidth = width(' ');
float runningX = boxX1;
float currentY = boxY1;
@@ -748,7 +751,7 @@ public class PFont implements PConstants {
}
// ....................................................................
//////////////////////////////////////////////////////////////
/**
@@ -808,10 +811,19 @@ public class PFont implements PConstants {
};
/**
* Create a new .vlw font on the fly. See documentation with
* the later version of this constructor.
*/
public PFont(String name, int size) {
this(new Font(name, Font.PLAIN, size), false, true);
}
/**
* Create a new .vlw font on the fly. See documentation with
* the later version of this constructor.
*/
public PFont(String name, int size, boolean smooth) {
this(new Font(name, Font.PLAIN, size), false, smooth);
}

11
processing/core/PGraphics.java
View File

@@ -1403,7 +1403,7 @@ public class PGraphics extends PImage implements PConstants {
protected void imageImpl(PImage image,
float x, float y, float w, float h,
float x1, float y1, float x2, float y2,
int u1, int v1, int u2, int v2) {
// TODO blit an image to the screen
}
@@ -1590,6 +1590,15 @@ public class PGraphics extends PImage implements PConstants {
}
/**
* Draw text in a box that is constrained to a particular size.
* The current rectMode() determines what the coordinates mean
* (whether x1/y1/x2/y2 or x/y/w/h).
*
* Note that the x,y coords of the start of the box
* will align with the *ascent* of the text, not the baseline,
* as is the case for the other text() functions.
*/
public void text(String s, float x1, float y1, float x2, float y2) {
if (textFont != null) {
float hradius, vradius;

12
processing/core/PGraphics2.java
View File

@@ -542,8 +542,9 @@ public class PGraphics2 extends PGraphics {
protected void imageImpl(PImage who,
float x, float y, float w, float h,
int u1, int v1, int u2, int v2) {
float x1, float y1, float x2, float y2,
//float x, float y, float w, float h,
int u1, int v1, int u2, int v2) {
if (who.cache == null) {
who.cache = new BufferedImage(who.width, who.height,
BufferedImage.TYPE_INT_ARGB);
@@ -565,11 +566,12 @@ public class PGraphics2 extends PGraphics {
who.modified = false;
}
int x2 = (int) (x + w);
int y2 = (int) (y + h);
//int x2 = (int) (x + w);
//int y2 = (int) (y + h);
graphics.drawImage((Image) who.cache,
(int) x, (int) y, x2, y2,
//(int) x, (int) y, x2, y2,
(int) x1, (int) y1, (int) x2, (int) y2,
u1, v1, u2, v2, null);
}

8
processing/core/PGraphics3.java
View File

@@ -1929,11 +1929,11 @@ public class PGraphics3 extends PGraphics {
protected void imageImpl(PImage image,
float x1, float y1, float w, float h,
float x1, float y1, float x2, float y2,
int u1, int v1, int u2, int v2) {
float x2 = x1 + w;
float y2 = y1 + h;
//float x2 = x1 + w;
//float y2 = y1 + h;
boolean savedStroke = stroke;
boolean savedFill = fill;
@@ -1961,6 +1961,8 @@ public class PGraphics3 extends PGraphics {
fillA = 1;
}
//System.out.println(fill + " " + fillR + " " + fillG + " " + fillB);
beginShape(QUADS);
texture(image);
vertex(x1, y1, u1, v1);

2
processing/core/PMethods.java
View File

@@ -154,7 +154,7 @@ public interface PMethods {
int u1, int v1, int u2, int v2);
//protected void imageImpl(PImage image,
// float x, float y, float w, float h,
// float x1, float y1, float x2, float y2,
// int u1, int v1, int u2, int v2);
//