Update, rm some junk files

This commit is contained in:
ListenerJubatus
2017-09-17 13:50:43 -06:00
parent edb96fec5d
commit 9deb28c35e
11 changed files with 18 additions and 105 deletions
@@ -0,0 +1,7 @@
return Def.ActorFrame {
OnCommand= function(self) self:queuecommand("Recenter") end,
RecenterCommand= function(self) SCREENMAN:GetTopScreen():xy(0, 0) end,
Def.Quad{
InitCommand=cmd(scaletocover,-SCREEN_WIDTH*2,SCREEN_TOP,SCREEN_WIDTH*2,SCREEN_BOTTOM;diffuse,color("0,0,0,0.5"));
};
};
Binary file not shown.

Before

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

@@ -1,74 +0,0 @@
local hideFancyElements = (ThemePrefs.Get("FancyUIBG") == false)
local t = Def.ActorFrame{};
if hideFancyElements then return t; end
local Params = {
NumParticles = 30,
VelocityXMin = 100,
VelocityXMax = 400,
VelocityYMin = 0,
VelocityYMax = 0,
VelocityZMin = 0,
VelocityZMax = 0,
BobRateZMin = 0.4,
BobRateZMax = 0.7,
ZoomMin = 0.5,
ZoomMax = 1,
SpinZ = 0,
BobZ = 52,
File = "_particle normal",
};
local tParticleInfo = {}
for i=1,Params.NumParticles do
tParticleInfo[i] = {
X = math.random(Params.VelocityXMin, Params.VelocityXMax),
Y = Params.VelocityYMin ~= Params.VelocityYMax and math.random(Params.VelocityYMin, Params.VelocityYMax) or Params.VelocityYMin,
Z = Params.VelocityZMin ~= Params.VelocityZMax and math.random(Params.VelocityZMin, Params.VelocityZMax) or Params.VelocityZMin,
Zoom = math.random(Params.ZoomMin*1000,Params.ZoomMax*1000) / 1000,
BobZRate = math.random(Params.BobRateZMin*1000,Params.BobRateZMax*1000) / 1000,
Age = 0,
};
t[#t+1] = LoadActor( Params.File )..{
Name="Particle"..i;
InitCommand=function(self)
self:basezoom(tParticleInfo[i].Zoom);
self:x(math.random(SCREEN_LEFT+(self:GetWidth()/2),SCREEN_RIGHT-(self:GetWidth()/2)));
self:y(math.random(SCREEN_TOP+(self:GetHeight()/2),SCREEN_BOTTOM-(self:GetHeight()/2)));
--self:z(math.random(-64,0));
end;
OnCommand=cmd(diffuse,ColorLightTone(color("#ffd400"));diffusealpha,0.8);
};
end
local function UpdateParticles(self,DeltaTime)
tParticles = self:GetChildren();
for i=1, Params.NumParticles do
local p = tParticles["Particle"..i];
local vX = tParticleInfo[i].X;
local vY = tParticleInfo[i].Y;
local vZ = tParticleInfo[i].Z;
tParticleInfo[i].Age = tParticleInfo[i].Age + DeltaTime;
p:x(p:GetX() + (vX * DeltaTime));
p:y(p:GetY() + (vY * DeltaTime));
p:z(p:GetZ() + (vZ * DeltaTime));
-- p:zoom( 1 + math.cos(
-- (tParticleInfo[i].Age * math.pi*2)
-- ) * 0.125 );
if p:GetX() > SCREEN_RIGHT + (p:GetWidth()/2 - p:GetZ()) then
p:x(SCREEN_LEFT - (p:GetWidth()/2));
elseif p:GetX() < SCREEN_LEFT - (p:GetWidth()/2 - p:GetZ()) then
p:x(SCREEN_RIGHT + (p:GetWidth()/2));
end
if p:GetY() > SCREEN_BOTTOM + (p:GetHeight()/2 - p:GetZ()) then
p:y(SCREEN_TOP - (p:GetHeight()/2));
elseif p:GetY() < SCREEN_TOP - (p:GetHeight()/2 - p:GetZ()) then
p:y(SCREEN_BOTTOM + (p:GetHeight()/2));
end
end;
end;
t.InitCommand = cmd(fov,90;SetUpdateFunction,UpdateParticles);
return t;
@@ -1,19 +0,0 @@
local t = Def.ActorFrame {};
t[#t+1] = Def.ActorFrame {
FOV=90;
InitCommand=cmd(Center);
Def.Quad {
InitCommand=cmd(scaletoclipped,SCREEN_WIDTH,SCREEN_HEIGHT);
OnCommand=cmd(diffuse,color("#fdbe28");diffusebottomedge,color("#f67849"));
};
Def.ActorFrame {
InitCommand=cmd(diffusealpha,0.2;);
LoadActor("_checkerboard") .. {
InitCommand=cmd(rotationy,0;rotationz,0;rotationx,-90/4*3.5;zoomto,SCREEN_WIDTH*2,SCREEN_HEIGHT*2;customtexturerect,0,0,SCREEN_WIDTH*4/256,SCREEN_HEIGHT*4/256);
OnCommand=cmd(texcoordvelocity,0,0.25;diffuse,color("#ffffff");fadetop,1);
};
};
};
return t;
@@ -272,7 +272,7 @@ t[#t+1] = Def.ActorFrame {
end
};
LoadFont("Common Normal") .. {
InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,-143;diffuse,color("#000000"););
InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,-143;diffuse,color("#000000");maxwidth,130);
OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;);
OffCommand=cmd(linear,0.3;diffusealpha,0;);
CurrentStepsP1ChangedMessageCommand=cmd(queuecommand,"Set";);
@@ -382,7 +382,7 @@ t[#t+1] = Def.ActorFrame {
end
};
LoadFont("Common Normal") .. {
InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,143;diffuse,color("#000000"););
InitCommand=cmd(uppercase,true;zoom,0.75;addy,-20;addx,143;diffuse,color("#000000");maxwidth,130);
OnCommand=cmd(diffusealpha,0;smooth,0.2;diffusealpha,0.75;);
OffCommand=cmd(linear,0.3;diffusealpha,0;);
CurrentStepsP2ChangedMessageCommand=cmd(queuecommand,"Set";);
Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

+9 -10
View File
@@ -509,17 +509,16 @@ LineCC="lua,ThemePrefRow('CustomComboContinue')"
LineCM="lua,ThemePrefRow('CustomComboMaintain')"
[ScreenMiniMenuContext]
PageOnCommand=visible,false
LineHighlightX=SCREEN_CENTER_X/2
PageOnCommand=visible,true
NumRowsShown=12
RowPositionTransformFunction=function(self,offsetFromCenter,itemIndex,numItems) self:y(SCREEN_CENTER_Y-217+43*offsetFromCenter) end
ItemsStartX=SCREEN_CENTER_X+120
ItemsEndX=SCREEN_CENTER_X+280
LineHighlightX=SCREEN_CENTER_X
TitleX=SCREEN_CENTER_X
TitleOnCommand=shadowlength,1;
ItemsStartX=SCREEN_CENTER_X
ItemsEndX=SCREEN_CENTER_X
ItemsGapX=14
ItemsLongRowP1X=SCREEN_CENTER_X
ItemsLongRowP2X=SCREEN_CENTER_X
ItemsLongRowSharedX=SCREEN_CENTER_X
[OptionRowMiniMenuContext]
Fallback="OptionRowMiniMenu"
TitleX=240
[ScreenSelectStyle]
UpdateOnMesage=""