diff --git a/ArchitectureColoredPainting/src/Editor/GraphicElement.h b/ArchitectureColoredPainting/src/Editor/GraphicElement.h index 4228e52..edd0caf 100644 --- a/ArchitectureColoredPainting/src/Editor/GraphicElement.h +++ b/ArchitectureColoredPainting/src/Editor/GraphicElement.h @@ -3,6 +3,7 @@ #include #include #include +#include #include #include "../Renderer/Painting/ElementStyle.h" @@ -49,6 +50,9 @@ public: //******************************** BitmapPath ********************************// +using std::vector; +using std::shared_ptr; + class BitmapPath { protected: diff --git a/ArchitectureColoredPainting/src/Editor/LayerWrapper.h b/ArchitectureColoredPainting/src/Editor/LayerWrapper.h index 456ac11..d063db9 100644 --- a/ArchitectureColoredPainting/src/Editor/LayerWrapper.h +++ b/ArchitectureColoredPainting/src/Editor/LayerWrapper.h @@ -12,6 +12,8 @@ #include #include #include + +#include "../Renderer/Painting/ElementStyle.h" using std::shared_ptr; using std::vector; class GraphicElement; diff --git a/ArchitectureColoredPainting/src/Renderer/Preview/ElementRenderer.cpp b/ArchitectureColoredPainting/src/Renderer/Preview/ElementRenderer.cpp index 2787c96..8c75783 100644 --- a/ArchitectureColoredPainting/src/Renderer/Preview/ElementRenderer.cpp +++ b/ArchitectureColoredPainting/src/Renderer/Preview/ElementRenderer.cpp @@ -43,11 +43,13 @@ std::vector generatePathBuffer(const QPainterPath& path) break; case QPainterPath::LineToElement: qDebug() << "LineToElement"; - glm::vec2 end = glm::vec2(element.x, element.y); - glm::vec2 mid = (pathBuffer.back() + end) / 2.f; - pathBuffer.push_back(mid); - pathBuffer.push_back(mid); - pathBuffer.push_back(end); + { + glm::vec2 end = glm::vec2(element.x, element.y); + glm::vec2 mid = (pathBuffer.back() + end) / 2.f; + pathBuffer.push_back(mid); + pathBuffer.push_back(mid); + pathBuffer.push_back(end); + } break; case QPainterPath::CurveToElement: qDebug() << "CurveToElement";