@xviewer.js/core 1.0.0-alpha.54 → 1.0.0-alpha.56

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xviewer.js/core",
-  "version": "1.0.0-alpha.54",
+  "version": "1.0.0-alpha.56",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,

package/types/Task.d.ts

@@ -1,5 +1,7 @@
 export declare class Task {
     excute: () => void;
     name: string;
+    static _instanceCount: number;
     constructor(excute: () => void, name?: string);
+    instanceId: number;
 }

package/types/Viewer.d.ts

@@ -1,13 +1,14 @@
-import { BufferGeometry, Camera, ColorSpace, DataTexture, DirectionalLightShadow, Euler, Material, Mesh, Object3D, OrthographicCamera, PerspectiveCamera, Scene, ShadowMapType, Texture, TextureDataType, ToneMapping, Vector3, WebGLCubeRenderTarget, WebGLRenderer, WebGLRendererParameters, WebGLRenderTarget } from "three";
+import { BufferGeometry, Camera, ColorSpace, DataTexture, DirectionalLightShadow, Euler, LoadingManager, Material, Mesh, Object3D, OrthographicCamera, PerspectiveCamera, Scene, ShadowMapType, Texture, TextureDataType, ToneMapping, Vector3, WebGLCubeRenderTarget, WebGLRenderer, WebGLRendererParameters, WebGLRenderTarget } from "three";
 import { EventEmitter } from "./base";
 import { ComponentManager } from "./ComponentManager";
+import { TaskManager } from "./TaskManager";
 import { DeviceInput } from "./DeviceInput";
 import { Orientation } from "./enums/Orientation";
-import { AssetProperties, LoaderConstructor } from "./asset/ResourceManager";
+import { AssetProperties, LoaderConstructor, ResourceManager } from "./asset/ResourceManager";
 import { __C, __P } from "./types";
 import { Component } from "./Component";
-import { TextureSettings } from "./TextureSettings";
 import { Plugin } from "./Plugin";
+import { Task } from "./Task";
 export declare class Viewer extends EventEmitter {
     static __target: Vector3;
     static __worldPos: Vector3;
@@ -62,6 +63,7 @@ export declare class Viewer extends EventEmitter {
     private _componentManager;
     private _pluginManager;
     private _tweenManager;
+    private _loadingManager;
     get instanceId(): number;
     get root(): HTMLElement;
     get time(): number;
@@ -84,6 +86,9 @@ export declare class Viewer extends EventEmitter {
     get input(): DeviceInput;
     get targetFrameRate(): number;
     set targetFrameRate(v: number);
+    get loadingManager(): LoadingManager;
+    get resourceManager(): ResourceManager;
+    get taskManager(): TaskManager;
     constructor({ root, canvas, autoStart, autoResize, shadows, camera, targetFrameRate, fixedFrameTime, colorSpace, toneMapping, toneMappingExposure, maxDPR, path, resourcePath, dracoPath, orientation, loader, tasker, ...webglOpts }?: {
         root?: HTMLElement;
         canvas?: HTMLCanvasElement;
@@ -130,9 +135,9 @@ export declare class Viewer extends EventEmitter {
     start(): this;
     stop(): this;
     resize(width?: number, height?: number): void;
-    loadAsset(props: AssetProperties & TextureSettings): Promise<any>;
+    loadAsset(props: AssetProperties): Promise<any>;
+    getLoader(ext: string): import(".").aLoader;
     addLoader(Loader: LoaderConstructor): void;
-    load({ url, ext, onProgress, castShadow, receiveShadow, ...props }: AssetProperties & __P<Object3D, typeof Object3D>): Promise<any>;
     timeline(target: Object): import("./tween").TweenChain;
     killTweensOf(target: Object): void;
     traverseMaterials(callback: (mat: Material) => void): void;
@@ -149,6 +154,7 @@ export declare class Viewer extends EventEmitter {
         new (): T;
     }): T;
     removeComponent(node: Object3D, component: Component): ComponentManager;
+    addTask(task: Task): void;
     addNode<T, K extends __C<T>>(object: T | K & __C<T>, props?: __P<T, K>): T;
     removeNode(node: Object3D): void;
     activeNode(node: Object3D, active: boolean): Object3D<import("three").Object3DEventMap>;

package/types/asset/ResourceManager.d.ts

@@ -1,12 +1,10 @@
 import { LoadingManager } from "three";
 import { TextureSettings } from "../TextureSettings";
 import { aLoader } from "./aLoader";
-export interface AssetProperties {
+export interface AssetProperties extends TextureSettings {
+    url: string;
     ext?: string;
-    url?: string | File | {
-        mainFile: File;
-        additionalFiles: File[];
-    };
+    buffer?: ArrayBuffer;
     onProgress?: (event: ProgressEvent) => void;
 }
 export type LoaderConstructor = new (manager: ResourceManager) => aLoader;
@@ -14,11 +12,6 @@ export declare class ResourceManager {
     static extension(path: string): string;
     static dirname(path: string): string;
     static basename(path: string, ext?: string): string;
-    static _parseURL(uri: any): {
-        url: string;
-        file: any;
-        ext: string;
-    };
     static _getTextureKey(url: string, settings: TextureSettings): string;
     static _texSettingKeys: string[];
     static _splitTextureSettings(props: TextureSettings & {
@@ -37,6 +30,7 @@ export declare class ResourceManager {
         loadingManager: LoadingManager;
     });
     destroy(): void;
+    getLoader(ext: string): aLoader;
     addLoader(Loader: LoaderConstructor): void;
-    loadAsset<T = any>({ url, ext, onProgress, ...props }: AssetProperties & TextureSettings): Promise<T>;
+    loadAsset<T = any>({ url, buffer, ext, onProgress, ...props }: AssetProperties): Promise<T>;
 }

package/types/asset/aLoader.d.ts

@@ -3,6 +3,7 @@ import { ResourceManager } from "./ResourceManager";
 import { TextureSettings } from "../TextureSettings";
 export interface LoadProperties {
     url: string;
+    buffer?: string | ArrayBuffer;
     texSettings?: TextureSettings;
     onLoad: (asset: any) => void;
     onProgress?: (event: ProgressEvent) => void;

package/types/index.d.ts

@@ -16,4 +16,5 @@ export { ObjectInstance } from "./ObjectInstance";
 export { property, PropertyManager } from "./PropertyManager";
 export { DeviceInput } from "./DeviceInput";
 export { Orientation } from "./enums/Orientation";
-export * from "./asset/aLoader";
+export { aLoader, type LoadProperties } from "./asset/aLoader";
+export { ResourceManager, type AssetProperties } from "./asset/ResourceManager";

package/types/loaders/aFBXLoader.d.ts

@@ -1,5 +1,5 @@
 import { LoadProperties, aLoader } from "../asset/aLoader";
 export declare class aFBXLoader extends aLoader {
     extension: string[];
-    load({ url, onLoad, onProgress, onError }: LoadProperties): void;
+    load({ url, buffer, onLoad, onProgress, onError }: LoadProperties): void;
 }

package/types/loaders/aGLTFLoader.d.ts

@@ -1,5 +1,5 @@
 import { LoadProperties, aLoader } from "../asset/aLoader";
 export declare class aGLTFLoader extends aLoader {
     extension: string[];
-    load({ url, onLoad, onProgress, onError }: LoadProperties): void;
+    load({ url, buffer, onLoad, onProgress, onError }: LoadProperties): void;
 }