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

got things compiling again (but nothing actually works)

Browse Source
This commit is contained in:
benfry
2005-02-15 05:48:26 +00:00
parent a470ed8e4d
commit df1ffdc8c4
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/PFont.java
View File

@@ -428,10 +428,10 @@ public class PFont implements PConstants {
float lextent = (float) leftExtent[glyph] / fwidth;
float textent = (float) topExtent[glyph] / fheight;
int savedTextureMode = parent.textureMode;
//int savedTextureMode = parent.textureMode;
boolean savedStroke = parent.stroke;
parent.textureMode = IMAGE_SPACE;
//parent.textureMode = IMAGE_SPACE;
//parent.drawing_text = true;
parent.stroke = false;
@@ -457,7 +457,7 @@ public class PFont implements PConstants {
parent.vertex(x2, y1, z, width[glyph], 0);
parent.endShape();
parent.textureMode = savedTextureMode;
//parent.textureMode = savedTextureMode;
//parent.drawing_text = false;
parent.stroke = savedStroke;

17
core/PGraphics.java
View File

@@ -699,21 +699,24 @@ public class PGraphics extends PImage implements PConstants {
// STROKE/FILL/DRAW
protected void fill_shape(Shape s) {
//protected void fill_shape(Shape s) {
protected void fill_shape(Path s) {
if (fill) {
//graphics.setColor(fillColorObject);
//graphics.fill(s);
}
}
protected void stroke_shape(Shape s) {
//protected void stroke_shape(Shape s) {
protected void stroke_shape(Path s) {
if (stroke) {
//graphics.setColor(strokeColorObject);
//graphics.draw(s);
}
}
protected void draw_shape(Shape s) {
//protected void draw_shape(Shape s) {
protected void draw_shape(Path s) {
if (fill) {
//graphics.setColor(fillColorObject);
//graphics.fill(s);
@@ -1558,7 +1561,7 @@ public class PGraphics extends PImage implements PConstants {
if (y2 < y1) {
float temp = y1; y1 = y2; y2 = temp;
}
textFont.text(s, x1, y1, z, x2, y2, this);
textFont.text(s, x1, y1, x2, y2, this);
} else {
System.err.println("text(): first set a font before drawing text");
@@ -1695,7 +1698,7 @@ public class PGraphics extends PImage implements PConstants {
throw new RuntimeException("too many calls to pop() " +
"(and not enough to push)");
//message(COMPLAINT, "matrix stack underflow, to many popmatrix");
return;
//return;
}
matrixStackDepth--;
float mat[] = matrixStack[matrixStackDepth];
@@ -2570,7 +2573,7 @@ public class PGraphics extends PImage implements PConstants {
}
}
class Shape extends Path {
}
//class Shape extends Path {
//}
}

2
core/PGraphics2.java
View File

@@ -526,7 +526,7 @@ public class PGraphics2 extends PGraphics {
public void image(PImage image,
float a, float b, float c, float d,
float u1, float v1, float u2, float v2) {
int u1, int v1, int u2, int v2) {
check_image_cache(image);
super.image(image, a, b, c, d, u1, v1, u2, v2);
}