@xviewer.js/core 1.0.4-alpha.9 → 1.0.5-alhpa.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xviewer.js/core",
-  "version": "1.0.4-alpha.9",
+  "version": "1.0.5-alhpa.0",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,

package/types/Task.d.ts

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

package/types/TaskManager.d.ts

@@ -5,8 +5,7 @@ export declare class TaskManager {
     onError?: (task: Task) => void;
     private _tasks;
     private _taskIndex;
-    private _interval;
-    private _onstartCalled;
+    private _onStartCalled;
     onStart?: () => void;
     constructor(onComplete?: () => void, onProgress?: (task: Task, loaded: number, total: number) => void, onError?: (task: Task) => void);
     destroy(): void;

package/types/Viewer.d.ts

@@ -30,6 +30,9 @@ export declare class Viewer extends EventEmitter {
     private _scene;
     private _camera;
     private _renderer;
+    private _active;
+    private _loading;
+    private _tasking;
     private _running;
     private _rootRotated;
     private _time;
@@ -43,6 +46,7 @@ export declare class Viewer extends EventEmitter {
     private _resourceManager;
     private _componentManager;
     private _loadingManager;
+    private _decodeURL;
     get root(): HTMLElement;
     get time(): number;
     get canvas(): HTMLCanvasElement;
@@ -66,7 +70,7 @@ export declare class Viewer extends EventEmitter {
     get scene(): Scene;
     get camera(): Camera;
     get renderer(): WebGLRenderer;
-    constructor({ root, canvas, input, shadows, sortObjects, resize, orthographic, camera, targetFrameRate, fixedFrameTime, colorSpace, toneMapping, toneMappingExposure, maxDPR, path, resourcePath, dracoPath, transcoderPath, orientation, loader, tasker, ...webglOpts }?: {
+    constructor({ root, canvas, input, shadows, sortObjects, resize, orthographic, camera, targetFrameRate, fixedFrameTime, colorSpace, toneMapping, toneMappingExposure, maxDPR, path, resourcePath, dracoPath, transcoderPath, orientation, decodeURL, loader, tasker, ...webglOpts }?: {
         /** 根节点，用于屏幕旋转 */
         root?: HTMLElement;
         /** 渲染用的 canvas 元素，如果不提供，默认获取 id 为 "canvas" 的元素 */
@@ -105,6 +109,7 @@ export declare class Viewer extends EventEmitter {
         orthographic?: boolean;
         /** A `THREE.Camera` instance or props that go into the default camera */
         camera?: (Camera | __Properties<PerspectiveCamera & OrthographicCamera>);
+        decodeURL?: (url: string) => string;
         /** 加载管理器 */
         loader?: {
             onComplete?: () => void;
@@ -127,7 +132,8 @@ export declare class Viewer extends EventEmitter {
     rotate(): void;
     resize(width?: number, height?: number): void;
     setURLModifier(callback?: (url: string) => string): LoadingManager;
-    loadAsset(props: AssetProperties): Promise<any>;
+    loadAsset<URL extends string, Asset = any>({ url, ...props }: AssetProperties<URL>): Promise<Asset>;
+    getAsset<URL extends string, Asset = any>(url: URL): Asset;
     getLoader(ext: string): import(".").Loader;
     addLoader(Loader: LoaderConstructor): import(".").Loader;
     getComponent<T extends Component>(constructor: {

package/types/asset/ResourceManager.d.ts

@@ -3,8 +3,8 @@ import { TextureSettings } from "../TextureSettings";
 import { Loader } from "./Loader";
 import type { Viewer } from "../Viewer";
 export type LoaderConstructor = new (viewer: Viewer) => Loader;
-export interface AssetProperties extends TextureSettings {
-    url?: string;
+export interface AssetProperties<URL extends string = string> extends TextureSettings {
+    url?: URL;
     ext?: string;
     buffer?: string | ArrayBuffer;
     path?: string;
@@ -24,9 +24,11 @@ export declare class ResourceManager {
     }): {};
     private _viewer;
     private _loaders;
+    private _resources;
     constructor(viewer: Viewer);
     destroy(): void;
     getLoader(ext: string): Loader;
     addLoader(Loader: LoaderConstructor): Loader;
-    loadAsset<T = any>({ url, ext, onProgress, ...props }: AssetProperties): Promise<T>;
+    loadAsset<Asset = unknown>({ url, ext, onProgress, ...props }: AssetProperties): Promise<Asset>;
+    getAsset<Asset = unknown>(url: string): Asset;
 }

package/types/materials/ReflectorMaterial.d.ts

@@ -1,4 +1,4 @@
-import { Color, IUniform, ShaderMaterial, Texture, WebGLProgramParametersWithUniforms } from "three";
+import { Color, IUniform, ShaderMaterial, Texture, Vector4, WebGLProgramParametersWithUniforms } from "three";
 import { Reflector } from "../components";
 export declare class ReflectorMaterial extends ShaderMaterial {
     vertexShader: string;
@@ -17,8 +17,13 @@ export declare class ReflectorMaterial extends ShaderMaterial {
         reflectIntensity?: number;
         transparent?: boolean;
         depthWrite?: boolean;
-        roughness?: number;
         metalness?: number;
+        map?: Texture;
+        roughness?: number;
+        roughnessMap?: Texture;
+        normalMap?: Texture;
+        normalScaleBias?: Vector4;
+        roughnessScaleBias?: Vector4;
     });
     onBeforeCompile(shader: WebGLProgramParametersWithUniforms): void;
     get color(): Color;
@@ -31,8 +36,12 @@ export declare class ReflectorMaterial extends ShaderMaterial {
     set map(v: Texture);
     get roughnessMap(): Texture;
     set roughnessMap(v: Texture);
+    get roughnessScaleBias(): Vector4;
+    set roughnessScaleBias(v: Vector4);
     get normalMap(): Texture;
     set normalMap(v: Texture);
+    get normalScaleBias(): Vector4;
+    set normalScaleBias(v: Vector4);
     get aoMap(): Texture;
     set aoMap(v: Texture);
     get lightMap(): Texture;