mx3d 2024.6.12 → 2024.6.27

package/docs/heatMap/heatMap.md

@@ -236,10 +236,10 @@ for (let i = 0; i < maps.length; i++) {
 
   $("#but_createColumnarHeatMap").click(function(){
    var _objs = app.project.findObjectsByCustomType('Cabinet',{ isCurrent: false, isEnabled: true });
-   for (let i = 0; i < _objs.length; i++) {
-     let map = MX3D.Builder.createColumnCloud({anchor:_objs[i],data:[{index: 0,value: 25},{index: 0,value: 27},{index: 0,value: 29}]});
+   //for (let i = 0; i < _objs.length; i++) {
+     let map = MX3D.Builder.createColumnCloud({anchor:_objs[0],data:[{index: 0,value: 25},{index: 0,value: 27},{index: 0,value: 29}]});
      maps.push(map);
-   }  
+   //}  
   });
 
   $("#but_createPunctateCloud").click(function(){

package/docs/index.html

@@ -26,7 +26,8 @@
     <script src="/mx3d.js"></script> -->
     <script src="../mx3d.seat.min.js"></script>
     <script src="../mx3d.min.js"></script>
-    <!-- <script src="../mx3d.js"></script> -->
+    <!-- <script src="/core/mx3d.seat.min.js"></script>
+    <script src="../mx3d.js"></script> -->
     <!-- <script src="/dist/mx3d.kernel.min.js"></script>
     <script src="/dist/mx3d.min.js"></script> -->
     <!-- <link rel="stylesheet" href="//unpkg.com/docsify/themes/buble.css"> -->

package/docs/releases.md

@@ -2,6 +2,15 @@
 
 除版本记录中备注外，迭代版本皆可直接升级，不影响旧版本 API 及功能
 
+#### 2024.06.27
+
+**重要更新**
+
+- 修复获取场景树不全问题
+- 修复切换楼层原楼层不消失问题
+
+---
+
 #### 2024.06.04
 
 **重要更新**

package/index.d.ts

@@ -1,10 +1,10 @@
-declare namespace MX3D {
+declare module MX3D {
   let accessToken: string;
   let pk: string;
   let sl: string;
   let rl: string;
 
-  class AlarmFlashing {
+  export class AlarmFlashing {
     static colors: {
       1: Runtime.Color3;
       2: Runtime.Color3;
@@ -16,7 +16,7 @@ declare namespace MX3D {
     static init(): void;
   }
 
-  class App {
+  export class App {
     canvas: HTMLCanvasElement;
     engine: Runtime.Engine;
     scene: Runtime.Scene;
@@ -38,7 +38,7 @@ declare namespace MX3D {
     dispose(): void;
   }
 
-  class Builder {
+  export class Builder {
     static createMatrixCloud(_data: {
       anchor: IObject;
       value: {
@@ -114,7 +114,7 @@ declare namespace MX3D {
     ): LineFromMesh;
   }
 
-  class Capacity {
+  export class Capacity {
     anchor: IObject;
     mesh: Runtime.Mesh;
     ratio: number;
@@ -124,7 +124,7 @@ declare namespace MX3D {
     dispose(): void;
   }
 
-  class Environment {
+  export class Environment {
     app: App;
     lights: Dictionary<LightObject>;
     _color: Runtime.Color4;
@@ -152,7 +152,7 @@ declare namespace MX3D {
     showDebug(): void;
   }
 
-  class HeatMap implements BaseNode {
+  export class HeatMap implements BaseNode {
     id: string;
     anchor: IObject;
     mesh: Runtime.Mesh;
@@ -164,7 +164,7 @@ declare namespace MX3D {
     dispose(): void;
   }
 
-  class Icon implements BaseNode {
+  export class Icon implements BaseNode {
     id: string;
     scene: Runtime.Scene;
     pint: Runtime.Mesh;
@@ -197,7 +197,7 @@ declare namespace MX3D {
     isEnabled(_isEnabled: boolean): void;
   }
 
-  class IconFromMesh implements BaseNode {
+  export class IconFromMesh implements BaseNode {
     id: string;
     scene: Runtime.Scene;
     instance: Runtime.Mesh;
@@ -231,7 +231,7 @@ declare namespace MX3D {
     isEnabled(_bool: boolean): void;
   }
 
-  class Line {
+  export class Line {
     id: string;
     objs: Array<IObject>;
     instance: Runtime.MultiLine;
@@ -244,7 +244,7 @@ declare namespace MX3D {
     dispose(): void;
   }
 
-  class LineFromMesh {
+  export class LineFromMesh {
     id: string;
     objs: Array<IObject>;
     instance: Runtime.Mesh;
@@ -262,7 +262,7 @@ declare namespace MX3D {
     Transparent = 2,
   }
 
-  class UI {
+  export class UI {
     static createIconFromMesh(_id: string, _anchor: IObject, _scaling: number, _height: number): IconFromMesh;
     static createIcon(
       _id: string,
@@ -275,13 +275,13 @@ declare namespace MX3D {
     ): Icon;
   }
 
-  class TileLoader {
+  export class TileLoader {
     app: App;
     constructor(_app: App);
     load(url: string): Promise<void>;
   }
 
-  class CloudEffect implements IEffect {
+  export class CloudEffect implements IEffect {
     app: App;
     cloudNum: number;
     canvas: HTMLCanvasElement;
@@ -295,7 +295,7 @@ declare namespace MX3D {
     render(): void;
     clearCanvasCloud(): void;
   }
-  class Cloud {
+  export class Cloud {
     rainSpeed: number;
     ctx: CanvasRenderingContext2D;
     c: string;
@@ -327,10 +327,11 @@ declare namespace MX3D {
     Rain = 'Rain',
     Cloud = 'Cloud',
   }
-  class Effect {
+  export class Effect {
     static effects: Dictionary<IEffect>;
     static add(_effectType: EffectType, _app: App): void;
     static remove(_effectType: EffectType): void;
+    static removeAll(): void;
   }
 
   interface IEffect {
@@ -338,7 +339,7 @@ declare namespace MX3D {
     close: Function;
   }
 
-  class RainEffect implements IEffect {
+  export class RainEffect implements IEffect {
     app: App;
     rainNum: number;
     canvas: HTMLCanvasElement;
@@ -352,7 +353,7 @@ declare namespace MX3D {
     render(): void;
     clearCanvasRain(): void;
   }
-  class Rain {
+  export class Rain {
     rainSpeed: number;
     ctx: CanvasRenderingContext2D;
     Y: number;
@@ -371,7 +372,7 @@ declare namespace MX3D {
     render(): void;
   }
 
-  class ThunderEffect implements IEffect {
+  export class ThunderEffect implements IEffect {
     app: App;
     thunderNum: number;
     canvas: HTMLCanvasElement;
@@ -385,7 +386,7 @@ declare namespace MX3D {
     render(): void;
     clearCanvasThunder(): void;
   }
-  class Thunder {
+  export class Thunder {
     ctx: CanvasRenderingContext2D;
     x: number;
     y: number;
@@ -401,7 +402,7 @@ declare namespace MX3D {
     render(): void;
   }
 
-  class DefaultEvent implements IEvent {
+  export class DefaultEvent implements IEvent {
     app: App;
     isMove: number;
     waitingTime: number;
@@ -423,7 +424,7 @@ declare namespace MX3D {
     click = 'click',
   }
 
-  class FPSCameraEvent implements IEvent {
+  export class FPSCameraEvent implements IEvent {
     app: App;
     isFPS: boolean;
     angle: number;
@@ -446,20 +447,20 @@ declare namespace MX3D {
     registerAfterRender(): void;
   }
 
-  class HubService {
+  export class HubService {
     static connection: any;
     static listener(_Url: string): Promise<void>;
     static start(): Promise<void>;
   }
 
-  class Directional extends LightObject {
+  export class Directional extends LightObject {
     direction: Runtime.Vector3;
     position: Runtime.Vector3;
     light: Runtime.DirectionalLight;
     load(): void;
   }
 
-  class Hemispheric extends LightObject {
+  export class Hemispheric extends LightObject {
     direction: Runtime.Vector3;
     light: Runtime.HemisphericLight;
     load(): void;
@@ -476,7 +477,7 @@ declare namespace MX3D {
     load: Function;
   }
 
-  class LightObject implements ILightObject {
+  export class LightObject implements ILightObject {
     id: string;
     sceneId: string;
     name: string;
@@ -499,14 +500,14 @@ declare namespace MX3D {
   declare let typeFromat: Function;
   typeFromat;
 
-  class Point extends LightObject {
+  export class Point extends LightObject {
     position: Runtime.Vector3;
     light: Runtime.PointLight;
     range: number;
     load(): void;
   }
 
-  class Spot extends LightObject {
+  export class Spot extends LightObject {
     direction: Runtime.Vector3;
     position: Runtime.Vector3;
     angle: number;
@@ -516,15 +517,15 @@ declare namespace MX3D {
     load(): void;
   }
 
-  class MJGLLoader {
+  export class MJGLLoader {
     static load(app: App, _data: any, progress?: Function): Promise<void>;
   }
 
-  class Mx3dLoader {
+  export class Mx3dLoader {
     static load(app: App, _data: any, progress?: Function): Promise<void>;
   }
 
-  class BaseModel {
+  export class BaseModel {
     extension: string;
     groupId: string;
     heat: number;
@@ -539,14 +540,14 @@ declare namespace MX3D {
     width: number;
   }
 
-  class BuildingObject extends DefaultObject {
+  export class BuildingObject extends DefaultObject {
     completed(): void;
     computeView(): void;
-    getInto(): void;
+    getInto(_isFocus?: boolean): void;
     goBack(): void;
   }
 
-  class CabinetObject extends DefaultObject {
+  export class CabinetObject extends DefaultObject {
     rack: Runtime.Mesh | Runtime.InstancedMesh;
     computeView(): void;
     setEnabled(_value: boolean): void;
@@ -557,7 +558,7 @@ declare namespace MX3D {
     close(): void;
   }
 
-  class CampusObject extends IRegion {
+  export class CampusObject extends IRegion {
     addEventListener(_type: string, _callback: Function): void;
     removeEventListener(_type: string): void;
     setEnabled(_isEnabled: boolean): void;
@@ -565,7 +566,7 @@ declare namespace MX3D {
     bind(): void;
   }
 
-  class ConduitObject extends DefaultObject {
+  export class ConduitObject extends DefaultObject {
     alpha: number;
     color: string;
     pints: Runtime.Vector3[];
@@ -581,7 +582,7 @@ declare namespace MX3D {
     setTransparent(alpha?: number): void;
   }
 
-  class CornerObject implements IObject {
+  export class CornerObject implements IObject {
     app: App;
     id: string;
     name: string;
@@ -621,7 +622,7 @@ declare namespace MX3D {
     setTransparent(): void;
   }
 
-  class DefaultObject implements IObject {
+  export class DefaultObject implements IObject {
     app: App;
     id: string;
     name: string;
@@ -675,14 +676,40 @@ declare namespace MX3D {
     goBack(): void;
   }
 
-  class DoorObject extends DefaultObject {
+  export class DoorObject extends DefaultObject {
     height: number;
     loadProperties(_m: any): void;
     setEnabled(_value: boolean): void;
     bind(): void;
   }
 
-  class FloorObject extends DefaultObject {
+  export class EmptyProject implements IBase {
+    app: App;
+    id: string;
+    name: string;
+    parentId: string;
+    objectType: string;
+    customNumber: string;
+    customType: string;
+    baseModel: BaseModel;
+    instance: Mesh | InstancedMesh;
+    Sight: Sight;
+    storey: StoreyObject;
+    loadProperties(_m: any): void;
+    bind(): void;
+    completed(): void;
+    setEnabled(_isEnabled: boolean): void;
+    toJson(): {
+      id: string;
+      parentId: string;
+      name: string;
+      objectType: string;
+    };
+    getInto(_isFocus?: boolean): void;
+    goBack(): void;
+  }
+
+  export class FloorObject extends DefaultObject {
     height: number;
     vectors: Runtime.Vector3[];
     buckles: Runtime.Vector3[][];
@@ -709,7 +736,7 @@ declare namespace MX3D {
     completed(): any;
     setEnabled(isEnabled: boolean): any;
     toJson(): any;
-    getInto(): any;
+    getInto(_isFocus?: boolean): any;
     goBack(): any;
   }
 
@@ -726,7 +753,7 @@ declare namespace MX3D {
     alwaysActive(): any;
   }
 
-  class IRegion implements IBase {
+  export class IRegion implements IBase {
     app: App;
     id: string;
     name: string;
@@ -770,7 +797,7 @@ declare namespace MX3D {
     goBack(): void;
   }
 
-  class LeakWaterObject extends DefaultObject {
+  export class LeakWaterObject extends DefaultObject {
     lines: Runtime.Vector3[];
     loadProperties(_l: any): void;
     setEnabled(_value: boolean): void;
@@ -797,44 +824,45 @@ declare namespace MX3D {
     Building = 'Building',
     Storey = 'Storey',
     Campus = 'Campus',
+    Project = 'Project',
   }
 
-  class OptimizedWallObject extends DefaultObject {
+  export class OptimizedWallObject extends DefaultObject {
     nativeMaterial: Runtime.StandardMaterial;
     loadProperties(_w: any): void;
     bind(): void;
   }
 
-  class Project {
+  export class Project {
     private app;
     id: string;
     current: IBase;
-    root: IRegion;
+    root: string;
     levelEvent: Function;
     objectDatas: Dictionary<IBase>;
     constructor(_app: App);
     clear(): void;
     optimization(): void;
-    getChildsById(_id: string, _includeSub?: boolean): IBase[];
+    getChildsById(_id: string, _includeSub?: boolean): Array<IBase>;
     getSceneTree(_id?: string, _excludeTypes?: Array<string>): any;
     findObjectById(_id: string): IBase;
-    findObjectByCustomNumber(_customNumber: string): any;
+    findObjectByCustomNumber(_customNumber: string): IBase;
     findObjectsByCustomType(
       _customType: string,
       queryParameters?: {
         isCurrent: boolean;
         isEnabled: boolean;
       },
-    ): any[];
-    findObjectsByType(_type: ObjectType): IBase[];
+    ): Array<IBase>;
+    findObjectsByType(_type: ObjectType): Array<IBase>;
     computeSight(_objs: Array<IBase>): any;
     switchLevel(_id?: string, _isFocus?: boolean): void;
     goBack(): void;
-    getTypes(_parentId?: string): any[];
-    getCustomTypes(_parentId?: string): any[];
+    getObjectTypes(_parentId?: string): Array<ObjectType>;
+    getCustomTypes(_parentId?: string): Array<ObjectType>;
   }
 
-  class RackModel {
+  export class RackModel {
     id: string;
     name: string;
     uHeight: number;
@@ -847,7 +875,7 @@ declare namespace MX3D {
     depth: number;
   }
 
-  class RackObject implements IObject {
+  export class RackObject implements IObject {
     app: App;
     id: string;
     name: string;
@@ -898,16 +926,17 @@ declare namespace MX3D {
     goBack(): void;
   }
 
-  class StoreyObject extends IRegion {
+  export class StoreyObject extends IRegion {
     scaling: Runtime.Vector3;
     loadProperties(_m: any): void;
     bind(): void;
     alwaysActive(): void;
     completed(): void;
     computeView(): void;
+    getInto(_isFocus?: boolean): void;
   }
 
-  class UI3DTextObject extends DefaultObject {
+  export class UI3DTextObject extends DefaultObject {
     tconfig: {
       color: string;
       position: any;
@@ -921,7 +950,7 @@ declare namespace MX3D {
     bind(): void;
   }
 
-  class VirtualBoxObject extends DefaultObject {
+  export class VirtualBoxObject extends DefaultObject {
     virtualType: string;
     color: Runtime.Color3;
     alpha: number;
@@ -933,7 +962,7 @@ declare namespace MX3D {
     bind(): void;
   }
 
-  class WallObject extends DefaultObject {
+  export class WallObject extends DefaultObject {
     nativeMaterial: Runtime.StandardMaterial;
     height: number;
     walls: Runtime.Mesh[];
@@ -944,14 +973,14 @@ declare namespace MX3D {
     setOpaque(): void;
   }
 
-  class WindowObject extends DefaultObject {
+  export class WindowObject extends DefaultObject {
     height: number;
     loadProperties(_m: any): void;
     setEnabled(_value: boolean): void;
     bind(): void;
   }
 
-  class ArrayEx<T> extends Array<T> {
+  export class ArrayEx<T> extends Array<T> {
     remove(val: any): void;
   }
 
@@ -961,7 +990,7 @@ declare namespace MX3D {
     isEnabled(bool: boolean): any;
   }
 
-  class CameraController {
+  export class CameraController {
     app: App;
     arcRotateCamera: Runtime.ArcRotateCamera;
     frustrum: number;
@@ -983,7 +1012,7 @@ declare namespace MX3D {
     switchFPSCamera(): void;
   }
 
-  class Dictionary<T> {
+  export class Dictionary<T> {
     map: {
       [key: string]: T;
     };
@@ -997,15 +1026,16 @@ declare namespace MX3D {
     clear(): void;
   }
 
-  class GUID {
+  export class GUID {
     static getGUID(length: number): string;
   }
 
-  class RES {
+  export class RES {
     static de(str: string): any;
+    static en(word: any): string;
   }
 
-  class Resources {
+  export class Resources {
     app: App;
     walls: Dictionary<Runtime.AbstractMesh>;
     resources: Dictionary<Runtime.AssetContainer>;
@@ -1029,7 +1059,7 @@ declare namespace MX3D {
     setTransparentById(modelId: string, _visibility?: number): void;
   }
 
-  class Sight {
+  export class Sight {
     alpha: number;
     focus: Runtime.Vector3;
     radius: number;
@@ -1044,7 +1074,7 @@ declare namespace MX3D {
     setBeta(_minBeta: number, _maxBeta: number): void;
   }
 
-  class ToolTips {
+  export class ToolTips {
     app: App;
     url: string;
     ele: HTMLDivElement;
@@ -1057,7 +1087,7 @@ declare namespace MX3D {
     dispose(): void;
   }
 
-  class Tools {
+  export class Tools {
     static vector3ToJson(old: Runtime.Vector3): any;
     static vector3ARRToJson(olds: Runtime.Vector3[]): Runtime.Vector3[];
     static ToVector3(old: any): Runtime.Vector3;