Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 12:36:05 +08:00
Code Activity

Fix namespace clash with libstdc++-4.9.

Browse Source
This commit is contained in:
David Anderson
2020-05-18 15:52:13 -07:00
parent 9b2dbfd1d0
commit 13499e5c3a
5 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mathlib/mathlib_base.cpp
View File

@ -1658,9 +1658,9 @@ void MatrixInvert( const matrix3x4_t& in, matrix3x4_t& out )
Assert( s_bMathlibInitialized );
if ( &in == &out )
{
swap(out[0][1],out[1][0]);
swap(out[0][2],out[2][0]);
swap(out[1][2],out[2][1]);
valve_swap(out[0][1],out[1][0]);
valve_swap(out[0][2],out[2][0]);
valve_swap(out[1][2],out[2][1]);
}
else
{
@ -3282,18 +3282,18 @@ bool SolveInverseQuadraticMonotonic( float x1, float y1, float x2, float y2, flo
// first, sort parameters
if (x1>x2)
{
swap(x1,x2);
swap(y1,y2);
valve_swap(x1,x2);
valve_swap(y1,y2);
}
if (x2>x3)
{
swap(x2,x3);
swap(y2,y3);
valve_swap(x2,x3);
valve_swap(y2,y3);
}
if (x1>x2)
{
swap(x1,x2);
swap(y1,y2);
valve_swap(x1,x2);
valve_swap(y1,y2);
}
// this code is not fast. what it does is when the curve would be non-monotonic, slowly shifts
// the center point closer to the linear line between the endpoints. Should anyone need htis