Skip to content
Permalink
Browse files

Merge pull request #502 from sanguinariojoe/develop

Fixed invalid collideeMD usage when modInfo.allowSepAxisCollisionTest = true
  • Loading branch information
gajop committed Mar 23, 2020
2 parents cb54625 + 7c63c73 commit 65dbb8270b9768fecba3bbe867dbb3e0b99d81d8
Showing with 1 addition and 1 deletion.
  1. +1 −1 rts/Sim/MoveTypes/GroundMoveType.cpp
@@ -2038,7 +2038,7 @@ void CGroundMoveType::HandleUnitCollisions(
const float2 collideeParams = {collidee->speed.w, collideeMobile? collideeMD->CalcFootPrintMaxInteriorRadius(): collidee->CalcFootPrintMaxInteriorRadius()};
const float4 separationVect = {collider->pos - collidee->pos, Square(colliderParams.y + collideeParams.y)};

if (!checkCollisionFuncs[allowSAT && (forceSAT || (collideeMD->CalcFootPrintAxisStretchFactor() > 0.1f))](separationVect, collider, collidee, colliderMD, collideeMD))
if (!checkCollisionFuncs[allowSAT && (forceSAT || (collideeMobile && collideeMD->CalcFootPrintAxisStretchFactor() > 0.1f))](separationVect, collider, collidee, colliderMD, collideeMD))
continue;


0 comments on commit 65dbb82

Please sign in to comment.
You can’t perform that action at this time.