--- a/src/gl/compiler.cpp Tue Jan 28 23:34:49 2020 +0200
+++ b/src/gl/compiler.cpp Thu Jan 30 19:20:11 2020 +0200
@@ -68,7 +68,7 @@
}
)";
-gl::Compiler::Compiler(const ColorTable& colorTable, QObject* parent) :
+gl::Compiler::Compiler(const ldraw::ColorTable& colorTable, QObject* parent) :
QObject{parent},
colorTable{colorTable}
{
@@ -163,7 +163,7 @@
}
[[maybe_unused]]
-static QColor colorFromId(linetypes::Id id)
+static QColor colorFromId(ldraw::Id id)
{
// Calculate a color based from this index. This method caters for
// 16777216 objects. I don't think that will be exceeded anytime soon.
@@ -197,11 +197,11 @@
{
QColor color;
// For normal colors, use the polygon's color.
- if (polygon.color == colors::main)
+ if (polygon.color == ldraw::mainColor)
{
color = {255, 255, 64}; // mainColorRepresentation();
}
- else if (polygon.color == colors::edge)
+ else if (polygon.color == ldraw::edgeColor)
{
// Edge color is black, unless we have a dark background, in which case lines need to be bright.
color = Qt::black; //luma(config::backgroundColor()) > 40 ? Qt::black : Qt::white;