This commit is contained in:
SoulliesOfficial
2025-12-17 04:19:38 -05:00
parent 7c1cb7e8e1
commit d15957c719
4315 changed files with 8260710 additions and 2940 deletions

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/CheckSliderSerializeData.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CheckSliderSerializeData.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothBehaviour.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothBehaviour.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothForceMode.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothForceMode.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothInitSerializeData.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothInitSerializeData.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothMeshWriteMode.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothMeshWriteMode.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothNormalAxis.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothNormalAxis.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothParameters.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothParameters.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothProcess.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcess.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothProcessData.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessData.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothProcessGeneration.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothProcessGeneration.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData2.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeData2.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeDataFunction.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothSerializeDataFunction.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/ClothUpdateMode.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/ClothUpdateMode.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderComponent.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderComponent.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderSymmetryMode.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/ColliderSymmetryMode.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaCapsuleCollider.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaCapsuleCollider.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaPlaneCollider.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaPlaneCollider.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaSphereCollider.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Collider/MagicaSphereCollider.cs
uploadId: 829902

View File

@@ -548,8 +548,8 @@ namespace MagicaCloth2
float3 cadd = cfpos - cpos;
// 摩擦考慮
padd *= cInvMass;
cadd *= pInvMass;
cadd *= cInvMass;
padd *= pInvMass;
// 子の書き込み
if (cattr.IsMove())

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Constraints/AngleConstraint.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/AngleConstraint.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Constraints/ColliderCollisionConstraint.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/ColliderCollisionConstraint.cs
uploadId: 829902

View File

@@ -304,11 +304,10 @@ namespace MagicaCloth2
ushort data = k == 0 ? dataArryaV[dstart + j] : dataArryaH[dstart + j];
var tpos = proxyMesh.localPositions[data];
float dist = math.distance(pos, tpos);
if (dist < 1e-06f)
continue;
// ゼロ距離も認める(v2.17.0)
dataList.Add(data);
distanceList.Add(k == 0 ? dist : -dist); // マイナスはhorizontalタイプ
distanceList.Add(dist < 1e-08f ? 0.0f : (k == 0 ? dist : -dist)); // マイナスはhorizontalタイプ
cnt++;
}
}
@@ -406,7 +405,7 @@ namespace MagicaCloth2
int d_start = dc.startIndex;
// 復元を基本姿勢で行うかアニメーション後の姿勢で行うかの判定
float blendRatio = tdata.animationPoseRatio;
float animeRatio = tdata.animationPoseRatio;
// スケール倍率
float scl = tdata.InitScale * tdata.scaleRatio;
@@ -479,33 +478,44 @@ namespace MagicaCloth2
float t_friction = frictionArray[tpindex];
var t_attr = attributes[tvindex];
// 重量
// BoneSpringでは固定点の重量加算を行わない
float t_invMass = MathUtility.CalcInverseMass(t_friction, t_depth, t_attr.IsDontMove(), fixMass);
// 復元する長さ
// !Distance制約は初期化時に保存した距離を見るようにしないと駄目
// フラグにより初期値かアニメーション後の姿勢かを切り替える
float restLength = math.lerp(math.abs(restDist) * scl, math.distance(basePos, t_basePos), blendRatio);
var v = t_nextPos - nextPos;
// 現在の長さ
float distance = math.length(v);
// ゼロ距離対応(v2.17.0)
if(restDist == 0.0f)
{
// ゼロ距離は単に中点で結合させる
// AnimationPoseRatioも無関係
addPos = v * 0.5f;
addCnt++;
}
else
{
// 重量
// BoneSpringでは固定点の重量加算を行わない
float t_invMass = MathUtility.CalcInverseMass(t_friction, t_depth, t_attr.IsDontMove(), fixMass);
// 距離がほぼ0ならば処理をスキップする(エラーの回避)
if (distance < Define.System.Epsilon)
continue;
// 復元する長さ
// !Distance制約は初期化時に保存した距離を見るようにしないと駄目
// フラグにより初期値かアニメーション後の姿勢かを切り替える
float restLength = math.lerp(math.abs(restDist) * scl, math.distance(basePos, t_basePos), animeRatio);
// 伸縮
float3 n = math.normalize(v);
float3 corr = (distance - restLength) * finalStiffness * n / (invMass + t_invMass);
float3 corr0 = invMass * corr;
//float3 corr1 = -t_invMass * corr; // 相手側(使用しない)
// 現在の長さ
float distance = math.length(v);
// すべて加算する
addPos += corr0;
addCnt++;
// 距離がほぼ0ならば処理をスキップする(エラーの回避)
if (distance < Define.System.Epsilon)
continue;
// 伸縮
float3 n = math.normalize(v);
float3 corr = (distance - restLength) * finalStiffness * n / (invMass + t_invMass);
float3 corr0 = invMass * corr;
//float3 corr1 = -t_invMass * corr; // 相手側(使用しない)
// すべて加算する
addPos += corr0;
addCnt++;
}
}
// 最終位置

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Constraints/DistanceConstraint.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/DistanceConstraint.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Constraints/InertiaConstraint.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/InertiaConstraint.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Constraints/MotionConstraint.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/MotionConstraint.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Constraints/SelfCollisionConstraint.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/SelfCollisionConstraint.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Constraints/SpringConstraint.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/SpringConstraint.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Constraints/TetherConstraint.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/TetherConstraint.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Constraints/TriangleBendingConstraint.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Constraints/TriangleBendingConstraint.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/CullingSettings.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CullingSettings.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/CurveSerializeData.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CurveSerializeData.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/CustomSkinningSettings.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/CustomSkinningSettings.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/GizmoSerializeData.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/GizmoSerializeData.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/MagicaCloth.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaCloth.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAPI.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAPI.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAnimationProperty.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/MagicaClothAnimationProperty.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/NormalAlignmentSettings.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/NormalAlignmentSettings.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/SelectionData.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/SelectionData.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Wind/MagicaWindZone.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/MagicaWindZone.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Wind/WindParams.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/WindParams.cs
uploadId: 829902

View File

@@ -13,6 +13,6 @@ AssetOrigin:
serializedVersion: 1
productId: 242307
packageName: Magica Cloth 2
packageVersion: 2.16.4
assetPath: Assets/MagicaCloth2/Scripts/Core/Cloth/Wind/WindSettings.cs
uploadId: 800766
packageVersion: 2.17.0
assetPath: Assets/OtherPlugins/MagicaCloth2/Scripts/Core/Cloth/Wind/WindSettings.cs
uploadId: 829902