Merge branch 'main' into main

Author: ksen0

.all-contributorsrc

@@ -6813,6 +6813,44 @@
         "bug",
         "doc"
       ]
+    },
+    {
+      "login": "clairep94",
+      "name": "Claire Peng",
+      "avatar_url": "https://avatars.githubusercontent.com/u/128436909?v=4",
+      "profile": "https://github.com/clairep94",
+      "contributions": [
+        "code",
+        "bug"
+      ]
+    },
+    {
+      "login": "IIITM-Jay",
+      "name": "Jay Dev Jha",
+      "avatar_url": "https://avatars.githubusercontent.com/u/65283880?v=4",
+      "profile": "https://github.com/IIITM-Jay",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "yugalkaushik",
+      "name": "Yugal Kaushik",
+      "avatar_url": "https://avatars.githubusercontent.com/u/138966980?v=4",
+      "profile": "https://yugalkaushik.vercel.app",
+      "contributions": [
+        "code",
+        "doc"
+      ]
+    },
+    {
+      "login": "LalitNarayanYadav",
+      "name": "Lalit Narayan Yadav",
+      "avatar_url": "https://avatars.githubusercontent.com/u/162928571?v=4",
+      "profile": "https://github.com/LalitNarayanYadav",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "repoType": "github",

.github/workflows/release-workflow.yml

@@ -73,6 +73,7 @@ jobs:
         uses: JS-DevTools/npm-publish@v1
         with:
           token: ${{ secrets.NPM_TOKEN }}
+          tag: r1
 
       # 4. Update p5.js website
       - name: Clone p5.js website

README.md

@@ -1135,6 +1135,11 @@ We recognize all types of contributions. This project follows the [all-contribut
     </tr>
     <tr>
       <td align="center" valign="top" width="16.66%"><a href="http://jackeddielove.github.io"><img src="https://avatars.githubusercontent.com/u/130420780?v=4?s=64" width="64px;" alt="Jack L"/><br /><sub><b>Jack L</b></sub></a><br /><a href="https://github.com/processing/p5.js/issues?q=author%3Ajackeddielove" title="Bug reports">🐛</a> <a href="https://github.com/processing/p5.js/commits?author=jackeddielove" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="http://jackeddielove.github.io"><img src="https://avatars.githubusercontent.com/u/130420780?v=4?s=64" width="64px;" alt="Jack L"/><br /><sub><b>Jack L</b></sub></a><br /><a href="https://github.com/processing/p5.js/issues?q=author%3Ajackeddielove" title="Bug reports">🐛</a> <a href="https://github.com/processing/p5.js/commits?author=jackeddielove" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/clairep94"><img src="https://avatars.githubusercontent.com/u/128436909?v=4?s=64" width="64px;" alt="Claire Peng"/><br /><sub><b>Claire Peng</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=clairep94" title="Code">💻</a> <a href="https://github.com/processing/p5.js/issues?q=author%3Aclairep94" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/IIITM-Jay"><img src="https://avatars.githubusercontent.com/u/65283880?v=4?s=64" width="64px;" alt="Jay Dev Jha"/><br /><sub><b>Jay Dev Jha</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=IIITM-Jay" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://yugalkaushik.vercel.app"><img src="https://avatars.githubusercontent.com/u/138966980?v=4?s=64" width="64px;" alt="Yugal Kaushik"/><br /><sub><b>Yugal Kaushik</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=yugalkaushik" title="Code">💻</a> <a href="https://github.com/processing/p5.js/commits?author=yugalkaushik" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/LalitNarayanYadav"><img src="https://avatars.githubusercontent.com/u/162928571?v=4?s=64" width="64px;" alt="Lalit Narayan Yadav"/><br /><sub><b>Lalit Narayan Yadav</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=LalitNarayanYadav" title="Documentation">📖</a></td>
     </tr>
   </tbody>
 </table>

package-lock.json

@@ -24,7 +24,7 @@
       "node --require @babel/register ./utils/sample-linter.js"
     ]
   },
-  "version": "1.11.5",
+  "version": "1.11.7",
   "devDependencies": {
     "@babel/core": "^7.7.7",
     "@babel/preset-env": "^7.10.2",

package.json

@@ -37,7 +37,7 @@ class p5 {
     //////////////////////////////////////////////
     // PUBLIC p5 PROPERTIES AND METHODS
     //////////////////////////////////////////////
-
+    this._isGlobal = !sketch;
     /**
      * A function that's called once to load assets before the sketch runs.
      *
@@ -286,7 +286,6 @@ class p5 {
     this._glAttributes = null;
     this._requestAnimId = 0;
     this._preloadCount = 0;
-    this._isGlobal = false;
     this._loop = true;
     this._startListener = null;
     this._initializeInstanceVariables();
@@ -661,21 +660,11 @@ class p5 {
     // ensure correct reporting of window dimensions
     this._updateWindowSize();
 
-    // call any registered init functions
-    this._registeredMethods.init.forEach(function(f) {
-      if (typeof f !== 'undefined') {
-        f.call(this);
-      }
-    }, this);
-    // Set up promise preloads
-    this._setupPromisePreloads();
-
     const friendlyBindGlobal = this._createFriendlyGlobalFunctionBinder();
 
     // If the user has created a global setup or draw function,
     // assume "global" mode and make everything global (i.e. on the window)
-    if (!sketch) {
-      this._isGlobal = true;
+    if (this._isGlobal) {
       p5.instance = this;
       // Loop through methods on the prototype and attach them to the window
       for (const p in p5.prototype) {
@@ -710,8 +699,14 @@ class p5 {
       p5._checkForUserDefinedFunctions(this);
     }
 
-    // Bind events to window (not using container div bc key events don't work)
+    this._updateWindowSize();
+
+    // call any registered init functions
+    this.callRegisteredHooksFor('init');
+    // Set up promise preloads
+    this._setupPromisePreloads();
 
+    // Bind events to window (not using container div bc key events don't work)
     for (const e in this._events) {
       const f = this[`_on${e}`];
       if (f) {

src/core/main.js

@@ -441,11 +441,13 @@ p5.prototype.keyCode = 0;
  * </div>
  */
 p5.prototype._onkeydown = function(e) {
+  // Ignore repeated key events when holding down a key
   if (e.repeat) {
-    // Ignore repeated key events when holding down a key
+    this._setProperty('isKeyRepeated', true);
     return;
   }
 
+  this._setProperty('isKeyRepeated', false);
   this._setProperty('isKeyPressed', true);
   this._setProperty('keyIsPressed', true);
   this._setProperty('keyCode', e.which);
@@ -781,7 +783,7 @@ p5.prototype._onkeyup = function(e) {
  * </div>
  */
 p5.prototype._onkeypress = function(e) {
-  if (e.which === this._lastKeyCodeTyped) {
+  if (e.which === this._lastKeyCodeTyped && this.isKeyRepeated) {
     // prevent multiple firings
     return;
   }

src/events/keyboard.js

@@ -825,15 +825,19 @@ p5.prototype._updateNextMouseCoords = function(e) {
       this.height,
       e
     );
-    this._setProperty('movedX', e.movementX);
-    this._setProperty('movedY', e.movementY);
+
     this._setProperty('mouseX', mousePos.x);
     this._setProperty('mouseY', mousePos.y);
     this._setProperty('winMouseX', mousePos.winX);
     this._setProperty('winMouseY', mousePos.winY);
+
+    const deltaX = this.mouseX - this.pmouseX;
+    const deltaY = this.mouseY - this.pmouseY;
+    this._setProperty('movedX', deltaX);
+    this._setProperty('movedY', deltaY);
   }
+
   if (!this._hasMouseInteracted) {
-    // For first draw, make previous and next equal
     this._updateMouseCoords();
     this._setProperty('_hasMouseInteracted', true);
   }