archgine 1.0.38 → 1.0.39

package/lib/renderers/buffer-renderer.d.ts

@@ -1,4 +1,4 @@
-import { IContext2D, IObject2, IShape2 } from '../interfaces';
+import { IContext2D, IObject2, IShape2, IText2 } from '../interfaces';
 import { BindingStates } from './binding-states';
 export default class BufferRenderer {
     ctx: IContext2D;
@@ -12,8 +12,12 @@ export default class BufferRenderer {
     render(obj: IShape2): void;
     renderFill(obj: IShape2): void;
     renderStroke(obj: IShape2): void;
-    renderText(obj: IShape2): void;
+    renderText(obj: IText2): void;
     afterRender(): void;
     renderWireFrame(obj: IShape2): void;
     renderSelected(shape: IShape2): void;
+    renderMergedBefore(): void;
+    renderMergedGeo(obj: IShape2): void;
+    renderMergedMat(obj: IShape2): void;
+    renderMergedAfter(): void;
 }

package/lib/renderers/cvs-renderer.d.ts

@@ -3,11 +3,12 @@ import { RenderState, RenderStates } from './render-states';
 import { default as BufferRenderer } from './buffer-renderer';
 import { BindingStates } from './binding-states';
 import { Renderer } from './renderer';
-import { IRenderItem, RenderList, RenderLists } from './render-lists';
+import { RenderList, RenderLists } from './render-lists';
 import { IQueue } from '../core/queue';
 export declare class CvsRenderer<Config extends IRenderer2Config> extends Renderer<Config> implements IRenderer2 {
     readonly name: string;
     id: string;
+    mergeRendering: boolean;
     renderer: BufferRenderer;
     bindingStates: BindingStates;
     renderStates: RenderStates;
@@ -22,8 +23,9 @@ export declare class CvsRenderer<Config extends IRenderer2Config> extends Render
     destroy(): void;
     render(scene: IObject2, camera?: ICamera2): void;
     projectObject(obj: IObject2, camera?: ICamera2 | undefined, groupOrder?: number): void;
+    renderMerged(currentRenderList: RenderList, camera?: ICamera2): void;
     renderScene(currentRenderList: RenderList, scene: IObject2, camera?: ICamera2): void;
-    renderObjects(queue: IQueue<IRenderItem>, scene: IObject2, camera?: ICamera2): void;
+    renderObjects(queue: IQueue<IObject2>, scene: IObject2, camera?: ICamera2): void;
     renderObject(obj: IObject2, scene: IObject2, camera?: ICamera2): void;
     renderBufferDirect(obj: IObject2, scene: IObject2, camera?: ICamera2): void;
     renderTexture(texture: ITexture): void;

package/lib/renderers/render-lists.d.ts

@@ -9,17 +9,15 @@ export interface IRenderItem {
     group: Group2<IGroup2Config> | undefined;
 }
 export declare class RenderList {
-    renderItems: IRenderItem[];
-    renderItemsIndex: number;
     queue: IQueue;
+    mergedQueue: Record<string, IQueue>;
     constructor();
     destroy(): void;
     clear(): void;
-    getNextRenderItem(object: IObject2, groupOrder: number, group?: Group2<IGroup2Config>): IRenderItem;
-    push(object: IObject2, groupOrder: number, group?: Group2<IGroup2Config>): this;
-    unshift(object: IObject2, groupOrder: number, group: Group2<IGroup2Config>): void;
+    push(object: IObject2, groupOrder: number): this;
+    unshift(object: IObject2): void;
     sort(fn?: (a: any, b: any) => number): this;
-    finish(): this;
+    mergeQueue(): this;
 }
 export declare class RenderLists {
     lists: WeakMap<IObject2, RenderList[]>;

package/lib/scenes/loading-scene.d.ts

@@ -15,5 +15,4 @@ export declare class LoadingScene<Config extends ILoadingSceneConfig> extends Dy
     scaleTrend: boolean;
     constructor(config?: Config);
     onBeforeRender(): void;
-    fullscreen(padding?: number, animate?: boolean): void;
 }

package/lib/scenes/main-scene.d.ts

@@ -1,6 +1,5 @@
 import { StaticScene } from './static-scene';
 import { AxesHelper2 } from '../helpers/axes-helper2';
-import { Adapter } from '../extras/adapter';
 export interface IMainSceneConfig {
     castShadow?: boolean;
 }
@@ -8,10 +7,8 @@ export declare class MainScene<Config extends IMainSceneConfig> extends StaticSc
     readonly isMainScene: boolean;
     name: string;
     featureKey: string;
-    adapter: Adapter;
     axesHelper?: AxesHelper2<any>;
     constructor(config?: Config);
     destroy(): void;
     initAxesHelper(): void;
-    load(url?: string, layers?: string[]): Promise<void>;
 }

package/lib/shapes2/text.d.ts

@@ -1,5 +1,5 @@
 import { default as Vector2 } from '../math/vector2';
-import { IBox2, IContext2D } from '../interfaces';
+import { IBox2, IContext2D, IText2 } from '../interfaces';
 import { ITextMaterial2Config } from '../materials/text-material2';
 import { IShape2Config, Shape2 } from '../objects/shape2';
 import { TextMat2 } from '../materials/text-mat2';
@@ -7,11 +7,11 @@ export interface ITextConfig extends IShape2Config, ITextMaterial2Config {
     fixed?: boolean;
     rotated?: number;
 }
-export declare class Text<Config extends ITextConfig> extends Shape2 {
+export declare class Text<Config extends ITextConfig> extends Shape2 implements IText2 {
     readonly isText: boolean;
-    readonly type: string;
     name: string;
     mat: TextMat2<Config>;
+    textContent?: string;
     size: Vector2;
     constructor(config?: Config);
     /** @override */

package/lib/utils/svg.d.ts

@@ -1,7 +1,14 @@
-import { IBox2 } from '../interfaces';
+import { IBox2, IMatrix3, ITree } from '../interfaces';
+import { default as Matrix3 } from '../math/matrix3';
 export declare function getBoxFromString(str?: string, out?: IBox2): IBox2;
 export declare function getBoxString(box?: IBox2): string;
 export declare function getRoot(svg: Element, rn?: string): Element | undefined;
 export declare function removeEmpty(out: Element): Element;
 export declare function traverseSvg(o: Element, cb: Function): void;
 export declare function getElementsMap(el: Element, out?: Record<string, Element>): Record<string, Element>;
+export declare function getLayersTree(el: Element, lv?: number, lvi?: number, out?: ITree[]): ITree[];
+export declare function traverseTree(t: ITree | ITree[], cb: Function): void;
+export declare function getUseSymbolId(el: Element): string | undefined;
+export declare function getAttr<T>(el: Element | null, attr: string, def?: T): T;
+export declare function getMatrix(el: Element, flipY?: boolean, out?: Matrix3): IMatrix3;
+export declare function convertEndpointToCenterParameterization(x1: number, y1: number, x2: number, y2: number, fa: number, fs: number, rx: number, ry: number, psiDeg: number): number[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "archgine",
-  "version": "1.0.38",
+  "version": "1.0.39",
   "description": "A simple rendering engine developed by archbds.",
   "author": "diozhu@163.com",
   "license": "ISC",