Merge branch 'dev-2.0' into shaders

processing · Oct 17, 2024 · a414e6b · a414e6b
2 parents 03faf7b + ef1b09c
commit a414e6b
Show file tree

Hide file tree

Showing 74 changed files with 24,353 additions and 22,991 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,25 +1,25 @@
-*.DS_Store
-.project
-node_modules/*
-experiments/*
-lib_old/*
-lib/p5.*
-lib/modules
-docs/reference/*
-!*.gitkeep
-examples/3d/
-.idea
-dist/
-p5.zip
-bower-repo/
-p5-website/
-.vscode/settings.json
-.nyc_output/*
-coverage/
-lib/p5-test.js
-release/
-yarn.lock
-docs/data.json
-analyzer/
-preview/
+*.DS_Store
+.project
+node_modules/*
+experiments/*
+lib_old/*
+lib/p5.*
+lib/modules
+docs/reference/*
+!*.gitkeep
+examples/3d/
+.idea
+dist/
+p5.zip
+bower-repo/
+p5-website/
+.vscode/settings.json
+.nyc_output/*
+coverage/
+lib/p5-test.js
+release/
+yarn.lock
+docs/data.json
+analyzer/
+preview/
 __screenshots__/
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,13 +22,14 @@
   },
   "version": "1.9.4",
   "dependencies": {
+    "acorn": "^8.12.1",
+    "acorn-walk": "^8.3.4",
     "colorjs.io": "^0.5.2",
     "file-saver": "^1.3.8",
     "gifenc": "^1.0.3",
     "libtess": "^1.2.2",
     "omggif": "^1.0.10",
-    "opentype.js": "^1.3.1",
-    "zod-validation-error": "^3.3.1"
+    "opentype.js": "^1.3.1"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^25.0.7",
@@ -83,4 +84,4 @@
       "pre-commit": "lint-staged"
     }
   }
-}
+}
diff --git a/preview/index.html b/preview/index.html
@@ -1,41 +1,44 @@
 <!DOCTYPE html>
 <html>
+
 <head>
   <title>P5 test</title>
   <meta http-equiv="pragma" content="no-cache" />
   <meta http-equiv="cache-control" content="no-cache" />
   <meta charset="utf-8">
 
   <style>
-  body{
-    margin:0;
-    overflow: hidden;
-  }
+    body {
+      margin: 0;
+      overflow: hidden;
+    }
   </style>
 </head>
+
 <body>
-<script type="module">
-import p5 from '../src/app.js';
-// import calculation from './src/math/calculation.js';
+  <script type="module">
+    import p5 from '../src/app.js';
+    // import calculation from './src/math/calculation.js';
 
-// p5.registerAddon(calculation);
+    // p5.registerAddon(calculation);
 
-const sketch = function(p){
-  p.setup = function(){
-    p.createCanvas(200, 200);
-  };
+    const sketch = function (p) {
+      p.setup = function () {
+        p.createCanvas(200, 200);
+      };
 
-  p.draw = function(){
-    p.background(0, 50, 50);
-    p.circle(100, 100, 50);
+      p.draw = function () {
+        p.background(0, 50, 50);
+        p.circle(100, 100, 50);
 
-    p.fill('white');
-    p.textSize(30);
-    p.text('hello', 10, 30);
-  };
-};
+        p.fill('white');
+        p.textSize(30);
+        p.text('hello', 10, 30);
+      };
+    };
 
-new p5(sketch);
-</script>
+    new p5(sketch);
+  </script>
 </body>
+
 </html>
diff --git a/src/accessibility/outputs.js b/src/accessibility/outputs.js
@@ -543,7 +543,7 @@ function outputs(p5, fn){
   fn._getPos = function (x, y) {
     const untransformedPosition = new DOMPointReadOnly(x, y);
     const currentTransform = this._renderer.isP3D ?
-      new DOMMatrix(this._renderer.uMVMatrix.mat4) :
+      new DOMMatrix(this._renderer.states.uMVMatrix.mat4) :
       this.drawingContext.getTransform();
     const { x: transformedX, y: transformedY } = untransformedPosition
       .matrixTransform(currentTransform);
@@ -663,7 +663,7 @@ function outputs(p5, fn){
     ];
     //  Apply the inverse of the current transformations to the canvas corners
     const currentTransform = this._renderer.isP3D ?
-      new DOMMatrix(this._renderer.uMVMatrix.mat4) :
+      new DOMMatrix(this._renderer.states.uMVMatrix.mat4) :
       this.drawingContext.getTransform();
     const invertedTransform = currentTransform.inverse();
     const tc = canvasCorners.map(

diff --git a/src/app.js b/src/app.js
@@ -68,24 +68,12 @@ import utilities from './utilities';
 utilities(p5);
 
 // webgl
-import './webgl/3d_primitives';
-import './webgl/interaction';
-import './webgl/light';
-import './webgl/loading';
-import './webgl/material';
-import './webgl/p5.Camera';
-import './webgl/p5.DataArray';
-import './webgl/p5.Geometry';
-import './webgl/p5.Matrix';
-import './webgl/p5.Quat';
+import webgl from './webgl';
+webgl(p5);
 import './webgl/p5.RendererGL.Immediate';
 import './webgl/p5.RendererGL';
 import './webgl/p5.RendererGL.Retained';
-import './webgl/p5.Framebuffer';
-import './webgl/p5.Shader';
-import './webgl/p5.RenderBuffer';
 import './webgl/p5.Texture';
-import './webgl/text';
 
 import './core/init';
 

diff --git a/src/color/setting.js b/src/color/setting.js
@@ -1209,8 +1209,8 @@ function setting(p5, fn){
    * @chainable
    */
   fn.fill = function(...args) {
-    this._renderer._setProperty('_fillSet', true);
-    this._renderer._setProperty('_doFill', true);
+    this._renderer.states.fillSet = true;
+    this._renderer.states.doFill = true;
     this._renderer.fill(...args);
     return this;
   };
@@ -1271,7 +1271,7 @@ function setting(p5, fn){
    * </div>
    */
   fn.noFill = function() {
-    this._renderer._setProperty('_doFill', false);
+    this._renderer.states.doFill = false;
     return this;
   };
 
@@ -1327,7 +1327,7 @@ function setting(p5, fn){
    * </div>
    */
   fn.noStroke = function() {
-    this._renderer._setProperty('_doStroke', false);
+    this._renderer.states.doStroke = false;
     return this;
   };
 
@@ -1581,8 +1581,8 @@ function setting(p5, fn){
    */
 
   fn.stroke = function(...args) {
-    this._renderer._setProperty('_strokeSet', true);
-    this._renderer._setProperty('_doStroke', true);
+    this._renderer.states.strokeSet = true;
+    this._renderer.states.doStroke = true;
     this._renderer.stroke(...args);
     return this;
   };

diff --git a/src/core/environment.js b/src/core/environment.js
@@ -410,9 +410,9 @@ p5.prototype.frameRate = function(fps) {
   if (typeof fps !== 'number' || fps < 0) {
     return this._frameRate;
   } else {
-    this._setProperty('_targetFrameRate', fps);
+    this._targetFrameRate = fps;
     if (fps === 0) {
-      this._setProperty('_frameRate', fps);
+      this._frameRate = fps;
     }
     return this;
   }
@@ -770,8 +770,8 @@ p5.prototype.windowHeight = 0;
  * This example does not render anything.
  */
 p5.prototype._onresize = function(e) {
-  this._setProperty('windowWidth', getWindowWidth());
-  this._setProperty('windowHeight', getWindowHeight());
+  this.windowWidth = getWindowWidth();
+  this.windowHeight = getWindowHeight();
   const context = this._isGlobal ? window : this;
   let executeDefault;
   if (typeof context.windowResized === 'function') {
@@ -805,8 +805,8 @@ function getWindowHeight() {
  * possibility of the window being resized when no sketch is active.
  */
 p5.prototype._updateWindowSize = function() {
-  this._setProperty('windowWidth', getWindowWidth());
-  this._setProperty('windowHeight', getWindowHeight());
+  this.windowWidth = getWindowWidth();
+  this.windowHeight = getWindowHeight();
 };
 
 /**