Merge branch 'main' into all-contributors/add-himanshuukholiya

Author: ksen0

.all-contributorsrc

@@ -6233,7 +6233,8 @@
       "avatar_url": "https://avatars.githubusercontent.com/u/7389189?v=4",
       "profile": "https://github.com/AaratiAkkapeddi",
       "contributions": [
-        "code"
+        "code",
+        "ideas"
       ]
     },
     {
@@ -6710,6 +6711,24 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "mclark414",
+      "name": "mclark414",
+      "avatar_url": "https://avatars.githubusercontent.com/u/26391144?v=4",
+      "profile": "https://github.com/mclark414",
+      "contributions": [
+        "ideas"
+      ]
+    },
+    {
+      "login": "mxramsey",
+      "name": "Mx. Ramsey",
+      "avatar_url": "https://avatars.githubusercontent.com/u/161327383?v=4",
+      "profile": "https://github.com/mxramsey",
+      "contributions": [
+        "ideas"
+      ]
     }
   ],
   "repoType": "github",

README.md

@@ -1044,7 +1044,7 @@ We recognize all types of contributions. This project follows the [all-contribut
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/c-dacanay"><img src="https://avatars.githubusercontent.com/u/54914834?v=4?s=120" width="120px;" alt="c-dacanay"/><br /><sub><b>c-dacanay</b></sub></a><br /><a href="#design-c-dacanay" title="Design">🎨</a> <a href="#eventOrganizing-c-dacanay" title="Event Organizing">📋</a> <a href="#example-c-dacanay" title="Examples">💡</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/mathewpan2"><img src="https://avatars.githubusercontent.com/u/112679001?v=4?s=120" width="120px;" alt="mathewpan2"/><br /><sub><b>mathewpan2</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=mathewpan2" title="Code">💻</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/cog25"><img src="https://avatars.githubusercontent.com/u/74242561?v=4?s=120" width="120px;" alt="cog25"/><br /><sub><b>cog25</b></sub></a><br /><a href="#translation-cog25" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="16.66%"><a href="https://github.com/AaratiAkkapeddi"><img src="https://avatars.githubusercontent.com/u/7389189?v=4?s=120" width="120px;" alt="Aarati Akkapeddi "/><br /><sub><b>Aarati Akkapeddi </b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=AaratiAkkapeddi" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/AaratiAkkapeddi"><img src="https://avatars.githubusercontent.com/u/7389189?v=4?s=120" width="120px;" alt="Aarati Akkapeddi "/><br /><sub><b>Aarati Akkapeddi </b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=AaratiAkkapeddi" title="Code">💻</a> <a href="#ideas-AaratiAkkapeddi" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
     <tr>
       <td align="center" valign="top" width="16.66%"><a href="https://mayaarguelles.com/"><img src="https://avatars.githubusercontent.com/u/29130029?v=4?s=120" width="120px;" alt="Maya Arguelles"/><br /><sub><b>Maya Arguelles</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=mayaarguelles" title="Code">💻</a></td>
@@ -1113,6 +1113,8 @@ We recognize all types of contributions. This project follows the [all-contribut
     <tr>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/webermayank"><img src="https://avatars.githubusercontent.com/u/111176033?v=4?s=120" width="120px;" alt="Mayank Verma"/><br /><sub><b>Mayank Verma</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=webermayank" title="Code">💻</a></td>
       <td align="center" valign="top" width="16.66%"><a href="https://github.com/himanshuukholiya"><img src="https://avatars.githubusercontent.com/u/128818464?v=4?s=120" width="120px;" alt="Himanshu Kholiya"/><br /><sub><b>Himanshu Kholiya</b></sub></a><br /><a href="https://github.com/processing/p5.js/commits?author=himanshuukholiya" title="Code">💻</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/mclark414"><img src="https://avatars.githubusercontent.com/u/26391144?v=4?s=120" width="120px;" alt="mclark414"/><br /><sub><b>mclark414</b></sub></a><br /><a href="#ideas-mclark414" title="Ideas, Planning, & Feedback">🤔</a></td>
+      <td align="center" valign="top" width="16.66%"><a href="https://github.com/mxramsey"><img src="https://avatars.githubusercontent.com/u/161327383?v=4?s=120" width="120px;" alt="Mx. Ramsey"/><br /><sub><b>Mx. Ramsey</b></sub></a><br /><a href="#ideas-mxramsey" title="Ideas, Planning, & Feedback">🤔</a></td>
     </tr>
   </tbody>
 </table>

src/accessibility/outputs.js

@@ -579,8 +579,13 @@ p5.prototype._getPos = function (x, y) {
 function _canvasLocator(args, canvasWidth, canvasHeight) {
   const noRows = 10;
   const noCols = 10;
-  let locX = Math.floor(args[0] / canvasWidth * noRows);
-  let locY = Math.floor(args[1] / canvasHeight * noCols);
+  let x = args[0];
+  let y = args[1];
+  if (x < 0 || x >= canvasWidth || y < 0 || y >= canvasHeight) {
+    return null;
+  }
+  let locX = Math.floor(x / canvasWidth * noRows);
+  let locY = Math.floor(y / canvasHeight * noCols);
   if (locX === noRows) {
     locX = locX - 1;
   }

src/webgl/p5.Camera.js

@@ -2435,6 +2435,7 @@ p5.Camera = class Camera {
     const rotation = p5.Matrix.identity(this._renderer._pInst);
     rotation.rotate(this._renderer._pInst._toRadians(a), x, y, z);
 
+    // Apply the rotation matrix to the center vector
     /* eslint-disable max-len */
     const rotatedCenter = [
       centerX * rotation.mat4[0] + centerY * rotation.mat4[4] + centerZ * rotation.mat4[8],
@@ -2443,21 +2444,28 @@ p5.Camera = class Camera {
     ];
     /* eslint-enable max-len */
 
-    // add eye position back into center
+    // Translate the rotated center back to world coordinates
     rotatedCenter[0] += this.eyeX;
     rotatedCenter[1] += this.eyeY;
     rotatedCenter[2] += this.eyeZ;
 
+    // Rotate the up vector to keep the correct camera orientation
+    /* eslint-disable max-len */
+    const upX = this.upX * rotation.mat4[0] + this.upY * rotation.mat4[4] + this.upZ * rotation.mat4[8];
+    const upY = this.upX * rotation.mat4[1] + this.upY * rotation.mat4[5] + this.upZ * rotation.mat4[9];
+    const upZ = this.upX * rotation.mat4[2] + this.upY * rotation.mat4[6] + this.upZ * rotation.mat4[10];
+    /* eslint-enable max-len */
+
     this.camera(
       this.eyeX,
       this.eyeY,
       this.eyeZ,
       rotatedCenter[0],
       rotatedCenter[1],
       rotatedCenter[2],
-      this.upX,
-      this.upY,
-      this.upZ
+      upX,
+      upY,
+      upZ
     );
   }
 

test/unit/webgl/p5.Camera.js

@@ -277,6 +277,61 @@ suite('p5.Camera', function() {
       assert.strictEqual(myCam.upY, orig.uy, 'up Y pos changed');
       assert.strictEqual(myCam.upZ, orig.uz, 'up Z pos changed');
     });
+
+    suite('Camera Tilt and Up Vector', function() {
+      test('Tilt() correctly updates the up vector', function() {
+        var orig = getVals(myCam); // Store original camera values
+
+        // Apply tilt to the camera
+        myCam.tilt(30); // Tilt by 30 degrees
+
+        // Compute expected up vector (normalized)
+        let forward = myp5.createVector(
+          myCam.centerX - myCam.eyeX,
+          myCam.centerY - myCam.eyeY,
+          myCam.centerZ - myCam.eyeZ
+        );
+        let up = myp5.createVector(orig.ux, orig.uy, orig.uz);
+        let right = p5.Vector.cross(forward, up);
+        let expectedUp = p5.Vector.cross(right, forward).normalize();
+
+        // Verify that the up vector has changed
+        assert.notStrictEqual(myCam.upX, orig.ux, 'upX should be updated');
+        assert.notStrictEqual(myCam.upY, orig.uy, 'upY should be updated');
+        assert.notStrictEqual(myCam.upZ, orig.uz, 'upZ should be updated');
+
+        // Verify up vector matches expected values within a small margin of error
+        assert.closeTo(myCam.upX, expectedUp.x, 0.001, 'upX mismatch');
+        assert.closeTo(myCam.upY, expectedUp.y, 0.001, 'upY mismatch');
+        assert.closeTo(myCam.upZ, expectedUp.z, 0.001, 'upZ mismatch');
+      });
+
+      test('Tilt() with negative angle correctly updates the up vector', function() {
+        var orig = getVals(myCam); // Store original camera values
+
+        myCam.tilt(-30); // Tilt by -30 degrees
+
+        // Compute expected up vector (normalized)
+        let forward = myp5.createVector(
+          myCam.centerX - myCam.eyeX,
+          myCam.centerY - myCam.eyeY,
+          myCam.centerZ - myCam.eyeZ
+        );
+        let up = myp5.createVector(orig.ux, orig.uy, orig.uz);
+        let right = p5.Vector.cross(forward, up);
+        let expectedUp = p5.Vector.cross(right, forward).normalize();
+
+        // Verify that the up vector has changed
+        assert.notStrictEqual(myCam.upX, orig.ux, 'upX should be updated');
+        assert.notStrictEqual(myCam.upY, orig.uy, 'upY should be updated');
+        assert.notStrictEqual(myCam.upZ, orig.uz, 'upZ should be updated');
+
+        // Verify up vector matches expected values within a small margin of error
+        assert.closeTo(myCam.upX, expectedUp.x, 0.001, 'upX mismatch');
+        assert.closeTo(myCam.upY, expectedUp.y, 0.001, 'upY mismatch');
+        assert.closeTo(myCam.upZ, expectedUp.z, 0.001, 'upZ mismatch');
+      });
+    });
   });
 
   suite('Rotation with angleMode(DEGREES)', function() {