@realsee/dnalogel 2.1.0-alpha.8 → 2.1.0-alpha.9

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

@@ -83,6 +83,7 @@ export declare abstract class RectangleScaleHelperAbstract<OriginObject3D extend
     }[];
     abstract cornerPositions: Vector3[];
     abstract css3DInstance?: NonVoid<Create3DElementReturnType>;
+    abstract plane?: THREE.Mesh;
     abstract updatePoints(): void;
     abstract enable(): void;
     abstract disable(): void;

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

@@ -2,9 +2,6 @@ import { BaseController } from '../Base/BaseController';
 import * as THREE from 'three';
 import { getMouseRaycaster, vectorIsEqual } from '../utils';
 import { Vector3 } from 'three';
-import '../utils/negateScale';
-import '../utils/getPoint';
-import '../utils/finiteNumber';
 export class RectangleScaleController extends BaseController {
     constructor(...params) {
         super(...params);
@@ -111,9 +108,6 @@ export class RectangleScaleController extends BaseController {
                 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');
@@ -158,7 +152,6 @@ export class RectangleScaleController extends BaseController {
                 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))
         // })
@@ -167,20 +160,25 @@ export class RectangleScaleController extends BaseController {
         const scaleXY = new Vector3(scaleX, scaleY, 1);
         console.log(scaleXY);
         const scaleMatrix = new THREE.Matrix4().scale(scaleXY);
-        const newScale = object.scale.clone().applyMatrix4(scaleMatrix);
-        object.scale.copy(newScale); // 或者 object.scale.applyMatrix4(scaleMatrix)
-        this.hooks.emit('scaleUpdate', { matrix4: scaleMatrix, helperOrigin: planeCenter });
+        // const newScale = object.scale.clone().applyMatrix4(scaleMatrix)
+        // object.scale.copy(newScale) // 或者 object.scale.applyMatrix4(scaleMatrix)
+        object.scale.applyMatrix4(scaleMatrix);
         startPoint.position.copy(planeIntersection);
         // =================================================================================================================================================================
         // =================================================================================================================================================================
         // 移动位置
         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 });
+        const transformMatrix4 = new THREE.Matrix4().setPosition(offset);
+        object.applyMatrix4(transformMatrix4);
+        (_a = this.helperObject3D.css3DInstance) === null || _a === void 0 ? void 0 : _a.css3DObject.applyMatrix4(transformMatrix4);
+        (_b = this.helperObject3D.plane) === null || _b === void 0 ? void 0 : _b.applyMatrix4(transformMatrix4);
+        this.hooks.emit('scaleUpdate', { matrix4: scaleMatrix, helperOrigin: planeCenter });
+        this.hooks.emit('positionUpdate', { matrix4: transformMatrix4 });
         // 移动位置end
+        // this.helperObject3D.cornerPositions.forEach((position, index) => {
+        //   this.scene.add(getPoint(position, index))
+        // })
         this.needsRender();
     }
     dragEnd() {

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

@@ -11,8 +11,8 @@ export declare class RectangleScaleHelper<T extends OriginObjectType = OriginObj
     cornerPositions: Vector3[];
     css3DInstance?: NonVoid<Create3DElementReturnType>;
     get helperObject(): CSS3DObjectPlus<HTMLElement>;
+    plane?: THREE.Mesh<THREE.PlaneGeometry, THREE.MeshBasicMaterial>;
     private css3DRenderer;
-    private plane?;
     private camera;
     private scene;
     private container;

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

@@ -26,17 +26,17 @@ export class RectangleScaleHelper extends RectangleScaleHelperAbstract {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "css3DRenderer", {
+        Object.defineProperty(this, "plane", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: new CSS3DRender()
+            value: void 0
         });
-        Object.defineProperty(this, "plane", {
+        Object.defineProperty(this, "css3DRenderer", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: void 0
+            value: new CSS3DRender()
         });
         Object.defineProperty(this, "camera", {
             enumerable: true,

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

@@ -60,7 +60,8 @@ export class Object3DHelper {
                         (_a = this.controllers.moveController) === null || _a === void 0 ? void 0 : _a.setHelperMatrix4(matrix4);
                     if (controller !== this.controllers.rotateController)
                         (_b = this.controllers.rotateController) === null || _b === void 0 ? void 0 : _b.setHelperMatrix4(matrix4);
-                    (_c = this.controllers.scaleController) === null || _c === void 0 ? void 0 : _c.setHelperMatrix4(matrix4);
+                    if (controller !== this.controllers.scaleController)
+                        (_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?.position) {

package/package.json

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