lythreeframe 1.2.51 → 1.2.52

package/dist/bundle.cjs.js

@@ -930,16 +930,16 @@ class TAssetPointer extends TSmartPointer {
         value.userData["assetPointer"] = this;
     }
     release() {
-        if (this.value) {
-            this.referenceCount--;
-            if (this.referenceCount === 0) {
-                setTimeout(() => {
-                    this.value.dispose();
-                    this.value = null;
-                }, 0);
-            }
-        }
-        console.log("realease", this);
+        // if (this.value) {
+        //     this.referenceCount--;
+        //     if (this.referenceCount === 0) {
+        //         setTimeout(() => {
+        //             this.value!.dispose();
+        //             this.value = null;
+        //         }, 0);
+        //     }
+        // }
+        // console.log("realease", this)
     }
     forceRelease() {
         console.log("forceRelease", this);
@@ -1045,63 +1045,58 @@ class AssetManager {
         }
     }
     convertThreeObjectToLYObject(parentLYComponent, threejsObject) {
-        let location = threejsObject.position.clone();
-        let rotation = threejsObject.rotation.clone();
-        let scale = threejsObject.scale.clone();
+        const location = threejsObject.position.clone();
+        const rotation = threejsObject.rotation.clone();
+        const scale = threejsObject.scale.clone();
         let newComp = null;
-        let children = threejsObject.children;
+        const children = threejsObject.children;
         threejsObject.children = [];
         if (threejsObject.type === "Group" || threejsObject.type === "Object3D") {
-            newComp = new SceneComponent(this.app, threejsObject);
+            newComp = new SceneComponent(this.app, threejsObject.uuid);
         }
         else if (threejsObject.isMesh) {
-            let obj = threejsObject;
+            const obj = threejsObject;
             newComp = new MeshComponent(this.app, obj.geometry, obj.material);
-            // assetManager.#collectMatAndGeoInMesh(threejsObject)
             threejsObject.layers.set(0);
         }
         else {
-            newComp = new SceneComponent(this.app, threejsObject);
+            newComp = new SceneComponent(this.app, threejsObject.uuid);
         }
         if (newComp === null) {
             threejsObject.children = children;
-            //threejsObject.parent = parent
-            //console.log("Unprocess", threejsObject);
             return null;
         }
         parentLYComponent.addChildComponent(newComp);
         newComp.setPosition(location);
         newComp.setRotation(rotation);
         newComp.setScale(scale);
-        for (let i = 0; i < children.length; ++i) {
-            this.convertThreeObjectToLYObject(newComp, children[i]);
+        for (const child of children) {
+            this.convertThreeObjectToLYObject(newComp, child);
         }
         return newComp;
     }
     collectResourcesAndReferences(object) {
-        function countResource(map, resource) {
-            if (!map.has(resource)) {
-                map.set(resource, 1);
-            }
-            else {
-                map.set(resource, map.get(resource) + 1);
-            }
-        }
+        const countResource = (map, resource) => {
+            var _a;
+            const currentCount = (_a = map.get(resource)) !== null && _a !== void 0 ? _a : 0;
+            map.set(resource, currentCount + 1);
+        };
         const resources = {
             geometries: new Map(),
             materials: new Map(),
             textures: new Map()
         };
         object.traverse((child) => {
-            if (child.geometry && child.geometry instanceof webgpu.BufferGeometry) {
-                countResource(resources.geometries, child.geometry);
+            const meshChild = child;
+            if (meshChild.geometry instanceof webgpu.BufferGeometry) {
+                countResource(resources.geometries, meshChild.geometry);
             }
-            if (child.material) {
-                const mats = Array.isArray(child.material) ? child.material : [child.material];
+            if (meshChild.material) {
+                const mats = Array.isArray(meshChild.material) ? meshChild.material : [meshChild.material];
                 mats.forEach((mat) => {
                     if (mat) {
                         countResource(resources.materials, mat);
-                        Object.entries(mat).forEach(([key, value]) => {
+                        Object.values(mat).forEach((value) => {
                             if (value instanceof webgpu.Texture) {
                                 countResource(resources.textures, value);
                             }
@@ -1110,49 +1105,36 @@ class AssetManager {
                 });
             }
         });
-        function createPointer(manager, map) {
-            map.forEach((value, key) => {
-                manager.addAsset(key, value);
-            });
-        }
-        createPointer(this, resources.geometries);
-        createPointer(this, resources.materials);
-        createPointer(this, resources.textures);
-        // console.log('Geometries:', Array.from(resources.geometries.entries()));
-        // console.log('Materials:', Array.from(resources.materials.entries()));
-        // console.log('Textures:', Array.from(resources.textures.entries()));
-        // console.log('assetPointer:', this.assetPointer);
+        resources.geometries.forEach((count, geometry) => this.addAsset(geometry, count));
+        resources.materials.forEach((count, material) => this.addAsset(material, count));
+        resources.textures.forEach((count, texture) => this.addAsset(texture, count));
     }
     checkMeshResource(mesh) {
-        if (mesh.geometry) {
-            if (!mesh.geometry.userData["assetPointer"]) {
-                this.addAsset(mesh.geometry);
-            }
+        if (mesh.geometry && !mesh.geometry.userData["assetPointer"]) {
+            this.addAsset(mesh.geometry);
         }
         if (mesh.material) {
             const mats = Array.isArray(mesh.material) ? mesh.material : [mesh.material];
             mats.forEach((material) => {
-                if (material) {
-                    if (!material.userData["assetPointer"]) {
-                        this.addAsset(material);
-                    }
-                    Object.entries(material).forEach(([key, value]) => {
-                        if (value instanceof webgpu.Texture) {
-                            if (!(value.userData["assetPointer"])) {
-                                this.addAsset(value);
-                            }
-                        }
-                    });
+                if (!material)
+                    return;
+                if (!material.userData["assetPointer"]) {
+                    this.addAsset(material);
                 }
+                Object.values(material).forEach((value) => {
+                    if (value instanceof webgpu.Texture && !value.userData["assetPointer"]) {
+                        this.addAsset(value);
+                    }
+                });
             });
         }
     }
     async loadGltfFromPathAsync(path) {
         this.setupDracoLoader("/SceneResource/draco/");
-        let res = await this.gltfLoader.loadAsync(path);
-        return res;
+        return await this.gltfLoader.loadAsync(path);
     }
     loadGltfFromPath(path, onLoadFinished) {
+        this.setupDracoLoader("/SceneResource/draco/");
         this.gltfLoader.load(path, onLoadFinished);
     }
     loadGltfFromBuffer(data, path, onLoadFinished) {
@@ -1161,33 +1143,30 @@ class AssetManager {
     }
     loadFile(filepath = '', onLoadFinished) {
         const loader = new webgpu.FileLoader();
-        loader.load(filepath, (data) => {
-            onLoadFinished(data);
-        });
+        loader.load(filepath, onLoadFinished);
     }
     addAsset(asset, referenceCount = 0) {
         if (asset instanceof webgpu.BufferGeometry) {
             return this.addGeometryAsset(asset, referenceCount);
         }
-        else if (asset instanceof webgpu.Material) {
+        if (asset instanceof webgpu.Material) {
             return this.addMaterialAsset(asset, referenceCount);
         }
-        else if (asset instanceof webgpu.Texture) {
+        if (asset instanceof webgpu.Texture) {
             return this.addTextureAsset(asset, referenceCount);
         }
         return undefined;
     }
     addMaterialAsset(asset, referenceCount = 0) {
-        let pointer = (asset.userData["assetPointer"]);
+        let pointer = asset.userData["assetPointer"];
         if (!pointer) {
-            let textureMap = new Map();
-            for (let k in asset) {
-                const value = asset[k];
+            const textureMap = new Map();
+            Object.entries(asset).forEach(([key, value]) => {
                 if (value instanceof webgpu.Texture) {
-                    let ptr = this.addTextureAsset(value, 1);
-                    textureMap.set(k, ptr);
+                    const texturePointer = this.addTextureAsset(value, 1);
+                    textureMap.set(key, texturePointer);
                 }
-            }
+            });
             pointer = new MaterialAssetPointer(asset, textureMap, referenceCount);
             this.materialAssets.set(asset.uuid, pointer);
         }
@@ -1197,7 +1176,7 @@ class AssetManager {
         return pointer;
     }
     addTextureAsset(asset, referenceCount = 0) {
-        let pointer = (asset.userData["assetPointer"]);
+        let pointer = asset.userData["assetPointer"];
         if (!pointer) {
             pointer = new TextureAssetPointer(asset, referenceCount);
             this.textureAssets.set(asset.uuid, pointer);
@@ -1208,7 +1187,7 @@ class AssetManager {
         return pointer;
     }
     addGeometryAsset(asset, referenceCount = 0) {
-        let pointer = (asset.userData["assetPointer"]);
+        let pointer = asset.userData["assetPointer"];
         if (!pointer) {
             pointer = new GeometryAssetPointer(asset, referenceCount);
             this.geometryAssets.set(asset.uuid, pointer);
@@ -1219,34 +1198,21 @@ class AssetManager {
         return pointer;
     }
     releaseAsset(asset) {
-        // let uuid = asset.uuid
-        let p = asset.userData["assetPointer"];
-        if (p) {
-            p.release();
+        const pointer = asset.userData["assetPointer"];
+        if (pointer) {
+            pointer.release();
         }
         else {
             asset.dispose();
         }
     }
     clearAssets() {
-        this.geometryAssets.forEach((p) => {
-            p.forceRelease();
-        });
+        this.geometryAssets.forEach((pointer) => pointer.forceRelease());
         this.geometryAssets.clear();
-        this.materialAssets.forEach((p) => {
-            p.forceRelease();
-        });
+        this.materialAssets.forEach((pointer) => pointer.forceRelease());
         this.materialAssets.clear();
-        this.textureAssets.forEach((p) => {
-            p.forceRelease();
-        });
+        this.textureAssets.forEach((pointer) => pointer.forceRelease());
         this.textureAssets.clear();
-        // let pointers = Array.from(this.assetPointer.values());
-        // pointers.forEach((p) =>
-        // {
-        //     p.forceRelease();
-        // });
-        // this.assetPointer.clear();
     }
 }
 

package/dist/bundle.esm.js

@@ -928,16 +928,16 @@ class TAssetPointer extends TSmartPointer {
         value.userData["assetPointer"] = this;
     }
     release() {
-        if (this.value) {
-            this.referenceCount--;
-            if (this.referenceCount === 0) {
-                setTimeout(() => {
-                    this.value.dispose();
-                    this.value = null;
-                }, 0);
-            }
-        }
-        console.log("realease", this);
+        // if (this.value) {
+        //     this.referenceCount--;
+        //     if (this.referenceCount === 0) {
+        //         setTimeout(() => {
+        //             this.value!.dispose();
+        //             this.value = null;
+        //         }, 0);
+        //     }
+        // }
+        // console.log("realease", this)
     }
     forceRelease() {
         console.log("forceRelease", this);
@@ -1043,63 +1043,58 @@ class AssetManager {
         }
     }
     convertThreeObjectToLYObject(parentLYComponent, threejsObject) {
-        let location = threejsObject.position.clone();
-        let rotation = threejsObject.rotation.clone();
-        let scale = threejsObject.scale.clone();
+        const location = threejsObject.position.clone();
+        const rotation = threejsObject.rotation.clone();
+        const scale = threejsObject.scale.clone();
         let newComp = null;
-        let children = threejsObject.children;
+        const children = threejsObject.children;
         threejsObject.children = [];
         if (threejsObject.type === "Group" || threejsObject.type === "Object3D") {
-            newComp = new SceneComponent(this.app, threejsObject);
+            newComp = new SceneComponent(this.app, threejsObject.uuid);
         }
         else if (threejsObject.isMesh) {
-            let obj = threejsObject;
+            const obj = threejsObject;
             newComp = new MeshComponent(this.app, obj.geometry, obj.material);
-            // assetManager.#collectMatAndGeoInMesh(threejsObject)
             threejsObject.layers.set(0);
         }
         else {
-            newComp = new SceneComponent(this.app, threejsObject);
+            newComp = new SceneComponent(this.app, threejsObject.uuid);
         }
         if (newComp === null) {
             threejsObject.children = children;
-            //threejsObject.parent = parent
-            //console.log("Unprocess", threejsObject);
             return null;
         }
         parentLYComponent.addChildComponent(newComp);
         newComp.setPosition(location);
         newComp.setRotation(rotation);
         newComp.setScale(scale);
-        for (let i = 0; i < children.length; ++i) {
-            this.convertThreeObjectToLYObject(newComp, children[i]);
+        for (const child of children) {
+            this.convertThreeObjectToLYObject(newComp, child);
         }
         return newComp;
     }
     collectResourcesAndReferences(object) {
-        function countResource(map, resource) {
-            if (!map.has(resource)) {
-                map.set(resource, 1);
-            }
-            else {
-                map.set(resource, map.get(resource) + 1);
-            }
-        }
+        const countResource = (map, resource) => {
+            var _a;
+            const currentCount = (_a = map.get(resource)) !== null && _a !== void 0 ? _a : 0;
+            map.set(resource, currentCount + 1);
+        };
         const resources = {
             geometries: new Map(),
             materials: new Map(),
             textures: new Map()
         };
         object.traverse((child) => {
-            if (child.geometry && child.geometry instanceof BufferGeometry) {
-                countResource(resources.geometries, child.geometry);
+            const meshChild = child;
+            if (meshChild.geometry instanceof BufferGeometry) {
+                countResource(resources.geometries, meshChild.geometry);
             }
-            if (child.material) {
-                const mats = Array.isArray(child.material) ? child.material : [child.material];
+            if (meshChild.material) {
+                const mats = Array.isArray(meshChild.material) ? meshChild.material : [meshChild.material];
                 mats.forEach((mat) => {
                     if (mat) {
                         countResource(resources.materials, mat);
-                        Object.entries(mat).forEach(([key, value]) => {
+                        Object.values(mat).forEach((value) => {
                             if (value instanceof Texture) {
                                 countResource(resources.textures, value);
                             }
@@ -1108,49 +1103,36 @@ class AssetManager {
                 });
             }
         });
-        function createPointer(manager, map) {
-            map.forEach((value, key) => {
-                manager.addAsset(key, value);
-            });
-        }
-        createPointer(this, resources.geometries);
-        createPointer(this, resources.materials);
-        createPointer(this, resources.textures);
-        // console.log('Geometries:', Array.from(resources.geometries.entries()));
-        // console.log('Materials:', Array.from(resources.materials.entries()));
-        // console.log('Textures:', Array.from(resources.textures.entries()));
-        // console.log('assetPointer:', this.assetPointer);
+        resources.geometries.forEach((count, geometry) => this.addAsset(geometry, count));
+        resources.materials.forEach((count, material) => this.addAsset(material, count));
+        resources.textures.forEach((count, texture) => this.addAsset(texture, count));
     }
     checkMeshResource(mesh) {
-        if (mesh.geometry) {
-            if (!mesh.geometry.userData["assetPointer"]) {
-                this.addAsset(mesh.geometry);
-            }
+        if (mesh.geometry && !mesh.geometry.userData["assetPointer"]) {
+            this.addAsset(mesh.geometry);
         }
         if (mesh.material) {
             const mats = Array.isArray(mesh.material) ? mesh.material : [mesh.material];
             mats.forEach((material) => {
-                if (material) {
-                    if (!material.userData["assetPointer"]) {
-                        this.addAsset(material);
-                    }
-                    Object.entries(material).forEach(([key, value]) => {
-                        if (value instanceof Texture) {
-                            if (!(value.userData["assetPointer"])) {
-                                this.addAsset(value);
-                            }
-                        }
-                    });
+                if (!material)
+                    return;
+                if (!material.userData["assetPointer"]) {
+                    this.addAsset(material);
                 }
+                Object.values(material).forEach((value) => {
+                    if (value instanceof Texture && !value.userData["assetPointer"]) {
+                        this.addAsset(value);
+                    }
+                });
             });
         }
     }
     async loadGltfFromPathAsync(path) {
         this.setupDracoLoader("/SceneResource/draco/");
-        let res = await this.gltfLoader.loadAsync(path);
-        return res;
+        return await this.gltfLoader.loadAsync(path);
     }
     loadGltfFromPath(path, onLoadFinished) {
+        this.setupDracoLoader("/SceneResource/draco/");
         this.gltfLoader.load(path, onLoadFinished);
     }
     loadGltfFromBuffer(data, path, onLoadFinished) {
@@ -1159,33 +1141,30 @@ class AssetManager {
     }
     loadFile(filepath = '', onLoadFinished) {
         const loader = new FileLoader();
-        loader.load(filepath, (data) => {
-            onLoadFinished(data);
-        });
+        loader.load(filepath, onLoadFinished);
     }
     addAsset(asset, referenceCount = 0) {
         if (asset instanceof BufferGeometry) {
             return this.addGeometryAsset(asset, referenceCount);
         }
-        else if (asset instanceof Material) {
+        if (asset instanceof Material) {
             return this.addMaterialAsset(asset, referenceCount);
         }
-        else if (asset instanceof Texture) {
+        if (asset instanceof Texture) {
             return this.addTextureAsset(asset, referenceCount);
         }
         return undefined;
     }
     addMaterialAsset(asset, referenceCount = 0) {
-        let pointer = (asset.userData["assetPointer"]);
+        let pointer = asset.userData["assetPointer"];
         if (!pointer) {
-            let textureMap = new Map();
-            for (let k in asset) {
-                const value = asset[k];
+            const textureMap = new Map();
+            Object.entries(asset).forEach(([key, value]) => {
                 if (value instanceof Texture) {
-                    let ptr = this.addTextureAsset(value, 1);
-                    textureMap.set(k, ptr);
+                    const texturePointer = this.addTextureAsset(value, 1);
+                    textureMap.set(key, texturePointer);
                 }
-            }
+            });
             pointer = new MaterialAssetPointer(asset, textureMap, referenceCount);
             this.materialAssets.set(asset.uuid, pointer);
         }
@@ -1195,7 +1174,7 @@ class AssetManager {
         return pointer;
     }
     addTextureAsset(asset, referenceCount = 0) {
-        let pointer = (asset.userData["assetPointer"]);
+        let pointer = asset.userData["assetPointer"];
         if (!pointer) {
             pointer = new TextureAssetPointer(asset, referenceCount);
             this.textureAssets.set(asset.uuid, pointer);
@@ -1206,7 +1185,7 @@ class AssetManager {
         return pointer;
     }
     addGeometryAsset(asset, referenceCount = 0) {
-        let pointer = (asset.userData["assetPointer"]);
+        let pointer = asset.userData["assetPointer"];
         if (!pointer) {
             pointer = new GeometryAssetPointer(asset, referenceCount);
             this.geometryAssets.set(asset.uuid, pointer);
@@ -1217,34 +1196,21 @@ class AssetManager {
         return pointer;
     }
     releaseAsset(asset) {
-        // let uuid = asset.uuid
-        let p = asset.userData["assetPointer"];
-        if (p) {
-            p.release();
+        const pointer = asset.userData["assetPointer"];
+        if (pointer) {
+            pointer.release();
         }
         else {
             asset.dispose();
         }
     }
     clearAssets() {
-        this.geometryAssets.forEach((p) => {
-            p.forceRelease();
-        });
+        this.geometryAssets.forEach((pointer) => pointer.forceRelease());
         this.geometryAssets.clear();
-        this.materialAssets.forEach((p) => {
-            p.forceRelease();
-        });
+        this.materialAssets.forEach((pointer) => pointer.forceRelease());
         this.materialAssets.clear();
-        this.textureAssets.forEach((p) => {
-            p.forceRelease();
-        });
+        this.textureAssets.forEach((pointer) => pointer.forceRelease());
         this.textureAssets.clear();
-        // let pointers = Array.from(this.assetPointer.values());
-        // pointers.forEach((p) =>
-        // {
-        //     p.forceRelease();
-        // });
-        // this.assetPointer.clear();
     }
 }
 

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

@@ -19,13 +19,13 @@ export declare class AssetManager {
     get LoadingManager(): LoadingManager;
     init(): Promise<void>;
     setupDracoLoader(dracoPath: string): void;
-    convertThreeObjectToLYObject(parentLYComponent: SceneComponent, threejsObject: any): SceneComponent | null;
+    convertThreeObjectToLYObject(parentLYComponent: SceneComponent, threejsObject: Object3D): SceneComponent | null;
     collectResourcesAndReferences(object: Object3D): void;
     checkMeshResource(mesh: Mesh): void;
     loadGltfFromPathAsync(path: string): Promise<GLTF>;
     loadGltfFromPath(path: string, onLoadFinished: (gltf: GLTF) => void): void;
     loadGltfFromBuffer(data: ArrayBuffer | string, path: string, onLoadFinished: (gltf: GLTF) => void): void;
-    loadFile(filepath: string | undefined, onLoadFinished: (data: any) => void): void;
+    loadFile(filepath: string | undefined, onLoadFinished: (data: string | ArrayBuffer) => void): void;
     addAsset(asset: BufferGeometry | Material | Texture, referenceCount?: number): TAssetPointer<BufferGeometry | Material | Texture> | undefined;
     addMaterialAsset(asset: Material, referenceCount?: number): MaterialAssetPointer;
     addTextureAsset(asset: Texture, referenceCount?: number): TextureAssetPointer;

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

@@ -1,9 +1,9 @@
-import { Vector3, Quaternion, Euler, Matrix4 } from "three/webgpu";
-import { BaseObject } from "./BaseObject";
+import { Euler, Matrix4, Quaternion, Vector3 } from "three/webgpu";
 import { AttachmentRules } from "../Defines";
-import { SceneComponent } from "./Components/SceneComponent";
+import { BaseObject } from "./BaseObject";
 import { World } from "../Frame/World";
 import { ThreeJsApp } from "../ThreeJsApp";
+import { SceneComponent } from "./Components/SceneComponent";
 export declare class Actor extends BaseObject {
     get world(): World | null;
     get name(): string;

package/package.json

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