Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-14 14:59:43 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

pin cd

Browse Source
This commit is contained in:
ousttrue
2024-12-02 15:00:08 +09:00
parent 4c6f5ebb48
commit 7113e62166
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Assets/VRM10_Samples/ClothSample/ClothWarp/Runtime/Jobs/RectCollisionJob.cs
View File

@@ -76,24 +76,41 @@ namespace UniVRM10.ClothWarp.Jobs
var abc = TryCollide(collider, collider_matrix, _triangle0, out var l0);
var cda = TryCollide(collider, collider_matrix, _triangle1, out var l1);
if (abc && cda)
if (!Info[rect._c].TransformType.Movable())
{
a += l0.GetDelta(collider.radius);
b += l0.GetDelta(collider.radius);
c += l1.GetDelta(collider.radius);
d += l1.GetDelta(collider.radius);
// cloth の上端。cd が固定
if (abc)
{
a += l0.GetDelta(collider.radius);
b += l0.GetDelta(collider.radius);
}
else if (cda)
{
a += l1.GetDelta(collider.radius);
b += l1.GetDelta(collider.radius);
}
}
else if (abc)
else
{
a += l0.GetDelta(collider.radius);
b += l0.GetDelta(collider.radius);
c += l0.GetDelta(collider.radius);
}
else if (cda)
{
c += l1.GetDelta(collider.radius);
d += l1.GetDelta(collider.radius);
a += l1.GetDelta(collider.radius);
if (abc && cda)
{
a += l0.GetDelta(collider.radius);
b += l0.GetDelta(collider.radius);
c += l1.GetDelta(collider.radius);
d += l1.GetDelta(collider.radius);
}
else if (abc)
{
a += l0.GetDelta(collider.radius);
b += l0.GetDelta(collider.radius);
c += l0.GetDelta(collider.radius);
}
else if (cda)
{
c += l1.GetDelta(collider.radius);
d += l1.GetDelta(collider.radius);
a += l1.GetDelta(collider.radius);
}
}
}
}