Skip to content

Commit b9dea80

Browse files
committed
Removed import within class body.
Unfortunately, mainline Processing is inconsistent on if imports within class bodies are allowed by the language definition. JavaBuild currently allows it (though does not explicitly permit it) while SourceUtil assumes that imports are "hoistable" to the top of the sketch so imply that the language does not permit it. The Sam Pottinger branch of Processing (specifically sampottinger/processing#15) makes SourceUtil's assumption explicity by dissallowing import statements within class bodies. This PR updates romanesco in response.
1 parent 2e06aa9 commit b9dea80

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+517
-1134
lines changed

.DS_Store

-10 KB
Binary file not shown.

src/sources/A___rendering_33/A__CORE_ROMANESCO.pde

100755100644
Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -449,14 +449,3 @@ void center_sketch(ivec2 loc) {
449449
int term_y_1 = height/2;
450450
loc.y = term_y_0 - term_y_1;
451451
}
452-
453-
454-
455-
456-
457-
458-
459-
460-
461-
462-

src/sources/A___rendering_33/A___rendering_33.pde

100755100644
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,6 +472,3 @@ void mouseWheel(MouseEvent e) {
472472
wheel[0] = e.getCount() *speedWheel;
473473
}
474474
}
475-
476-
477-

src/sources/A___rendering_33/A_debug.pde

100755100644
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,3 @@ void test_set_pix_density() {
3333
set(x,y,c);
3434
}
3535
}
36-
37-
38-
39-

src/sources/A___rendering_33/B_Core_Prescene.pde

100755100644
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,3 @@ void key_false() {
364364
if (key_left) key_left = false;
365365
if (key_right) key_right = false;
366366
}
367-
368-
369-

src/sources/A___rendering_33/B_Core_Scene.pde

100755100644
Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void init_value_temp_prescene() {
7474
* MANAGE DIALOGUE SCENE
7575
*/
7676
void save_dial_scene(String path) {
77-
Table save_dial = new Table();
77+
processing.data.Table save_dial = new processing.data.Table();
7878
save_dial.addColumn("fx active");
7979
save_dial.addColumn("fx slider active");
8080
TableRow table_row = save_dial.addRow();
@@ -100,7 +100,3 @@ void save_dial_scene(String path) {
100100
table_row.setString("fx slider active",list_slider);
101101
saveTable(save_dial,path+"/dialogue_from_scene.csv");
102102
}
103-
104-
105-
106-

src/sources/A___rendering_33/D_depracated.pde

100755100644
Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -481,17 +481,3 @@ class Canvas {
481481
}
482482
// END CANVAS
483483
/////////////
484-
485-
486-
487-
488-
489-
490-
491-
492-
493-
494-
495-
496-
497-

src/sources/A___rendering_33/O_Abyss.pde

100755100644
Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,16 +1584,3 @@ class The_Abbyss extends Romanesco {
15841584
//END CATALOGUE
15851585

15861586
}
1587-
1588-
1589-
1590-
1591-
1592-
1593-
1594-
1595-
1596-
1597-
1598-
1599-

src/sources/A___rendering_33/O_Arbre.pde

100755100644
Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,3 @@ class ArbreRomanesco extends Romanesco {
242242
}
243243
}
244244
}
245-
246-
247-
248-
249-
250-
251-
252-
253-

src/sources/A___rendering_33/O_Atome.pde

100755100644
Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,17 +1462,3 @@ String whichSentence(String txt, int whichChapter, int whichSentence) {
14621462

14631463
return repartition[whichChapter][whichSentence] ;
14641464
}
1465-
1466-
1467-
1468-
1469-
1470-
1471-
1472-
1473-
1474-
1475-
1476-
1477-
1478-

src/sources/A___rendering_33/O_BoumBoum.pde

100755100644
Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,3 @@ class BoumBoum extends Romanesco {
125125
}
126126
}
127127
}
128-
129-
130-
131-
132-
133-
134-
135-
136-
137-
138-
139-

src/sources/A___rendering_33/O_Boxolyzer.pde

100755100644
Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -263,18 +263,3 @@ class Boxolyzer extends Romanesco {
263263
}
264264
}
265265
}
266-
267-
268-
269-
270-
271-
272-
273-
274-
275-
276-
277-
278-
279-
280-

src/sources/A___rendering_33/O_Cellular_automata.pde

100755100644
Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -229,22 +229,3 @@ class Cellular_automata extends Romanesco {
229229
}
230230
}
231231
}
232-
233-
234-
235-
236-
237-
238-
239-
240-
241-
242-
243-
244-
245-
246-
247-
248-
249-
250-

src/sources/A___rendering_33/O_Ecosystem_host.pde

100755100644
Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -350,32 +350,3 @@ void costume_DNA(Helix helix, int target, vec3 size, float direction, Costume co
350350
costume(pos_b, size, angle_b,costume) ;
351351

352352
}
353-
354-
355-
356-
357-
358-
359-
360-
361-
362-
363-
364-
365-
366-
367-
368-
369-
370-
371-
372-
373-
374-
375-
376-
377-
378-
379-
380-
381-

src/sources/A___rendering_33/O_Escargot.pde

100755100644
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1822,9 +1822,3 @@ int timer(float tempo) {
18221822
chronometer = newChronometer ;
18231823
return chrnmtr ;
18241824
}
1825-
1826-
1827-
1828-
1829-
1830-

src/sources/A___rendering_33/O_FF_Flux.pde

100755100644
Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -195,22 +195,3 @@ class Flux extends Romanesco {
195195
}
196196
}
197197
}
198-
199-
200-
201-
202-
203-
204-
205-
206-
207-
208-
209-
210-
211-
212-
213-
214-
215-
216-

src/sources/A___rendering_33/O_FF_Force_field.pde

100755100644
Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -354,22 +354,3 @@ class FF extends Romanesco {
354354
colorMode(color_mode_ref,color_arg_ref.red(),color_arg_ref.gre(),color_arg_ref.blu(),color_arg_ref.alp());
355355
}
356356
}
357-
358-
359-
360-
361-
362-
363-
364-
365-
366-
367-
368-
369-
370-
371-
372-
373-
374-
375-

src/sources/A___rendering_33/O_FF_Puppet_Master.pde

100755100644
Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -329,15 +329,3 @@ class Puppet_master extends Romanesco {
329329
} else return true;
330330
}
331331
}
332-
333-
334-
335-
336-
337-
338-
339-
340-
341-
342-
343-

src/sources/A___rendering_33/O_Grillo.pde

100755100644
Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -213,18 +213,3 @@ class Grillo extends Romanesco {
213213
}
214214
}
215215
}
216-
217-
218-
219-
220-
221-
222-
223-
224-
225-
226-
227-
228-
229-
230-

src/sources/A___rendering_33/O_Hexagone.pde

100755100644
Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -283,12 +283,3 @@ class Honeycomb extends Romanesco {
283283
}
284284
}
285285
//end object two
286-
287-
288-
289-
290-
291-
292-
293-
294-

src/sources/A___rendering_33/O_Kino.pde

100755100644
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -201,11 +201,3 @@ class Kino extends Romanesco {
201201
}
202202
}
203203
}
204-
205-
206-
207-
208-
209-
210-
211-

src/sources/A___rendering_33/O_Kofosphere.pde

100755100644
Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,3 @@ class Kofosphere extends Romanesco {
234234
}
235235
}
236236
}
237-
238-
239-
240-

src/sources/A___rendering_33/O_Letter.pde

100755100644
Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,3 @@ class Letter extends Romanesco {
304304
return pts ;
305305
}
306306
}
307-
308-
309-
310-
311-
312-

src/sources/A___rendering_33/O_Lorenz.pde

100755100644
Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,3 @@ class Lorenz extends Romanesco {
149149
if(mode == 1) endShape() ;
150150
}
151151
}
152-
153-
154-
155-
156-
157-
158-
159-
160-
161-
162-
163-

src/sources/A___rendering_33/O_Mer.pde

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -217,18 +217,3 @@ class Mer extends Romanesco {
217217
}
218218
//
219219
}
220-
221-
222-
223-
224-
225-
226-
227-
228-
229-
230-
231-
232-
233-
234-

src/sources/A___rendering_33/O_Rosace.pde

100755100644
Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1367,12 +1367,3 @@ class Rose {
13671367

13681368

13691369
}
1370-
1371-
1372-
1373-
1374-
1375-
1376-
1377-
1378-

0 commit comments

Comments
 (0)