diff -r 1de2b8d64e9f -r 98906a94732f src/linetypes/subfilereference.cpp --- a/src/linetypes/subfilereference.cpp Tue Jan 28 23:34:49 2020 +0200 +++ b/src/linetypes/subfilereference.cpp Thu Jan 30 19:20:11 2020 +0200 @@ -2,7 +2,7 @@ #include "documentmanager.h" #include "invert.h" -linetypes::SubfileReference::SubfileReference(const glm::mat4& transformation, +ldraw::SubfileReference::SubfileReference(const glm::mat4& transformation, const QString& referenceName, const Color color) : ColoredObject{color}, @@ -11,7 +11,7 @@ { } -QVariant linetypes::SubfileReference::getProperty(Property property) const +QVariant ldraw::SubfileReference::getProperty(Property property) const { switch (property) { @@ -24,7 +24,7 @@ } } -auto linetypes::SubfileReference::setProperty( +auto ldraw::SubfileReference::setProperty( Property property, const QVariant& value) -> SetPropertyResult @@ -42,12 +42,12 @@ } } -QString linetypes::SubfileReference::textRepresentation() const +QString ldraw::SubfileReference::textRepresentation() const { return referenceName + " " + utility::vertexToStringParens(this->position()); } -void linetypes::SubfileReference::getPolygons( +void ldraw::SubfileReference::getPolygons( std::vector& polygons, GetPolygonsContext* context) const { @@ -69,7 +69,7 @@ { gl::invert(polygon); } - if (polygon.color == colors::main) + if (polygon.color == ldraw::mainColor) { polygon.color = this->colorIndex; } @@ -79,17 +79,17 @@ } } -glm::vec3 linetypes::SubfileReference::position() const +glm::vec3 ldraw::SubfileReference::position() const { return {this->transformation[3][0], this->transformation[3][1], this->transformation[3][2]}; } -void linetypes::SubfileReference::invert() +void ldraw::SubfileReference::invert() { this->isInverted = not this->isInverted; } -Model* linetypes::SubfileReference::resolve(DocumentManager* documents) const +Model* ldraw::SubfileReference::resolve(DocumentManager* documents) const { return documents->findModelByName(this->referenceName); }