Skip to content

Commit 768cbd1

Browse files
committed
[GEN] Backport normal direction fix in CollisionMath::Collide for AABox-AABox collision from Zero Hour (#772)
1 parent 90a9078 commit 768cbd1

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Generals/Code/Libraries/Source/WWVegas/WWMath/colmathaabox.cpp

+5-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
* *
2727
* Author:: Greg Hjelstrom *
2828
* *
29-
* $Modtime:: 11/14/00 2:46p $*
29+
* $Modtime:: 8/30/01 7:40p $*
3030
* *
31-
* $Revision:: 21 $*
31+
* $Revision:: 22 $*
3232
* *
3333
*---------------------------------------------------------------------------------------------*
3434
* Functions: *
@@ -583,10 +583,11 @@ bool CollisionMath::Collide(const AABoxClass & box,const Vector3 & move,const AA
583583

584584
result->Fraction = context.MaxFrac;
585585
result->Normal.Set(0,0,0);
586-
result->Normal[context.AxisId] = context.Side;
586+
result->Normal[context.AxisId] = -context.Side;
587587

588588
if (result->ComputeContactPoint) {
589-
WWASSERT(0); // TODO
589+
//WWASSERT(0); // TODO
590+
WWDEBUG_SAY(("AABox-AABox collision does not currently support contact point computation\r\n"));
590591
}
591592

592593
return true;

0 commit comments

Comments
 (0)