7 files changed, 56 insertions, 43 deletions
diff --git a/demos/Graphics/CMakeLists.txt b/demos/Graphics/CMakeLists.txt
new file mode 100644
index 00000000..64982a19
--- /dev/null
+++ b/demos/Graphics/CMakeLists.txt
@@ -0,0 +1,8 @@
+add_library(CruDemoGraphicsBase INTERFACE)
+target_link_libraries(CruDemoGraphicsBase INTERFACE CruPlatformGraphicsBootstrap)
+
+add_executable(CruDemoGraphicsDrawCircle DrawCircle.cpp)
+target_link_libraries(CruDemoGraphicsDrawCircle PRIVATE CruDemoGraphicsBase)
+
+add_executable(CruDemoGraphicsSvgPath SvgPath.cpp)
+target_link_libraries(CruDemoGraphicsSvgPath PRIVATE CruDemoGraphicsBase)
diff --git a/demos/Graphics/DrawCircle/DrawCircle.cpp b/demos/Graphics/DrawCircle.cpp
index a28bc4e4..db63c7dc 100644
--- a/demos/Graphics/DrawCircle/DrawCircle.cpp
+++ b/demos/Graphics/DrawCircle.cpp
@@ -1,13 +1,15 @@
 #include "cru/base/io/CFileStream.h"
 #include "cru/platform/Color.h"
+#include "cru/platform/bootstrap/GraphicsBootstrap.h"
 #include "cru/platform/graphics/Factory.h"
 #include "cru/platform/graphics/ImageFactory.h"
 #include "cru/platform/graphics/Painter.h"
 
 #include <memory>
 
-namespace cru::demos::graphics {
-  void DrawCircle(platform::graphics::IGraphicsFactory* graphics_factory) {
+int main() {
+  std::unique_ptr<cru::platform::graphics::IGraphicsFactory> graphics_factory(
+      cru::platform::bootstrap::CreateGraphicsFactory());
 
   auto image = graphics_factory->GetImageFactory()->CreateBitmap(500, 500);
 
@@ -19,11 +21,11 @@ namespace cru::demos::graphics {
     painter->EndDraw();
   }
 
-  cru::io::CFileStream file_stream("./test_image.png", "w");
+  cru::io::CFileStream file_stream("draw-circle-demo.png", "w");
 
   graphics_factory->GetImageFactory()->EncodeToStream(
       image.get(), &file_stream, cru::platform::graphics::ImageFormat::Png,
       1.0f);
-  }
-}
 
+  return 0;
+}
diff --git a/demos/Graphics/DrawCircle/CMakeLists.txt b/demos/Graphics/DrawCircle/CMakeLists.txt
deleted file mode 100644
index 51531d4c..00000000
--- a/demos/Graphics/DrawCircle/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable(CruDemoGraphicsDrawCircle DrawCircle.cpp PlatformMain.cpp)
-target_link_libraries(CruDemoGraphicsDrawCircle PRIVATE CruDemoBase)
-
-if(TARGET CruPlatformGraphicsCairo)
-	add_executable(CruDemoGraphicsDrawCircleCairo DrawCircle.cpp CairoMain.cpp)
-	target_link_libraries(CruDemoGraphicsDrawCircleCairo PRIVATE CruDemoBase CruPlatformGraphicsCairo)
-endif()
diff --git a/demos/Graphics/DrawCircle/CairoMain.cpp b/demos/Graphics/DrawCircle/CairoMain.cpp
deleted file mode 100644
index 35d6840b..00000000
--- a/demos/Graphics/DrawCircle/CairoMain.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "cru/platform/graphics/cairo/CairoGraphicsFactory.h"
-
-#include "DrawCircle.h"
-
-int main() {
-  std::unique_ptr<cru::platform::graphics::IGraphicsFactory> graphics_factory(
-      new cru::platform::graphics::cairo::CairoGraphicsFactory());
-
-  cru::demos::graphics::DrawCircle(graphics_factory.get());
-
-  return 0;
-}
diff --git a/demos/Graphics/DrawCircle/DrawCircle.h b/demos/Graphics/DrawCircle/DrawCircle.h
deleted file mode 100644
index 8e14dc84..00000000
--- a/demos/Graphics/DrawCircle/DrawCircle.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#pragma once
-#include "cru/platform/graphics/Factory.h"
-
-namespace cru::demos::graphics {
-  void DrawCircle(platform::graphics::IGraphicsFactory* graphics_factory);
-}
-
diff --git a/demos/Graphics/DrawCircle/PlatformMain.cpp b/demos/Graphics/DrawCircle/PlatformMain.cpp
deleted file mode 100644
index 3da1ec89..00000000
--- a/demos/Graphics/DrawCircle/PlatformMain.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "cru/platform/bootstrap/Bootstrap.h"
-
-#include "DrawCircle.h"
-
-int main() {
-  std::unique_ptr<cru::platform::graphics::IGraphicsFactory> graphics_factory(
-      cru::platform::bootstrap::CreateGraphicsFactory());
-
-  cru::demos::graphics::DrawCircle(graphics_factory.get());
-
-  return 0;
-}
diff --git a/demos/Graphics/SvgPath.cpp b/demos/Graphics/SvgPath.cpp
new file mode 100644
index 00000000..181cb297
--- /dev/null
+++ b/demos/Graphics/SvgPath.cpp
@@ -0,0 +1,41 @@
+
+#include "cru/base/io/CFileStream.h"
+#include "cru/platform/Color.h"
+#include "cru/platform/bootstrap/GraphicsBootstrap.h"
+#include "cru/platform/graphics/Factory.h"
+#include "cru/platform/graphics/ImageFactory.h"
+#include "cru/platform/graphics/Painter.h"
+
+#include <memory>
+
+int main() {
+  std::unique_ptr<cru::platform::graphics::IGraphicsFactory> graphics_factory(
+      cru::platform::bootstrap::CreateGraphicsFactory());
+
+  auto brush =
+      graphics_factory->CreateSolidColorBrush(cru::platform::colors::black);
+
+  auto geometry_builder = graphics_factory->CreateGeometryBuilder();
+  geometry_builder->ParseAndApplySvgPathData(
+      uR"(
+M8.5 5.5a.5.5 0 0 0-1 0v3.362l-1.429 2.38a.5.5 0 1 0 .858.515l1.5-2.5A.5.5 0 0 0 8.5 9V5.5z
+M6.5 0a.5.5 0 0 0 0 1H7v1.07a7.001 7.001 0 0 0-3.273 12.474l-.602.602a.5.5 0 0 0 .707.708l.746-.746A6.97 6.97 0 0 0 8 16a6.97 6.97 0 0 0 3.422-.892l.746.746a.5.5 0 0 0 .707-.708l-.601-.602A7.001 7.001 0 0 0 9 2.07V1h.5a.5.5 0 0 0 0-1h-3zm1.038 3.018a6.093 6.093 0 0 1 .924 0 6 6 0 1 1-.924 0zM0 3.5c0 .753.333 1.429.86 1.887A8.035 8.035 0 0 1 4.387 1.86 2.5 2.5 0 0 0 0 3.5zM13.5 1c-.753 0-1.429.333-1.887.86a8.035 8.035 0 0 1 3.527 3.527A2.5 2.5 0 0 0 13.5 1z
+  )");
+  auto geometry = geometry_builder->Build();
+
+  auto image = graphics_factory->GetImageFactory()->CreateBitmap(1000, 1000);
+  auto painter = image->CreatePainter();
+
+  painter->PushState();
+  painter->FillGeometry(geometry.get(), brush.get());
+  painter->PopState();
+  painter->EndDraw();
+
+  cru::io::CFileStream file_stream("./svg-path-demo.png", "w");
+
+  graphics_factory->GetImageFactory()->EncodeToStream(
+      image.get(), &file_stream, cru::platform::graphics::ImageFormat::Png,
+      1.0f);
+
+  return 0;
+}