@xviewer.js/core 1.0.5-alhpa.1 → 1.0.5-alhpa.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xviewer.js/core",
-  "version": "1.0.5-alhpa.1",
+  "version": "1.0.5-alhpa.3",
   "license": "MIT",
   "type": "module",
   "sideEffects": false,
@@ -13,7 +13,7 @@
     "types/**/*"
   ],
   "peerDependencies": {
-    "three": ">= 0.179.0"
+    "three": ">= 0.181.0"
   },
   "scripts": {
     "b:types": "tsc"

package/types/DeviceInput.d.ts

@@ -1,5 +1,5 @@
 import { Vector2 } from "three";
-import { ConnTarget } from "./Pressability";
+import { ConnTarget, Pressability } from "./Pressability";
 import { Component } from "./Component";
 export interface InputTarget {
     on?(event: string, cb: (...args: any[]) => void, target: Object, once?: boolean): any;
@@ -40,6 +40,8 @@ export declare class DeviceInput extends Component {
     private _pointer;
     private _pointerPixel;
     private _pointerButton;
+    private _pointerDown;
+    private _pointerMoving;
     private _prePointer;
     private _prePointerPixel;
     private _preTouches;
@@ -48,7 +50,9 @@ export declare class DeviceInput extends Component {
     private _pressability;
     get pointer(): Vector2;
     get pointerPixel(): Vector2;
+    get pointerDown(): boolean;
     get pointerButton(): number;
+    get pointerMoving(): boolean;
     get prePointer(): Vector2;
     get prePointerPixel(): Vector2;
     get preTouches(): {
@@ -66,6 +70,7 @@ export declare class DeviceInput extends Component {
     get keys(): {
         [k: string]: boolean;
     };
+    get pressability(): Pressability;
     constructor(option: InputOption);
     onEnable(): void;
     onDisable(): void;

package/types/Viewer.d.ts

@@ -1,4 +1,4 @@
-import { BufferGeometry, Camera, Color, ColorRepresentation, ColorSpace, DataTexture, LoadingManager, Material, Mesh, Object3D, OrthographicCamera, PerspectiveCamera, Scene, ShaderMaterial, ShadowMapType, Texture, TextureDataType, ToneMapping, Vector3, WebGLCubeRenderTarget, WebGLRenderer, WebGLRendererParameters, WebGLRenderTarget } from "three";
+import { BufferGeometry, Camera, Color, ColorRepresentation, ColorSpace, DataTexture, LoadingManager, Material, Mesh, Object3D, OrthographicCamera, PerspectiveCamera, Scene, ShaderMaterial, ShadowMapType, Texture, TextureDataType, ToneMapping, TypedArray, Vector3, WebGLCubeRenderTarget, WebGLRenderer, WebGLRendererParameters, WebGLRenderTarget } from "three";
 import { EventEmitter } from "./base";
 import { ComponentManager } from "./ComponentManager";
 import { DeviceInput, InputOption } from "./DeviceInput";
@@ -31,8 +31,6 @@ export declare class Viewer extends EventEmitter {
     private _camera;
     private _renderer;
     private _active;
-    private _loading;
-    private _tasking;
     private _running;
     private _rootRotated;
     private _time;
@@ -42,6 +40,7 @@ export declare class Viewer extends EventEmitter {
     private _fixedFrameTime;
     private _windowSize;
     private _orientation;
+    private _freeze;
     private _taskManager;
     private _resourceManager;
     private _componentManager;
@@ -67,9 +66,11 @@ export declare class Viewer extends EventEmitter {
     set targetFrameRate(v: number);
     get instanceId(): number;
     get componentManager(): ComponentManager;
-    get scene(): Scene;
+    get scene(): Scene<import("three").Object3DEventMap>;
     get camera(): Camera;
     get renderer(): WebGLRenderer;
+    get freeze(): boolean;
+    set freeze(v: boolean);
     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;
@@ -125,8 +126,7 @@ export declare class Viewer extends EventEmitter {
     } & WebGLRendererParameters);
     destroy(): void;
     context(context?: Context): Context;
-    private _frame;
-    loop(dt: number): void;
+    animate(): void;
     start(): this;
     stop(): this;
     rotate(): void;
@@ -143,9 +143,9 @@ export declare class Viewer extends EventEmitter {
     task<T extends Material[]>(target?: Material[]): T;
     add<T extends Object3D | Component, K extends __C<T>>(object: T | K & __C<T>, props?: __P<T, K>): T;
     remove<T extends Object3D | Component>(ins: T): T;
-    createRenderTarget(width: number, height: number, nearest?: boolean, floatType?: boolean | TextureDataType, msaa?: number, mipmap?: boolean, depth?: boolean): WebGLRenderTarget<Texture>;
+    createRenderTarget(width: number, height: number, nearest?: boolean, floatType?: boolean | TextureDataType, msaa?: number, mipmap?: boolean, depth?: boolean): WebGLRenderTarget<Texture<unknown>>;
     createCubeRenderTarget(size: number, nearest?: boolean, floatType?: boolean | TextureDataType, msaa?: number, mipmap?: boolean, depth?: boolean): WebGLCubeRenderTarget;
-    createDataTexture(data: ArrayBufferView, width: number, height: number, floatType?: boolean, nearest?: boolean): DataTexture;
+    createDataTexture(data: TypedArray, width: number, height: number, floatType?: boolean, nearest?: boolean): DataTexture;
     blit(renderTarget: WebGLRenderTarget, material: Material, lod?: number, face?: number): void;
     copy(src: WebGLRenderTarget | Texture, dest: WebGLRenderTarget): void;
     clearColor(renderTarget: WebGLRenderTarget, color: ColorRepresentation, alpha?: number): void;

package/types/components/Environment.d.ts

@@ -19,7 +19,7 @@ export declare class Environment extends Component {
     reflectBlurIntensity: number;
     interval: number;
     manual: boolean;
-    get envMap(): Texture;
+    get envMap(): Texture<unknown>;
     constructor({ envMap, scene, near, far, layerMask, resolution, floatType, position, }?: {
         envMap?: Texture;
         scene?: Scene | Object3D;

package/types/components/FreelookVirtualCamera.d.ts

@@ -20,6 +20,7 @@ export declare class FreelookVirtualCamera extends Component<Object3D & {
     private _preLoc1;
     private _spherical;
     private _lookAt;
+    private _up;
     private _offset;
     private _fov;
     private _near;
@@ -29,14 +30,17 @@ export declare class FreelookVirtualCamera extends Component<Object3D & {
     private _targetPosition;
     private _targetTheta;
     private _targetPhi;
-    private _targetSpringLength;
+    private _targetRadius;
     private _targetFov;
     private _targetNear;
     private _targetFar;
     private _targetLookAt;
     private _targetOffset;
+    private _targetUp;
     private _finalLookAt;
     name: string;
+    sync: boolean;
+    forbitAll: boolean;
     forbidX: boolean;
     forbidY: boolean;
     forbidZ: boolean;
@@ -51,14 +55,16 @@ export declare class FreelookVirtualCamera extends Component<Object3D & {
     phiMax: number;
     thetaMin: number;
     thetaMax: number;
-    distanceMin: number;
-    distanceMax: number;
+    radiusMin: number;
+    radiusMax: number;
+    get up(): Vector3;
+    set up(v: Vector3);
     get lookAt(): Vector3;
     set lookAt(v: Vector3);
     get offset(): Vector2;
     set offset(v: Vector2);
-    get springLength(): number;
-    set springLength(v: number);
+    get radius(): number;
+    set radius(v: number);
     get theta(): number;
     set theta(v: number);
     get phi(): number;
@@ -80,11 +86,12 @@ export declare class FreelookVirtualCamera extends Component<Object3D & {
     onEnable(): void;
     onDisable(): void;
     reset(): void;
-    goto({ phi, theta, springLength, offset, lookAt, fov, near, far, smoothing, rotateSmoothing, }: {
+    goto({ phi, theta, radius, offset, lookAt, up, fov, near, far, smoothing, rotateSmoothing, }: {
         phi?: number;
         theta?: number;
-        springLength?: number;
+        radius?: number;
         lookAt?: Vector3;
+        up?: Vector3;
         offset?: Vector2;
         fov?: number;
         near?: number;

package/types/components/Reflector.d.ts

@@ -1,8 +1,12 @@
-import { Matrix4, Vector3, WebGLRenderTarget, Object3D } from "three";
+import { Matrix4, Vector3, Object3D } from "three";
 import { Component } from "../Component";
 export declare class Reflector extends Component {
     node: Object3D;
     layerMask: number;
+    private _renderTarget;
+    private _textureMatrix;
+    get texture(): import("three").Texture<unknown>;
+    get textureMatrix(): Matrix4;
     constructor({ resolution, clipBias, multisample, layerMask, normal, mipmap, }?: {
         resolution?: number;
         clipBias?: number;
@@ -11,6 +15,5 @@ export declare class Reflector extends Component {
         layerMask?: number;
         mipmap?: boolean;
     });
-    getTextureMatrix: () => Matrix4;
-    getRenderTarget: () => WebGLRenderTarget;
+    onDestroy(): void;
 }

package/types/components/RenderTexture.d.ts

@@ -2,6 +2,6 @@ import { RenderTargetOptions } from "three";
 import { Component } from "../Component";
 export declare class RenderTexture extends Component {
     private _fbo;
-    get texture(): import("three").Texture;
+    get texture(): import("three").Texture<unknown>;
     constructor(width?: number, height?: number, options?: RenderTargetOptions);
 }

package/types/index.d.ts

@@ -14,7 +14,7 @@ export { Component } from "./Component";
 export { SystemInfo } from "./SystemInfo";
 export { ObjectInstance } from "./ObjectInstance";
 export { property, PropertyManager } from "./PropertyManager";
-export { dependencies, DependentMode } from "./ComponentManager";
+export { dependencies, DependentMode, single } from "./ComponentManager";
 export { DeviceInput } from "./DeviceInput";
 export { Loader, type LoadProperties } from "./asset/Loader";
 export { ResourceManager, type AssetProperties } from "./asset/ResourceManager";

package/types/loaders/GLTFLoader.d.ts

@@ -1,4 +1,12 @@
 import { LoadProperties, Loader } from "../asset/Loader";
+import { GLTF } from "three/examples/jsm/loaders/GLTFLoader.js";
+import { BufferGeometry, Material, Mesh } from "three";
+export interface GLTFAsset<V = Mesh<BufferGeometry, Material>, M = Material> extends GLTF {
+    mesh: V;
+    material: M;
+    meshes: Map<string, V>;
+    materials: Map<string, M>;
+}
 export declare class GLTFLoader extends Loader {
     extension: string[];
     load({ url, buffer, path, resourcePath, dracoPath, manager, onLoad, onProgress, onError }: LoadProperties): void;

package/types/loaders/index.d.ts

@@ -1,6 +1,6 @@
 export { EXRLoader } from "./EXRLoader";
 export { FBXLoader } from "./FBXLoader";
-export { GLTFLoader } from "./GLTFLoader";
+export { GLTFLoader, type GLTFAsset } from "./GLTFLoader";
 export { HDRLoader } from "./HDRLoader";
 export { JSONLoader } from "./JSONLoader";
 export { TextureLoader } from "./TextureLoader";

package/types/materials/ReflectorMaterial.d.ts

@@ -24,6 +24,7 @@ export declare class ReflectorMaterial extends ShaderMaterial {
         normalMap?: Texture;
         normalScaleBias?: Vector4;
         roughnessScaleBias?: Vector4;
+        aoMap?: Texture;
     });
     onBeforeCompile(shader: WebGLProgramParametersWithUniforms): void;
     get color(): Color;
@@ -44,6 +45,8 @@ export declare class ReflectorMaterial extends ShaderMaterial {
     set normalScaleBias(v: Vector4);
     get aoMap(): Texture;
     set aoMap(v: Texture);
+    get aoMapIntensity(): Texture;
+    set aoMapIntensity(v: Texture);
     get lightMap(): Texture;
     set lightMap(v: Texture);
     get lightMapIntensity(): number;

package/types/passes/cubeuv/MergeBlurPass.d.ts

@@ -9,8 +9,8 @@ export declare class MergeMipBlurPass {
     private _blurIntensity;
     private _envMapTarget;
     private _reflectMap;
-    get envMapTarget(): WebGLRenderTarget<Texture>;
-    get envMap(): Texture;
+    get envMapTarget(): WebGLRenderTarget<Texture<unknown>>;
+    get envMap(): Texture<unknown>;
     constructor({ viewer, reflectMap, }: {
         viewer: Viewer;
         reflectMap: CubeTexture;

package/types/passes/cubeuv/MergeReflectPass.d.ts

@@ -6,7 +6,7 @@ export declare class MergeRefectPass {
     private _reflectMap;
     private _envMapTarget;
     private _sourceTarget;
-    get envMap(): Texture;
+    get envMap(): Texture<unknown>;
     constructor({ envMap, reflectMap, viewer, }: {
         envMap?: Texture;
         reflectMap: CubeTexture;