adapted Trajectory particle and occurences to new particle system

stable-5.4
David Dormagen 2013-11-04 12:22:52 +01:00
parent 3ffa87dd02
commit 40b84704fe
4 changed files with 22 additions and 13 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 962 B

View File

@ -1,11 +0,0 @@
[Particle]
Name=Trajectory
MaxCount=1000
InitFn=StdInit
ExecFn=StdExec
DrawFn=Std
Face=0,0,32,32,-32,-32
Delay=0
Additive=1
Attach=1
RByV=2

View File

@ -34,6 +34,18 @@ global func AddTrajectory(object pObj, int iX, int iY, int iXDir, int iYDir, int
iYDir *= 5; iXDir *= 5;
iY -= 4*iFaktor;
iXOld = iX; iYOld = iY;
if (!spacing) spacing = 10;
// particle setup
var particles =
{
Prototype = Particles_Trajectory(),
R = (iColor >> 16) & 0xff,
G = (iColor >> 8) & 0xff,
B = (iColor >> 0) & 0xff,
Alpha = (iColor >> 24) & 0xff
};
// Trajectory simulation
while(++i < 500)
{
@ -41,10 +53,9 @@ global func AddTrajectory(object pObj, int iX, int iY, int iXDir, int iYDir, int
iX += iXDir;
iY += iYDir + GetGravity() * i / 22;
// If we are far enough away insert a new point
if(!spacing) spacing = 10;
if(Distance((iXOld - iX) / iFaktor, (iYOld - iY) / iFaktor) >= spacing)
{
CreateParticle("Trajectory", iX/iFaktor - pTrajectory->GetX(), iY/iFaktor - pTrajectory->GetY(), iXDir/500, iYDir/500, 15, iColor, pTrajectory);
pTrajectory->CreateParticleEx("Magic", iX/iFaktor - pTrajectory->GetX(), iY/iFaktor - pTrajectory->GetY(), 0, 0, 0, particles);
iXOld = iX; iYOld = iY;
}
// Or is it here already?

View File

@ -156,3 +156,12 @@ global func Particles_Material(int color)
B = (color >> 0) & 0xff
};
}
global func Particles_Trajectory()
{
return
{
BlitMode = GFX_BLIT_Additive,
Attach = ATTACH_Front | ATTACH_MoveRelative
};
}