Merge pull request #307 from LinkunGao/feat/v2.1.2

Feat/v2.1.2
LinkunGao · Nov 5, 2024 · 57c7952 · 57c7952
2 parents e4149f7 + a434f7f
commit 57c7952
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 46 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,14 +47,14 @@
   },
   "dependencies": {
     "@types/dat.gui": "^0.7.9",
-    "@types/three": "^0.152.0",
+    "@types/three": "^0.169.0",
     "copper3d_plugin_heart_k": "^1.0.14",
     "dat.gui": "^0.7.9",
     "dicom-parser": "^1.8.13",
     "fflate": "^0.7.3",
     "file-saver": "^2.0.5",
     "glsl-blend-soft-light": "^1.0.5",
     "glsl-film-grain": "^1.0.4",
-    "three": "^0.161.0"
+    "three": "^0.170.0"
   }
 }
diff --git a/src/Controls/Copper3dTrackballControls.ts b/src/Controls/Copper3dTrackballControls.ts
@@ -384,7 +384,7 @@ class Copper3dTrackballControls extends EventDispatcher {
         scope.object.lookAt(scope.target);
 
         if (lastPosition.distanceToSquared(scope.object.position) > EPS) {
-          scope.dispatchEvent(_changeEvent);
+          scope.dispatchEvent(_changeEvent as never);
 
           lastPosition.copy(scope.object.position);
         }
@@ -395,7 +395,7 @@ class Copper3dTrackballControls extends EventDispatcher {
           lastPosition.distanceToSquared(scope.object.position) > EPS ||
           lastZoom !== scope.object.zoom
         ) {
-          scope.dispatchEvent(_changeEvent);
+          scope.dispatchEvent(_changeEvent as never);
 
           lastPosition.copy(scope.object.position);
           lastZoom = scope.object.zoom;
@@ -420,7 +420,7 @@ class Copper3dTrackballControls extends EventDispatcher {
 
       scope.object.lookAt(scope.target);
 
-      scope.dispatchEvent(_changeEvent);
+      scope.dispatchEvent(_changeEvent as never);
 
       lastPosition.copy(scope.object.position);
       lastZoom = scope.object.zoom;
@@ -538,7 +538,7 @@ class Copper3dTrackballControls extends EventDispatcher {
         _panEnd.copy(_panStart);
       }
 
-      scope.dispatchEvent(_startEvent);
+      scope.dispatchEvent(_startEvent as never);
     }
 
     function onMouseMove(event: PointerEvent) {
@@ -557,7 +557,7 @@ class Copper3dTrackballControls extends EventDispatcher {
     function onMouseUp() {
       _state = STATE.NONE;
 
-      scope.dispatchEvent(_endEvent);
+      scope.dispatchEvent(_endEvent as never);
     }
 
     function onMouseWheel(event: WheelEvent) {
@@ -584,8 +584,8 @@ class Copper3dTrackballControls extends EventDispatcher {
           break;
       }
 
-      scope.dispatchEvent(_startEvent);
-      scope.dispatchEvent(_endEvent);
+      scope.dispatchEvent(_startEvent as never);
+      scope.dispatchEvent(_endEvent as never);
     }
 
     function onTouchStart(event: PointerEvent) {
@@ -626,7 +626,7 @@ class Copper3dTrackballControls extends EventDispatcher {
           break;
       }
 
-      scope.dispatchEvent(_startEvent);
+      scope.dispatchEvent(_startEvent as never);
     }
 
     function onTouchMove(event: PointerEvent) {
@@ -709,7 +709,7 @@ class Copper3dTrackballControls extends EventDispatcher {
           break;
       }
 
-      scope.dispatchEvent(_endEvent);
+      scope.dispatchEvent(_endEvent as never);
     }
 
     function contextmenu(event: MouseEvent) {

diff --git a/src/Loader/copperNrrdLoader.ts b/src/Loader/copperNrrdLoader.ts
@@ -435,9 +435,9 @@ export function getWholeSlices(
 export function addBoxHelper(
   scene: copperScene,
   volume: any,
-  boxCube?: THREE.Object3D<THREE.Event>
+  boxCube?: THREE.Object3D<THREE.Object3DEventMap>
 ) {
-  let obj: THREE.Object3D<THREE.Event>;
+  let obj: THREE.Object3D<THREE.Object3DEventMap>;
   boxCube ? (obj = boxCube) : (obj = cube);
 
   const boxHelper = new THREE.BoxHelper(obj);

diff --git a/src/Renderer/copperMSceneRenderer.ts b/src/Renderer/copperMSceneRenderer.ts
@@ -39,7 +39,7 @@ export class copperMSceneRenderer {
   init() {
     // this.renderer.physicallyCorrectLights = true;
     // this.renderer.outputEncoding = THREE.sRGBEncoding;
-    this.renderer.useLegacyLights = true;
+    // this.renderer.useLegacyLights = true;
     this.renderer.outputColorSpace = THREE.SRGBColorSpace;
 
     this.pmremGenerator.compileEquirectangularShader();

diff --git a/src/Utils/segmentation/DrawToolCore.ts b/src/Utils/segmentation/DrawToolCore.ts
@@ -455,7 +455,7 @@ export class DrawToolCore extends CommToolsData {
       );
       let mouseX = e.offsetX / this.nrrd_states.sizeFoctor;
       let mouseY = e.offsetY / this.nrrd_states.sizeFoctor;
-
+      
       //  record mouseX,Y, and enable crosshair function
       this.nrrd_states.sphereOrigin[this.protectedData.axis] = [
         mouseX,
@@ -1215,8 +1215,8 @@ export class DrawToolCore extends CommToolsData {
         Math.min(this.nrrd_states.sphereRadius, 50)
       );
       // get mouse position
-      const mouseX = this.nrrd_states.sphereOrigin[this.protectedData.axis][0] * this.nrrd_states.sizeFoctor;
-      const mouseY = this.nrrd_states.sphereOrigin[this.protectedData.axis][1] * this.nrrd_states.sizeFoctor;
+      const mouseX = this.nrrd_states.sphereOrigin[this.protectedData.axis][0] ;
+      const mouseY = this.nrrd_states.sphereOrigin[this.protectedData.axis][1];
       this.drawSphere(mouseX, mouseY, this.nrrd_states.sphereRadius);
     };
     return sphereEvent;
@@ -1254,6 +1254,8 @@ export class DrawToolCore extends CommToolsData {
 
 
   drawSphere(mouseX: number, mouseY: number, radius: number) {
+    console.log(radius);
+
     // clear canvas
     const [canvas, ctx] = this.clearSphereCanvas()
     this.drawSphereCore(ctx as CanvasRenderingContext2D, mouseX, mouseY, radius,this.gui_states.fillColor);

diff --git a/src/Utils/utils.ts b/src/Utils/utils.ts
@@ -1,3 +1,4 @@
+import * as THREE from "three";
 export function fullScreenListenner(
   container: HTMLDivElement | HTMLCanvasElement
 ) {

diff --git a/src/index.ts b/src/index.ts
@@ -44,10 +44,10 @@ import { IPaintImage, ICommXYZ } from "./Utils/segmentation/coreTools/coreType";
 
 import "./css/style.css";
 
-export const REVISION = "v2.1.1";
+export const REVISION = "v2.1.2";
 
 console.log(
-  "%cCopper3D Visualisation %cBeta:v2.1.1",
+  "%cCopper3D Visualisation %cBeta:v2.1.2",
   "padding: 3px;color:white; background:#023047",
   "padding: 3px;color:white; background:#f50a25"
 );

diff --git a/src/types/types.ts b/src/types/types.ts
@@ -2,6 +2,7 @@ import { copperScene } from "../Scene/copperScene";
 import { baseScene } from "../Scene/baseScene";
 import { copperMScene } from "../Scene/copperMScene";
 import { GUI } from "dat.gui";
+import * as THREE from "three";
 
 interface SceneMapType {
   [key: string]: copperScene | baseScene | copperMScene;