Can now display SVGs, also fixed bad function call bug when taking screenshot

CMakeLists.txt

@@ -40,6 +40,7 @@ set(sources "src/main.cpp"
             "src/FileHelpers.cpp"
             "src/BookmarkManager.cpp"
             "src/ResourceDisplay/ResourceDisplay.cpp"
+            "src/ResourceDisplay/SvgResourceDisplay.cpp"
             "src/ResourceDisplay/ImageResourceDisplay.cpp"
             "src/ResourceDisplay/FileResourceDisplay.cpp"
             "src/Server/MainServer.cpp"

src/DrawCamera.cpp

@@ -15,9 +15,6 @@ void DrawCamera::set_based_on_properties(World& w, const WorldVec& newPos, const
     c.pos = newPos;
     c.set_rotation(newRotate);
 
-    if(changed)
-        changed();
-
     set_viewing_area(w.main.window.size.cast<float>());
 }
 
@@ -26,17 +23,12 @@ void DrawCamera::set_based_on_center(World& w, const WorldVec& newPos, const Wor
     c.set_rotation(newRotate);
     c.pos = newPos - c.dir_from_space(w.main.window.size.cast<float>() * 0.5f);
 
-    if(changed)
-        changed();
-
     set_viewing_area(w.main.window.size.cast<float>());
 }
 
 void DrawCamera::set_viewing_area(Vector2f viewingAreaNew) {
     if(viewingArea != viewingAreaNew) {
         viewingArea = viewingAreaNew;
-        if(changed)
-            changed();
     }
     float maxDim = std::max(viewingAreaNew.x(), viewingAreaNew.y());
     WorldScalar a = WorldScalar(maxDim * 0.708f) * c.inverseScale;
@@ -109,8 +101,6 @@ void DrawCamera::update_main(World& w) {
             smoothMove.occurring = false;
         }
 
-        if(changed)
-            changed();
     }
     else {
         bool middleClickDown = w.main.input.mouse.middleDown || w.main.input.pen.buttons[w.main.toolbar.tabletOptions.middleClickButton].held;
@@ -119,8 +109,6 @@ void DrawCamera::update_main(World& w) {
             startZoomMousePos = w.get_mouse_world_pos();
             startZoomVal = c.inverseScale;
             startZoomCameraPos = c.pos;
-            if(changed)
-                changed();
         }
         isMiddleClickZooming = newIsMiddleClickZooming;
         if(isMiddleClickZooming) {
@@ -133,13 +121,9 @@ void DrawCamera::update_main(World& w) {
                 WorldScalar mX = c.inverseScale / startZoomVal;
                 c.pos = startZoomMousePos + mVec * mX;
             }
-            if(changed)
-                changed();
         }
         else if(middleClickDown) {
             c.pos -= c.dir_from_space(w.main.input.mouse.move);
-            if(changed)
-                changed();
         }
         if(w.main.input.mouse.scrollAmount.y() && !w.main.toolbar.io->hoverObstructed) {
             // Ignore the value of scrollAmount, since that leads to problems on macOS
@@ -155,18 +139,12 @@ void DrawCamera::update_main(World& w) {
                 WorldVec mVec = c.pos - w.get_mouse_world_pos();
                 c.pos = w.get_mouse_world_pos() + mVec / zoomFactor;
             }
-            if(changed)
-                changed();
         }
         if(w.main.input.key(InputManager::KEY_CAMERA_ROTATE_COUNTERCLOCKWISE).held && !w.main.input.text.get_accepting_input()) {
             c.rotate_about(c.from_space(w.main.window.size.cast<float>() * 0.5f), -w.main.deltaTime);
-            if(changed)
-                changed();
         }
         if(w.main.input.key(InputManager::KEY_CAMERA_ROTATE_CLOCKWISE).held && !w.main.input.text.get_accepting_input()) {
             c.rotate_about(c.from_space(w.main.window.size.cast<float>() * 0.5f), w.main.deltaTime);
-            if(changed)
-                changed();
         }
     }
 

src/DrawCamera.hpp

@@ -19,8 +19,6 @@ class DrawCamera {
         Vector2f viewingArea{-1, -1};
         SCollision::AABB<WorldScalar> viewingAreaGenerousCollider;
 
-        std::function<void()> changed;
-
         void set_viewing_area(Vector2f viewingAreaNew);
         void smooth_move_to(World& w, const CoordSpaceHelper& c, Vector2f windowSize, bool instantJump = false);
         void set_based_on_properties(World& w, const WorldVec& newPos, const WorldScalar& newZoom, double newRotate);

src/DrawingProgram/DrawingProgramCache.cpp

@@ -327,7 +327,6 @@ void DrawingProgramCache::refresh_draw_cache(const std::shared_ptr<DrawingProgra
 
     DrawData cacheDrawData = drawData;
     cacheDrawData.cam.c = bvhNode->coords;
-    cacheDrawData.cam.changed = nullptr;
     cacheDrawData.cam.set_viewing_area(bvhNode->resolution.cast<float>());
     cacheDrawData.refresh_draw_optimizing_values();
 

src/DrawingProgram/ScreenshotTool.cpp

@@ -78,7 +78,6 @@ void ScreenshotTool::gui_toolbox() {
                     setExtensionFilter = {"WebP", "webp"};
                 t.open_file_selector("Export", {setExtensionFilter}, [setExtensionFilter, w = make_weak_ptr(drawP.world.main.world)](const std::filesystem::path& p, const auto& e) {
                     auto world = w.lock();
-                    // NOTE: CHANGE THIS
                     if(world && world->drawProg.drawTool->get_type() == DrawingProgramToolType::SCREENSHOT) {
                         ScreenshotTool* screenshotTool = static_cast<ScreenshotTool*>(world->drawProg.drawTool.get());
                         screenshotTool->controls.screenshotSavePath = force_extension_on_path(p, setExtensionFilter.extensions);
@@ -202,7 +201,6 @@ void ScreenshotTool::take_screenshot_area_hw(const sk_sp<SkSurface>& surface, Sk
     drawP.world.main.transparentBackground = false;
     drawP.world.main.grid.gridType = oldGridType;
     drawP.world.drawData = d;
-    drawP.world.drawData.cam.changed();
 
     SkImageInfo aaImgInfo = SkImageInfo::Make(sectionImageSize.x(), sectionImageSize.y(), kRGBA_8888_SkColorType, kPremul_SkAlphaType);
     void* fullImgRawDataStartPt = (uint8_t*)fullImgRawData + 4 * (size_t)sectionImagePos.x() + 4 * (size_t)fullImageSize.x() * (size_t)sectionImagePos.y();

src/ResourceDisplay/SvgResourceDisplay.cpp

@@ -0,0 +1,43 @@
+#include "SvgResourceDisplay.hpp"
+#include "../MainProgram.hpp"
+#include <Helpers/Logger.hpp>
+#include <include/core/SkStream.h>
+#include <modules/svg/include/SkSVGRenderContext.h>
+
+bool SvgResourceDisplay::update_draw() const {
+    return mustUpdateDraw;
+}
+
+void SvgResourceDisplay::update(World& w) {
+    mustUpdateDraw = false;
+}
+
+bool SvgResourceDisplay::load(const std::string& fileName, const std::string& fileData) {
+    SkMemoryStream strm(fileData.c_str(), fileData.size());
+    svgDom = SkSVGDOM::Builder().make(strm);
+
+    mustUpdateDraw = true;
+
+    if(!svgDom)
+        return false;
+
+    svgRootSize = svgDom->containerSize();
+
+    return true;
+}
+
+void SvgResourceDisplay::draw(SkCanvas* canvas, const DrawData& drawData, const SkRect& imRect) {
+    canvas->save();
+    canvas->translate(imRect.x(), imRect.y());
+    canvas->scale(imRect.width() / svgRootSize.width(), imRect.height() / svgRootSize.height());
+    svgDom->render(canvas);
+    canvas->restore();
+}
+
+Vector2f SvgResourceDisplay::get_dimensions() const {
+    return {svgRootSize.width(), svgRootSize.height()};
+}
+
+float SvgResourceDisplay::get_dimension_scale() const {
+    return 0.3f;
+}

src/ResourceDisplay/SvgResourceDisplay.hpp

@@ -0,0 +1,19 @@
+#pragma once
+#include "ResourceDisplay.hpp"
+#include <include/core/SkImage.h>
+#include <vector>
+#include <modules/svg/include/SkSVGDOM.h>
+
+class SvgResourceDisplay : public ResourceDisplay {
+    public:
+        virtual void update(World& w) override;
+        virtual bool load(const std::string& fileName, const std::string& fileData) override;
+        virtual bool update_draw() const override;
+        virtual void draw(SkCanvas* canvas, const DrawData& drawData, const SkRect& imRect) override;
+        virtual Vector2f get_dimensions() const override;
+        virtual float get_dimension_scale() const override;
+    private:
+        sk_sp<SkSVGDOM> svgDom;
+        bool mustUpdateDraw = false;
+        SkSize svgRootSize;
+};

src/ResourceManager.cpp

@@ -1,6 +1,7 @@
 #include "ResourceManager.hpp"
 #include "Helpers/Networking/NetLibrary.hpp"
 #include <include/core/SkImage.h>
+#include "ResourceDisplay/SvgResourceDisplay.hpp"
 #include "Server/CommandList.hpp"
 #include "ResourceDisplay/ImageResourceDisplay.hpp"
 #include "ResourceDisplay/FileResourceDisplay.hpp"
@@ -121,6 +122,12 @@ std::shared_ptr<ResourceDisplay> ResourceManager::get_display_data(const ServerC
         return imgResource;
     }
 
+    auto svgResource(std::make_shared<SvgResourceDisplay>());
+    if(svgResource->load(resourceIt->second.name, *resourceIt->second.data)) {
+        displays[fileID] = svgResource;
+        return svgResource;
+    }
+
     auto fileResource(std::make_shared<FileResourceDisplay>());
     fileResource->load(resourceIt->second.name, *resourceIt->second.data);
     displays[fileID] = fileResource;

src/Toolbar.cpp

@@ -370,7 +370,6 @@ void Toolbar::paint_popup() {
         });
         if(newRotationAngle != main.world->drawData.cam.c.rotation) {
             main.world->drawData.cam.c.rotate_about(main.world->drawData.cam.c.from_space(main.window.size.cast<float>() * 0.5f), newRotationAngle - main.world->drawData.cam.c.rotation);
-            main.world->drawData.cam.changed();
         }
     }
 }