copper3d 1.15.14 → 1.15.16

package/dist/Renderer/copperRenderer.js

@@ -11,10 +11,6 @@ export default class copperRenderer extends baseRenderer {
         this.interval = 1 / this.fps;
         this.preRenderCallbackFunctions = [];
         this.animate = (time) => {
-            // if (this.start) {
-            //   this.fpsCap = createFpsCap(this.render, 10);
-            //   this.start = false;
-            // }
             var _a, _b, _c;
             switch ((_a = this.options) === null || _a === void 0 ? void 0 : _a.fpsMode) {
                 case "1":

package/dist/Renderer/copperRenderer.js.map

@@ -1 +1 @@
-{"version":3,"file":"copperRenderer.js","sourceRoot":"","sources":["../../src/Renderer/copperRenderer.ts"],"names":[],"mappings":"AAAA,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAO/C,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,YAAY;IAStD,YAAY,SAAyB,EAAE,OAA0B;QAC/D,KAAK,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QATpB,aAAQ,GAAiB,EAAE,CAAC;QAC5B,QAAG,GAAW,EAAE,CAAC;QACjB,gBAAW,GAAgB,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC7C,UAAK,GAAW,CAAC,CAAC;QAClB,aAAQ,GAAW,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC;QAExC,+BAA0B,GAAoB,EAAE,CAAC;QA+CjD,YAAO,GAAG,CAAC,IAAa,EAAE,EAAE;YAC1B,oBAAoB;YACpB,iDAAiD;YACjD,wBAAwB;YACxB,IAAI;;YAEJ,QAAQ,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,EAAE;gBAC7B,KAAK,GAAG;oBACN,wBAAwB;oBACxB,UAAU,CAAC,GAAG,EAAE;wBACd,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACtC,CAAC,EAAE,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;oBACpB,IAAI,CAAC,MAAM,EAAE,CAAC;oBACd,IAAI,MAAA,IAAI,CAAC,OAAO,0CAAE,cAAc;wBAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;oBACtD,MAAM;gBACR;oBACE,wBAAwB;oBACxB,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;oBACpC,IAAI,IAAI,CAAC,KAAK,KAAK,CAAC,EAAE;wBACpB,IAAI,CAAC,MAAM,EAAE,CAAC;qBACf;oBACD,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC;oBAC1C,IAAI,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE;wBAC9B,IAAI,CAAC,MAAM,EAAE,CAAC;wBACd,IAAI,MAAA,IAAI,CAAC,OAAO,0CAAE,cAAc;4BAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;wBACtD,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC;qBACzC;aACJ;QACH,CAAC,CAAC;IAvEF,CAAC;IAED,cAAc,CAAC,IAAY;QACzB,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;IACjB,CAAC;IAED,eAAe,CAAC,OAAoB;;QAClC,IAAI,OAAO,EAAE;YACX,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;YAC5B,IAAI,MAAA,IAAI,CAAC,OAAO,0CAAE,OAAO,EAAE;gBACzB,IAAI,CAAC,SAAS,EAAE,CAAC;aAClB;YACD,IAAI,CAAC,cAAc,EAAE,CAAC;SACvB;IACH,CAAC;IAED,WAAW,CAAC,IAAY;;QACtB,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,SAAS,EAAE;YACpC,OAAO,SAAS,CAAC;SAClB;aAAM;YACL,MAAM,KAAK,GAAG,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,KAAK,CAAA,CAAC;YACpC,MAAM,SAAS,GAAG,IAAI,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,EAAE;gBAC/D,MAAM,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,UAAU;gBAChC,QAAQ,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAQ;gBAChC,KAAK,EAAE,KAAK;aACb,CAAC,CAAC;YACH,SAAS,CAAC,SAAS,GAAG,IAAI,CAAC;YAC3B,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YAC3C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;YAChC,OAAO,SAAS,CAAC;SAClB;IACH,CAAC;IAED,4BAA4B,CAAC,gBAA0B;QACrD,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IACzD,CAAC;IAED,cAAc,KAAI,CAAC;IAgCnB,MAAM;QACJ,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;QAC3B,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/C,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClB,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"copperRenderer.js","sourceRoot":"","sources":["../../src/Renderer/copperRenderer.ts"],"names":[],"mappings":"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"}

package/dist/Utils/MeshNodeTool.d.ts

@@ -0,0 +1,41 @@
+import * as THREE from "three";
+import { IMeshNodes } from "../types/types";
+export declare class Node {
+    id: string;
+    p: number[];
+    elements: Array<Element>;
+    constructor(id: string, p: number[]);
+}
+export declare class Element {
+    id: string;
+    basis: string[];
+    nodes: Array<Node>;
+    constructor(id: string, basis: string[], nodes: Array<Node>);
+}
+export declare class MeshNodeTool {
+    nodes: {
+        [key: string]: Node;
+    };
+    elements: {
+        [key: string]: Element;
+    };
+    addNode(id: string, p: number[]): void;
+    addElement(id: string, basis: string[], nodeIds: string[]): void;
+    loadMesh(json: IMeshNodes): void;
+    evaluate(elementId: string, xi: number[]): number[];
+    find(point: THREE.Vector3, startingNodeId: string): {
+        [key: string]: any;
+        elementId: string;
+        xi: number[];
+    };
+    search(point: THREE.Vector3, startingNodeId: string, tol: number): {
+        [key: string]: any;
+        elementId: string;
+        xi: number[];
+    };
+    getNodeMaterialPoints(nodeId: string): {
+        [key: string]: any;
+        elementId: string;
+        xi: number[];
+    }[];
+}

package/dist/Utils/MeshNodeTool.js

@@ -0,0 +1,211 @@
+import { getWightsL3L3L3, calcDistance, perturbRandom } from "./utils";
+export class Node {
+    constructor(id, p) {
+        this.elements = [];
+        this.id = id;
+        this.p = p;
+    }
+}
+export class Element {
+    constructor(id, basis, nodes) {
+        this.id = id;
+        this.basis = basis;
+        this.nodes = nodes;
+    }
+}
+export class MeshNodeTool {
+    constructor() {
+        this.nodes = {};
+        this.elements = {};
+    }
+    addNode(id, p) {
+        this.nodes[id] = new Node(id, p);
+    }
+    addElement(id, basis, nodeIds) {
+        let nodes = [];
+        for (let nid in nodeIds) {
+            let enid = nodeIds[nid];
+            nodes.push(this.nodes[enid]);
+        }
+        let element = new Element(id, basis, nodes);
+        this.elements[id] = element;
+        for (let idx in element.nodes) {
+            element.nodes[idx].elements.push(element);
+        }
+    }
+    loadMesh(json) {
+        for (let nid in json.nodes) {
+            this.addNode(nid, json.nodes[nid]);
+        }
+        for (let eid in json.elements) {
+            let elem = json.elements[eid];
+            this.addElement(eid, elem.basis, elem.nodes);
+        }
+    }
+    evaluate(elementId, xi) {
+        let w = getWightsL3L3L3(xi);
+        return evaluateElement(this.elements[elementId], w);
+    }
+    find(point, startingNodeId) {
+        let pt = [point.x, point.y, point.z];
+        let nodeMaterialPoints = this.getNodeMaterialPoints(startingNodeId);
+        for (let i in nodeMaterialPoints) {
+            let mpt = nodeMaterialPoints[i];
+            let x = this.evaluate(mpt.elementId, mpt.xi);
+            let r = calcDistance(x, pt);
+            mpt.error = r;
+        }
+        let t0 = new Date().getTime();
+        let n = 0;
+        for (let step = 0; step < 10000; step++) {
+            for (let i in nodeMaterialPoints) {
+                let mpt = nodeMaterialPoints[i];
+                let xi = perturbRandom(mpt.xi, 0.1);
+                let x = this.evaluate(mpt.elementId, xi);
+                let r = calcDistance(x, pt);
+                if (r < mpt.error) {
+                    mpt.error = r;
+                    mpt.xi = xi;
+                    if (r < 1.0) {
+                        console.log("Time: (" +
+                            n +
+                            ") " +
+                            (new Date().getTime() - t0) +
+                            "ms Error: " +
+                            r);
+                        return mpt;
+                    }
+                }
+            }
+            n = step;
+        }
+        let bestIndex = 0;
+        let bestError = nodeMaterialPoints[0].error;
+        for (let i in nodeMaterialPoints) {
+            let mpt = nodeMaterialPoints[i];
+            if (mpt.error < bestError) {
+                bestIndex = Number(i);
+                bestError = mpt.error;
+            }
+        }
+        let mpt = nodeMaterialPoints[bestIndex];
+        console.log("Time: (" +
+            n +
+            ") " +
+            (new Date().getTime() - t0) +
+            "ms Error: " +
+            mpt.error);
+        return mpt;
+    }
+    search(point, startingNodeId, tol) {
+        let pt = [point.x, point.y, point.z];
+        let nodeMaterialPoints = this.getNodeMaterialPoints(startingNodeId);
+        for (let i in nodeMaterialPoints) {
+            let mpt = nodeMaterialPoints[i];
+            let x = this.evaluate(mpt.elementId, mpt.xi);
+            mpt.error = calcDistance(x, pt);
+        }
+        let t0 = new Date().getTime();
+        let xiStepSize = [0.1, 0.01, 0.001];
+        for (let i in nodeMaterialPoints) {
+            let mpt = nodeMaterialPoints[i];
+            let numDims = mpt.xi.length;
+            let nIter = 0;
+            let go = true;
+            while (go || nIter < 10) {
+                let minErr = 1 * mpt.error;
+                let minXi;
+                for (let xiIdx in xiStepSize) {
+                    let dXi = xiStepSize[xiIdx];
+                    for (let dim = 0; dim < numDims; dim++) {
+                        let xi = mpt.xi.slice();
+                        xi[dim] += dXi;
+                        if (xi[dim] >= 0 && xi[dim] <= 1) {
+                            let x = this.evaluate(mpt.elementId, mpt.xi);
+                            let err = calcDistance(x, pt);
+                            if (err < minErr) {
+                                minErr = err;
+                                minXi = xi;
+                                if (err < tol) {
+                                    mpt.error = err;
+                                    mpt.xi = xi;
+                                    console.log("Time 1: " +
+                                        (new Date().getTime() - t0) +
+                                        "ms Error: " +
+                                        mpt.error);
+                                    return mpt;
+                                }
+                            }
+                        }
+                        else {
+                        }
+                        xi = mpt.xi.slice();
+                        xi[dim] -= dXi;
+                        if (xi[dim] >= 0 && xi[dim] <= 1) {
+                            let x = this.evaluate(mpt.elementId, mpt.xi);
+                            let err = calcDistance(x, pt);
+                            if (err < minErr) {
+                                minErr = err;
+                                minXi = xi;
+                                if (err < tol) {
+                                    mpt.error = err;
+                                    mpt.xi = xi;
+                                    console.log("Time 2: " +
+                                        (new Date().getTime() - t0) +
+                                        "ms Error: " +
+                                        mpt.error);
+                                    return mpt;
+                                }
+                            }
+                        }
+                        else {
+                        }
+                    }
+                }
+                if (minXi === null || minXi === undefined) {
+                    go = false;
+                }
+                else {
+                    mpt.xi = minXi;
+                    mpt.error = minErr;
+                }
+                nIter++;
+            }
+        }
+        let bestIndex = 0;
+        let bestError = nodeMaterialPoints[0].error;
+        for (let i in nodeMaterialPoints) {
+            let mpt = nodeMaterialPoints[i];
+            if (mpt.error < bestError) {
+                bestIndex = Number(i);
+                bestError = mpt.error;
+            }
+        }
+        let mpt = nodeMaterialPoints[bestIndex];
+        console.log("Time 3: " + (new Date().getTime() - t0) + "ms Error: " + mpt.error);
+        return mpt;
+    }
+    getNodeMaterialPoints(nodeId) {
+        let materialPoints = [];
+        let node = this.nodes[nodeId];
+        for (let eid in node.elements) {
+            let element = node.elements[eid];
+            let nodeIdx = element.nodes.indexOf(node);
+            let xi0 = (nodeIdx % 4) / 3;
+            let xi1 = Math.floor((nodeIdx % 16) / 4) / 3;
+            let xi2 = Math.floor(nodeIdx / 16) / 3;
+            materialPoints.push({ elementId: element.id, xi: [xi0, xi1, xi2] });
+        }
+        return materialPoints;
+    }
+}
+function evaluateElement(element, weights) {
+    let x = [0, 0, 0];
+    for (let f = 0; f < 3; f++) {
+        for (let i = 0; i < weights.length; i++) {
+            x[f] += weights[i] * element.nodes[i].p[f];
+        }
+    }
+    return x;
+}
+//# sourceMappingURL=MeshNodeTool.js.map

package/dist/Utils/MeshNodeTool.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"MeshNodeTool.js","sourceRoot":"","sources":["../../src/Utils/MeshNodeTool.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAEvE,MAAM,OAAO,IAAI;IAIf,YAAY,EAAU,EAAE,CAAW;QADnC,aAAQ,GAAmB,EAAE,CAAC;QAE5B,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACb,CAAC;CACF;AAED,MAAM,OAAO,OAAO;IAIlB,YAAY,EAAU,EAAE,KAAe,EAAE,KAAkB;QACzD,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;AAED,MAAM,OAAO,YAAY;IAAzB;QACE,UAAK,GAA4B,EAAE,CAAC;QACpC,aAAQ,GAA+B,EAAE,CAAC;IA4M5C,CAAC;IA1MC,OAAO,CAAC,EAAU,EAAE,CAAW;QAC7B,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACnC,CAAC;IACD,UAAU,CAAC,EAAU,EAAE,KAAe,EAAE,OAAiB;QACvD,IAAI,KAAK,GAAgB,EAAE,CAAC;QAC5B,KAAK,IAAI,GAAG,IAAI,OAAO,EAAE;YACvB,IAAI,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YACxB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;SAC9B;QACD,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;QAC5C,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC;QAC5B,KAAK,IAAI,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE;YAC7B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC3C;IACH,CAAC;IAED,QAAQ,CAAC,IAAgB;QACvB,KAAK,IAAI,GAAG,IAAI,IAAI,CAAC,KAAK,EAAE;YAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;SACpC;QACD,KAAK,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC7B,IAAI,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;SAC9C;IACH,CAAC;IAED,QAAQ,CAAC,SAAiB,EAAE,EAAY;QACtC,IAAI,CAAC,GAAG,eAAe,CAAC,EAAE,CAAC,CAAC;QAC5B,OAAO,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,CAAC,KAAoB,EAAE,cAAsB;QAC/C,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC;QAEpE,KAAK,IAAI,CAAC,IAAI,kBAAkB,EAAE;YAChC,IAAI,GAAG,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7C,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5B,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC;SACf;QACD,IAAI,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,GAAG,KAAK,EAAE,IAAI,EAAE,EAAE;YACvC,KAAK,IAAI,CAAC,IAAI,kBAAkB,EAAE;gBAChC,IAAI,GAAG,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;gBAChC,IAAI,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;gBACpC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;gBACzC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC5B,IAAI,CAAC,GAAG,GAAG,CAAC,KAAK,EAAE;oBACjB,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC;oBACd,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;oBACZ,IAAI,CAAC,GAAG,GAAG,EAAE;wBACX,OAAO,CAAC,GAAG,CACT,SAAS;4BACP,CAAC;4BACD,IAAI;4BACJ,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC;4BAC3B,YAAY;4BACZ,CAAC,CACJ,CAAC;wBACF,OAAO,GAAG,CAAC;qBACZ;iBACF;aACF;YACD,CAAC,GAAG,IAAI,CAAC;SACV;QACD,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,IAAI,SAAS,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC5C,KAAK,IAAI,CAAC,IAAI,kBAAkB,EAAE;YAChC,IAAI,GAAG,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,GAAG,CAAC,KAAK,GAAG,SAAS,EAAE;gBACzB,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACtB,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC;aACvB;SACF;QACD,IAAI,GAAG,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CACT,SAAS;YACP,CAAC;YACD,IAAI;YACJ,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC;YAC3B,YAAY;YACZ,GAAG,CAAC,KAAK,CACZ,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED,MAAM,CAAC,KAAoB,EAAE,cAAsB,EAAE,GAAW;QAC9D,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;QACrC,IAAI,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC,cAAc,CAAC,CAAC;QACpE,KAAK,IAAI,CAAC,IAAI,kBAAkB,EAAE;YAChC,IAAI,GAAG,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7C,GAAG,CAAC,KAAK,GAAG,YAAY,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;SACjC;QAED,IAAI,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAC9B,IAAI,UAAU,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QACpC,KAAK,IAAI,CAAC,IAAI,kBAAkB,EAAE;YAChC,IAAI,GAAG,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,OAAO,GAAG,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC;YAC5B,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,IAAI,EAAE,GAAG,IAAI,CAAC;YACd,OAAO,EAAE,IAAI,KAAK,GAAG,EAAE,EAAE;gBACvB,IAAI,MAAM,GAAG,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC;gBAC3B,IAAI,KAAK,CAAC;gBAEV,KAAK,IAAI,KAAK,IAAI,UAAU,EAAE;oBAC5B,IAAI,GAAG,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;oBAC5B,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,OAAO,EAAE,GAAG,EAAE,EAAE;wBACtC,IAAI,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;wBACxB,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;wBACf,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;4BAChC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;4BAC7C,IAAI,GAAG,GAAG,YAAY,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;4BAC9B,IAAI,GAAG,GAAG,MAAM,EAAE;gCAChB,MAAM,GAAG,GAAG,CAAC;gCACb,KAAK,GAAG,EAAE,CAAC;gCACX,IAAI,GAAG,GAAG,GAAG,EAAE;oCACb,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC;oCAChB,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;oCACZ,OAAO,CAAC,GAAG,CACT,UAAU;wCACR,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC;wCAC3B,YAAY;wCACZ,GAAG,CAAC,KAAK,CACZ,CAAC;oCACF,OAAO,GAAG,CAAC;iCACZ;6BACF;yBACF;6BAAM;yBACN;wBAED,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC;wBACpB,EAAE,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC;wBACf,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;4BAChC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;4BAC7C,IAAI,GAAG,GAAG,YAAY,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;4BAC9B,IAAI,GAAG,GAAG,MAAM,EAAE;gCAChB,MAAM,GAAG,GAAG,CAAC;gCACb,KAAK,GAAG,EAAE,CAAC;gCACX,IAAI,GAAG,GAAG,GAAG,EAAE;oCACb,GAAG,CAAC,KAAK,GAAG,GAAG,CAAC;oCAChB,GAAG,CAAC,EAAE,GAAG,EAAE,CAAC;oCACZ,OAAO,CAAC,GAAG,CACT,UAAU;wCACR,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC;wCAC3B,YAAY;wCACZ,GAAG,CAAC,KAAK,CACZ,CAAC;oCACF,OAAO,GAAG,CAAC;iCACZ;6BACF;yBACF;6BAAM;yBACN;qBACF;iBACF;gBAED,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,SAAS,EAAE;oBACzC,EAAE,GAAG,KAAK,CAAC;iBACZ;qBAAM;oBACL,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC;oBACf,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC;iBACpB;gBACD,KAAK,EAAE,CAAC;aACT;SACF;QAED,IAAI,SAAS,GAAG,CAAC,CAAC;QAClB,IAAI,SAAS,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;QAC5C,KAAK,IAAI,CAAC,IAAI,kBAAkB,EAAE;YAChC,IAAI,GAAG,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;YAChC,IAAI,GAAG,CAAC,KAAK,GAAG,SAAS,EAAE;gBACzB,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBACtB,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC;aACvB;SACF;QACD,IAAI,GAAG,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CACT,UAAU,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,GAAG,YAAY,GAAG,GAAG,CAAC,KAAK,CACpE,CAAC;QACF,OAAO,GAAG,CAAC;IACb,CAAC;IAED,qBAAqB,CAAC,MAAc;QAClC,IAAI,cAAc,GAIZ,EAAE,CAAC;QACT,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC9B,KAAK,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,EAAE;YAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;YACjC,IAAI,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,GAAG,GAAG,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YAC5B,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;YAC7C,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;YACvC,cAAc,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;SACrE;QACD,OAAO,cAAc,CAAC;IACxB,CAAC;CACF;AAED,SAAS,eAAe,CAAC,OAAgB,EAAE,OAAiB;IAC1D,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvC,CAAC,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5C;KACF;IACD,OAAO,CAAC,CAAC;AACX,CAAC"}

package/dist/Utils/nrrd_tool.js

@@ -1238,6 +1238,16 @@ export class nrrd_tools {
                 else if (this.gui_states.sphere) {
                     let mouseX = e.offsetX;
                     let mouseY = e.offsetY;
+                    //  record mouseX,Y, and enable crosshair function
+                    this.nrrd_states.sphereOrigin[this.axis] = [
+                        mouseX,
+                        mouseY,
+                        this.nrrd_states.currentIndex,
+                    ];
+                    this.setUpSphereOrigins(mouseX, mouseY);
+                    this.nrrd_states.cursorPageX = mouseX;
+                    this.nrrd_states.cursorPageY = mouseY;
+                    this.enableCrosshair();
                     // draw circle setup width/height for sphere canvas
                     this.drawSphere(mouseX, mouseY, this.nrrd_states.sphereRadius);
                     this.drawingCanvas.addEventListener("wheel", this.drawingPrameters.handleSphereWheel, true);
@@ -1350,18 +1360,8 @@ export class nrrd_tools {
                 else if (this.gui_states.sphere &&
                     !this.nrrd_states.enableCursorChoose) {
                     // let { ctx, canvas } = this.setCurrentLayer();
-                    let mouseX = e.offsetX;
-                    let mouseY = e.offsetY;
-                    this.nrrd_states.sphereOrigin[this.axis] = [
-                        mouseX,
-                        mouseY,
-                        this.nrrd_states.currentIndex,
-                    ];
-                    /************ */
-                    this.setUpSphereOrigins(mouseX, mouseY);
-                    this.nrrd_states.cursorPageX = mouseX;
-                    this.nrrd_states.cursorPageY = mouseY;
-                    this.enableCrosshair();
+                    // let mouseX = e.offsetX;
+                    // let mouseY = e.offsetY;
                     // plan B
                     // findout all index in the sphere radius range in Axial view
                     if (this.nrrd_states.spherePlanB) {
@@ -1601,9 +1601,10 @@ export class nrrd_tools {
             }
             // limited the radius max and min
             this.nrrd_states.sphereRadius = Math.max(1, Math.min(this.nrrd_states.sphereRadius, 50));
+            console.log(this.nrrd_states.sphereOrigin[this.axis][0], this.nrrd_states.sphereOrigin[this.axis][1]);
             // get mouse position
-            const mouseX = e.offsetX;
-            const mouseY = e.offsetY;
+            const mouseX = this.nrrd_states.sphereOrigin[this.axis][0];
+            const mouseY = this.nrrd_states.sphereOrigin[this.axis][1];
             this.drawSphere(mouseX, mouseY, this.nrrd_states.sphereRadius);
         };
         return sphereEvent;