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

pull the pixelDensity() calls out

Browse Source
This commit is contained in:
Ben Fry
2015-06-08 12:32:05 -04:00
parent b0d2d2e453
commit 08f9dac076
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
java/src/processing/mode/java/preproc/PdePreprocessor.java
View File

@@ -309,20 +309,25 @@ public class PdePreprocessor {
searchArea = sb.toString();
}
StringList extraStatements = new StringList();
// First look for noSmooth() or smooth(N) so we can hoist it into settings.
String smoothStatement = null;
String[] smoothContents = matchMethod("smooth", searchArea);
if (smoothContents != null) {
smoothStatement = smoothContents[0];
extraStatements.append(smoothContents[0]);
}
String[] noContents = matchMethod("noSmooth", searchArea);
if (noContents != null) {
if (smoothStatement != null) {
if (extraStatements != null) {
throw new SketchException("smooth() and noSmooth() cannot be used in the same sketch");
} else {
smoothStatement = noContents[0];
extraStatements.append(noContents[0]);
}
}
String[] pixelDensityContents = matchMethod("pixelDensity", searchArea);
if (pixelDensityContents != null) {
extraStatements.append(pixelDensityContents[0]);
}
String[] sizeContents = matchMethod("size", searchArea);
String[] fullContents = matchMethod("fullScreen", searchArea);
@@ -364,8 +369,8 @@ public class PdePreprocessor {
throw new SketchException("Please fix the size() line to continue.", false);
}
if (smoothStatement != null) {
info.statement += smoothStatement;
if (extraStatements != null) {
info.statement += extraStatements;
}
info.checkEmpty();
return info;
@@ -396,8 +401,8 @@ public class PdePreprocessor {
}
info.width = "displayWidth";
info.height = "displayHeight";
if (smoothStatement != null) {
info.statement += smoothStatement;
if (extraStatements != null) {
info.statement += extraStatements.join(" ");
}
info.checkEmpty();
return info;
@@ -405,9 +410,9 @@ public class PdePreprocessor {
// Made it this far, but no size() or fullScreen(), and still
// need to pull out the noSmooth() and smooth(N) methods.
if (smoothStatement != null) {
if (extraStatements != null) {
SurfaceInfo info = new SurfaceInfo();
info.statement = smoothStatement;
info.statement = extraStatements.join(" ");
return info;
}