@realsee/dnalogel 2.1.0-alpha.1 → 2.1.0-alpha.10

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

@@ -31,7 +31,7 @@ export declare enum ContentType {
     /** 营销标签 */
     Marketing = "Marketing",
     /** 图片视频贴片 */
-    MediaPanel = "MediaPanel",
+    MediaPlane = "MediaPlane",
     /** 其他/自定义标签 */
     Custom = "Custom"
 }
@@ -146,11 +146,21 @@ export interface TagConfig<C extends ContentType = ContentType, T extends PointT
         unfolded?: boolean;
     };
     tag3DConfig?: Create3DDomContainerParamsType['config'];
+    clickable?: false;
 }
 export declare enum LinkType {
     VrLink = "vr",
     NormalLink = "normal"
 }
+export declare type MediaData = {
+    type: 'Image';
+    url: string;
+} | {
+    type: 'Video';
+    url: string;
+    videoCoverUrl?: string;
+};
+export declare type ObjectFit = 'fill' | 'contain' | 'cover' | 'none' | 'scale-down';
 interface ContentTypeMap {
     [ContentType.Audio]: {
         text: string;
@@ -159,14 +169,9 @@ interface ContentTypeMap {
     };
     [ContentType.ImageText]: {
         text?: string;
-        mediaData: {
-            type: 'Video' | 'Image';
-            url: string;
-            videoCoverUrl?: string;
-            name: string;
-            width?: number;
-            height?: number;
-        }[];
+        mediaData: (MediaData & {
+            name?: string;
+        })[];
         extraData?: Object;
     };
     [ContentType.Text]: {
@@ -197,7 +202,18 @@ interface ContentTypeMap {
         };
         extraData?: Object;
     };
-    [ContentType.MediaPanel]: {};
+    [ContentType.MediaPlane]: {
+        enableCarousel?: boolean;
+        /**
+         * @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;
+        mediaData: MediaData[];
+        extraData?: Object;
+    };
     [ContentType.Custom]: unknown;
 }
 /** 内置一些基础标签 */

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/floorplan/Components/Compass.js

@@ -20,7 +20,7 @@ import {
 import { COMPASS_IMAGE } from '../Assets/compass';
 
 function add_css(target) {
-	append_styles(target, "svelte-z9kwkx", ".floorplan-plugin__compass.svelte-z9kwkx{position:absolute;left:50%;top:-2.39583rem;width:12.03125rem;height:2.13542rem;will-change:opacity;transform-origin:center 9.58333rem}.floorplan-plugin__compass-image.svelte-z9kwkx{width:100%;height:100%;position:absolute;left:0;top:0;opacity:0.1;background-repeat:no-repeat;background-size:100% 100%}.floorplan-plugin__compass-text.svelte-z9kwkx{position:absolute;left:50%;top:0.78125rem;transform:translateX(-50%);opacity:0.2;font-weight:bold;font-size:0.52083rem;color:#fff}");
+	append_styles(target, "svelte-rpkaro", ".floorplan-plugin__compass.svelte-rpkaro{position:absolute;left:50%;top:-2.875rem;width:14.4375rem;height:2.5625rem;will-change:opacity;transform-origin:center 11.5rem}.floorplan-plugin__compass-image.svelte-rpkaro{width:100%;height:100%;position:absolute;left:0;top:0;opacity:0.1;background-repeat:no-repeat;background-size:100% 100%}.floorplan-plugin__compass-text.svelte-rpkaro{position:absolute;left:50%;top:0.9375rem;transform:translateX(-50%);opacity:0.2;font-weight:bold;font-size:0.625rem;color:#fff}");
 }
 
 // (14:0) {#if canCompassShow}
@@ -38,10 +38,10 @@ function create_if_block(ctx) {
 			t0 = space();
 			span = element("span");
 			t1 = text(/*northDesc*/ ctx[0]);
-			attr(div0, "class", "floorplan-plugin__compass-image svelte-z9kwkx");
+			attr(div0, "class", "floorplan-plugin__compass-image svelte-rpkaro");
 			set_style(div0, "background-image", `url(${COMPASS_IMAGE})`);
-			attr(span, "class", "floorplan-plugin__compass-text svelte-z9kwkx");
-			attr(div1, "class", "floorplan-plugin__compass svelte-z9kwkx");
+			attr(span, "class", "floorplan-plugin__compass-text svelte-rpkaro");
+			attr(div1, "class", "floorplan-plugin__compass svelte-rpkaro");
 			set_style(div1, "transform", /*compassTransformStyle*/ ctx[2], false);
 		},
 		m(target, anchor) {

package/libs/floorplan/PanoFloorplanRadarPlugin/Components/Camera.js

@@ -18,7 +18,7 @@ import { CAMERA_IMAGE } from '../../Assets/camera';
 import throttle from '../../../shared-utils/throttle';
 
 function add_css(target) {
-	append_styles(target, "svelte-1ty3s4p", ".plugin-radar__camera-wrapper.svelte-1ty3s4p{width:100%;height:100%;position:absolute;pointer-events:none}.plugin-radar__camera-position.svelte-1ty3s4p{position:absolute;left:0;top:0;width:0;height:0;transform:none;pointer-events:none;transition:transform 1s linear}.plugin-radar__camera-rotate.svelte-1ty3s4p{position:absolute;left:-0.78125rem;top:-0.78125rem;width:0.88542rem;height:0.88542rem;transform-origin:0.78125rem 0.78125rem;transform:rotate(45deg);background-repeat:no-repeat;background-size:100%}");
+	append_styles(target, "svelte-1nqrlxd", ".plugin-radar__camera-wrapper.svelte-1nqrlxd{width:100%;height:100%;position:absolute;pointer-events:none}.plugin-radar__camera-position.svelte-1nqrlxd{position:absolute;left:0;top:0;width:0;height:0;transform:none;pointer-events:none;transition:transform 1s linear}.plugin-radar__camera-rotate.svelte-1nqrlxd{position:absolute;left:-0.9375rem;top:-0.9375rem;width:1.0625rem;height:1.0625rem;transform-origin:0.9375rem 0.9375rem;transform:rotate(45deg);background-repeat:no-repeat;background-size:100%}");
 }
 
 function create_fragment(ctx) {
@@ -31,12 +31,12 @@ function create_fragment(ctx) {
 			div2 = element("div");
 			div1 = element("div");
 			div0 = element("div");
-			attr(div0, "class", "plugin-radar__camera-rotate svelte-1ty3s4p");
+			attr(div0, "class", "plugin-radar__camera-rotate svelte-1nqrlxd");
 			set_style(div0, "background-image", "url(" + (/*cameraImageUrl*/ ctx[0] || CAMERA_IMAGE) + ")");
 			set_style(div0, "transform", /*rotateTransform*/ ctx[1], false);
-			attr(div1, "class", "plugin-radar__camera-position svelte-1ty3s4p");
+			attr(div1, "class", "plugin-radar__camera-position svelte-1nqrlxd");
 			set_style(div1, "transform", /*positionTransform*/ ctx[2], false);
-			attr(div2, "class", "plugin-radar__camera-wrapper svelte-1ty3s4p");
+			attr(div2, "class", "plugin-radar__camera-wrapper svelte-1nqrlxd");
 		},
 		m(target, anchor) {
 			insert(target, div2, anchor);

package/libs/index.d.ts

@@ -17,4 +17,6 @@ export * from './ItemLabelPlugin';
 export * from './PanoDoorLabelPlugin';
 export * from './GuideLinePlugin';
 export * from './CruisePlugin';
+export * from './PanoTagPlugin';
+export * from './Object3DHelperPlugin';
 export declare const DnalogelVersion = "2.0.0-alpha.58";

package/libs/index.js

@@ -32,4 +32,8 @@ export * from './PanoDoorLabelPlugin';
 export * from './GuideLinePlugin';
 // 漫游插件
 export * from './CruisePlugin';
+// 全景标签插件
+export * from './PanoTagPlugin';
+// 三维物体编辑插件
+export * from './Object3DHelperPlugin';
 export const DnalogelVersion = '2.0.0-alpha.58';

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

@@ -3,29 +3,37 @@ import { Subscribe } from '../../Subscribe';
 import type { HelperEventMap } from '../typings';
 import type { BaseHelper } from './BaseHelper';
 import DomEvents from '../utils/threex/domevents';
+export declare let originOpacity: {
+    opacity: number;
+} | null;
 export declare abstract class BaseController<T extends BaseHelper = BaseHelper, K extends THREE.Object3D = THREE.Object3D> {
     hooks: Subscribe<HelperEventMap>;
     helperObject3D: T;
-    protected originObject3D: K;
+    originObject3D: K;
     protected camera: THREE.Camera;
     protected model: THREE.Object3D;
     protected scene: THREE.Scene;
     protected container: HTMLElement;
     protected domEvents: DomEvents;
     protected isDragging: boolean;
-    protected needsRender: () => void;
+    protected onRender: () => void;
     protected enabled: boolean;
-    constructor(camera: THREE.Camera, model: THREE.Object3D, originObject3D: K, helperObject3D: T, container: HTMLElement, scene: THREE.Scene, needsRender?: () => void);
+    constructor(camera: THREE.Camera, model: THREE.Object3D, originObject3D: K, helperObject3D: T, container: HTMLElement, scene: THREE.Scene, onRender?: () => void);
+    initialHelperPosition(): void;
+    initialHelperQuaternion(): void;
     enable(): void;
     disable(): void;
     show(): void;
     hide(): void;
     dispose(): void;
+    setOpacity(opacity: number): void;
+    restoreOpacity(): void;
+    setOriginOpacityProperty(): void;
     updateHelperPosition(): void;
-    setHelperPosition(position: THREE.Vector3): void;
-    setHelperMatrix4(matrix4: THREE.Matrix4, origin?: THREE.Vector3): void;
-    setHelperQuaternion(quaternion: THREE.Quaternion, origin: THREE.Vector3): void;
-    setHelperScaleMatrix4(matrix4: THREE.Matrix4, params?: {
+    updateHelperQuaternion(): void;
+    applyHelperMatrix4(matrix4: THREE.Matrix4): void;
+    applyHelperQuaternion(quaternion: THREE.Quaternion, origin: THREE.Vector3): void;
+    applyHelperScaleMatrix4(matrix4: THREE.Matrix4, params?: {
         origin?: THREE.Vector3;
         helperOrigin?: THREE.Vector3;
     }): void;
@@ -34,6 +42,7 @@ export declare abstract class BaseController<T extends BaseHelper = BaseHelper,
         x: number;
         y: number;
     }[], final: boolean): false | void;
+    protected render(): void;
     protected hoverListener(object3D: THREE.Object3D | undefined | THREE.Group | (THREE.Object3D | undefined | THREE.Group)[], hoverColor?: THREE.Color | string | number, hoverOpacity?: number): () => void;
     private getIntersectObject;
 }

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

@@ -2,8 +2,10 @@ import * as THREE from 'three';
 import { Subscribe } from '../../Subscribe';
 import DomEvents from '../utils/threex/domevents';
 import { notNil } from '../../isNil';
+import { CSS3DObjectPlus } from '../../../CSS3DRenderPlugin/utils/CSS3DObjectPlus';
+export let originOpacity = null;
 export class BaseController {
-    constructor(camera, model, originObject3D, helperObject3D, container, scene, needsRender) {
+    constructor(camera, model, originObject3D, helperObject3D, container, scene, onRender) {
         Object.defineProperty(this, "hooks", {
             enumerable: true,
             configurable: true,
@@ -58,7 +60,7 @@ export class BaseController {
             writable: true,
             value: false
         });
-        Object.defineProperty(this, "needsRender", {
+        Object.defineProperty(this, "onRender", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -88,55 +90,108 @@ export class BaseController {
         this.container = container;
         this.scene = scene;
         this.domEvents = new DomEvents(camera, container);
-        this.needsRender = needsRender !== null && needsRender !== void 0 ? needsRender : (() => { });
-        this.updateHelperPosition();
+        this.onRender = onRender !== null && onRender !== void 0 ? onRender : (() => { });
+        this.initialHelperPosition();
+        this.initialHelperQuaternion();
         this.enable();
     }
+    initialHelperPosition() {
+        this.helperObject3D.updatePosition();
+    }
+    initialHelperQuaternion() {
+        this.helperObject3D.updateQuaternion();
+    }
     enable() {
         if (this.enabled)
             return;
         this.enabled = true;
         this.scene.add(this.helperObject3D);
-        this.needsRender();
+        this.render();
     }
     disable() {
         if (!this.enabled)
             return;
         this.enabled = false;
         this.scene.remove(this.helperObject3D);
-        this.needsRender();
+        this.render();
     }
     show() {
-        this.helperObject3D.visible = true;
-        this.needsRender();
+        this.helperObject3D.show();
+        this.render();
     }
     hide() {
-        this.helperObject3D.visible = false;
-        this.needsRender();
+        this.helperObject3D.hide();
+        this.render();
     }
     dispose() {
-        this.scene.remove(this.helperObject3D);
         this.helperObject3D.dispose();
+        this.scene.remove(this.helperObject3D);
+        this.render();
+    }
+    setOpacity(opacity) {
+        this.setOriginOpacityProperty();
+        const originObject3D = this.originObject3D;
+        if (originObject3D instanceof THREE.Mesh) {
+            originObject3D.material.opacity = opacity;
+        }
+        if (originObject3D instanceof CSS3DObjectPlus) {
+            originObject3D.container.style.opacity = opacity;
+        }
+        this.render();
+    }
+    restoreOpacity() {
+        if (originOpacity === null)
+            return;
+        const originObject3D = this.originObject3D;
+        if (originObject3D instanceof THREE.Mesh) {
+            originObject3D.material.opacity = originOpacity.opacity;
+        }
+        if (originObject3D instanceof CSS3DObjectPlus) {
+            originObject3D.container.style.opacity = originOpacity.opacity;
+        }
+        this.render();
+    }
+    setOriginOpacityProperty() {
+        var _a;
+        if (originOpacity === null) {
+            const originObject3D = this.originObject3D;
+            if (originObject3D instanceof THREE.Mesh) {
+                originOpacity = {
+                    opacity: originObject3D.material.opacity,
+                };
+            }
+            if (originObject3D instanceof CSS3DObjectPlus) {
+                originOpacity = {
+                    opacity: (_a = originObject3D.container.style.opacity) !== null && _a !== void 0 ? _a : 1,
+                };
+            }
+        }
     }
     updateHelperPosition() {
         this.helperObject3D.updatePosition();
     }
-    setHelperPosition(position) {
-        this.helperObject3D.setPosition(position);
+    updateHelperQuaternion() {
+        this.helperObject3D.updateQuaternion();
     }
-    setHelperMatrix4(matrix4, origin) {
-        this.helperObject3D.updateMatrix4(matrix4, origin);
+    // public setHelperPosition(position: THREE.Vector3) {
+    //   this.helperObject3D.setPosition(position)
+    // }
+    applyHelperMatrix4(matrix4) {
+        this.helperObject3D.applyMatrix4(matrix4);
     }
-    setHelperQuaternion(quaternion, origin) {
-        this.helperObject3D.updateQuaternion(quaternion, origin);
+    applyHelperQuaternion(quaternion, origin) {
+        this.helperObject3D.applyHelperQuaternion(quaternion, origin);
     }
-    setHelperScaleMatrix4(matrix4, params) {
-        this.helperObject3D.setHelperScaleMatrix4(matrix4, params);
+    applyHelperScaleMatrix4(matrix4, params) {
+        this.helperObject3D.applyHelperScaleMatrix4(matrix4, params);
     }
     onWantsGesture(type, pointers, final) {
         if (this.isDragging)
             return false;
     }
+    render() {
+        this.onRender();
+    }
     hoverListener(object3D, hoverColor = 0xffffff, hoverOpacity = 1) {
         const objects = (Array.isArray(object3D) ? object3D : [object3D]).filter(notNil);
         const disposers = [];
@@ -153,14 +208,14 @@ export class BaseController {
                         mesh.material.color.set(hoverColor);
                         mesh.material.opacity = hoverOpacity;
                     });
-                    this.needsRender();
+                    this.render();
                 };
                 const resetColor = () => {
                     meshes.forEach((mesh) => {
                         mesh.material.color.copy(mesh['__originalColor__']);
                         mesh.material.opacity = mesh['__originalOpacity__'];
                     });
-                    this.needsRender();
+                    this.render();
                 };
                 const handleMouseover = () => {
                     if (this.isDragging)

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

@@ -5,18 +5,22 @@ 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 onRender: () => any;
     get helperObject(): Object3D;
-    constructor(originObject3D: OriginObject3D);
+    constructor(originObject3D: OriginObject3D, config?: {
+        onRender?: () => any;
+    });
+    render(): void;
+    show(): void;
+    hide(): void;
     updatePosition(): void;
-    setPosition(position: Vector3): void;
-    updateMatrix4(matrix: THREE.Matrix4, origin?: THREE.Vector3): void;
-    setHelperScaleMatrix4(matrix: THREE.Matrix4, params?: {
+    updateQuaternion(): void;
+    applyHelperScaleMatrix4(matrix: THREE.Matrix4, params?: {
         origin?: THREE.Vector3;
         helperOrigin?: THREE.Vector3;
     }): void;
-    updateQuaternion(quaternion: THREE.Quaternion, origin?: THREE.Vector3): void;
-    abstract hide(...args: any[]): void;
-    abstract show(...args: any[]): void;
+    applyHelperQuaternion(quaternion: THREE.Quaternion, origin?: THREE.Vector3): 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> {
@@ -82,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/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,39 @@ export class BaseHelper extends Object3D {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "onRender", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         this.originObject3D = originObject3D;
+        this.onRender = (_a = config === null || config === void 0 ? void 0 : config.onRender) !== null && _a !== void 0 ? _a : (() => { });
     }
     get helperObject() {
         return this;
     }
+    render() {
+        this.onRender();
+    }
+    show() {
+        this.visible = true;
+        this.render();
+    }
+    hide() {
+        this.visible = false;
+        this.render();
+    }
     updatePosition() {
         this.position.copy(this.originObject3D.position);
     }
-    setPosition(position) {
-        this.position.copy(position);
-    }
-    updateMatrix4(matrix, origin) {
-        this.applyMatrix4(matrix);
+    updateQuaternion() {
+        this.quaternion.copy(this.originObject3D.quaternion);
     }
-    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/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>> {