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

set effectclock cleanly

Browse Source
This commit is contained in:
Glenn Maynard
2007-03-22 00:04:37 +00:00
parent 1fdf23a4a3
commit 8a07dfca34
12 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/BackgroundEffects/Centered.lua
+1 -1
View File
@@ -1,7 +1,7 @@
local Color = color(Var "Color1");
local children = {
LoadActor(Var "File1") .. {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,Color);
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;diffuse,Color;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
stepmania/BackgroundEffects/Checkerboard1File2x2.lua
+1 -1
View File
@@ -1,7 +1,7 @@
local Color = color(Var "Color1");
local a = LoadActor(Var "File1") .. {
OnCommand=cmd(zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color);
OnCommand=cmd(zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
stepmania/BackgroundEffects/Checkerboard2File2x2.lua
+1 -1
View File
@@ -1,6 +1,6 @@
local Color = color(Var "Color1");
local a = LoadActor(Var "File2") .. {
OnCommand=cmd(zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color);
OnCommand=cmd(zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
stepmania/BackgroundEffects/Kaleidoscope2x2.lua
+1 -1
View File
@@ -1,7 +1,7 @@
local Color = color(Var "Color1");
local a = LoadActor(Var "File1") .. {
OnCommand=cmd(zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color;zoomx,self:GetZoomX()*-1;zoomy,self:GetZoomY()*-1);
OnCommand=cmd(zoomtowidth,SCREEN_WIDTH/2;zoomtoheight,SCREEN_HEIGHT/2;diffuse,Color;zoomx,self:GetZoomX()*-1;zoomy,self:GetZoomY()*-1;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
stepmania/BackgroundEffects/SongBgWithMovieViz.lua
+2 -2
View File
@@ -3,11 +3,11 @@ local Color2 = color(Var "Color2");
local children = {
Def.Sprite {
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;ZoomToWidth,SCREEN_WIDTH;ZoomToHeight,SCREEN_HEIGHT;diffuse,Color1);
OnCommand=cmd(x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;ZoomToWidth,SCREEN_WIDTH;ZoomToHeight,SCREEN_HEIGHT;diffuse,Color1;effectclock,"music");
};
LoadActor(Var "File1") .. {
OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;ZoomToWidth,SCREEN_WIDTH;ZoomToHeight,SCREEN_HEIGHT;diffuse,Color2);
OnCommand=cmd(blend,"BlendMode_Add";x,SCREEN_CENTER_X;y,SCREEN_CENTER_Y;ZoomToWidth,SCREEN_WIDTH;ZoomToHeight,SCREEN_HEIGHT;diffuse,Color2;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
stepmania/BackgroundEffects/StretchNoLoop.lua
+1 -1
View File
@@ -1,7 +1,7 @@
local Color = color(Var "Color1");
local children = {
LoadActor(Var "File1") .. {
OnCommand=cmd(scale_or_crop_background;diffuse,Color;loop,false);
OnCommand=cmd(scale_or_crop_background;diffuse,Color;loop,false;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
stepmania/BackgroundEffects/StretchNormal.lua
+1 -1
View File
@@ -2,7 +2,7 @@ local Color = color(Var "Color1");
local children = {
LoadActor(Var "File1") .. {
OnCommand=cmd(scale_or_crop_background;diffuse,Color);
OnCommand=cmd(scale_or_crop_background;diffuse,Color;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
stepmania/BackgroundEffects/StretchNormalAlignLeft.lua
+1 -1
View File
@@ -3,7 +3,7 @@ local Color = color(Var "Color1");
local children = {
LoadActor(Var "File1") .. {
OnCommand=cmd(horizalign,left;scaletocover,0,0,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color(Color));
OnCommand=cmd(horizalign,left;scaletocover,0,0,SCREEN_WIDTH,SCREEN_HEIGHT;diffuse,color(Color);effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
stepmania/BackgroundEffects/StretchPaused.lua
+1 -1
View File
@@ -2,7 +2,7 @@ local Color = color(Var "Color1");
local children = {
LoadActor(Var "File1") .. {
OnCommand=cmd(scale_or_crop_background;diffuse,Color;pause);
OnCommand=cmd(scale_or_crop_background;diffuse,Color;pause;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
stepmania/BackgroundEffects/StretchRewind.lua
+1 -1
View File
@@ -2,7 +2,7 @@ local Color = color(Var "Color1");
local children = {
LoadActor(Var "File1") .. {
OnCommand=cmd(scale_or_crop_background;diffuse,Color;position,0);
OnCommand=cmd(scale_or_crop_background;diffuse,Color;position,0;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
stepmania/BackgroundEffects/UpperLeft.lua
+1 -1
View File
@@ -3,7 +3,7 @@ local Color = color(Var "Color1");
local children = {
LoadActor(Var "File1") .. {
OnCommand=cmd(diffuse,Color);
OnCommand=cmd(diffuse,Color;effectclock,"music");
GainFocusCommand=cmd(play);
LoseFocusCommand=cmd(pause);
};
stepmania/src/Background.cpp
-15
View File
@@ -670,21 +670,6 @@ void BackgroundImpl::LoadFromSong( const Song* pSong )
m_pDancingCharacters->LoadNextSong();
TEXTUREMAN->SetDefaultTexturePolicy( OldPolicy );
/* Song backgrounds always sync from the music by default, unlike other actors
* which sync from the regular clock by default. If you don't want this, set
* the clock back with "effectclock,timer" in your OnCommand. Note that at this
* point, we havn't run the OnCommand yet, so it'll override correctly. */
FOREACHM( BackgroundDef, Actor*, mainlayer.m_BGAnimations, it )
{
Actor *pBGA = it->second;
/* Be sure that we run this command recursively on all children; the tree
* may look something like "BGAnimation, BGAnimationLayer, Sprite" or it
* may be deeper, like "BGAnimation, BGAnimationLayer, BGAnimation,
* BGAnimationLayer, Sprite". */
pBGA->RunCommands( ActorUtil::ParseActorCommands("effectclock,'music'") );
}
}
int BackgroundImpl::Layer::FindBGSegmentForBeat( float fBeat ) const