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

TPT: Add PROP_NOAMBHEAT to prevent certain elements from being heated by Ambient heat 8397b6e51a

Browse Source
This commit is contained in:
Simon Robertshaw 2012-06-12 17:25:06 +01:00
parent 318499350d
commit 50a587813e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/simulation/Elements.h
View File

@ -35,6 +35,7 @@
#define PROP_LIFE_KILL 0x08000 //2^15 Kill when life value is <= zero #define PROP_LIFE_KILL 0x08000 //2^15 Kill when life value is <= zero
#define PROP_LIFE_KILL_DEC 0x10000 //2^16 Kill when life value is decremented to <= zero #define PROP_LIFE_KILL_DEC 0x10000 //2^16 Kill when life value is decremented to <= zero
#define PROP_SPARKSETTLE 0x20000 //2^17 Allow Sparks/Embers to settle #define PROP_SPARKSETTLE 0x20000 //2^17 Allow Sparks/Embers to settle
#define PROP_NOAMBHEAT 0x40000 //2^18 Don't transfer or receive heat from ambient heat.
#define FLAG_STAGNANT 1 #define FLAG_STAGNANT 1
#define FLAG_SKIPMOVE 0x2 // skip movement for one frame, only implemented for PHOT #define FLAG_SKIPMOVE 0x2 // skip movement for one frame, only implemented for PHOT

2
src/simulation/Simulation.cpp
View File

@ -3134,7 +3134,7 @@ void Simulation::update_particles_i(int start, int inc)
{ {
float c_Cm = 0.0f; float c_Cm = 0.0f;
#endif #endif
if (aheat_enable) if (aheat_enable && !(elements[t].Properties&PROP_NOAMBHEAT))
{ {
#ifdef REALISTIC #ifdef REALISTIC
c_heat = parts[i].temp*96.645/elements[t].HeatConduct*gel_scale*fabs(elements[t].Weight) + hv[y/CELL][x/CELL]*100*(pv[y/CELL][x/CELL]+273.15f)/256; c_heat = parts[i].temp*96.645/elements[t].HeatConduct*gel_scale*fabs(elements[t].Weight) + hv[y/CELL][x/CELL]*100*(pv[y/CELL][x/CELL]+273.15f)/256;

2
src/simulation/elements/FILT.cpp
View File

@ -31,7 +31,7 @@ Element_FILT::Element_FILT()
Description = "Filter for photons, changes the color."; Description = "Filter for photons, changes the color.";
State = ST_SOLID; State = ST_SOLID;
Properties = TYPE_SOLID; Properties = TYPE_SOLID | PROP_NOAMBHEAT;
LowPressure = IPL; LowPressure = IPL;
LowPressureTransition = NT; LowPressureTransition = NT;