[Tuxracer-checkins] CVS: tuxracer/src alglib.c,1.6,1.7 alglib.h,1.5,1.6 course_load.c,1.15,1.16 course_render.c,1.14,1.15 preview.c,1.3,1.4 view.c,1.5,1.6 viewfrustum.c,1.4,1.5

[Jasmin P. <jf...@us...>]

Update of /cvsroot/tuxracer/tuxracer/src
In directory slayer.i.sourceforge.net:/tmp/cvs-serv6098

Modified Files:
	alglib.c alglib.h course_load.c course_render.c preview.c 
	view.c viewfrustum.c 
Log Message:
Created ANGLES_TO_RADIANS and RADIANS_TO_ANGLES macros; changed all
such conversions to use these macros.


Index: alglib.c
===================================================================
RCS file: /cvsroot/tuxracer/tuxracer/src/alglib.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** alglib.c	2000/08/31 15:24:39	1.6
--- alglib.c	2000/09/02 17:21:10	1.7
***************
*** 303,308 ****
  {
      scalar_t sinv, cosv;
!     sinv = sin( angle * M_PI / 180.0 );
!     cosv = cos( angle * M_PI / 180.0 );
  
      make_identity_matrix( mat );
--- 303,308 ----
  {
      scalar_t sinv, cosv;
!     sinv = sin( ANGLES_TO_RADIANS( angle ) );
!     cosv = cos( ANGLES_TO_RADIANS( angle ) );
  
      make_identity_matrix( mat );

Index: alglib.h
===================================================================
RCS file: /cvsroot/tuxracer/tuxracer/src/alglib.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** alglib.h	2000/08/31 15:24:39	1.5
--- alglib.h	2000/09/02 17:21:10	1.6
***************
*** 37,40 ****
--- 37,43 ----
  #endif
  
+ #define ANGLES_TO_RADIANS(x) ( M_PI / 180.0 * (x) )
+ #define RADIANS_TO_ANGLES(x) ( 180.0 / M_PI * (x) )
+ 
  /* points and vectors */
  vector_t  make_vector( scalar_t x, scalar_t y, scalar_t z );

Index: course_load.c
===================================================================
RCS file: /cvsroot/tuxracer/tuxracer/src/course_load.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** course_load.c	2000/08/31 15:29:34	1.15
--- course_load.c	2000/09/02 17:21:10	1.16
***************
*** 119,123 ****
  scalar_t get_terrain_base_height( scalar_t distance )
  {
!     scalar_t slope = tan( course_angle * M_PI/180.0 );
      scalar_t base_height;
      
--- 119,123 ----
  scalar_t get_terrain_base_height( scalar_t distance )
  {
!     scalar_t slope = tan( ANGLES_TO_RADIANS( course_angle ) );
      scalar_t base_height;
      
***************
*** 443,447 ****
      }
  
!     slope = tan( course_angle * M_PI/180.0 );
  
      pad = 0;    /* RGBA images rows are aligned on 4-byte boundaries */
--- 443,447 ----
      }
  
!     slope = tan( ANGLES_TO_RADIANS( course_angle ) );
  
      pad = 0;    /* RGBA images rows are aligned on 4-byte boundaries */

Index: course_render.c
===================================================================
RCS file: /cvsroot/tuxracer/tuxracer/src/course_render.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** course_render.c	2000/09/01 00:12:05	1.14
--- course_render.c	2000/09/02 17:21:10	1.15
***************
*** 456,460 ****
  
      /* make background fill field of view */
!     bgndWidth  = 2 * tan(fov/2.*M_PI/180.) * aspect * total_length;
  
      if ( bgndWidth < total_length ) {
--- 456,461 ----
  
      /* make background fill field of view */
!     bgndWidth  = 2 * tan( ANGLES_TO_RADIANS( fov/2. ) ) * 
! 	aspect * total_length;
  
      if ( bgndWidth < total_length ) {
***************
*** 672,676 ****
      get_course_dimensions( &course_width, &course_length );
      course_angle = get_course_angle();
!     slope = tan( course_angle * M_PI / 180.0 );
  
      left_edge_plane = make_plane( 1.0, 0.0, 0.0, 0.0 );
--- 673,677 ----
      get_course_dimensions( &course_width, &course_length );
      course_angle = get_course_angle();
!     slope = tan( ANGLES_TO_RADIANS( course_angle ) );
  
      left_edge_plane = make_plane( 1.0, 0.0, 0.0, 0.0 );

Index: preview.c
===================================================================
RCS file: /cvsroot/tuxracer/tuxracer/src/preview.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** preview.c	2000/03/13 23:01:54	1.3
--- preview.c	2000/09/02 17:21:10	1.4
***************
*** 50,60 ****
      courseAngle = get_course_angle();
  
!     eye_pt = make_point( sin( theta * M_PI / 180.0 ) * courseLength + 
  			courseWidth / 2.,
! 			-courseLength * tan( courseAngle*M_PI/180.0 ) / 2.,
! 			-cos( theta * M_PI / 180.0 ) * courseLength );
  
      coursePt = make_point( courseWidth / 2., 
! 			   -courseLength * tan( courseAngle*M_PI/180.0 ) / 2.,
  			   -courseLength / 2.);
  
--- 50,62 ----
      courseAngle = get_course_angle();
  
!     eye_pt = make_point( sin( ANGLES_TO_RADIANS( theta ) ) * courseLength + 
  			courseWidth / 2.,
! 			-courseLength * 
! 			 tan( ANGLES_TO_RADIANS( courseAngle ) ) / 2.,
! 			-cos( ANGLES_TO_RADIANS( theta ) ) * courseLength );
  
      coursePt = make_point( courseWidth / 2., 
! 			   -courseLength * 
! 			   tan( ANGLES_TO_RADIANS( courseAngle ) ) / 2.,
  			   -courseLength / 2.);
  

Index: view.c
===================================================================
RCS file: /cvsroot/tuxracer/tuxracer/src/view.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** view.c	2000/08/31 15:44:43	1.5
--- view.c	2000/09/02 17:21:10	1.6
***************
*** 183,188 ****
  
      /* Constrain angle with x-z plane */
!     theta = ( M_PI/2 - acos( dot_product( vec2, y_vec ) ) ) * 
! 	180.0/M_PI;
  
      if ( theta > max_vec_angle )
--- 183,187 ----
  
      /* Constrain angle with x-z plane */
!     theta = RADIANS_TO_ANGLES( M_PI/2 - acos( dot_product( vec2, y_vec ) ) );
  
      if ( theta > max_vec_angle )
***************
*** 329,340 ****
  	/* Construct vector from player to camera */
  	view_vec = make_vector( 0, 
! 				sin( ( course_angle -
! 				       CAMERA_ANGLE_ABOVE_SLOPE + 
! 				       PLAYER_ANGLE_IN_CAMERA ) *
! 				     M_PI/180.0 ),
! 				cos( ( course_angle -
! 				       CAMERA_ANGLE_ABOVE_SLOPE + 
! 				       PLAYER_ANGLE_IN_CAMERA ) *
! 				     M_PI/180.0 ) );
  
  	view_vec = scale_vector( CAMERA_DISTANCE, view_vec );
--- 328,339 ----
  	/* Construct vector from player to camera */
  	view_vec = make_vector( 0, 
! 				sin( ANGLES_TO_RADIANS( 
! 				    course_angle -
! 				    CAMERA_ANGLE_ABOVE_SLOPE + 
! 				    PLAYER_ANGLE_IN_CAMERA ) ),
! 				cos( ANGLES_TO_RADIANS( 
! 				    course_angle -
! 				    CAMERA_ANGLE_ABOVE_SLOPE + 
! 				    PLAYER_ANGLE_IN_CAMERA ) ) );
  
  	view_vec = scale_vector( CAMERA_DISTANCE, view_vec );
***************
*** 417,428 ****
  	/* Construct vector from player to camera */
  	view_vec = make_vector( 0, 
! 				sin( ( course_angle -
! 				       CAMERA_ANGLE_ABOVE_SLOPE +
! 				       PLAYER_ANGLE_IN_CAMERA ) *
! 				     M_PI/180.0 ),
! 				cos( ( course_angle -
! 				       CAMERA_ANGLE_ABOVE_SLOPE + 
! 				       PLAYER_ANGLE_IN_CAMERA ) *
! 				     M_PI/180.0 ) );
  	view_vec = scale_vector( CAMERA_DISTANCE, view_vec );
  
--- 416,427 ----
  	/* Construct vector from player to camera */
  	view_vec = make_vector( 0, 
! 				sin( ANGLES_TO_RADIANS( 
! 				    course_angle -
! 				    CAMERA_ANGLE_ABOVE_SLOPE +
! 				    PLAYER_ANGLE_IN_CAMERA ) ),
! 				cos( ANGLES_TO_RADIANS( 
! 				    course_angle -
! 				    CAMERA_ANGLE_ABOVE_SLOPE + 
! 				    PLAYER_ANGLE_IN_CAMERA ) ) );
  	view_vec = scale_vector( CAMERA_DISTANCE, view_vec );
  
***************
*** 506,517 ****
  	/* Construct vector from player to camera */
  	view_vec = make_vector( 0, 
! 				sin( ( course_angle - 
! 				       CAMERA_ANGLE_ABOVE_SLOPE+
! 				       PLAYER_ANGLE_IN_CAMERA ) *
! 				     M_PI/180.0 ),
! 				cos( ( course_angle - 
! 				       CAMERA_ANGLE_ABOVE_SLOPE+ 
! 				       PLAYER_ANGLE_IN_CAMERA ) *
! 				     M_PI/180.0 ) );
  	view_vec = scale_vector( CAMERA_DISTANCE, view_vec );
  
--- 505,516 ----
  	/* Construct vector from player to camera */
  	view_vec = make_vector( 0, 
! 				sin( ANGLES_TO_RADIANS( 
! 				    course_angle - 
! 				    CAMERA_ANGLE_ABOVE_SLOPE+
! 				    PLAYER_ANGLE_IN_CAMERA ) ),
! 				cos( ANGLES_TO_RADIANS( 
! 				    course_angle - 
! 				    CAMERA_ANGLE_ABOVE_SLOPE+ 
! 				    PLAYER_ANGLE_IN_CAMERA ) ) );
  	view_vec = scale_vector( CAMERA_DISTANCE, view_vec );
  

Index: viewfrustum.c
===================================================================
RCS file: /cvsroot/tuxracer/tuxracer/src/viewfrustum.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** viewfrustum.c	2000/08/31 15:45:27	1.4
--- viewfrustum.c	2000/09/02 17:21:10	1.5
***************
*** 40,44 ****
      point_t pt;
      point_t origin = { 0., 0., 0. };
!     scalar_t half_fov = getparam_fov() * M_PI/180.0 * 0.5;
      scalar_t half_fov_horiz = atan( tan( half_fov ) * aspect ); 
  
--- 40,44 ----
      point_t pt;
      point_t origin = { 0., 0., 0. };
!     scalar_t half_fov = ANGLES_TO_RADIANS( getparam_fov() * 0.5 );
      scalar_t half_fov_horiz = atan( tan( half_fov ) * aspect );