From 29619e9ebfaa5d0358dd5d817631c7df329ebfda Mon Sep 17 00:00:00 2001 From: Simon Robertshaw Date: Tue, 28 Aug 2012 13:19:34 +0100 Subject: [PATCH] WOOD and PLNT turn grey when hot, bluish when cold --- src/simulation/elements/PLNT.cpp | 22 ++++++- src/simulation/elements/WOOD.cpp | 105 ++++++++++++++++++------------- 2 files changed, 84 insertions(+), 43 deletions(-) diff --git a/src/simulation/elements/PLNT.cpp b/src/simulation/elements/PLNT.cpp index 9c87e22a9..84a83c25f 100644 --- a/src/simulation/elements/PLNT.cpp +++ b/src/simulation/elements/PLNT.cpp @@ -43,7 +43,7 @@ Element_PLNT::Element_PLNT() HighTemperatureTransition = PT_FIRE; Update = &Element_PLNT::update; - + Graphics = &Element_PLNT::graphics; } //#TPT-Directive ElementHeader Element_PLNT static int update(UPDATE_FUNC_ARGS) @@ -99,6 +99,26 @@ int Element_PLNT::update(UPDATE_FUNC_ARGS) } parts[i].life = 0; } + if (parts[i].temp > 400 && parts[i].temp > parts[i].tmp2) + parts[i].tmp2 = (int)parts[i].temp; + return 0; +} + +//#TPT-Directive ElementHeader Element_PLNT static int graphics(GRAPHICS_FUNC_ARGS) +int Element_PLNT::graphics(GRAPHICS_FUNC_ARGS) +{ + float maxtemp = fmax(cpart->tmp2, cpart->temp); + if (maxtemp > 300) + { + *colr += (int)restrict_flt((maxtemp-300)/5,0,58); + *colg -= (int)restrict_flt((maxtemp-300)/2,0,102); + *colb += (int)restrict_flt((maxtemp-300)/5,0,70); + } + if (maxtemp < 273) + { + *colg += (int)restrict_flt((273-maxtemp)/4,0,255); + *colb += (int)restrict_flt((273-maxtemp)/1.5,0,255); + } return 0; } diff --git a/src/simulation/elements/WOOD.cpp b/src/simulation/elements/WOOD.cpp index 398c657ad..cbbab8f90 100644 --- a/src/simulation/elements/WOOD.cpp +++ b/src/simulation/elements/WOOD.cpp @@ -2,48 +2,69 @@ //#TPT-Directive ElementClass Element_WOOD PT_WOOD 17 Element_WOOD::Element_WOOD() { - Identifier = "DEFAULT_PT_WOOD"; - Name = "WOOD"; - Colour = PIXPACK(0xC0A040); - MenuVisible = 1; - MenuSection = SC_SOLIDS; - Enabled = 1; - - Advection = 0.0f; - AirDrag = 0.00f * CFDS; - AirLoss = 0.90f; - Loss = 0.00f; - Collision = 0.0f; - Gravity = 0.0f; - Diffusion = 0.00f; - HotAir = 0.000f * CFDS; - Falldown = 0; - - Flammable = 20; - Explosive = 0; - Meltable = 0; - Hardness = 15; - - Weight = 100; - - Temperature = R_TEMP+0.0f +273.15f; - HeatConduct = 164; - Description = "Solid. Flammable."; - - State = ST_SOLID; - Properties = TYPE_SOLID | PROP_NEUTPENETRATE; - - LowPressure = IPL; - LowPressureTransition = NT; - HighPressure = IPH; - HighPressureTransition = NT; - LowTemperature = ITL; - LowTemperatureTransition = NT; - HighTemperature = 873.0f; - HighTemperatureTransition = PT_FIRE; - - Update = NULL; - + Identifier = "DEFAULT_PT_WOOD"; + Name = "WOOD"; + Colour = PIXPACK(0xC0A040); + MenuVisible = 1; + MenuSection = SC_SOLIDS; + Enabled = 1; + + Advection = 0.0f; + AirDrag = 0.00f * CFDS; + AirLoss = 0.90f; + Loss = 0.00f; + Collision = 0.0f; + Gravity = 0.0f; + Diffusion = 0.00f; + HotAir = 0.000f * CFDS; + Falldown = 0; + + Flammable = 20; + Explosive = 0; + Meltable = 0; + Hardness = 15; + + Weight = 100; + + Temperature = R_TEMP+0.0f +273.15f; + HeatConduct = 164; + Description = "Solid. Flammable."; + + State = ST_SOLID; + Properties = TYPE_SOLID | PROP_NEUTPENETRATE; + + LowPressure = IPL; + LowPressureTransition = NT; + HighPressure = IPH; + HighPressureTransition = NT; + LowTemperature = ITL; + LowTemperatureTransition = NT; + HighTemperature = 873.0f; + HighTemperatureTransition = PT_FIRE; + + Update = NULL; + Graphics = &Element_WOOD::graphics; +} + +//#TPT-Directive ElementHeader Element_WOOD static int graphics(GRAPHICS_FUNC_ARGS) +int Element_WOOD::graphics(GRAPHICS_FUNC_ARGS) +{ + float maxtemp = fmax(cpart->tmp, cpart->temp); + if (maxtemp > 400) + { + *colr -= (int)restrict_flt((maxtemp-400)/3,0,172); + *colg -= (int)restrict_flt((maxtemp-400)/4,0,140); + *colb -= (int)restrict_flt((maxtemp-400)/20,0,44); + if (maxtemp > 550) + cpart->tmp = (int)maxtemp; + } + if (maxtemp < 273) + { + *colr -= (int)restrict_flt((273-maxtemp)/5,0,40); + *colg += (int)restrict_flt((273-maxtemp)/4,0,40); + *colb += (int)restrict_flt((273-maxtemp)/1.5,0,150); + } + return 0; } Element_WOOD::~Element_WOOD() {} \ No newline at end of file