csp-commits

[<mk...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Source
In directory sc8-pr-cvs1:/tmp/cvs-serv13051/Source

Modified Files:
      Tag: simdata
	Matrix3.cpp Quaternion.cpp 
Log Message:
M_PI defined now as G_PI, fixed hash_map path again for win32

Index: Matrix3.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/Matrix3.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Matrix3.cpp	19 Jan 2003 20:31:41 -0000	1.1.2.1
--- Matrix3.cpp	20 Jan 2003 04:36:58 -0000	1.1.2.2
***************
*** 31,35 ****
  #include <cmath>
  
! #define HALF_PI (M_PI*0.5)
  
  #include <SimData/Matrix3.h>
--- 31,35 ----
  #include <cmath>
  
! #define HALF_PI (G_PI*0.5)
  
  #include <SimData/Matrix3.h>
***************
*** 389,393 ****
  
  	if ( rfRadians > 0.0 ) {
! 		if ( rfRadians < M_PI ) {
  			rkAxis.x = rowcol[2][1]-rowcol[1][2];
  			rkAxis.y = rowcol[0][2]-rowcol[2][0];
--- 389,393 ----
  
  	if ( rfRadians > 0.0 ) {
! 		if ( rfRadians < G_PI ) {
  			rkAxis.x = rowcol[2][1]-rowcol[1][2];
  			rkAxis.y = rowcol[0][2]-rowcol[2][0];

Index: Quaternion.cpp
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Source/Attic/Quaternion.cpp,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** Quaternion.cpp	19 Jan 2003 20:31:41 -0000	1.1.2.1
--- Quaternion.cpp	20 Jan 2003 04:36:58 -0000	1.1.2.2
***************
*** 443,447 ****
  
  	double fSin = sin(fAngle);
! 	double fPhase = M_PI*iExtraSpins*fT;
  	double fInvSin = 1.0f/fSin;
  	double fCoeff0 = sin((1.0f-fT)*fAngle - fPhase)*fInvSin;
--- 443,447 ----
  
  	double fSin = sin(fAngle);
! 	double fPhase = G_PI*iExtraSpins*fT;
  	double fInvSin = 1.0f/fSin;
  	double fCoeff0 = sin((1.0f-fT)*fAngle - fPhase)*fInvSin;
***************
*** 539,543 ****
  
  		u.x = RadiansToDegrees(0.0f); //roll
! 		u.y = RadiansToDegrees((double) (-(M_PI/2) * r31/tmp)); // pitch
  		u.z = RadiansToDegrees((double) atan2(-r12, -r31*r13)); // yaw
  		return u;
--- 539,543 ----
  
  		u.x = RadiansToDegrees(0.0f); //roll
! 		u.y = RadiansToDegrees((double) (-(G_PI/2) * r31/tmp)); // pitch
  		u.z = RadiansToDegrees((double) atan2(-r12, -r31*r13)); // yaw
  		return u;