eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-14 10:55:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

starting rev 94, fixing some textMode issues, additions to the faq, toxi

Browse Source 
code for tga leniancy
This commit is contained in:
benfry
2005-10-15 18:13:01 +00:00
parent 31af9c9246
commit 88efb88a38
7 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
core/PGraphics.java
View File

@@ -1707,7 +1707,8 @@ public class PGraphics extends PImage implements PConstants {
throw new RuntimeException("use textFont() before textAscent()");
}
return textFont.ascent() * textSize;
return textFont.ascent() *
((textMode == SCREEN) ? textFont.size : textSize);
}
@@ -1718,7 +1719,8 @@ public class PGraphics extends PImage implements PConstants {
*/
public float textDescent() {
if (textFont != null) {
return textFont.descent() * textSize;
return textFont.descent() *
((textMode == SCREEN) ? textFont.size : textSize);
} else {
throw new RuntimeException("use textFont() before textDescent()");
@@ -1734,8 +1736,8 @@ public class PGraphics extends PImage implements PConstants {
public void textFont(PFont which) {
if (which != null) {
textFont = which;
textSize(which.size);
textFontNative = which.font;
textSize(textFont.size);
} else {
throw new RuntimeException("a null PFont was passed to textFont()");
@@ -1780,18 +1782,18 @@ public class PGraphics extends PImage implements PConstants {
"are available with this renderer.");
}
if (textFont != null) {
textMode = mode;
//if (textFont != null) {
textMode = mode;
// reset the font to its natural size
// (helps with width calculations and all that)
if (textMode == SCREEN) {
textSize(textFont.size);
}
// reset the font to its natural size
// (helps with width calculations and all that)
//if (textMode == SCREEN) {
//textSize(textFont.size);
//}
} else {
throw new RuntimeException("use textFont() before textMode()");
}
//} else {
//throw new RuntimeException("use textFont() before textMode()");
//}
}