diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2011-11-14 11:11:25 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2011-11-14 11:11:25 (GMT) |
| commit | cef8dfa517c8a3d67fbd4cfddc7cd48958442575 (patch) | |
| tree | 2b9ca54356c00966b67d9aca8d61b676db4360aa /src/graphics.c | |
| parent | c63dff45e4e59ac14c0a087388b89e0d08fa5a62 (diff) | |
| download | powder-cef8dfa517c8a3d67fbd4cfddc7cd48958442575.zip powder-cef8dfa517c8a3d67fbd4cfddc7cd48958442575.tar.gz | |
Colour mode and display mode added to render_ui
Diffstat (limited to 'src/graphics.c')
| -rw-r--r-- | src/graphics.c | 40 |
1 files changed, 4 insertions, 36 deletions
diff --git a/src/graphics.c b/src/graphics.c index 3e889ad..36db658 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1854,7 +1854,7 @@ void render_parts(pixel *vid) pixel_mode &= render_mode; //Alter colour based on display mode - if(display_mode & COLOUR_HEAT) + if(colour_mode & COLOUR_HEAT) { caddress = restrict_flt((int)( restrict_flt((float)(parts[i].temp+(-MIN_TEMP)), 0.0f, MAX_TEMP+(-MIN_TEMP)) / ((MAX_TEMP+(-MIN_TEMP))/1024) ) *3, 0.0f, (1024.0f*3)-3); firea = 255; @@ -1864,7 +1864,7 @@ void render_parts(pixel *vid) cola = 255; if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR; } - else if(display_mode & COLOUR_LIFE) + else if(colour_mode & COLOUR_LIFE) { gradv = 0.4f; if (!(parts[i].life<5)) @@ -1875,41 +1875,9 @@ void render_parts(pixel *vid) cola = 255; if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR; } - - /*switch(cmode) - { - case CM_LIFE: - gradv = 0.4f; - if (!(parts[i].life<5)) - q = sqrt(parts[i].life); - else - q = parts[i].life; - colr = colg = colb = sin(gradv*q) * 100 + 128; - cola = 255; - if(pixel_mode & (FIRE_ADD | FIRE_BLEND)) pixel_mode = (pixel_mode & ~FIRE_ADD) | PMODE_BLUR | PMODE_FLAT; - break; - case CM_PERS: - case CM_CRACK: - case CM_VEL: - case CM_PRESS: - case CM_GRAD: - if(pixel_mode & FIRE_ADD) pixel_mode = (pixel_mode & ~(FIRE_ADD|PMODE_FLAT)) | PMODE_GLOW | PMODE_ADD; - if(pixel_mode & FIRE_BLEND) pixel_mode = (pixel_mode & ~FIRE_BLEND) | PMODE_BLUR; - case CM_FIRE: - if(pixel_mode & PMODE_BLOB) pixel_mode = (pixel_mode & ~PMODE_BLOB) | PMODE_FLAT; - if(pixel_mode & PMODE_BLUR) pixel_mode = (pixel_mode & ~PMODE_BLUR) | PMODE_FLAT; - break; - case CM_BLOB: - if(pixel_mode & PMODE_FLAT) pixel_mode = (pixel_mode & ~PMODE_FLAT) | PMODE_BLOB; - break; - case CM_FANCY: - break; - default: - break; - }*/ - + //Apply decoration colour - if(!(display_mode & COLOUR_HEAT|COLOUR_LIFE)) + if(!(colour_mode & COLOUR_HEAT|COLOUR_LIFE)) { if(!(pixel_mode & NO_DECO) && decorations_enable) { |