Update of /cvsroot/plib/plib/src/ssg
In directory usw-pr-cvs1:/tmp/cvs-serv29303/plib/src/ssg
Modified Files:
ssg.h ssgAnimation.cxx
Log Message:
Changed 'float' time to 'double'.
Index: ssg.h
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssg.h,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- ssg.h 4 Nov 2002 05:11:22 -0000 1.155
+++ ssg.h 8 Nov 2002 18:35:07 -0000 1.156
@@ -1808,10 +1808,10 @@
ssgAnimEnum running ;
ssgAnimDirection mode ;
- float start_time ;
- float pause_time ;
- float loop_time ;
- float* times ;
+ double start_time ;
+ double pause_time ;
+ double loop_time ;
+ float *times ;
int curr ;
int start ;
int end ;
@@ -1830,7 +1830,7 @@
protected:
virtual void copy_from ( ssgTimedSelector *src, int clone_flags ) ;
- float get_time() const
+ double get_time() const
{
if (time_mode == SSG_ANIM_FRAME)
return static_cast<float>( ssgGetFrameCounter() );
Index: ssgAnimation.cxx
===================================================================
RCS file: /cvsroot/plib/plib/src/ssg/ssgAnimation.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ssgAnimation.cxx 24 Oct 2002 14:21:23 -0000 1.15
+++ ssgAnimation.cxx 8 Nov 2002 18:35:07 -0000 1.16
@@ -63,8 +63,8 @@
select ( 1 ) ;
running = SSG_ANIM_STOP ;
mode = SSG_ANIM_SHUTTLE ;
- start_time = pause_time = 0.0f ;
- loop_time = 1.0f ;
+ start_time = pause_time = 0.0 ;
+ loop_time = 1.0 ;
times = new float [ max_kids ] ;
for ( int i = 0 ; i < max_kids ; i++ )
@@ -106,7 +106,7 @@
int ssgTimedSelector::getStep ()
{
- float t = get_time () ;
+ double t = get_time () ;
if ( running == SSG_ANIM_STOP || running == SSG_ANIM_PAUSE )
return curr ;
@@ -128,24 +128,24 @@
{
/* Compute time since start of this loop */
- t = t - (float) floor ( t / loop_time ) * loop_time ;
+ t = t - floor ( t / loop_time ) * loop_time ;
}
else
if ( mode == SSG_ANIM_SWING )
{
/* Compute time since start of this swing loop */
- t = t - (float) floor ( t / (2.0f * loop_time) ) * (2.0f * loop_time) ;
+ t = t - floor ( t / (2.0 * loop_time) ) * (2.0 * loop_time) ;
/* Are we on the reverse part of the loop? */
if ( t >= loop_time )
- t = 2.0f * loop_time - t ;
+ t = 2.0 * loop_time - t ;
}
int k ;
- for ( k = start ; t > 0.0f && k <= end ; k++ )
- t -= times [ k ] ;
+ for ( k = start ; t > 0.0 && k <= end ; k++ )
+ t -= (double) times [ k ] ;
//DaveM: i removed this line because, in shuttle mode, start plays twice
k-- ;
@@ -170,9 +170,9 @@
{
_ssgReadInt ( fd, (int *) & running ) ;
_ssgReadInt ( fd, (int *) & mode ) ;
- _ssgReadFloat ( fd, & start_time ) ;
- _ssgReadFloat ( fd, & pause_time ) ;
- _ssgReadFloat ( fd, & loop_time ) ;
+// _ssgReadDouble( fd, & start_time ) ;
+// _ssgReadDouble( fd, & pause_time ) ;
+// _ssgReadDouble( fd, & loop_time ) ;
_ssgReadInt ( fd, & max_kids ) ;
delete [] times ;
times = new float [ max_kids ] ;
@@ -189,9 +189,9 @@
{
_ssgWriteInt ( fd, (int) running ) ;
_ssgWriteInt ( fd, (int) mode ) ;
- _ssgWriteFloat ( fd, start_time ) ;
- _ssgWriteFloat ( fd, pause_time ) ;
- _ssgWriteFloat ( fd, loop_time ) ;
+// _ssgWriteFloat ( fd, start_time ) ;
+// _ssgWriteFloat ( fd, pause_time ) ;
+// _ssgWriteFloat ( fd, loop_time ) ;
_ssgWriteInt ( fd, max_kids ) ;
_ssgWriteFloat ( fd, max_kids, times ) ;
_ssgWriteInt ( fd, curr ) ;
|
