matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
jacob1 2013-02-24 22:10:31 -05:00
commit e700ff2988
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/simulation/elements/ACEL.cpp
View File

@ -50,7 +50,16 @@ Element_ACEL::Element_ACEL()
int Element_ACEL::update(UPDATE_FUNC_ARGS) int Element_ACEL::update(UPDATE_FUNC_ARGS)
{ {
int r, rx, ry; int r, rx, ry;
float multiplier;
if (parts[i].life!=0)
{
float change = parts[i].life > 1000 ? 1000 : (parts[i].life < 0 ? 0 : parts[i].life); float change = parts[i].life > 1000 ? 1000 : (parts[i].life < 0 ? 0 : parts[i].life);
multiplier = 1.0f+(change/100.0f);
}
else
{
multiplier = 1.1f;
}
parts[i].tmp = 0; parts[i].tmp = 0;
for (rx=-1; rx<2; rx++) for (rx=-1; rx<2; rx++)
for (ry=-1; ry<2; ry++) for (ry=-1; ry<2; ry++)
@ -63,16 +72,8 @@ int Element_ACEL::update(UPDATE_FUNC_ARGS)
continue; continue;
if(sim->elements[r&0xFF].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY)) if(sim->elements[r&0xFF].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY))
{ {
if (parts[i].life) parts[r>>8].vx *= multiplier;
{ parts[r>>8].vy *= multiplier;
parts[r>>8].vx *= 1.0f+(change/100.0f);
parts[r>>8].vy *= 1.0f+(change/100.0f);
}
else
{
parts[r>>8].vx *= 1.1f;
parts[r>>8].vy *= 1.1f;
}
parts[i].tmp = 1; parts[i].tmp = 1;
} }
} }

21
src/simulation/elements/dcel.cpp
View File

@ -50,7 +50,16 @@ Element_DCEL::Element_DCEL()
int Element_DCEL::update(UPDATE_FUNC_ARGS) int Element_DCEL::update(UPDATE_FUNC_ARGS)
{ {
int r, rx, ry; int r, rx, ry;
float multiplier;
if (parts[i].life!=0)
{
float change = parts[i].life > 100 ? 100 : (parts[i].life < 0 ? 0 : parts[i].life); float change = parts[i].life > 100 ? 100 : (parts[i].life < 0 ? 0 : parts[i].life);
multiplier = 1.0f-(change/100.0f);
}
else
{
multiplier = 1.0f/1.1f;
}
parts[i].tmp = 0; parts[i].tmp = 0;
for (rx=-1; rx<2; rx++) for (rx=-1; rx<2; rx++)
for (ry=-1; ry<2; ry++) for (ry=-1; ry<2; ry++)
@ -63,16 +72,8 @@ int Element_DCEL::update(UPDATE_FUNC_ARGS)
continue; continue;
if(sim->elements[r&0xFF].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY)) if(sim->elements[r&0xFF].Properties & (TYPE_PART | TYPE_LIQUID | TYPE_GAS | TYPE_ENERGY))
{ {
if (parts[i].life) parts[r>>8].vx *= multiplier;
{ parts[r>>8].vy *= multiplier;
parts[r>>8].vx *= 1.0f-(change/100.0f);
parts[r>>8].vy *= 1.0f-(change/100.0f);
}
else
{
parts[r>>8].vx *= 0.9f;
parts[r>>8].vy *= 0.9f;
}
parts[i].tmp = 1; parts[i].tmp = 1;
} }
} }