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

Pretty effect when drawing powders, activate with 'n'

Browse Source
This commit is contained in:
Simon Robertshaw 2011-10-09 13:55:16 +01:00
parent cb30cbcce7
commit ee47b2dd68
5 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/defines.h
View File

@ -162,6 +162,7 @@ extern int aheat_enable;
extern int decorations_enable; extern int decorations_enable;
extern int hud_enable; extern int hud_enable;
extern int debug_flags; extern int debug_flags;
extern int pretty_powder;
int limitFPS; int limitFPS;
int water_equal_test; int water_equal_test;

5
includes/graphics.h
View File

@ -40,6 +40,11 @@ extern unsigned cmode;
extern SDL_Surface *sdl_scrn; extern SDL_Surface *sdl_scrn;
extern int sdl_scale; extern int sdl_scale;
extern int sandcolour_r;
extern int sandcolour_g;
extern int sandcolour_b;
extern int sandcolour_frame;
extern unsigned char fire_r[YRES/CELL][XRES/CELL]; extern unsigned char fire_r[YRES/CELL][XRES/CELL];
extern unsigned char fire_g[YRES/CELL][XRES/CELL]; extern unsigned char fire_g[YRES/CELL][XRES/CELL];
extern unsigned char fire_b[YRES/CELL][XRES/CELL]; extern unsigned char fire_b[YRES/CELL][XRES/CELL];

5
src/graphics.c
View File

@ -25,6 +25,11 @@ unsigned cmode = CM_FIRE;
SDL_Surface *sdl_scrn; SDL_Surface *sdl_scrn;
int sdl_scale = 1; int sdl_scale = 1;
int sandcolour_r = 0;
int sandcolour_g = 0;
int sandcolour_b = 0;
int sandcolour_frame = 0;
unsigned char fire_r[YRES/CELL][XRES/CELL]; unsigned char fire_r[YRES/CELL][XRES/CELL];
unsigned char fire_g[YRES/CELL][XRES/CELL]; unsigned char fire_g[YRES/CELL][XRES/CELL];
unsigned char fire_b[YRES/CELL][XRES/CELL]; unsigned char fire_b[YRES/CELL][XRES/CELL];

10
src/main.c
View File

@ -179,6 +179,7 @@ int decorations_enable = 1;
int hud_enable = 1; int hud_enable = 1;
int active_menu = 0; int active_menu = 0;
int framerender = 0; int framerender = 0;
int pretty_powder = 0;
int amd = 1; int amd = 1;
int FPSB = 0; int FPSB = 0;
int MSIGN =-1; int MSIGN =-1;
@ -1801,6 +1802,13 @@ int main(int argc, char *argv[])
bsy = 1180; bsy = 1180;
if (bsy<0) if (bsy<0)
bsy = 0; bsy = 0;
//Pretty powders, colour cycle
//sandcolour_r = 0;
//sandcolour_g = 0;
sandcolour_b = sandcolour_r = sandcolour_g = (int)(20.0f*sin((float)sandcolour_frame*(M_PI/180.0f)));
sandcolour_frame++;
sandcolour_frame%=360;
if(ngrav_enable && drawgrav_enable) if(ngrav_enable && drawgrav_enable)
draw_grav(vid_buf); draw_grav(vid_buf);
@ -2362,6 +2370,8 @@ int main(int argc, char *argv[])
aheat_enable = !aheat_enable; aheat_enable = !aheat_enable;
if (sdl_key=='h') if (sdl_key=='h')
hud_enable = !hud_enable; hud_enable = !hud_enable;
if (sdl_key=='n')
pretty_powder = !pretty_powder;
if (sdl_key=='p') if (sdl_key=='p')
dump_frame(vid_buf, XRES, YRES, XRES+BARSIZE); dump_frame(vid_buf, XRES, YRES, XRES+BARSIZE);
if (sdl_key=='v'&&(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL))) if (sdl_key=='v'&&(sdl_mod & (KMOD_LCTRL|KMOD_RCTRL)))

14
src/powder.c
View File

@ -987,6 +987,20 @@ inline int create_part(int p, int x, int y, int tv)//the function for creating a
photons[y][x] = t|(i<<8); photons[y][x] = t|(i<<8);
if (t!=PT_STKM&&t!=PT_STKM2 && t!=PT_PHOT && t!=PT_NEUT) if (t!=PT_STKM&&t!=PT_STKM2 && t!=PT_PHOT && t!=PT_NEUT)
pmap[y][x] = t|(i<<8); pmap[y][x] = t|(i<<8);
//Fancy dust effects for powder types
if((ptypes[t].properties & TYPE_PART) && pretty_powder)
{
int colr, colg, colb, randa;
randa = (rand()%30)-15;
colr = (PIXR(ptypes[t].pcolors)+sandcolour_r+(rand()%20)-10+randa);
colg = (PIXG(ptypes[t].pcolors)+sandcolour_g+(rand()%20)-10+randa);
colb = (PIXB(ptypes[t].pcolors)+sandcolour_b+(rand()%20)-10+randa);
colr = colr>255 ? 255 : (colr<0 ? 0 : colr);
colg = colg>255 ? 255 : (colg<0 ? 0 : colg);
colb = colb>255 ? 255 : (colb<0 ? 0 : colb);
parts[i].dcolour = 0xFF000000 | (colr<<16) | (colg<<8) | colb;
}
return i; return i;
} }