From 5e3cd59eeb71b265a5a97d9276b57574529cd939 Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:09:20 -0500 Subject: [PATCH 01/16] Switch from getContrastColor to getColor in GLView * Removed bgcontrast * Added new `Color4f axescolor` obtained by `ColorMap::getColor(..., AXES_COLOR)` * Switched showAxes and showScalemarkers to `axescolor` --- src/GLView.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/GLView.cc b/src/GLView.cc index c7bd88c3..680741cb 100644 --- a/src/GLView.cc +++ b/src/GLView.cc @@ -158,7 +158,7 @@ void GLView::paintGL() glDisable(GL_LIGHTING); Color4f bgcol = ColorMap::getColor(*this->colorscheme, BACKGROUND_COLOR); - Color4f bgcontrast = ColorMap::getContrastColor(bgcol); + Color4f axescolor = ColorMap::getColor(*this->colorscheme, AXES_COLOR); glClearColor(bgcol[0], bgcol[1], bgcol[2], 1.0); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); @@ -169,9 +169,9 @@ void GLView::paintGL() if (showcrosshairs) GLView::showCrosshairs(); glTranslated(cam.object_trans.x(), cam.object_trans.y(), cam.object_trans.z()); // ...the axis lines need to follow the object translation. - if (showaxes) GLView::showAxes(bgcontrast); + if (showaxes) GLView::showAxes(axescolor); // mark the scale along the axis lines - if (showaxes && showscale) GLView::showScalemarkers(bgcontrast); + if (showaxes && showscale) GLView::showScalemarkers(axescolor); } glEnable(GL_LIGHTING); @@ -191,7 +191,7 @@ void GLView::paintGL() // Only for GIMBAL glDisable(GL_LIGHTING); - if (showaxes) GLView::showSmallaxes(bgcontrast); + if (showaxes) GLView::showSmallaxes(axescolor); } #ifdef ENABLE_OPENCSG From 98b6cf3d190190c9b0510fdee321a2658943c02e Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:22:26 -0500 Subject: [PATCH 02/16] Add AXES_COLOR to `enum RenderColor` --- src/colormap.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/colormap.h b/src/colormap.h index bb869dd8..087182e9 100644 --- a/src/colormap.h +++ b/src/colormap.h @@ -13,6 +13,7 @@ namespace fs = boost::filesystem; enum RenderColor { BACKGROUND_COLOR, + AXES_COLOR, OPENCSG_FACE_FRONT_COLOR, OPENCSG_FACE_BACK_COLOR, CGAL_FACE_FRONT_COLOR, From cdbd08a4d3246a3bb17e97e550263f1a3a1d16fd Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:25:53 -0500 Subject: [PATCH 03/16] Default for axis color (for testing) --- src/colormap.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/colormap.cc b/src/colormap.cc index 5196b481..a27da325 100644 --- a/src/colormap.cc +++ b/src/colormap.cc @@ -37,6 +37,7 @@ RenderColorScheme::RenderColorScheme() : _path("") _show_in_gui = true; _color_scheme.insert(ColorScheme::value_type(BACKGROUND_COLOR, Color4f(0xff, 0xff, 0xe5))); + _color_scheme.insert(ColorScheme::value_type(AXES_COLOR, Color4f(0x00, 0x00, 0xff))); _color_scheme.insert(ColorScheme::value_type(OPENCSG_FACE_FRONT_COLOR, Color4f(0xf9, 0xd7, 0x2c))); _color_scheme.insert(ColorScheme::value_type(OPENCSG_FACE_BACK_COLOR, Color4f(0x9d, 0xcb, 0x51))); _color_scheme.insert(ColorScheme::value_type(CGAL_FACE_FRONT_COLOR, Color4f(0xf9, 0xd7, 0x2c))); From 9fb589354002876e57f5e3539abc47f33e5726f1 Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:26:08 -0500 Subject: [PATCH 04/16] Map axes-color in JSON files to AXES_COLOR --- src/colormap.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/colormap.cc b/src/colormap.cc index a27da325..275fa9a1 100644 --- a/src/colormap.cc +++ b/src/colormap.cc @@ -58,6 +58,7 @@ RenderColorScheme::RenderColorScheme(fs::path path) : _path(path) _show_in_gui = pt.get("show-in-gui"); addColor(BACKGROUND_COLOR, "background"); + addColor(AXES_COLOR, "axes-color"); addColor(OPENCSG_FACE_FRONT_COLOR, "opencsg-face-front"); addColor(OPENCSG_FACE_BACK_COLOR, "opencsg-face-back"); addColor(CGAL_FACE_FRONT_COLOR, "cgal-face-front"); From 69e6707c62199ddb3a155027e0497ff707aa2c3c Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:41:54 -0500 Subject: [PATCH 05/16] axes-color for solarized --- color-schemes/render/solarized.json | 1 + 1 file changed, 1 insertion(+) diff --git a/color-schemes/render/solarized.json b/color-schemes/render/solarized.json index 06190ee9..0fd5002b 100644 --- a/color-schemes/render/solarized.json +++ b/color-schemes/render/solarized.json @@ -5,6 +5,7 @@ "colors" : { "background" : "#fdf6e3", + "axes-color" : "#191816", "opencsg-face-front" : "#b58800", "opencsg-face-back" : "#882233", "cgal-face-front" : "#b58800", From c2f2ba5293637fcb721526d7ae69b5b93df4534d Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:43:31 -0500 Subject: [PATCH 06/16] axes-color for beforedawn --- color-schemes/render/beforedawn.json | 1 + 1 file changed, 1 insertion(+) diff --git a/color-schemes/render/beforedawn.json b/color-schemes/render/beforedawn.json index 9e09fcca..d4d98bba 100644 --- a/color-schemes/render/beforedawn.json +++ b/color-schemes/render/beforedawn.json @@ -5,6 +5,7 @@ "colors" : { "background" : "#333333", + "axes-color" : "#c1c1c1", "opencsg-face-front" : "#cccccc", "opencsg-face-back" : "#5563dd", "cgal-face-front" : "#cccccc", From 55affd0273131da503aad48d917fff307c0743ca Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:44:56 -0500 Subject: [PATCH 07/16] axes-color for DeepOcean --- color-schemes/render/deepocean.json | 1 + 1 file changed, 1 insertion(+) diff --git a/color-schemes/render/deepocean.json b/color-schemes/render/deepocean.json index c325db8e..9ce164fd 100644 --- a/color-schemes/render/deepocean.json +++ b/color-schemes/render/deepocean.json @@ -5,6 +5,7 @@ "colors" : { "background" : "#333333", + "axes-color" : "#c1c1c1", "opencsg-face-front" : "#eeeeee", "opencsg-face-back" : "#0babc8", "cgal-face-front" : "#eeeeee", From 7fb626fb08eb8b926c793ab7da74284d212c671d Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:45:53 -0500 Subject: [PATCH 08/16] axes-color for Metallic --- color-schemes/render/metallic.json | 1 + 1 file changed, 1 insertion(+) diff --git a/color-schemes/render/metallic.json b/color-schemes/render/metallic.json index f2582e46..83855876 100644 --- a/color-schemes/render/metallic.json +++ b/color-schemes/render/metallic.json @@ -5,6 +5,7 @@ "colors" : { "background" : "#aaaaff", + "axes-color" : "#222233", "opencsg-face-front" : "#ddddff", "opencsg-face-back" : "#dd22dd", "cgal-face-front" : "#ddddff", From 3511e7079f81a128a49a7315c8cbe7b8dcdf0ba3 Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:47:49 -0500 Subject: [PATCH 09/16] axes-color for Monotone --- color-schemes/render/monotone.json | 1 + 1 file changed, 1 insertion(+) diff --git a/color-schemes/render/monotone.json b/color-schemes/render/monotone.json index 1ce30005..df1a79aa 100644 --- a/color-schemes/render/monotone.json +++ b/color-schemes/render/monotone.json @@ -6,6 +6,7 @@ "colors" : { "background" : "#ffffe5", + "axes-color" : "#191916", "opencsg-face-front" : "#f9d72c", "opencsg-face-back" : "#f9d72c", "cgal-face-front" : "#f9d72c", From f9b074c473ab103d62b5b5c91c9bb74df82626b7 Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:50:14 -0500 Subject: [PATCH 10/16] axes-color for Nature --- color-schemes/render/nature.json | 1 + 1 file changed, 1 insertion(+) diff --git a/color-schemes/render/nature.json b/color-schemes/render/nature.json index 9e19932e..6250e7a3 100644 --- a/color-schemes/render/nature.json +++ b/color-schemes/render/nature.json @@ -5,6 +5,7 @@ "colors" : { "background" : "#fafafa", + "axes-color" : "#323232", "opencsg-face-front" : "#16a085", "opencsg-face-back" : "#dbf4da", "cgal-face-front" : "#16a085", From e6cd3fdda10775c9baa7558340c5000d7d792caa Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:50:22 -0500 Subject: [PATCH 11/16] axes-color for StarNight --- color-schemes/render/starnight.json | 1 + 1 file changed, 1 insertion(+) diff --git a/color-schemes/render/starnight.json b/color-schemes/render/starnight.json index 0dbe702d..88a9510c 100644 --- a/color-schemes/render/starnight.json +++ b/color-schemes/render/starnight.json @@ -5,6 +5,7 @@ "colors" : { "background" : "#000000", + "axes-color" : "#e5e5e5", "opencsg-face-front" : "#ffffe0", "opencsg-face-back" : "#00ffff", "cgal-face-front" : "#ffffe0", From 8e53c296120018fdceacd43b7629a5d216191829 Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:53:11 -0500 Subject: [PATCH 12/16] axes-color for Sunset --- color-schemes/render/sunset.json | 1 + 1 file changed, 1 insertion(+) diff --git a/color-schemes/render/sunset.json b/color-schemes/render/sunset.json index 072c361c..bd7ae26b 100644 --- a/color-schemes/render/sunset.json +++ b/color-schemes/render/sunset.json @@ -5,6 +5,7 @@ "colors" : { "background" : "#aa4444", + "axes-color" : "#220d0d", "opencsg-face-front" : "#ffaaaa", "opencsg-face-back" : "#882233", "cgal-face-front" : "#ffaaaa", From 0c2af2defa42c88da1f99e694a5696ecf7e1ffda Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:53:19 -0500 Subject: [PATCH 13/16] axes-color for Tomorrow --- color-schemes/render/tomorrow.json | 1 + 1 file changed, 1 insertion(+) diff --git a/color-schemes/render/tomorrow.json b/color-schemes/render/tomorrow.json index db21d9a7..559e23fe 100644 --- a/color-schemes/render/tomorrow.json +++ b/color-schemes/render/tomorrow.json @@ -5,6 +5,7 @@ "colors" : { "background" : "#f8f8f8", + "axes-color" : "#181818", "opencsg-face-front" : "#4271ae", "opencsg-face-back" : "#f5871f", "cgal-face-front" : "#3e999f", From ca9f9d9d9c0e3143910e1df80a141f66a4b2fac4 Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 15:53:26 -0500 Subject: [PATCH 14/16] axes-color for Tomorrow Night --- color-schemes/render/tomorrow-night.json | 1 + 1 file changed, 1 insertion(+) diff --git a/color-schemes/render/tomorrow-night.json b/color-schemes/render/tomorrow-night.json index 991755f2..8b7966c0 100644 --- a/color-schemes/render/tomorrow-night.json +++ b/color-schemes/render/tomorrow-night.json @@ -5,6 +5,7 @@ "colors" : { "background" : "#1d1f21", + "axes-color" : "#e8e8e8", "opencsg-face-front" : "#81a2be", "opencsg-face-back" : "#de935f", "cgal-face-front" : "#8abeb7", From 17f9941a08c2d647fad5ec727f7de3b69bfd5472 Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Tue, 12 May 2015 17:37:00 -0500 Subject: [PATCH 15/16] Make default blue color a bit darker --- src/colormap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/colormap.cc b/src/colormap.cc index 275fa9a1..2e6a8a59 100644 --- a/src/colormap.cc +++ b/src/colormap.cc @@ -37,7 +37,7 @@ RenderColorScheme::RenderColorScheme() : _path("") _show_in_gui = true; _color_scheme.insert(ColorScheme::value_type(BACKGROUND_COLOR, Color4f(0xff, 0xff, 0xe5))); - _color_scheme.insert(ColorScheme::value_type(AXES_COLOR, Color4f(0x00, 0x00, 0xff))); + _color_scheme.insert(ColorScheme::value_type(AXES_COLOR, Color4f(0x00, 0x00, 0x7f))); _color_scheme.insert(ColorScheme::value_type(OPENCSG_FACE_FRONT_COLOR, Color4f(0xf9, 0xd7, 0x2c))); _color_scheme.insert(ColorScheme::value_type(OPENCSG_FACE_BACK_COLOR, Color4f(0x9d, 0xcb, 0x51))); _color_scheme.insert(ColorScheme::value_type(CGAL_FACE_FRONT_COLOR, Color4f(0xf9, 0xd7, 0x2c))); From 2c6d783eb765d6f4cd8a48d033738ced70d956b4 Mon Sep 17 00:00:00 2001 From: Liam Marshall Date: Thu, 14 May 2015 14:48:12 -0500 Subject: [PATCH 16/16] Change bacl to black axes for Cornfield --- src/colormap.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/colormap.cc b/src/colormap.cc index 2e6a8a59..7b0f780d 100644 --- a/src/colormap.cc +++ b/src/colormap.cc @@ -37,7 +37,7 @@ RenderColorScheme::RenderColorScheme() : _path("") _show_in_gui = true; _color_scheme.insert(ColorScheme::value_type(BACKGROUND_COLOR, Color4f(0xff, 0xff, 0xe5))); - _color_scheme.insert(ColorScheme::value_type(AXES_COLOR, Color4f(0x00, 0x00, 0x7f))); + _color_scheme.insert(ColorScheme::value_type(AXES_COLOR, Color4f(0x00, 0x00, 0x00))); _color_scheme.insert(ColorScheme::value_type(OPENCSG_FACE_FRONT_COLOR, Color4f(0xf9, 0xd7, 0x2c))); _color_scheme.insert(ColorScheme::value_type(OPENCSG_FACE_BACK_COLOR, Color4f(0x9d, 0xcb, 0x51))); _color_scheme.insert(ColorScheme::value_type(CGAL_FACE_FRONT_COLOR, Color4f(0xf9, 0xd7, 0x2c)));