Merge pull request #7432 from processing/hooks-updates

Updates to shader hooks for 2.0
processing · Dec 18, 2024 · 8d68d48 · 8d68d48
2 parents 2ada04a + 5f81f8f
commit 8d68d48
Show file tree

Hide file tree

Showing 50 changed files with 636 additions and 208 deletions.
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.states.uMVMatrix.mat4) :
+      new DOMMatrix(this._renderer.calculateCombinedMatrix()) :
       this.drawingContext.getTransform();
     const { x: transformedX, y: transformedY } = untransformedPosition
       .matrixTransform(currentTransform);

diff --git a/src/webgl/GeometryBuilder.js b/src/webgl/GeometryBuilder.js
@@ -37,7 +37,7 @@ class GeometryBuilder {
     if (!this.hasTransform) return normals;
 
     return normals.map(
-      v => this.renderer.states.uNMatrix.multiplyVec(v) // this is a vec3
+      v => this.renderer.scratchMat3.multiplyVec(v) // this is a vec3
     );
   }
 
@@ -51,7 +51,7 @@ class GeometryBuilder {
       .every((v, i) => v === this.identityMatrix.mat4[i]);
 
     if (this.hasTransform) {
-      this.renderer.states.uNMatrix.inverseTranspose4x4(this.renderer.states.uModelMatrix);
+      this.renderer.scratchMat3.inverseTranspose4x4(this.renderer.states.uModelMatrix);
     }
 
     let startIdx = this.geometry.vertices.length;