vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1338 from ArchimedesPi/axes-colorscheme 

Add a axes-color option for color schemes
master
Marius Kintel 2015-05-14 22:12:37 -04:00
parent 59f63b5e17 2c6d783eb7
commit f71e0acbbb
13 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
color-schemes/render/beforedawn.json
View File

@ -5,6 +5,7 @@
"colors" : {
"background" : "#333333",
"axes-color" : "#c1c1c1",
"opencsg-face-front" : "#cccccc",
"opencsg-face-back" : "#5563dd",
"cgal-face-front" : "#cccccc",

1
color-schemes/render/deepocean.json
View File

@ -5,6 +5,7 @@
"colors" : {
"background" : "#333333",
"axes-color" : "#c1c1c1",
"opencsg-face-front" : "#eeeeee",
"opencsg-face-back" : "#0babc8",
"cgal-face-front" : "#eeeeee",

1
color-schemes/render/metallic.json
View File

@ -5,6 +5,7 @@
"colors" : {
"background" : "#aaaaff",
"axes-color" : "#222233",
"opencsg-face-front" : "#ddddff",
"opencsg-face-back" : "#dd22dd",
"cgal-face-front" : "#ddddff",

1
color-schemes/render/monotone.json
View File

@ -6,6 +6,7 @@
"colors" : {
"background" : "#ffffe5",
"axes-color" : "#191916",
"opencsg-face-front" : "#f9d72c",
"opencsg-face-back" : "#f9d72c",
"cgal-face-front" : "#f9d72c",

1
color-schemes/render/nature.json
View File

@ -5,6 +5,7 @@
"colors" : {
"background" : "#fafafa",
"axes-color" : "#323232",
"opencsg-face-front" : "#16a085",
"opencsg-face-back" : "#dbf4da",
"cgal-face-front" : "#16a085",

1
color-schemes/render/solarized.json
View File

@ -5,6 +5,7 @@
"colors" : {
"background" : "#fdf6e3",
"axes-color" : "#191816",
"opencsg-face-front" : "#b58800",
"opencsg-face-back" : "#882233",
"cgal-face-front" : "#b58800",

1
color-schemes/render/starnight.json
View File

@ -5,6 +5,7 @@
"colors" : {
"background" : "#000000",
"axes-color" : "#e5e5e5",
"opencsg-face-front" : "#ffffe0",
"opencsg-face-back" : "#00ffff",
"cgal-face-front" : "#ffffe0",

1
color-schemes/render/sunset.json
View File

@ -5,6 +5,7 @@
"colors" : {
"background" : "#aa4444",
"axes-color" : "#220d0d",
"opencsg-face-front" : "#ffaaaa",
"opencsg-face-back" : "#882233",
"cgal-face-front" : "#ffaaaa",

1
color-schemes/render/tomorrow-night.json
View File

@ -5,6 +5,7 @@
"colors" : {
"background" : "#1d1f21",
"axes-color" : "#e8e8e8",
"opencsg-face-front" : "#81a2be",
"opencsg-face-back" : "#de935f",
"cgal-face-front" : "#8abeb7",

1
color-schemes/render/tomorrow.json
View File

@ -5,6 +5,7 @@
"colors" : {
"background" : "#f8f8f8",
"axes-color" : "#181818",
"opencsg-face-front" : "#4271ae",
"opencsg-face-back" : "#f5871f",
"cgal-face-front" : "#3e999f",

8
src/GLView.cc
View File

@ -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

2
src/colormap.cc
View File

@ -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, 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)));
@ -57,6 +58,7 @@ RenderColorScheme::RenderColorScheme(fs::path path) : _path(path)
_show_in_gui = pt.get<bool>("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");

1
src/colormap.h
View File

@ -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,