Make contrast of all player colors the same

build-linux.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-gcc -O3 -Wall -Wextra -o nw -DTARGET_GLUT color.c config.c display.c main.c network.c simulation.c vector.c -lGL -lGLU -lglut -lm
+gcc -O3 -Wall -Wextra -o nw -DTARGET_GLUT config.c display.c main.c network.c simulation.c vector.c hsluv.c -lGL -lGLU -lglut -lm

build-mac.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-gcc -I/usr/local/include -L/usr/local/lib -L/opt/X11/lib -O3 -Wall -Wno-deprecated-declarations -o nw -DTARGET_GLUT color.c config.c display.c main.c network.c simulation.c vector.c -framework OpenGL -framework GLUT -lm
+gcc -I/usr/local/include -L/usr/local/lib -L/opt/X11/lib -O3 -Wall -Wno-deprecated-declarations -o nw -DTARGET_GLUT config.c display.c main.c network.c simulation.c vector.c hsluv.c -framework OpenGL -framework GLUT -lm

build-raspi.sh

@@ -1,2 +1,2 @@
 #!/bin/sh
-gcc -O3 -Wall -Wextra -Wno-unused-parameter -std=gnu11 -o nw -DTARGET_RASPI color.c config.c display.c main.c network.c simulation.c vector.c -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads/ -I/opt/vc/include/interface/vmcs_host/linux -L/opt/vc/lib -lm -lbrcmEGL -lbrcmGLESv2 -lbcm_host -lvchiq_arm
+gcc -O3 -Wall -Wextra -Wno-unused-parameter -std=gnu11 -o nw -DTARGET_RASPI config.c display.c main.c network.c simulation.c vector.c hsluv.c -I/opt/vc/include -I/opt/vc/include/interface/vcos/pthreads/ -I/opt/vc/include/interface/vmcs_host/linux -L/opt/vc/lib -lm -lbrcmEGL -lbrcmGLESv2 -lbcm_host -lvchiq_arm

display.c

@@ -29,7 +29,7 @@
 #endif
 
 #include "config.h"
-#include "color.h"
+#include "hsluv.h"
 #include "simulation.h"
 
 #if defined TARGET_GLUT
@@ -461,13 +461,31 @@ void initDisplay(int* argc, char** argv)
    uiPlayer = malloc(conf.maxPlayers * sizeof(UiPlayer));
    playersByPoints = malloc(conf.maxPlayers * sizeof(int));
 
+   // find the smallest coprime of max_players and use it as a multiplicator
+   // for more even color distribution
+
+   unsigned int multiplier = 2;
+   while (conf.maxPlayers % multiplier == 0)
+   {
+      multiplier++;
+   }
+
+   double hue_step_size = 360.0 / conf.maxPlayers * multiplier;
+   double red_hue = 11.0;
+
+
    for(p = 0; p < conf.maxPlayers; ++p)
    {
-      hsv color;
-      color.h = 360.0 / MIN(conf.maxPlayers, 6) * p + (p / 6) * 30.0;
-      color.s = 0.8;
-      color.v = 1.0;
-      uiPlayer[p].color = hsv2rgb(color);
+
+      double hue = p * hue_step_size  + red_hue;
+      double saturation = 120;
+      double luminosity = 70;
+
+      rgb rgb;
+
+      hpluv2rgb(hue, saturation, luminosity, &rgb.r, &rgb.g, &rgb.b);
+
+      uiPlayer[p].color = rgb;
       playersByPoints[p] = p;
    }
    sorted = 0;

display.h

@@ -1,6 +1,12 @@
 #ifndef _DISPLAY_H_
 #define _DISPLAY_H_
-#include "color.h"
+
+typedef struct
+{
+    double r;
+    double g;
+    double b;
+} rgb;
 
 void updateZoom(double z);
 void toggleFps(void);