lythreeframe 1.0.43 → 1.0.45

package/dist/bundle.cjs.js

@@ -852,7 +852,7 @@ class TAssetPointer extends TSmartPointer {
     get uuid() {
         return this._uuid;
     }
-    constructor(value, referenceCount = 1) {
+    constructor(value, referenceCount = 0) {
         super(value, referenceCount);
         this._uuid = value.uuid;
         value.userData["assetPointer"] = this;
@@ -875,6 +875,37 @@ class TAssetPointer extends TSmartPointer {
     }
 }
 
+class MaterialAssetPointer extends TAssetPointer {
+    constructor(value, usedTextures, referenceCount = 0) {
+        super(value, referenceCount);
+        this.textures = usedTextures;
+    }
+    release() {
+        for (let texture of this.textures.values()) {
+            texture.release();
+        }
+        super.release();
+    }
+    forceRelease() {
+        for (let texture of this.textures.values()) {
+            texture.release();
+        }
+        super.forceRelease();
+    }
+}
+
+class TextureAssetPointer extends TAssetPointer {
+    constructor(value, referenceCount = 1) {
+        super(value, referenceCount);
+    }
+}
+
+class GeometryAssetPointer extends TAssetPointer {
+    constructor(value, referenceCount = 1) {
+        super(value, referenceCount);
+    }
+}
+
 class AssetManager {
     constructor(app) {
         this.geometryAssets = new Map();
@@ -1054,7 +1085,7 @@ class AssetManager {
             onLoadFinished(data);
         });
     }
-    addAsset(asset, referenceCount = 1) {
+    addAsset(asset, referenceCount = 0) {
         if (asset instanceof webgpu.BufferGeometry) {
             return this.addGeometryAsset(asset, referenceCount);
         }
@@ -1066,35 +1097,42 @@ class AssetManager {
         }
         return undefined;
     }
-    addMaterialAsset(asset, referenceCount = 1) {
+    addMaterialAsset(asset, referenceCount = 0) {
         let pointer = (asset.userData["assetPointer"]);
         if (!pointer) {
-            pointer = new TAssetPointer(asset, referenceCount);
+            let textureMap = new Map();
+            for (let k in asset) {
+                if (asset[k] instanceof webgpu.Texture) {
+                    let ptr = this.addTextureAsset(asset[k], 1);
+                    textureMap.set(k, ptr);
+                }
+            }
+            pointer = new MaterialAssetPointer(asset, textureMap, referenceCount);
+            this.geometryAssets.set(asset.uuid, pointer);
         }
         else {
-            pointer = asset.userData["assetPointer"];
             pointer.addRef(referenceCount);
         }
         return pointer;
     }
-    addTextureAsset(asset, referenceCount = 1) {
+    addTextureAsset(asset, referenceCount = 0) {
         let pointer = (asset.userData["assetPointer"]);
         if (!pointer) {
-            pointer = new TAssetPointer(asset, referenceCount);
+            pointer = new TextureAssetPointer(asset, referenceCount);
+            this.textureAssets.set(asset.uuid, pointer);
         }
         else {
-            pointer = asset.userData["assetPointer"];
             pointer.addRef(referenceCount);
         }
         return pointer;
     }
-    addGeometryAsset(asset, referenceCount = 1) {
+    addGeometryAsset(asset, referenceCount = 0) {
         let pointer = (asset.userData["assetPointer"]);
         if (!pointer) {
-            pointer = new TAssetPointer(asset, referenceCount);
+            pointer = new GeometryAssetPointer(asset, referenceCount);
+            this.geometryAssets.set(asset.uuid, pointer);
         }
         else {
-            pointer = asset.userData["assetPointer"];
             pointer.addRef(referenceCount);
         }
         return pointer;
@@ -3122,7 +3160,9 @@ exports.Delegate = Delegate;
 exports.DirectionalLightActor = DirectionalLightActor;
 exports.DirectionalLightComponent = DirectionalLightComponent;
 exports.FirstPerson = FirstPerson;
+exports.GeometryAssetPointer = GeometryAssetPointer;
 exports.LabelComponent = LabelComponent;
+exports.MaterialAssetPointer = MaterialAssetPointer;
 exports.MeshComponent = MeshComponent;
 exports.Orbital = Orbital;
 exports.PlaneActor = PlaneActor;
@@ -3133,6 +3173,7 @@ exports.SkyComponent = SkyComponent;
 exports.SphereComponent = SphereComponent;
 exports.TAssetPointer = TAssetPointer;
 exports.TSmartPointer = TSmartPointer;
+exports.TextureAssetPointer = TextureAssetPointer;
 exports.ThreeJsApp = ThreeJsApp;
 exports.ThreeObjectLibrary = ThreeObjectLibrary;
 exports.ToneMappingOptions = ToneMappingOptions;

package/dist/bundle.esm.js

@@ -850,7 +850,7 @@ class TAssetPointer extends TSmartPointer {
     get uuid() {
         return this._uuid;
     }
-    constructor(value, referenceCount = 1) {
+    constructor(value, referenceCount = 0) {
         super(value, referenceCount);
         this._uuid = value.uuid;
         value.userData["assetPointer"] = this;
@@ -873,6 +873,37 @@ class TAssetPointer extends TSmartPointer {
     }
 }
 
+class MaterialAssetPointer extends TAssetPointer {
+    constructor(value, usedTextures, referenceCount = 0) {
+        super(value, referenceCount);
+        this.textures = usedTextures;
+    }
+    release() {
+        for (let texture of this.textures.values()) {
+            texture.release();
+        }
+        super.release();
+    }
+    forceRelease() {
+        for (let texture of this.textures.values()) {
+            texture.release();
+        }
+        super.forceRelease();
+    }
+}
+
+class TextureAssetPointer extends TAssetPointer {
+    constructor(value, referenceCount = 1) {
+        super(value, referenceCount);
+    }
+}
+
+class GeometryAssetPointer extends TAssetPointer {
+    constructor(value, referenceCount = 1) {
+        super(value, referenceCount);
+    }
+}
+
 class AssetManager {
     constructor(app) {
         this.geometryAssets = new Map();
@@ -1052,7 +1083,7 @@ class AssetManager {
             onLoadFinished(data);
         });
     }
-    addAsset(asset, referenceCount = 1) {
+    addAsset(asset, referenceCount = 0) {
         if (asset instanceof BufferGeometry) {
             return this.addGeometryAsset(asset, referenceCount);
         }
@@ -1064,35 +1095,42 @@ class AssetManager {
         }
         return undefined;
     }
-    addMaterialAsset(asset, referenceCount = 1) {
+    addMaterialAsset(asset, referenceCount = 0) {
         let pointer = (asset.userData["assetPointer"]);
         if (!pointer) {
-            pointer = new TAssetPointer(asset, referenceCount);
+            let textureMap = new Map();
+            for (let k in asset) {
+                if (asset[k] instanceof Texture) {
+                    let ptr = this.addTextureAsset(asset[k], 1);
+                    textureMap.set(k, ptr);
+                }
+            }
+            pointer = new MaterialAssetPointer(asset, textureMap, referenceCount);
+            this.geometryAssets.set(asset.uuid, pointer);
         }
         else {
-            pointer = asset.userData["assetPointer"];
             pointer.addRef(referenceCount);
         }
         return pointer;
     }
-    addTextureAsset(asset, referenceCount = 1) {
+    addTextureAsset(asset, referenceCount = 0) {
         let pointer = (asset.userData["assetPointer"]);
         if (!pointer) {
-            pointer = new TAssetPointer(asset, referenceCount);
+            pointer = new TextureAssetPointer(asset, referenceCount);
+            this.textureAssets.set(asset.uuid, pointer);
         }
         else {
-            pointer = asset.userData["assetPointer"];
             pointer.addRef(referenceCount);
         }
         return pointer;
     }
-    addGeometryAsset(asset, referenceCount = 1) {
+    addGeometryAsset(asset, referenceCount = 0) {
         let pointer = (asset.userData["assetPointer"]);
         if (!pointer) {
-            pointer = new TAssetPointer(asset, referenceCount);
+            pointer = new GeometryAssetPointer(asset, referenceCount);
+            this.geometryAssets.set(asset.uuid, pointer);
         }
         else {
-            pointer = asset.userData["assetPointer"];
             pointer.addRef(referenceCount);
         }
         return pointer;
@@ -3099,4 +3137,4 @@ class TransformGizmo extends Pawn {
     }
 }
 
-export { Actor, AssetManager, AttachmentRules, BoxActor, BoxComponent, Controller, DefaultAppParam, DefaultBloomParam, DefaultCameraParam, DefaultDOFParam, DefaultDenoiseParam, DefaultGTAOParam, DefaultOutlineParams, DefaultPostProcessParam, DefaultRenderParam, DefaultSSRParam, DefaultSkyParam, DefaultToneMappingParams, Delegate, DirectionalLightActor, DirectionalLightComponent, FirstPerson, LabelComponent, MeshComponent, Orbital, PlaneActor, PlaneComponent, SceneComponent, SkyActor, SkyComponent, SphereComponent, TAssetPointer, TSmartPointer, ThreeJsApp, ThreeObjectLibrary, ToneMappingOptions, TransformGizmo, Viewport, WebGPUPostProcessFactory, World };
+export { Actor, AssetManager, AttachmentRules, BoxActor, BoxComponent, Controller, DefaultAppParam, DefaultBloomParam, DefaultCameraParam, DefaultDOFParam, DefaultDenoiseParam, DefaultGTAOParam, DefaultOutlineParams, DefaultPostProcessParam, DefaultRenderParam, DefaultSSRParam, DefaultSkyParam, DefaultToneMappingParams, Delegate, DirectionalLightActor, DirectionalLightComponent, FirstPerson, GeometryAssetPointer, LabelComponent, MaterialAssetPointer, MeshComponent, Orbital, PlaneActor, PlaneComponent, SceneComponent, SkyActor, SkyComponent, SphereComponent, TAssetPointer, TSmartPointer, TextureAssetPointer, ThreeJsApp, ThreeObjectLibrary, ToneMappingOptions, TransformGizmo, Viewport, WebGPUPostProcessFactory, World };

package/dist/index.d.ts

@@ -1,6 +1,9 @@
 export { AssetManager } from "./lythreeframe/AssetManagement/AssetManager";
 export { TAssetPointer } from "./lythreeframe/AssetManagement/AssetPointer/AssetPointer";
 export { TSmartPointer } from './lythreeframe/Container/SmartPointer';
+export { MaterialAssetPointer } from "./lythreeframe/AssetManagement/AssetPointer/Assets/MaterialAssetPointer";
+export { GeometryAssetPointer } from "./lythreeframe/AssetManagement/AssetPointer/Assets/GeometryAssetPointer";
+export { TextureAssetPointer } from "./lythreeframe/AssetManagement/AssetPointer/Assets/TextureAssetPointer";
 export { AttachmentRules } from "./lythreeframe/Defines";
 export { Delegate } from "./lythreeframe/Delegate";
 export { ThreeJsApp } from "./lythreeframe/ThreeJsApp";

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

@@ -4,10 +4,13 @@ import { TAssetPointer } from "./AssetPointer/AssetPointer";
 import { DRACOLoader, GLTF, GLTFLoader } from 'three/examples/jsm/Addons.js';
 import { Object3D } from "three";
 import { ThreeJsApp } from "../ThreeJsApp";
+import { MaterialAssetPointer } from "./AssetPointer/Assets/MaterialAssetPointer";
+import { TextureAssetPointer } from "./AssetPointer/Assets/TextureAssetPointer";
+import { GeometryAssetPointer } from "./AssetPointer/Assets/GeometryAssetPointer";
 export declare class AssetManager {
-    protected geometryAssets: Map<string, TAssetPointer<BufferGeometry>>;
-    protected textureAssets: Map<string, TAssetPointer<Texture>>;
-    protected materialAssets: Map<string, TAssetPointer<Material>>;
+    protected geometryAssets: Map<string, GeometryAssetPointer>;
+    protected textureAssets: Map<string, TextureAssetPointer>;
+    protected materialAssets: Map<string, MaterialAssetPointer>;
     protected dracoLoader: DRACOLoader | null;
     protected readonly gltfLoader: GLTFLoader;
     protected readonly loadingManager: LoadingManager;
@@ -21,9 +24,9 @@ export declare class AssetManager {
     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): 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>;
+    addMaterialAsset(asset: Material, referenceCount?: number): MaterialAssetPointer;
+    addTextureAsset(asset: Texture, referenceCount?: number): TextureAssetPointer;
+    addGeometryAsset(asset: BufferGeometry, referenceCount?: number): GeometryAssetPointer;
     releaseAsset(asset: BufferGeometry | Material | Texture): void;
     clearAssets(): void;
 }

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

@@ -1,6 +1,6 @@
 import { BufferGeometry, Material, Texture } from "three/webgpu";
 import { TSmartPointer } from "../../Container/SmartPointer";
-export declare class TAssetPointer<T extends BufferGeometry | Texture | Material> extends TSmartPointer<T> {
+export declare abstract class TAssetPointer<T extends BufferGeometry | Texture | Material> extends TSmartPointer<T> {
     get uuid(): string;
     private readonly _uuid;
     constructor(value: T, referenceCount?: number);

package/dist/lythreeframe/AssetManagement/AssetPointer/Assets/GeometryAssetPointer.d.ts

@@ -0,0 +1,5 @@
+import { TAssetPointer } from "../AssetPointer";
+import { BufferGeometry } from "three/webgpu";
+export declare class GeometryAssetPointer extends TAssetPointer<BufferGeometry> {
+    constructor(value: BufferGeometry, referenceCount?: number);
+}

package/dist/lythreeframe/AssetManagement/AssetPointer/Assets/MaterialAssetPointer.d.ts

@@ -0,0 +1,9 @@
+import { Material } from "three/webgpu";
+import { TAssetPointer } from "../AssetPointer";
+import { TextureAssetPointer } from "./TextureAssetPointer";
+export declare class MaterialAssetPointer extends TAssetPointer<Material> {
+    protected textures: Map<string, TextureAssetPointer>;
+    constructor(value: Material, usedTextures: Map<string, TextureAssetPointer>, referenceCount?: number);
+    release(): void;
+    forceRelease(): void;
+}

package/dist/lythreeframe/AssetManagement/AssetPointer/Assets/TextureAssetPointer.d.ts

@@ -0,0 +1,5 @@
+import { TAssetPointer } from "../AssetPointer";
+import { Texture } from "three/webgpu";
+export declare class TextureAssetPointer extends TAssetPointer<Texture> {
+    constructor(value: Texture, referenceCount?: number);
+}

package/package.json

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