Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed #7239

Browse Source
This commit is contained in:
Anuken
2022-07-28 09:26:28 -04:00
parent fa3bd6dbc6
commit 5fb7c2a916
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/entities/comp/LegsComp.java
View File

@@ -202,12 +202,10 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
//leg destination //leg destination
Vec2 legDest = Tmp.v1.trns(dstRot, legLength * type.legLengthScl).add(baseOffset).add(moveOffset); Vec2 legDest = Tmp.v1.trns(dstRot, legLength * type.legLengthScl).add(baseOffset).add(moveOffset);
//join destination //join destination
Vec2 jointDest = Tmp.v2;//.trns(rot2, legLength / 2f + type.legBaseOffset).add(moveOffset); Vec2 jointDest = Tmp.v2;
InverseKinematics.solve(legLength/2f, legLength/2f, Tmp.v6.set(l.base).sub(baseOffset), side, jointDest); InverseKinematics.solve(legLength/2f, legLength/2f, Tmp.v6.set(l.base).sub(baseOffset), side, jointDest);
jointDest.add(baseOffset); jointDest.add(baseOffset);
Tmp.v6.set(baseOffset).lerp(l.base, 0.5f); Tmp.v6.set(baseOffset).lerp(l.base, 0.5f);
//lerp between kinematic and linear?
//jointDest.lerp(Tmp.v6.set(baseOffset).lerp(l.base, 0.5f), 1f - type.kinematicScl);
if(move){ if(move){
float moveFract = stageF % 1f; float moveFract = stageF % 1f;
@@ -224,7 +222,7 @@ abstract class LegsComp implements Posc, Rotc, Hitboxc, Flyingc, Unitc{
} }
//when at least 1 leg is touching land, it can't drown //when at least 1 leg is touching land, it can't drown
if(deeps != legs.length){ if(deeps != legs.length || !floorOn().isDeep()){
lastDeepFloor = null; lastDeepFloor = null;
} }
} }