[Evolution-commits] CVS: evolutionlejeu/Evolution/Protogonos evalue.cpp,1.6,1.7 timeline.h,1.2,1.3

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Protogonos
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4353/Evolution/Protogonos

Modified Files:
	evalue.cpp timeline.h 
Log Message:
FIX : Compilation issue in release (name collision)

Index: evalue.cpp
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Protogonos/evalue.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** evalue.cpp	17 Aug 2005 16:12:12 -0000	1.6
--- evalue.cpp	16 Dec 2005 16:20:12 -0000	1.7
***************
*** 30,34 ****
  	{
  		m_instantaneous_duration = tDuration;
! 		m_pFinalEvent = Kronos::Get().TimeLine().AddEvent(  Kronos::Get().TimeLine().GetCurrentTime() + tDuration, pFinalEvent );
  	}
  	else
--- 30,34 ----
  	{
  		m_instantaneous_duration = tDuration;
! 		m_pFinalEvent = Kronos::Get().TimeLine().AddEvent(  Kronos::Get().TimeLine().CurrentTime() + tDuration, pFinalEvent );
  	}
  	else
***************
*** 60,64 ****
  	if( new_instantaneous_duration != INVALID_DURATION )
  	{
! 		evoTime tNewEnd = (int)(( 1.0 - GetProgression() ) * (float)new_instantaneous_duration) + Kronos::Get().TimeLine().GetCurrentTime();

  		m_instantaneous_duration = new_instantaneous_duration;
--- 60,64 ----
  	if( new_instantaneous_duration != INVALID_DURATION )
  	{
! 		evoTime tNewEnd = (int)(( 1.0 - GetProgression() ) * (float)new_instantaneous_duration) + Kronos::Get().TimeLine().CurrentTime();

  		m_instantaneous_duration = new_instantaneous_duration;
***************
*** 96,100 ****
  {
  	if( m_instantaneous_duration != INVALID_DURATION )
! 		return (__int16)( m_pFinalEvent->GetTime() - Kronos::Get().TimeLine().GetCurrentTime() );
  	else
  		return INVALID_DURATION;
--- 96,100 ----
  {
  	if( m_instantaneous_duration != INVALID_DURATION )
! 		return (__int16)( m_pFinalEvent->GetTime() - Kronos::Get().TimeLine().CurrentTime() );
  	else
  		return INVALID_DURATION;
***************
*** 105,109 ****
  {
  	if( m_instantaneous_duration != INVALID_DURATION )
! 		return 1 - ( ( (float)( m_pFinalEvent->GetTime() - Kronos::Get().TimeLine().GetCurrentTime() ) ) / ( (float) m_instantaneous_duration ) );
  	else
  	{
--- 105,109 ----
  {
  	if( m_instantaneous_duration != INVALID_DURATION )
! 		return 1 - ( ( (float)( m_pFinalEvent->GetTime() - Kronos::Get().TimeLine().CurrentTime() ) ) / ( (float) m_instantaneous_duration ) );
  	else
  	{
***************
*** 160,164 ****
  		m_instantaneous_duration = tDuration;
  		pFinalEvent->m_bPositiveEvent = bIncrease;
! 		m_pFinalEvent = Kronos::Get().TimeLine().AddEvent(  Kronos::Get().TimeLine().GetCurrentTime() + tDuration, pFinalEvent );
  	}
  	else
--- 160,164 ----
  		m_instantaneous_duration = tDuration;
  		pFinalEvent->m_bPositiveEvent = bIncrease;
! 		m_pFinalEvent = Kronos::Get().TimeLine().AddEvent(  Kronos::Get().TimeLine().CurrentTime() + tDuration, pFinalEvent );
  	}
  	else
***************
*** 168,172 ****

  		// store the Event in TimeEvent... and cancel it
! 		m_pFinalEvent = Kronos::Get().TimeLine().AddEvent(  Kronos::Get().TimeLine().GetCurrentTime() + tDuration, pFinalEvent );

  		m_fStoppedProgression = 0.0f;
--- 168,172 ----

  		// store the Event in TimeEvent... and cancel it
! 		m_pFinalEvent = Kronos::Get().TimeLine().AddEvent(  Kronos::Get().TimeLine().CurrentTime() + tDuration, pFinalEvent );

  		m_fStoppedProgression = 0.0f;
***************
*** 198,207 ****
  		if( bIncrease )		// goal: value = 1.0f
  		{
! 			tNewEnd = (int)(( 1.0 - GetProgression() ) * (float)new_instantaneous_duration) + Kronos::Get().TimeLine().GetCurrentTime();
  			m_fStoppedProgression = 1.0f;
  		}
  		else				// goal: value = -1.0f
  		{
! 			tNewEnd = (int)(( 1.0 + GetProgression() ) * (float)new_instantaneous_duration) + Kronos::Get().TimeLine().GetCurrentTime();
  			m_fStoppedProgression = -1.0f;
  		}
--- 198,207 ----
  		if( bIncrease )		// goal: value = 1.0f
  		{
! 			tNewEnd = (int)(( 1.0 - GetProgression() ) * (float)new_instantaneous_duration) + Kronos::Get().TimeLine().CurrentTime();
  			m_fStoppedProgression = 1.0f;
  		}
  		else				// goal: value = -1.0f
  		{
! 			tNewEnd = (int)(( 1.0 + GetProgression() ) * (float)new_instantaneous_duration) + Kronos::Get().TimeLine().CurrentTime();
  			m_fStoppedProgression = -1.0f;
  		}
***************
*** 241,245 ****
  {
  	if( m_instantaneous_duration != INVALID_DURATION )
! 		return (__int16)( m_pFinalEvent->GetTime() - Kronos::Get().TimeLine().GetCurrentTime() );
  	else
  		return INVALID_DURATION;
--- 241,245 ----
  {
  	if( m_instantaneous_duration != INVALID_DURATION )
! 		return (__int16)( m_pFinalEvent->GetTime() - Kronos::Get().TimeLine().CurrentTime() );
  	else
  		return INVALID_DURATION;
***************
*** 260,266 ****
  	{
  		if( m_fStoppedProgression == 1.0f )
! 			return (float)( 1.0f - ( ( (float)( m_pFinalEvent->GetTime() - Kronos::Get().TimeLine().GetCurrentTime() ) ) / ( (float) m_instantaneous_duration ) ) );
  		else
! 			return (float)( - 1.0f + ( ( (float)( m_pFinalEvent->GetTime() - Kronos::Get().TimeLine().GetCurrentTime() ) ) / ( (float) m_instantaneous_duration ) ) );
  	}
  	else
--- 260,266 ----
  	{
  		if( m_fStoppedProgression == 1.0f )
! 			return (float)( 1.0f - ( ( (float)( m_pFinalEvent->GetTime() - Kronos::Get().TimeLine().CurrentTime() ) ) / ( (float) m_instantaneous_duration ) ) );
  		else
! 			return (float)( - 1.0f + ( ( (float)( m_pFinalEvent->GetTime() - Kronos::Get().TimeLine().CurrentTime() ) ) / ( (float) m_instantaneous_duration ) ) );
  	}
  	else
***************
*** 310,314 ****
  {
  	m_fLastValue = fInitialValue;
! 	m_tLastComputation = Kronos::Get().TimeLine().GetCurrentTime();
  	m_fEvolutionSpeed = fEvolutionSpeed;
  }
--- 310,314 ----
  {
  	m_fLastValue = fInitialValue;
! 	m_tLastComputation = Kronos::Get().TimeLine().CurrentTime();
  	m_fEvolutionSpeed = fEvolutionSpeed;
  }
***************
*** 323,327 ****
  {
  	m_fLastValue = GetCurrentValue();
! 	m_tLastComputation = Kronos::Get().TimeLine().GetCurrentTime();
  	m_fEvolutionSpeed = fEvolutionSpeed;
  }
--- 323,327 ----
  {
  	m_fLastValue = GetCurrentValue();
! 	m_tLastComputation = Kronos::Get().TimeLine().CurrentTime();
  	m_fEvolutionSpeed = fEvolutionSpeed;
  }
***************
*** 329,333 ****
  float EValueRamp::GetCurrentValue()	const
  {
! 	return (float)( Kronos::Get().TimeLine().GetCurrentTime() - m_tLastComputation ) * m_fEvolutionSpeed + m_fLastValue;
  }

--- 329,333 ----
  float EValueRamp::GetCurrentValue()	const
  {
! 	return (float)( Kronos::Get().TimeLine().CurrentTime() - m_tLastComputation ) * m_fEvolutionSpeed + m_fLastValue;
  }

***************
*** 335,339 ****
  {
  	m_fLastValue = fNewValue;
! 	m_tLastComputation = Kronos::Get().TimeLine().GetCurrentTime();
  }

--- 335,339 ----
  {
  	m_fLastValue = fNewValue;
! 	m_tLastComputation = Kronos::Get().TimeLine().CurrentTime();
  }

Index: timeline.h
===================================================================
RCS file: /cvsroot/evolutionlejeu/evolutionlejeu/Evolution/Protogonos/timeline.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** timeline.h	17 Aug 2005 16:12:12 -0000	1.2
--- timeline.h	16 Dec 2005 16:20:12 -0000	1.3
***************
*** 32,36 ****
  	void SetTimeOrigin( evoTime time );		// Set time origin. Events previously added are deleted

! 	evoTime GetCurrentTime()	const	{	return m_currentTime;	}

  	TimeEvent * AddEvent( evoTime time, Event *pEvent );
--- 32,36 ----
  	void SetTimeOrigin( evoTime time );		// Set time origin. Events previously added are deleted

! 	evoTime CurrentTime()	const	{	return m_currentTime;	}

  	TimeEvent * AddEvent( evoTime time, Event *pEvent );