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

Add PAPR interaction with LDTC

Browse Source
This commit is contained in:
Rebmiami 2023-12-12 08:38:02 -05:00
parent f4dd854b78
commit cb40d869cd
1 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/simulation/elements/LDTC.cpp
View File

@ -104,7 +104,7 @@ static int update(UPDATE_FUNC_ARGS)
if (!r) if (!r)
continue; continue;
bool boolMode = accepted_conductor(sim, r); bool boolMode = accepted_conductor(sim, r);
bool filtMode = copyColor && TYP(r) == PT_FILT; bool filtMode = copyColor && (TYP(r) == PT_FILT || TYP(r) == PT_PAPR);
if (!boolMode && !filtMode) if (!boolMode && !filtMode)
continue; continue;
@ -147,13 +147,33 @@ static int update(UPDATE_FUNC_ARGS)
if (filtMode) if (filtMode)
{ {
if (!phot_data_type(TYP(rr))) if (!phot_data_type(TYP(rr)) && TYP(rr) != PT_PAPR)
continue; continue;
int nx = x + rx, ny = y + ry; int nx = x + rx, ny = y + ry;
int photonWl = TYP(rr) == PT_FILT ? int photonWl = TYP(rr) == PT_FILT ?
Element_FILT_getWavelengths(&parts[ID(rr)]) : Element_FILT_getWavelengths(&parts[ID(rr)]) :
parts[ID(rr)].ctype; parts[ID(rr)].ctype;
if (TYP(rr) == PT_PAPR)
{
photonWl = 0x0;
int bit = 0x1;
while (TYP(rr) == PT_PAPR && bit <= 0x3FFFFFFF)
{
if ((parts[ID(rr)].life >> 24) & 0x1)
{
photonWl |= bit;
}
xCurrent += xStep;
yCurrent += yStep;
if (xCurrent < 0 || yCurrent < 0 || xCurrent >= XRES || yCurrent >= YRES)
break;
rr = pmap[yCurrent][xCurrent];
bit <<= 1;
}
}
if (TYP(r) == PT_FILT)
{
while (TYP(r) == PT_FILT) while (TYP(r) == PT_FILT)
{ {
parts[ID(r)].ctype = photonWl; parts[ID(r)].ctype = photonWl;
@ -163,6 +183,24 @@ static int update(UPDATE_FUNC_ARGS)
break; break;
r = pmap[ny][nx]; r = pmap[ny][nx];
} }
}
if (TYP(r) == PT_PAPR)
{
int bit = 0x1;
while (TYP(r) == PT_PAPR && bit <= 0x3FFFFFFF)
{
if (photonWl & bit)
parts[ID(r)].life = 0x1080820;
else
parts[ID(r)].life = 0x0;
nx += rx;
ny += ry;
if (nx < 0 || ny < 0 || nx >= XRES || ny >= YRES)
break;
r = pmap[ny][nx];
bit <<= 1;
}
}
break; break;
} }
} }