Add SvgIcon class

Based on Icon class, but constructor replaced with calls to lunasvg.

6 files changed, 110 insertions, 0 deletions

diff --git a/config/types.h b/config/types.h
index c501f41..06825b5 100644
--- a/config/types.h
+++ b/config/types.h
@@ -42,6 +42,7 @@ using Normal3D = Normal<3>;
 using Rotation2D = Rotation<2>;
 using Rotation3D = Rotation<3>;
 using TextureRelCoord = glm::vec<2, float>;
+using ImageDimensions = glm::vec<2, GLsizei>;
 using TextureDimensions = glm::vec<3, GLsizei>;
 using TextureRelRegion = glm::vec<4, float>;
 using TextureAbsCoord = glm::vec<2, GLsizei>;
diff --git a/res/ui/icon/rails.svg b/res/ui/icon/rails.svg
new file mode 100644
index 0000000..81e9b94
--- /dev/null
+++ b/res/ui/icon/rails.svg
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">

+<!-- Creator: CorelDRAW -->

+<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="1.99999in" height="1.99999in" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd"

+viewBox="0 0 2000 2000"

+ xmlns:xlink="http://www.w3.org/1999/xlink">

+ <defs>

+  <style type="text/css">

+   <![CDATA[

+    .fil0 {fill:none}

+    .fil1 {fill:#333333}

+    .fil2 {fill:#C06000}

+    .fil3 {fill:#CCCCCC}

+   ]]>

+  </style>

+ </defs>

+ <rect class="fil0" width="2000" height="2000"/>

+ <g id="Layer_x0020_1">

+  <metadata id="CorelCorpID_0Corel-Layer"/>

+  <path class="fil1" d="M1448 515l-61 0 29 126 108 0c30,0 55,23 63,59l38 168c8,37 -28,69 -63,69l-80 0 28 126 127 0c31,0 55,23 63,59l38 168c9,37 -27,69 -63,69l-98 0 28 126 146 0c31,0 55,22 63,58l38 169c8,37 -27,68 -63,68l-126 0c-8,20 -30,34 -51,34l-81 0c-21,0 -38,-13 -48,-34l-966 0c-10,21 -27,34 -48,34l-81 0c-21,0 -43,-14 -51,-34l-126 0c-36,0 -71,-31 -63,-68l38 -169c8,-36 32,-58 63,-58l146 0 29 -126 -99 0c-36,0 -72,-32 -63,-69l38 -168c8,-36 32,-59 63,-59l127 0 28 -126 -80 0c-35,0 -71,-32 -63,-69l38 -168c8,-36 32,-59 63,-59l109 0 28 -126c-40,0 -87,8 -113,-25 -10,-13 -14,-28 -11,-44 56,-248 29,-226 192,-226 10,-21 27,-34 49,-34l80 0c21,0 43,14 51,34l278 0c8,-20 30,-34 51,-34l81 0c21,0 39,13 48,34 163,0 136,-21 192,226 8,37 -28,69 -63,69zm-971 1239l341 -1516 0 -1c-1,-2 -5,-4 -8,-4l-80 0c-5,0 -8,10 -9,15l-338 1506c-2,7 -5,13 5,13l81 0c4,0 7,-8 8,-13zm108 -269l830 0 -28 -126 -773 0 -29 126zm95 -422l640 0 -28 -126 -584 0 -28 126zm95 -422l450 0 -28 -126 -394 0 -28 126zm-436 1093l46 -202 -136 0 0 0c-12,0 -16,17 -18,22l-37 168c-2,6 12,12 17,12l128 0zm95 -422l45 -202 -116 0 0 0c-12,0 -17,17 -18,22l-38 168c-1,7 13,12 18,12l109 0zm425 -1046l-45 202 373 0 -46 -202 -282 0zm-95 422l-45 202 562 0 -45 -202 -472 0zm-94 422l-46 202 752 0 -45 -202 -661 0zm-95 422l-46 202 942 0 -46 -202 -850 0zm760 -1035l-56 -251c-1,-5 -4,-13 -9,-13l-80 0c-3,0 -6,2 -8,4l341 1517c1,5 5,13 8,13l81 0c3,0 7,-2 8,-4l-285 -1266zm-4 -231l46 202 71 0c5,0 19,-5 17,-11l-37 -169c-2,-5 -6,-22 -18,-22l-79 0zm95 422l45 202 91 0c4,0 19,-5 17,-12l-38 -168c-1,-5 -6,-22 -17,-22l-98 0zm95 422l45 202 109 0c6,0 19,-5 18,-12l-38 -168c-1,-5 -6,-22 -17,-22l-117 0zm95 422l45 202 128 0c6,0 18,-6 18,-12l-38 -168c-1,-5 -6,-22 -18,-22l-135 0zm-1140 -844c-11,0 -16,17 -17,22l-38 168c-2,7 13,12 17,12l91 0 45 -202 -98 0zm114 -422c-12,0 -16,17 -17,22l-38 169c-2,6 12,11 17,11l72 0 45 -202 -79 0z"/>

+  <path class="fil2" d="M339 1734l46 -202 -136 0 0 0c-12,0 -16,17 -18,22l-37 168c-2,6 12,12 17,12l128 0z"/>

+  <path class="fil3" d="M721 248l-338 1506c-2,7 -5,13 5,13l81 0c4,0 7,-8 8,-13l341 -1516 0 -1c-1,-2 -5,-4 -8,-4l-80 0c-5,0 -8,10 -9,15z"/>

+  <polygon class="fil2" points="1425,1532 575,1532 529,1734 1471,1734 "/>

+  <path class="fil3" d="M1182 237l341 1517c1,5 5,13 8,13l81 0c3,0 7,-2 8,-4l-285 -1266 -56 -251c-1,-5 -4,-13 -9,-13l-80 0c-3,0 -6,2 -8,4z"/>

+  <path class="fil2" d="M1751 1532l-135 0 45 202 128 0c6,0 18,-6 18,-12l-38 -168c-1,-5 -6,-22 -18,-22z"/>

+  <path class="fil2" d="M1566 1312l109 0c6,0 19,-5 18,-12l-38 -168c-1,-5 -6,-22 -17,-22l-117 0 45 202z"/>

+  <polygon class="fil2" points="1376,1312 1331,1110 670,1110 624,1312 "/>

+  <path class="fil2" d="M434 1312l45 -202 -116 0 0 0c-12,0 -17,17 -18,22l-38 168c-1,7 13,12 18,12l109 0z"/>

+  <path class="fil2" d="M438 890l91 0 45 -202 -98 0c-11,0 -16,17 -17,22l-38 168c-2,7 13,12 17,12z"/>

+  <polygon class="fil2" points="764,688 719,890 1281,890 1236,688 "/>

+  <path class="fil2" d="M1426 688l45 202 91 0c4,0 19,-5 17,-12l-38 -168c-1,-5 -6,-22 -17,-22l-98 0z"/>

+  <path class="fil2" d="M1377 468l71 0c5,0 19,-5 17,-11l-37 -169c-2,-5 -6,-22 -18,-22l-79 0 46 202z"/>

+  <polygon class="fil2" points="1187,468 1141,266 859,266 814,468 "/>

+  <path class="fil2" d="M624 468l45 -202 -79 0c-12,0 -16,17 -17,22l-38 169c-2,6 12,11 17,11l72 0z"/>

+ </g>

+</svg>

diff --git a/test/Jamfile.jam b/test/Jamfile.jam
index bedc2ad..c922187 100644
--- a/test/Jamfile.jam
+++ b/test/Jamfile.jam
@@ -65,6 +65,7 @@ run perf-instancing.cpp : \< : test-instancing : <library>benchmark <library>tes
 run test-glContainer.cpp : : : <library>test ;
 run test-pack.cpp : : : <library>test ;
 run test-environment.cpp : : : <library>test ;
+run test-ui.cpp : : : <library>test ;
 compile test-static-enumDetails.cpp ;
 compile test-static-stream_support.cpp ;
 explicit perf-assetFactory ;
diff --git a/test/test-ui.cpp b/test/test-ui.cpp
new file mode 100644
index 0000000..2810cda
--- /dev/null
+++ b/test/test-ui.cpp
@@ -0,0 +1,20 @@
+#define BOOST_TEST_MODULE UI
+#include <boost/test/unit_test.hpp>
+#include <stream_support.h>
+
+#include "testMainWindow.h"
+#include <gfx/models/texture.h>
+#include <resource.h>
+#include <ui/svgIcon.h>
+
+constexpr GLsizei RENDER_SIZE = 64;
+
+BOOST_GLOBAL_FIXTURE(TestMainWindowAppBase);
+
+BOOST_AUTO_TEST_CASE(LoadFromFile)
+{
+	SvgIcon svg(ImageDimensions {RENDER_SIZE}, Resource::mapPath("ui/icon/rails.svg"));
+	const auto size = Texture::getSize(svg.texture);
+	BOOST_CHECK_EQUAL(size, TextureDimensions(RENDER_SIZE, RENDER_SIZE, 1));
+	Texture::save(svg.texture, "/tmp/rails.tga");
+}
diff --git a/ui/svgIcon.cpp b/ui/svgIcon.cpp
new file mode 100644
index 0000000..499d9cc
--- /dev/null
+++ b/ui/svgIcon.cpp
@@ -0,0 +1,34 @@
+#include "svgIcon.h"
+#include "gl_traits.h"
+#include <resource.h>
+
+SvgIcon::SvgIcon(ImageDimensions dim, const std::filesystem::path & path)
+{
+	const auto svgDoc = lunasvg::Document::loadFromFile(Resource::mapPath(path).native());
+	if (!svgDoc) {
+		throw std::runtime_error("Failed to load SVG from " + path.string());
+	}
+
+	auto bitmap = svgDoc->renderToBitmap(dim.x, dim.y);
+	if (bitmap.isNull()) {
+		throw std::runtime_error("Failed to render SVG " + path.string());
+	}
+	bitmap.convertToRGBA();
+
+	glBindTexture(GL_TEXTURE_2D, texture);
+
+	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_BORDER);
+	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
+
+	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameter(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, dim.x, dim.y, 0, GL_RGBA, GL_UNSIGNED_BYTE, bitmap.data());
+}
+
+ImTextureID
+SvgIcon::operator*() const
+{
+	static_assert(sizeof(glTexture) <= sizeof(ImTextureID));
+	// NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast,performance-no-int-to-ptr) This is how ImGui works
+	return reinterpret_cast<ImTextureID>(*texture);
+}
diff --git a/ui/svgIcon.h b/ui/svgIcon.h
new file mode 100644
index 0000000..106f97c
--- /dev/null
+++ b/ui/svgIcon.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "glArrays.h"
+#include "imgui_wrap.h"
+#include <config/types.h>
+#include <filesystem>
+#include <lunasvg.h>
+
+class SvgIcon {
+public:
+	SvgIcon(ImageDimensions, const std::filesystem::path &);
+
+	ImTextureID operator*() const;
+
+private:
+	friend class LoadFromFile; // Test case verifying size/content
+	glTexture texture;
+};