lythreeframe 1.0.33 → 1.0.35

package/dist/index.d.ts

@@ -1,14 +1,15 @@
-export { LYLoadTask } from "./lythreeframe/AssetManagement/Task/Task";
-export { LYAssetManager } from "./lythreeframe/AssetManagement/AssetManager";
+export { AssetManager } from "./lythreeframe/AssetManagement/AssetManager";
+export { TAssetPointer } from "./lythreeframe/AssetManagement/AssetPointer/AssetPointer";
+export { TSmartPointer } from './lythreeframe/Container/SmartPointer';
 export { AttachmentRules } from "./lythreeframe/Defines";
 export { Delegate } from "./lythreeframe/Delegate";
-export { ThreeJsApp, } from "./lythreeframe/ThreeJsApp";
+export { ThreeJsApp } from "./lythreeframe/ThreeJsApp";
 export { Controller } from "./lythreeframe/Frame/Controller";
 export { Viewport } from "./lythreeframe/Frame/Viewport";
 export { World } from "./lythreeframe/Frame/World";
 export type { CameraParam } from './lythreeframe/Frame/Parameters/CameraParameter';
 export type { DefaultCameraParam } from './lythreeframe/Frame/Parameters/CameraParameter';
-export type { AppParam } from "./lythreeframe/Frame/Parameters/AppParameter";
+export type { AppParam, AppClass } from "./lythreeframe/Frame/Parameters/AppParameter";
 export { DefaultRenderParam, DefaultAppParam } from "./lythreeframe/Frame/Parameters/AppParameter";
 export { Actor } from "./lythreeframe/Object/Actor";
 export { DirectionalLightActor } from "./lythreeframe/Object/Actors/Light/DirectionalLightActor";

package/dist/lythreeframe/AssetManagement/AssetManager.d.ts

@@ -1,25 +1,29 @@
 import { BufferGeometry, LoadingManager, Material, Mesh, Texture } from "three/webgpu";
 import { SceneComponent } from "../Object/Components/SceneComponent";
-import { LYLoadTask } from "./Task/Task";
 import { TAssetPointer } from "./AssetPointer/AssetPointer";
 import { DRACOLoader, GLTF, GLTFLoader } from 'three/examples/jsm/Addons.js';
-export declare class LYAssetManager {
-    protected assetPointer: Map<string, TAssetPointer<BufferGeometry | Texture | Material>>;
+import { Object3D } from "three";
+import { ThreeJsApp } from "../ThreeJsApp";
+export declare class AssetManager {
+    protected geometryAssets: Map<string, TAssetPointer<BufferGeometry>>;
+    protected textureAssets: Map<string, TAssetPointer<Texture>>;
+    protected materialAssets: Map<string, TAssetPointer<Material>>;
     protected dracoLoader: DRACOLoader | null;
     protected readonly gltfLoader: GLTFLoader;
     protected readonly loadingManager: LoadingManager;
-    constructor();
+    protected app: ThreeJsApp;
+    constructor(app: ThreeJsApp);
     get LoadingManager(): LoadingManager;
-    static Get(): LYAssetManager;
-    static ClearAssets(): void;
     setupDracoLoader(dracoPath: string): void;
     convertThreeObjectToLYObject(parentLYComponent: SceneComponent, threejsObject: any): SceneComponent | null;
-    private collectResourcesAndReferences;
+    collectResourcesAndReferences(object: Object3D): void;
     checkMeshResource(mesh: Mesh): void;
-    loadMultiGLTFAsGroup(tasks: LYLoadTask[], onProgress?: ((url: string, loaded: number, total: number) => void) | null, onAllFinished?: (() => void) | null): void;
     loadGltfFromBuffer(data: ArrayBuffer | string, path: string, onLoadFinished: (gltf: GLTF) => void): void;
     loadFile(filepath: string | undefined, onLoadFinished: (data: any) => void): void;
-    addAsset(asset: BufferGeometry | Material | Texture, referenceCount?: number): void;
+    addAsset(asset: BufferGeometry | Material | Texture, referenceCount?: number): TAssetPointer<BufferGeometry | Material | Texture> | undefined;
+    addMaterialAsset(asset: Material, referenceCount?: number): TAssetPointer<Material>;
+    addTextureAsset(asset: Texture, referenceCount?: number): TAssetPointer<Texture>;
+    addGeometryAsset(asset: BufferGeometry, referenceCount?: number): TAssetPointer<BufferGeometry>;
     releaseAsset(asset: BufferGeometry | Material | Texture): void;
     clearAssets(): void;
 }

package/dist/lythreeframe/Frame/Parameters/AppParameter.d.ts

@@ -2,11 +2,22 @@ import { WebGPURendererParameters } from "three/src/renderers/webgpu/WebGPURende
 import { CameraParam } from "./CameraParameter";
 import { PostProcessParam } from "@/lythreeframe/PostProcess/PostProcessParam";
 import { WorldParam } from "./WorldParameter";
+import { AssetManager } from "@/lythreeframe/AssetManagement/AssetManager";
+import { Controller } from "../Controller";
+import { World } from "../World";
+import { Viewport } from "../Viewport";
+export interface AppClass {
+    assetManagerClass: typeof AssetManager;
+    controllerClass: typeof Controller;
+    worldClass: typeof World;
+    viewportClass: typeof Viewport;
+}
 export interface AppParam {
     renderParam?: WebGPURendererParameters;
     cameraParam?: CameraParam;
     postProcessParam?: PostProcessParam;
     worldParam?: WorldParam;
+    classes?: AppClass;
 }
 export declare const DefaultRenderParam: WebGPURendererParameters;
 export declare const DefaultAppParam: AppParam;

package/dist/lythreeframe/Object/Actor.d.ts

@@ -3,6 +3,7 @@ import { BaseObject } from "./BaseObject";
 import { AttachmentRules } from "../Defines";
 import { SceneComponent } from "./Components/SceneComponent";
 import { World } from "../Frame/World";
+import { ThreeJsApp } from "../ThreeJsApp";
 export declare class Actor extends BaseObject {
     get world(): World | null;
     get name(): string;
@@ -16,11 +17,12 @@ export declare class Actor extends BaseObject {
     protected _name: string;
     protected _rootComponent: SceneComponent | null;
     protected _world: World | null;
+    protected app: ThreeJsApp;
     protected onClickedEvent: ((component?: SceneComponent) => void)[];
     protected onDoubleClickedEvent: ((component?: SceneComponent) => void)[];
     protected onHoverBeginEvent: ((component?: SceneComponent) => void)[];
     protected onHoverEndEvent: ((component?: SceneComponent) => void)[];
-    constructor(myThreeObject?: Object3D | null);
+    constructor(app: ThreeJsApp, myThreeObject?: Object3D | null);
     protected constructRootComponent(myThreeObject?: Object3D | null): void;
     getBoundsCenterPosition(bInWorldSpace?: boolean): any;
     getBoundsTopCenterPosition(bInWorldSpace?: boolean): any;

package/dist/lythreeframe/Object/Actors/Light/DirectionalLightActor.d.ts

@@ -1,8 +1,9 @@
 import { ColorRepresentation } from "three/webgpu";
 import { Actor } from "../../Actor";
 import { DirectionalLightComponent } from "../../Components/Light/DirectionalLight/DirectionalLightComponent";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 export declare class DirectionalLightActor extends Actor {
     protected lightComponent: DirectionalLightComponent | null;
-    constructor(color?: ColorRepresentation, intensity?: number);
+    constructor(app: ThreeJsApp, color?: ColorRepresentation, intensity?: number);
     protected constructRootComponent(): void;
 }

package/dist/lythreeframe/Object/Actors/Shape/BoxActor.d.ts

@@ -1,5 +1,6 @@
 import { Material } from "three/webgpu";
 import { Actor } from "../../Actor";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 export declare class BoxActor extends Actor {
-    constructor(width?: number, height?: number, depth?: number, widthSegments?: number, heightSegments?: number, depthSegments?: number, material?: Material);
+    constructor(app: ThreeJsApp, width?: number, height?: number, depth?: number, widthSegments?: number, heightSegments?: number, depthSegments?: number, material?: Material);
 }

package/dist/lythreeframe/Object/Actors/Shape/PlaneActor.d.ts

@@ -1,9 +1,10 @@
 import { Material } from "three/webgpu";
 import { Actor } from "../../Actor";
 import { PlaneComponent } from "../../Components/Mesh/Shape/PlaneComponent";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 export declare class PlaneActor extends Actor {
     get planeComponent(): PlaneComponent | null;
     private _planeComponent;
-    constructor(width: number, height: number, material?: Material, widthSegments?: number, heightSegments?: number);
+    constructor(app: ThreeJsApp, width: number, height: number, material?: Material, widthSegments?: number, heightSegments?: number);
     destroy(): void;
 }

package/dist/lythreeframe/Object/Actors/Sky/SkyActor.d.ts

@@ -1,8 +1,9 @@
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 import { Actor } from "../../Actor";
 import { SkyComponent } from "../../Components/Sky/SkyComponent";
 export declare class SkyActor extends Actor {
     protected _name: string;
     protected skyComponent: SkyComponent | null;
-    constructor();
+    constructor(app: ThreeJsApp);
     protected constructRootComponent(): void;
 }

package/dist/lythreeframe/Object/Components/2D/2DComponent.d.ts

@@ -1,10 +1,11 @@
 import { CSS2DObject } from "three/examples/jsm/renderers/CSS2DRenderer.js";
 import { SceneComponent } from "../SceneComponent";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 export declare class LabelComponent extends SceneComponent {
     get threeObject(): CSS2DObject;
     set threeObject(newThreeObject: CSS2DObject);
     protected obj: CSS2DObject;
-    constructor(domElement: HTMLElement, center?: any);
+    constructor(app: ThreeJsApp, domElement: HTMLElement, center?: any);
     set isHoverEnabled(bCanHorver: boolean);
     set isClickEnabled(bCanClick: boolean);
     setVisible(bVisible: boolean): void;

package/dist/lythreeframe/Object/Components/Light/DirectionalLight/DirectionalLightComponent.d.ts

@@ -1,13 +1,14 @@
 import { LightComponent } from "../LightComponent";
 import { ColorRepresentation, DirectionalLight, Vector3 } from "three/webgpu";
 import { World } from "../../../../Frame/World";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 export declare class DirectionalLightComponent extends LightComponent {
     get threeObject(): DirectionalLight;
     set threeObject(newThreeObject: DirectionalLight);
     get castShadow(): boolean;
     set castShadow(value: boolean);
     protected obj: DirectionalLight | null;
-    constructor(color?: ColorRepresentation, intensity?: number);
+    constructor(app: ThreeJsApp, color?: ColorRepresentation, intensity?: number);
     setPosition(...args: [Vector3] | [number, number, number]): void;
     update(): void;
     onAddedToWorld(world: World): void;

package/dist/lythreeframe/Object/Components/Light/LightComponent.d.ts

@@ -1,5 +1,6 @@
 import { ColorRepresentation, Light } from "three/webgpu";
 import { SceneComponent } from "../SceneComponent";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 export declare abstract class LightComponent extends SceneComponent {
     get threeObject(): Light;
     set threeObject(newThreeObject: Light);
@@ -8,5 +9,5 @@ export declare abstract class LightComponent extends SceneComponent {
     get intensity(): number;
     set intensity(intensity: number);
     protected obj: Light | null;
-    protected constructor(light: Light);
+    protected constructor(app: ThreeJsApp, light: Light);
 }

package/dist/lythreeframe/Object/Components/Mesh/MeshComponent.d.ts

@@ -1,21 +1,28 @@
-import { BufferGeometry, Material, Mesh } from "three/webgpu";
 import { SceneComponent } from "../SceneComponent";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
+import { TAssetPointer } from "@/lythreeframe/AssetManagement/AssetPointer/AssetPointer";
+import { BufferGeometry, Material, Mesh, Vector3 } from "three/webgpu";
 export declare class MeshComponent extends SceneComponent {
     get threeObject(): Mesh | null;
     set threeObject(newThreeObject: Mesh);
     protected obj: Mesh | null;
     get geometry(): BufferGeometry | null;
     set geometry(geo: BufferGeometry);
-    get material(): Material | Material[] | null;
+    get geometryPtr(): TAssetPointer<BufferGeometry>;
+    set geometryPtr(geo: TAssetPointer<BufferGeometry>);
+    get material(): Material[];
+    get materialPtr(): TAssetPointer<Material>[];
     set material(newMat: Material | Material[]);
-    constructor(mesh: Mesh);
-    constructor(geometry: BufferGeometry, material: Material | Material[] | null);
+    set materialPtr(newMat: TAssetPointer<Material> | TAssetPointer<Material>[]);
+    protected _geometryPtr: TAssetPointer<BufferGeometry> | null;
+    protected _materialPtr: TAssetPointer<Material>[];
+    constructor(app: ThreeJsApp, geometry: BufferGeometry, material: Material | Material[]);
     set castShadow(bCast: boolean);
     get castShadow(): boolean;
-    set receiveShadow(bReceive: any);
-    get receiveShadow(): any;
-    getBoundsCenterPosition(): any;
-    getBoundsTopCenterPosition(): any;
-    getBoundsBottomCenterPosition(): any;
+    set receiveShadow(bReceive: boolean);
+    get receiveShadow(): boolean;
+    getBoundsCenterPosition(): Vector3;
+    getBoundsTopCenterPosition(): Vector3;
+    getBoundsBottomCenterPosition(): Vector3;
     destroyObject(): void;
 }

package/dist/lythreeframe/Object/Components/Mesh/Shape/BoxComponent.d.ts

@@ -1,5 +1,6 @@
 import { Material } from "three/webgpu";
 import { MeshComponent } from "../MeshComponent";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 export declare class BoxComponent extends MeshComponent {
-    constructor(width?: number, height?: number, depth?: number, widthSegments?: number, heightSegments?: number, depthSegments?: number, material?: Material);
+    constructor(app: ThreeJsApp, width?: number, height?: number, depth?: number, widthSegments?: number, heightSegments?: number, depthSegments?: number, material?: Material);
 }

package/dist/lythreeframe/Object/Components/Mesh/Shape/PlaneComponent.d.ts

@@ -1,5 +1,6 @@
 import { Material } from "three/webgpu";
 import { MeshComponent } from "../MeshComponent";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 export declare class PlaneComponent extends MeshComponent {
-    constructor(width: number, height: number, material: Material, widthSegments?: number, heightSegments?: number);
+    constructor(app: ThreeJsApp, width: number, height: number, material: Material, widthSegments?: number, heightSegments?: number);
 }

package/dist/lythreeframe/Object/Components/Mesh/Shape/SphereComponent.d.ts

@@ -1,4 +1,5 @@
 import { MeshComponent } from "../MeshComponent";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 export declare class SphereComponent extends MeshComponent {
-    constructor(radius: number, material?: any, widthSegments?: number, heightSegments?: number);
+    constructor(app: ThreeJsApp, radius: number, material?: any, widthSegments?: number, heightSegments?: number);
 }

package/dist/lythreeframe/Object/Components/Mesh/Sprite/SpriteComponent.d.ts

@@ -1,8 +1,9 @@
 import { Sprite, Texture } from "three/webgpu";
 import { SceneComponent } from "../../SceneComponent";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 export declare class SpriteComponent extends SceneComponent {
     get threeObject(): Sprite;
     set threeObject(newThreeObject: Sprite);
     protected obj: Sprite;
-    constructor(texture: Texture);
+    constructor(app: ThreeJsApp, texture: Texture);
 }

package/dist/lythreeframe/Object/Components/SceneComponent.d.ts

@@ -3,13 +3,15 @@ import { Box3, Euler, Matrix4, Object3D, Quaternion, Vector3 } from "three/webgp
 import { Component } from "./Component";
 import { World } from "../../Frame/World";
 import { AttachmentRules } from "../../Defines";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 export declare class SceneComponent extends Component {
     set parentActor(value: Actor | null);
     get parentActor(): Actor | null;
     protected bCanHover: boolean;
     protected bCanClick: boolean;
-    protected world: World | null;
-    constructor(newThreeObject: Object3D);
+    get world(): World;
+    protected app: ThreeJsApp;
+    constructor(app: ThreeJsApp, newThreeObject: Object3D);
     createDefaultThreeObject(): void;
     get isVisible(): boolean;
     setVisible(bVisible: boolean): void;

package/dist/lythreeframe/Object/Components/Sky/SkyComponent.d.ts

@@ -1,5 +1,6 @@
 import { SkyMesh } from "three/examples/jsm/objects/SkyMesh.js";
 import { SceneComponent } from "../SceneComponent";
+import { ThreeJsApp } from "@/lythreeframe/ThreeJsApp";
 export interface SkyComponentParam {
     turbidity: number;
     rayleigh: number;
@@ -15,6 +16,7 @@ export declare class SkyComponent extends SceneComponent {
     protected obj: SkyMesh | null;
     private skyParam;
     private sunPosition;
-    constructor(skyparam?: SkyComponentParam);
+    constructor(app: ThreeJsApp, skyparam?: SkyComponentParam);
     private updateSky;
+    destroyObject(): void;
 }

package/dist/lythreeframe/ThreeJsApp.d.ts

@@ -5,20 +5,20 @@ import { Clock, OrthographicCamera, PerspectiveCamera } from "three/webgpu";
 import { Delegate } from './Delegate';
 import { CameraParam } from './Frame/Parameters/CameraParameter';
 import { AppParam } from './Frame/Parameters/AppParameter';
+import { AssetManager } from './AssetManagement/AssetManager';
 export declare class ThreeJsApp {
     get camera(): PerspectiveCamera | OrthographicCamera;
     get clock(): Clock;
     get world(): World;
     get viewport(): Viewport;
     get controller(): Controller;
-    get worldClass(): typeof World;
-    get viewportClass(): typeof Viewport;
-    get controllerClass(): typeof Controller;
+    get assetManager(): AssetManager;
     protected _clock: Clock;
     protected _camera: PerspectiveCamera | OrthographicCamera;
     protected _world: World;
     protected _viewport: Viewport;
     protected _controller: Controller;
+    protected _assetManager: AssetManager;
     get appParam(): AppParam;
     protected _appParam: AppParam;
     get onCameraChangedDelegate(): Delegate<[void]>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lythreeframe",
-  "version": "1.0.33",
+  "version": "1.0.35",
   "description": "Three.js 封装",
   "main": "dist/bundle.cjs.js",
   "module": "dist/bundle.esm.js",