@configura/babylon-view 1.3.0-alpha.2 → 1.3.0-alpha.7

package/dist/utilities/utilities3D.js

@@ -8,10 +8,14 @@ import { Point } from "@configura/web-core/dist/cm/geometry/Point.js";
 export function vector3Equals(left, right) {
     return left.x === right.x && left.y === right.y && left.z === right.z;
 }
+export function cmPointToVector3(point) {
+    return new Vector3(point.x, point.y, point.z);
+}
 const allAxes = ["x", "y", "z"];
-/// Calculates the change in one component for min or max when
-/// moving from one bounding box to another.
-/// Negative result is shrink, positive is grow. forMax is accounted for.
+/**
+ * Calculates the change in one component for min or max when moving from one bounding box to
+ * another. Negative result is shrink, positive is grow. forMax is accounted for.
+ */
 export const getBoundingBoxChangeForAxis = (bbOld, bbNew, forMax, axis) => {
     const getMinMax = forMax
         ? (bb) => bb.maximum
@@ -25,17 +29,20 @@ export const getBoundingBoxChangeForAxis = (bbOld, bbNew, forMax, axis) => {
         ((getC(getMinMax(bbNew)) - getC(getMinMax(bbOld))) /
             Math.abs(getC(bbOld.maximum) - getC(bbOld.minimum))));
 };
-/// Given an old bounding box and a new tells if the size difference
-/// in one component is significant
+/**
+ * Given an old bounding box and a new tells if the size difference in one component is significant.
+ */
 export const boundingBoxChangeIsSignificantForAxis = (bbOld, bbNew, forMax, axis, acceptableDifferenceShrink, acceptableDifferenceGrow) => {
     const change = getBoundingBoxChangeForAxis(bbOld, bbNew, forMax, axis);
     return (change < 0 ? acceptableDifferenceShrink : acceptableDifferenceGrow) < Math.abs(change);
 };
-/// Returns true if one bb was empty and the other not or
-/// There is a size change in any of the six primary directions which
-/// is larger than acceptableDifferenceShrink or acceptableDifferenceGrow
-/// depending if the change from bbOld to bbNew in that direction is
-/// shrink or grow.
+/**
+ * Returns true if either:
+ * - One bounding box was empty and the other not.
+ * - There is a size change in any of the six primary directions which is larger than
+ * acceptableDifferenceShrink or acceptableDifferenceGrow depending if the change from bbOld to
+ * bbNew in that direction is shrink or grow.
+ */
 export function boundingBoxesAreSignificantlyDifferent(bbOld, bbNew, acceptableDifferenceShrink, acceptableDifferenceGrow) {
     if (bbOld.isEmpty !== bbNew.isEmpty) {
         return true;
@@ -107,11 +114,13 @@ export function measureLongestDistanceToCorner(bb, measureComponents) {
     }
     return Math.sqrt(longestSquaredDistanceFromCenter);
 }
-/// Creates an ATriMeshF instance containing a mesh of a sphere of the given radius (default 1)
-/// centered on the given position (default <0,0,0>). The "resolution" of the mesh is set by the
-/// segments value (default 32).
-///
-/// UV coordinates are generated by wrapping the texture around the sphere like a world map.
+/**
+ * Creates an ATriMeshF instance containing a mesh of a sphere of the given radius (default 1)
+ * centered on the given position (default <0,0,0>). The "resolution" of the mesh is set by the
+ * segments value (default 32).
+ *
+ * UV coordinates are generated by wrapping the texture around the sphere like a world map.
+ */
 export function aTriMeshSphere(radius, center, segments) {
     // Simplified and slightly modified (mostly z-up etc) version of SphereBuilder from Babylon.js
     // https://github.com/BabylonJS/Babylon.js/blob/master/src/Meshes/Builders/sphereBuilder.ts
@@ -156,10 +165,12 @@ export function aTriMeshSphere(radius, center, segments) {
     // On the other hand, during testing the calls below took 0ms for 52k indices...
     return ATriMeshF.createWithArrays(Uint32Array.from(indices), Float32Array.from(positions), Float32Array.from(normals), Float32Array.from(uvs));
 }
-/// Creates an ATriMeshF instance containing a mesh of a box between the two points.
-/// Default value of p0 is <0,0,0> and p1 is <1,1,1>.
-///
-/// UV coordinates are generated, repeating the texture on each side.
+/**
+ * Creates an ATriMeshF instance containing a mesh of a box between the two points.
+ * Default value of p0 is <0,0,0> and p1 is <1,1,1>.
+ *
+ * UV coordinates are generated, repeating the texture on each side.
+ */
 export function aTriMeshBox(p0, p1) {
     p0 = p0 !== null && p0 !== void 0 ? p0 : new Point(0, 0, 0);
     p1 = p1 !== null && p1 !== void 0 ? p1 : new Point(1, 1, 1);
@@ -185,3 +196,70 @@ const BOX_UVS = new Float32Array([1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 0, 1, 0, 0, 1, 0
 const BOX_VERTICES = new Float32Array([1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0, 0,
     0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0,
     1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 1]);
+/**
+ * Creates an ATriMeshF instance containing a mesh representing an infinite plane with the given
+ * normal, offset by the given distance along the normal.
+ *
+ * Due to automatic bounding box calculations, the infinite plane is represented by a circular disc
+ * with the given radius centered on a point offset from the origin along the normal vector.
+ *
+ * The number of triangles in the disc is controlled by the refine parameter. The minimum number of
+ * triangles is 4, each refine step doubles the triangle count.
+ *
+ * Default normal: 1, 0, 0
+ * Default offset: 0
+ * Default radius: 1
+ * Default refinement: 4 (64 triangles)
+ */
+export function aTriMeshPlane(normal, offset, radius, refine) {
+    normal = normal !== null && normal !== void 0 ? normal : new Point(0, 0, 1);
+    offset = offset !== null && offset !== void 0 ? offset : 0;
+    radius = radius !== null && radius !== void 0 ? radius : 1;
+    refine = refine !== null && refine !== void 0 ? refine : 4;
+    const normalVec = new Vector3(normal.x, normal.y, normal.z).normalize();
+    let base1 = normalVec.cross(new Vector3(1, 0, 0));
+    if (base1.length() < 0.2) {
+        // Normal was pretty close to 1, 0, 0, try another base vector
+        base1 = normalVec.cross(new Vector3(0, 1, 0));
+    }
+    base1 = base1.normalize();
+    const base2 = base1.cross(normalVec);
+    let points = new Array(5);
+    points[0] = Vector3.Zero();
+    points[1] = base1;
+    points[2] = base2;
+    points[3] = base1.negate();
+    points[4] = base2.negate();
+    for (let i = 0; i < refine; i++) {
+        points = refineCircle(points);
+    }
+    const numTriangles = points.length - 1;
+    const indices = new Uint32Array(numTriangles * 3);
+    for (let i = 0; i < numTriangles; i++) {
+        const index = i * 3;
+        indices[index] = 0;
+        indices[index + 1] = i + 1;
+        indices[index + 2] = i >= numTriangles - 1 ? 1 : i + 2;
+    }
+    const vertices = new Float32Array(points.length * 3);
+    for (let i = 0; i < points.length; i++) {
+        const point = points[i];
+        const index = i * 3;
+        vertices[index] = point.x * radius + normal.x * offset;
+        vertices[index + 1] = point.y * radius + normal.y * offset;
+        vertices[index + 2] = point.z * radius + normal.z * offset;
+    }
+    const mesh = ATriMeshF.createWithArrays(indices, vertices);
+    mesh.doubleSided = true;
+    return mesh;
+}
+function refineCircle(points) {
+    const refined = new Array(points.length * 2 - 1);
+    refined[0] = points[0];
+    for (let i = 1; i < points.length; i++) {
+        const next = (i >= points.length - 1 ? 0 : i) + 1;
+        refined[i * 2 - 1] = points[i];
+        refined[i * 2] = points[i].add(points[next]).normalize();
+    }
+    return refined;
+}

package/dist/utilities/utilitiesSymRootIdentifier.d.ts

@@ -1,6 +1,8 @@
 import { RootNodeSource, Transform as ModelTransform } from "@configura/web-api";
+import { CfgAnchorRef } from "./anchor/anchor.js";
 export declare function makeIdentifier(type: "uri" | "file", v: string): string;
+export declare function identifierIsUri(identifier: string): boolean;
 export declare function makeIdentifierFromRootNodeSource(source: RootNodeSource): string;
-export declare function isSameIdentifierAndTransform(identifier1: string, transform1: ModelTransform | undefined, identifier2: string, transform2: ModelTransform | undefined): boolean;
+export declare function isSameIdentifierTransformAndAnchor(identifier1: string, transform1: ModelTransform | undefined, anchor1: CfgAnchorRef | undefined, identifier2: string, transform2: ModelTransform | undefined, anchor2: CfgAnchorRef | undefined): boolean;
 export declare function isSameRootNodeSource(source1: RootNodeSource, source2: RootNodeSource): boolean;
 //# sourceMappingURL=utilitiesSymRootIdentifier.d.ts.map

package/dist/utilities/utilitiesSymRootIdentifier.js

@@ -1,20 +1,26 @@
 import { isModel } from "@configura/web-api";
+import { CfgAnchorRef } from "./anchor/anchor.js";
 import { modelTransformsEqual } from "./utilities3D.js";
 export function makeIdentifier(type, v) {
-    return `${type}${v}`;
+    return `${type}:${v}`;
+}
+export function identifierIsUri(identifier) {
+    return identifier.startsWith("uri:");
 }
 export function makeIdentifierFromRootNodeSource(source) {
     return isModel(source)
         ? makeIdentifier("uri", source.uri)
         : makeIdentifier("file", source.name);
 }
-export function isSameIdentifierAndTransform(identifier1, transform1, identifier2, transform2) {
+export function isSameIdentifierTransformAndAnchor(identifier1, transform1, anchor1, identifier2, transform2, anchor2) {
     return (identifier1 === identifier2 &&
         ((transform1 === undefined && transform2 === undefined) ||
             (transform1 !== undefined &&
                 transform2 !== undefined &&
-                modelTransformsEqual(transform1, transform2))));
+                modelTransformsEqual(transform1, transform2))) &&
+        ((anchor1 === undefined && anchor2 === undefined) ||
+            (anchor1 !== undefined && anchor2 !== undefined && anchor1.equal(anchor2))));
 }
 export function isSameRootNodeSource(source1, source2) {
-    return isSameIdentifierAndTransform(makeIdentifierFromRootNodeSource(source1), isModel(source1) ? source1.t : undefined, makeIdentifierFromRootNodeSource(source2), isModel(source2) ? source2.t : undefined);
+    return isSameIdentifierTransformAndAnchor(makeIdentifierFromRootNodeSource(source1), isModel(source1) ? source1.t : undefined, isModel(source1) ? CfgAnchorRef.make(source1.anchor) : undefined, makeIdentifierFromRootNodeSource(source2), isModel(source2) ? source2.t : undefined, isModel(source2) ? CfgAnchorRef.make(source2.anchor) : undefined);
 }

package/dist/view/BaseView.d.ts

@@ -12,9 +12,17 @@ import { DummyMaterialCreator } from "../material/DummyMaterialCreator.js";
 import { CfgContentRootNode } from "../nodes/CfgContentRootNode.js";
 import { SceneCreator } from "../scene/SceneCreator.js";
 import { BaseViewConfiguration, BaseViewEventMap, CameraConfigurationProps, DetailLevel, ImageDumpCallback } from "./BaseViewConfiguration.js";
-import { RenderEnv } from "./RenderEnv.js";
+import { RenderEnv } from "./RenderEnv";
 export declare const CET_TO_BABYLON_MATRIX: Matrix;
 export declare const BABYLON_TO_CET_MATRIX: Matrix;
+/**
+ * Load the highest quality meshes by default.
+ *
+ * @remarks We only use "base" as a last fallback. The reason is that even though this LOD level
+ * could theoretically include a better version than "super" it is not normally included in CmSym
+ * files and never used by CET, which makes it unpredictable. See WRD-387 for a case where it
+ * caused problems when it was the first choice.
+ */
 export declare const DEFAULT_DETAIL_LEVELS: DetailLevel[];
 export declare type BaseViewConstructorOptions<C extends Camera> = {
     canvas: HTMLCanvasElement;

package/dist/view/BaseView.js

@@ -18,12 +18,14 @@ export const CET_TO_BABYLON_MATRIX = Matrix.RotationX(-Math.PI / 2);
 export const BABYLON_TO_CET_MATRIX = Matrix.RotationX(Math.PI / 2);
 const ENABLE_CONTINUOUS_RENDER = false;
 const CULL_EMPTY_NODES = true;
-/// Load the highest quality meshes by default.
-///
-/// @remarks We only use "base" as a last fallback. The reason is that even though this LOD level
-/// could theoretically include a better version than "super" it is not normally included in CmSym
-/// files and never used by CET, which makes it unpredictable. See WRD-387 for a case where it
-/// caused problems when it was the first choice.
+/**
+ * Load the highest quality meshes by default.
+ *
+ * @remarks We only use "base" as a last fallback. The reason is that even though this LOD level
+ * could theoretically include a better version than "super" it is not normally included in CmSym
+ * files and never used by CET, which makes it unpredictable. See WRD-387 for a case where it
+ * caused problems when it was the first choice.
+ */
 export const DEFAULT_DETAIL_LEVELS = [
     DetailLevel.super,
     DetailLevel.high,
@@ -31,10 +33,14 @@ export const DEFAULT_DETAIL_LEVELS = [
     DetailLevel.low,
     DetailLevel.base,
 ];
-// As this cache contains items read from a another resource undefined
-// is an acceptable cache value representing a value that will not be
-// anything but undefined no mather how many times you try.
-const geometryCache = new PromiseCache();
+/**
+ * @remarks As this cache contains items read from a another resource undefined is an acceptable
+ * cache value representing a value that will not be anything but undefined no mather how many
+ * times you try.
+ */
+const geometryCache = new PromiseCache((i1, i2) => i1.component === i2.component &&
+    i1.stretchDatasHash === i2.stretchDatasHash &&
+    i1.uvMapperHash === i2.uvMapperHash);
 const symNodeCache = new PromiseCache();
 const materialCache = new PromiseCache();
 const textureImageCache = new PromiseCache();

package/dist/view/RenderEnv.d.ts

@@ -13,11 +13,16 @@ import { CfgMaterial } from "../material/CfgMaterial.js";
 import { MaterialWithMetaData } from "../material/material.js";
 import { TextureImageWithMetaData } from "../material/texture.js";
 import { ScheduleRerender } from "./BaseViewConfiguration.js";
+export declare type GeometryCacheIdentifierObject = {
+    component: SymComponent;
+    stretchDatasHash: number;
+    uvMapperHash: number | undefined;
+};
 export interface RenderEnv {
     scene: Scene;
     assetsManager: AssetsManager;
     dummyMaterial: CfgMaterial;
-    geometryCache: PromiseCache<SymComponent, GeometryCacheEntry | undefined>;
+    geometryCache: PromiseCache<GeometryCacheIdentifierObject, GeometryCacheEntry | undefined>;
     symNodeCache: PromiseCache<string, SymNode>;
     materialCache: PromiseCache<string | GMaterial3D, MaterialWithMetaData>;
     textureImageCache: PromiseCache<string, TextureImageWithMetaData>;

package/dist/view/SingleProductDefaultCameraView.js

@@ -17,7 +17,7 @@ export class SingleProductDefaultCameraView extends SingleProductView {
         const { distance, pitch, yaw } = this._cameraConf;
         let change = false;
         if (distance !== undefined) {
-            this._camera.radius = distance;
+            this._camera.forceRadius(distance);
             change = true;
         }
         if (pitch !== undefined) {

package/dist/view/SingleProductView.d.ts

@@ -1,5 +1,5 @@
 import { Camera } from "@babylonjs/core/Cameras/camera.js";
-import { ApplicationArea, CfgProduct } from "@configura/web-api";
+import { ApplicationArea, CfgProduct, Model, MtrlApplication, PartsData } from "@configura/web-api";
 import { EventListener } from "@configura/web-utilities";
 import { CoordinatorWithMeta } from "../animation/coordinator/Coordinator.js";
 import { CameraCreator } from "../camera/CameraCreator.js";
@@ -19,6 +19,13 @@ export declare type SingleProductViewConstructorOptions<C extends Camera> = {
     sceneCreator?: SceneCreator;
     dummyMaterialCreator?: DummyMaterialCreator;
 };
+export declare type RootNodeSource = Model | File;
+export declare type CfgProductViewProductData = {
+    mtrlApplications?: MtrlApplication[];
+    sku: string;
+    models?: RootNodeSource[];
+    partsData: PartsData;
+};
 export declare class SingleProductView<C extends Camera = Camera, T extends SingleProductViewEventMap = SingleProductViewEventMap> extends BaseView<C, T> {
     private _currentProductNode;
     private _scheduledForRemoval;

package/dist/view/SingleProductView.js

@@ -61,6 +61,7 @@ export class SingleProductView extends BaseView {
                 };
                 try {
                     this.notifyPhaseChange(SingleProductViewPhase.SetModelsAndLoadGeo);
+                    currentProductNode.refreshStretch();
                     yield currentProductNode.loadGeo(animationCoordinator);
                     if (isNewProduct) {
                         // New products needs resizing before rendering the first time

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@configura/babylon-view",
-	"version": "1.3.0-alpha.2",
+	"version": "1.3.0-alpha.7",
 	"license": "Apache-2.0",
 	"type": "module",
 	"main": "dist/index.js",
@@ -16,16 +16,16 @@
 	},
 	"dependencies": {
 		"@babylonjs/core": "4.2.0",
-		"@configura/web-core": "^1.3.0-alpha.2",
-		"@configura/web-utilities": "^1.3.0-alpha.2"
+		"@configura/web-core": "^1.3.0-alpha.7",
+		"@configura/web-utilities": "^1.3.0-alpha.7"
 	},
 	"devDependencies": {
-		"@configura/web-api": "^1.3.0-alpha.2",
+		"@configura/web-api": "^1.3.0-alpha.7",
 		"del-cli": "^3.0.0",
 		"typescript": "4.2"
 	},
 	"publishConfig": {
 		"access": "public"
 	},
-	"gitHead": "ecc00b624310c03a59c0ac5933e06df92326436d"
+	"gitHead": "1c5c089a31e6662b6da365b7038254e70a1cc8ff"
 }