diff --git a/Grinder/ui/image/draftitems/PixelsDraftItemNode.cpp b/Grinder/ui/image/draftitems/PixelsDraftItemNode.cpp index e5514c9b9e00a89a7676a8abe393a9b3ab005e22..af4969a18e4eb0d59b9fc50a5bc3abad6b8ef7c6 100644 --- a/Grinder/ui/image/draftitems/PixelsDraftItemNode.cpp +++ b/Grinder/ui/image/draftitems/PixelsDraftItemNode.cpp @@ -21,7 +21,7 @@ PixelsDraftItemNode::PixelsDraftItemNode(ImageEditorScene* scene, const std::sha bool PixelsDraftItemNode::contains(const QPointF& point) const { if (auto draftItem = pixelsDraftItem()) // Make sure that the underlying draft item still exists - return draftItem->pixelsData().isSet(point.toPoint()); + return draftItem->pixelsData().isSet(MathUtils::floor(point)); else return DraftItemNode::contains(point); } diff --git a/Grinder/ui/image/tools/FloodFillTool.cpp b/Grinder/ui/image/tools/FloodFillTool.cpp index 788ae38958f10474c3ee7b4f040475f586380321..c0794dab7cca909bd21c5e8befbd6d68b8b036f6 100644 --- a/Grinder/ui/image/tools/FloodFillTool.cpp +++ b/Grinder/ui/image/tools/FloodFillTool.cpp @@ -6,6 +6,7 @@ #include "Grinder.h" #include "FloodFillTool.h" #include "ui/image/ImageEditor.h" +#include "util/MathUtils.h" #include "res/Resources.h" const char* FloodFillTool::tool_type = "FloodFillTool"; @@ -34,13 +35,13 @@ void FloodFillTool::createProperties() ImageEditorTool::InputEventResult FloodFillTool::mousePressed(const QGraphicsSceneMouseEvent* event) { - floodFill(event->scenePos().toPoint()); + floodFill(MathUtils::floor(event->scenePos())); return InputEventResult::Process; } VisualSceneInputHandler::InputEventResult FloodFillTool::rightMousePressed(const QGraphicsSceneMouseEvent* event) { - floodFill(event->scenePos().toPoint(), true); + floodFill(MathUtils::floor(event->scenePos()), true); return InputEventResult::Process; } diff --git a/Grinder/ui/image/tools/PaintbrushTool.cpp b/Grinder/ui/image/tools/PaintbrushTool.cpp index 2add57f041cbb0d4b913acafb062bce01e8f2fd4..ea5040a3f9c59d7648fec3b3870d374bc0b5b579 100644 --- a/Grinder/ui/image/tools/PaintbrushTool.cpp +++ b/Grinder/ui/image/tools/PaintbrushTool.cpp @@ -7,6 +7,7 @@ #include "PaintbrushTool.h" #include "ui/image/ImageEditor.h" #include "image/ImageUtils.h" +#include "util/MathUtils.h" #include "res/Resources.h" const char* PaintbrushTool::tool_type = "PaintbrushTool"; @@ -35,7 +36,7 @@ void PaintbrushTool::createProperties() ImageEditorTool::InputEventResult PaintbrushTool::mousePressed(const QGraphicsSceneMouseEvent* event) { - auto pos = event->scenePos().toPoint(); + auto pos = MathUtils::floor(event->scenePos()); _lastPixelPos = pos; paintPixel(pos, _eraseByDefault); return InputEventResult::Process; @@ -43,7 +44,7 @@ ImageEditorTool::InputEventResult PaintbrushTool::mousePressed(const QGraphicsSc ImageEditorTool::InputEventResult PaintbrushTool::mouseMoved(const QGraphicsSceneMouseEvent* event) { - auto pos = event->scenePos().toPoint(); + auto pos = MathUtils::floor(event->scenePos()); paintPixel(pos, _eraseByDefault); _lastPixelPos = pos; return InputEventResult::Process; @@ -51,7 +52,7 @@ ImageEditorTool::InputEventResult PaintbrushTool::mouseMoved(const QGraphicsScen VisualSceneInputHandler::InputEventResult PaintbrushTool::rightMousePressed(const QGraphicsSceneMouseEvent* event) { - auto pos = event->scenePos().toPoint(); + auto pos = MathUtils::floor(event->scenePos()); _lastPixelPos = pos; paintPixel(pos, !_eraseByDefault); return InputEventResult::Process; @@ -59,7 +60,7 @@ VisualSceneInputHandler::InputEventResult PaintbrushTool::rightMousePressed(cons VisualSceneInputHandler::InputEventResult PaintbrushTool::rightMouseMoved(const QGraphicsSceneMouseEvent* event) { - auto pos = event->scenePos().toPoint(); + auto pos = MathUtils::floor(event->scenePos()); paintPixel(pos, !_eraseByDefault); _lastPixelPos = pos; return InputEventResult::Process; diff --git a/Grinder/util/MathUtils.cpp b/Grinder/util/MathUtils.cpp index 9c3d550eb03ec0711610c92989b41e76e2e41215..5ae677a455531c234fc7828b99b76b764bb1edce 100644 --- a/Grinder/util/MathUtils.cpp +++ b/Grinder/util/MathUtils.cpp @@ -11,3 +11,13 @@ double MathUtils::vectorLength(double x, double y) // Simple L2 norm return std::sqrt(x * x + y * y); } + +QPoint MathUtils::ceil(QPointF pos) +{ + return QPoint{static_cast<int>(std::ceil(pos.x())), static_cast<int>(std::ceil(pos.y()))}; +} + +QPoint MathUtils::floor(QPointF pos) +{ + return QPoint{static_cast<int>(std::floor(pos.x())), static_cast<int>(std::floor(pos.y()))}; +} diff --git a/Grinder/util/MathUtils.h b/Grinder/util/MathUtils.h index 80fa7ff9a3161d3614fb47fe57c596c941aee593..738261095914930036a35bdd12ac8ecccf5cd7ad 100644 --- a/Grinder/util/MathUtils.h +++ b/Grinder/util/MathUtils.h @@ -18,6 +18,9 @@ namespace grndr template<typename T> static T clamp(T& val, T min, T max) { if (val < min) val = min; if (val > max) val = max; return val; } + static QPoint ceil(QPointF pos); + static QPoint floor(QPointF pos); + private: MathUtils() { } };