Jason Felds
0dc695b247
...now that I'm seeing this... why does the timing data get the beat and BPS from the elapsed time TWICE with each call?
111 lines
3.9 KiB
C++
111 lines
3.9 KiB
C++
#include "global.h"
|
|
#include "SongPosition.h"
|
|
|
|
static Preference<float> g_fVisualDelaySeconds( "VisualDelaySeconds", 0.0f );
|
|
|
|
void SongPosition::UpdateSongPosition( float fPositionSeconds, const TimingData &timing, const RageTimer ×tamp )
|
|
{
|
|
|
|
if( !timestamp.IsZero() )
|
|
m_LastBeatUpdate = timestamp;
|
|
else
|
|
m_LastBeatUpdate.Touch();
|
|
|
|
timing.GetBeatAndBPSFromElapsedTime( fPositionSeconds, m_fSongBeat, m_fCurBPS, m_bFreeze, m_bDelay, m_iWarpBeginRow, m_fWarpDestination );
|
|
|
|
// "Crash reason : -243478.890625 -48695.773438"
|
|
ASSERT_M( m_fSongBeat > -2000, ssprintf("Song beat %f at %f seconds is less than -2000!", m_fSongBeat, fPositionSeconds) );
|
|
|
|
m_fMusicSeconds = fPositionSeconds;
|
|
|
|
m_fLightSongBeat = timing.GetBeatFromElapsedTime( fPositionSeconds + g_fLightsAheadSeconds );
|
|
|
|
m_fSongBeatNoOffset = timing.GetBeatFromElapsedTimeNoOffset( fPositionSeconds );
|
|
|
|
m_fMusicSecondsVisible = fPositionSeconds - g_fVisualDelaySeconds.Get();
|
|
float fThrowAway, fThrowAway2;
|
|
bool bThrowAway;
|
|
int iThrowAway;
|
|
timing.GetBeatAndBPSFromElapsedTime( m_fMusicSecondsVisible, m_fSongBeatVisible, fThrowAway, bThrowAway, bThrowAway, iThrowAway, fThrowAway2 );
|
|
|
|
}
|
|
|
|
void SongPosition::Reset()
|
|
{
|
|
|
|
m_fMusicSecondsVisible = 0;
|
|
m_fSongBeatVisible = 0;
|
|
|
|
m_fMusicSeconds = 0; // MUSIC_SECONDS_INVALID;
|
|
// todo: move me to FOREACH_EnabledPlayer( p ) after [NUM_PLAYERS]ing
|
|
m_fSongBeat = 0;
|
|
m_fSongBeatNoOffset = 0;
|
|
m_fCurBPS = 10;
|
|
//m_bStop = false;
|
|
m_bFreeze = false;
|
|
m_bDelay = false;
|
|
m_iWarpBeginRow = -1; // Set to -1 because some song may want to warp to row 0. -aj
|
|
m_fWarpDestination = -1; // Set when a warp is encountered. also see above. -aj
|
|
|
|
}
|
|
|
|
//lua start
|
|
#include "LuaBinding.h"
|
|
class LunaSongPosition: public Luna<SongPosition>
|
|
{
|
|
public:
|
|
DEFINE_METHOD( GetMusicSecondsVisible, m_fMusicSecondsVisible );
|
|
DEFINE_METHOD( GetSongBeatVisible, m_fSongBeatVisible );
|
|
DEFINE_METHOD( GetMusicSeconds, m_fMusicSeconds );
|
|
DEFINE_METHOD( GetSongBeat, m_fSongBeat );
|
|
DEFINE_METHOD( GetSongBeatNoOffset, m_fSongBeatNoOffset );
|
|
DEFINE_METHOD( GetCurBPS, m_fCurBPS );
|
|
DEFINE_METHOD( GetFreeze, m_bFreeze );
|
|
DEFINE_METHOD( GetDelay, m_bDelay );
|
|
DEFINE_METHOD( GetWarpBeginRow, m_iWarpBeginRow );
|
|
DEFINE_METHOD( GetWarpDestination, m_fWarpDestination );
|
|
|
|
LunaSongPosition()
|
|
{
|
|
ADD_METHOD( GetMusicSecondsVisible );
|
|
ADD_METHOD( GetSongBeatVisible );
|
|
ADD_METHOD( GetMusicSeconds );
|
|
ADD_METHOD( GetSongBeat );
|
|
ADD_METHOD( GetSongBeatNoOffset );
|
|
ADD_METHOD( GetCurBPS );
|
|
ADD_METHOD( GetFreeze );
|
|
ADD_METHOD( GetDelay );
|
|
ADD_METHOD( GetWarpBeginRow );
|
|
ADD_METHOD( GetWarpDestination );
|
|
}
|
|
};
|
|
|
|
LUA_REGISTER_CLASS( SongPosition );
|
|
/**
|
|
* @file
|
|
* @author Thai Pangsakulyanont (c) 2011
|
|
* @section LICENSE
|
|
* All rights reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, and/or sell copies of the Software, and to permit persons to
|
|
* whom the Software is furnished to do so, provided that the above
|
|
* copyright notice(s) and this permission notice appear in all copies of
|
|
* the Software and that both the above copyright notice(s) and this
|
|
* permission notice appear in supporting documentation.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
|
|
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
|
|
* THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
|
|
* INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
|
|
* OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
|
|
* OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
|
|
* OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
|
|
* PERFORMANCE OF THIS SOFTWARE.
|
|
*/
|
|
|