sa2kit 1.0.4 → 1.0.5

package/dist/mmd/index.js

@@ -516,7 +516,7 @@ var MMDPlayerEnhanced = ({
     };
   }, [stage]);
   const clearOldResources = () => {
-    console.log("\u{1F9F9} [MMDPlayerEnhanced] \u5F00\u59CB\u6E05\u9664\u65E7\u8D44\u6E90");
+    console.log("\u{1F9F9} [MMDPlayerEnhanced] \u5F00\u59CB\u6E05\u9664\u65E7\u8D44\u6E90\uFF08\u589E\u5F3A\u6E05\u7406\uFF09");
     if (!sceneRef.current) return;
     if (isPlayingRef.current) {
       isPlayingRef.current = false;
@@ -525,11 +525,31 @@ var MMDPlayerEnhanced = ({
     if (audioRef.current) {
       audioRef.current.pause();
       audioRef.current.currentTime = 0;
+      audioRef.current.onended = null;
       audioRef.current = null;
     }
     if (helperRef.current) {
+      try {
+        const helperObjects = helperRef.current.objects;
+        if (helperObjects && Array.isArray(helperObjects)) {
+          console.log(`\u{1F9F9} \u6E05\u9664 helper \u4E2D\u7684 ${helperObjects.length} \u4E2A\u5BF9\u8C61`);
+          helperObjects.length = 0;
+        }
+      } catch (error2) {
+        console.warn("\u26A0\uFE0F \u65E0\u6CD5\u8BBF\u95EE helper.objects\uFF0C\u521B\u5EFA\u65B0\u7684 helper:", error2);
+      }
       helperRef.current = null;
     }
+    if (sceneRef.current.background && sceneRef.current.background.isTexture) {
+      console.log("\u{1F9F9} \u6E05\u9664\u573A\u666F\u80CC\u666F\u8D34\u56FE");
+      sceneRef.current.background.dispose();
+      sceneRef.current.background = null;
+    }
+    if (sceneRef.current.environment && sceneRef.current.environment.isTexture) {
+      console.log("\u{1F9F9} \u6E05\u9664\u573A\u666F\u73AF\u5883\u8D34\u56FE");
+      sceneRef.current.environment.dispose();
+      sceneRef.current.environment = null;
+    }
     const objectsToRemove = [];
     sceneRef.current.traverse((child) => {
       if (child.type === "SkinnedMesh" || child.isSkinnedMesh) {
@@ -547,16 +567,34 @@ var MMDPlayerEnhanced = ({
         obj.geometry.dispose();
       }
       if (obj.material) {
-        if (Array.isArray(obj.material)) {
-          obj.material.forEach((mat) => mat.dispose());
+        const material = obj.material;
+        const disposeMaterial = (m) => {
+          if (m.map) m.map.dispose();
+          if (m.emissiveMap) m.emissiveMap.dispose();
+          if (m.normalMap) m.normalMap.dispose();
+          if (m.bumpMap) m.bumpMap.dispose();
+          if (m.specularMap) m.specularMap.dispose();
+          if (m.envMap) m.envMap.dispose();
+          if (m.lightMap) m.lightMap.dispose();
+          if (m.aoMap) m.aoMap.dispose();
+          if (m.alphaMap) m.alphaMap.dispose();
+          m.dispose();
+        };
+        if (Array.isArray(material)) {
+          material.forEach(disposeMaterial);
         } else {
-          obj.material.dispose();
+          disposeMaterial(material);
         }
       }
+      if (obj.skeleton) {
+        console.log("\u{1F9F9} \u6E05\u7406\u9AA8\u9ABC\u6570\u636E");
+        obj.skeleton = null;
+      }
     });
     clockRef.current = new THREE2__namespace.Clock();
     vmdDataRef.current = null;
-    console.log(`\u2705 [MMDPlayerEnhanced] \u5DF2\u6E05\u9664 ${objectsToRemove.length} \u4E2A\u65E7\u5BF9\u8C61`);
+    setNeedReset(false);
+    console.log(`\u2705 [MMDPlayerEnhanced] \u5DF2\u6E05\u9664 ${objectsToRemove.length} \u4E2A\u5BF9\u8C61\uFF08\u589E\u5F3A\u6E05\u7406\u5B8C\u6210\uFF09`);
   };
   React2.useEffect(() => {
     console.log("\u{1F4E6} [MMDPlayerEnhanced] \u8D44\u6E90\u52A0\u8F7D useEffect \u89E6\u53D1");
@@ -617,22 +655,30 @@ var MMDPlayerEnhanced = ({
         const helper = new threeStdlib.MMDAnimationHelper();
         helperRef.current = helper;
         setLoadingProgress(20);
+        const modelStartTime = performance.now();
         console.log("\u{1F3AD} \u5F00\u59CB\u52A0\u8F7D\u6A21\u578B:", currentResources.modelPath);
+        console.log("\u{1F4CA} [\u6027\u80FD] \u6A21\u578B\u52A0\u8F7D\u5F00\u59CB\u65F6\u95F4:", (/* @__PURE__ */ new Date()).toISOString());
         const mesh = await new Promise((resolve, reject) => {
           loader.load(
             currentResources.modelPath,
             (object) => {
-              console.log("\u2705 \u6A21\u578B\u52A0\u8F7D\u6210\u529F");
+              const modelEndTime = performance.now();
+              const modelLoadTime = ((modelEndTime - modelStartTime) / 1e3).toFixed(2);
+              console.log(`\u2705 \u6A21\u578B\u52A0\u8F7D\u6210\u529F (\u8017\u65F6: ${modelLoadTime}\u79D2)`);
+              console.log(`\u{1F4CA} [\u6027\u80FD] \u6A21\u578B\u5927\u5C0F: ${object.geometry ? (object.geometry.attributes.position.count * 3 * 4 / 1024 / 1024).toFixed(2) : "N/A"} MB`);
               resolve(object);
             },
             (progress) => {
               if (progress.total > 0) {
                 const percent = progress.loaded / progress.total * 30 + 20;
                 setLoadingProgress(Math.min(percent, 50));
+                console.log(`\u{1F4E5} \u6A21\u578B\u52A0\u8F7D\u8FDB\u5EA6: ${(progress.loaded / progress.total * 100).toFixed(1)}% (${(progress.loaded / 1024 / 1024).toFixed(2)}MB / ${(progress.total / 1024 / 1024).toFixed(2)}MB)`);
               }
             },
             (error2) => {
-              console.error("\u274C \u6A21\u578B\u52A0\u8F7D\u5931\u8D25:", error2);
+              const modelEndTime = performance.now();
+              const modelLoadTime = ((modelEndTime - modelStartTime) / 1e3).toFixed(2);
+              console.error(`\u274C \u6A21\u578B\u52A0\u8F7D\u5931\u8D25 (\u8017\u65F6: ${modelLoadTime}\u79D2):`, error2);
               reject(error2);
             }
           );
@@ -660,14 +706,25 @@ var MMDPlayerEnhanced = ({
           sceneRef.current.add(stageMesh);
         }
         if (currentResources.backgroundPath && sceneRef.current) {
+          const bgStartTime = performance.now();
           console.log("\u{1F5BC}\uFE0F \u5F00\u59CB\u52A0\u8F7D\u80CC\u666F\u56FE\u7247:", currentResources.backgroundPath);
           const textureLoader = new THREE2__namespace.TextureLoader();
           const backgroundTexture = await new Promise((resolve, reject) => {
             textureLoader.load(
               currentResources.backgroundPath,
-              (texture) => resolve(texture),
+              (texture) => {
+                const bgEndTime = performance.now();
+                const bgLoadTime = ((bgEndTime - bgStartTime) / 1e3).toFixed(2);
+                console.log(`\u2705 \u80CC\u666F\u56FE\u7247\u52A0\u8F7D\u6210\u529F (\u8017\u65F6: ${bgLoadTime}\u79D2, \u5C3A\u5BF8: ${texture.image.width}x${texture.image.height})`);
+                resolve(texture);
+              },
               void 0,
-              (err) => reject(err)
+              (err) => {
+                const bgEndTime = performance.now();
+                const bgLoadTime = ((bgEndTime - bgStartTime) / 1e3).toFixed(2);
+                console.error(`\u274C \u80CC\u666F\u56FE\u7247\u52A0\u8F7D\u5931\u8D25 (\u8017\u65F6: ${bgLoadTime}\u79D2):`, err);
+                reject(err);
+              }
             );
           });
           backgroundTexture.colorSpace = THREE2__namespace.SRGBColorSpace;
@@ -680,29 +737,34 @@ var MMDPlayerEnhanced = ({
           } else {
             sceneRef.current.background = backgroundTexture;
           }
-          console.log("\u2705 \u80CC\u666F\u56FE\u7247\u52A0\u8F7D\u6210\u529F");
         }
         let vmd = null;
         let cameraVmd = null;
         if (currentResources.motionPath) {
           setLoadingProgress(60);
+          const motionStartTime = performance.now();
           console.log("\u{1F483} \u5F00\u59CB\u52A0\u8F7D\u52A8\u4F5C:", currentResources.motionPath);
           vmd = await new Promise((resolve, reject) => {
             loader.loadAnimation(
               currentResources.motionPath,
               mesh,
               (vmdObject) => {
-                console.log("\u2705 \u52A8\u4F5C\u52A0\u8F7D\u6210\u529F");
+                const motionEndTime = performance.now();
+                const motionLoadTime = ((motionEndTime - motionStartTime) / 1e3).toFixed(2);
+                console.log(`\u2705 \u52A8\u4F5C\u52A0\u8F7D\u6210\u529F (\u8017\u65F6: ${motionLoadTime}\u79D2)`);
                 resolve(vmdObject);
               },
               (progress) => {
                 if (progress.total > 0) {
                   const percent = progress.loaded / progress.total * 20 + 60;
                   setLoadingProgress(Math.min(percent, 80));
+                  console.log(`\u{1F4E5} \u52A8\u4F5C\u52A0\u8F7D\u8FDB\u5EA6: ${(progress.loaded / progress.total * 100).toFixed(1)}%`);
                 }
               },
               (error2) => {
-                console.error("\u274C \u52A8\u4F5C\u52A0\u8F7D\u5931\u8D25:", error2);
+                const motionEndTime = performance.now();
+                const motionLoadTime = ((motionEndTime - motionStartTime) / 1e3).toFixed(2);
+                console.error(`\u274C \u52A8\u4F5C\u52A0\u8F7D\u5931\u8D25 (\u8017\u65F6: ${motionLoadTime}\u79D2):`, error2);
                 reject(error2);
               }
             );
@@ -753,12 +815,18 @@ var MMDPlayerEnhanced = ({
         }
         if (currentResources.audioPath) {
           setLoadingProgress(90);
+          const audioStartTime = performance.now();
           console.log("\u{1F3B5} \u5F00\u59CB\u52A0\u8F7D\u97F3\u9891:", currentResources.audioPath);
           const audio = new Audio(currentResources.audioPath);
           audio.volume = 0.5;
           audio.loop = loop;
           audioRef.current = audio;
           hasAudioRef.current = true;
+          audio.onloadedmetadata = () => {
+            const audioEndTime = performance.now();
+            const audioLoadTime = ((audioEndTime - audioStartTime) / 1e3).toFixed(2);
+            console.log(`\u2705 \u97F3\u9891\u52A0\u8F7D\u6210\u529F (\u8017\u65F6: ${audioLoadTime}\u79D2, \u65F6\u957F: ${audio.duration.toFixed(2)}\u79D2)`);
+          };
           audio.onended = () => {
             if (!loop) {
               setIsPlaying(false);
@@ -773,7 +841,6 @@ var MMDPlayerEnhanced = ({
             }
             onAudioEnded?.();
           };
-          console.log("\u2705 \u97F3\u9891\u52A0\u8F7D\u6210\u529F");
         }
         setLoadingProgress(100);
         setLoading(false);
@@ -802,32 +869,54 @@ var MMDPlayerEnhanced = ({
   }, [currentResources, stage?.enablePhysics, autoPlay, loop, onLoad, onError, reloadTrigger]);
   const play = () => {
     console.log("\u{1F3AC} [play] \u51FD\u6570\u88AB\u8C03\u7528\uFF0CneedReset =", needReset);
-    if (!helperRef.current) return;
+    if (!helperRef.current && !needReset) return;
     if (needReset && vmdDataRef.current && sceneRef.current && cameraRef.current) {
       console.log("\u{1F504} \u68C0\u6D4B\u5230\u9700\u8981\u91CD\u7F6E\uFF0C\u91CD\u65B0\u521D\u59CB\u5316 helper\uFF08\u4FDD\u7559\u6A21\u578B\uFF09");
       const { mesh, vmd, cameraVmd } = vmdDataRef.current;
+      if (helperRef.current) {
+        try {
+          const helperObjects = helperRef.current.objects;
+          if (helperObjects && Array.isArray(helperObjects)) {
+            helperObjects.length = 0;
+            console.log("\u{1F9F9} \u6E05\u7A7A\u4E86\u65E7 helper \u7684 objects \u6570\u7EC4");
+          }
+        } catch (error2) {
+          console.warn("\u26A0\uFE0F \u65E0\u6CD5\u6E05\u7A7A\u65E7 helper.objects:", error2);
+        }
+      }
       const newHelper = new threeStdlib.MMDAnimationHelper();
       helperRef.current = newHelper;
       clockRef.current = new THREE2__namespace.Clock();
       if (vmd && typeof vmd === "object") {
-        console.log("\u{1F4E6} \u91CD\u65B0\u6DFB\u52A0\u6A21\u578B\u52A8\u753B\uFF0Cvmd:", vmd);
+        console.log("\u{1F4E6} \u91CD\u65B0\u6DFB\u52A0\u6A21\u578B\u52A8\u753B");
         try {
           newHelper.add(mesh, {
             animation: vmd,
             physics: stage?.enablePhysics !== false
           });
+          console.log("\u2705 \u6A21\u578B\u52A8\u753B\u6DFB\u52A0\u6210\u529F");
         } catch (error2) {
           console.error("\u274C \u91CD\u65B0\u6DFB\u52A0\u6A21\u578B\u52A8\u753B\u5931\u8D25:", error2);
-          console.log("\u{1F4CB} vmd \u6570\u636E:", vmd);
-          newHelper.add(mesh, { physics: stage?.enablePhysics !== false });
+          try {
+            newHelper.add(mesh, { physics: stage?.enablePhysics !== false });
+            console.log("\u2705 \u4EC5\u6DFB\u52A0\u6A21\u578B\u548C\u7269\u7406\uFF08\u65E0\u52A8\u753B\uFF09");
+          } catch (innerError) {
+            console.error("\u274C \u6DFB\u52A0\u6A21\u578B\u4E5F\u5931\u8D25\u4E86:", innerError);
+          }
         }
       } else {
-        newHelper.add(mesh, { physics: stage?.enablePhysics !== false });
+        try {
+          newHelper.add(mesh, { physics: stage?.enablePhysics !== false });
+          console.log("\u2705 \u4EC5\u6DFB\u52A0\u6A21\u578B\u548C\u7269\u7406\uFF08\u65E0\u52A8\u753B\u6570\u636E\uFF09");
+        } catch (error2) {
+          console.error("\u274C \u6DFB\u52A0\u6A21\u578B\u5931\u8D25:", error2);
+        }
       }
       if (cameraVmd && typeof cameraVmd === "object") {
         console.log("\u{1F4F7} \u91CD\u65B0\u6DFB\u52A0\u76F8\u673A\u52A8\u753B");
         try {
           newHelper.add(cameraRef.current, { animation: cameraVmd });
+          console.log("\u2705 \u76F8\u673A\u52A8\u753B\u6DFB\u52A0\u6210\u529F");
         } catch (error2) {
           console.error("\u274C \u91CD\u65B0\u6DFB\u52A0\u76F8\u673A\u52A8\u753B\u5931\u8D25:", error2);
         }
@@ -838,6 +927,10 @@ var MMDPlayerEnhanced = ({
       setNeedReset(false);
       console.log("\u2705 Helper \u91CD\u65B0\u521D\u59CB\u5316\u5B8C\u6210\uFF0C\u51C6\u5907\u4ECE\u7B2C\u4E00\u5E27\u64AD\u653E");
     }
+    if (!helperRef.current) {
+      console.error("\u274C [play] helper \u4E0D\u5B58\u5728\uFF0C\u65E0\u6CD5\u64AD\u653E");
+      return;
+    }
     if (audioRef.current) {
       audioRef.current.play();
     }