archgine 1.0.49 → 1.0.53

package/README.md

@@ -8,3 +8,10 @@ npm run build
 npm login
 
 npm publish —access=public
+
+## 2024-12-20
+1、app提供reload方法，用于配置刷新；
+
+2、缓存标记（usedCache）触发reload；
+
+3、svg 中的：symbol、文字 根据 usedCache 使用 texture；

package/lib/applications/app-cvs.d.ts

@@ -6,11 +6,18 @@ export declare class AppCvs<Config extends IApplicationConfig> extends Applicati
     params: Config;
     adapter: Adapter;
     mainScene: MainScene<Config>;
+    private _url?;
+    private _layers?;
     constructor(config?: Config);
     destroy(): void;
     load(url?: string, layers?: string[]): Promise<void>;
+    reload(): Promise<void>;
+    /** overwrite */
+    usedCacheChanged(v?: boolean): Promise<void>;
     getLayers(lv?: number): ITree[];
     trans2MainScene(): void;
     fullScreen(): void;
     updateLayersVisibility(ids: string | string[], visible?: boolean): void;
+    /** overwrite */
+    running(time: DOMHighResTimeStamp): void;
 }

package/lib/applications/app-offscreen.d.ts

@@ -22,6 +22,8 @@ export declare class AppOffscreen<Config extends IApplicationConfig> extends Eve
     resize(): void;
     load(url: string, layers?: string[]): Promise<void>;
     getLayers(lv?: number): Promise<ITree[]>;
+    usedCacheChanged(v?: boolean): void;
+    wireframeChanged(v?: boolean): void;
     fullscreen(): Promise<void>;
     saveCameraPosition(id?: string): void;
     restoreCameraPosition(id?: string): void;

package/lib/applications/application.d.ts

@@ -33,7 +33,7 @@ export declare abstract class Application<Config extends IApplicationConfig> ext
     scenes: Scene[];
     nextScenes: Scene[];
     nextBoundingBox: Box2;
-    loadingScene: Scene;
+    loadingScene?: Scene;
     composer: EffectComposer;
     renderer: IRenderer2;
     view: View<any>;
@@ -41,7 +41,9 @@ export declare abstract class Application<Config extends IApplicationConfig> ext
     protected constructor(config?: Config);
     get isLoadingScene(): boolean;
     destroy(): void;
-    trans2LoadingScene(): void;
+    usedCacheChanged(v?: boolean): Promise<void>;
+    wireframeChanged(v?: boolean): void;
+    trans2LoadingScene(): Promise<void>;
     hasScene(scene: Scene): boolean;
     pushScene(scene: Scene): void;
     clearScenes(): void;

package/lib/controls/orbit-controller.d.ts

@@ -52,6 +52,7 @@ export declare class OrbitController extends EventDispatcher implements IOrbitCo
     private readonly hammerInputHandler;
     constructor(dom: HTMLElement, camera: ICamera2, isSvg?: boolean);
     destroy(): void;
+    resize(): void;
     update(): void;
     bindEvents(): void;
     unbindEvents(): void;

package/lib/core/queue.d.ts

@@ -8,6 +8,7 @@ export interface IQueue<T = any> {
     getByIndex(index: number): T | undefined;
     setByIndex(index: number, item: T): boolean;
     sort(comparator?: (a: (T | undefined), b: (T | undefined)) => number): void;
+    getAll(): T[] | undefined;
 }
 export declare class OQueue<T = any> implements IQueue<T> {
     private count;
@@ -24,6 +25,7 @@ export declare class OQueue<T = any> implements IQueue<T> {
     getByIndex(index: number): T | undefined;
     setByIndex(index: number, item: T): boolean;
     sort(comparator?: (a: (T | undefined), b: (T | undefined)) => number): void;
+    getAll(): T[] | undefined;
 }
 export declare class AQueue<T = any> implements IQueue<T> {
     private items;
@@ -39,6 +41,7 @@ export declare class AQueue<T = any> implements IQueue<T> {
     setByIndex(index: number, item: T): boolean;
     sort(comparator?: (a: (T | undefined), b: (T | undefined)) => number): void;
     toString(): string;
+    getAll(): T[] | undefined;
 }
 export declare class ABQueue<T = any> implements IQueue<T> {
     cellCapacity: number;
@@ -58,6 +61,7 @@ export declare class ABQueue<T = any> implements IQueue<T> {
     getByIndex(index: number): T | undefined;
     setByIndex(index: number, item: T): boolean;
     sort(comparator?: (a: (T | undefined), b: (T | undefined)) => number): void;
+    getAll(): T[] | undefined;
 }
 export declare class LQueue<T = any> implements IQueue<T> {
     private head;
@@ -75,6 +79,7 @@ export declare class LQueue<T = any> implements IQueue<T> {
     isEmpty(): boolean;
     sort(comparator?: (a: (T | undefined), b: (T | undefined)) => number): void;
     toString(): string;
+    getAll(): T[] | undefined;
 }
 export declare class Queue<T = any> implements IQueue<T> {
     private items;
@@ -92,4 +97,5 @@ export declare class Queue<T = any> implements IQueue<T> {
     setByIndex(index: number, item: T): boolean;
     sort(comparator?: (a: T | undefined, b: T | undefined) => number): void;
     toString(): string;
+    getAll(): T[] | undefined;
 }

package/lib/core/tic.d.ts

@@ -0,0 +1,9 @@
+export declare class Tic {
+    duration: number;
+    generator?: Generator<undefined, void, unknown>;
+    t: number | null;
+    constructor(list: number | any[], callback: Function, duration?: number);
+    next(): void;
+    queue(len: number, callback: Function): Generator<undefined, void, unknown>;
+    clear(): void;
+}

package/lib/environment.worker.js

@@ -12,8 +12,15 @@ var Pe = {
   syncDelay: 800,
   animateDuration: 600,
   mergeRendering: !1,
-  // 合并渲染
+  // 合并渲染，相同材质合并渲染；
+  sliceRendering: !0,
+  // 切片渲染
+  sliceDuration: 15,
+  // 切片渲染间隔：1 ～ 40
   usedCache: !1,
+  // 开启缓存，相同 featureKey 的图形使用 texture，绘制时需先进行画布TRS
+  separateCache: !1,
+  // 独立缓存，对于需要TRS的，保存独立 texture，渲染时直接 drawImage
   showPoints: !1,
   wireframe: !1,
   castShadow: !1,
@@ -3997,7 +4004,7 @@ Fu.__DOMHandler = Eu;
 Fu.normalizeLineEndings = Le;
 Fu.DOMParser = Ie;
 var gr = Fu.DOMParser;
-const Er = "1.0.49";
+const Er = "1.0.53";
 function vr() {
   return typeof window < "u" && ({}.toString.call(window) === "[object Window]" || {}.toString.call(window) === "[object global]");
 }

package/lib/extras/adapter.d.ts

@@ -18,37 +18,11 @@ export declare class Adapter extends EventDispatcher {
     clear(): void;
     load(url: string, layers?: string[]): Promise<void>;
     init(str?: string): void;
-    /**
-     * background:
-     *    ...
-     *
-     * gros
-     * rm
-     *    ...
-     * gros-labels
-     * rm-labels
-     *    ...
-     */
-    initResources(): void;
     initResourcesTree(): void;
-    initResource(id: string): void;
     getResources(): IObject2[] | undefined;
     getLayers(lv?: number): ITree[];
     getElementById(id?: string): Element | undefined;
     getSymbolElement(el?: Element): Element | undefined;
-    trans2Shape(el?: Element, flipY?: boolean): IObject2 | undefined;
-    transG(el?: Element, flipY?: boolean): IObject2 | undefined;
-    transSymbol(el?: Element, flipY?: boolean): IObject2 | undefined;
-    transPath(el?: Element, flipY?: boolean): IObject2 | undefined;
-    transUse(el?: Element, flipY?: boolean): IObject2 | undefined;
-    transCircle(el?: Element, flipY?: boolean): IObject2 | undefined;
-    /**
-     * test linked to asset
-     * 1、old version: split with ';', use first；
-     * 2、new version: use 'aid' attribute；
-     * 3、use 'assetId' + SPLITTER + LABEL_TAG save to elementsMap;
-     */
-    transText(el?: Element, flipY?: boolean): IObject2 | undefined;
     getAssetLabelId(assetId: string): string;
     getResourceById(id?: string): IObject2 | undefined;
     getResourceTreeById(t: ITree | ITree[], id?: string): ITree | undefined;

package/lib/extras/interfaces.d.ts

@@ -15,6 +15,7 @@ export interface IApp {
     setAssetType(assetType: string, showLayers?: string[]): void;
     updateLayersVisibility(ids: string[], visible?: boolean): void;
     selectByIds(ids: string | string[]): void;
+    clearSelectedByIds(ids: string | string[]): void;
     getSelectedIds(): string[] | undefined;
     targetByIds(id: string | string[]): void;
     linkAssetsByTree(o: ITree): void;

package/lib/extras/svg-app.d.ts

@@ -50,7 +50,7 @@ export declare class SvgApp<Config extends ISvgAppConfig> extends EventDispatche
     getLayers(lv?: number): ITree[] | undefined;
     updateLayersVisibility(ids: string[], visible?: boolean): void;
     selectByIds(ids: string | string[]): void;
-    clearSelectedById(ids: string | string[]): void;
+    clearSelectedByIds(ids: string | string[]): void;
     clearSelected(): void;
     getSelectedIds(): string[] | undefined;
     targetByIds(ids: string | string[]): Promise<void>;

package/lib/geometries/geo2.d.ts

@@ -8,9 +8,11 @@ export interface IGeo2Config {
 }
 export declare class Geo2<Config extends IGeo2Config> extends SVGPathData implements IGeo2 {
     name: string;
+    id: number;
     params: Config;
     viewMatrix: Matrix3;
     boundingBox: IBox2;
+    flipY: boolean;
     constructor(config?: Config);
     _version: number;
     get version(): number;

package/lib/helpers/canvas-helper.d.ts

@@ -1,4 +1,4 @@
-import { ICanvas, IContext2D, IShape2 } from '../interfaces';
+import { ICanvas, IShape2 } from '../interfaces';
 import { default as Vector2 } from '../math/vector2';
 interface ICanvasConfig {
     containerId?: string;
@@ -17,7 +17,7 @@ export default class CanvasHelper {
     /**
      * @todo: cvs.getContext('bitmaprenderer') => ImageBitmapRenderingContext.transferFromImageBitmap()
      */
-    static getContext2D(cvs: ICanvas, params?: any): IContext2D;
+    static getContext2D(cvs: HTMLCanvasElement | OffscreenCanvas, params?: any): CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D;
     static resizeCanvas(cvs: ICanvas, w: number, h: number, r?: number): void;
     static getImageBitmapByCanvasAsync(cvs?: ICanvas): Promise<ImageBitmap | undefined>;
     static get(k: string, w: number, h: number, dpr?: number): OffscreenCanvas;

package/lib/helpers/geo-helper.d.ts

@@ -3,10 +3,11 @@ import { SVGCommand } from 'svg-pathdata/src/types';
 import { IShape2Config } from '../objects/shape2';
 export declare class GeoHelper {
     params: IShape2Config;
+    static splitLimit: number;
     constructor(config?: IShape2Config);
     destroy(): void;
-    static getInstanceByElement(o: Element, flipY?: boolean): Geo2<any> | undefined;
-    static getInstanceByPath(o: Element, flipY?: boolean): Geo2<any> | undefined;
+    static getInstanceByElement(o: Element, flipY?: boolean): Geo2<any> | Geo2<any>[] | undefined;
+    static getInstanceByPath(o: Element, flipY?: boolean): Geo2<any> | Geo2<any>[] | undefined;
     static getInstanceByCircle(o: Element, flipY?: boolean): Geo2<any> | undefined;
     static getInstance(cmd: string | SVGCommand[], flipY?: boolean): Geo2<any> | undefined;
 }

package/lib/helpers/merge-helper.d.ts

@@ -1,7 +1,7 @@
-import { IShape2 } from '../interfaces';
+import { IGroup2, IShape2 } from '../interfaces';
 import { IShape2Config } from '../objects/shape2';
 import { ITextConfig } from '../shapes2/text';
 export declare class MergeHelper {
-    static getShapeByElement(el: Element, config: IShape2Config, flipY?: boolean): IShape2;
+    static getShapeByElement(el: Element, config: IShape2Config, flipY?: boolean): IShape2 | IGroup2;
     static getText(config: ITextConfig): IShape2;
 }

package/lib/helpers/svg-helper.d.ts

@@ -0,0 +1,30 @@
+import { IObject2 } from '../interfaces';
+export declare class SvgHelper {
+    svg: Element | undefined;
+    resources: IObject2[];
+    resourcesMap: Record<string, IObject2>;
+    _traverseMap: WeakMap<Element, boolean>;
+    private constructor();
+    private static _instance;
+    static get instance(): SvgHelper;
+    static parse(str: string): SvgHelper;
+    static init(svg: Element): SvgHelper;
+    initResources(): SvgHelper;
+    setTexture(el: Element, o: IObject2): void;
+    getResourceById(id?: string): IObject2 | undefined;
+    getResourcesMap(): Record<string, IObject2>;
+    getResources(): IObject2[];
+    trans2Shape(el?: Element, flipY?: boolean): IObject2 | undefined;
+    transG(el?: Element, flipY?: boolean): IObject2 | undefined;
+    transSymbol(el?: Element, flipY?: boolean): IObject2 | undefined;
+    transPath(el?: Element, flipY?: boolean): IObject2 | undefined;
+    transUse(el?: Element, flipY?: boolean): IObject2 | undefined;
+    transCircle(el?: Element, flipY?: boolean): IObject2 | undefined;
+    /**
+     * test linked to asset
+     * 1、old version: split with ';', use first；
+     * 2、new version: use 'aid' attribute；
+     * 3、use 'assetId' + SPLITTER + LABEL_TAG save to elementsMap;
+     */
+    transText(el?: Element, flipY?: boolean): IObject2 | undefined;
+}

package/lib/helpers/texture-helper.d.ts

@@ -1,5 +1,5 @@
 import { default as Vector2 } from '../math/vector2';
-import { IGroup2, ILight, IPoint2, IShape, ITexture } from '../interfaces';
+import { IGroup2, ILight, IPoint2, IShape2, ITexture } from '../interfaces';
 import { ITextureConfig, Texture } from '../textures/texture';
 import { default as _ } from 'lodash';
 /**
@@ -13,6 +13,7 @@ export declare class TextureHelper {
     static precisionOptimizeLevels: number[];
     static initialized: boolean;
     static textureMaxSize: Vector2;
+    static DEBUG_DisplayCachedTexture: _.DebouncedFuncLeading<(width?: number, opacity?: number) => void>;
     static destroy(): void;
     static has(k: string): boolean;
     static get(k: string | undefined, threshold?: number): ITexture | undefined;
@@ -21,12 +22,11 @@ export declare class TextureHelper {
     static clear(): void;
     static setTextureMaxSize(): void;
     static getTextureMaxSize(): Vector2;
-    static getTextureByShape(obj: IShape | IGroup2, originSize?: IPoint2, finalSize?: IPoint2, light?: ILight): Texture<ITextureConfig>;
-    static setPrecisionOptimizeTextures(key: string, obj: IShape | IGroup2, texture: ITexture, originSize?: IPoint2, light?: ILight): void;
-    static renderShapeTexture(obj: IShape | IGroup2, texture: ITexture, light?: ILight): void;
-    static setByShape(key: string, obj: IShape | IGroup2, originSize?: IPoint2, finalSize?: IPoint2): ITexture;
-    static setShadowByShape(key: string, obj: IShape, light?: ILight): ITexture;
-    static setPointsByShape(key: string, obj: IShape | IGroup2): ITexture;
-    static setWireframeByShape(key: string, obj: IShape): ITexture;
-    static DEBUG_DisplayCachedTexture: _.DebouncedFuncLeading<(width?: number, opacity?: number) => void>;
+    static getTextureByShape(obj: IShape2 | IGroup2, originSize?: IPoint2, finalSize?: IPoint2, light?: ILight): Texture<ITextureConfig>;
+    static setPrecisionOptimizeTextures(key: string, obj: IShape2 | IGroup2, texture: ITexture, originSize?: IPoint2, light?: ILight): void;
+    static renderShapeTexture(obj: IShape2 | IGroup2, texture: ITexture, light?: ILight): void;
+    static setByShape(key: string, obj: IShape2 | IGroup2, originSize?: IPoint2, finalSize?: IPoint2): ITexture;
+    static setShadowByShape(key: string, obj: IShape2, light?: ILight): ITexture;
+    static setPointsByShape(key: string, obj: IShape2 | IGroup2): ITexture;
+    static setWireframeByShape(key: string, obj: IShape2): ITexture;
 }