Permalink
Browse files

* Added primary color definitions.

* Jump line colors are now properly set.
  • Loading branch information...
1 parent 224efb4 commit af0c5b49533627d52ef4b6a1f71b6cdd2c28ca01 BTAxis committed Jan 22, 2012
Showing with 14 additions and 4 deletions.
  1. +3 −0 src/colour.c
  2. +3 −0 src/colour.h
  3. +8 −4 src/map.c
View
@@ -39,9 +39,11 @@ const glColour cBlack = { .r=0.00, .g=0.00, .b=0.00, .a=1. }; /**< Black */
/* Greens. */
const glColour cGreen = { .r=0.20, .g=0.80, .b=0.20, .a=1. }; /**< Green */
+const glColour cPrimeGreen = { .r=0.00, .g=1.00, .b=0.00, .a=1. }; /**< Primary Green */
/* Reds. */
const glColour cDarkRed = { .r=0.60, .g=0.10, .b=0.10, .a=1. }; /**< Dark Red */
const glColour cRed = { .r=0.80, .g=0.20, .b=0.20, .a=1. }; /**< Red */
+const glColour cPrimeRed = { .r=1.00, .g=0.00, .b=0.00, .a=1. }; /**< Primary Red */
/* Oranges. */
const glColour cOrange = { .r=0.90, .g=0.70, .b=0.10, .a=1. }; /**< Orange */
/* Yellows. */
@@ -52,6 +54,7 @@ const glColour cMidnightBlue = { .r=0.40, .g=0.4, .b=0.60, .a=1. }; /**< Midnigh
const glColour cDarkBlue = { .r=0.10, .g=0.10, .b=0.60, .a=1. }; /**< Dark Blue */
const glColour cBlue = { .r=0.20, .g=0.20, .b=0.80, .a=1. }; /**< Blue */
const glColour cLightBlue = { .r=0.40, .g=0.40, .b=1.00, .a=1. }; /**< Light Blue */
+const glColour cPrimeBlue = { .r=0.00, .g=0.00, .b=1.00, .a=1. }; /**< Primary Blue */
const glColour cCyan = { .r=0.00, .g=1.00, .b=1.00, .a=1. }; /* Cyan. */
/* Purples. */
const glColour cPurple = { .r=0.90, .g=0.10, .b=0.90, .a=1. }; /**< Purple */
View
@@ -40,14 +40,17 @@ extern const glColour cGrey20;
extern const glColour cGrey10;
extern const glColour cGreen;
+extern const glColour cPrimeGreen;
extern const glColour cDarkRed;
extern const glColour cRed;
+extern const glColour cPrimeRed;
extern const glColour cOrange;
extern const glColour cYellow;
extern const glColour cMidnightBlue;
extern const glColour cDarkBlue;
extern const glColour cBlue;
extern const glColour cLightBlue;
+extern const glColour cPrimeBlue;
extern const glColour cPurple;
extern const glColour cDarkPurple;
extern const glColour cBrown;
View
@@ -798,22 +798,26 @@ void map_renderSystems( double bx, double by, double x, double y,
gl_vboActivateOffset( map_vbo, GL_VERTEX_ARRAY, 0, 2, GL_FLOAT, 0 );
gl_vboActivateOffset( map_vbo, GL_COLOR_ARRAY,
sizeof(GLfloat) * 2*3, 4, GL_FLOAT, 0 );
- for (j=0; j<sys->njumps; j++) {
+ for (j = 0; j < sys->njumps; j++) {
jsys = sys->jumps[j].target;
if (!space_sysReachableFromSys(jsys,sys) && !editor)
continue;
/* Choose colours. */
cole = &cBlue;
- for (k=0; k<jsys->njumps; k++) {
- if (jsys->jumps[i].target == sys) {
- if (jp_isFlag(&sys->jumps[j], JP_EXITONLY))
+ for (k = 0; k < jsys->njumps; k++) {
+ if (jsys->jumps[k].target == sys) {
+ if (jp_isFlag(&jsys->jumps[k], JP_EXITONLY))
cole = &cWhite;
+ else if (jp_isFlag(&jsys->jumps[k], JP_HIDDEN))
+ cole = &cRed;
break;
}
}
if (jp_isFlag(&sys->jumps[j], JP_EXITONLY))
col = &cWhite;
+ else if (jp_isFlag(&sys->jumps[j], JP_HIDDEN))
+ col = &cRed;
else
col = &cBlue;

0 comments on commit af0c5b4

Please sign in to comment.