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

Revert "Some more of default. Not yet done."

Browse Source 
This reverts commit 162b626e3e.
This commit is contained in:
Jason Felds
2013-07-18 17:57:14 -04:00
parent dc5d6a932d
commit ea45a6947c
11 changed files with 1024 additions and 1447 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/default/BGAnimations/ScreenWithMenuElements background/_particleLoader.lua
+74 -80
View File
@@ -1,80 +1,74 @@
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=function(self)
self:diffuse(ColorLightTone(color("#ffd400")));
self:diffusealpha(0.8);
end;
};
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 = function(self)
self:fov(90);
self:SetUpdateFunction(UpdateParticles);
end;
return t;
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;