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

Add solarized render color map to match the editor color scheme.

master
Torsten Paul 2014-09-16 20:31:23 +02:00
parent 0886944fcd
commit df119fec75
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Preferences.ui
View File

@ -54,7 +54,7 @@
<bool>false</bool>
</property>
<property name="currentRow">
<number>0</number>
<number>-1</number>
</property>
<item>
<property name="text">
@ -91,6 +91,11 @@
<string>DeepOcean</string>
</property>
</item>
<item>
<property name="text">
<string>Solarized</string>
</property>
</item>
</widget>
</item>
</layout>
@ -522,8 +527,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>832</width>
<height>420</height>
<width>100</width>
<height>30</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10">

13
src/colormap.cc
View File

@ -249,6 +249,18 @@ ColorMap::ColorMap() {
(CGAL_EDGE_2D_COLOR, webcolors["magenta"])
(CROSSHAIR_COLOR, Color4f(0xf0, 0xf0, 0xf0));
ColorScheme solarized = map_list_of
(BACKGROUND_COLOR, Color4f(0xfd, 0xf6, 0xe3))
(OPENCSG_FACE_FRONT_COLOR, Color4f(0xb5, 0x88, 0x00))
(OPENCSG_FACE_BACK_COLOR, Color4f(0x88, 0x22, 0x33))
(CGAL_FACE_FRONT_COLOR, Color4f(0xb5, 0x88, 0x00))
(CGAL_FACE_BACK_COLOR, Color4f(0x88, 0x22, 0x33))
(CGAL_FACE_2D_COLOR, Color4f(0x6c, 0x71, 0xc4))
(CGAL_EDGE_FRONT_COLOR, Color4f(0xb5, 0x88, 0x00))
(CGAL_EDGE_BACK_COLOR, Color4f(0xb5, 0x88, 0x00))
(CGAL_EDGE_2D_COLOR, Color4f(0xb5, 0x88, 0x00))
(CROSSHAIR_COLOR, Color4f(0x80, 0x00, 0x00));
// Monotone - no difference between 'back face' and 'front face'
ColorScheme monotone = map_list_of
(BACKGROUND_COLOR, Color4f(0xff, 0xff, 0xe5))
@ -270,6 +282,7 @@ ColorMap::ColorMap() {
("BeforeDawn", beforedawn)
("Nature", nature)
("DeepOcean", deepocean)
("Solarized", solarized)
("Monotone", monotone); // Hidden, not in GUI
colorschemes = tmpcolorschemes;