mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-27 10:14:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

move M_PI etc. to wposix.h to ensure they're always present on Windows (previously required MathUtil.h)

Browse Source 
use M_PI instead of nonstandard PI

This was SVN commit r7380.
This commit is contained in:
janwas
2010-03-20 20:54:03 +00:00
parent d1c5119694
commit 0bbb99c3cd
19 changed files with 76 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation/EntityStateProcessing.cpp
+4 -4
View File
@@ -84,7 +84,7 @@ float CEntity::ChooseMovementSpeed( float distance )
// Modify the speed based on the slope of the terrain in our direction (obtained from our x orientation)
float angle = m_orientation_unclamped.x;
int sector = rintf( angle / (PI/2) * m_base->m_pitchDivs );
int sector = rintf( angle / (M_PI/2) * m_base->m_pitchDivs );
speed -= sector * m_base->m_pitchValue;
entf_set_to(ENTF_IS_RUNNING, should_run);
@@ -130,8 +130,8 @@ int CEntity::ProcessGotoHelper( CEntityOrder* current, int timestep_millis, HEnt
m_targetorientation = atan2( delta.x, delta.y );
float deltatheta = m_targetorientation - (float)m_orientation.Y;
while( deltatheta > PI ) deltatheta -= 2 * PI;
while( deltatheta < -PI ) deltatheta += 2 * PI;
while( deltatheta > M_PI ) deltatheta -= 2 * M_PI;
while( deltatheta < -M_PI ) deltatheta += 2 * M_PI;
if( fabs( deltatheta ) > 0.01f )
{
@@ -336,7 +336,7 @@ bool CEntity::ProcessGotoNoPathing( CEntityOrder* current, int timestep_millis )
{
delta = interval / r;
theta += delta;
r += ( interval * delta ) / ( 2 * PI );
r += ( interval * delta ) / ( 2 * M_PI );
destinationObs.SetPosition( _x + r * cosf( theta ), _y + r * sinf( theta ) );
if( !GetCollisionObject( &destinationObs ) ) break;
}