copper3d 1.15.6 → 1.15.8

package/dist/bundle.esm.js

@@ -38582,11 +38582,9 @@ function copperDicomLoader(url, callback) {
     loader$1.load(url, (arrayBuffer) => {
         var dicomFileAsBuffer = new Uint8Array(arrayBuffer);
         const dataSet = dicomParser.parseDicom(dicomFileAsBuffer);
-        // console.log(dataSet1);
         // const dataSet = dicomParser.parseDicom(dicomFileAsBuffer, {
         //   vrCallback(tag) {
         //     const formatted = `(${tag.substring(1, 5)},${tag.substring(5, 9)})`;
-        //     // console.log(!!TAG_DICT[formatted] ? TAG_DICT[formatted].vr : undefined);
         //     return !!TAG_DICT[formatted] ? TAG_DICT[formatted].vr : undefined;
         //   },
         // });
@@ -44094,7 +44092,6 @@ function copperNrrdTexture3dLoader(url, scene, container, callback) {
         // 获取边界框的尺寸
         const size_ = new Vector3();
         boundingBox.getSize(size_);
-        console.log(size_);
         scene.add(mesh);
         const gui = new GUI$1();
         gui.add(volconfig, "clim1_g", -500, 500, 1).onChange((value) => {
@@ -44163,7 +44160,6 @@ function getWholeSlices(nrrdSlices, scene, gui, controls) {
     //     nrrdSlices.z.index = i;
     //     nrrdSlices.z.repaint(nrrdSlices.z);
     //     nrrdSlices.z.mesh.position.set(0, 0, 0.5);
-    //     console.log(nrrdSlices.z.mesh);
     //   }, 100);
     // }
     let up = true;
@@ -44208,7 +44204,6 @@ function getWholeSlices(nrrdSlices, scene, gui, controls) {
         // }
         // if (slicesX[index]) {
         //   controls.enabled = false;
-        //   console.log(slicesX[index]);
         //   slicesX[index].visible = false;
         //   // ? (slicesX[index].visible = false)
         //   // : (slicesX[index].visible = true);
@@ -45244,7 +45239,7 @@ class Copper3dTrackballControls extends EventDispatcher {
         this.maxDistance = Infinity;
         this.minZoom = 0;
         this.maxZoom = Infinity;
-        this.keys = ["KeyA", "KeyS", "KeyD"];
+        this.keys = ["KeyA" /*A*/, "KeyS" /*S*/, "KeyD" /*D*/];
         this.mouseButtons = {
             LEFT: MOUSE.ROTATE,
             MIDDLE: MOUSE.DOLLY,
@@ -45262,11 +45257,10 @@ class Copper3dTrackballControls extends EventDispatcher {
         this.position0 = this.object.position.clone();
         this.up0 = this.object.up.clone();
         this.zoom0 = this.object.zoom;
-        // core methods
+        // methods
         this.handleResize = function () {
             const box = scope.domElement.getBoundingClientRect();
-            // adjustments come from similar code in the jquery offser() function
-            // get root element
+            // adjustments come from similar code in the jquery offset() function
             const d = scope.domElement.ownerDocument.documentElement;
             scope.screen.left = box.left + window.pageXOffset - d.clientLeft;
             scope.screen.top = box.top + window.pageYOffset - d.clientTop;
@@ -45281,18 +45275,11 @@ class Copper3dTrackballControls extends EventDispatcher {
             };
         })();
         const getMouseOnCircle = (function () {
-            /**
-             * convert screen coordinates to threejs coordinates ratio
-             */
             const vector = new Vector2();
-            return function getMouseonCircle(pageX, pageY) {
-                vector.set(
-                // the width radius of the circle diameter
-                (pageX - scope.screen.width * 0.5 - scope.screen.left) /
-                    (scope.screen.width * 0.5), 
-                // the height radius of the circle diameter
-                (scope.screen.height + 2 * (scope.screen.top - pageY)) /
-                    scope.screen.width //screen.width intentional
+            return function getMouseOnCircle(pageX, pageY) {
+                vector.set((pageX - scope.screen.width * 0.5 - scope.screen.left) /
+                    (scope.screen.width * 0.5), (scope.screen.height + 2 * (scope.screen.top - pageY)) /
+                    scope.screen.width // screen.width intentional
                 );
                 return vector;
             };
@@ -45301,26 +45288,20 @@ class Copper3dTrackballControls extends EventDispatcher {
             const axis = new Vector3(), quaternion = new Quaternion(), eyeDirection = new Vector3(), objectUpDirection = new Vector3(), objectSidewaysDirection = new Vector3(), moveDirection = new Vector3();
             return function rotateCamera() {
                 moveDirection.set(_moveCurr.x - _movePrev.x, _moveCurr.y - _movePrev.y, 0);
-                // Computes the Euclidean length (straight-line length) from (0, 0, 0) to (x, y, z).
                 let angle = moveDirection.length();
                 if (angle) {
-                    // .sub Subtracts v from this vector.
                     _eye.copy(scope.object.position).sub(scope.target);
-                    // .normalize() Convert this vector to a unit vector - that is, sets it equal to a vector with the same direction as this one, but length 1.
                     eyeDirection.copy(_eye).normalize();
                     objectUpDirection.copy(scope.object.up).normalize();
-                    // .crossVectors Sets this vector to cross product of a and b.
                     objectSidewaysDirection
                         .crossVectors(objectUpDirection, eyeDirection)
                         .normalize();
-                    // .setLength Set this vector to a vector with the same direction as this one, but length l.
                     objectUpDirection.setLength(_moveCurr.y - _movePrev.y);
                     objectSidewaysDirection.setLength(_moveCurr.x - _movePrev.x);
                     moveDirection.copy(objectUpDirection.add(objectSidewaysDirection));
                     axis.crossVectors(moveDirection, _eye).normalize();
                     angle *= scope.rotateSpeed;
                     quaternion.setFromAxisAngle(axis, angle);
-                    // Applies a Quaternion transform to this vector.
                     _eye.applyQuaternion(quaternion);
                     scope.object.up.applyQuaternion(quaternion);
                     _lastAxis.copy(axis);
@@ -45375,15 +45356,15 @@ class Copper3dTrackballControls extends EventDispatcher {
             const mouseChange = new Vector2(), objectUp = new Vector3(), pan = new Vector3();
             return function panCamera() {
                 mouseChange.copy(_panEnd).sub(_panStart);
-                // .lengthSq() Computes the squared length of this vector. If you are comparing the lengths of vectors, you should compare the length squared instead as it is slightly more efficient to calculate.
                 if (mouseChange.lengthSq()) {
                     if (scope.object.isOrthographicCamera) {
-                        const orth_camera = scope.object;
-                        const scale_x = (orth_camera.right - orth_camera.left) /
-                            orth_camera.zoom /
+                        const scale_x = (scope.object.right -
+                            scope.object.left) /
+                            scope.object.zoom /
                             scope.domElement.clientWidth;
-                        const scale_y = (orth_camera.top - orth_camera.bottom) /
-                            orth_camera.zoom /
+                        const scale_y = (scope.object.top -
+                            scope.object.bottom) /
+                            scope.object.zoom /
                             scope.domElement.clientWidth;
                         mouseChange.x *= scale_x;
                         mouseChange.y *= scale_y;
@@ -45469,9 +45450,10 @@ class Copper3dTrackballControls extends EventDispatcher {
                 return;
             if (_pointers.length === 0) {
                 scope.domElement.setPointerCapture(event.pointerId);
-                scope.domElement.addEventListener("pointermove", onPointerMove, false);
-                scope.domElement.addEventListener("pointerup", onPointerUp, false);
+                scope.domElement.addEventListener("pointermove", onPointerMove);
+                scope.domElement.addEventListener("pointerup", onPointerUp);
             }
+            //
             addPointer(event);
             if (event.pointerType === "touch") {
                 onTouchStart(event);
@@ -45499,11 +45481,12 @@ class Copper3dTrackballControls extends EventDispatcher {
             else {
                 onMouseUp();
             }
+            //
             removePointer(event);
             if (_pointers.length === 0) {
                 scope.domElement.releasePointerCapture(event.pointerId);
-                scope.domElement.removeEventListener("pointermove", onPointerMove, false);
-                scope.domElement.removeEventListener("pointerup", onPointerUp, false);
+                scope.domElement.removeEventListener("pointermove", onPointerMove);
+                scope.domElement.removeEventListener("pointerup", onPointerUp);
             }
         }
         function onPointerCancel(event) {
@@ -45526,11 +45509,11 @@ class Copper3dTrackballControls extends EventDispatcher {
                 _keyState = STATE.PAN;
             }
         }
-        function keyup(event) {
+        function keyup() {
             if (scope.enabled === false)
                 return;
             _keyState = STATE.NONE;
-            window.addEventListener("keydown", keydown, false);
+            window.addEventListener("keydown", keydown);
         }
         function onMouseDown(event) {
             if (_state === STATE.NONE) {
@@ -45574,7 +45557,7 @@ class Copper3dTrackballControls extends EventDispatcher {
                 _panEnd.copy(getMouseOnScreen(event.pageX, event.pageY));
             }
         }
-        function onMouseUp(event) {
+        function onMouseUp() {
             _state = STATE.NONE;
             scope.dispatchEvent(_endEvent$2);
         }
@@ -45708,7 +45691,7 @@ class Copper3dTrackballControls extends EventDispatcher {
         function removePointer(event) {
             delete _pointerPositions[event.pointerId];
             for (let i = 0; i < _pointers.length; i++) {
-                if (_pointers[i].pointerId === event.pointerId) {
+                if (_pointers[i].pointerId == event.pointerId) {
                     _pointers.splice(i, 1);
                     return;
                 }
@@ -45729,21 +45712,21 @@ class Copper3dTrackballControls extends EventDispatcher {
             return _pointerPositions[pointer.pointerId];
         }
         this.dispose = function () {
-            scope.domElement.removeEventListener("contextmenu", contextmenu, false);
-            scope.domElement.removeEventListener("pointerdown", onPointerDown, false);
-            scope.domElement.removeEventListener("pointercancel", onPointerCancel, false);
-            scope.domElement.removeEventListener("wheel", onMouseWheel, false);
-            scope.domElement.removeEventListener("pointermove", onPointerMove, false);
-            scope.domElement.removeEventListener("pointerup", onPointerUp, false);
-            window.removeEventListener("keydown", keydown, false);
-            window.removeEventListener("keyup", keyup, false);
+            scope.domElement.removeEventListener("contextmenu", contextmenu);
+            scope.domElement.removeEventListener("pointerdown", onPointerDown);
+            scope.domElement.removeEventListener("pointercancel", onPointerCancel);
+            scope.domElement.removeEventListener("wheel", onMouseWheel);
+            scope.domElement.removeEventListener("pointermove", onPointerMove);
+            scope.domElement.removeEventListener("pointerup", onPointerUp);
+            window.removeEventListener("keydown", keydown);
+            window.removeEventListener("keyup", keyup);
         };
-        this.domElement.addEventListener("contextmenu", contextmenu, false);
-        this.domElement.addEventListener("pointerdown", onPointerDown, false);
-        this.domElement.addEventListener("pointercancel", onPointerCancel, false);
+        this.domElement.addEventListener("contextmenu", contextmenu);
+        this.domElement.addEventListener("pointerdown", onPointerDown);
+        this.domElement.addEventListener("pointercancel", onPointerCancel);
         this.domElement.addEventListener("wheel", onMouseWheel, { passive: false });
-        window.addEventListener("keydown", keydown, false);
-        window.addEventListener("keyup", keyup, false);
+        window.addEventListener("keydown", keydown);
+        window.addEventListener("keyup", keyup);
         this.handleResize();
         // force an update at start
         this.update();
@@ -47002,7 +46985,7 @@ class OrbitControls extends EventDispatcher {
 }
 
 class commonScene {
-    constructor(container) {
+    constructor(container, opt) {
         this.subDiv = null;
         this.subScene = new Scene();
         this.subCamera = null;
@@ -47014,7 +46997,16 @@ class commonScene {
         this.pickableObjects = [];
         this.container = container;
         this.scene = new Scene();
-        this.camera = new PerspectiveCamera(75, container.clientWidth / container.clientHeight, 0.1, 500);
+        this.copperPerspectiveCamera = new PerspectiveCamera(75, container.clientWidth / container.clientHeight, 0.1, 500);
+        const h = 1024;
+        const aspect = window.innerWidth / window.innerHeight;
+        this.copperOrthographicCamera = new OrthographicCamera((-h * aspect) / 2, (h * aspect) / 2, h / 2, -h / 2, 1, 2000);
+        if ((opt === null || opt === void 0 ? void 0 : opt.camera) === "orthographic") {
+            this.camera = this.copperOrthographicCamera;
+        }
+        else {
+            this.camera = this.copperPerspectiveCamera;
+        }
         this.controls = new Copper3dTrackballControls(this.camera, this.container);
         this.controls.dispose();
         this.preRenderCallbackFunctions = {
@@ -47215,9 +47207,7 @@ class commonScene {
     }
     loadNrrdTexture3d(url, callback) {
         // const h = 512; // frustum height
-        const h = 1024;
-        const aspect = window.innerWidth / window.innerHeight;
-        this.camera = new OrthographicCamera((-h * aspect) / 2, (h * aspect) / 2, h / 2, -h / 2, 1, 2000);
+        this.camera.updateProjectionMatrix();
         this.camera.position.set(0, 0, 1280);
         this.camera.up.set(0, 0, 1);
         this.camera.updateProjectionMatrix();
@@ -47238,9 +47228,7 @@ class commonScene {
             this.scene.add(obj);
             !!callback && callback(obj);
         }, // called when loading is in progresses
-        (xhr) => {
-            // console.log((xhr.loaded / xhr.total) * 100 + "% loaded");
-        }, 
+        (xhr) => { }, 
         // called when loading has errors
         (error) => {
             console.log("An error happened");
@@ -47250,8 +47238,8 @@ class commonScene {
 
 const IS_IOS = isIOS();
 class baseScene extends commonScene {
-    constructor(container, renderer, alpha) {
-        super(container);
+    constructor(container, renderer, opt) {
+        super(container, opt);
         // scene: THREE.Scene;
         // camera: THREE.PerspectiveCamera;
         this.sceneName = "";
@@ -47265,18 +47253,19 @@ class baseScene extends commonScene {
         this.lights = [];
         this.onWindowResize = () => {
             var _a;
-            console.log("adaa");
             this.renderer.setPixelRatio(Math.min(window.devicePixelRatio, 2));
             this.onRenderCameraChange();
             (_a = this.vignette) === null || _a === void 0 ? void 0 : _a.style({
                 aspect: this.camera.aspect,
             });
+            if (this.controls instanceof Copper3dTrackballControls)
+                this.controls.handleResize();
             this.renderer.setSize(this.container.clientWidth, this.container.clientHeight);
         };
         this.renderer = renderer;
         this.ambientLight = new AmbientLight(0x202020, 0.3);
         this.directionalLight = new DirectionalLight(0xffffff, 0.3);
-        if (!alpha) {
+        if (!(opt === null || opt === void 0 ? void 0 : opt.alpha)) {
             this.vignette = createBackground({
                 aspect: this.container.clientWidth / this.container.clientHeight,
                 grainScale: IS_IOS ? 0 : 0.001,
@@ -47291,7 +47280,7 @@ class baseScene extends commonScene {
     init() {
         this.copperControl.setCameraViewPoint();
         this.camera.position.z = 2;
-        this.scene.add(this.camera);
+        // this.scene.add(this.camera);
         this.renderer.setSize(this.container.clientWidth, this.container.clientHeight);
         this.addLights();
     }
@@ -48101,10 +48090,14 @@ class baseRenderer {
         this.pmremGenerator.compileEquirectangularShader();
         this.renderer.setPixelRatio(Math.min(window.devicePixelRatio, 2));
         if (!!((_b = this.options) === null || _b === void 0 ? void 0 : _b.alpha)) {
-            this.currentScene = new baseScene(this.container, this.renderer, true);
+            this.currentScene = new baseScene(this.container, this.renderer, {
+                alpha: true,
+            });
         }
         else {
-            this.currentScene = new baseScene(this.container, this.renderer, false);
+            this.currentScene = new baseScene(this.container, this.renderer, {
+                alpha: false,
+            });
         }
         this.currentScene.sceneName = "default";
         !!this.currentScene.vignette &&
@@ -48189,11 +48182,11 @@ class baseRenderer {
         bgColor1Ctrl.onChange(() => this.currentScene.updateBackground(this.state.bgColor1, this.state.bgColor2));
         bgColor2Ctrl.onChange(() => this.currentScene.updateBackground(this.state.bgColor1, this.state.bgColor2));
         // camera
-        if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.camera) {
+        if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.cameraGui) {
             this.cameraFolder = gui.addFolder("Camera");
         }
         // Performance
-        if ((_b = this.options) === null || _b === void 0 ? void 0 : _b.performance) {
+        if ((_b = this.options) === null || _b === void 0 ? void 0 : _b.performanceGui) {
             const perfFolder = gui.addFolder("Performance");
             const perfLi = document.createElement("li");
             this.stats.dom.style.position = "static";
@@ -48202,7 +48195,7 @@ class baseRenderer {
             perfFolder.__ul.appendChild(perfLi);
         }
         // lights
-        if ((_c = this.options) === null || _c === void 0 ? void 0 : _c.light) {
+        if ((_c = this.options) === null || _c === void 0 ? void 0 : _c.lightGui) {
             const lightFolder = gui.addFolder("LightsFolder");
             [
                 lightFolder.add(this.state, "addLights").listen(),
@@ -56247,11 +56240,8 @@ class TrackballControls extends EventDispatcher {
 }
 
 class copperScene extends baseScene {
-    // private preRenderCallbackFunctions: Array<preRenderCallbackFunctionType> = [];
-    // private preRenderCallbackFunctions: preRenderCallbackFunctionType;
-    // private sort: boolean = true; //default ascending order
-    constructor(container, renderer, controls, alpha) {
-        super(container, renderer, alpha);
+    constructor(container, renderer, opt) {
+        super(container, renderer, opt);
         this.clock = new Clock();
         // isHalfed: boolean = false;
         this.mixer = null;
@@ -56259,12 +56249,11 @@ class copperScene extends baseScene {
         this.modelReady = false;
         // rayster pick
         // texture2d
-        // private depthStep: number = 0.4;
         this.texture2dMesh = null;
-        if (controls === "trackball") {
+        if ((opt === null || opt === void 0 ? void 0 : opt.controls) === "trackball") {
             this.controls = new TrackballControls(this.camera, this.renderer.domElement);
         }
-        else if (controls === "orbit") {
+        else if ((opt === null || opt === void 0 ? void 0 : opt.controls) === "orbit") {
             this.controls = new OrbitControls(this.camera, this.renderer.domElement);
         }
         else {
@@ -56507,13 +56496,12 @@ class copperScene extends baseScene {
     }
     updateControls(camera) {
         this.controls.dispose();
-        this.controls = new OrbitControls(camera, this.renderer.domElement);
+        this.controls = new Copper3dTrackballControls(camera, this.renderer.domElement);
         // this.controls.target.set(64, 64, 128);
         this.controls.target.set(0, 0, 0);
         this.controls.minZoom = 0.5;
         this.controls.maxZoom = 4;
         // this.controls.enablePan = false;
-        this.controls.update();
     }
     onRenderCameraChange() {
         const { width, height } = this.container.getBoundingClientRect();
@@ -56527,7 +56515,6 @@ class copperScene extends baseScene {
         else {
             this.camera.aspect = aspect;
         }
-        this.camera.updateProjectionMatrix();
     }
     render() {
         this.controls.update();
@@ -56575,13 +56562,17 @@ class copperRenderer extends baseRenderer {
         }
     }
     createScene(name) {
-        var _a, _b;
+        var _a, _b, _c;
         if (this.sceneMap[name] != undefined) {
             return undefined;
         }
         else {
             const alpha = !!((_a = this.options) === null || _a === void 0 ? void 0 : _a.alpha);
-            const new_scene = new copperScene(this.container, this.renderer, (_b = this.options) === null || _b === void 0 ? void 0 : _b.controls, alpha);
+            const new_scene = new copperScene(this.container, this.renderer, {
+                camera: (_b = this.options) === null || _b === void 0 ? void 0 : _b.cameraType,
+                controls: (_c = this.options) === null || _c === void 0 ? void 0 : _c.controls,
+                alpha: alpha,
+            });
             new_scene.sceneName = name;
             this.updateEnvironment(new_scene.vignette);
             this.sceneMap[name] = new_scene;
@@ -56725,9 +56716,6 @@ class copperRendererOnDemond extends baseRenderer {
     constructor(container, options) {
         super(container, options);
         this.sceneMap = {};
-        // addGui(): void {
-        //   console.log("hello");
-        // }
         this.animate = () => {
             this.render();
             this.stats.update();
@@ -67835,8 +67823,6 @@ class nrrd_tools {
             this.allSlicesArray[0].x.volume.dimensions[1];
         this.nrrd_states.nrrd_z_pixel =
             this.allSlicesArray[0].x.volume.dimensions[2];
-        console.log("mm", this.nrrd_states.nrrd_x_mm);
-        console.log("pixel", this.nrrd_states.nrrd_x_pixel);
         this.nrrd_states.voxelSpacing = this.allSlicesArray[0].x.volume.spacing;
         this.nrrd_states.ratios.x = this.allSlicesArray[0].x.volume.spacing[0];
         this.nrrd_states.ratios.y = this.allSlicesArray[0].x.volume.spacing[1];
@@ -69771,7 +69757,7 @@ class nrrd_tools {
 }
 
 // import * as kiwrious from "copper3d_plugin_heart_k";
-const REVISION = "v1.15.3";
-console.log("%cCopper3D Visualisation %cBeta:v1.15.3", "padding: 3px;color:white; background:#023047", "padding: 3px;color:white; background:#f50a25");
+const REVISION = "v1.15.8";
+console.log("%cCopper3D Visualisation %cBeta:v1.15.8", "padding: 3px;color:white; background:#023047", "padding: 3px;color:white; background:#f50a25");
 
 export { CameraViewPoint, Copper3dTrackballControls, REVISION, addBoxHelper, addLabelToScene, configKiwriousHeart, convert3DPostoScreenPos, convertScreenPosto3DPos, copperMScene, copperMSceneRenderer, copperRenderer, copperRendererOnDemond, copperScene, copperSceneOnDemond, createTexture2D_NRRD, fullScreenListenner, kiwrious, loading, nrrd_tools, setHDRFilePath };