Skip to content

Commit ef1f587

Browse files
authored
Merge pull request #3 from Niels-NTG/03_A
03_A: Compatibility fixes for Processing 3.2.3
2 parents 96ae6af + 39d7940 commit ef1f587

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

03_A/Cover/Cover.pde

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Cover.pde
22
// ImageRibbon.pde, Tag.pde
3-
//
3+
//
44
// Generative Gestaltung, ISBN: 978-3-87439-759-9
55
// First Edition, Hermann Schmidt, Mainz, 2009
66
// Hartmut Bohnacker, Benedikt Groß, Julia Laub, Claudius Lazzeroni
@@ -129,10 +129,12 @@ float tagBlockFactor = 1;
129129
float tagBlockGapRatio = 0.25;
130130

131131

132+
void settings() {
133+
size(1310 * qf, 822 * qf);
134+
}
132135

133136

134137
void setup() {
135-
size(1310*qf, 822*qf);
136138
frameRate(4);
137139

138140
smooth();
@@ -310,16 +312,16 @@ void setup() {
310312
// ------ load files ------
311313
imageCount = 0;
312314

313-
File dir = new File(sketchPath, "data/images");
315+
File dir = new File(sketchPath(), "data/images");
314316

315317
if (dir.isDirectory()) {
316318
String[] contents = dir.list();
317-
images = new PImage[contents.length];
319+
images = new PImage[contents.length];
318320
//for (int i = 15 ; i < 60; i++) {
319321
for (int i = 0 ; i < contents.length; i++) {
320322
if (contents[i].charAt(0) == '.') continue;
321323
else if (contents[i].toLowerCase().endsWith(".png") || contents[i].toLowerCase().endsWith(".jpg")) {
322-
File childFile = new File(dir, contents[i]);
324+
File childFile = new File(dir, contents[i]);
323325
images[imageCount] = loadImage(childFile.getPath());
324326
println(imageCount+" - "+contents[i]);
325327
imageCount++;

03_A/Force_Directed_Tags/Force_Directed_Tags.pde

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,12 @@ int[] bookParts = new int[0];
9999
PFont font;
100100

101101

102+
void settings() {
103+
size((2*205)*qf, 285*qf);
104+
}
105+
106+
102107
void setup() {
103-
size((2*205)*qf, 285*qf);
104108
background(255);
105109
smooth();
106110
noStroke();

0 commit comments

Comments
 (0)