@realsee/dnalogel 2.1.0-alpha.3 → 2.1.0-alpha.5

package/libs/shared-utils/Object3DHelper/Base/BaseHelper.js

@@ -1,6 +1,7 @@
 import { Object3D } from 'three';
 export class BaseHelper extends Object3D {
-    constructor(originObject3D) {
+    constructor(originObject3D, config) {
+        var _a;
         super();
         Object.defineProperty(this, "originObject3D", {
             enumerable: true,
@@ -8,24 +9,42 @@ export class BaseHelper extends Object3D {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "needsRender", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.originObject3D = originObject3D;
+        this.needsRender = (_a = config === null || config === void 0 ? void 0 : config.needsRender) !== null && _a !== void 0 ? _a : (() => { });
     }
     get helperObject() {
         return this;
     }
+    show() {
+        this.visible = true;
+        this.needsRender();
+    }
+    hide() {
+        this.visible = false;
+        this.needsRender();
+    }
     updatePosition() {
         this.position.copy(this.originObject3D.position);
     }
-    setPosition(position) {
-        this.position.copy(position);
+    updateQuaternion() {
+        this.quaternion.copy(this.originObject3D.quaternion);
     }
+    // public setPosition(position: Vector3) {
+    //   this.position.copy(position)
+    // }
     updateMatrix4(matrix, origin) {
         this.applyMatrix4(matrix);
     }
-    setHelperScaleMatrix4(matrix, params) {
+    applyHelperScaleMatrix4(matrix, params) {
         this.scale.applyMatrix4(matrix);
     }
-    updateQuaternion(quaternion, origin) {
+    applyHelperQuaternion(quaternion, origin) {
         this.applyQuaternion(quaternion);
     }
 }

package/libs/shared-utils/Object3DHelper/Controller/MoveController.js

@@ -61,7 +61,7 @@ export class MoveController extends BaseController {
         plane.setFromNormalAndCoplanarPoint(planeNormal, startIntersect);
         this.startInfo = { startVectorProject: startIntersect.clone().projectOnVector(directionVector), directionVector, plane };
         // 隐藏其他箭头
-        this.helperObject3D.hide(...['x', 'y', 'z'].filter((direction) => direction !== draggingDirection));
+        this.helperObject3D.showDraggingHelper([draggingDirection]);
         this.hooks.emit('moveStart');
         this.isDragging = true;
         console.log('%c MoveController dragStart', 'color: #e5af2e');

package/libs/shared-utils/Object3DHelper/Controller/RotateController.js

@@ -100,7 +100,7 @@ export class RotateController extends BaseController {
         // this.a = new THREE.PlaneHelper(plane, 10, 0xffff00)
         // this.scene.add(this.a)
         this.startInfo = { direction, startVector, staticStartVector, plane, angleHelper };
-        this.helperObject3D.show(direction);
+        this.helperObject3D.showDraggingHelper([direction]);
         this.hooks.emit('rotateStart');
         this.isDragging = true;
         console.log(`%c RotateController dragStart ${direction}`, 'color: #e5af2e');
@@ -190,7 +190,7 @@ export class RotateController extends BaseController {
         // end
         const quaternion = new THREE.Quaternion().setFromUnitVectors(startVector.clone().normalize(), currentVector.clone().normalize());
         object.applyQuaternion(quaternion);
-        this.helperObject3D.updateQuaternion(quaternion);
+        this.helperObject3D.applyHelperQuaternion(quaternion);
         this.helperObject3DQuaternion.premultiply(quaternion);
         this.hooks.emit('rotateUpdate', { quaternion, origin: rotateCenter });
         this.startInfo.startVector = currentVector;

package/libs/shared-utils/Object3DHelper/Helper/MoveHelper.d.ts

@@ -7,7 +7,7 @@ export declare class MoveHelper extends MoveHelperAbstract {
     yArrow: ArrowGroup;
     zArrow: ArrowGroup;
     constructor(originObject3D: Object3D);
-    hide(...directions: Direction[]): void;
-    show(direction?: Direction): void;
+    show(): void;
+    showDraggingHelper(directions: Direction[]): void;
     dispose(): void;
 }

package/libs/shared-utils/Object3DHelper/Helper/MoveHelper.js

@@ -26,29 +26,16 @@ export class MoveHelper extends MoveHelperAbstract {
         this.add(this.yArrow);
         this.add(this.zArrow);
     }
-    hide(...directions) {
-        if (directions.length === 0) {
-            this.xArrow.visible = false;
-            this.yArrow.visible = false;
-            this.zArrow.visible = false;
-        }
-        else {
-            directions.forEach((direction) => {
-                const arrow = [this.xArrow, this.yArrow, this.zArrow].find((arrow) => arrow.direction === direction);
-                arrow && (arrow.visible = false);
-            });
-        }
+    show() {
+        super.show();
+        this.xArrow.visible = true;
+        this.yArrow.visible = true;
+        this.zArrow.visible = true;
     }
-    show(direction) {
-        if (!direction) {
-            this.xArrow.visible = true;
-            this.yArrow.visible = true;
-            this.zArrow.visible = true;
-        }
-        else {
-            const arrow = [this.xArrow, this.yArrow, this.zArrow].find((arrow) => arrow.direction === direction);
-            arrow && (arrow.visible = true);
-        }
+    showDraggingHelper(directions) {
+        this.xArrow.visible = directions.includes('x');
+        this.yArrow.visible = directions.includes('y');
+        this.zArrow.visible = directions.includes('z');
     }
     dispose() {
         this.remove(this.xArrow, this.yArrow, this.zArrow);

package/libs/shared-utils/Object3DHelper/Helper/RectangleScaleHelper.d.ts

@@ -19,14 +19,14 @@ export declare class RectangleScaleHelper<T extends OriginObjectType = OriginObj
     private enabled;
     constructor(originObject3D: T, container: Element, camera: THREE.Camera, scene: THREE.Scene);
     updatePosition(): void;
-    setPosition(position: Vector3): void;
     updateMatrix4(matrix: THREE.Matrix4): void;
-    setHelperScaleMatrix4(matrix: THREE.Matrix4, params?: {
+    showDraggingHelper(): void;
+    applyHelperScaleMatrix4(matrix: THREE.Matrix4, params?: {
         origin?: Vector3;
         helperOrigin?: Vector3;
     }): void;
     updatePoints(): void;
-    updateQuaternion(quaternion: THREE.Quaternion, origin: THREE.Vector3): void;
+    applyHelperQuaternion(quaternion: THREE.Quaternion, origin: THREE.Vector3): void;
     enable(): void;
     disable(): void;
     show(): void;

package/libs/shared-utils/Object3DHelper/Helper/RectangleScaleHelper.js

@@ -77,18 +77,20 @@ export class RectangleScaleHelper extends RectangleScaleHelperAbstract {
         (_a = this.css3DInstance) === null || _a === void 0 ? void 0 : _a.css3DObject.position.copy(this.originObject3D.position);
         (_b = this.plane) === null || _b === void 0 ? void 0 : _b.position.copy(this.originObject3D.position);
     }
-    setPosition(position) {
-        var _a, _b;
-        (_a = this.css3DInstance) === null || _a === void 0 ? void 0 : _a.css3DObject.position.copy(position);
-        (_b = this.plane) === null || _b === void 0 ? void 0 : _b.position.copy(position);
-    }
+    // public setPosition(position: Vector3) {
+    //   this.css3DInstance?.css3DObject.position.copy(position)
+    //   this.plane?.position.copy(position)
+    // }
     updateMatrix4(matrix) {
         var _a, _b;
         (_a = this.css3DInstance) === null || _a === void 0 ? void 0 : _a.css3DObject.applyMatrix4(matrix);
         (_b = this.plane) === null || _b === void 0 ? void 0 : _b.applyMatrix4(matrix);
         this.cornerPositions.forEach((cornerPosition) => cornerPosition.applyMatrix4(matrix));
     }
-    setHelperScaleMatrix4(matrix, params) {
+    showDraggingHelper() {
+        // nothing to do
+    }
+    applyHelperScaleMatrix4(matrix, params) {
         var _a, _b;
         (_a = this.css3DInstance) === null || _a === void 0 ? void 0 : _a.css3DObject.scale.applyMatrix4(matrix);
         (_b = this.plane) === null || _b === void 0 ? void 0 : _b.scale.applyMatrix4(matrix);
@@ -106,7 +108,7 @@ export class RectangleScaleHelper extends RectangleScaleHelperAbstract {
             point.position.copy(position8[index]);
         });
     }
-    updateQuaternion(quaternion, origin) {
+    applyHelperQuaternion(quaternion, origin) {
         var _a;
         const css3DObject = (_a = this.css3DInstance) === null || _a === void 0 ? void 0 : _a.css3DObject;
         if (css3DObject) {

package/libs/shared-utils/Object3DHelper/Helper/RotateHelper.d.ts

@@ -19,9 +19,10 @@ export declare class RotateHelper extends RotateHelperAbstract {
         container: HTMLElement;
     });
     updateAngleHelperQuaternion(): void;
-    updateQuaternion(quaternion: THREE.Quaternion, origin?: THREE.Vector3): void;
+    applyHelperQuaternion(quaternion: THREE.Quaternion, origin?: THREE.Vector3): void;
     hide(): void;
-    show(direction?: Direction): void;
+    show(): void;
+    showDraggingHelper(directions: Direction[]): void;
     dispose(): void;
     private filterRingHelper;
     private filterAngleHelper;

package/libs/shared-utils/Object3DHelper/Helper/RotateHelper.js

@@ -87,7 +87,7 @@ export class RotateHelper extends RotateHelperAbstract {
         this.yRingHelper.quaternion.copy(this.xzCircle.quaternion);
         this.zRingHelper.quaternion.copy(this.xyCircle.quaternion);
     }
-    updateQuaternion(quaternion, origin) {
+    applyHelperQuaternion(quaternion, origin) {
         this.yzCircle.applyQuaternion(quaternion);
         this.xzCircle.applyQuaternion(quaternion);
         this.xyCircle.applyQuaternion(quaternion);
@@ -96,21 +96,21 @@ export class RotateHelper extends RotateHelperAbstract {
         this.zAngleHelper.baseAxes.applyQuaternion(quaternion);
     }
     hide() {
+        // 改为remove而不是设置visible，是因为会影响其他helper的碰撞检测
         this.remove(this.yzCircle, this.xzCircle, this.xyCircle, this.xRingHelper, this.yRingHelper, this.zRingHelper, this.xAngleHelper, this.yAngleHelper, this.zAngleHelper);
     }
-    show(direction) {
-        var _a, _b;
-        if (direction) {
-            this.hide();
-            this.add(...this.filterRingHelper(direction));
-            this.add(...this.filterAngleHelper(direction));
-            (_a = this.angleTips) === null || _a === void 0 ? void 0 : _a.show();
-        }
-        else {
-            this.add(this.xyCircle, this.xzCircle, this.yzCircle);
-            this.remove(this.xRingHelper, this.yRingHelper, this.zRingHelper, this.xAngleHelper, this.yAngleHelper, this.zAngleHelper);
-            (_b = this.angleTips) === null || _b === void 0 ? void 0 : _b.hide();
-        }
+    show() {
+        var _a;
+        this.add(this.xyCircle, this.xzCircle, this.yzCircle);
+        this.remove(this.xRingHelper, this.yRingHelper, this.zRingHelper, this.xAngleHelper, this.yAngleHelper, this.zAngleHelper);
+        (_a = this.angleTips) === null || _a === void 0 ? void 0 : _a.hide();
+    }
+    showDraggingHelper(directions) {
+        var _a;
+        this.hide();
+        this.add(...this.filterRingHelper(directions));
+        this.add(...this.filterAngleHelper(directions));
+        (_a = this.angleTips) === null || _a === void 0 ? void 0 : _a.show();
     }
     dispose() {
         var _a, _b;
@@ -118,11 +118,11 @@ export class RotateHelper extends RotateHelperAbstract {
         if ((_a = this.angleTips) === null || _a === void 0 ? void 0 : _a.element)
             (_b = this.container) === null || _b === void 0 ? void 0 : _b.removeChild(this.angleTips.element);
     }
-    filterRingHelper(direction) {
-        return [this.xRingHelper, this.yRingHelper, this.zRingHelper].filter((helper) => helper.direction === direction);
+    filterRingHelper(directions) {
+        return [this.xRingHelper, this.yRingHelper, this.zRingHelper].filter((helper) => directions.includes(helper.direction));
     }
-    filterAngleHelper(direction) {
-        return [this.xAngleHelper, this.yAngleHelper, this.zAngleHelper].filter((helper) => helper.direction === direction);
+    filterAngleHelper(directions) {
+        return [this.xAngleHelper, this.yAngleHelper, this.zAngleHelper].filter((helper) => directions.includes(helper.direction));
     }
 }
 class Circle extends THREE.Mesh {

package/libs/shared-utils/Object3DHelper/index.js

@@ -52,7 +52,7 @@ export class Object3DHelper {
             configurable: true,
             writable: true,
             value: (controller, ...positionParams) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h;
+                var _a, _b, _c, _d;
                 const [position] = positionParams;
                 const matrix4 = position === null || position === void 0 ? void 0 : position.matrix4;
                 if (matrix4) {
@@ -63,14 +63,12 @@ export class Object3DHelper {
                     (_c = this.controllers.scaleController) === null || _c === void 0 ? void 0 : _c.setHelperMatrix4(matrix4);
                     (_d = this.helpers.outlineHelper) === null || _d === void 0 ? void 0 : _d.applyMatrix4(matrix4);
                 }
-                if (position === null || position === void 0 ? void 0 : position.position) {
-                    if (controller !== this.controllers.moveController)
-                        (_e = this.controllers.moveController) === null || _e === void 0 ? void 0 : _e.setHelperPosition(position.position);
-                    if (controller !== this.controllers.rotateController)
-                        (_f = this.controllers.rotateController) === null || _f === void 0 ? void 0 : _f.setHelperPosition(position.position);
-                    (_g = this.controllers.scaleController) === null || _g === void 0 ? void 0 : _g.setHelperPosition(position.position);
-                    (_h = this.helpers.outlineHelper) === null || _h === void 0 ? void 0 : _h.position.copy(position.position);
-                }
+                // if (position?.position) {
+                //   if (controller !== this.controllers.moveController) this.controllers.moveController?.setHelperPosition(position.position)
+                //   if (controller !== this.controllers.rotateController) this.controllers.rotateController?.setHelperPosition(position.position)
+                //   this.controllers.scaleController?.setHelperPosition(position.position)
+                //   this.helpers.outlineHelper?.position.copy(position.position)
+                // }
             }
         });
         Object.defineProperty(this, "handleScaleUpdate", {
@@ -82,7 +80,7 @@ export class Object3DHelper {
                 const [params] = positionParams;
                 const matrix4 = params === null || params === void 0 ? void 0 : params.matrix4;
                 if (matrix4) {
-                    (_a = this.controllers.scaleController) === null || _a === void 0 ? void 0 : _a.setHelperScaleMatrix4(matrix4, params);
+                    (_a = this.controllers.scaleController) === null || _a === void 0 ? void 0 : _a.applyHelperScaleMatrix4(matrix4, params);
                     (_b = this.helpers.outlineHelper) === null || _b === void 0 ? void 0 : _b.scale.applyMatrix4(matrix4);
                 }
             }
@@ -235,7 +233,6 @@ export class Object3DHelper {
         }
     }
     handleEnable(enabled, userAction = true) {
-        console.log({ enabled });
         if (enabled) {
             this.everyControllerDo((controller) => controller.enable());
             this.hooks.emit('enable', { userAction });
@@ -247,7 +244,6 @@ export class Object3DHelper {
         this.state.enabled = enabled;
     }
     handleVisible(visible, userAction = true) {
-        console.log({ visible });
         if (visible) {
             this.everyControllerDo((controller) => controller.show());
             this.actionIfStateIsEnabled(() => this.hooks.emit('show', { userAction }));

package/libs/shared-utils/Object3DHelper/typings/Hooks.d.ts

@@ -5,7 +5,6 @@ export declare type HelperEventMap = {
     scaleStart: () => void;
     positionUpdate: (position: {
         matrix4?: THREE.Matrix4;
-        position?: THREE.Vector3;
     } | undefined) => void;
     rotateUpdate: (rotate: {
         quaternion?: THREE.Quaternion;

package/package.json

@@ -8,7 +8,7 @@
   "repository": "https://github.com/realsee-developer/dnalogel.git",
   "description": "如视 VR 看房插件合集",
   "private": false,
-  "version": "2.1.0-alpha.3",
+  "version": "2.1.0-alpha.5",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build": "yarn run tsb && yarn run build:rollup && yarn run build:components && yarn build:docs",