From b2adbb54db6a4fcf260efb3b801c15b7ab57eb6f Mon Sep 17 00:00:00 2001 From: Cracker1000 <39940063+cracker1000@users.noreply.github.com> Date: Wed, 26 Jun 2019 00:27:43 +0530 Subject: [PATCH] Add .life serialization support to lsns (#652) --- src/simulation/elements/LSNS.cpp | 160 +++++++++++++++++++++---------- 1 file changed, 112 insertions(+), 48 deletions(-) diff --git a/src/simulation/elements/LSNS.cpp b/src/simulation/elements/LSNS.cpp index 83009a08e..dd48120dc 100644 --- a/src/simulation/elements/LSNS.cpp +++ b/src/simulation/elements/LSNS.cpp @@ -3,45 +3,45 @@ Element_LSNS::Element_LSNS() { Identifier = "DEFAULT_PT_LSNS"; - Name = "LSNS"; - Colour = PIXPACK(0x336699); - MenuVisible = 1; - MenuSection = SC_SENSOR; - Enabled = 1; + Name = "LSNS"; + Colour = PIXPACK(0x336699); + MenuVisible = 1; + MenuSection = SC_SENSOR; + Enabled = 1; - Advection = 0.0f; - AirDrag = 0.00f * CFDS; - AirLoss = 0.96f; - Loss = 0.00f; - Collision = 0.0f; - Gravity = 0.0f; - Diffusion = 0.00f; - HotAir = 0.000f * CFDS; - Falldown = 0; + Advection = 0.0f; + AirDrag = 0.00f * CFDS; + AirLoss = 0.96f; + Loss = 0.00f; + Collision = 0.0f; + Gravity = 0.0f; + Diffusion = 0.00f; + HotAir = 0.000f * CFDS; + Falldown = 0; - Flammable = 0; - Explosive = 0; - Meltable = 0; - Hardness = 1; + Flammable = 0; + Explosive = 0; + Meltable = 0; + Hardness = 1; - Weight = 100; + Weight = 100; - Temperature = 4.0f + 273.15f; - HeatConduct = 0; - Description = "Life sensor, creates a spark when there's a nearby particle with a life higher than its temperature."; + Temperature = 4.0f + 273.15f; + HeatConduct = 0; + Description = "Life sensor, creates a spark when there's a nearby particle with a life higher than its temperature."; - Properties = TYPE_SOLID; + Properties = TYPE_SOLID; - LowPressure = IPL; - LowPressureTransition = NT; - HighPressure = IPH; - HighPressureTransition = NT; - LowTemperature = ITL; - LowTemperatureTransition = NT; - HighTemperature = ITH; - HighTemperatureTransition = NT; + LowPressure = IPL; + LowPressureTransition = NT; + HighPressure = IPH; + HighPressureTransition = NT; + LowTemperature = ITL; + LowTemperatureTransition = NT; + HighTemperature = ITH; + HighTemperatureTransition = NT; - Update = &Element_LSNS::update; + Update = &Element_LSNS::update; } //#TPT-Directive ElementHeader Element_LSNS static int update(UPDATE_FUNC_ARGS) @@ -52,40 +52,104 @@ int Element_LSNS::update(UPDATE_FUNC_ARGS) if (parts[i].life) { parts[i].life = 0; - for (rx=-2; rx<3; rx++) - for (ry=-2; ry<3; ry++) + for (rx = -2; rx < 3; rx++) + for (ry = -2; ry < 3; ry++) if (BOUNDS_CHECK && (rx || ry)) { - r = pmap[y+ry][x+rx]; + r = pmap[y + ry][x + rx]; if (!r) continue; rt = TYP(r); - if (sim->parts_avg(i,ID(r),PT_INSL) != PT_INSL) + if (sim->parts_avg(i, ID(r), PT_INSL) != PT_INSL) { - if ((sim->elements[rt].Properties&PROP_CONDUCTS) && !(rt==PT_WATR||rt==PT_SLTW||rt==PT_NTCT||rt==PT_PTCT||rt==PT_INWR) && parts[ID(r)].life==0) + if ((sim->elements[rt].Properties&PROP_CONDUCTS) && !(rt == PT_WATR || rt == PT_SLTW || rt == PT_NTCT || rt == PT_PTCT || rt == PT_INWR) && parts[ID(r)].life == 0) { parts[ID(r)].life = 4; parts[ID(r)].ctype = rt; - sim->part_change_type(ID(r),x+rx,y+ry,PT_SPRK); + sim->part_change_type(ID(r), x + rx, y + ry, PT_SPRK); } } + } } - for (rx=-rd; rx=0 && y+ry>=0 && x+rx= 0 && y + ry >= 0 && x + rx < XRES && y + ry < YRES && (rx || ry)) { - r = pmap[y+ry][x+rx]; - if(!r) - r = sim->photons[y+ry][x+rx]; - if(!r) + r = pmap[y + ry][x + rx]; + if (!r) + r = sim->photons[y + ry][x + rx]; + if (!r) continue; - if (parts[ID(r)].life > parts[i].temp-273.15) - parts[i].life = 1; + if (parts[i].tmp == 1 && TYP(r) != PT_LSNS && TYP(r) != PT_FILT && parts[ID(r)].life >= 0) + { + setFilt = true; + partlife = parts[ID(r)].life; + } + if (parts[i].tmp == 3 && TYP(r) == PT_FILT) + { + Setnewlife = true; + Newlife = parts[ID(r)].ctype; + } + if ((parts[i].tmp != 1) && (parts[i].tmp != 2) && (parts[i].tmp != 3)) + { + if (parts[ID(r)].life > parts[i].temp - 273.15) + { + parts[i].life = 1; + } + } + //Invert mode. + if (parts[i].tmp == 2) + { + if (parts[ID(r)].life > parts[i].temp - 273.15) + parts[i].life = 0; + else + parts[i].life = 1; + + } + } + int nx, ny; + for (int rx = -1; rx <= 1; rx++) + for (int ry = -1; ry <= 1; ry++) + if (BOUNDS_CHECK && (rx || ry)) + { + int r = pmap[y + ry][x + rx]; + if (!r) + continue; + nx = x + rx; + ny = y + ry; + //.life serialization. + if (setFilt) + { + while (TYP(r) == PT_FILT) + { + parts[ID(r)].ctype = 0x10000000 + partlife; + nx += rx; + ny += ry; + if (nx < 0 || ny < 0 || nx >= XRES || ny >= YRES) + break; + r = pmap[ny][nx]; + } + } + //.life deserialization. + if (Setnewlife) + { + if (TYP(r) != PT_FILT) + { + parts[ID(r)].life = Newlife - 0x10000000; + break; + } + } + } + return 0; } -Element_LSNS::~Element_LSNS() {} +Element_LSNS::~Element_LSNS() {} \ No newline at end of file