From 8acc56b21ea69777f5a3a7a2cc4e012f06cd30f4 Mon Sep 17 00:00:00 2001 From: Nathan Date: Sun, 17 Sep 2017 12:58:42 -0500 Subject: [PATCH] map color updates Former-commit-id: 8544751e3259398a4852af3544ccd9abcd454045 Former-commit-id: b9b5bdbfdb7eb4b750949c87bd576fbd92f26afe --- sdl1090/draw.c | 20 ++++++++++---------- sdl1090/init.c | 1 + sdl1090/view1090.REMOVED.git-id | 2 +- sdl1090/~$mapconversion.xlsx | Bin 171 -> 0 bytes 4 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 sdl1090/~$mapconversion.xlsx diff --git a/sdl1090/draw.c b/sdl1090/draw.c index b5cb8da..5e0cb3c 100644 --- a/sdl1090/draw.c +++ b/sdl1090/draw.c @@ -218,17 +218,17 @@ void drawGrid() if(AA) { aacircleRGBA (game.screen, SCREEN_WIDTH>>1, SCREEN_HEIGHT>>1, p1km, 249,38,114, SDL_ALPHA_OPAQUE); - aacircleRGBA (game.screen, SCREEN_WIDTH>>1, SCREEN_HEIGHT>>1, p10km, 249,38,114, 196); - aacircleRGBA (game.screen, SCREEN_WIDTH>>1, SCREEN_HEIGHT>>1, p100km, 249,38,114, 127); + aacircleRGBA (game.screen, SCREEN_WIDTH>>1, SCREEN_HEIGHT>>1, p10km, 187,29,86, SDL_ALPHA_OPAQUE); + aacircleRGBA (game.screen, SCREEN_WIDTH>>1, SCREEN_HEIGHT>>1, p100km, 125,19,57, SDL_ALPHA_OPAQUE); } else { circleRGBA (game.screen, SCREEN_WIDTH>>1, SCREEN_HEIGHT>>1, p1km, 249,38,114, SDL_ALPHA_OPAQUE); - circleRGBA (game.screen, SCREEN_WIDTH>>1, SCREEN_HEIGHT>>1, p10km, 249,38,114, 196); - circleRGBA (game.screen, SCREEN_WIDTH>>1, SCREEN_HEIGHT>>1, p100km, 249,38,114, 127); + circleRGBA (game.screen, SCREEN_WIDTH>>1, SCREEN_HEIGHT>>1, p10km, 187,29,86, SDL_ALPHA_OPAQUE); + circleRGBA (game.screen, SCREEN_WIDTH>>1, SCREEN_HEIGHT>>1, p100km, 125,19,57, SDL_ALPHA_OPAQUE); } - drawString("1km", (SCREEN_WIDTH>>1) + p1km + 5, (SCREEN_HEIGHT>>1) + 5, game.font, setColor(64,64,64)); - drawString("10km", (SCREEN_WIDTH>>1) + p10km + 5, (SCREEN_HEIGHT>>1) + 5, game.font, setColor(64,64,64)); - drawString("100km", (SCREEN_WIDTH>>1) + p100km + 5, (SCREEN_HEIGHT>>1) + 5, game.font, setColor(64,64,64)); + drawString("1km", (SCREEN_WIDTH>>1) + p1km + 5, (SCREEN_HEIGHT>>1) + 5, game.font, setColor(249,38,114)); + drawString("10km", (SCREEN_WIDTH>>1) + p10km + 5, (SCREEN_HEIGHT>>1) + 5, game.font, setColor(187,29,86)); + drawString("100km", (SCREEN_WIDTH>>1) + p100km + 5, (SCREEN_HEIGHT>>1) + 5, game.font, setColor(125,19,57)); } void drawGeography() { @@ -261,9 +261,9 @@ void drawGeography() { // geoColor.g = (uint8_t) (colorDist * 29.0 + (1.0 - colorDist) * 266.0); // geoColor.b = (uint8_t) (colorDist * 240.0 + (1.0 - colorDist) * 16.0); - geoColor.r = 114; - geoColor.g = 129; - geoColor.b = 255; + geoColor.r = 100; + geoColor.g = 0; + geoColor.b = 200; if(AA) { aalineRGBA(game.screen, x1, y1, x2, y2,geoColor.r,geoColor.g,geoColor.b, SDL_ALPHA_OPAQUE); diff --git a/sdl1090/init.c b/sdl1090/init.c index e271aa3..049dcc5 100644 --- a/sdl1090/init.c +++ b/sdl1090/init.c @@ -69,6 +69,7 @@ void cleanup() /* Close SDL_TTF */ TTF_Quit(); + /* Shut down SDL */ diff --git a/sdl1090/view1090.REMOVED.git-id b/sdl1090/view1090.REMOVED.git-id index 4331711..5be9935 100644 --- a/sdl1090/view1090.REMOVED.git-id +++ b/sdl1090/view1090.REMOVED.git-id @@ -1 +1 @@ -3dc133421ef7d0474dfec87001d49f3cf4f7d3b4 \ No newline at end of file +0539f0c770f684b7ef79f185c195a747d2736a87 \ No newline at end of file diff --git a/sdl1090/~$mapconversion.xlsx b/sdl1090/~$mapconversion.xlsx deleted file mode 100644 index 02a3bf931d25f58421e6fb4d8e73f5c46b4bee6d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmWgj%}g%JFV0UZQSeVo%S=vH2rW)6QXm9G8GIQs8Il=_81fm4fjEt!gh7G9A4sQx X#Z!U2P@qgIP=x};kU`ep-IfOcx*!=T