From 066bd622a82213fe2b170811b60d37653e97144a Mon Sep 17 00:00:00 2001 From: Kyah Rindlisbacher Date: Wed, 21 Jun 2017 09:53:52 +1000 Subject: [PATCH] Move size() from setup() to settings() as per https://github.com/processing/processing-docs/issues/298#issuecomment-140218268 also added .gitattributes file to avoid eol style changes --- .gitattributes | 1 + evolutionSteer.pde | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..35af787 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.pde text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2 \ No newline at end of file diff --git a/evolutionSteer.pde b/evolutionSteer.pde index ea1723a..ed22d62 100644 --- a/evolutionSteer.pde +++ b/evolutionSteer.pde @@ -850,6 +850,11 @@ void drawStatusWindow(boolean isFirstFrame) { } } } + +void settings() { + size((int)(windowWidth*windowSizeMultiplier), (int)(windowHeight*windowSizeMultiplier),P3D); +} + void setup() { String[] prePatronData = loadStrings("PatronReport_2017-06-12.csv"); patronData = new String[PATRON_COUNT]; @@ -866,7 +871,6 @@ void setup() { frameRate(60); randomSeed(SEED); noSmooth(); - size((int)(windowWidth*windowSizeMultiplier), (int)(windowHeight*windowSizeMultiplier),P3D); ellipseMode(CENTER); Float[] beginPercentile = new Float[29]; Integer[] beginBar = new Integer[barLen]; @@ -1609,4 +1613,4 @@ float getFitness(){ } void setFitness(int i){ c[i].d = getFitness(); -} +}