Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.0 modules clean up #7361

Merged
merged 5 commits into from
Nov 5, 2024
Merged

2.0 modules clean up #7361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9081ef1
Convert more classes to be exportable
limzykenneth Nov 2, 2024
42be883
Move input event listener to p5.Element.js
limzykenneth Nov 2, 2024
ae81cdd
Merge branch 'dev-2.0' into 2.0-modules
limzykenneth Nov 5, 2024
ae508c7
Selectively attach renderer properties to p5.Graphics
limzykenneth Nov 5, 2024
f655f0f
Fix Color class not imported to p5.Element
limzykenneth Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions preview/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,12 @@
import p5 from '../src/app.js';

const sketch = function (p) {
let g, f;

p.setup = function () {
p.createCanvas(200, 200);
g = p.createGraphics(200, 200);
f = p.createGraphics(200, 200, p.WEBGL);
};

p.draw = function () {
Expand All @@ -31,6 +35,10 @@
p.fill('white');
p.textSize(30);
p.text('hello', 10, 30);

// f.fill('red');
f.sphere();
p.image(f, 0, 0);
};
};

Expand Down
3 changes: 0 additions & 3 deletions src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ import './core/friendly_errors/validate_params';
import './core/friendly_errors/file_errors';
import './core/friendly_errors/fes_core';
import './core/friendly_errors/sketch_reader';
import './core/p5.Element';
// import './core/p5.Graphics';
// import './core/rendering';
import shape from './shape';
shape(p5);

Expand Down
4 changes: 2 additions & 2 deletions src/core/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,7 +665,7 @@ import rendering from './rendering';
import renderer from './p5.Renderer';
import renderer2D from './p5.Renderer2D';
import graphics from './p5.Graphics';
import element from './p5.Element';
// import element from './p5.Element';

p5.registerAddon(transform);
p5.registerAddon(structure);
Expand All @@ -674,6 +674,6 @@ p5.registerAddon(rendering);
p5.registerAddon(renderer);
p5.registerAddon(renderer2D);
p5.registerAddon(graphics);
p5.registerAddon(element);
// p5.registerAddon(element);

export default p5;
Loading
Loading