@realsee/dnalogel 2.1.0-alpha.6 → 2.1.0-alpha.7

package/libs/CSS3DRenderPlugin/CSS3DRender.js

@@ -289,8 +289,10 @@ export class CSS3DRender {
             configurable: true,
             writable: true,
             value: (element, resizeHandler, fireImmediately = true) => {
-                if (!element || !ResizeObserver)
+                if (!element) {
+                    console.error('createResizeObserver: element is undefined');
                     return { observe: () => { }, unobserve: () => { } };
+                }
                 const resizeObserverHandler = () => {
                     /**
                      * 这里evenNumber策略是遇到奇数会加1，在某些浏览器中会触发滚动条显示，导致fiveElement变小，fiveElement变小又触发了这里的resize，宽高变小，滚动条消失，然后又触发resize。。。无限循环
@@ -300,6 +302,10 @@ export class CSS3DRender {
                     const height = evenNumber(element.clientHeight, { smaller: true });
                     resizeHandler(width, height);
                 };
+                if (typeof ResizeObserver === 'undefined' || !ResizeObserver) {
+                    console.warn('createResizeObserver: ResizeObserver is undefined');
+                    return { observe: () => resizeObserverHandler(), unobserve: () => { } };
+                }
                 const observer = new ResizeObserver(resizeObserverHandler);
                 if (fireImmediately)
                     resizeObserverHandler();

package/libs/CSS3DRenderPlugin/utils/CSS3DObjectPlus.js

@@ -8,6 +8,7 @@ const NAME = `CSS3DObjectPlus@${VERSION}`;
 export const MinRatio = 0.00216;
 export const DefaultRatio = 0.003;
 export class CSS3DObjectPlus extends CSS3DObject {
+    // eslint-disable-next-line max-params
     constructor(container, cornerPoints, ratio = DefaultRatio, dpr = 1) {
         const realRatio = Math.max(MinRatio, ratio);
         const planeWidth = cornerPoints[0].distanceTo(cornerPoints[1]);

package/libs/Object3DHelperPlugin/Controller.js

@@ -50,6 +50,7 @@ export class Object3DHelperController extends BasePlugin.Controller {
         });
         this.five = five;
         Object.assign(window, { [`__${PLUGIN_NAME.toUpperCase()}_DEBUG__`]: this });
+        // Object.assign(window, { THREE: THREE })
     }
     /**
      * @description Show guide line
@@ -115,6 +116,8 @@ export class Object3DHelperController extends BasePlugin.Controller {
      */
     addObject3DHelper(object3D, config = {}) {
         var _a;
+        if (!object3D)
+            return console.error('Object3D is undefined');
         if (this.objectHelperMap.has(object3D)) {
             console.warn(`Object3DHelperPlugin: object3D ${object3D.name} already has helper`);
             return;
@@ -162,7 +165,6 @@ export class Object3DHelperController extends BasePlugin.Controller {
         helper.dispose();
     }
     handleEnable(enabled, userAction = true) {
-        console.log({ enabled });
         if (enabled) {
             this.everyHelperDo((helper) => helper.enable());
             this.hooks.emit('enable', { userAction });
@@ -174,7 +176,6 @@ export class Object3DHelperController extends BasePlugin.Controller {
         this.state.enabled = enabled;
     }
     handleVisible(visible, userAction = true) {
-        console.log({ visible });
         if (visible) {
             this.everyHelperDo((helper) => helper.show());
             this.actionIfStateIsEnabled(() => this.hooks.emit('show', { userAction }));

package/libs/PanoTagPlugin/Components/Tag/MarketingTag.js

@@ -27,7 +27,7 @@ import {
 import Shadow from '../Common/Shadow';
 
 function add_css(target) {
-	append_styles(target, "svelte-xgzc8c", ".svelte-xgzc8c.svelte-xgzc8c{box-sizing:border-box}.marketing.svelte-xgzc8c.svelte-xgzc8c{transform:translateY(-100%)}.content.svelte-xgzc8c .headerImage.svelte-xgzc8c{position:absolute;width:100%;top:0.25rem;transform:translateY(-100%);border-top-left-radius:0.25rem;border-top-right-radius:0.25rem}.line.svelte-xgzc8c.svelte-xgzc8c{position:absolute;height:2.0625rem;width:0.0625rem;left:50%;transform:translateX(-50%);background-color:white;bottom:0;transform-origin:bottom;transition:all 500ms}.content.svelte-xgzc8c.svelte-xgzc8c{background-color:white;position:relative;display:flex;flex-direction:column;min-width:11.125rem;width:-webkit-max-content;width:-moz-max-content;width:max-content;height:-webkit-max-content;height:-moz-max-content;height:max-content;border-radius:0.25rem;top:-1.875rem;left:-1rem;padding:0.5rem 0rem 0.5625rem;transition:all 500ms}.title.svelte-xgzc8c.svelte-xgzc8c{position:absolute;background-color:white;border-radius:0.25rem;width:100%;top:0.5rem;padding-left:0.75rem;padding-right:0.75rem}.title.svelte-xgzc8c .text.svelte-xgzc8c{display:block;width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:0.75rem;font-weight:bold;line-height:1.125rem;color:#000}.footer.svelte-xgzc8c.svelte-xgzc8c{position:relative;padding-left:0.75rem;padding-right:0.75rem;width:100%;height:1.375rem;display:flex;align-items:center}.footer.svelte-xgzc8c .goto-button.svelte-xgzc8c{flex-shrink:0;white-space:nowrap;background-image:linear-gradient(to right, rgba(87, 144, 253, 1) 0, rgba(42, 114, 254, 1) 100%);color:#fff;font-size:0.625rem;border-radius:0.875rem;font-weight:bold;padding-left:0.5rem;padding-right:0.5rem;height:1.25rem;margin-left:auto;display:flex;align-items:center}.footer.svelte-xgzc8c .goto-icon.svelte-xgzc8c::after{content:'';display:inline-block;width:0.75rem;height:0.75rem;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAMAAADW3miqAAAAeFBMVEUAAAD////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////GqOSsAAAAJ3RSTlMAFNO2pYt4bErz8uP6ysawgVtBPDcR5C4s2L6ZmJBzZGJXUyEeDws/0G2zAAAAkklEQVQ4y+3TRw6DMBAF0OAeJ3QCpCe0uf8NwRILLBYfiS1/aT3JoymnI+sERZ5VCH0iVto3QDfBLmeSSMUTogRV9bBEpJAKaYpGijn13aTSLeraeG9D0NZFZv4/rRL5FDHnITlllqjv6tykWsmX4JHr05y7j6oFKq2P8He48B0tAM0EY0EDxquClw6vLz6EI35GmwwSZpe+WOgAAAAASUVORK5CYII=);background-size:100% auto;background-repeat:no-repeat}.price.svelte-xgzc8c.svelte-xgzc8c{flex-shrink:0;margin-right:0.75rem;white-space:nowrap;color:#ff6600;display:flex;align-items:baseline}.price.svelte-xgzc8c .value.svelte-xgzc8c{position:relative;top:0.0625rem;font-size:1.125rem;line-height:1.375rem;font-family:TG-TYPE, PingFangSC, Segoe UI, Rototo, sans-serif;letter-spacing:0rem}.price.svelte-xgzc8c .unit.svelte-xgzc8c{padding-left:0.125rem;font-size:0.625rem}.tag.svelte-xgzc8c.svelte-xgzc8c{position:relative;background-color:white;display:flex;width:-webkit-max-content;width:-moz-max-content;width:max-content;padding-left:0.75rem;padding-right:0.75rem}.tag.svelte-xgzc8c .base-tag.svelte-xgzc8c{height:1rem;margin-top:1.375rem;margin-bottom:0.5rem;margin-right:0.25rem;font-size:0.625rem;line-height:0.875rem;padding:0.0625rem 0.25rem;border-radius:0.125rem;overflow:hidden}.tag.svelte-xgzc8c .primary-tag.svelte-xgzc8c{background:#e5eefe;color:#0055ff}.tag.svelte-xgzc8c .secondary-tag.svelte-xgzc8c{background:rgba(255, 102, 0, 0.08);color:rgba(255, 102, 0, 1)}.unfolded.svelte-xgzc8c .line.svelte-xgzc8c{transform:translateX(-50%) scale(1, 1)}.folded.svelte-xgzc8c .line.svelte-xgzc8c{transform:translateX(-50%) scale(1, 0);transition-timing-function:ease-in}.unfolded.svelte-xgzc8c .content.svelte-xgzc8c{opacity:1}.folded.svelte-xgzc8c .content.svelte-xgzc8c{opacity:0;transform:translateY(0.425rem);transition-timing-function:ease-in}");
+	append_styles(target, "svelte-1dqrka8", ".svelte-1dqrka8.svelte-1dqrka8{box-sizing:border-box}.marketing.svelte-1dqrka8.svelte-1dqrka8{transform:translateY(-100%)}.content.svelte-1dqrka8 .headerImage.svelte-1dqrka8{position:absolute;width:100%;top:0.25rem;transform:translateY(-100%);border-top-left-radius:0.25rem;border-top-right-radius:0.25rem}.line.svelte-1dqrka8.svelte-1dqrka8{position:absolute;height:2.0625rem;width:0.0625rem;left:50%;transform:translateX(-50%);background-color:white;bottom:0;transform-origin:bottom;transition:all 500ms}.content.svelte-1dqrka8.svelte-1dqrka8{background-color:white;position:relative;display:flex;flex-direction:column;min-width:11.125rem;width:-webkit-max-content;width:-moz-max-content;width:max-content;height:-webkit-max-content;height:-moz-max-content;height:max-content;border-radius:0.25rem;top:-1.875rem;left:-1rem;padding:0.5rem 0rem 0.5625rem;transition:all 500ms}.title.svelte-1dqrka8.svelte-1dqrka8{position:absolute;background-color:white;border-radius:0.25rem;width:100%;top:0.5rem;padding-left:0.75rem;padding-right:0.75rem}.title.svelte-1dqrka8 .text.svelte-1dqrka8{display:block;width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:0.75rem;font-weight:bold;line-height:1.125rem;color:#000}.footer.svelte-1dqrka8.svelte-1dqrka8{position:relative;padding-left:0.75rem;padding-right:0.75rem;width:100%;height:1.375rem;display:flex;align-items:center}.footer.svelte-1dqrka8 .goto-button.svelte-1dqrka8{flex-shrink:0;white-space:nowrap;background-image:linear-gradient(to right, rgba(87, 144, 253, 1) 0, rgba(42, 114, 254, 1) 100%);color:#fff;font-size:0.625rem;border-radius:0.875rem;font-weight:bold;padding-left:0.5rem;padding-right:0.5rem;height:1.25rem;margin-left:auto;display:flex;align-items:center}.footer.svelte-1dqrka8 .goto-icon.svelte-1dqrka8::after{content:'';display:inline-block;width:0.75rem;height:0.75rem;background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAMAAADW3miqAAAAeFBMVEUAAAD////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////GqOSsAAAAJ3RSTlMAFNO2pYt4bErz8uP6ysawgVtBPDcR5C4s2L6ZmJBzZGJXUyEeDws/0G2zAAAAkklEQVQ4y+3TRw6DMBAF0OAeJ3QCpCe0uf8NwRILLBYfiS1/aT3JoymnI+sERZ5VCH0iVto3QDfBLmeSSMUTogRV9bBEpJAKaYpGijn13aTSLeraeG9D0NZFZv4/rRL5FDHnITlllqjv6tykWsmX4JHr05y7j6oFKq2P8He48B0tAM0EY0EDxquClw6vLz6EI35GmwwSZpe+WOgAAAAASUVORK5CYII=);background-size:100% auto;background-repeat:no-repeat}.price.svelte-1dqrka8.svelte-1dqrka8{flex-shrink:0;margin-right:0.75rem;white-space:nowrap;color:#ff6600;display:flex;align-items:baseline}.price.svelte-1dqrka8 .value.svelte-1dqrka8{position:relative;top:0.0625rem;font-size:1.125rem;line-height:1.375rem;font-family:TG-TYPE, PingFangSC, Segoe UI, Rototo, sans-serif;letter-spacing:0rem}.price.svelte-1dqrka8 .unit.svelte-1dqrka8{padding-left:0.125rem;font-size:0.625rem}.tag.svelte-1dqrka8.svelte-1dqrka8{position:relative;background-color:white;display:flex;width:-webkit-max-content;width:-moz-max-content;width:max-content;padding-left:0.75rem;padding-right:0.75rem;min-height:1.75rem}.tag.svelte-1dqrka8 .base-tag.svelte-1dqrka8{height:1rem;margin-top:1.375rem;margin-bottom:0.5rem;margin-right:0.25rem;font-size:0.625rem;line-height:0.875rem;padding:0.0625rem 0.25rem;border-radius:0.125rem;overflow:hidden}.tag.svelte-1dqrka8 .primary-tag.svelte-1dqrka8{background:#e5eefe;color:#0055ff}.tag.svelte-1dqrka8 .secondary-tag.svelte-1dqrka8{background:rgba(255, 102, 0, 0.08);color:rgba(255, 102, 0, 1)}.unfolded.svelte-1dqrka8 .line.svelte-1dqrka8{transform:translateX(-50%) scale(1, 1)}.folded.svelte-1dqrka8 .line.svelte-1dqrka8{transform:translateX(-50%) scale(1, 0);transition-timing-function:ease-in}.unfolded.svelte-1dqrka8 .content.svelte-1dqrka8{opacity:1}.folded.svelte-1dqrka8 .content.svelte-1dqrka8{opacity:0;transform:translateY(0.425rem);transition-timing-function:ease-in}");
 }
 
 function get_each_context(ctx, list, i) {
@@ -52,7 +52,7 @@ function create_if_block_4(ctx) {
 		c() {
 			div = element("div");
 			t = text(t_value);
-			attr(div, "class", "base-tag primary-tag svelte-xgzc8c");
+			attr(div, "class", "base-tag primary-tag svelte-1dqrka8");
 		},
 		m(target, anchor) {
 			insert(target, div, anchor);
@@ -112,7 +112,7 @@ function create_if_block_3(ctx) {
 		c() {
 			div = element("div");
 			t = text(t_value);
-			attr(div, "class", "base-tag secondary-tag svelte-xgzc8c");
+			attr(div, "class", "base-tag secondary-tag svelte-1dqrka8");
 		},
 		m(target, anchor) {
 			insert(target, div, anchor);
@@ -178,8 +178,8 @@ function create_if_block_1(ctx) {
 			t0 = text(t0_value);
 			t1 = space();
 			if (if_block) if_block.c();
-			attr(span, "class", "value svelte-xgzc8c");
-			attr(div, "class", "price svelte-xgzc8c");
+			attr(span, "class", "value svelte-1dqrka8");
+			attr(div, "class", "price svelte-1dqrka8");
 		},
 		m(target, anchor) {
 			insert(target, div, anchor);
@@ -221,7 +221,7 @@ function create_if_block_2(ctx) {
 		c() {
 			span = element("span");
 			t = text(t_value);
-			attr(span, "class", "unit svelte-xgzc8c");
+			attr(span, "class", "unit svelte-1dqrka8");
 		},
 		m(target, anchor) {
 			insert(target, span, anchor);
@@ -246,7 +246,7 @@ function create_if_block(ctx) {
 		c() {
 			div = element("div");
 			t = text(t_value);
-			attr(div, "class", "goto-button goto-icon svelte-xgzc8c");
+			attr(div, "class", "goto-button goto-icon svelte-1dqrka8");
 		},
 		m(target, anchor) {
 			insert(target, div, anchor);
@@ -342,7 +342,7 @@ function create_fragment(ctx) {
 			if (if_block0) if_block0.c();
 			t7 = space();
 			if (if_block1) if_block1.c();
-			attr(div0, "class", "line svelte-xgzc8c");
+			attr(div0, "class", "line svelte-1dqrka8");
 
 			set_style(
 				div0,
@@ -353,13 +353,13 @@ function create_fragment(ctx) {
 				false
 			);
 
-			attr(img, "class", "headerImage svelte-xgzc8c");
+			attr(img, "class", "headerImage svelte-1dqrka8");
 			if (!src_url_equal(img.src, img_src_value = /*data*/ ctx[2].headerPictureUrl)) attr(img, "src", img_src_value);
 			attr(img, "alt", "");
-			attr(div1, "class", "tag svelte-xgzc8c");
-			attr(div2, "class", "text svelte-xgzc8c");
-			attr(div3, "class", "title svelte-xgzc8c");
-			attr(div4, "class", "footer svelte-xgzc8c");
+			attr(div1, "class", "tag svelte-1dqrka8");
+			attr(div2, "class", "text svelte-1dqrka8");
+			attr(div3, "class", "title svelte-1dqrka8");
+			attr(div4, "class", "footer svelte-1dqrka8");
 
 			set_style(
 				div4,
@@ -370,7 +370,7 @@ function create_fragment(ctx) {
 				false
 			);
 
-			attr(div5, "class", "content svelte-xgzc8c");
+			attr(div5, "class", "content svelte-1dqrka8");
 
 			set_style(
 				div5,
@@ -381,7 +381,7 @@ function create_fragment(ctx) {
 				false
 			);
 
-			attr(div6, "class", "marketing svelte-xgzc8c");
+			attr(div6, "class", "marketing svelte-1dqrka8");
 			toggle_class(div6, "unfolded", /*unfolded*/ ctx[1]);
 			toggle_class(div6, "folded", /*folded*/ ctx[3]);
 		},

package/libs/PanoTagPlugin/controller/index.js

@@ -9,7 +9,7 @@ import { TagComputer } from './TagComputer';
 import { CSS3DRenderPlugin } from '../../CSS3DRenderPlugin';
 import { DimensionType, PointType } from '../typings';
 // declare const __APP_VERSION__: string
-const VERSION = '0.3.4';
+const VERSION = '0.3.6';
 const PLUGIN_NAME = `DnalogelPlugin-PanoTagPlugin@${VERSION}`;
 const TAG_INITIAL_UNFOLDED = true;
 export const pluginFlag = (name) => `${PLUGIN_NAME}--${name}`;

package/libs/PanoTagPlugin/tag.config.js

@@ -14,7 +14,7 @@ const DefaultConfig = {
         },
         tag3DConfig: {
             ratio: 0.0035,
-            devicePixelRatio: window.devicePixelRatio,
+            // devicePixelRatio: window.devicePixelRatio,
         },
     },
     contentTypeConfig: {

package/libs/shared-utils/Object3DHelper/Base/BaseController.d.ts

@@ -16,6 +16,8 @@ export declare abstract class BaseController<T extends BaseHelper = BaseHelper,
     protected needsRender: () => void;
     protected enabled: boolean;
     constructor(camera: THREE.Camera, model: THREE.Object3D, originObject3D: K, helperObject3D: T, container: HTMLElement, scene: THREE.Scene, needsRender?: () => void);
+    initialHelperPosition(): void;
+    initialHelperQuaternion(): void;
     enable(): void;
     disable(): void;
     show(): void;

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

@@ -89,10 +89,16 @@ export class BaseController {
         this.scene = scene;
         this.domEvents = new DomEvents(camera, container);
         this.needsRender = needsRender !== null && needsRender !== void 0 ? needsRender : (() => { });
-        this.updateHelperQuaternion();
-        this.updateHelperPosition();
+        this.initialHelperPosition();
+        this.initialHelperQuaternion();
         this.enable();
     }
+    initialHelperPosition() {
+        this.helperObject3D.updatePosition();
+    }
+    initialHelperQuaternion() {
+        this.helperObject3D.updateQuaternion();
+    }
     enable() {
         if (this.enabled)
             return;

package/libs/shared-utils/Object3DHelper/Controller/RectangleScaleController.d.ts

@@ -8,8 +8,8 @@ interface StartInfo {
         position: Vector3;
         direction: Direction4;
     };
-    nsMoveIsNegative?: boolean | null;
-    ewMoveIsNegative?: boolean | null;
+    dragPointInCenterBottom?: boolean | null;
+    dragPointInCenterLeft?: boolean | null;
     plane: THREE.Plane;
 }
 export declare abstract class RectangleScaleController<OriginObject3D extends THREE.Object3D, PointType extends THREE.Object3D | HTMLElement> extends BaseController<RectangleScaleHelperAbstract<OriginObject3D, PointType>> {

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

@@ -2,8 +2,9 @@ import { BaseController } from '../Base/BaseController';
 import * as THREE from 'three';
 import { getMouseRaycaster, vectorIsEqual } from '../utils';
 import { Vector3 } from 'three';
-import { negateScale } from '../utils/negateScale';
+import '../utils/negateScale';
 import '../utils/getPoint';
+import '../utils/finiteNumber';
 export class RectangleScaleController extends BaseController {
     constructor(...params) {
         super(...params);
@@ -40,10 +41,6 @@ export class RectangleScaleController extends BaseController {
             plane.setFromNormalAndCoplanarPoint(this.originObject3D.getWorldDirection(new Vector3()), positions[0]);
         else
             plane.setFromCoplanarPoints(positions[0], positions[1], positions[2]);
-        // const p0 = getPoint(positions[0]!, 0)
-        // const p1 = getPoint(positions[1]!, 1)
-        // const p2 = getPoint(positions[2]!, 2)
-        // this.scene.add(p0, p1, p2)
         return plane;
     }
     dragStart(mousePoint, point) {
@@ -53,6 +50,7 @@ export class RectangleScaleController extends BaseController {
         if (!plane)
             return this.dragEnd();
         this.startInfo = { startPoint: { position: point.position.clone(), direction: point.direction }, plane };
+        // this.scene.add(getPoint(point.position.clone(), 3))
         this.hooks.emit('scaleStart');
         this.needsRender();
         this.isDragging = true;
@@ -65,7 +63,7 @@ export class RectangleScaleController extends BaseController {
         if (!raycaster)
             return this.dragEnd();
         this.scale(raycaster);
-        console.log('%c RectangleScaleController dragging', 'color: #49de1b');
+        // console.log('%c RectangleScaleController dragging', 'color: #49de1b')
     }
     scale(raycaster) {
         var _a, _b;
@@ -81,100 +79,108 @@ export class RectangleScaleController extends BaseController {
             return;
         if (vectorIsEqual(planeIntersection, this.camera.position))
             return;
-        const referencePosition = cornerPositions[0].clone();
         const planeCenter = new Vector3().addVectors(cornerPositions[0], cornerPositions[2]).divideScalar(2);
         const { position: startPosition, direction } = startPoint;
-        const ewVector = new Vector3().subVectors(cornerPositions[1], referencePosition); // west -> east vector
-        const nsVector = new Vector3().subVectors(cornerPositions[3], referencePosition); // south -> north vector
+        const ewVector = new Vector3().subVectors(cornerPositions[1], cornerPositions[0]); // west -> east vector
+        const nsVector = new Vector3().subVectors(cornerPositions[3], cornerPositions[0]); // south -> north vector
         // eslint-disable-next-line complexity
-        const getScale = (direction) => {
+        const getOffset = (direction) => {
+            const defaultVector = new Vector3(0, 0, 0);
+            if (!this.startInfo)
+                return defaultVector;
             const baseVector = (direction === 'ew' ? ewVector : nsVector).clone();
             const startPositionProject = startPosition.clone().projectOnVector(baseVector);
             const nowPositionProject = planeIntersection.clone().projectOnVector(baseVector);
             const planeCenterProject = planeCenter.clone().projectOnVector(baseVector);
-            if (this.startInfo) {
-                if (direction === 'ns' && typeof this.startInfo.nsMoveIsNegative !== 'boolean') {
-                    const offset = new Vector3().subVectors(nowPositionProject, planeCenterProject);
-                    const xIsNegative = offset.x < 0 && baseVector.x >= 0;
-                    const yIsNegative = offset.y < 0 && baseVector.y >= 0;
-                    const zIsNegative = offset.z < 0 && baseVector.z >= 0;
-                    this.startInfo.nsMoveIsNegative = xIsNegative || yIsNegative || zIsNegative;
+            // this.scene.add(getPoint(startPosition, 0))
+            // this.scene.add(getPoint(planeIntersection, 0))
+            if (nowPositionProject.equals(startPositionProject))
+                return defaultVector;
+            if (direction === 'ns' && typeof this.startInfo.dragPointInCenterBottom !== 'boolean') {
+                const offset = new Vector3().subVectors(nowPositionProject, planeCenterProject);
+                const xIsNegative = offset.x < 0 && baseVector.x >= 0;
+                const yIsNegative = offset.y < 0 && baseVector.y >= 0;
+                const zIsNegative = offset.z < 0 && baseVector.z >= 0;
+                this.startInfo.dragPointInCenterBottom = xIsNegative || yIsNegative || zIsNegative;
+            }
+            if (direction === 'ew' && typeof this.startInfo.dragPointInCenterLeft !== 'boolean') {
+                const offset = new Vector3().subVectors(nowPositionProject, planeCenterProject);
+                const xIsNegative = offset.x < 0 && baseVector.x >= 0;
+                const yIsNegative = offset.y < 0 && baseVector.y >= 0;
+                const zIsNegative = offset.z < 0 && baseVector.z >= 0;
+                this.startInfo.dragPointInCenterLeft = xIsNegative || yIsNegative || zIsNegative;
+            }
+            const offset = new Vector3().subVectors(nowPositionProject, startPositionProject);
+            // TODO
+            if (offset.length() > 0.1)
+                return defaultVector;
+            return offset;
+        };
+        const ewOffset = getOffset('ew');
+        const nsOffset = getOffset('ns');
+        const setEWScale = () => {
+            const offset = ewOffset;
+            this.helperObject3D.cornerPositions.forEach((position, index) => {
+                var _a;
+                if ((_a = this.startInfo) === null || _a === void 0 ? void 0 : _a.dragPointInCenterLeft) {
+                    if (index === 0 || index === 3)
+                        position.add(offset); // 拖左边，只改左边点
                 }
-                if (direction === 'ew' && typeof this.startInfo.ewMoveIsNegative !== 'boolean') {
-                    const offset = new Vector3().subVectors(nowPositionProject, planeCenterProject);
-                    const xIsNegative = offset.x < 0 && baseVector.x >= 0;
-                    const yIsNegative = offset.y < 0 && baseVector.y >= 0;
-                    const zIsNegative = offset.z < 0 && baseVector.z >= 0;
-                    this.startInfo.ewMoveIsNegative = xIsNegative || yIsNegative || zIsNegative;
+                else {
+                    if (index === 1 || index === 2)
+                        position.add(offset); // 拖右边，只改右边点
                 }
-            }
-            if (nowPositionProject.equals(startPositionProject))
-                return;
-            const startPositionProjectOffset = new Vector3().subVectors(startPositionProject, planeCenterProject);
-            const nowPositionProjectOffset = new Vector3().subVectors(nowPositionProject, planeCenterProject);
-            const scale = nowPositionProjectOffset.clone().divide(startPositionProjectOffset);
-            scale.x = isNaN(scale.x) ? 1 : scale.x;
-            scale.y = isNaN(scale.y) ? 1 : scale.y;
-            scale.z = isNaN(scale.z) ? 1 : scale.z;
-            return scale;
+            });
         };
-        const nsScale = (_a = getScale('ns')) !== null && _a !== void 0 ? _a : new Vector3(1, 1, 1);
-        const ewScale = (_b = getScale('ew')) !== null && _b !== void 0 ? _b : new Vector3(1, 1, 1);
-        const scale = (() => {
-            switch (direction) {
-                case 'ew':
-                    return ewScale;
-                case 'ns':
-                    return nsScale;
-                case 'nesw':
-                case 'nwse':
-                    return new Vector3().multiplyVectors(nsScale, ewScale);
-            }
-        })();
-        const halfScale = scale.clone().sub(new Vector3(1, 1, 1)).multiplyScalar(0.5).add(new Vector3(1, 1, 1));
-        const scaleMatrix = new THREE.Matrix4().scale(halfScale);
+        const setNSScale = () => {
+            const offset = nsOffset;
+            this.helperObject3D.cornerPositions.forEach((position, index) => {
+                var _a;
+                if ((_a = this.startInfo) === null || _a === void 0 ? void 0 : _a.dragPointInCenterBottom) {
+                    if (index === 0 || index === 1)
+                        position.add(offset); // 拖下边，只改下边点
+                }
+                else {
+                    if (index === 2 || index === 3)
+                        position.add(offset); // 拖上边，只改上边点
+                }
+            });
+        };
+        switch (direction) {
+            case 'ew':
+                setEWScale();
+                break;
+            case 'ns':
+                setNSScale();
+                break;
+            case 'nesw':
+            case 'nwse':
+                setEWScale();
+                setNSScale();
+        }
+        (_b = (_a = this.helperObject3D).updatePoints) === null || _b === void 0 ? void 0 : _b.call(_a);
+        // this.helperObject3D.cornerPositions.forEach((position, index) => {
+        //   this.scene.add(getPoint(position, index))
+        // })
+        const scaleX = new Vector3().subVectors(cornerPositions[1], cornerPositions[0]).length() / ewVector.length();
+        const scaleY = new Vector3().subVectors(cornerPositions[3], cornerPositions[0]).length() / nsVector.length();
+        const scaleXY = new Vector3(scaleX, scaleY, 1);
+        console.log(scaleXY);
+        const scaleMatrix = new THREE.Matrix4().scale(scaleXY);
         const newScale = object.scale.clone().applyMatrix4(scaleMatrix);
-        // const minScale = 0.000001
-        // newScale.x = Math.max(newScale.x, minScale)
-        // newScale.y = Math.max(newScale.y, minScale)
-        // newScale.z = Math.max(newScale.z, minScale)
-        // if (direction === 'ew' || direction === 'ns') {
-        //   if (newScale.x === minScale || newScale.y === minScale || newScale.z === minScale) return
-        // }
-        // if (direction === 'nesw' || direction === 'nwse') {
-        //   if (newScale.x === minScale && newScale.y === minScale) return
-        //   if (newScale.x === minScale && newScale.z === minScale) return
-        //   if (newScale.y === minScale && newScale.z === minScale) return
-        // }
         object.scale.copy(newScale); // 或者 object.scale.applyMatrix4(scaleMatrix)
-        startPoint.position.copy(planeIntersection);
         this.hooks.emit('scaleUpdate', { matrix4: scaleMatrix, helperOrigin: planeCenter });
+        startPoint.position.copy(planeIntersection);
+        // =================================================================================================================================================================
+        // =================================================================================================================================================================
         // 移动位置
-        if (referencePosition) {
-            const ewMoveScale = this.startInfo.ewMoveIsNegative ? negateScale(ewScale) : ewScale;
-            const nsMoveScale = this.startInfo.nsMoveIsNegative ? negateScale(nsScale) : nsScale;
-            const moveScale = (() => {
-                switch (direction) {
-                    case 'ew':
-                        return ewMoveScale;
-                    case 'ns':
-                        return nsMoveScale;
-                    case 'nesw':
-                    case 'nwse':
-                        return new Vector3().multiplyVectors(ewMoveScale, nsMoveScale);
-                }
-            })();
-            const halfMoveScale = moveScale.clone().sub(new Vector3(1, 1, 1)).multiplyScalar(0.5).add(new Vector3(1, 1, 1));
-            const objectPosition = object.position.clone();
-            const newPosition = new Vector3()
-                .subVectors(objectPosition, referencePosition)
-                .multiply(halfMoveScale)
-                .add(referencePosition)
-                .sub(objectPosition);
-            const transform = new THREE.Matrix4().setPosition(newPosition);
-            object.applyMatrix4(transform);
-            this.hooks.emit('positionUpdate', { matrix4: transform });
-        }
+        const centerPosition = new Vector3().addVectors(cornerPositions[0], cornerPositions[2]).divideScalar(2);
+        const offset = new Vector3().subVectors(centerPosition, planeCenter);
+        const transform = new THREE.Matrix4().setPosition(offset);
+        object.applyMatrix4(transform);
+        // this.hooks.emit('scaleUpdate', { matrix4: scaleMatrix, helperOrigin: planeCenter })
+        this.hooks.emit('positionUpdate', { matrix4: transform });
+        // 移动位置end
         this.needsRender();
     }
     dragEnd() {

package/libs/shared-utils/Object3DHelper/Controller/RotateController.d.ts

@@ -3,10 +3,11 @@ import type { RotateHelperAbstract } from '../Helper';
 export declare class RotateController<T extends RotateHelperAbstract = RotateHelperAbstract> extends BaseController<T> {
     private startInfo?;
     private lastRotation?;
+    private a?;
     private rotations;
-    private a;
     private helperObject3DQuaternion;
     constructor(...params: ConstructorParameters<typeof BaseController<T>>);
+    initialHelperQuaternion(): void;
     /**
      * @description: 拖动开始，找出拖的Direction
      */

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

@@ -17,23 +17,23 @@ export class RotateController extends BaseController {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "rotations", {
+        Object.defineProperty(this, "a", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: []
+            value: void 0
         });
-        Object.defineProperty(this, "a", {
+        Object.defineProperty(this, "rotations", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: []
         });
         Object.defineProperty(this, "helperObject3DQuaternion", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: this.helperObject3D.quaternion.clone()
+            value: this.originObject3D.quaternion.clone()
         });
         // add hover listener
         const helper = this.helperObject3D;
@@ -45,6 +45,10 @@ export class RotateController extends BaseController {
         document.addEventListener('mousemove', dragging);
         document.addEventListener('mouseup', dragEnd);
     }
+    initialHelperQuaternion() {
+        this.helperObject3D.updateAngleHelperQuaternion();
+        this.helperObject3D.applyHelperQuaternion(this.originObject3D.quaternion);
+    }
     /**
      * @description: 拖动开始，找出拖的Direction
      */
@@ -69,9 +73,9 @@ export class RotateController extends BaseController {
         this.setTipsPosition(tipsPosition);
         // end
         // init plane
-        const directionX = new THREE.Vector3(1, 0, 0).applyQuaternion(this.helperObject3DQuaternion.clone());
-        const directionY = new THREE.Vector3(0, 1, 0).applyQuaternion(this.helperObject3DQuaternion.clone());
-        const directionZ = new THREE.Vector3(0, 0, 1).applyQuaternion(this.helperObject3DQuaternion.clone());
+        const directionX = new THREE.Vector3(1, 0, 0).applyQuaternion(this.helperObject3DQuaternion);
+        const directionY = new THREE.Vector3(0, 1, 0).applyQuaternion(this.helperObject3DQuaternion);
+        const directionZ = new THREE.Vector3(0, 0, 1).applyQuaternion(this.helperObject3DQuaternion);
         const directionVector = (() => {
             switch (direction) {
                 case 'x':
@@ -83,6 +87,11 @@ export class RotateController extends BaseController {
             }
         })();
         const plane = new THREE.Plane().setFromNormalAndCoplanarPoint(directionVector, startIntersect);
+        // this.a && this.scene.remove(this.a)
+        // const h = new THREE.PlaneHelper(plane, 1)
+        // console.log(h.position)
+        // this.scene.add(h)
+        // this.a = h
         // end
         // init startVectorProject
         const projectPoint = new THREE.Vector3();

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

@@ -4,6 +4,7 @@ import { RectangleScaleHelperAbstract } from '.';
 import { CSS3DObject } from 'three/examples/jsm/renderers/CSS3DRenderer';
 import { rectangleScaleDom } from './HTML/rectangleScaleDom';
 import { CSS3DObjectPlus } from '../../../CSS3DRenderPlugin/utils/CSS3DObjectPlus';
+import '../utils/getPoint';
 export class RectangleScaleHelper extends RectangleScaleHelperAbstract {
     constructor(originObject3D, container, camera, scene) {
         super(originObject3D);
@@ -98,13 +99,6 @@ export class RectangleScaleHelper extends RectangleScaleHelperAbstract {
         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);
-        const { origin, helperOrigin } = params !== null && params !== void 0 ? params : {};
-        if (!helperOrigin)
-            return;
-        this.cornerPositions.forEach((position) => {
-            position.subVectors(position, helperOrigin).applyMatrix4(matrix).add(helperOrigin);
-        });
-        this.updatePoints();
     }
     updatePoints() {
         const position8 = this.calculatePointPosition(this.cornerPositions);

package/libs/shared-utils/Object3DHelper/utils/finiteNumber.d.ts

@@ -0,0 +1 @@
+export default function finiteNumber(value: number | undefined | null | void, defaultValue?: number): number;

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

@@ -0,0 +1,9 @@
+export default function finiteNumber(value, defaultValue = 0) {
+    if (typeof value === 'undefined' || value === null)
+        return defaultValue;
+    if (typeof value === 'number') {
+        if (Number.isNaN(value) || !Number.isFinite(value))
+            return defaultValue;
+    }
+    return value;
+}

package/package.json

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