Skip to content

Commit d2c9560

Browse files
committed
Update for v0.26.0
1 parent b186d6a commit d2c9560

File tree

4 files changed

+327
-80
lines changed

4 files changed

+327
-80
lines changed

MMD.js/MMD_SA.js

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// MMD for System Animator
2-
// (2024-06-19)
2+
// (2024-07-14)
33

44
var use_full_spectrum = true
55

@@ -8974,9 +8974,9 @@ Model_obj.call(this, index, vrm, para);
89748974
this.mesh = vrm.scene;
89758975

89768976
this._joints_settings = [];
8977-
vrm.springBoneManager.joints.forEach( e => {
8977+
for ( const e of vrm.springBoneManager.joints ) {
89788978
this._joints_settings.push(Object.assign({}, e.settings));
8979-
});
8979+
}
89808980

89818981
if (!MMD_SA.MMD_started)
89828982
vrm_list.push(this)
@@ -9033,12 +9033,12 @@ const restrict_physics = MMD_SA.motion[_THREE.MMD.getModels()[this.index].skin._
90339033
const settings_default = this._joints_settings;
90349034
// Set has no index
90359035
let i = 0;
9036-
this.model.springBoneManager.joints.forEach( e => {
9037-
// e.settings.dragForce = 1
9038-
e.settings.stiffness = settings_default[i].stiffness * ((restrict_physics) ? 10 : 1) * vrm_scale;
9036+
for ( const e of this.model.springBoneManager.joints ) {
9037+
//e.settings.dragForce = 1;//settings_default[i].dragForce;
9038+
e.settings.stiffness = settings_default[i].stiffness * ((restrict_physics) ? 10 : 1) * VRM.joint_stiffness_percent/100 * vrm_scale;//this.mesh.scale.x;
90399039
e.settings.gravityPower = settings_default[i].gravityPower;
90409040
i++;
9041-
});
9041+
};
90429042

90439043
this.model.springBoneManager.reset();
90449044
//this.model.springBoneManager.setInitState();
@@ -9085,7 +9085,7 @@ if (vrm.springBoneManager) {
90859085
for ( const joint of vrm.springBoneManager.joints ) {
90869086
let j = model_para._joints[i];
90879087
if (!j)
9088-
j = model_para._joints[i] = { settings:{ stiffness:joint.settings.stiffness, hitRadius:joint.settings.hitRadius } };
9088+
j = model_para._joints[i] = { settings:this._joints_settings[i] };
90899089
i++;
90909090

90919091
joint.settings.stiffness = j.settings.stiffness * scale;
@@ -9877,12 +9877,17 @@ if (!mesh.matrixAutoUpdate) {
98779877
const finger_list_en = ["Thumb", "Index", "Middle", "Ring", "Little"];
98789878
const nj_list = ["0","1","2","3"];
98799879

9880+
let joint_stiffness_percent;
9881+
98809882
return {
98819883
get list() { return vrm_list; },
98829884
set list(v) { vrm_list = v; },
98839885

98849886
get vrm_scale() { return vrm_scale; },
98859887

9888+
get joint_stiffness_percent () { return (joint_stiffness_percent == null) ? 100 : joint_stiffness_percent; },
9889+
set joint_stiffness_percent (v) { joint_stiffness_percent = v; },
9890+
98869891
get bone_map_MMD_to_VRM() { return bone_map_MMD_to_VRM; },
98879892
get bone_map_VRM_to_MMD() { return bone_map_VRM_to_MMD; },
98889893

@@ -15553,7 +15558,10 @@ case "口角下げ":
1555315558
case "上":
1555415559
case "下":
1555515560
morph_alt.push(m, 'まゆ'+m, '眉'+((m=='上')?'↑':'↓'));
15556-
break
15561+
break;
15562+
case "照れ":
15563+
morph_alt.push(m, '赤面');
15564+
break;
1555715565
default:
1555815566
morph_alt.push(m);
1555915567
}

0 commit comments

Comments
 (0)