visgl · sraimund · Dec 26, 2024 · Dec 26, 2024 · Dec 26, 2024 · Dec 26, 2024
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   check_branch:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     outputs:
       should_build: ${{ steps.permitted.outputs.result }}
 
@@ -30,7 +30,7 @@ jobs:
           echo "result=${result}" >> "$GITHUB_OUTPUT"
 
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs: check_branch
     permissions:
       contents: write

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   check_branch:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     outputs:
       should_deploy: ${{ endsWith(github.ref, steps.get_version.outputs.latest) }}
 

diff --git a/.ocularrc.js b/.ocularrc.js
@@ -2,7 +2,7 @@ import {resolve} from 'path';
 
 export default {
   lint: {
-    paths: ['dev-docs', 'docs', 'modules', 'examples', 'test'], // 'website'
+    paths: ['dev-docs', 'docs', 'modules', 'test'], // 'examples', 'website'
     extensions: ['js', 'mjs', 'jsx', 'ts', 'tsx', 'd.ts', 'md']
   },
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## v4.2.0-alpha.3
+
+- chore: Fix CI release action (#47)
+
+## v4.2.0-alpha.2
+
+- chore: Fix CI workflows (#46)
+- build(deps): bump nanoid from 3.3.7 to 3.3.8 (#39)
+
+## v4.2.0-alpha.1
+
+- feat(geospatial): Add makeOBBFromRegion() (#43) (Co-authored-by: Raimund Schnürer <[email protected]>)
+- chore: Bump lerna to 4.2.0-alpha.0. Fix CI. Modernize dependencies. (#41)
+- build(deps): bump vite from 4.5.3 to 4.5.5 (#34)
+- chore: Fix website build (#33)
+
 ## v4.1.0
 
 - Website home page pass

diff --git a/docs/modules/core/api-reference/matrix.md b/docs/modules/core/api-reference/matrix.md
@@ -1,6 +1,6 @@
 # Matrix
 
-`Matrix` is a base class for [`Matrix3`](./docs/modules/core/api-reference/vector3) and [`Matrix4`](./docs/modules/core/api-reference/vector4), providing common methods to those classes.
+`Matrix` is a base class for [`Matrix3`](/docs/modules/core/api-reference/vector3) and [`Matrix4`](/docs/modules/core/api-reference/vector4), providing common methods to those classes.
 
 ## Methods
 

diff --git a/docs/whats-new.md b/docs/whats-new.md
@@ -45,12 +45,18 @@
   </tbody>
 </table>
 
-## v5.0 (In planning stage)
+## v5.0 (In planning)
 
-Release Date: TBD, maybe Q4, 2024.
+Release Date: TBD, maybe Q2, 2025.
 
 Goal: Stronger type guarantees for math classes via the new sized array types.
 
+## v4.2 (In development)
+
+Release Date: TBD, maybe Q1, 2024.
+
+Goal: Minor functionality additions, as required.
+
 ## v4.1
 
 Release Date: Sep 7, 2024.

diff --git a/examples/benchmarks/app.js → examples/benchmarks/app.tsx b/examples/benchmarks/app.js → examples/benchmarks/app.tsx
diff --git a/examples/benchmarks/index.html b/examples/benchmarks/index.html
@@ -1,24 +1,7 @@
 <!doctype html>
-<html>
-  <head>
-    <meta charset='UTF-8' />
-    <title>math.gl benchmarks</title>
-    <style>
-      body {
-        font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-        font-size: 13px;
-        -webkit-font-smoothing: antialiased;
-        margin:0;
-        padding:0;
-        overflow:auto;
-      }
-    </style>
-  </head>
-  <body/>
-    <div id="app"></div>
-    <script src='./app.js'></script>
-  </body>
-  <script type="text/javascript">
-    App.renderToDOM(document.getElementById('app'));
-  </script>
-</html>
+<script type="module">
+  import {renderToDOM} from './app.tsx';
+  renderToDOM(document.body);
+</script>
+<body style="margin: 0;">
+</body>
diff --git a/examples/benchmarks/package.json b/examples/benchmarks/package.json
@@ -4,25 +4,19 @@
   "license": "MIT",
   "private": true,
   "scripts": {
-    "start": "webpack-dev-server --progress --hot --open",
-    "start-local": "webpack-dev-server --env.local --progress --hot --open",
-    "generate": "node ./generate-index/index.js"
+    "start": "vite",
+    "build": "tsc && vite build",
+    "serve": "vite preview"
   },
   "dependencies": {
+    "@math.gl/core": "4.1.0-alpha.9",
     "@probe.gl/bench": "^4.0.0",
     "@probe.gl/react-bench": "^4.0.0",
     "react": "^16.3.0",
     "react-dom": "^16.3.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.0.0",
-    "@babel/core": "^7.4.0",
-    "@babel/preset-react": "^7.0.0",
-    "babel-loader": "^8.0.5",
-    "css-loader": "^2.1.1",
-    "style-loader": "^0.23.1",
-    "webpack": "^5.94.0",
-    "webpack-cli": "^3.1.2",
-    "webpack-dev-server": "^3.1.11"
+    "typescript": "^5.5.0",
+    "vite": "^5.0.0"
   }
 }
diff --git a/examples/benchmarks/vite.config.ts b/examples/benchmarks/vite.config.ts
@@ -0,0 +1,18 @@
+import fs from 'fs/promises';
+import {defineConfig} from 'vite';
+
+/** @see https://vitejs.dev/config/ */
+export default defineConfig(async () => ({
+  resolve: {alias: await getAliases('@math.gl', `${__dirname}/../..`)},
+  server: {open: true}
+}));
+
+/** Run against local source */
+const getAliases = async (frameworkName, frameworkRootDir) => {
+  const modules = await fs.readdir(`${frameworkRootDir}/modules`);
+  const aliases = {};
+  for (const module of modules) {
+    aliases[`${frameworkName}/${module}`] = `${frameworkRootDir}/modules/${module}/src`;
+  }
+  return aliases;
+};
diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "4.1.0-alpha.9",
+  "version": "4.2.0-alpha.3",
   "npmClient": "yarn",
   "exact": true,
   "packages": [

diff --git a/modules/core/package.json b/modules/core/package.json
@@ -6,7 +6,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "4.1.0-alpha.9",
+  "version": "4.2.0-alpha.3",
   "keywords": [
     "webgl",
     "javascript",
@@ -45,7 +45,7 @@
     "./src/lib/common.js"
   ],
   "dependencies": {
-    "@math.gl/types": "4.1.0-alpha.9"
+    "@math.gl/types": "4.2.0-alpha.3"
   },
   "gitHead": "e1a95300cb225a90da6e90333d4adf290f7ba501"
 }
diff --git a/modules/core/src/classes/matrix3.ts b/modules/core/src/classes/matrix3.ts
@@ -5,6 +5,7 @@
 
 import {NumericArray, NumericArray9} from '@math.gl/types';
 import {Matrix} from './base/matrix';
+import {Vector3} from './vector3';
 import {checkVector} from '../lib/validators';
 
 import {vec4_transformMat3} from '../lib/gl-matrix-extras';
@@ -202,6 +203,20 @@ export class Matrix3 extends Matrix {
     return this.check();
   }
 
+  /**
+   * Computes the product of this matrix times a (non-uniform) scale, as if the scale were a scale matrix.
+   *
+   * @param scale The non-uniform scale on the right-hand side.
+   * @returns The modified result parameter.
+   */
+  multiplyByScale(scale: Vector3): Matrix3 {
+    const x = scale.x;
+    const y = scale.y;
+    const z = scale.z;
+
+    return super.scale([x, x, x, y, y, y, z, z, z]);
+  }
+
   rotate(radians: number): this {
     mat3_rotate(this, this, radians);
     return this.check();

diff --git a/modules/core/src/index.ts b/modules/core/src/index.ts
@@ -48,6 +48,8 @@ export {
   // math.gl global utility methods
   config,
   configure,
+  safeMod,
+  normalizeAngle,
   formatValue,
   isArray,
   clone,

diff --git a/modules/core/src/lib/common.ts b/modules/core/src/lib/common.ts
@@ -7,6 +7,7 @@
 import type {NumericArray} from '@math.gl/types';
 
 import type {MathArray} from '../classes/base/math-array';
+import {EPSILON14, TWO_PI, PI} from './math-utils';
 
 const RADIANS_TO_DEGREES = (1 / Math.PI) * 180;
 const DEGREES_TO_RADIANS = (1 / 180) * Math.PI;
@@ -122,6 +123,73 @@ export function degrees(
   return map(radians, (radians) => radians * RADIANS_TO_DEGREES, result);
 }
 
+
+/**
+ * The modulo operation that also works for negative dividends.
+ *
+ * @param m The dividend.
+ * @param n The divisor.
+ * @returns The remainder.
+ */
+export function safeMod(m: number, n: number): number {
+  if (Math.sign(m) === Math.sign(n) && Math.abs(m) < Math.abs(n)) {
+    return m;
+  }
+
+  return ((m % n) + n) % n;
+}
+
+/**
+ * Produces an angle restricted to its equivalent in a normalized range
+ *
+ * @param angle in radians
+ * @param range 'zero-to-two-pi' - in the range 0 <= angle <= 2PI, | 'negative-pi-to-pi' -  -Pi <= angle <= Pi
+ * @returns The angle in the range [0, <code>TWO_PI</code>] or  [<code>-PI</code>, <code>PI</code>]..
+ */
+export function normalizeAngle(
+  angle: number,
+  range: 'zero-to-two-pi' | 'negative-pi-to-pi'
+): number {
+  switch (range) {
+    case 'negative-pi-to-pi':
+      return negativePiToPi(angle);
+    case 'zero-to-two-pi':
+      return zeroToTwoPi(angle);
+    default:
+      return angle;
+  }
+}
+
+/**
+ * Produces an angle in the range 0 <= angle <= 2Pi which is equivalent to the provided angle.
+ *
+ * @param angle in radians
+ * @returns The angle in the range [0, <code>TWO_PI</code>].
+ */
+function zeroToTwoPi(angle: number): number {
+  if (angle >= 0 && angle <= TWO_PI) {
+    return angle;
+  }
+  const remainder = safeMod(angle, TWO_PI);
+  if (Math.abs(remainder) < EPSILON14 && Math.abs(angle) > EPSILON14) {
+    return TWO_PI;
+  }
+  return remainder;
+}
+
+/**
+ * Produces an angle in the range -Pi <= angle <= Pi which is equivalent to the provided angle.
+ *
+ * @param angle in radians
+ * @returns The angle in the range [<code>-PI</code>, <code>PI</code>].
+ */
+function negativePiToPi(angle: number): number {
+  if (angle >= -PI && angle <= PI) {
+    return angle;
+  }
+  return zeroToTwoPi(angle + PI) - PI;
+}
+
 /**
  * "GLSL equivalent" of `Math.sin`: Works on single values and vectors
  * @deprecated

diff --git a/modules/core/src/lib/math-utils.ts b/modules/core/src/lib/math-utils.ts
@@ -29,4 +29,5 @@ export const PI_OVER_TWO = Math.PI / 2;
 export const PI_OVER_FOUR = Math.PI / 4;
 export const PI_OVER_SIX = Math.PI / 6;
 
+export const PI = Math.PI;
 export const TWO_PI = Math.PI * 2;
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ on: @@
     jobs:
       test:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-20.04
         steps:
           - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ Expand Down @@