Skip to content

Commit b66247f

Browse files
authored
Merge pull request #7361 from limzykenneth/2.0-modules
2.0 modules clean up
2 parents 8909e1b + f655f0f commit b66247f

16 files changed

+2200
-2204
lines changed

preview/index.html

+8
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,12 @@
2020
import p5 from '../src/app.js';
2121

2222
const sketch = function (p) {
23+
let g, f;
24+
2325
p.setup = function () {
2426
p.createCanvas(200, 200);
27+
g = p.createGraphics(200, 200);
28+
f = p.createGraphics(200, 200, p.WEBGL);
2529
};
2630

2731
p.draw = function () {
@@ -31,6 +35,10 @@
3135
p.fill('white');
3236
p.textSize(30);
3337
p.text('hello', 10, 30);
38+
39+
// f.fill('red');
40+
f.sphere();
41+
p.image(f, 0, 0);
3442
};
3543
};
3644

src/app.js

-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@ import './core/friendly_errors/validate_params';
55
import './core/friendly_errors/file_errors';
66
import './core/friendly_errors/fes_core';
77
import './core/friendly_errors/sketch_reader';
8-
import './core/p5.Element';
9-
// import './core/p5.Graphics';
10-
// import './core/rendering';
118
import shape from './shape';
129
shape(p5);
1310

src/core/main.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ import rendering from './rendering';
665665
import renderer from './p5.Renderer';
666666
import renderer2D from './p5.Renderer2D';
667667
import graphics from './p5.Graphics';
668-
import element from './p5.Element';
668+
// import element from './p5.Element';
669669

670670
p5.registerAddon(transform);
671671
p5.registerAddon(structure);
@@ -674,6 +674,6 @@ p5.registerAddon(rendering);
674674
p5.registerAddon(renderer);
675675
p5.registerAddon(renderer2D);
676676
p5.registerAddon(graphics);
677-
p5.registerAddon(element);
677+
// p5.registerAddon(element);
678678

679679
export default p5;

0 commit comments

Comments
 (0)