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

save tmp2, show decoration color on stamps

Browse Source
This commit is contained in:
Jacob1 2012-01-18 08:20:52 +08:00 committed by Simon Robertshaw
parent eaf2af6d40
commit 35270d1e37
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/save.c
View File

@ -226,7 +226,7 @@ pixel *prerender_save_OPS(void *save, int size, int *width, int *height)
goto fail; goto fail;
} }
if(partsData[i] >= PT_NUM) if(partsData[i] >= PT_NUM)
partsData[i] = PT_DMND; //Replace all invalid powders with diamond partsData[i] = PT_DMND; //Replace all invalid elements with diamond
//Draw type //Draw type
vidBuf[(fullY+y)*fullW+(fullX+x)] = ptypes[partsData[i]].pcolors; vidBuf[(fullY+y)*fullW+(fullX+x)] = ptypes[partsData[i]].pcolors;
@ -273,24 +273,33 @@ pixel *prerender_save_OPS(void *save, int size, int *width, int *height)
} }
} }
//Skip dcolour //Read dcolour
if(fieldDescriptor & 0x40) if(fieldDescriptor & 0x40)
{ {
if(i+3 >= partsDataLen) goto fail; if(i+3 >= partsDataLen) goto fail;
i+=4; i++; //vidBuf[(fullY+y)*fullW+(fullX+x)] = (unsigned)partsData[i++]<<24;
vidBuf[(fullY+y)*fullW+(fullX+x)] = (unsigned)partsData[i++]<<16;
vidBuf[(fullY+y)*fullW+(fullX+x)] |= (unsigned)partsData[i++]<<8;
vidBuf[(fullY+y)*fullW+(fullX+x)] |= (unsigned)partsData[i++];
} }
//Read vx //Skip vx
if(fieldDescriptor & 0x80) if(fieldDescriptor & 0x80)
{ {
if(i++ >= partsDataLen) goto fail; if(i++ >= partsDataLen) goto fail;
} }
//Read vy //Skip vy
if(fieldDescriptor & 0x100) if(fieldDescriptor & 0x100)
{ {
if(i++ >= partsDataLen) goto fail; if(i++ >= partsDataLen) goto fail;
} }
//Skip tmp2
if(fieldDescriptor & 0x400)
{
if(i++ >= partsDataLen) goto fail;
}
} }
} }
} }
@ -424,7 +433,7 @@ void *build_save_OPS(int *size, int orig_x0, int orig_y0, int orig_w, int orig_h
//Copy parts data //Copy parts data
/* Field descriptor format: /* Field descriptor format:
| 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
| vy | vx | dcololour | ctype | tmp[2] | tmp[1] | life[2] | life[1] | temp dbl len| | tmp2 | ctype[2] | vy | vx | dcololour | ctype[1] | tmp[2] | tmp[1] | life[2] | life[1] | temp dbl len|
life[2] means a second byte (for a 16 bit field) if life[1] is present life[2] means a second byte (for a 16 bit field) if life[1] is present
*/ */
partsData = malloc(NPART * (sizeof(particle)+1)); partsData = malloc(NPART * (sizeof(particle)+1));
@ -534,6 +543,13 @@ void *build_save_OPS(int *size, int orig_x0, int orig_y0, int orig_w, int orig_h
if (vTemp>255) vTemp=255; if (vTemp>255) vTemp=255;
partsData[partsDataLen++] = vTemp; partsData[partsDataLen++] = vTemp;
} }
//Tmp2 (optional), 1 byte
if(partsptr[i].tmp2)
{
fieldDesc |= 1 << 10;
partsData[partsDataLen++] = partsptr[i].tmp2;
}
//Write the field descriptor; //Write the field descriptor;
partsData[fieldDescLoc] = fieldDesc; partsData[fieldDescLoc] = fieldDesc;
@ -1004,7 +1020,7 @@ int parse_save_OPS(void *save, int size, int replace, int x0, int y0, unsigned c
goto fail; goto fail;
} }
if(partsData[i] >= PT_NUM) if(partsData[i] >= PT_NUM)
partsData[i] = PT_DMND; //Replace all invalid powders with diamond partsData[i] = PT_DMND; //Replace all invalid elements with diamond
if(pmap[y][x]) if(pmap[y][x])
{ {
//Replace existing particle or allocated block //Replace existing particle or allocated block
@ -1111,6 +1127,13 @@ int parse_save_OPS(void *save, int size, int replace, int x0, int y0, unsigned c
if(i >= partsDataLen) goto fail; if(i >= partsDataLen) goto fail;
partsptr[newIndex].vy = (partsData[i++]-127.0f)/16.0f; partsptr[newIndex].vy = (partsData[i++]-127.0f)/16.0f;
} }
//Read tmp2
if(fieldDescriptor & 0x400)
{
if(i >= partsDataLen) goto fail;
partsptr[newIndex].tmp2 = partsData[i++];
}
} }
} }
} }