upd

res/model/{Lumine.bpmx → HuTao/HuTao.pmx}

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:05ff01ac153eab51821615badde67e5040ac6b799fb8285e38a3331453bfb01f
-size 9000317
+oid sha256:e98189f1f36d1052a424d4ceb61eab28ef59e49fd8717db4ba2ad96081ce8a17
+size 1273366

res/model/Lumine/Lumine.pmx

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7775e1cc6a9cd6d7840f6567aedf91704ced1fb516c5835307ec4da81a309e3d
+size 2328588

res/model/Lumine/LumineModified.pmx

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6f26626d0d809f9d148c904f20bf67bf54409fa07cf2a0e308370edf75a94677
+size 2328634

res/model/Lumine/使用规则.txt

@@ -0,0 +1,15 @@
+
+�������죬�Ż������͸��壬����UV
+
+===================
+��������䲼
+
+��������18����Ʒ�������ڽ�������Ѫ�ȿֲ�������Ʒ������������
+
+����������ҵ��;
+
+����ʹ�ñ�ģ������ɵ�һ�в������������ģ�͸�������miHoYo�е�������ʹ����׷��ȫ������
+
+ģ�ͱ༭�������
+
+ģ�Ͱ�Ȩ����miHoYo

res/track/apdh/audio.m4a

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f1db0302eecb56b5e02b25a2061609666605b6576c786e17adf88023e775d089
+size 9849565

res/track/apdh/audio.wav

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5767ca7429ebec9b3112e687e8e935f444f179d2e02e6e2d822e09b2bb35ff46
+size 42083504

res/track/apdh/hime_motion_-8f.bvmd

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f23dfa2f61d185a3bc63d3215f9ae5e6dedfe82d77beb27eb832f0f7c90a93b9
+size 13985432

res/track/apdh/hime_motion_-8f.vmd

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e1092cebdcfe11895691c6beb66fd921c06da7b1db1f4ce7423304b83477f44e
+size 36890132

res/track/apdh/hime_motion_-8f_bake_hutao.bvmd

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0599f97d7d022e906916abf49b009530380c7f55f224e51419c09bf220d12742
+size 51501580

res/track/apdh/hime_motion_-8f_bake_hutao.vmd

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:59ce04cbccea20bd0239eda7d7526de300b6fcd04adee497938e96b2b932b832
+size 122124111

res/track/apdh/hina_motion_-8f.bvmd

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1bf5c8c1a75efd9cd7f857a64b8c1ba8a0ad89d2805c0e0e99cfd82d781aab6b
+size 14428332

res/track/apdh/hina_motion_-8f.vmd

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a591791806fb63cdb7f285331e4021f400b4fb1d2536d1e462141df5b0ef8a62
+size 39387112

script.js

@@ -51,13 +51,22 @@ const resourcePathSetsDefault = {
 };
 const resourcePathSets = {
   'track': {
+    'apdh': {
+      'mainMotion': './res/track/apdh/hime_motion_-8f.bvmd',
+      'audio': './res/track/apdh/audio.m4a',
+      'bakeMotion': {
+        // 'hutao': './res/track/apdh/hime_motion_-8f_bake_hutao.bvmd'
+      }
+    },
     'conqueror': {
       'mainMotion': './res/track/conqueror/merged.bvmd',
-      'audio': './res/track/conqueror/audio.m4a'
+      'audio': './res/track/conqueror/audio.m4a',
+      'bakeMotion': {}
     },
     'melancholy_night': {
       'mainMotion': './res/track/melancholy_night/motion.bvmd',
-      'audio': './res/track/melancholy_night/melancholy_night.m4a'
+      'audio': './res/track/melancholy_night/melancholy_night.m4a',
+      'bakeMotion': {}
     }
   },
   'mainModel': {
@@ -70,25 +79,32 @@ const resourcePathSets = {
     'higuchiKaedeOni': './res/model/higuchi_kaede_oni.bpmx',
     'higuchiKaedeArmy': './res/model/higuchi_kaede_army.bpmx',
     'higuchiKaedeArmyHair': './res/model/higuchi_kaede_army_alt.bpmx',
+    'hutao': './res/model/HuTao/HuTao.pmx',
     'inuiToko': './res/model/inui_toko.bpmx',
-    'lumine': './res/model/Lumine.bpmx',
+    'lumine': './res/model/Lumine/LumineModified.pmx',
     'miraiAkari': './res/model/MiraiAkari_v1.0.bpmx',
     'raidenShogun': './res/model/RaidenShogun.bpmx',
     'tokinoSora': './res/model/tokino_sora.bpmx',
     'yyb_miku_10th': './res/model/yyb_hatsune_miku_10th_v1.02.bpmx'
   }
 };
+let isEnablePhysicsEngine = true;
 const resourcePaths = {
   'mainModel': resourcePathSets.mainModel[resourcePathSetsDefault.mainModel],
   'mainMotion': resourcePathSets.track[resourcePathSetsDefault.track].mainMotion,
   'audio': resourcePathSets.track[resourcePathSetsDefault.track].audio,
 };
+const resourceNames = {
+  'track': resourcePathSetsDefault.track,
+  'mainModel': resourcePathSetsDefault.mainModel
+};
 const urlQueryObject = Object.fromEntries(new URLSearchParams(window.location.search));
 if (Object.keys(urlQueryObject).some(el => el === 'track')) {
   for (let i = 0; i < Object.keys(resourcePathSets.track).length; i++) {
     if (urlQueryObject.track === Object.keys(resourcePathSets.track)[i]) {
       resourcePaths.mainMotion = resourcePathSets.track[Object.keys(resourcePathSets.track)[i]].mainMotion;
       resourcePaths.audio = resourcePathSets.track[Object.keys(resourcePathSets.track)[i]].audio;
+      resourceNames.track = Object.keys(resourcePathSets.track)[i];
     }
   }
 }
@@ -96,9 +112,17 @@ if (Object.keys(urlQueryObject).some(el => el === 'mainModel')) {
   for (let i = 0; i < Object.keys(resourcePathSets.mainModel).length; i++) {
     if (urlQueryObject.mainModel === Object.keys(resourcePathSets.mainModel)[i]) {
       resourcePaths.mainModel = resourcePathSets.mainModel[Object.keys(resourcePathSets.mainModel)[i]];
+      resourceNames.mainModel = Object.keys(resourcePathSets.mainModel)[i];
     }
   }
 }
+for (let i = 0; i < Object.keys(resourcePathSets.track[resourceNames.track].bakeMotion).length; i++) {
+  if (Object.keys(resourcePathSets.track[resourceNames.track].bakeMotion)[i] === resourceNames.mainModel) {
+    resourcePaths.mainMotion = resourcePathSets.track[resourceNames.track].bakeMotion[resourceNames.mainModel];
+    isEnablePhysicsEngine = false;
+  }
+}
+console.log(resourcePaths)
 
 var canvas = document.getElementById("renderCanvas");
 var startRenderLoop = function (engine, canvas) {
@@ -170,10 +194,10 @@ class Playground {
     shadowGenerator.forceBackFacesOnly = true;
     shadowGenerator.filteringQuality = BABYLON.ShadowGenerator.QUALITY_MEDIUM;
     shadowGenerator.frustumEdgeFalloff = 0.1;
-    const mmdRuntime = new BABYLONMMD.MmdRuntime(scene, new BABYLONMMD.MmdPhysics(scene));
+    const mmdRuntime = isEnablePhysicsEngine ? new BABYLONMMD.MmdRuntime(scene, new BABYLONMMD.MmdPhysics(scene)) : new BABYLONMMD.MmdRuntime(scene)
     mmdRuntime.register(scene);
     const audioPlayer = new BABYLONMMD.StreamAudioPlayer(scene);
-    audioPlayer.preservesPitch = false;
+    audioPlayer.preservesPitch = true;
     audioPlayer.source = resourcePaths.audio;
     mmdRuntime.setAudioPlayer(audioPlayer);
     const mmdPlayerControl = new BABYLONMMD.MmdPlayerControl(scene, mmdRuntime, audioPlayer);
@@ -188,15 +212,17 @@ class Playground {
     const bvmdLoader = new BABYLONMMD.BvmdLoader(scene);
     promises.push(bvmdLoader.loadAsync("motion", resourcePaths.mainMotion, (event) => updateLoadingText(0, `Loading motion... ${event.loaded}/${event.total} (${Math.floor((event.loaded * 100) / event.total)}%)`)));
     promises.push(BABYLON.SceneLoader.ImportMeshAsync(undefined, resourcePaths.mainModel, undefined, scene, (event) => updateLoadingText(1, `Loading model... ${event.loaded}/${event.total} (${Math.floor((event.loaded * 100) / event.total)}%)`)));
-    promises.push(
-      (async () => {
-        updateLoadingText(2, "Loading physics engine...");
-        const havokPlugin = new BABYLON.HavokPlugin();
-        // scene.enablePhysics(new BABYLON.Vector3(0, -9.8, 0), havokPlugin);
-        scene.enablePhysics(new BABYLON.Vector3(0, -9.8, 0), havokPlugin);
-        updateLoadingText(2, "Loading physics engine... Done");
-      })()
-    );
+    if (isEnablePhysicsEngine === true) {
+      promises.push(
+        (async () => {
+          updateLoadingText(2, "Loading physics engine...");
+          const havokPlugin = new BABYLON.HavokPlugin();
+          // scene.enablePhysics(new BABYLON.Vector3(0, -9.8, 0), havokPlugin);
+          scene.enablePhysics(new BABYLON.Vector3(0, -9.8, 0), havokPlugin);
+          updateLoadingText(2, "Loading physics engine... Done");
+        })()
+      );
+    }
     loadingTexts = new Array(promises.length).fill("");
     const loadResults = await Promise.all(promises);
     scene.onAfterRenderObservable.addOnce(() => engine.hideLoadingUI());