diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-25 20:13:03 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-25 20:13:03 (GMT) |
| commit | 4cbdbf9827d2576f8672a6c167261b4b27682920 (patch) | |
| tree | b9d413ac635585ceb3abc53b83a48d66ac5e20f3 /src/rendersettings.cc | |
| parent | ed02aa85ef0ec0a1adc9aa34f6e1a9f7715a4704 (diff) | |
Ported remaining color handling away from Qt
Diffstat (limited to 'src/rendersettings.cc')
| -rw-r--r-- | src/rendersettings.cc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/rendersettings.cc b/src/rendersettings.cc index ee57c34..195f2d8 100644 --- a/src/rendersettings.cc +++ b/src/rendersettings.cc @@ -12,24 +12,24 @@ RenderSettings *RenderSettings::inst(bool erase) RenderSettings::RenderSettings() { - this->colors[BACKGROUND_COLOR] = QColor(0xff, 0xff, 0xe5); - this->colors[OPENCSG_FACE_FRONT_COLOR] = QColor(0xf9, 0xd7, 0x2c); - this->colors[OPENCSG_FACE_BACK_COLOR] = QColor(0x9d, 0xcb, 0x51); - this->colors[CGAL_FACE_FRONT_COLOR] = QColor(0xf9, 0xd7, 0x2c); - this->colors[CGAL_FACE_BACK_COLOR] = QColor(0x9d, 0xcb, 0x51); - this->colors[CGAL_FACE_2D_COLOR] = QColor(0x00, 0xbf, 0x99); - this->colors[CGAL_EDGE_FRONT_COLOR] = QColor(0xff, 0x00, 0x00); - this->colors[CGAL_EDGE_BACK_COLOR] = QColor(0xff, 0x00, 0x00); - this->colors[CGAL_EDGE_2D_COLOR] = QColor(0xff, 0x00, 0x00); - this->colors[CROSSHAIR_COLOR] = QColor(0x80, 0x00, 0x00); + this->colors[BACKGROUND_COLOR] = Color4f(0xff, 0xff, 0xe5); + this->colors[OPENCSG_FACE_FRONT_COLOR] = Color4f(0xf9, 0xd7, 0x2c); + this->colors[OPENCSG_FACE_BACK_COLOR] = Color4f(0x9d, 0xcb, 0x51); + this->colors[CGAL_FACE_FRONT_COLOR] = Color4f(0xf9, 0xd7, 0x2c); + this->colors[CGAL_FACE_BACK_COLOR] = Color4f(0x9d, 0xcb, 0x51); + this->colors[CGAL_FACE_2D_COLOR] = Color4f(0x00, 0xbf, 0x99); + this->colors[CGAL_EDGE_FRONT_COLOR] = Color4f(0xff, 0x00, 0x00); + this->colors[CGAL_EDGE_BACK_COLOR] = Color4f(0xff, 0x00, 0x00); + this->colors[CGAL_EDGE_2D_COLOR] = Color4f(0xff, 0x00, 0x00); + this->colors[CROSSHAIR_COLOR] = Color4f(0x80, 0x00, 0x00); } -QColor RenderSettings::color(RenderColor idx) const +Color4f RenderSettings::color(RenderColor idx) { return this->colors[idx]; } -void RenderSettings::setColors(const QMap<RenderColor, QColor> &colors) +void RenderSettings::setColors(const std::map<RenderColor, Color4f> &colors) { this->colors = colors; } |