actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Thai Pangsakulyanont
2011-06-12 13:27:58 +07:00
parent c057b23ab3 e4636a0a50
commit bc074180da
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NoteSkins/pump/default/UpLeft Receptor.lua
+6 -2
View File
@@ -1,12 +1,16 @@
local function Beat(self) local function Beat(self)
local this = self:GetChildren() 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 local part = beat%1
part = clamp(part,0,0.5) part = clamp(part,0,0.5)
local eff = scale(part,0,0.5,1,0) 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 if beat < 0 then
eff = 0 eff = 0
end end
src/GhostArrowRow.cpp
+2
View File
@@ -88,8 +88,10 @@ void GhostArrowRow::Update( float fDeltaTime )
void GhostArrowRow::DrawPrimitives() void GhostArrowRow::DrawPrimitives()
{ {
for( unsigned c=0; c<m_Ghost.size(); c++ ) for( unsigned c=0; c<m_Ghost.size(); c++ )
{
m_Ghost[c]->Draw(); m_Ghost[c]->Draw();
} }
}
void GhostArrowRow::DidTapNote( int iCol, TapNoteScore tns, bool bBright ) void GhostArrowRow::DidTapNote( int iCol, TapNoteScore tns, bool bBright )
{ {