与主干版本同步

This commit is contained in:
ChenX
2023-05-08 10:53:13 +08:00
parent 8e481e821c
commit ee08cb516b
1748 changed files with 15504 additions and 13758 deletions

View File

@@ -4,19 +4,27 @@ import { CADFiler } from '../DatabaseServices/CADFiler';
import { Database } from '../DatabaseServices/Database';
import { AutoSaveServer } from '../Editor/AutoSave';
import { BoardMoveTool } from '../Editor/BoardMoveTool';
import { CameraControls } from '../Editor/CameraControls';
import { Editor } from '../Editor/Editor';
import { Gesture } from '../Editor/Gesture';
import { LayoutTool } from '../Editor/LayoutTool';
import { Viewer } from '../GraphicsSystem/Viewer';
import { WebRtcRenderer } from '../GraphicsSystem/WebRtcRenderer';
import { CommandReactor } from '../Reactor/CommandReactor';
import { SyncDataReactor } from '../Reactor/SyncDataReactor';
import { WebSocketClientServer } from './WebSocketClientServer';
export declare let app: ApplicationService;
export declare enum CameraRoamType {
Fly = 0,
Walk = 1
}
/**
* webCAD应用.
*/
export declare class ApplicationService {
Database: Database;
Viewer: Viewer;
WebRtcRenderer: WebRtcRenderer;
Editor: Editor;
CommandReactor: CommandReactor;
_drillingReactor: DrillingReactor;
@@ -27,10 +35,23 @@ export declare class ApplicationService {
SyncDataReactor: SyncDataReactor;
AutoSaveServer: AutoSaveServer;
LayoutTool: LayoutTool;
CameraControls: CameraControls;
Gesture: Gesture;
CameraRoamType: CameraRoamType;
CameraFlySpeed: number;
private _PerCameraUseSkyBox;
constructor();
protected InitService(): void;
SendCameraPosToRenderer(): void;
get PerCameraUseSkyBox(): boolean;
set PerCameraUseSkyBox(b: boolean);
private UpdateBackground;
InitViewDir(): void;
CreateDocument(name?: string): void;
FileOut(): CADFiler;
/**
* 文件写出,没有历史记录
*/
FileOut2(): CADFiler;
OpenFile(f: CADFiler): void;
}

View File

@@ -1 +1 @@
{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../src/ApplicationServices/Application.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAMzE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAGxD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAIxD,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE1C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAMlD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAM7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,IAAI,GAAG,EAAE,kBAAkB,CAAC;AAEnC;;GAEG;AACH,qBAAa,kBAAkB;IAE3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,eAAe,CAAC;IAElC,uBAAuB,EAAE,sBAAsB,CAAC;IAEhD,KAAK,UAAQ;IACb,QAAQ,EAAE,aAAa,CAAC;IACxB,SAAS,EAAE,qBAAqB,CAA6D;IAC7F,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;;IAsPvB,WAAW;IAoBX,cAAc,CAAC,IAAI,GAAE,MAAc;IAanC,OAAO,IAAI,QAAQ;IAanB,QAAQ;IAaR,QAAQ,CAAC,CAAC,EAAE,QAAQ;CAkBvB"}
{"version":3,"file":"Application.d.ts","sourceRoot":"","sources":["../../../src/ApplicationServices/Application.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,+CAA+C,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAWzE,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAIxD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAG1D,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAOlD,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAC;AAGlE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAM7D,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,eAAO,IAAI,GAAG,EAAE,kBAAkB,CAAC;AAEnC,oBAAY,cAAc;IAEtB,GAAG,IAAI;IACP,IAAI,IAAI;CACX;AAED;;GAEG;AACH,qBAAa,kBAAkB;IAE3B,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,cAAc,EAAE,cAAc,CAAC;IAC/B,gBAAgB,EAAE,eAAe,CAAC;IAElC,uBAAuB,EAAE,sBAAsB,CAAC;IAChD,KAAK,UAAQ;IACb,QAAQ,EAAE,aAAa,CAAC;IACxB,SAAS,EAAE,qBAAqB,CAA6D;IAC7F,eAAe,EAAE,eAAe,CAAC;IACjC,cAAc,EAAE,cAAc,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;IAEvB,cAAc,EAAE,cAAc,CAAC;IAC/B,OAAO,EAAE,OAAO,CAAC;IAGjB,cAAc,iBAAsB;IACpC,cAAc,SAAK;IAEnB,OAAO,CAAC,mBAAmB,CAAS;;IAQpC,SAAS,CAAC,WAAW;IAiVrB,uBAAuB;IAgBvB,IAAI,kBAAkB,IACI,OAAO,CAD4B;IAC7D,IAAI,kBAAkB,CAAC,CAAC,EAAE,OAAO,EAOhC;IACD,OAAO,CAAC,gBAAgB,CAQtB;IAEF,WAAW;IAoBX,cAAc,CAAC,IAAI,GAAE,MAAc;IAanC,OAAO,IAAI,QAAQ;IAanB;;OAEG;IACH,QAAQ,IAAI,QAAQ;IAgBpB,QAAQ,CAAC,CAAC,EAAE,QAAQ;CAmBvB"}

View File

@@ -1,11 +1,56 @@
import { ApplicationService } from './Application';
import { MeshBasicMaterial, MeshStandardMaterial } from 'three';
interface IHostApplicationServices {
Application?: ApplicationService;
import { MeshBasicMaterial, MeshStandardMaterial, Texture } from 'three';
import { FractionDigitsType } from '../Common/SystemEnum';
import { ObjectId } from '../DatabaseServices/ObjectId';
import { ICursorConfig } from '../Editor/ICursorConfig';
import { RenderType } from '../GraphicsSystem/RenderType';
import { DrillingOption } from '../UI/Store/drillInterface';
export declare class IHostApplicationServices {
DefaultMeshMaterial?: MeshBasicMaterial | MeshStandardMaterial;
UseShadow?: boolean;
ShowHistoryLog?: boolean;
DefaultFloorMaterial?: MeshBasicMaterial | MeshStandardMaterial;
DefaultWallMaterial?: MeshBasicMaterial | MeshStandardMaterial;
CurrentDimStyle: ObjectId;
isShowLightShadow: boolean;
ShowHistoryLog: boolean;
Physical2EdgeColor: number;
ConceptualEdgeColor: number;
ConceptualOpacity: number;
DrawWallBottomFace: boolean;
private __ProxyObject__;
static __ProxyKeys__: string[];
get ProxyObject(): any;
set ProxyObject(obj: any);
_renderType: RenderType;
DrillConfigs: Map<string, DrillingOption[]>;
openDrillingReactor: boolean;
sealingColorMap: [string, string][];
showLines: boolean;
uese: string;
forceFilterPxl: boolean;
chaidanOption: {
changXiuBian: number;
duanXiuBian: number;
useDefaultRad: boolean;
radius: number;
modeling2HoleRad: number;
isCheckInterfere: boolean;
noModeingData: string;
statTk: boolean;
statSt: boolean;
};
viewSize: {
minViewHeight: number;
maxViewHeight: number;
zoomSpeed: number;
};
cursorSize: ICursorConfig;
dimTextHeight: number;
lineWidth: number;
fractionDigitsType: FractionDigitsType;
private constructor();
private static _SingleInstance;
static GetInstance(): IHostApplicationServices;
LoadDefaultExr(): Promise<Texture>;
LoadMetalEnv(): Promise<Texture>;
}
export declare let HostApplicationServices: IHostApplicationServices;
export {};
//# sourceMappingURL=HostApplicationServices.d.ts.map

View File

@@ -1 +1 @@
{"version":3,"file":"HostApplicationServices.d.ts","sourceRoot":"","sources":["../../../src/ApplicationServices/HostApplicationServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,OAAO,CAAC;AAEhE,UAAU,wBAAwB;IAE9B,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,mBAAmB,CAAC,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAC/D,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,eAAO,IAAI,uBAAuB,EAAE,wBAAmD,CAAC"}
{"version":3,"file":"HostApplicationServices.d.ts","sourceRoot":"","sources":["../../../src/ApplicationServices/HostApplicationServices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,qBAAa,wBAAwB;IAEjC,mBAAmB,CAAC,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAC/D,oBAAoB,CAAC,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAChE,mBAAmB,CAAC,EAAE,iBAAiB,GAAG,oBAAoB,CAAC;IAE/D,eAAe,EAAE,QAAQ,CAAC;IACd,iBAAiB,EAAE,OAAO,CAAQ;IAC9C,cAAc,EAAE,OAAO,CAAQ;IAEnB,kBAAkB,SAAK;IACvB,mBAAmB,SAAK;IAExB,iBAAiB,SAAK;IAElC,kBAAkB,UAAS;IAE3B,OAAO,CAAC,eAAe,CAAM;IAC7B,MAAM,CAAC,aAAa,EAAE,MAAM,EAAE,CAAM;IACpC,IAAI,WAAW,IACM,GAAG,CAD0B;IAClD,IAAI,WAAW,CAAC,GAAG,EAAE,GAAG,EAUvB;IAGW,WAAW,EAAE,UAAU,CAAwB;IAI/C,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAW;IAItD,mBAAmB,UAAQ;IAI3B,eAAe,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAM;IAIzC,SAAS,UAAS;IAIlB,IAAI,EAAE,MAAM,CAAC;IAIb,cAAc,EAAE,OAAO,CAAS;IAGhC,aAAa;;;;;;;;;;MAUvB;IAEU,QAAQ;;;;MAIlB;IAEU,UAAU,EAAE,aAAa,CAInC;IAEU,aAAa,SAAM;IACnB,SAAS,SAAK;IACd,kBAAkB,EAAE,kBAAkB,CAA0B;IAE5E,OAAO;IAEP,OAAO,CAAC,MAAM,CAAC,eAAe,CAA2B;IACzD,MAAM,CAAC,WAAW,IAAI,wBAAwB;IAQxC,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAClC,YAAY,IAAI,OAAO,CAAC,OAAO,CAAC;CACzC;AAED,eAAO,IAAI,uBAAuB,0BAAyC,CAAC"}

View File

@@ -4,16 +4,20 @@
export declare class WebSocketClientServer {
url: string;
private ws;
mode: string;
private _Closeing;
mode: "obj" | "" | undefined;
constructor(url?: string);
_ConnectionPromise: Promise<boolean>;
Connect(retry?: boolean): Promise<boolean> | true;
private _ReTryTime;
private _CloseTime;
Connect(retry?: boolean, timeOut?: number): Promise<boolean> | true;
Send(msg: string): Promise<void>;
/**
* 接收到消息. AOP可接入此函数
* @param {MessageEvent} event
*/
OnMessage: (event: MessageEvent) => void;
OnMessageEvent(event: MessageEvent): void;
get IsLink(): boolean;
OnLinkEvent(isLink: boolean): void;
Close(): Promise<void>;
}

View File

@@ -1 +1 @@
{"version":3,"file":"WebSocketClientServer.d.ts","sourceRoot":"","sources":["../../../src/ApplicationServices/WebSocketClientServer.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,qBAAa,qBAAqB;IAMX,GAAG;IAJtB,OAAO,CAAC,EAAE,CAAY;IAEtB,IAAI,EAAE,MAAM,CAAC;gBAEM,GAAG,SAAK;IAI3B,kBAAkB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAErC,OAAO,CAAC,KAAK,UAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI;IAqCxC,IAAI,CAAC,GAAG,EAAE,MAAM;IAOtB;;;OAGG;IACH,SAAS,UAAW,YAAY,UAG9B;IACF,WAAW,CAAC,MAAM,EAAE,OAAO;IAKrB,KAAK;CAOd"}
{"version":3,"file":"WebSocketClientServer.d.ts","sourceRoot":"","sources":["../../../src/ApplicationServices/WebSocketClientServer.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,qBAAa,qBAAqB;IAOX,GAAG;IALtB,OAAO,CAAC,EAAE,CAAY;IACtB,OAAO,CAAC,SAAS,CAAS;IAE1B,IAAI,EAAE,KAAK,GAAG,EAAE,GAAG,SAAS,CAAC;gBAEV,GAAG,SAAK;IAI3B,kBAAkB,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAErC,OAAO,CAAC,UAAU,CAAC;IACnB,OAAO,CAAC,UAAU,CAAC;IACnB,OAAO,CAAC,KAAK,UAAO,EAAE,OAAO,SAAO,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,IAAI;IAgDxD,IAAI,CAAC,GAAG,EAAE,MAAM;IAOtB;;;OAGG;IACH,cAAc,CAAC,KAAK,EAAE,YAAY;IAMlC,IAAI,MAAM,YAAwC;IAElD,WAAW,CAAC,MAAM,EAAE,OAAO;IAIrB,KAAK;CAed"}

View File

@@ -1,15 +0,0 @@
import { ExtrudeGeometry, Mesh, Shape, Vector2 } from 'three';
export declare namespace CreateBoardUtil {
class Arc2d {
_StartAn: number;
_EndAn: number;
_StartPoint: Vector2;
_EndPoint: Vector2;
_Center: Vector2;
_Radius: number;
constructor(p1: Vector2, p2: Vector2, bul: number);
}
function CreatePath(pts: Vector2[], buls: number[]): Shape;
function createBoard(boardData: object): Mesh<ExtrudeGeometry, import("three").Material | import("three").Material[]>;
}
//# sourceMappingURL=createBoard.d.ts.map

View File

@@ -1 +0,0 @@
{"version":3,"file":"createBoard.d.ts","sourceRoot":"","sources":["../../../../src/ApplicationServices/mesh/createBoard.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAW,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAKvE,yBAAiB,eAAe,CAChC;IAEI,MAAa,KAAK;QAEd,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,EAAE,MAAM,CAAC;QACf,WAAW,EAAE,OAAO,CAAC;QACrB,SAAS,EAAE,OAAO,CAAC;QACnB,OAAO,EAAE,OAAO,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;oBACJ,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM;KA4BpD;IAID,SAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CA0BhE;IAGD,SAAgB,WAAW,CAAC,SAAS,EAAE,MAAM,gFAkD5C;CACJ"}