summaryrefslogtreecommitdiffstats
path: root/Smoke/palette.c
diff options
context:
space:
mode:
Diffstat (limited to 'Smoke/palette.c')
-rw-r--r--Smoke/palette.c24
1 files changed, 19 insertions, 5 deletions
diff --git a/Smoke/palette.c b/Smoke/palette.c
index a653db7..d8b10a9 100644
--- a/Smoke/palette.c
+++ b/Smoke/palette.c
@@ -13,8 +13,8 @@
static float trip_like_i_do_arr[10][3] = {
- {0.0f, 0.0f, 0.0f}, {1.0f, 0.0f, 0.0f}, {0.0f, 0.0f, 1.0f}, {1.0f, 1.0f, 0.0f}, {0.0f, 1.0f, 1.0f},
- {1.0f, 0.0f, 1.0f}, {1.0f, 0.5f, 0.5f}, {0.5f, 0.5f, 1.0f}, {0.5f, 1.0f, 0.5f}, {0.0f, 1.0f, 0.0f},
+ {0.0f, 0.0f, 0.0f}, {0.1f, 0.1f, 0.1f}, {0.2f, 0.2f, 0.2f}, {0.3f, 0.3f, 0.3f}, {0.4f, 0.4f, 0.4f},
+ {0.5f, 0.5f, 0.5f}, {0.6f, 0.6f, 0.6f}, {0.7f, 0.7f, 0.7f}, {0.8f, 0.8f, 0.8f}, {0.9f, 0.9f, 0.9f},
};
void HSVtoRGB(float *r, float *g, float *b, float h, float s, float v)
@@ -136,6 +136,21 @@ static struct color4f rainbow(float value)
}
+static struct color4f puke_like_he_does(float value)
+{
+ struct color4f return_value;
+ float val;
+
+ val = (float)(((int)(value * 100)) % 10);
+
+ return_value.r = val/10.0f;
+ return_value.g = val/10.0f;
+ return_value.b = val/10.0f;
+
+ return return_value;
+}
+
+
static struct color4f trip_like_i_do(float value)
{
struct color4f return_value;
@@ -223,15 +238,14 @@ struct color4f set_palette(int colormap_sort, float value, int num_colors)
value/= 7;
return_value = rainbow(value);
break;
- case PALETTE_BLUE_GREEN_RED:
- return_value = bluegreenred(value);
- break;
case PALETTE_WILRIK:
return_value = colormap_fire(value);
break;
case PALETTE_OLIVER:
return_value = trip_like_i_do(value);
break;
+ case PALETTE_GREY_BANDS:
+ return_value = puke_like_he_does(value);
case PALETTE_RED:
return_value.r = 1.0f;
break;