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

Added back heat gradient display

Browse Source
This commit is contained in:
Jacob1 2011-11-17 18:31:52 -05:00 committed by Simon Robertshaw
parent f2759c7f2c
commit f135dbb734
3 changed files with 52 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
includes/powdergraphics.h
View File

@ -36,6 +36,7 @@
#define COLOUR_HEAT 0x00000001 #define COLOUR_HEAT 0x00000001
#define COLOUR_LIFE 0x00000002 #define COLOUR_LIFE 0x00000002
#define COLOUR_GRAD 0x00000004
#define COLOUR_DEFAULT 0x00000000 #define COLOUR_DEFAULT 0x00000000

10
src/graphics.c
View File

@ -1877,6 +1877,16 @@ void render_parts(pixel *vid)
cola = 255; cola = 255;
if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR; if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
} }
if (colour_mode & COLOUR_GRAD)
{
float frequency = 0.05;
int q = parts[i].temp-40;
colr = sin(frequency*q) * 16 + PIXR(ptypes[t].pcolors);
colg = sin(frequency*q) * 16 + PIXG(ptypes[t].pcolors);
colb = sin(frequency*q) * 16 + PIXB(ptypes[t].pcolors);
if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
pixel_mode |= PMODE_BLEND;
}
//Apply decoration colour //Apply decoration colour
if(!colour_mode) if(!colour_mode)

67
src/interface.c
View File

@ -2667,33 +2667,43 @@ void set_cmode(int cm) // sets to given view mode
{ {
int cmode = cm; int cmode = cm;
colour_mode = COLOUR_DEFAULT; colour_mode = COLOUR_DEFAULT;
free(render_modes); free(render_modes);
render_modes = calloc(1, sizeof(unsigned int)); render_modes = calloc(1, sizeof(unsigned int));
render_mode = RENDER_BASC; render_mode = RENDER_BASC;
render_modes[0] = RENDER_BASC; render_modes[0] = RENDER_BASC;
free(display_modes); free(display_modes);
display_mode = 0; display_mode = 0;
display_modes = calloc(0, sizeof(unsigned int)); display_modes = calloc(1, sizeof(unsigned int));
display_modes[0] = 0;
itc = 51; itc = 51;
if (cmode==CM_VEL) if (cmode==CM_VEL)
{ {
display_modes = calloc(1, sizeof(unsigned int)); free(display_modes);
display_modes = calloc(2, sizeof(unsigned int));
display_mode |= DISPLAY_AIRV; display_mode |= DISPLAY_AIRV;
display_modes[0] = DISPLAY_AIRV; display_modes[0] = DISPLAY_AIRV;
display_modes[1] = 0;
strcpy(itc_msg, "Velocity Display"); strcpy(itc_msg, "Velocity Display");
} }
else if (cmode==CM_PRESS) else if (cmode==CM_PRESS)
{ {
display_modes = calloc(1, sizeof(unsigned int)); free(display_modes);
display_modes = calloc(2, sizeof(unsigned int));
display_mode |= DISPLAY_AIRP; display_mode |= DISPLAY_AIRP;
display_modes[0] = DISPLAY_AIRP; display_modes[0] = DISPLAY_AIRP;
display_modes[1] = 0;
strcpy(itc_msg, "Pressure Display"); strcpy(itc_msg, "Pressure Display");
} }
else if (cmode==CM_PERS) else if (cmode==CM_PERS)
{ {
display_modes = calloc(1, sizeof(unsigned int)); free(display_modes);
display_modes = calloc(2, sizeof(unsigned int));
display_mode |= DISPLAY_PERS; display_mode |= DISPLAY_PERS;
display_modes[0] = DISPLAY_PERS; display_modes[0] = DISPLAY_PERS;
display_modes[1] = 0;
memset(pers_bg, 0, (XRES+BARSIZE)*YRES*PIXELSIZE); memset(pers_bg, 0, (XRES+BARSIZE)*YRES*PIXELSIZE);
strcpy(itc_msg, "Persistent Display"); strcpy(itc_msg, "Persistent Display");
} }
@ -2702,9 +2712,8 @@ void set_cmode(int cm) // sets to given view mode
free(render_modes); free(render_modes);
render_modes = calloc(2, sizeof(unsigned int)); render_modes = calloc(2, sizeof(unsigned int));
render_mode |= RENDER_FIRE; render_mode |= RENDER_FIRE;
render_mode |= RENDER_GLOW;
render_modes[0] = RENDER_FIRE; render_modes[0] = RENDER_FIRE;
render_modes[1] = RENDER_GLOW; render_modes[1] = 0;
memset(fire_r, 0, sizeof(fire_r)); memset(fire_r, 0, sizeof(fire_r));
memset(fire_g, 0, sizeof(fire_g)); memset(fire_g, 0, sizeof(fire_g));
memset(fire_b, 0, sizeof(fire_b)); memset(fire_b, 0, sizeof(fire_b));
@ -2712,10 +2721,17 @@ void set_cmode(int cm) // sets to given view mode
} }
else if (cmode==CM_BLOB) else if (cmode==CM_BLOB)
{ {
free(render_modes);
render_modes = calloc(3, sizeof(unsigned int));
render_mode |= RENDER_FIRE;
render_mode |= RENDER_BLOB;
render_modes[0] = RENDER_FIRE;
render_modes[1] = RENDER_BLOB;
render_modes[2] = 0;
memset(fire_r, 0, sizeof(fire_r)); memset(fire_r, 0, sizeof(fire_r));
memset(fire_g, 0, sizeof(fire_g)); memset(fire_g, 0, sizeof(fire_g));
memset(fire_b, 0, sizeof(fire_b)); memset(fire_b, 0, sizeof(fire_b));
strcpy(itc_msg, "Not Implemented");//strcpy(itc_msg, "Blob Display"); strcpy(itc_msg, "Blob Display");
} }
else if (cmode==CM_HEAT) else if (cmode==CM_HEAT)
{ {
@ -2725,14 +2741,19 @@ void set_cmode(int cm) // sets to given view mode
else if (cmode==CM_FANCY) else if (cmode==CM_FANCY)
{ {
free(render_modes); free(render_modes);
render_modes = calloc(2, sizeof(unsigned int)); render_modes = calloc(4, sizeof(unsigned int));
render_mode |= RENDER_FIRE; render_mode |= RENDER_FIRE;
render_mode |= RENDER_GLOW; render_mode |= RENDER_GLOW;
render_mode |= RENDER_BLUR;
render_modes[0] = RENDER_FIRE; render_modes[0] = RENDER_FIRE;
render_modes[1] = RENDER_GLOW; render_modes[1] = RENDER_GLOW;
display_modes = calloc(1, sizeof(unsigned int)); render_modes[2] = RENDER_BLUR;
render_modes[3] = 0;
free(display_modes);
display_modes = calloc(2, sizeof(unsigned int));
display_mode |= DISPLAY_WARP; display_mode |= DISPLAY_WARP;
display_modes[0] = DISPLAY_WARP; display_modes[0] = DISPLAY_WARP;
display_modes[1] = 0;
memset(fire_r, 0, sizeof(fire_r)); memset(fire_r, 0, sizeof(fire_r));
memset(fire_g, 0, sizeof(fire_g)); memset(fire_g, 0, sizeof(fire_g));
memset(fire_b, 0, sizeof(fire_b)); memset(fire_b, 0, sizeof(fire_b));
@ -2740,31 +2761,25 @@ void set_cmode(int cm) // sets to given view mode
} }
else if (cmode==CM_NOTHING) else if (cmode==CM_NOTHING)
{ {
render_mode = RENDER_NONE;
render_modes[0] = RENDER_NONE;
strcpy(itc_msg, "Nothing Display"); strcpy(itc_msg, "Nothing Display");
} }
else if (cmode==CM_GRAD) else if (cmode==CM_GRAD)
{ {
strcpy(itc_msg, "Not Implemented");//strcpy(itc_msg, "Heat Gradient Display"); colour_mode = COLOUR_GRAD;
strcpy(itc_msg, "Heat Gradient Display");
} }
else if (cmode==CM_LIFE) else if (cmode==CM_LIFE)
{ {
if (DEBUG_MODE) //can only get to Life view in debug mode colour_mode = COLOUR_LIFE;
{ strcpy(itc_msg, "Life Gradient Display");
colour_mode = COLOUR_LIFE;
strcpy(itc_msg, "Life Display");
}
else
{
set_cmode(CM_CRACK);
}
} }
else if (cmode==CM_CRACK) else if (cmode==CM_CRACK)
{ {
display_modes = calloc(1, sizeof(unsigned int)); free(display_modes);
display_modes = calloc(2, sizeof(unsigned int));
display_mode |= DISPLAY_AIRC; display_mode |= DISPLAY_AIRC;
display_modes[0] = DISPLAY_AIRC; display_modes[0] = DISPLAY_AIRC;
display_modes[1] = 0;
strcpy(itc_msg, "Alternate Velocity Display"); strcpy(itc_msg, "Alternate Velocity Display");
} }
else //if no special text given, it will display this. else //if no special text given, it will display this.
@ -6222,10 +6237,10 @@ void render_ui(pixel * vid_buf, int xcoord, int ycoord, int orientation)
int display_optionicons[] = {10, 1, 0, 5, -1, 2, -1}; int display_optionicons[] = {10, 1, 0, 5, -1, 2, -1};
char * display_desc[] = {"Air: Cracker", "Air: Pressure", "Air: Velocity", "Air: Heat", "Warp effect", "Persistent", "Effects"}; char * display_desc[] = {"Air: Cracker", "Air: Pressure", "Air: Velocity", "Air: Heat", "Warp effect", "Persistent", "Effects"};
int colour_optioncount = 2; int colour_optioncount = 3;
int colour_options[] = {COLOUR_LIFE, COLOUR_HEAT}; int colour_options[] = {COLOUR_LIFE, COLOUR_HEAT, COLOUR_GRAD};
int colour_optionicons[] = {-1, 5}; int colour_optionicons[] = {-1, 5, 8};
char * colour_desc[] = {"Life", "Heat"}; char * colour_desc[] = {"Life", "Heat", "Heat Gradient"};
yoffset = 16; yoffset = 16;
xoffset = 0; xoffset = 0;