merge
This commit is contained in:
@@ -1,12 +1,16 @@
|
||||
|
||||
local function Beat(self)
|
||||
local this = self:GetChildren()
|
||||
local player = GAMESTATE:GetMasterPlayerNumber()
|
||||
local playerstate = GAMESTATE:GetPlayerState( player )
|
||||
local songposition = playerstate:GetSongPosition() -- GAMESTATE:GetSongPosition()
|
||||
|
||||
local beat = GAMESTATE:GetSongBeat()
|
||||
local beat = songposition:GetSongBeat() -- GAMESTATE:GetSongBeat()
|
||||
|
||||
local part = beat%1
|
||||
part = clamp(part,0,0.5)
|
||||
local eff = scale(part,0,0.5,1,0)
|
||||
if (GAMESTATE:GetSongPosition():GetDelay() or false) and part == 0 then eff = 0 end
|
||||
if (songposition:GetDelay() or false) and part == 0 then eff = 0 end
|
||||
if beat < 0 then
|
||||
eff = 0
|
||||
end
|
||||
|
||||
@@ -88,7 +88,9 @@ void GhostArrowRow::Update( float fDeltaTime )
|
||||
void GhostArrowRow::DrawPrimitives()
|
||||
{
|
||||
for( unsigned c=0; c<m_Ghost.size(); c++ )
|
||||
{
|
||||
m_Ghost[c]->Draw();
|
||||
}
|
||||
}
|
||||
|
||||
void GhostArrowRow::DidTapNote( int iCol, TapNoteScore tns, bool bBright )
|
||||
|
||||
Reference in New Issue
Block a user