[Gcblue-commits] gcb_wx/src/common simmath.cpp,1.26,1.27

[Dewitt C. <ddc...@us...>]

Update of /cvsroot/gcblue/gcb_wx/src/common
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6347/src/common

Modified Files:
	simmath.cpp 
Log Message:


Index: simmath.cpp
===================================================================
RCS file: /cvsroot/gcblue/gcb_wx/src/common/simmath.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** simmath.cpp	22 Jun 2005 01:22:04 -0000	1.26
--- simmath.cpp	28 Jun 2005 02:51:34 -0000	1.27
***************
*** 89,107 ****
  }
  
! int AngleWithinRange(float afAngle_rad, float afAngle1_rad, float afAngle2_rad) {
!    // map angles to -180 to 180, assumes angles are in [-540,540]
!    if (afAngle_rad < -C_PI) afAngle_rad += C_TWOPI;
!    else if (afAngle_rad >= C_PI) afAngle_rad -= C_TWOPI;
!    if (afAngle1_rad < -C_PI) afAngle1_rad += C_TWOPI;
!    else if (afAngle1_rad > C_PI) afAngle1_rad -= C_TWOPI;
!    if (afAngle2_rad < -C_PI) afAngle2_rad += C_TWOPI;
!    else if (afAngle2_rad > C_PI) afAngle2_rad -= C_TWOPI;
!    // check if region is wrapped and calc result
!    if (afAngle1_rad <= afAngle2_rad) {
!       return ((afAngle_rad >= afAngle1_rad)&&(afAngle_rad <= afAngle2_rad));
!    }
!    else {
!       return ((afAngle_rad >= afAngle1_rad)||(afAngle_rad <= afAngle2_rad));
!    }
  }
  
--- 89,113 ----
  }
  
! int AngleWithinRange(float afAngle_rad, float afAngle1_rad, float afAngle2_rad) 
! {
! 	// map angles to -180 to 180, assumes angles are in [-540,540]
! 	if (afAngle_rad < -C_PI) afAngle_rad += C_TWOPI;
! 	else if (afAngle_rad >= C_PI) afAngle_rad -= C_TWOPI;
! 
! 	if (afAngle1_rad < -C_PI) afAngle1_rad += C_TWOPI;
! 	else if (afAngle1_rad > C_PI) afAngle1_rad -= C_TWOPI;
! 
! 	if (afAngle2_rad < -C_PI) afAngle2_rad += C_TWOPI;
! 	else if (afAngle2_rad > C_PI) afAngle2_rad -= C_TWOPI;
! 
! 	// check if region is wrapped and calc result
! 	if (afAngle1_rad <= afAngle2_rad) 
! 	{
! 		return ((afAngle_rad >= afAngle1_rad)&&(afAngle_rad <= afAngle2_rad));
! 	}
! 	else 
! 	{
! 		return ((afAngle_rad >= afAngle1_rad)||(afAngle_rad <= afAngle2_rad));
! 	}
  }