From: terencehill Date: Sat, 10 Mar 2018 22:28:14 +0000 (+0100) Subject: Make use of defined constants in colormapPaletteColor code X-Git-Tag: xonotic-v0.8.5~2239 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a0c2863593aa1d56e765ea0713a17e65efb15892;p=xonotic%2Fxonotic-data.pk3dir.git Make use of defined constants in colormapPaletteColor code --- diff --git a/qcsrc/lib/color.qh b/qcsrc/lib/color.qh index 5f9297f2d..6f7a7326d 100644 --- a/qcsrc/lib/color.qh +++ b/qcsrc/lib/color.qh @@ -25,13 +25,13 @@ vector colormapPaletteColor_(int c, bool isPants, float t) case 14: return '1.000000 0.666667 0.000000'; case 15: if (isPants) - return '1 0 0' * (0.502 + 0.498 * sin(t / 2.7182818285 + 0.0000000000)) - + '0 1 0' * (0.502 + 0.498 * sin(t / 2.7182818285 + 2.0943951024)) - + '0 0 1' * (0.502 + 0.498 * sin(t / 2.7182818285 + 4.1887902048)); + return '1 0 0' * (0.502 + 0.498 * sin(t / M_E + 0)) + + '0 1 0' * (0.502 + 0.498 * sin(t / M_E + M_PI * 2 / 3)) + + '0 0 1' * (0.502 + 0.498 * sin(t / M_E + M_PI * 4 / 3)); else - return '1 0 0' * (0.502 + 0.498 * sin(t / 3.1415926536 + 5.2359877560)) - + '0 1 0' * (0.502 + 0.498 * sin(t / 3.1415926536 + 3.1415926536)) - + '0 0 1' * (0.502 + 0.498 * sin(t / 3.1415926536 + 1.0471975512)); + return '1 0 0' * (0.502 + 0.498 * sin(t / M_PI + M_PI * 5 / 3)) + + '0 1 0' * (0.502 + 0.498 * sin(t / M_PI + M_PI)) + + '0 0 1' * (0.502 + 0.498 * sin(t / M_PI + M_PI * 1 / 3)); default: return '0.000 0.000 0.000'; } }