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

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.2.0';
+const VERSION = '0.3.3';
 const PLUGIN_NAME = `DnalogelPlugin-PanoTagPlugin-${random()}@${VERSION}`;
 const TAG_INITIAL_UNFOLDED = true;
 export const pluginFlag = (name) => `${PLUGIN_NAME}--${name}`;

package/libs/PanoTagPlugin/index.d.ts

@@ -1,6 +1,7 @@
 import type { FivePlugin } from '@realsee/five';
 import PanoTagPluginController from './controller';
 export * from './controller';
+export * from './typings/tag';
 export declare type PanoTagPluginExportInterface = InstanceType<typeof PanoTagPluginController>;
 export declare type PanoTagPluginParamsInterface = ConstructorParameters<typeof PanoTagPluginController>[1];
 export declare const PanoTagPlugin: FivePlugin<PanoTagPluginParamsInterface, PanoTagPluginExportInterface>;

package/libs/PanoTagPlugin/index.js

@@ -1,4 +1,5 @@
 import PanoTagPluginController from './controller';
 export * from './controller';
+export * from './typings/tag';
 export const PanoTagPlugin = (five, params) => new PanoTagPluginController(five, params);
 export default PanoTagPlugin;

package/libs/PanoTagPlugin/mocks/mock1.js

@@ -56,7 +56,7 @@ const tagList = [
     {
         dimensionType: '3D',
         pointType: 'PlaneTag',
-        contentType: 'MediaPanel',
+        contentType: 'MediaPlane',
         position: [vector0, vector1, vector2, vector3],
         data: {
             mediaData: [

package/libs/PanoTagPlugin/mocks/mock6.js

@@ -103,7 +103,7 @@ export default {
         {
             dimensionType: '3D',
             pointType: 'PlaneTag',
-            contentType: 'MediaPanel',
+            contentType: 'MediaPlane',
             position: [vector0, vector1, vector2, vector3],
             data: {
                 mediaData: [

package/libs/PanoTagPlugin/tag.config.js

@@ -31,7 +31,7 @@ const DefaultConfig = {
         'Any-Marketing-Any': {
             unfoldedConfig: undefined,
         },
-        '3D-MediaPanel-PlaneTag': {
+        '3D-MediaPlane-PlaneTag': {
             unfoldedConfig: {
                 disableFold: true,
             },

package/libs/PanoTagPlugin/typings/tag.d.ts

@@ -31,7 +31,7 @@ export declare enum ContentType {
     /** 营销标签 */
     Marketing = "Marketing",
     /** 图片视频贴片 */
-    MediaPanel = "MediaPanel",
+    MediaPlane = "MediaPlane",
     /** 其他/自定义标签 */
     Custom = "Custom"
 }
@@ -201,9 +201,12 @@ interface ContentTypeMap {
         };
         extraData?: Object;
     };
-    [ContentType.MediaPanel]: {
+    [ContentType.MediaPlane]: {
         enableCarousel?: boolean;
-        /** @deprecated replaced by objectFit */
+        /**
+         * @description stretch: 拉伸适配, proportional: 等比适配，默认值 'proportional'
+         * @deprecated replaced by objectFit
+         */
         adaptationMode?: 'stretch' | 'proportional';
         /** object-fit doc {@link https://developer.mozilla.org/zh-CN/docs/Web/CSS/object-fit} */
         objectFit?: ObjectFit;

package/libs/PanoTagPlugin/typings/tag.js

@@ -21,7 +21,7 @@ export var ContentType;
     /** 营销标签 */
     ContentType["Marketing"] = "Marketing";
     /** 图片视频贴片 */
-    ContentType["MediaPanel"] = "MediaPanel";
+    ContentType["MediaPlane"] = "MediaPlane";
     /** 其他/自定义标签 */
     ContentType["Custom"] = "Custom";
 })(ContentType || (ContentType = {}));

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

@@ -107,16 +107,17 @@ export class BaseController {
         this.needsRender();
     }
     show() {
-        this.helperObject3D.visible = true;
+        this.helperObject3D.show();
         this.needsRender();
     }
     hide() {
-        this.helperObject3D.visible = false;
+        this.helperObject3D.hide();
         this.needsRender();
     }
     dispose() {
-        this.scene.remove(this.helperObject3D);
         this.helperObject3D.dispose();
+        this.scene.remove(this.helperObject3D);
+        this.needsRender();
     }
     updateHelperPosition() {
         this.helperObject3D.updatePosition();

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

@@ -5,8 +5,13 @@ import type { Direction, Direction4 } from '../typings';
 import type { tipsDom } from '../Helper/HTML/tipsDom';
 export declare abstract class BaseHelper<OriginObject3D extends Object3D = Object3D> extends Object3D {
     protected originObject3D: OriginObject3D;
+    protected needsRender: () => any;
     get helperObject(): Object3D;
-    constructor(originObject3D: OriginObject3D);
+    constructor(originObject3D: OriginObject3D, config?: {
+        needsRender?: () => any;
+    });
+    show(): void;
+    hide(): void;
     updatePosition(): void;
     setPosition(position: Vector3): void;
     updateMatrix4(matrix: THREE.Matrix4, origin?: THREE.Vector3): void;
@@ -15,8 +20,7 @@ export declare abstract class BaseHelper<OriginObject3D extends Object3D = Objec
         helperOrigin?: THREE.Vector3;
     }): void;
     updateQuaternion(quaternion: THREE.Quaternion, origin?: THREE.Vector3): void;
-    abstract hide(...args: any[]): void;
-    abstract show(...args: any[]): void;
+    abstract showDraggingHelper(directions?: Direction[]): void;
     abstract dispose(): void;
 }
 export declare abstract class MoveHelperAbstract<OriginObject3D extends Object3D = Object3D> extends BaseHelper<OriginObject3D> {
@@ -35,8 +39,6 @@ export declare abstract class MoveHelperAbstract<OriginObject3D extends Object3D
         line?: Object3D;
         direction: Direction;
     };
-    abstract hide(...directions: Direction[]): void;
-    abstract show(...directions: Direction[]): void;
 }
 export declare abstract class RotateHelperAbstract<OriginObject3D extends Object3D = Object3D> extends BaseHelper<OriginObject3D> {
     abstract xyCircle: Mesh & {
@@ -64,8 +66,7 @@ export declare abstract class RotateHelperAbstract<OriginObject3D extends Object
         direction: Direction;
     };
     abstract angleTips?: ReturnType<typeof tipsDom>;
-    abstract hide(): void;
-    abstract show(direction?: Direction): void;
+    abstract showDraggingHelper(directions: Direction[]): void;
     abstract updateAngleHelperQuaternion(): void;
 }
 export declare abstract class ScaleHelperAbstract<OriginObject3D extends Object3D = Object3D> extends BaseHelper<OriginObject3D> {

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,11 +9,26 @@ 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);
     }

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');

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

@@ -21,6 +21,7 @@ export declare class RectangleScaleHelper<T extends OriginObjectType = OriginObj
     updatePosition(): void;
     setPosition(position: Vector3): void;
     updateMatrix4(matrix: THREE.Matrix4): void;
+    showDraggingHelper(): void;
     setHelperScaleMatrix4(matrix: THREE.Matrix4, params?: {
         origin?: Vector3;
         helperOrigin?: Vector3;

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

@@ -88,6 +88,9 @@ export class RectangleScaleHelper extends RectangleScaleHelperAbstract {
         (_b = this.plane) === null || _b === void 0 ? void 0 : _b.applyMatrix4(matrix);
         this.cornerPositions.forEach((cornerPosition) => cornerPosition.applyMatrix4(matrix));
     }
+    showDraggingHelper() {
+        // nothing to do
+    }
     setHelperScaleMatrix4(matrix, params) {
         var _a, _b;
         (_a = this.css3DInstance) === null || _a === void 0 ? void 0 : _a.css3DObject.scale.applyMatrix4(matrix);

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

@@ -21,7 +21,8 @@ export declare class RotateHelper extends RotateHelperAbstract {
     updateAngleHelperQuaternion(): void;
     updateQuaternion(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

@@ -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

@@ -235,7 +235,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 +246,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/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.4",
   "license": "SEE LICENSE IN TERMS.txt",
   "scripts": {
     "build": "yarn run tsb && yarn run build:rollup && yarn run build:components && yarn build:docs",