Put drawing program tools code in folder

2025-12-26 10:40:58 +03:00 · 2025-12-26 10:40:58 +03:00 · 783bb7dacb
commit 783bb7dacb
parent 702df53794
45 changed files with 133 additions and 139 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -60,26 +60,26 @@ set(sources "src/main.cpp"
            "src/RichText/ParagraphStyleData.cpp"
            "src/DrawingProgram/DrawingProgramCache.cpp"
            "src/DrawingProgram/DrawingProgram.cpp"
-            "src/DrawingProgram/BrushTool.cpp"
-            "src/DrawingProgram/TextBoxTool.cpp"
-            "src/DrawingProgram/EraserTool.cpp"
-            "src/DrawingProgram/RectSelectTool.cpp"
-            "src/DrawingProgram/LassoSelectTool.cpp"
-            "src/DrawingProgram/RectDrawTool.cpp"
-            "src/DrawingProgram/EllipseDrawTool.cpp"
-            "src/DrawingProgram/EyeDropperTool.cpp"
-            "src/DrawingProgram/ScreenshotTool.cpp"
-            "src/DrawingProgram/EditTool.cpp"
-            "src/DrawingProgram/ZoomCanvasTool.cpp"
-            "src/DrawingProgram/PanCanvasTool.cpp"
-            "src/DrawingProgram/ImageEditTool.cpp"
-            "src/DrawingProgram/GridModifyTool.cpp"
            "src/DrawingProgram/DrawingProgramSelection.cpp"
-            "src/DrawingProgram/DrawingProgramEditToolBase.cpp"
-            "src/DrawingProgram/DrawingProgramToolBase.cpp"
-            "src/DrawingProgram/EllipseDrawEditTool.cpp"
-            "src/DrawingProgram/RectDrawEditTool.cpp"
-            "src/DrawingProgram/TextBoxEditTool.cpp"
+            "src/DrawingProgram/Tools/BrushTool.cpp"
+            "src/DrawingProgram/Tools/TextBoxTool.cpp"
+            "src/DrawingProgram/Tools/EraserTool.cpp"
+            "src/DrawingProgram/Tools/RectSelectTool.cpp"
+            "src/DrawingProgram/Tools/LassoSelectTool.cpp"
+            "src/DrawingProgram/Tools/RectDrawTool.cpp"
+            "src/DrawingProgram/Tools/EllipseDrawTool.cpp"
+            "src/DrawingProgram/Tools/EyeDropperTool.cpp"
+            "src/DrawingProgram/Tools/ScreenshotTool.cpp"
+            "src/DrawingProgram/Tools/EditTool.cpp"
+            "src/DrawingProgram/Tools/ZoomCanvasTool.cpp"
+            "src/DrawingProgram/Tools/PanCanvasTool.cpp"
+            "src/DrawingProgram/Tools/GridModifyTool.cpp"
+            "src/DrawingProgram/Tools/DrawingProgramToolBase.cpp"
+            "src/DrawingProgram/Tools/EditTools/DrawingProgramEditToolBase.cpp"
+            "src/DrawingProgram/Tools/EditTools/ImageEditTool.cpp"
+            "src/DrawingProgram/Tools/EditTools/EllipseDrawEditTool.cpp"
+            "src/DrawingProgram/Tools/EditTools/RectDrawEditTool.cpp"
+            "src/DrawingProgram/Tools/EditTools/TextBoxEditTool.cpp"
            "src/DrawingProgram/Layers/DrawingProgramLayerManagerGUI.cpp"
            "src/DrawingProgram/Layers/DrawingProgramLayerManager.cpp"
            "src/DrawingProgram/Layers/DrawingProgramLayerListItem.cpp"
--- a/src/DrawCamera.cpp
+++ b/src/DrawCamera.cpp
@ -1,5 +1,5 @@
 #include "DrawCamera.hpp"
-#include "DrawingProgram/DrawingProgramToolBase.hpp"
+#include "DrawingProgram/Tools/DrawingProgramToolBase.hpp"
 #include "Helpers/FixedPoint.hpp"
 #include "MainProgram.hpp"
 #include "World.hpp"
--- a/src/DrawingProgram/DrawingProgram.cpp
+++ b/src/DrawingProgram/DrawingProgram.cpp
@ -1,11 +1,11 @@
 #include "DrawingProgram.hpp"
-#include "DrawingProgramToolBase.hpp"
+#include "Tools/DrawingProgramToolBase.hpp"
 #include <include/core/SkPaint.h>
 #include <include/core/SkVertices.h>
 #include "../DrawCamera.hpp"
-#include "EllipseDrawTool.hpp"
-#include "EyeDropperTool.hpp"
-#include "GridModifyTool.hpp"
+#include "Tools/EllipseDrawTool.hpp"
+#include "Tools/EyeDropperTool.hpp"
+#include "Tools/GridModifyTool.hpp"
 #include "../InputManager.hpp"
 #include "../SharedTypes.hpp"
 #include <memory>
@ -19,7 +19,7 @@
 #include <Helpers/FileDownloader.hpp>
 #include <Helpers/NetworkingObjects/NetObjID.hpp>
 #include <Helpers/StringHelpers.hpp>
-#include "LassoSelectTool.hpp"
+#include "Tools/LassoSelectTool.hpp"
 #include <Helpers/Logger.hpp>
 #include <Helpers/Parallel.hpp>
 #include <cereal/types/unordered_set.hpp>
@ -28,7 +28,7 @@
 #include <chrono>
 #include "../CanvasComponents/ImageCanvasComponent.hpp"

-#include "EraserTool.hpp"
+#include "Tools/EraserTool.hpp"

 DrawingProgram::DrawingProgram(World& initWorld):
    world(initWorld),
--- a/src/DrawingProgram/DrawingProgram.hpp
+++ b/src/DrawingProgram/DrawingProgram.hpp
@ -1,10 +1,10 @@
 #pragma once
 #include "../DrawData.hpp"
 #include "DrawingProgramCache.hpp"
-#include "GridModifyTool.hpp"
+#include "Tools/GridModifyTool.hpp"
 #include <Helpers/NetworkingObjects/NetObjWeakPtr.hpp>
-#include "PanCanvasTool.hpp"
-#include "ZoomCanvasTool.hpp"
+#include "Tools/PanCanvasTool.hpp"
+#include "Tools/ZoomCanvasTool.hpp"
 #include "cereal/archives/portable_binary.hpp"
 #include <include/core/SkCanvas.h>
 #include <include/core/SkPath.h>
@ -13,7 +13,7 @@
 #include <Helpers/Hashes.hpp>
 #include <Helpers/Random.hpp>
 #include "DrawingProgramSelection.hpp"
-#include "DrawingProgramToolBase.hpp"
+#include "Tools/DrawingProgramToolBase.hpp"
 #include <Helpers/FileDownloader.hpp>
 #include <Helpers/NetworkingObjects/NetObjOrderedList.hpp>
 #include "Layers/DrawingProgramLayerManager.hpp"
--- a/src/DrawingProgram/DrawingProgramSelection.cpp
+++ b/src/DrawingProgram/DrawingProgramSelection.cpp
@ -2,7 +2,7 @@
 #include "DrawingProgram.hpp"
 #include "../World.hpp"
 #include "../MainProgram.hpp"
-#include "DrawingProgramToolBase.hpp"
+#include "Tools/DrawingProgramToolBase.hpp"
 #include "Helpers/FixedPoint.hpp"
 #include <Helpers/MathExtras.hpp>
 #include <Helpers/SCollision.hpp>
--- a/src/DrawingProgram/Tools/BrushTool.cpp
+++ b/src/DrawingProgram/Tools/BrushTool.cpp
@ -1,13 +1,13 @@
 #include "BrushTool.hpp"
 #include <Helpers/ConvertVec.hpp>
-#include "../GUIStuff/GUIManager.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
+#include "../../GUIStuff/GUIManager.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
 #include "DrawingProgramToolBase.hpp"
-#include "../CanvasComponents/BrushStrokeCanvasComponent.hpp"
+#include "../../CanvasComponents/BrushStrokeCanvasComponent.hpp"
 #include "Helpers/NetworkingObjects/NetObjTemporaryPtr.decl.hpp"
 #include "Helpers/NetworkingObjects/NetObjWeakPtr.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"
 #include <chrono>

 #define VEL_SMOOTH_MIN 0.6
--- a/src/DrawingProgram/Tools/BrushTool.hpp
+++ b/src/DrawingProgram/Tools/BrushTool.hpp
@ -6,7 +6,7 @@
 #include <Helpers/SCollision.hpp>
 #include <deque>
 #include <include/core/SkCanvas.h>
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"
 #include <Helpers/NetworkingObjects/NetObjWeakPtr.hpp>

 class DrawingProgram;
--- a/src/DrawingProgram/Tools/DrawingProgramToolBase.cpp
+++ b/src/DrawingProgram/Tools/DrawingProgramToolBase.cpp
--- a/src/DrawingProgram/Tools/DrawingProgramToolBase.hpp
+++ b/src/DrawingProgram/Tools/DrawingProgramToolBase.hpp
@ -1,7 +1,7 @@
 #pragma once
 #include <include/core/SkCanvas.h>
-#include "../DrawData.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../DrawData.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"

 class DrawingProgram;

--- a/src/DrawingProgram/Tools/EditTool.cpp
+++ b/src/DrawingProgram/Tools/EditTool.cpp
@ -1,18 +1,18 @@
 #include "EditTool.hpp"
 #include <chrono>
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "Helpers/MathExtras.hpp"
 #include "Helpers/SCollision.hpp"
-#include "../SharedTypes.hpp"
+#include "../../SharedTypes.hpp"
 #include <cereal/types/vector.hpp>
 #include <memory>

-#include "TextBoxEditTool.hpp"
-#include "RectDrawEditTool.hpp"
-#include "ImageEditTool.hpp"
-#include "EllipseDrawEditTool.hpp"
+#include "EditTools/TextBoxEditTool.hpp"
+#include "EditTools/RectDrawEditTool.hpp"
+#include "EditTools/ImageEditTool.hpp"
+#include "EditTools/EllipseDrawEditTool.hpp"

 EditTool::EditTool(DrawingProgram& initDrawP):
    DrawingProgramToolBase(initDrawP)
--- a/src/DrawingProgram/Tools/EditTool.hpp
+++ b/src/DrawingProgram/Tools/EditTool.hpp
@ -2,11 +2,10 @@
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/SCollision.hpp>
 #include <any>
-#include "DrawingProgramEditToolBase.hpp"
+#include "EditTools/DrawingProgramEditToolBase.hpp"

 class DrawingProgram;

-
 class EditTool : public DrawingProgramToolBase {
    public:
        struct HandleData {
--- a/src/DrawingProgram/Tools/EditTools/DrawingProgramEditToolBase.cpp
+++ b/src/DrawingProgram/Tools/EditTools/DrawingProgramEditToolBase.cpp
@ -1,5 +1,5 @@
 #include "DrawingProgramEditToolBase.hpp"
-#include "../MainProgram.hpp"
+#include "../../../MainProgram.hpp"

 DrawingProgramEditToolBase::DrawingProgramEditToolBase(DrawingProgram& initDrawP):
    drawP(initDrawP)
--- a/src/DrawingProgram/Tools/EditTools/DrawingProgramEditToolBase.hpp
+++ b/src/DrawingProgram/Tools/EditTools/DrawingProgramEditToolBase.hpp
@ -1,7 +1,7 @@
 #pragma once
 #include <include/core/SkCanvas.h>
-#include "../DrawData.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../../DrawData.hpp"
+#include "../../../CanvasComponents/CanvasComponentContainer.hpp"

 class DrawingProgram;
 class EditTool;
--- a/src/DrawingProgram/Tools/EditTools/EllipseDrawEditTool.cpp
+++ b/src/DrawingProgram/Tools/EditTools/EllipseDrawEditTool.cpp
@ -1,11 +1,11 @@
 #include "EllipseDrawEditTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../World.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../../DrawingProgram.hpp"
+#include "../../../World.hpp"
+#include "../../../MainProgram.hpp"
+#include "../../../DrawData.hpp"
 #include <cereal/types/vector.hpp>
 #include <memory>
-#include "EditTool.hpp"
+#include "../EditTool.hpp"

 EllipseDrawEditTool::EllipseDrawEditTool(DrawingProgram& initDrawP):
    DrawingProgramEditToolBase(initDrawP)
--- a/src/DrawingProgram/Tools/EditTools/EllipseDrawEditTool.hpp
+++ b/src/DrawingProgram/Tools/EditTools/EllipseDrawEditTool.hpp
@ -1,7 +1,7 @@
 #pragma once
 #include "DrawingProgramEditToolBase.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
-#include "../CanvasComponents//EllipseCanvasComponent.hpp"
+#include "../../../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../../CanvasComponents//EllipseCanvasComponent.hpp"
 #include <any>
 #include <Helpers/SCollision.hpp>

--- a/src/DrawingProgram/Tools/EditTools/ImageEditTool.cpp
+++ b/src/DrawingProgram/Tools/EditTools/ImageEditTool.cpp
@ -1,10 +1,10 @@
 #include "ImageEditTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../CanvasComponents/ImageCanvasComponent.hpp"
-#include "../World.hpp"
-#include "../Toolbar.hpp"
-#include "../MainProgram.hpp"
-#include "../ResourceManager.hpp"
+#include "../../DrawingProgram.hpp"
+#include "../../../CanvasComponents/ImageCanvasComponent.hpp"
+#include "../../../World.hpp"
+#include "../../../Toolbar.hpp"
+#include "../../../MainProgram.hpp"
+#include "../../../ResourceManager.hpp"
 #include "DrawingProgramEditToolBase.hpp"
 #include <fstream>

--- a/src/DrawingProgram/Tools/EditTools/ImageEditTool.hpp
+++ b/src/DrawingProgram/Tools/EditTools/ImageEditTool.hpp
--- a/src/DrawingProgram/Tools/EditTools/RectDrawEditTool.cpp
+++ b/src/DrawingProgram/Tools/EditTools/RectDrawEditTool.cpp
@ -1,9 +1,9 @@
 #include "RectDrawEditTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../World.hpp"
-#include "../MainProgram.hpp"
+#include "../../DrawingProgram.hpp"
+#include "../../../World.hpp"
+#include "../../../MainProgram.hpp"
 #include <memory>
-#include "EditTool.hpp"
+#include "../EditTool.hpp"

 RectDrawEditTool::RectDrawEditTool(DrawingProgram& initDrawP):
    DrawingProgramEditToolBase(initDrawP)
--- a/src/DrawingProgram/Tools/EditTools/RectDrawEditTool.hpp
+++ b/src/DrawingProgram/Tools/EditTools/RectDrawEditTool.hpp
@ -1,6 +1,6 @@
 #pragma once
 #include "DrawingProgramEditToolBase.hpp"
-#include "../CanvasComponents/RectangleCanvasComponent.hpp"
+#include "../../../CanvasComponents/RectangleCanvasComponent.hpp"
 #include <Helpers/SCollision.hpp>
 #include <any>

--- a/src/DrawingProgram/Tools/EditTools/TextBoxEditTool.cpp
+++ b/src/DrawingProgram/Tools/EditTools/TextBoxEditTool.cpp
@ -1,7 +1,7 @@
 #include "TextBoxEditTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../../DrawingProgram.hpp"
+#include "../../../MainProgram.hpp"
+#include "../../../DrawData.hpp"
 #include "Helpers/ConvertVec.hpp"
 #include "Helpers/SCollision.hpp"
 #include <cereal/types/vector.hpp>
@ -12,7 +12,7 @@
 #include <modules/skparagraph/src/ParagraphBuilderImpl.h>
 #include <modules/skunicode/include/SkUnicode_icu.h>
 #include <memory>
-#include "EditTool.hpp"
+#include "../EditTool.hpp"

 using namespace RichText;

--- a/src/DrawingProgram/Tools/EditTools/TextBoxEditTool.hpp
+++ b/src/DrawingProgram/Tools/EditTools/TextBoxEditTool.hpp
@ -1,5 +1,5 @@
 #pragma once
-#include "../CanvasComponents/TextBoxCanvasComponent.hpp"
+#include "../../../CanvasComponents/TextBoxCanvasComponent.hpp"
 #include "DrawingProgramEditToolBase.hpp"
 #include <Helpers/SCollision.hpp>
 #include <any>
--- a/src/DrawingProgram/Tools/EllipseDrawTool.cpp
+++ b/src/DrawingProgram/Tools/EllipseDrawTool.cpp
@ -1,13 +1,13 @@
 #include "EllipseDrawTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include "Helpers/MathExtras.hpp"
-#include "../InputManager.hpp"
+#include "../../InputManager.hpp"
 #include <cereal/types/vector.hpp>
-#include "../CanvasComponents/EllipseCanvasComponent.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/EllipseCanvasComponent.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"

 EllipseDrawTool::EllipseDrawTool(DrawingProgram& initDrawP):
    DrawingProgramToolBase(initDrawP)
--- a/src/DrawingProgram/Tools/EllipseDrawTool.hpp
+++ b/src/DrawingProgram/Tools/EllipseDrawTool.hpp
@ -2,7 +2,7 @@
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/SCollision.hpp>
 #include <Helpers/NetworkingObjects/NetObjWeakPtr.hpp>
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"

 class DrawingProgram;

--- a/src/DrawingProgram/Tools/EraserTool.cpp
+++ b/src/DrawingProgram/Tools/EraserTool.cpp
@ -1,7 +1,7 @@
 #include "EraserTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include <include/core/SkPathBuilder.h>

 EraserTool::EraserTool(DrawingProgram& initDrawP):
--- a/src/DrawingProgram/Tools/EraserTool.hpp
+++ b/src/DrawingProgram/Tools/EraserTool.hpp
@ -1,8 +1,8 @@
 #pragma once
 #include <include/core/SkCanvas.h>
-#include "../DrawData.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
-#include "DrawingProgramCache.hpp"
+#include "../DrawingProgramCache.hpp"

 class DrawingProgram;

--- a/src/DrawingProgram/Tools/EyeDropperTool.cpp
+++ b/src/DrawingProgram/Tools/EyeDropperTool.cpp
@ -1,7 +1,7 @@
 #include "EyeDropperTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include <include/core/SkAlphaType.h>
 #include <include/core/SkCanvas.h>
--- a/src/DrawingProgram/Tools/EyeDropperTool.hpp
+++ b/src/DrawingProgram/Tools/EyeDropperTool.hpp
--- a/src/DrawingProgram/Tools/GridModifyTool.cpp
+++ b/src/DrawingProgram/Tools/GridModifyTool.cpp
@ -1,7 +1,7 @@
 #include "GridModifyTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "Helpers/Networking/NetLibrary.hpp"
 #include "Helpers/NetworkingObjects/NetObjTemporaryPtr.decl.hpp"
 #include <Helpers/NetworkingObjects/NetObjWeakPtr.hpp>
--- a/src/DrawingProgram/Tools/GridModifyTool.hpp
+++ b/src/DrawingProgram/Tools/GridModifyTool.hpp
@ -1,6 +1,6 @@
 #pragma once
 #include "DrawingProgramToolBase.hpp"
-#include "../WorldGrid.hpp"
+#include "../../WorldGrid.hpp"
 #include "Helpers/NetworkingObjects/NetObjWeakPtr.hpp"

 class DrawingProgram;
--- a/src/DrawingProgram/Tools/LassoSelectTool.cpp
+++ b/src/DrawingProgram/Tools/LassoSelectTool.cpp
@ -1,13 +1,13 @@
 #include "LassoSelectTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include "Helpers/MathExtras.hpp"
 #include "Helpers/SCollision.hpp"
-#include "../CoordSpaceHelper.hpp"
+#include "../../CoordSpaceHelper.hpp"
 #include <ranges>
-#include "../DrawCollision.hpp"
+#include "../../DrawCollision.hpp"
 #include <earcut.hpp>
 #include <include/core/SkPathBuilder.h>

--- a/src/DrawingProgram/Tools/LassoSelectTool.hpp
+++ b/src/DrawingProgram/Tools/LassoSelectTool.hpp
@ -1,8 +1,8 @@
 #pragma once
 #include <include/core/SkCanvas.h>
-#include "../DrawData.hpp"
+#include "../../DrawData.hpp"
 #include <Helpers/SCollision.hpp>
-#include "../CoordSpaceHelper.hpp"
+#include "../../CoordSpaceHelper.hpp"
 #include "DrawingProgramToolBase.hpp"

 class DrawingProgram;
--- a/src/DrawingProgram/Tools/PanCanvasTool.cpp
+++ b/src/DrawingProgram/Tools/PanCanvasTool.cpp
@ -1,7 +1,7 @@
 #include "PanCanvasTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/Logger.hpp>

--- a/src/DrawingProgram/Tools/PanCanvasTool.hpp
+++ b/src/DrawingProgram/Tools/PanCanvasTool.hpp
--- a/src/DrawingProgram/Tools/RectDrawTool.cpp
+++ b/src/DrawingProgram/Tools/RectDrawTool.cpp
@ -1,10 +1,10 @@
 #include "RectDrawTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
-#include "../CanvasComponents/RectangleCanvasComponent.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/RectangleCanvasComponent.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"

 RectDrawTool::RectDrawTool(DrawingProgram& initDrawP):
    DrawingProgramToolBase(initDrawP)
--- a/src/DrawingProgram/Tools/RectDrawTool.hpp
+++ b/src/DrawingProgram/Tools/RectDrawTool.hpp
@ -1,7 +1,7 @@
 #pragma once
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/SCollision.hpp>
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"

 class DrawingProgram;

--- a/src/DrawingProgram/Tools/RectSelectTool.cpp
+++ b/src/DrawingProgram/Tools/RectSelectTool.cpp
@ -1,11 +1,11 @@
 #include "RectSelectTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include "Helpers/MathExtras.hpp"
 #include "Helpers/SCollision.hpp"
-#include "../CoordSpaceHelper.hpp"
+#include "../../CoordSpaceHelper.hpp"

 RectSelectTool::RectSelectTool(DrawingProgram& initDrawP):
    DrawingProgramToolBase(initDrawP)
--- a/src/DrawingProgram/Tools/RectSelectTool.hpp
+++ b/src/DrawingProgram/Tools/RectSelectTool.hpp
@ -1,7 +1,7 @@
 #pragma once
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/SCollision.hpp>
-#include "../CoordSpaceHelper.hpp"
+#include "../../CoordSpaceHelper.hpp"

 class DrawingProgram;

--- a/src/DrawingProgram/Tools/ScreenshotTool.cpp
+++ b/src/DrawingProgram/Tools/ScreenshotTool.cpp
@ -1,7 +1,7 @@
 #include "ScreenshotTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include "Helpers/SCollision.hpp"
 #include <include/core/SkAlphaType.h>
@ -19,7 +19,7 @@
 #include <include/encode/SkJpegEncoder.h>
 #include <fstream>
 #include <include/gpu/GpuTypes.h>
-#include "../FileHelpers.hpp"
+#include "../../FileHelpers.hpp"
 #include <filesystem>
 #ifdef USE_SKIA_BACKEND_GRAPHITE
    #include <include/gpu/graphite/Surface.h>
@ -27,10 +27,10 @@
    #include <include/gpu/ganesh/GrDirectContext.h>
    #include <include/gpu/ganesh/SkSurfaceGanesh.h>
 #endif
-#include "../GridManager.hpp"
+#include "../../GridManager.hpp"
 #include <Helpers/Logger.hpp>

-#include "../MainProgram.hpp"
+#include "../../MainProgram.hpp"

 #ifdef __EMSCRIPTEN__
    #include <EmscriptenHelpers/emscripten_browser_file.h>
--- a/src/DrawingProgram/Tools/ScreenshotTool.hpp
+++ b/src/DrawingProgram/Tools/ScreenshotTool.hpp
@ -2,8 +2,8 @@
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/SCollision.hpp>
 #include <filesystem>
-#include "../InputManager.hpp"
-#include "../CoordSpaceHelper.hpp"
+#include "../../InputManager.hpp"
+#include "../../CoordSpaceHelper.hpp"

 class DrawingProgram;

--- a/src/DrawingProgram/Tools/TextBoxTool.cpp
+++ b/src/DrawingProgram/Tools/TextBoxTool.cpp
@ -1,14 +1,14 @@
 #include "TextBoxTool.hpp"
 #include <chrono>
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "Helpers/MathExtras.hpp"
 #include "Helpers/SCollision.hpp"
 #include <cereal/types/vector.hpp>
 #include <memory>
-#include "../CanvasComponents/TextBoxCanvasComponent.hpp"
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/TextBoxCanvasComponent.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"
 #include "EditTool.hpp"

 TextBoxTool::TextBoxTool(DrawingProgram& initDrawP):
--- a/src/DrawingProgram/Tools/TextBoxTool.hpp
+++ b/src/DrawingProgram/Tools/TextBoxTool.hpp
@ -1,7 +1,7 @@
 #pragma once
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/SCollision.hpp>
-#include "../CanvasComponents/CanvasComponentContainer.hpp"
+#include "../../CanvasComponents/CanvasComponentContainer.hpp"

 class DrawingProgram;

--- a/src/DrawingProgram/Tools/ZoomCanvasTool.cpp
+++ b/src/DrawingProgram/Tools/ZoomCanvasTool.cpp
@ -1,7 +1,7 @@
 #include "ZoomCanvasTool.hpp"
-#include "DrawingProgram.hpp"
-#include "../MainProgram.hpp"
-#include "../DrawData.hpp"
+#include "../DrawingProgram.hpp"
+#include "../../MainProgram.hpp"
+#include "../../DrawData.hpp"
 #include "DrawingProgramToolBase.hpp"
 #include <Helpers/Logger.hpp>

--- a/src/DrawingProgram/Tools/ZoomCanvasTool.hpp
+++ b/src/DrawingProgram/Tools/ZoomCanvasTool.hpp
--- a/src/MainProgram.cpp
+++ b/src/MainProgram.cpp
@ -1,9 +1,5 @@
 #include "MainProgram.hpp"
-#include "DrawingProgram/DrawingProgramToolBase.hpp"
-#include "Helpers/NetworkingObjects/NetObjManagerTypeList.hpp"
 #include "VersionConstants.hpp"
-#include "cereal/archives/portable_binary.hpp"
-#include "cereal/details/helpers.hpp"
 #include <SDL3/SDL_render.h>
 #include <SDL3/SDL_video.h>
 #include <chrono>
--- a/src/Toolbar.cpp
+++ b/src/Toolbar.cpp
@ -1,7 +1,6 @@
 #include "Toolbar.hpp"
-#include "DrawingProgram/DrawingProgramToolBase.hpp"
-#include "DrawingProgram/ScreenshotTool.hpp"
-#include "FontData.hpp"
+#include "DrawingProgram/Tools/DrawingProgramToolBase.hpp"
+#include "DrawingProgram/Tools/ScreenshotTool.hpp"
 #include "Helpers/ConvertVec.hpp"
 #include "Helpers/FileDownloader.hpp"
 #include "Helpers/Networking/NetLibrary.hpp"