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

OPS: Fix byte order when unpacking 4 byte tmp fields

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-25 15:53:27 +01:00
parent 6ace7bd26f
commit 082072a05e
9 changed files with 401 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/GameSave.cpp
View File

@ -836,8 +836,8 @@ void GameSave::readOPS(char * data, int dataLength)
if(fieldDescriptor & 0x1000) if(fieldDescriptor & 0x1000)
{ {
if(i+1 >= partsDataLen) goto fail; if(i+1 >= partsDataLen) goto fail;
particles[newIndex].tmp |= (((unsigned)partsData[i++]) << 16);
particles[newIndex].tmp |= (((unsigned)partsData[i++]) << 24); particles[newIndex].tmp |= (((unsigned)partsData[i++]) << 24);
particles[newIndex].tmp |= (((unsigned)partsData[i++]) << 16);
} }
} }
} }

380
src/simulation/Simulation.cpp
View File

@ -3155,89 +3155,89 @@ void Simulation::update_particles_i(int start, int inc)
currentTick++; currentTick++;
if (lighting_recreate>0) if (lighting_recreate>0)
{ {
for (i=0; i<=parts_lastActiveIndex; i++) for (i=0; i<=parts_lastActiveIndex; i++)
{ {
if (parts[i].type==PT_LIGH && parts[i].tmp2>0) if (parts[i].type==PT_LIGH && parts[i].tmp2>0)
{ {
lighting_ok=0; lighting_ok=0;
break; break;
} }
} }
} }
if (lighting_ok) if (lighting_ok)
lighting_recreate--; lighting_recreate--;
if (lighting_recreate<0) if (lighting_recreate<0)
lighting_recreate=1; lighting_recreate=1;
if (lighting_recreate>21) if (lighting_recreate>21)
lighting_recreate=21; lighting_recreate=21;
//if (sys_pause&&!framerender)//do nothing if paused //if (sys_pause&&!framerender)//do nothing if paused
// return; // return;
if (force_stacking_check || (rand()%10)==0) if (force_stacking_check || (rand()%10)==0)
{ {
force_stacking_check = 0; force_stacking_check = 0;
excessive_stacking_found = 0; excessive_stacking_found = 0;
for (y=0; y<YRES; y++) for (y=0; y<YRES; y++)
{ {
for (x=0; x<XRES; x++) for (x=0; x<XRES; x++)
{ {
// Use a threshold, since some particle stacking can be normal (e.g. BIZR + FILT) // Use a threshold, since some particle stacking can be normal (e.g. BIZR + FILT)
// Setting pmap_count[y][x] > NPART means BHOL will form in that spot // Setting pmap_count[y][x] > NPART means BHOL will form in that spot
if (pmap_count[y][x]>5) if (pmap_count[y][x]>5)
{ {
if (bmap[y/CELL][x/CELL]==WL_EHOLE) if (bmap[y/CELL][x/CELL]==WL_EHOLE)
{ {
// Allow more stacking in E-hole // Allow more stacking in E-hole
if (pmap_count[y][x]>1500) if (pmap_count[y][x]>1500)
{ {
pmap_count[y][x] = pmap_count[y][x] + NPART; pmap_count[y][x] = pmap_count[y][x] + NPART;
excessive_stacking_found = 1; excessive_stacking_found = 1;
} }
} }
else if (pmap_count[y][x]>1500 || (rand()%1600)<=(pmap_count[y][x]+100)) else if (pmap_count[y][x]>1500 || (rand()%1600)<=(pmap_count[y][x]+100))
{ {
pmap_count[y][x] = pmap_count[y][x] + NPART; pmap_count[y][x] = pmap_count[y][x] + NPART;
excessive_stacking_found = 1; excessive_stacking_found = 1;
} }
} }
} }
} }
if (excessive_stacking_found) if (excessive_stacking_found)
{ {
for (i=0; i<=parts_lastActiveIndex; i++) for (i=0; i<=parts_lastActiveIndex; i++)
{ {
if (parts[i].type) if (parts[i].type)
{ {
t = parts[i].type; t = parts[i].type;
x = (int)(parts[i].x+0.5f); x = (int)(parts[i].x+0.5f);
y = (int)(parts[i].y+0.5f); y = (int)(parts[i].y+0.5f);
if (x>=0 && y>=0 && x<XRES && y<YRES && !(elements[t].Properties&TYPE_ENERGY)) if (x>=0 && y>=0 && x<XRES && y<YRES && !(elements[t].Properties&TYPE_ENERGY))
{ {
if (pmap_count[y][x]>=NPART) if (pmap_count[y][x]>=NPART)
{ {
if (pmap_count[y][x]>NPART) if (pmap_count[y][x]>NPART)
{ {
create_part(i, x, y, PT_NBHL); create_part(i, x, y, PT_NBHL);
parts[i].temp = MAX_TEMP; parts[i].temp = MAX_TEMP;
parts[i].tmp = pmap_count[y][x]-NPART;//strength of grav field parts[i].tmp = pmap_count[y][x]-NPART;//strength of grav field
if (parts[i].tmp>51200) parts[i].tmp = 51200; if (parts[i].tmp>51200) parts[i].tmp = 51200;
pmap_count[y][x] = NPART; pmap_count[y][x] = NPART;
} }
else else
{ {
kill_part(i); kill_part(i);
} }
} }
} }
} }
} }
} }
} }
//wire! //wire!
if(elementCount[PT_WIRE] > 0) if(elementCount[PT_WIRE] > 0)
@ -3245,13 +3245,13 @@ void Simulation::update_particles_i(int start, int inc)
for (nx=0; nx<XRES; nx++) for (nx=0; nx<XRES; nx++)
{ {
for (ny=0; ny<YRES; ny++) for (ny=0; ny<YRES; ny++)
{ {
r = pmap[ny][nx]; r = pmap[ny][nx];
if (!r) if (!r)
continue; continue;
if(parts[r>>8].type==PT_WIRE) if(parts[r>>8].type==PT_WIRE)
parts[r>>8].tmp=parts[r>>8].ctype; parts[r>>8].tmp=parts[r>>8].ctype;
} }
} }
} }
@ -3288,33 +3288,33 @@ void Simulation::update_particles_i(int start, int inc)
{ {
//for ( golnum=1; golnum<=NGOL; golnum++) //This shouldn't be necessary any more. //for ( golnum=1; golnum<=NGOL; golnum++) //This shouldn't be necessary any more.
//{ //{
if (parts[r>>8].type==PT_LIFE/* && parts[r>>8].ctype==golnum-1*/) if (parts[r>>8].type==PT_LIFE/* && parts[r>>8].ctype==golnum-1*/)
{ {
golnum = parts[r>>8].ctype+1; golnum = parts[r>>8].ctype+1;
if (golnum<=0 || golnum>NGOLALT) { if (golnum<=0 || golnum>NGOLALT) {
parts[r>>8].type = PT_NONE; parts[r>>8].type = PT_NONE;
continue; continue;
} }
if (parts[r>>8].tmp == grule[golnum][9]-1) { if (parts[r>>8].tmp == grule[golnum][9]-1) {
gol[ny][nx] = golnum; gol[ny][nx] = golnum;
for ( nnx=-1; nnx<2; nnx++) for ( nnx=-1; nnx<2; nnx++)
{
for ( nny=-1; nny<2; nny++)//it will count itself as its own neighbor, which is needed, but will have 1 extra for delete check
{ {
rt = pmap[((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL]; for ( nny=-1; nny<2; nny++)//it will count itself as its own neighbor, which is needed, but will have 1 extra for delete check
if (!rt || (rt&0xFF)==PT_LIFE)
{ {
gol2[((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL][golnum] ++; rt = pmap[((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL];
gol2[((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL][0] ++; if (!rt || (rt&0xFF)==PT_LIFE)
{
gol2[((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL][golnum] ++;
gol2[((ny+nny+YRES-3*CELL)%(YRES-2*CELL))+CELL][((nx+nnx+XRES-3*CELL)%(XRES-2*CELL))+CELL][0] ++;
}
} }
} }
} else {
parts[r>>8].tmp --;
if (parts[r>>8].tmp<=0)
parts[r>>8].type = PT_NONE;//using kill_part makes it not work
} }
} else {
parts[r>>8].tmp --;
if (parts[r>>8].tmp<=0)
parts[r>>8].type = PT_NONE;//using kill_part makes it not work
} }
}
//} //}
} }
} }
@ -3397,33 +3397,33 @@ void Simulation::update_particles_i(int start, int inc)
continue; continue;
} }
} }
//the main particle loop function, goes over all particles. //the main particle loop function, goes over all particles.
for (i=0; i<=parts_lastActiveIndex; i++) for (i=0; i<=parts_lastActiveIndex; i++)
if (parts[i].type) if (parts[i].type)
{ {
t = parts[i].type; t = parts[i].type;
x = (int)(parts[i].x+0.5f); x = (int)(parts[i].x+0.5f);
y = (int)(parts[i].y+0.5f); y = (int)(parts[i].y+0.5f);
//this kills any particle out of the screen, or in a wall where it isn't supposed to go //this kills any particle out of the screen, or in a wall where it isn't supposed to go
if (x<CELL || y<CELL || x>=XRES-CELL || y>=YRES-CELL || if (x<CELL || y<CELL || x>=XRES-CELL || y>=YRES-CELL ||
(bmap[y/CELL][x/CELL] && (bmap[y/CELL][x/CELL] &&
(bmap[y/CELL][x/CELL]==WL_WALL || (bmap[y/CELL][x/CELL]==WL_WALL ||
bmap[y/CELL][x/CELL]==WL_WALLELEC || bmap[y/CELL][x/CELL]==WL_WALLELEC ||
bmap[y/CELL][x/CELL]==WL_ALLOWAIR || bmap[y/CELL][x/CELL]==WL_ALLOWAIR ||
(bmap[y/CELL][x/CELL]==WL_DESTROYALL) || (bmap[y/CELL][x/CELL]==WL_DESTROYALL) ||
(bmap[y/CELL][x/CELL]==WL_ALLOWLIQUID && elements[t].Falldown!=2) || (bmap[y/CELL][x/CELL]==WL_ALLOWLIQUID && elements[t].Falldown!=2) ||
(bmap[y/CELL][x/CELL]==WL_ALLOWSOLID && elements[t].Falldown!=1) || (bmap[y/CELL][x/CELL]==WL_ALLOWSOLID && elements[t].Falldown!=1) ||
(bmap[y/CELL][x/CELL]==WL_ALLOWGAS && !(elements[t].Properties&TYPE_GAS)) || //&& elements[t].Falldown!=0 && parts[i].type!=PT_FIRE && parts[i].type!=PT_SMKE && parts[i].type!=PT_HFLM) || (bmap[y/CELL][x/CELL]==WL_ALLOWGAS && !(elements[t].Properties&TYPE_GAS)) || //&& elements[t].Falldown!=0 && parts[i].type!=PT_FIRE && parts[i].type!=PT_SMKE && parts[i].type!=PT_HFLM) ||
(bmap[y/CELL][x/CELL]==WL_ALLOWENERGY && !(elements[t].Properties&TYPE_ENERGY)) || (bmap[y/CELL][x/CELL]==WL_ALLOWENERGY && !(elements[t].Properties&TYPE_ENERGY)) ||
(bmap[y/CELL][x/CELL]==WL_DETECT && (t==PT_METL || t==PT_SPRK)) || (bmap[y/CELL][x/CELL]==WL_DETECT && (t==PT_METL || t==PT_SPRK)) ||
(bmap[y/CELL][x/CELL]==WL_EWALL && !emap[y/CELL][x/CELL])) && (t!=PT_STKM) && (t!=PT_STKM2) && (t!=PT_FIGH))) (bmap[y/CELL][x/CELL]==WL_EWALL && !emap[y/CELL][x/CELL])) && (t!=PT_STKM) && (t!=PT_STKM2) && (t!=PT_FIGH)))
{ {
kill_part(i); kill_part(i);
continue; continue;
} }
if (bmap[y/CELL][x/CELL]==WL_DETECT && emap[y/CELL][x/CELL]<8) if (bmap[y/CELL][x/CELL]==WL_DETECT && emap[y/CELL][x/CELL]<8)
set_emap(x/CELL, y/CELL); set_emap(x/CELL, y/CELL);
@ -3461,19 +3461,19 @@ void Simulation::update_particles_i(int start, int inc)
//Gravity mode by Moach //Gravity mode by Moach
switch (gravityMode) switch (gravityMode)
{ {
default: default:
case 0: case 0:
pGravX = 0.0f; pGravX = 0.0f;
pGravY = elements[t].Gravity; pGravY = elements[t].Gravity;
break; break;
case 1: case 1:
pGravX = pGravY = 0.0f; pGravX = pGravY = 0.0f;
break; break;
case 2: case 2:
pGravD = 0.01f - hypotf((x - XCNTR), (y - YCNTR)); pGravD = 0.01f - hypotf((x - XCNTR), (y - YCNTR));
pGravX = elements[t].Gravity * ((float)(x - XCNTR) / pGravD); pGravX = elements[t].Gravity * ((float)(x - XCNTR) / pGravD);
pGravY = elements[t].Gravity * ((float)(y - YCNTR) / pGravD); pGravY = elements[t].Gravity * ((float)(y - YCNTR) / pGravD);
break; break;
} }
//Get some gravity from the gravity map //Get some gravity from the gravity map
if (t==PT_ANAR) if (t==PT_ANAR)
@ -3500,9 +3500,14 @@ void Simulation::update_particles_i(int start, int inc)
if (elements[t].Diffusion)//the random diffusion that gasses have if (elements[t].Diffusion)//the random diffusion that gasses have
{ {
#ifdef REALISTIC
//The magic number controlls diffusion speed //The magic number controlls diffusion speed
parts[i].vx += 0.05*sqrtf(parts[i].temp)*elements[t].Diffusion*(rand()/(0.5f*RAND_MAX)-1.0f); parts[i].vx += 0.05*sqrtf(parts[i].temp)*elements[t].Diffusion*(rand()/(0.5f*RAND_MAX)-1.0f);
parts[i].vy += 0.05*sqrtf(parts[i].temp)*elements[t].Diffusion*(rand()/(0.5f*RAND_MAX)-1.0f); parts[i].vy += 0.05*sqrtf(parts[i].temp)*elements[t].Diffusion*(rand()/(0.5f*RAND_MAX)-1.0f);
#else
parts[i].vx += elements[t].Diffusion*(rand()/(0.5f*RAND_MAX)-1.0f);
parts[i].vy += elements[t].Diffusion*(rand()/(0.5f*RAND_MAX)-1.0f);
#endif
} }
j = surround_space = nt = 0;//if nt is 1 after this, then there is a particle around the current particle, that is NOT the current particle's type, for water movement. j = surround_space = nt = 0;//if nt is 1 after this, then there is a particle around the current particle, that is NOT the current particle's type, for water movement.
@ -3524,7 +3529,7 @@ void Simulation::update_particles_i(int start, int inc)
if (!legacy_enable) if (!legacy_enable)
{ {
if (y-2 >= 0 && y-2 < YRES && (elements[t].Properties&TYPE_LIQUID) && (t!=PT_GEL || gel_scale>(1+rand()%255))) {//some heat convection for liquids if (y-2 >= 0 && y-2 < YRES && (elements[t].Properties&TYPE_LIQUID) && (t!=PT_GEL || gel_scale>(1+rand()%255))) {//some heat convection for liquids
r = pmap[y-2][x]; r = pmap[y-2][x];
if (!(!r || parts[i].type != (r&0xFF))) { if (!(!r || parts[i].type != (r&0xFF))) {
if (parts[i].temp>parts[r>>8].temp) { if (parts[i].temp>parts[r>>8].temp) {
@ -3537,11 +3542,18 @@ void Simulation::update_particles_i(int start, int inc)
//heat transfer code //heat transfer code
h_count = 0; h_count = 0;
#ifdef REALISTIC
if (t&&(t!=PT_HSWC||parts[i].life==10)&&(elements[t].HeatConduct*gel_scale)) if (t&&(t!=PT_HSWC||parts[i].life==10)&&(elements[t].HeatConduct*gel_scale))
{ {
float c_Cm = 0.0f; float c_Cm = 0.0f;
#else
if (t&&(t!=PT_HSWC||parts[i].life==10)&&(elements[t].HeatConduct*gel_scale)>(rand()%250))
{
float c_Cm = 0.0f;
#endif
if (aheat_enable && !(elements[t].Properties&PROP_NOAMBHEAT)) if (aheat_enable && !(elements[t].Properties&PROP_NOAMBHEAT))
{ {
#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;
c_Cm = 96.645/elements[t].HeatConduct*gel_scale*fabs(elements[t].Weight) + 100*(pv[y/CELL][x/CELL]+273.15f)/256; c_Cm = 96.645/elements[t].HeatConduct*gel_scale*fabs(elements[t].Weight) + 100*(pv[y/CELL][x/CELL]+273.15f)/256;
pt = c_heat/c_Cm; pt = c_heat/c_Cm;
@ -3550,6 +3562,12 @@ void Simulation::update_particles_i(int start, int inc)
//Pressure increase from heat (temporary) //Pressure increase from heat (temporary)
pv[y/CELL][x/CELL] += (pt-hv[y/CELL][x/CELL])*0.004; pv[y/CELL][x/CELL] += (pt-hv[y/CELL][x/CELL])*0.004;
hv[y/CELL][x/CELL] = pt; hv[y/CELL][x/CELL] = pt;
#else
c_heat = (hv[y/CELL][x/CELL]-parts[i].temp)*0.04;
c_heat = restrict_flt(c_heat, -MAX_TEMP+MIN_TEMP, MAX_TEMP-MIN_TEMP);
parts[i].temp += c_heat;
hv[y/CELL][x/CELL] -= c_heat;
#endif
} }
c_heat = 0.0f; c_heat = 0.0f;
c_Cm = 0.0f; c_Cm = 0.0f;
@ -3561,19 +3579,24 @@ void Simulation::update_particles_i(int start, int inc)
continue; continue;
rt = r&0xFF; rt = r&0xFF;
if (rt&&elements[rt].HeatConduct&&(rt!=PT_HSWC||parts[r>>8].life==10) if (rt&&elements[rt].HeatConduct&&(rt!=PT_HSWC||parts[r>>8].life==10)
&&(t!=PT_FILT||(rt!=PT_BRAY&&rt!=PT_BIZR&&rt!=PT_BIZRG)) &&(t!=PT_FILT||(rt!=PT_BRAY&&rt!=PT_BIZR&&rt!=PT_BIZRG))
&&(rt!=PT_FILT||(t!=PT_BRAY&&t!=PT_PHOT&&t!=PT_BIZR&&t!=PT_BIZRG))) &&(rt!=PT_FILT||(t!=PT_BRAY&&t!=PT_PHOT&&t!=PT_BIZR&&t!=PT_BIZRG)))
{ {
surround_hconduct[j] = r>>8; surround_hconduct[j] = r>>8;
#ifdef REALISTIC
if (rt==PT_GEL) if (rt==PT_GEL)
gel_scale = parts[r>>8].tmp*2.55f; gel_scale = parts[r>>8].tmp*2.55f;
else gel_scale = 1.0f; else gel_scale = 1.0f;
c_heat += parts[r>>8].temp*96.645/elements[rt].HeatConduct*gel_scale*fabs(elements[rt].Weight); c_heat += parts[r>>8].temp*96.645/elements[rt].HeatConduct*gel_scale*fabs(elements[rt].Weight);
c_Cm += 96.645/elements[rt].HeatConduct*gel_scale*fabs(elements[rt].Weight); c_Cm += 96.645/elements[rt].HeatConduct*gel_scale*fabs(elements[rt].Weight);
#else
c_heat += parts[r>>8].temp;
#endif
h_count++; h_count++;
} }
} }
#ifdef REALISTIC
if (t==PT_GEL) if (t==PT_GEL)
gel_scale = parts[i].tmp*2.55f; gel_scale = parts[i].tmp*2.55f;
else gel_scale = 1.0f; else gel_scale = 1.0f;
@ -3586,14 +3609,22 @@ void Simulation::update_particles_i(int start, int inc)
c_heat += parts[i].temp*96.645/elements[t].HeatConduct*gel_scale*fabs(elements[t].Weight); c_heat += parts[i].temp*96.645/elements[t].HeatConduct*gel_scale*fabs(elements[t].Weight);
c_Cm += 96.645/elements[t].HeatConduct*gel_scale*fabs(elements[t].Weight); c_Cm += 96.645/elements[t].HeatConduct*gel_scale*fabs(elements[t].Weight);
parts[i].temp = restrict_flt(pt, MIN_TEMP, MAX_TEMP); parts[i].temp = restrict_flt(pt, MIN_TEMP, MAX_TEMP);
#else
pt = (c_heat+parts[i].temp)/(h_count+1);
pt = parts[i].temp = restrict_flt(pt, MIN_TEMP, MAX_TEMP);
for (j=0; j<8; j++)
{
parts[surround_hconduct[j]].temp = pt;
}
#endif
ctemph = ctempl = pt; ctemph = ctempl = pt;
// change boiling point with pressure // change boiling point with pressure
if ((elements[t].State==ST_LIQUID && elements[t].HighTemperatureTransition>-1 && elements[t].HighTemperatureTransition<PT_NUM && elements[elements[t].HighTemperatureTransition].State==ST_GAS) if ((elements[t].State==ST_LIQUID && elements[t].HighTemperatureTransition>-1 && elements[t].HighTemperatureTransition<PT_NUM && elements[elements[t].HighTemperatureTransition].State==ST_GAS)
|| t==PT_LNTG || t==PT_SLTW) || t==PT_LNTG || t==PT_SLTW)
ctemph -= 2.0f*pv[y/CELL][x/CELL]; ctemph -= 2.0f*pv[y/CELL][x/CELL];
else if ((elements[t].State==ST_GAS && elements[t].LowTemperatureTransition>-1 && elements[t].LowTemperatureTransition<PT_NUM && elements[elements[t].LowTemperatureTransition].State==ST_LIQUID) else if ((elements[t].State==ST_GAS && elements[t].LowTemperatureTransition>-1 && elements[t].LowTemperatureTransition<PT_NUM && elements[elements[t].LowTemperatureTransition].State==ST_LIQUID)
|| t==PT_WTRV) || t==PT_WTRV)
ctempl -= 2.0f*pv[y/CELL][x/CELL]; ctempl -= 2.0f*pv[y/CELL][x/CELL];
s = 1; s = 1;
@ -3603,12 +3634,13 @@ void Simulation::update_particles_i(int start, int inc)
if (ctemph>elements[t].HighTemperature&&elements[t].HighTemperatureTransition>-1) { if (ctemph>elements[t].HighTemperature&&elements[t].HighTemperatureTransition>-1) {
// particle type change due to high temperature // particle type change due to high temperature
#ifdef REALISTIC
float dbt = ctempl - pt; float dbt = ctempl - pt;
if (elements[t].HighTemperatureTransition!=PT_NUM) if (elements[t].HighTemperatureTransition!=PT_NUM)
{ {
if (elements[t].Enthalpy <= (c_heat - (elements[t].HighTemperature - dbt)*c_Cm)) if (platent[t] <= (c_heat - (elements[t].HighTemperature - dbt)*c_Cm))
{ {
pt = (c_heat - elements[t].Enthalpy)/c_Cm; pt = (c_heat - platent[t])/c_Cm;
t = elements[t].HighTemperatureTransition; t = elements[t].HighTemperatureTransition;
} }
else else
@ -3617,31 +3649,42 @@ void Simulation::update_particles_i(int start, int inc)
s = 0; s = 0;
} }
} }
#else
if (elements[t].HighTemperatureTransition!=PT_NUM)
t = elements[t].HighTemperatureTransition;
#endif
else if (t==PT_ICEI || t==PT_SNOW) { else if (t==PT_ICEI || t==PT_SNOW) {
if (parts[i].ctype<PT_NUM&&parts[i].ctype!=t) { if (parts[i].ctype<PT_NUM&&parts[i].ctype!=t) {
if (elements[parts[i].ctype].LowTemperatureTransition==t&&pt<=elements[parts[i].ctype].LowTemperature) s = 0; if (elements[parts[i].ctype].LowTemperatureTransition==t&&pt<=elements[parts[i].ctype].LowTemperature) s = 0;
else { else {
#ifdef REALISTIC
//One ice table value for all it's kinds //One ice table value for all it's kinds
if (elements[t].Enthalpy <= (c_heat - (elements[parts[i].ctype].LowTemperature - dbt)*c_Cm)) if (platent[t] <= (c_heat - (elements[parts[i].ctype].LowTemperature - dbt)*c_Cm))
{ {
pt = (c_heat - elements[t].Enthalpy)/c_Cm; pt = (c_heat - platent[t])/c_Cm;
t = parts[i].ctype; t = parts[i].ctype;
parts[i].ctype = PT_NONE; parts[i].ctype = PT_NONE;
parts[i].life = 0; parts[i].life = 0;
} }
else else
{ {
parts[i].temp = restrict_flt(elements[parts[i].ctype].LowTemperature - dbt, MIN_TEMP, MAX_TEMP); parts[i].temp = restrict_flt(elements[parts[i].ctype].LowTemperature - dbt, MIN_TEMP, MAX_TEMP);
s = 0; s = 0;
} }
#else
t = parts[i].ctype;
parts[i].ctype = PT_NONE;
parts[i].life = 0;
#endif
} }
} }
else s = 0; else s = 0;
} }
else if (t==PT_SLTW) { else if (t==PT_SLTW) {
if (elements[t].Enthalpy <= (c_heat - (elements[t].HighTemperature - dbt)*c_Cm)) #ifdef REALISTIC
if (platent[t] <= (c_heat - (elements[t].HighTemperature - dbt)*c_Cm))
{ {
pt = (c_heat - elements[t].Enthalpy)/c_Cm; pt = (c_heat - platent[t])/c_Cm;
if (rand()%4==0) t = PT_SALT; if (rand()%4==0) t = PT_SALT;
else t = PT_WTRV; else t = PT_WTRV;
@ -3651,16 +3694,21 @@ void Simulation::update_particles_i(int start, int inc)
parts[i].temp = restrict_flt(elements[t].HighTemperature - dbt, MIN_TEMP, MAX_TEMP); parts[i].temp = restrict_flt(elements[t].HighTemperature - dbt, MIN_TEMP, MAX_TEMP);
s = 0; s = 0;
} }
#else
if (1>rand()%6) t = PT_SALT;
else t = PT_WTRV;
#endif
} }
else s = 0; else s = 0;
} else if (ctempl<elements[t].LowTemperature&&elements[t].LowTemperatureTransition>-1) { } else if (ctempl<elements[t].LowTemperature&&elements[t].LowTemperatureTransition>-1) {
// particle type change due to low temperature // particle type change due to low temperature
#ifdef REALISTIC
float dbt = ctempl - pt; float dbt = ctempl - pt;
if (elements[t].LowTemperatureTransition!=PT_NUM) if (elements[t].LowTemperatureTransition!=PT_NUM)
{ {
if (elements[elements[t].LowTemperatureTransition].Enthalpy >= (c_heat - (elements[t].LowTemperature - dbt)*c_Cm)) if (platent[elements[t].LowTemperatureTransition] >= (c_heat - (elements[t].LowTemperature - dbt)*c_Cm))
{ {
pt = (c_heat + elements[elements[t].LowTemperatureTransition].Enthalpy)/c_Cm; pt = (c_heat + platent[elements[t].LowTemperatureTransition])/c_Cm;
t = elements[t].LowTemperatureTransition; t = elements[t].LowTemperatureTransition;
} }
else else
@ -3669,6 +3717,10 @@ void Simulation::update_particles_i(int start, int inc)
s = 0; s = 0;
} }
} }
#else
if (elements[t].LowTemperatureTransition!=PT_NUM)
t = elements[t].LowTemperatureTransition;
#endif
else if (t==PT_WTRV) { else if (t==PT_WTRV) {
if (pt<273.0f) t = PT_RIME; if (pt<273.0f) t = PT_RIME;
else t = PT_DSTW; else t = PT_DSTW;
@ -3700,11 +3752,13 @@ void Simulation::update_particles_i(int start, int inc)
else s = 0; else s = 0;
} }
else s = 0; else s = 0;
#ifdef REALISTIC
pt = restrict_flt(pt, MIN_TEMP, MAX_TEMP); pt = restrict_flt(pt, MIN_TEMP, MAX_TEMP);
for (j=0; j<8; j++) for (j=0; j<8; j++)
{ {
parts[surround_hconduct[j]].temp = pt; parts[surround_hconduct[j]].temp = pt;
} }
#endif
if (s) { // particle type change occurred if (s) { // particle type change occurred
if (t==PT_ICEI||t==PT_LAVA||t==PT_SNOW) if (t==PT_ICEI||t==PT_LAVA||t==PT_SNOW)
parts[i].ctype = parts[i].type; parts[i].ctype = parts[i].type;
@ -3868,8 +3922,13 @@ void Simulation::update_particles_i(int start, int inc)
y = (int)(parts[i].y+0.5f); y = (int)(parts[i].y+0.5f);
} }
#endif #endif
<<<<<<< HEAD
if(legacy_enable)//if heat sim is off if(legacy_enable)//if heat sim is off
Element::legacyUpdate(this, i,x,y,surround_space,nt, parts, pmap); Element::legacyUpdate(this, i,x,y,surround_space,nt, parts, pmap);
=======
//if (legacy_enable)//if heat sim is off
//update_legacy_all(this, i,x,y,surround_space,nt, parts, pmap); //TODO:pop
>>>>>>> parent of d6fe7fa... Basic realistic heat and latent heat support.
killed: killed:
if (parts[i].type == PT_NONE)//if its dead, skip to next particle if (parts[i].type == PT_NONE)//if its dead, skip to next particle
@ -3959,10 +4018,10 @@ killed:
photons[ny][nx] = t|(i<<8); photons[ny][nx] = t|(i<<8);
else if (t) else if (t)
pmap[ny][nx] = t|(i<<8); pmap[ny][nx] = t|(i<<8);
}
} }
} else if (elements[t].Properties & TYPE_ENERGY)
else if (elements[t].Properties & TYPE_ENERGY) {
{
if (t == PT_PHOT) { if (t == PT_PHOT) {
if (parts[i].flags&FLAG_SKIPMOVE) if (parts[i].flags&FLAG_SKIPMOVE)
{ {
@ -4132,7 +4191,7 @@ killed:
s = 1; s = 1;
r = (rand()%2)*2-1; r = (rand()%2)*2-1;
if ((clear_x!=x || clear_y!=y || nt || surround_space) && if ((clear_x!=x || clear_y!=y || nt || surround_space) &&
(fabsf(parts[i].vx)>0.01f || fabsf(parts[i].vy)>0.01f)) (fabsf(parts[i].vx)>0.01f || fabsf(parts[i].vy)>0.01f))
{ {
// allow diagonal movement if target position is blocked // allow diagonal movement if target position is blocked
// but no point trying this if particle is stuck in a block of identical particles // but no point trying this if particle is stuck in a block of identical particles
@ -4175,14 +4234,14 @@ killed:
for (j=clear_x+r; j>=0 && j>=clear_x-rt && j<clear_x+rt && j<XRES; j+=r) for (j=clear_x+r; j>=0 && j>=clear_x-rt && j<clear_x+rt && j<XRES; j+=r)
{ {
if (((pmap[fin_y][j]&0xFF)!=t || bmap[fin_y/CELL][j/CELL]) if (((pmap[fin_y][j]&0xFF)!=t || bmap[fin_y/CELL][j/CELL])
&& (s=do_move(i, x, y, (float)j, fin_yf))) && (s=do_move(i, x, y, (float)j, fin_yf)))
{ {
nx = (int)(parts[i].x+0.5f); nx = (int)(parts[i].x+0.5f);
ny = (int)(parts[i].y+0.5f); ny = (int)(parts[i].y+0.5f);
break; break;
} }
if (fin_y!=clear_y && ((pmap[clear_y][j]&0xFF)!=t || bmap[clear_y/CELL][j/CELL]) if (fin_y!=clear_y && ((pmap[clear_y][j]&0xFF)!=t || bmap[clear_y/CELL][j/CELL])
&& (s=do_move(i, x, y, (float)j, clear_yf))) && (s=do_move(i, x, y, (float)j, clear_yf)))
{ {
nx = (int)(parts[i].x+0.5f); nx = (int)(parts[i].x+0.5f);
ny = (int)(parts[i].y+0.5f); ny = (int)(parts[i].y+0.5f);
@ -4495,6 +4554,7 @@ void Simulation::update_particles()//doesn't update the particles themselves, bu
Simulation::~Simulation() Simulation::~Simulation()
{ {
delete[] platent;
delete grav; delete grav;
delete air; delete air;
for(int i = 0; i < tools.size(); i++) for(int i = 0; i < tools.size(); i++)
@ -4547,6 +4607,12 @@ Simulation::Simulation():
memcpy(wtypes, wtypesT, wallCount * sizeof(wall_type)); memcpy(wtypes, wtypesT, wallCount * sizeof(wall_type));
free(wtypesT); free(wtypesT);
platent = new unsigned[PT_NUM];
int latentCount;
unsigned int * platentT = LoadLatent(latentCount);
memcpy(platent, platentT, latentCount * sizeof(unsigned int));
free(platentT);
//elements = new Element[PT_NUM]; //elements = new Element[PT_NUM];
std::vector<Element> elementList = GetElements(); std::vector<Element> elementList = GetElements();
for(int i = 0; i < PT_NUM; i++) for(int i = 0; i < PT_NUM; i++)

1
src/simulation/Simulation.h
View File

@ -50,6 +50,7 @@ public:
Element elements[PT_NUM]; Element elements[PT_NUM];
//Element * elements; //Element * elements;
std::vector<SimTool*> tools; std::vector<SimTool*> tools;
unsigned int * platent;
wall_type wtypes[UI_WALLCOUNT]; wall_type wtypes[UI_WALLCOUNT];
gol_menu gmenu[NGOL]; gol_menu gmenu[NGOL];
int goltype[NGOL]; int goltype[NGOL];

172
src/simulation/SimulationData.cpp
View File

@ -170,3 +170,175 @@ menu_section * LoadMenus(int & menuCount)
memcpy(msectionsT, msections, SC_TOTAL*sizeof(menu_section)); memcpy(msectionsT, msections, SC_TOTAL*sizeof(menu_section));
return msectionsT; return msectionsT;
} }
unsigned int * LoadLatent(int & elementCount)
{
unsigned int platent[PT_NUM] =
{
/* NONE */ 0,
/* DUST */ 0,
/* WATR */ 7500,
/* OIL */ 0,
/* FIRE */ 0,
/* STNE */ 0,
/* LAVA */ 0,
/* GUN */ 0,
/* NITR */ 0,
/* CLNE */ 0,
/* GAS */ 0,
/* C-4 */ 0,
/* GOO */ 0,
/* ICE */ 1095,
/* METL */ 919,
/* SPRK */ 0,
/* SNOW */ 1095,
/* WOOD */ 0,
/* NEUT */ 0,
/* PLUT */ 0,
/* PLNT */ 0,
/* ACID */ 0,
/* VOID */ 0,
/* WTRV */ 0,
/* CNCT */ 0,
/* DSTW */ 7500,
/* SALT */ 0,
/* SLTW */ 7500,
/* DMND */ 0,
/* BMTL */ 0,
/* BRMT */ 0,
/* PHOT */ 0,
/* URAN */ 0,
/* WAX */ 0,
/* MWAX */ 0,
/* PSCN */ 0,
/* NSCN */ 0,
/* LN2 */ 0,
/* INSL */ 0,
/* VACU */ 0,
/* VENT */ 0,
/* RBDM */ 0,
/* LRBD */ 0,
/* NTCT */ 0,
/* SAND */ 0,
/* GLAS */ 0,
/* PTCT */ 0,
/* BGLA */ 0,
/* THDR */ 0,
/* PLSM */ 0,
/* ETRD */ 0,
/* NICE */ 0,
/* NBLE */ 0,
/* BTRY */ 0,
/* LCRY */ 0,
/* STKM */ 0,
/* SWCH */ 0,
/* SMKE */ 0,
/* DESL */ 0,
/* COAL */ 0,
/* LO2 */ 0,
/* O2 */ 0,
/* INWR */ 0,
/* YEST */ 0,
/* DYST */ 0,
/* THRM */ 0,
/* GLOW */ 0,
/* BRCK */ 0,
/* CFLM */ 0,
/* FIRW */ 0,
/* FUSE */ 0,
/* FSEP */ 0,
/* AMTR */ 0,
/* BCOL */ 0,
/* PCLN */ 0,
/* HSWC */ 0,
/* IRON */ 0,
/* MORT */ 0,
/* LIFE */ 0,
/* DLAY */ 0,
/* CO2 */ 0,
/* DRIC */ 0,
/* CBNW */ 7500,
/* STOR */ 0,
/* STOR */ 0,
/* FREE */ 0,
/* FREE */ 0,
/* FREE */ 0,
/* FREE */ 0,
/* FREE */ 0,
/* SPNG */ 0,
/* RIME */ 0,
/* FOG */ 0,
/* BCLN */ 0,
/* LOVE */ 0,
/* DEUT */ 0,
/* WARP */ 0,
/* PUMP */ 0,
/* FWRK */ 0,
/* PIPE */ 0,
/* FRZZ */ 0,
/* FRZW */ 0,
/* GRAV */ 0,
/* BIZR */ 0,
/* BIZRG*/ 0,
/* BIZRS*/ 0,
/* INST */ 0,
/* ISOZ */ 0,
/* ISZS */ 0,
/* PRTI */ 0,
/* PRTO */ 0,
/* PSTE */ 0,
/* PSTS */ 0,
/* ANAR */ 0,
/* VINE */ 0,
/* INVS */ 0,
/* EQVE */ 0,
/* SPWN2*/ 0,
/* SPAWN*/ 0,
/* SHLD1*/ 0,
/* SHLD2*/ 0,
/* SHLD3*/ 0,
/* SHLD4*/ 0,
/* LOlZ */ 0,
/* WIFI */ 0,
/* FILT */ 0,
/* ARAY */ 0,
/* BRAY */ 0,
/* STKM2*/ 0,
/* BOMB */ 0,
/* C-5 */ 0,
/* SING */ 0,
/* QRTZ */ 0,
/* PQRT */ 0,
/* EMP */ 0,
/* BREL */ 0,
/* ELEC */ 0,
/* ACEL */ 0,
/* DCEL */ 0,
/* TNT */ 0,
/* IGNP */ 0,
/* BOYL */ 0,
/* GEL */ 0,
/* FREE */ 0,
/* FREE */ 0,
/* FREE */ 0,
/* FREE */ 0,
/* WIND */ 0,
/* H2 */ 0,
/* SOAP */ 0,
/* NBHL */ 0,
/* NWHL */ 0,
/* MERC */ 0,
/* PBCN */ 0,
/* GPMP */ 0,
/* CLST */ 0,
/* WIRE */ 0,
/* GBMB */ 0,
/* FIGH */ 0,
/* FRAY */ 0,
/* REPL */ 0,
};
elementCount = PT_NUM;
unsigned int * platentT = (unsigned int*)malloc(PT_NUM*sizeof(unsigned int));
memcpy(platentT, platent, PT_NUM*sizeof(unsigned int));
return platentT;
}

2
src/simulation/SimulationData.h
View File

@ -172,4 +172,6 @@ wall_type * LoadWalls(int & wallCount);
menu_section * LoadMenus(int & menuCount); menu_section * LoadMenus(int & menuCount);
unsigned int * LoadLatent(int & elementCount);
#endif /* SIMULATIONDATA_H_ */ #endif /* SIMULATIONDATA_H_ */

1
src/simulation/elements/Element.cpp
View File

@ -26,7 +26,6 @@ Element::Element():
Weight(50), Weight(50),
Temperature(273.15f), Temperature(273.15f),
Enthalpy(0.0f),
HeatConduct(128), HeatConduct(128),
Description("No description"), Description("No description"),

1
src/simulation/elements/Element.h
View File

@ -32,7 +32,6 @@ public:
int Weight; int Weight;
int MenuSection; int MenuSection;
float Temperature; float Temperature;
float Enthalpy;
unsigned char HeatConduct; unsigned char HeatConduct;
char *Description; char *Description;
char State; char State;

4
src/simulation/elements/FIRE.cpp
View File

@ -27,7 +27,7 @@ Element_FIRE::Element_FIRE()
Weight = 2; Weight = 2;
Temperature = R_TEMP+400.0f+273.15f; Temperature = R_TEMP+400.0f+273.15f;
HeatConduct = 1; HeatConduct = 88;
Description = "Ignites flammable materials. Heats air."; Description = "Ignites flammable materials. Heats air.";
State = ST_GAS; State = ST_GAS;
@ -199,4 +199,4 @@ int Element_FIRE::graphics(GRAPHICS_FUNC_ARGS)
return 0; return 0;
} }
Element_FIRE::~Element_FIRE() {} Element_FIRE::~Element_FIRE() {}

1
src/simulation/elements/WATR.cpp
View File

@ -27,7 +27,6 @@ Element_WATR::Element_WATR()
Weight = 30; Weight = 30;
Temperature = R_TEMP-2.0f +273.15f; Temperature = R_TEMP-2.0f +273.15f;
Enthalpy = 7500;
HeatConduct = 29; HeatConduct = 29;
Description = "Liquid. Conducts electricity. Freezes. Extinguishes fires."; Description = "Liquid. Conducts electricity. Freezes. Extinguishes fires.";