diff options
| author | Nguyễn Gia Phong <cnx@loang.net> | 2023-11-18 21:40:15 +0900 |
|---|---|---|
| committer | Nguyễn Gia Phong <cnx@loang.net> | 2023-11-18 21:40:15 +0900 |
| commit | ae0810b2d4cdd31cd05f5746c6411da9d458eead (patch) | |
| tree | a827fbe10c12a4a4665b98144f32e767ba5a3553 /src/Skeleton.cpp | |
| parent | 371906f5fb958691a8bfce85c28eb4dfaf63559c (diff) | |
| download | blackshades-ae0810b2d4cdd31cd05f5746c6411da9d458eead.tar.gz | |
Convert model geometry to Zig
Diffstat (limited to 'src/Skeleton.cpp')
| -rw-r--r-- | src/Skeleton.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/Skeleton.cpp b/src/Skeleton.cpp index b01e27d..b29ec53 100644 --- a/src/Skeleton.cpp +++ b/src/Skeleton.cpp @@ -83,13 +83,12 @@ void Skeleton::DoConstraints(Model *collide, XYZ *move, float rotation) overpoint.y += 10; XYZ underpoint = pos; XYZ impact; - int whichtri = collide->LineCheck2(overpoint, underpoint, - &impact, *move, rotation); + int whichtri = segCrossModelTrans(overpoint, underpoint, + collide, *move, rotation, &impact); if (whichtri == -1 || collide->normals[whichtri].y <= 0.8) - whichtri = collide->LineCheck2( - joints[i].realoldposition, pos, - &impact, *move, rotation); + whichtri = segCrossModelTrans(joints[i].realoldposition, pos, + collide, *move, rotation, &impact); if (pos.y <= 0 || whichtri != -1) { if (whichtri == -1 |
