geom-center-and-normalize 2.0.0 → 2.2.0

package/CHANGELOG.md

@@ -1,6 +1,36 @@
 # Changelog
 
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
+
+# [2.2.0](https://github.com/vorg/geom-center-and-normalize/compare/v2.1.1...v2.2.0) (2024-04-16)
+
+
+### Features
+
+* rename scale to normalizedSize ([8007608](https://github.com/vorg/geom-center-and-normalize/commit/800760830ee69d2a882d74447ce97e56ead7e857))
+
+
+
+## [2.1.1](https://github.com/vorg/geom-center-and-normalize/compare/v2.1.0...v2.1.1) (2024-03-14)
+
+
+
+# [2.1.0](https://github.com/vorg/geom-center-and-normalize/compare/v2.0.0...v2.1.0) (2024-03-14)
+
+
+### Bug Fixes
+
+* handle division by 0 for aabb size 0 ([26f146c](https://github.com/vorg/geom-center-and-normalize/commit/26f146cc25b32617eb03fcf71285bc8d419550aa))
+
+
+### Features
+
+* add support for flat arrays ([300c4ad](https://github.com/vorg/geom-center-and-normalize/commit/300c4ad31f233e6b5f93816bfbb06c37b8fcf188))
+* make center and normalize options ([0a051bb](https://github.com/vorg/geom-center-and-normalize/commit/0a051bbf477f3d130bc25262f9a432b400bf255f))
+* replace normalize option with scaling as boolean/number ([fe23ff9](https://github.com/vorg/geom-center-and-normalize/commit/fe23ff9eb06cb7f135667cbaaac977c8b475b67a))
+* separate normalize and scale parameters ([56efcd3](https://github.com/vorg/geom-center-and-normalize/commit/56efcd354e6a5088d5d7474a30339262ee9fadfe))
+
+
 
 # [2.0.0](https://github.com/vorg/geom-center-and-normalize/compare/v1.0.2...v2.0.0) (2023-02-02)
 

package/README.md

@@ -1,6 +1,6 @@
 # geom-center-and-normalize
 
-Center a simplicial complex geometry's positions and scale them to fill 1x1x1 bounding box.
+Center a simplicial complex geometry's positions in place and scale them to fill a defined bounding box.
 
 ## Installation
 
@@ -31,15 +31,17 @@ const normalizedPositions = centerAndNormalize(positions);
 
 ## API
 
-#### `centerAndNormalize(positions): positions`
+#### `centerAndNormalize(positions, [options]): positions`
 
 **Parameters**
 
-- positions: `TypedArray|Array` – simplicial complex geometry positions (eg. `new Float32Array([x, y, z, x, y, z, ...])` or `new Array([x, y, z], [x, y, z], ...)`)
+- positions: `TypedArray | Array | Array<[x, y, z]>` – simplicial complex geometry positions (eg. `new Float32Array([x, y, z, x, y, z, ...])/new Array(x, y, z, x, y, z, ...)` or `new Array([x, y, z], [x, y, z], ...)`)
+
+- options: `{ center: boolean, normalize: boolean, normalizedSize: number }` – enable/disable centering/normalizing and control normalized scaling. `center` and `normalize` defaults to `true`. Scale defaults to `1`.
 
 **Returns**
 
-- positions: `TypedArray|Array` – The positions parameter array updated, centered at `[0, 0, 0]` and normalized to a unit bounding box `[-0.5, -0.5, -0.5] x [0.5, 0.5, 0.5]`.
+- positions: `TypedArray | Array | Array<[x, y, z]>` – The positions parameter array updated, centered at `[0, 0, 0]` and normalized to a bounding box of `normalizedSize` (`[-halfScale, -halfScale, -halfScale] x [halfScale, halfScale, halfScale]`).
 
 ## License
 

package/index.js

@@ -1,25 +1,38 @@
 import { avec3, vec3 } from "pex-math";
 import { aabb } from "pex-geom";
 
-function centerAndNormalize(positions) {
-  const isTypedArray = !Array.isArray(positions);
-  const stride = isTypedArray ? 3 : 1;
+const TEMP_VEC3 = vec3.create();
 
-  const bbox = aabb.create();
-  aabb.fromPoints(bbox, positions);
-  const center = aabb.center(bbox);
-  const size = aabb.size(bbox);
-  const scale = 1 / Math.max(...size);
+function centerAndNormalize(
+  positions,
+  { center = true, normalize = true, normalizedSize = 1 } = {},
+) {
+  const isFlatArray = !positions[0]?.length;
+  const positionsCount = positions.length / (isFlatArray ? 3 : 1);
 
-  for (let i = 0; i < positions.length / stride; i++) {
-    if (isTypedArray) {
-      avec3.sub(positions, i, center, 0);
-      avec3.scale(positions, i, scale);
+  const bbox = aabb.fromPoints(aabb.create(), positions);
+  const bboxCenter = aabb.center(bbox);
+
+  if (normalize) {
+    const size = aabb.size(bbox);
+    normalizedSize = normalizedSize / (Math.max(...size) || 1);
+  }
+
+  for (let i = 0; i < positionsCount; i++) {
+    if (isFlatArray) {
+      avec3.sub(positions, i, bboxCenter, 0);
+      if (normalize) {
+        avec3.scale(positions, i, normalizedSize);
+        if (!center) avec3.add(positions, i, bboxCenter, 0);
+      }
     } else {
-      const p = vec3.copy(positions[i]);
-      vec3.sub(p, center);
-      vec3.scale(p, scale);
-      positions[i] = p;
+      vec3.set(TEMP_VEC3, positions[i]);
+      vec3.sub(TEMP_VEC3, bboxCenter);
+      if (normalize) {
+        vec3.scale(TEMP_VEC3, normalizedSize);
+        if (!center) vec3.add(TEMP_VEC3, bboxCenter);
+      }
+      vec3.set(positions[i], TEMP_VEC3);
     }
   }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "geom-center-and-normalize",
-  "version": "2.0.0",
-  "description": "Center a simplicial complex geometry's positions and scale them to fill 1x1x1 bounding box.",
+  "version": "2.2.0",
+  "description": "Center a simplicial complex geometry's positions in place and scale them to fill a defined bounding box.",
   "keywords": [
     "geom",
     "center",
@@ -25,17 +25,18 @@
   "type": "module",
   "exports": "./index.js",
   "main": "index.js",
+  "types": "types/index.d.ts",
   "scripts": {
     "release": "snowdev release",
     "test": "node --test",
     "test:watch": "node --test --watch test"
   },
   "dependencies": {
-    "pex-geom": "^3.0.0-alpha.3",
-    "pex-math": "^4.0.0-alpha.3"
+    "pex-geom": "^3.0.1",
+    "pex-math": "^4.1.0"
   },
   "engines": {
-    "node": ">=18.0.0",
-    "npm": ">=8.0.0"
+    "node": ">=20.0.0",
+    "npm": ">=9.6.4"
   }
 }

package/types/index.d.ts

@@ -1,2 +1,6 @@
 export default centerAndNormalize;
-declare function centerAndNormalize(positions: any): any;
+declare function centerAndNormalize(positions: any, { center, normalize, normalizedSize }?: {
+    center?: boolean;
+    normalize?: boolean;
+    normalizedSize?: number;
+}): any;