@configura/babylon-view 1.5.0-alpha.0 → 1.6.0-iotest.0

package/dist/geometry/stretch/CfgStretchData.d.ts

@@ -52,6 +52,7 @@ export declare type StretchSection = {
 export declare class CfgStretchData {
     readonly detailLevel: DetailLevel;
     readonly measureParam: string;
+    readonly stretchSymNodeId: string;
     readonly originalReferenceLength: number | undefined;
     readonly sp: Vector3;
     readonly ep: Vector3;
@@ -68,6 +69,7 @@ export declare class CfgStretchData {
      *
      * @param detailLevel
      * @param measureParam Name of the parameter controlling the stretch
+     * @param stretchSymNodeId Id of the SymNode. This is used for anchoring.
      * @param originalReferenceLength Server-side calculated original referenceLength. We do not
      * actually use this for anything, but it can be handy for debug.
      * @param sp Start Point, the start anchor of the stretch line.

package/dist/geometry/stretch/CfgStretchData.js

@@ -80,6 +80,7 @@ export class CfgStretchData {
      *
      * @param detailLevel
      * @param measureParam Name of the parameter controlling the stretch
+     * @param stretchSymNodeId Id of the SymNode. This is used for anchoring.
      * @param originalReferenceLength Server-side calculated original referenceLength. We do not
      * actually use this for anything, but it can be handy for debug.
      * @param sp Start Point, the start anchor of the stretch line.
@@ -91,9 +92,10 @@ export class CfgStretchData {
      * @param normalNormalized Normalized version of normal
      * @param sections The slices the model is sliced into
      */
-    constructor(detailLevel, measureParam, originalReferenceLength, sp, ep, spToEpLength, originalSpToEpLength, normal, normalNormalized, sections) {
+    constructor(detailLevel, measureParam, stretchSymNodeId, originalReferenceLength, sp, ep, spToEpLength, originalSpToEpLength, normal, normalNormalized, sections) {
         this.detailLevel = detailLevel;
         this.measureParam = measureParam;
+        this.stretchSymNodeId = stretchSymNodeId;
         this.originalReferenceLength = originalReferenceLength;
         this.sp = sp;
         this.ep = ep;
@@ -114,6 +116,10 @@ export class CfgStretchData {
         if (measureParam === undefined) {
             throw new Error("No measureParam");
         }
+        const stretchSymNodeId = symNode.id;
+        if (stretchSymNodeId !== measureParam) {
+            logger.warn(`measureParam (${measureParam}) has different ID from parent symNode (${stretchSymNodeId})`);
+        }
         const children = symNode.children(logger, true, true);
         let sp;
         let ep;
@@ -206,7 +212,7 @@ export class CfgStretchData {
             throw new Error("Dividers for detail level missing");
         }
         const processedSections = CfgStretchData.processSections(sections, detailLevel, detailLevelGfxMode, dividerNameToPos, sp, spToEpLength, normalizedNormal);
-        return new this(detailLevel, measureParam, originalLength, sp, ep, spToEpLength, spToEpLength, normal, normalizedNormal, processedSections);
+        return new this(detailLevel, measureParam, stretchSymNodeId, originalLength, sp, ep, spToEpLength, spToEpLength, normal, normalizedNormal, processedSections);
     }
     static processSections(sections, detailLevel, detailLevelGfxMode, dividerNameToPos, sp, spToEpLength, normalizedNormal) {
         // The morph target shall morph to making the morphed thing
@@ -291,7 +297,7 @@ export class CfgStretchData {
         const sp = Vector3.TransformCoordinates(this.sp, matrix);
         const ep = Vector3.TransformCoordinates(this.ep, matrix);
         const { spToEpLength, normal, normalizedNormal } = calculateNormals(sp, ep);
-        return new CfgStretchData(this.detailLevel, this.measureParam, this.originalReferenceLength, sp, ep, spToEpLength, this.spToEpLength, normal, normalizedNormal, this.sections);
+        return new CfgStretchData(this.detailLevel, this.measureParam, this.stretchSymNodeId, this.originalReferenceLength, sp, ep, spToEpLength, this.spToEpLength, normal, normalizedNormal, this.sections);
     }
     /**
      * Calculates the translation of a point which moves it from its original position to where it

package/dist/utilities/anchor/anchor.d.ts

@@ -24,9 +24,13 @@ export declare const getAnchorTargetPriorityComparer: (measureDefinitions: CfgMe
  * clear CfgAnchorRef exists, which including only what is relevant for when used for anchoring.
  */
 export declare class CfgAnchorRef {
-    readonly measureParamCode: string;
+    readonly stretchSymNodeId: string;
     readonly toSp: boolean;
     static make(m: MeasureParam | undefined): CfgAnchorRef | undefined;
+    /**
+     * The name stretchSymNodeId might seem confusing. And it is. Turns out CET is implemented so
+     * that it bases its anchoring on symNode Id containing the stretch. Not the measureParamId.
+     */
     private constructor();
     equal(other: CfgAnchorRef): boolean;
 }

package/dist/utilities/anchor/anchor.js

@@ -49,8 +49,12 @@ export const getAnchorTargetPriorityComparer = (measureDefinitions) => (measureP
  * clear CfgAnchorRef exists, which including only what is relevant for when used for anchoring.
  */
 export class CfgAnchorRef {
-    constructor(measureParamCode, toSp) {
-        this.measureParamCode = measureParamCode;
+    /**
+     * The name stretchSymNodeId might seem confusing. And it is. Turns out CET is implemented so
+     * that it bases its anchoring on symNode Id containing the stretch. Not the measureParamId.
+     */
+    constructor(stretchSymNodeId, toSp) {
+        this.stretchSymNodeId = stretchSymNodeId;
         this.toSp = toSp;
     }
     static make(m) {
@@ -71,7 +75,7 @@ export class CfgAnchorRef {
         return new CfgAnchorRef(code, isSp);
     }
     equal(other) {
-        return this.measureParamCode === other.measureParamCode && this.toSp === other.toSp;
+        return this.stretchSymNodeId === other.stretchSymNodeId && this.toSp === other.toSp;
     }
 }
 /** Gets the coordinates of the anchor point relative the anchor target. */
@@ -82,9 +86,9 @@ export function getRawAnchorPoint(anchorTarget, anchorRef) {
     if (anchorRef === undefined) {
         throw new Error("AnchorTo not set even though we got an anchorTarget");
     }
-    const { measureParamCode, toSp } = anchorRef;
+    const { stretchSymNodeId, toSp } = anchorRef;
     const { stretchDatas } = anchorTarget;
-    const targetStretchData = stretchDatas.find((stretchData) => measureParamCode === stretchData.measureParam);
+    const targetStretchData = stretchDatas.find((stretchData) => stretchSymNodeId === stretchData.stretchSymNodeId);
     if (targetStretchData === undefined) {
         throw new Error("No target stretch data for measureParamCode found");
     }

package/dist/utilities/anchor/anchorMap.d.ts

@@ -11,11 +11,11 @@
  */
 export declare function makeAnchoredToAnchorMap<A extends {
     anchorRef: {
-        measureParamCode: string;
+        stretchSymNodeId: string;
     } | undefined;
 }, T extends {
     stretchDatas: {
-        measureParam: string;
+        stretchSymNodeId: string;
     }[];
 }>(nodes: (A | T)[], targetCandidateComparer: (measureParamCode: string, l: T, r: T) => number): Map<A, T>;
 //# sourceMappingURL=anchorMap.d.ts.map

package/dist/utilities/anchor/anchorMap.js

@@ -27,7 +27,7 @@ export function makeAnchoredToAnchorMap(nodes, targetCandidateComparer) {
         if (anchorRef === undefined) {
             continue;
         }
-        const measureParam = anchorRef.measureParamCode;
+        const stretchSymNodeId = anchorRef.stretchSymNodeId;
         const targetCandidates = nodes
             .filter((n) => {
             // Ignore self
@@ -38,13 +38,13 @@ export function makeAnchoredToAnchorMap(nodes, targetCandidateComparer) {
                 return false;
             }
             // Can we anchor to this node?
-            return n.stretchDatas.some((stretchData) => measureParam === stretchData.measureParam);
+            return n.stretchDatas.some((stretchData) => stretchSymNodeId === stretchData.stretchSymNodeId);
         })
             .map((t, i) => ({ t, i }))
             .sort((l, r) => {
             // As sort is not stable in JS-versions older than EcmaScript 2019 we add the
             // array original index to have as a fallback when there is a draw
-            const comp = targetCandidateComparer(anchorRef.measureParamCode, l.t, r.t);
+            const comp = targetCandidateComparer(anchorRef.stretchSymNodeId, l.t, r.t);
             if (comp === 0) {
                 return l.i - r.i;
             }

package/package.json

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