eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-13 18:35:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

changes made to api for the newyorkmag globe project and while working on illustrator stuff

Browse Source
This commit is contained in:
benfry
2006-02-27 20:42:52 +00:00
parent b4d02f1953
commit 635bb68b4f
3 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/PGraphics.java
View File

@@ -108,9 +108,9 @@ public class PGraphics extends PImage implements PConstants {
/** tint that was last set (read-only) */
public int tintColor;
boolean tintAlpha;
float tintR, tintG, tintB, tintA;
int tintRi, tintGi, tintBi, tintAi;
protected boolean tintAlpha;
protected float tintR, tintG, tintB, tintA;
protected int tintRi, tintGi, tintBi, tintAi;
// ........................................................
@@ -120,9 +120,9 @@ public class PGraphics extends PImage implements PConstants {
/** fill that was last set (read-only) */
public int fillColor;
boolean fillAlpha;
float fillR, fillG, fillB, fillA;
int fillRi, fillGi, fillBi, fillAi;
protected boolean fillAlpha;
protected float fillR, fillG, fillB, fillA;
protected int fillRi, fillGi, fillBi, fillAi;
// ........................................................
@@ -132,9 +132,9 @@ public class PGraphics extends PImage implements PConstants {
/** stroke that was last set (read-only) */
public int strokeColor;
boolean strokeAlpha;
float strokeR, strokeG, strokeB, strokeA;
int strokeRi, strokeGi, strokeBi, strokeAi;
protected boolean strokeAlpha;
protected float strokeR, strokeG, strokeB, strokeA;
protected int strokeRi, strokeGi, strokeBi, strokeAi;
// ........................................................
@@ -174,8 +174,12 @@ public class PGraphics extends PImage implements PConstants {
* Model transformation of the form m[row][column],
* which is a "column vector" (as opposed to "row vector") matrix.
*/
public float m00, m01, m02;
public float m10, m11, m12;
//public float m00, m01, m02;
//public float m10, m11, m12;
public float m00, m01, m02, m03;
public float m10, m11, m12, m13;
public float m20, m21, m22, m23;
public float m30, m31, m32, m33;
//public int angleMode;
@@ -1786,7 +1790,12 @@ public class PGraphics extends PImage implements PConstants {
if (which != null) {
textFont = which;
textFontNative = which.font;
textFontNativeMetrics = null;
//textFontNativeMetrics = null;
// changed for rev 0104 for textMode(SHAPE) in opengl
if (textFontNative != null) {
textFontNativeMetrics =
Toolkit.getDefaultToolkit().getFontMetrics(textFontNative);
}
textSize(which.size);
} else {