Skip to content

Commit

Permalink
Jacob's laziness made me do this again.
Browse files Browse the repository at this point in the history 
CELL checks +-1 aren't required.
Moo
  • Loading branch information
@pilihp64
pilihp64 committed Oct 8, 2015
1 parent 63843c2 commit 3263c94
Show file tree
Hide file tree
Showing 13 changed files with 115 additions and 132 deletions.
98 changes: 50 additions & 48 deletions src/simulation/elements/ARAY.cpp
View file
Expand Up @@ -62,13 +62,15 @@ int Element_ARAY::update(UPDATE_FUNC_ARGS)
bool isBlackDeco = false;
int destroy = (parts[r>>8].ctype==PT_PSCN)?1:0;
int nostop = (parts[r>>8].ctype==PT_INST)?1:0;
int colored = 0;
int colored = 0, rt;
for (docontinue = 1, nxx = 0, nyy = 0, nxi = rx*-1, nyi = ry*-1; docontinue; nyy+=nyi, nxx+=nxi) {
if (!(x+nxi+nxx<XRES && y+nyi+nyy<YRES && x+nxi+nxx >= 0 && y+nyi+nyy >= 0)) {
break;
}
r = pmap[y+nyi+nyy][x+nxi+nxx];
if (!r) {
rt = r & 0xFF;
r = r >> 8;
if (!rt) {
int nr = sim->create_part(-1, x+nxi+nxx, y+nyi+nyy, PT_BRAY);
if (nr!=-1) {
if (destroy) {//if it came from PSCN
Expand All @@ -81,89 +83,89 @@ int Element_ARAY::update(UPDATE_FUNC_ARGS)
parts[nr].dcolour = 0xFF000000;
}
} else if (!destroy) {
if ((r&0xFF)==PT_BRAY) {
if (rt==PT_BRAY) {
//cases for hitting different BRAY modes
switch(parts[r>>8].tmp) {
switch(parts[r].tmp) {
case 0://normal white
if (nyy!=0 || nxx!=0) {
parts[r>>8].life = 1020;//makes it last a while
parts[r>>8].tmp = 1;
if (!parts[r>>8].ctype)//and colors it if it isn't already
parts[r>>8].ctype = colored;
parts[r].life = 1020;//makes it last a while
parts[r].tmp = 1;
if (!parts[r].ctype)//and colors it if it isn't already
parts[r].ctype = colored;
}
case 2://red bray, stop
default://stop any other random tmp mode
docontinue = 0;//then stop it
break;
case 1://long life, reset it
parts[r>>8].life = 1020;
parts[r].life = 1020;
//docontinue = 1;
break;
}
if (isBlackDeco)
parts[r>>8].dcolour = 0xFF000000;
} else if ((r&0xFF)==PT_FILT) {//get color if passed through FILT
if (parts[r>>8].tmp != 6)
parts[r].dcolour = 0xFF000000;
} else if (rt==PT_FILT) {//get color if passed through FILT
if (parts[r].tmp != 6)
{
colored = Element_FILT::interactWavelengths(&parts[r>>8], colored);
colored = Element_FILT::interactWavelengths(&parts[r], colored);
if (!colored)
break;
}
isBlackDeco = (parts[r>>8].dcolour==0xFF000000);
parts[r>>8].life = 4;
isBlackDeco = (parts[r].dcolour==0xFF000000);
parts[r].life = 4;
//this if prevents BRAY from stopping on certain materials
} else if ((r&0xFF)!=PT_STOR && (r&0xFF)!=PT_INWR && ((r&0xFF)!=PT_SPRK || parts[r>>8].ctype!=PT_INWR) && (r&0xFF)!=PT_ARAY && (r&0xFF)!=PT_WIFI && !((r&0xFF)==PT_SWCH && parts[r>>8].life>=10)) {
if (nyy!=0 || nxx!=0) {
sim->create_part(-1, x+nxi+nxx, y+nyi+nyy, PT_SPRK);
}
if (!(nostop && parts[r>>8].type==PT_SPRK && parts[r>>8].ctype >= 0 && parts[r>>8].ctype < PT_NUM && (sim->elements[parts[r>>8].ctype].Properties&PROP_CONDUCTS))) {
docontinue = 0;
} else {
docontinue = 1;
}
} else if((r&0xFF)==PT_STOR) {
if(parts[r>>8].tmp)
} else if (rt == PT_STOR) {
if (parts[r].tmp)
{
//Cause STOR to release
for(ry1 = 1; ry1 >= -1; ry1--){
for(rx1 = 0; rx1 >= -1 && rx1 <= 1; rx1 = -rx1-rx1+1){
int np = sim->create_part(-1, x+nxi+nxx+rx1, y+nyi+nyy+ry1, parts[r>>8].tmp);
if (np!=-1)
for (ry1 = 1; ry1 >= -1; ry1--){
for (rx1 = 0; rx1 >= -1 && rx1 <= 1; rx1 = -rx1 - rx1 + 1){
int np = sim->create_part(-1, x + nxi + nxx + rx1, y + nyi + nyy + ry1, parts[r].tmp);
if (np != -1)
{
parts[np].temp = parts[r>>8].temp;
parts[np].life = parts[r>>8].tmp2;
parts[np].tmp = parts[r>>8].pavg[0];
parts[np].ctype = parts[r>>8].pavg[1];
parts[r>>8].tmp = 0;
parts[r>>8].life = 10;
parts[np].temp = parts[r].temp;
parts[np].life = parts[r].tmp2;
parts[np].tmp = parts[r].pavg[0];
parts[np].ctype = parts[r].pavg[1];
parts[r].tmp = 0;
parts[r].life = 10;
break;
}
}
}
}
else
{
parts[r>>8].life = 10;
parts[r].life = 10;
}
} else if (rt != PT_INWR && (rt != PT_SPRK || parts[r].ctype != PT_INWR) && rt != PT_ARAY && rt != PT_WIFI && !(rt == PT_SWCH && parts[r].life >= 10)) {
if (nyy!=0 || nxx!=0) {
sim->create_part(-1, x+nxi+nxx, y+nyi+nyy, PT_SPRK);
}
if (!(nostop && parts[r].type==PT_SPRK && parts[r].ctype >= 0 && parts[r].ctype < PT_NUM && (sim->elements[parts[r].ctype].Properties&PROP_CONDUCTS))) {
docontinue = 0;
} else {
docontinue = 1;
}
}
} else if (destroy) {
if ((r&0xFF)==PT_BRAY) {
parts[r>>8].tmp = 2;
parts[r>>8].life = 1;
if (rt==PT_BRAY) {
parts[r].tmp = 2;
parts[r].life = 1;
docontinue = 1;
if (isBlackDeco)
parts[r>>8].dcolour = 0xFF000000;
parts[r].dcolour = 0xFF000000;
//this if prevents red BRAY from stopping on certain materials
} else if ((r&0xFF)==PT_STOR || (r&0xFF)==PT_INWR || ((r&0xFF)==PT_SPRK && parts[r>>8].ctype==PT_INWR) || (r&0xFF)==PT_ARAY || (r&0xFF)==PT_WIFI || (r&0xFF)==PT_FILT || ((r&0xFF)==PT_SWCH && parts[r>>8].life>=10)) {
if((r&0xFF)==PT_STOR)
} else if (rt==PT_STOR || rt==PT_INWR || (rt==PT_SPRK && parts[r].ctype==PT_INWR) || rt==PT_ARAY || rt==PT_WIFI || rt==PT_FILT || (rt==PT_SWCH && parts[r].life>=10)) {
if(rt==PT_STOR)
{
parts[r>>8].tmp = 0;
parts[r>>8].life = 0;
parts[r].tmp = 0;
parts[r].life = 0;
}
else if ((r&0xFF)==PT_FILT)
else if (rt==PT_FILT)
{
isBlackDeco = (parts[r>>8].dcolour==0xFF000000);
parts[r>>8].life = 2;
isBlackDeco = (parts[r].dcolour==0xFF000000);
parts[r].life = 2;
}
docontinue = 1;
} else {
Expand Down
31 changes: 17 additions & 14 deletions src/simulation/elements/BIZR.cpp
View file
Expand Up @@ -46,12 +46,13 @@ Element_BIZR::Element_BIZR()
Graphics = &Element_BIZR::graphics;
}

#define BLEND 0.95f

//#TPT-Directive ElementHeader Element_BIZR static int update(UPDATE_FUNC_ARGS)
int Element_BIZR::update(UPDATE_FUNC_ARGS)
{
int r, rx, ry, nr, ng, nb, na;
float tr, tg, tb, ta, mr, mg, mb, ma;
float blend;
if(parts[i].dcolour){
for (rx=-2; rx<3; rx++)
for (ry=-2; ry<3; ry++)
Expand All @@ -62,7 +63,6 @@ int Element_BIZR::update(UPDATE_FUNC_ARGS)
continue;
if ((r&0xFF)!=PT_BIZR && (r&0xFF)!=PT_BIZRG && (r&0xFF)!=PT_BIZRS)
{
blend = 0.95f;
tr = (parts[r>>8].dcolour>>16)&0xFF;
tg = (parts[r>>8].dcolour>>8)&0xFF;
tb = (parts[r>>8].dcolour)&0xFF;
Expand All @@ -73,10 +73,10 @@ int Element_BIZR::update(UPDATE_FUNC_ARGS)
mb = (parts[i].dcolour)&0xFF;
ma = (parts[i].dcolour>>24)&0xFF;

nr = (tr*blend) + (mr*(1-blend));
ng = (tg*blend) + (mg*(1-blend));
nb = (tb*blend) + (mb*(1-blend));
na = (ta*blend) + (ma*(1-blend));
nr = (tr*BLEND) + (mr*(1 - BLEND));
ng = (tg*BLEND) + (mg*(1 - BLEND));
nb = (tb*BLEND) + (mb*(1 - BLEND));
na = (ta*BLEND) + (ma*(1 - BLEND));

parts[r>>8].dcolour = nr<<16 | ng<<8 | nb | na<<24;
}
Expand All @@ -91,6 +91,7 @@ int Element_BIZR::graphics(GRAPHICS_FUNC_ARGS)
//BIZR, BIZRG, BIZRS
{
int x = 0;
float brightness = fabs(cpart->vx) + fabs(cpart->vy);
if (cpart->ctype&0x3FFFFFFF)
{
*colg = 0;
Expand All @@ -102,17 +103,19 @@ int Element_BIZR::graphics(GRAPHICS_FUNC_ARGS)
}
for (x=0; x<12; x++)
*colg += (cpart->ctype >> (x+9)) & 1;
x = *colr+*colg+*colb+1;
*colr = *colr*624/x;
*colg = *colg*624/x;
*colb = *colb*624/x;
x = 624 / (*colr + *colg + *colb + 1);
*colr *= x;
*colg *= x;
*colb *= x;
}
if(fabs(cpart->vx)+fabs(cpart->vy)>0)

if(brightness>0)
{
brightness /= 5;
*firea = 255;
*fireg = *colg/5 * (fabs(cpart->vx)+fabs(cpart->vy));
*fireb = *colb/5 * (fabs(cpart->vx)+fabs(cpart->vy));
*firer = *colr/5 * (fabs(cpart->vx)+fabs(cpart->vy));
*fireg = *colg * brightness;
*fireb = *colb * brightness;
*firer = *colr * brightness;
*pixel_mode |= FIRE_ADD;
}
*pixel_mode |= PMODE_BLUR;
Expand Down
31 changes: 13 additions & 18 deletions src/simulation/elements/BOYL.cpp
View file
Expand Up @@ -50,24 +50,19 @@ Element_BOYL::Element_BOYL()
int Element_BOYL::update(UPDATE_FUNC_ARGS)
{
int r, rx, ry;
if (sim->pv[y/CELL][x/CELL]<(parts[i].temp/100))
sim->pv[y/CELL][x/CELL] += 0.001f*((parts[i].temp/100)-sim->pv[y/CELL][x/CELL]);
if (y+CELL<YRES && sim->pv[y/CELL+1][x/CELL]<(parts[i].temp/100))
sim->pv[y/CELL+1][x/CELL] += 0.001f*((parts[i].temp/100)-sim->pv[y/CELL+1][x/CELL]);
if (x+CELL<XRES)
{
sim->pv[y/CELL][x/CELL+1] += 0.001f*((parts[i].temp/100)-sim->pv[y/CELL][x/CELL+1]);
if (y+CELL<YRES)
sim->pv[y/CELL+1][x/CELL+1] += 0.001f*((parts[i].temp/100)-sim->pv[y/CELL+1][x/CELL+1]);
}
if (y-CELL>=0 && sim->pv[y/CELL-1][x/CELL]<(parts[i].temp/100))
sim->pv[y/CELL-1][x/CELL] += 0.001f*((parts[i].temp/100)-sim->pv[y/CELL-1][x/CELL]);
if (x-CELL>=0)
{
sim->pv[y/CELL][x/CELL-1] += 0.001f*((parts[i].temp/100)-sim->pv[y/CELL][x/CELL-1]);
if (y-CELL>=0)
sim->pv[y/CELL-1][x/CELL-1] += 0.001f*((parts[i].temp/100)-sim->pv[y/CELL-1][x/CELL-1]);
}
float limit = parts[i].temp / 100;
if (sim->pv[y / CELL][x / CELL] < limit)
sim->pv[y / CELL][x / CELL] += 0.001f*(limit - sim->pv[y / CELL][x / CELL]);
if (sim->pv[y / CELL + 1][x / CELL] < limit)
sim->pv[y / CELL + 1][x / CELL] += 0.001f*(limit - sim->pv[y / CELL + 1][x / CELL]);
if (sim->pv[y / CELL - 1][x / CELL] < limit)
sim->pv[y / CELL - 1][x / CELL] += 0.001f*(limit - sim->pv[y / CELL - 1][x / CELL]);

sim->pv[y / CELL][x / CELL + 1] += 0.001f*(limit - sim->pv[y / CELL][x / CELL + 1]);
sim->pv[y / CELL + 1][x / CELL + 1] += 0.001f*(limit - sim->pv[y / CELL + 1][x / CELL + 1]);
sim->pv[y / CELL][x / CELL - 1] += 0.001f*(limit - sim->pv[y / CELL][x / CELL - 1]);
sim->pv[y / CELL - 1][x / CELL - 1] += 0.001f*(limit - sim->pv[y / CELL - 1][x / CELL - 1]);

for (rx=-1; rx<2; rx++)
for (ry=-1; ry<2; ry++)
if (BOUNDS_CHECK && (rx || ry))
Expand Down
2 changes: 1 addition & 1 deletion src/simulation/elements/BREC.cpp
View file
Expand Up @@ -70,7 +70,7 @@ int Element_BREC::update(UPDATE_FUNC_ARGS)
int r = pmap[y+ry][x+rx];
if (!r)
continue;
if (parts[r>>8].type == PT_LAVA && parts[r>>8].ctype == PT_CLST)
if ((r&0xFF) == PT_LAVA && parts[r>>8].ctype == PT_CLST)
{
float pres = std::max(sim->pv[y/CELL][x/CELL]*10.0f, 0.0f);
if (parts[r>>8].temp >= pres+sim->elements[PT_CRMC].HighTemperature+50.0f)
Expand Down
8 changes: 1 addition & 7 deletions src/simulation/elements/CBNW.cpp
View file
Expand Up @@ -52,13 +52,7 @@ int Element_CBNW::update(UPDATE_FUNC_ARGS)
int r, rx, ry;
if (sim->pv[y/CELL][x/CELL]<=3)
{
if(sim->pv[y/CELL][x/CELL]<=-0.5)
{
sim->part_change_type(i,x,y,PT_CO2);
parts[i].ctype = 5;
sim->pv[y/CELL][x/CELL] += 0.5f;
}
else if(!(rand()%4000))
if (sim->pv[y/CELL][x/CELL] <= -0.5 || !(rand()%4000))
{
sim->part_change_type(i,x,y,PT_CO2);
parts[i].ctype = 5;
Expand Down
8 changes: 4 additions & 4 deletions src/simulation/elements/CLST.cpp
View file
Expand Up @@ -93,10 +93,10 @@ int Element_CLST::update(UPDATE_FUNC_ARGS)
int Element_CLST::graphics(GRAPHICS_FUNC_ARGS)

{
int z = cpart->tmp - 5;//speckles!
*colr += z * 16;
*colg += z * 16;
*colb += z * 16;
int z =( cpart->tmp - 5) * 16;//speckles!
*colr += z;
*colg += z;
*colb += z;
return 0;
}

Expand Down
17 changes: 9 additions & 8 deletions src/simulation/elements/COAL.cpp
View file
Expand Up @@ -49,15 +49,14 @@ Element_COAL::Element_COAL()
//#TPT-Directive ElementHeader Element_COAL static int update(UPDATE_FUNC_ARGS)
int Element_COAL::update(UPDATE_FUNC_ARGS)
{
int t = parts[i].type;
if (parts[i].life<=0) {
sim->create_part(i, x, y, PT_FIRE);
return 1;
} else if (parts[i].life < 100) {
parts[i].life--;
sim->create_part(-1, x+rand()%3-1, y+rand()%3-1, PT_FIRE);
}
if (t == PT_COAL)
if (parts[i].type == PT_COAL)
{
if ((sim->pv[y/CELL][x/CELL] > 4.3f)&&parts[i].tmp>40)
parts[i].tmp=39;
Expand All @@ -73,6 +72,7 @@ int Element_COAL::update(UPDATE_FUNC_ARGS)
return 0;
}

#define FREQUENCY 3.1415/(2*300.0f-(300.0f-200.0f))

//#TPT-Directive ElementHeader Element_COAL static int graphics(GRAPHICS_FUNC_ARGS)
int Element_COAL::graphics(GRAPHICS_FUNC_ARGS)
Expand All @@ -87,14 +87,15 @@ int Element_COAL::graphics(GRAPHICS_FUNC_ARGS)

*colg = *colb = *colr;

if((cpart->temp-295.15f) > 300.0f-200.0f)
// ((cpart->temp-295.15f) > 300.0f-200.0f)
if (cpart->temp > 395.15f)
{
float frequency = 3.1415/(2*300.0f-(300.0f-200.0f));
int q = ((cpart->temp-295.15f)>300.0f)?300.0f-(300.0f-200.0f):(cpart->temp-295.15f)-(300.0f-200.0f);
// q = ((cpart->temp-295.15f)>300.0f)?300.0f-(300.0f-200.0f):(cpart->temp-295.15f)-(300.0f-200.0f);
int q = (cpart->temp > 595.15f) ? 200.0f : cpart->temp - 395.15f;

*colr += sin(frequency*q) * 226;
*colg += sin(frequency*q*4.55 +3.14) * 34;
*colb += sin(frequency*q*2.22 +3.14) * 64;
*colr += sin(FREQUENCY*q) * 226;
*colg += sin(FREQUENCY*q*4.55 + 3.14) * 34;
*colb += sin(FREQUENCY*q*2.22 + 3.14) * 64;
}
return 0;
}
Expand Down
8 changes: 4 additions & 4 deletions src/simulation/elements/CRMC.cpp
View file
Expand Up @@ -57,10 +57,10 @@ int Element_CRMC::update(UPDATE_FUNC_ARGS)
//#TPT-Directive ElementHeader Element_CRMC static int graphics(GRAPHICS_FUNC_ARGS)
int Element_CRMC::graphics(GRAPHICS_FUNC_ARGS)
{
int z = cpart->tmp2 - 2;
*colr += z * 8;
*colg += z * 8;
*colb += z * 8;
int z = (cpart->tmp2 - 2) * 8;
*colr += z;
*colg += z;
*colb += z;
return 0;
}

Expand Down
9 changes: 2 additions & 7 deletions src/simulation/elements/DCEL.cpp
View file
Expand Up @@ -50,15 +50,10 @@ Element_DCEL::Element_DCEL()
int Element_DCEL::update(UPDATE_FUNC_ARGS)
{
int r, rx, ry;
float multiplier;
float multiplier = 1.0f/1.1f;
if (parts[i].life!=0)
{
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;
multiplier = 1.0f - ((parts[i].life > 100 ? 100 : (parts[i].life < 0 ? 0 : parts[i].life)) / 100.0f);
}
parts[i].tmp = 0;
for (rx=-1; rx<2; rx++)
Expand Down

0 comments on commit 3263c94

Please sign in to comment.