font sizes

ucpu · Jan 9, 2024 · 95b5369 · 95b5369
1 parent b2e19c4
commit 95b5369
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 5 deletions.
diff --git a/externals/cage b/externals/cage
diff --git a/sources/gui/CMakeLists.txt b/sources/gui/CMakeLists.txt
@@ -16,5 +16,6 @@ macro(cage_tests folder)
 endmacro()
 
 cage_tests("layouts/")
+cage_tests("texts/")
 cage_tests("widgets/")
 cage_tests("")
diff --git a/sources/gui/fontLineSpacing.cpp → sources/gui/texts/fontLineSpacing.cpp b/sources/gui/fontLineSpacing.cpp → sources/gui/texts/fontLineSpacing.cpp
@@ -1,4 +1,4 @@
-#include "gui.h"
+#include "../gui.h"
 
 #include <cage-core/string.h>
 

diff --git a/sources/gui/fontScaling.cpp → sources/gui/texts/fontScaling.cpp b/sources/gui/fontScaling.cpp → sources/gui/texts/fontScaling.cpp
@@ -1,4 +1,4 @@
-#include "gui.h"
+#include "../gui.h"
 
 #include <cage-core/color.h>
 

diff --git a/sources/gui/texts/fontSizes.cpp b/sources/gui/texts/fontSizes.cpp
@@ -0,0 +1,61 @@
+#include "../gui.h"
+
+using namespace cage;
+
+constexpr const char *fontNames[] = {
+	"cage-tests/gui/DroidSansMono.ttf",
+	"cage-tests/gui/immortal.ttf",
+	"cage-tests/gui/roboto.ttf",
+	"cage-tests/gui/asimov.otf",
+	"cage/font/ubuntu/regular.ttf",
+	"cage/font/ubuntu/bold.ttf",
+	"cage/font/ubuntu/italic.ttf",
+	"cage/font/ubuntu/monospace.ttf",
+};
+constexpr String labelTexts[] = {
+	"Droid Sans Mono",
+	"Immortal",
+	"Roboto",
+	"Asimov",
+	"Ubuntu Regular",
+	"Ubuntu Bold",
+	"Ubuntu Italic",
+	"Ubuntu Mono",
+};
+constexpr String multilineText = "lorem ipsum dolor sit amet\npříliš žluťoučký kůň úpěl ďábelské ódy\na quick brown fox jumps over a lazy dog\nhello world, foo, bar, baz\n\n";
+
+const uint32 fontsCount = array_size(fontNames);
+static_assert(array_size(fontNames) == array_size(labelTexts));
+
+constexpr Real fontSizes[] = { 9, 11, 14, 18 };
+
+class GuiTestImpl : public GuiTestClass
+{
+public:
+	void initialize() override
+	{
+		Holder g = newGuiBuilder(engineGuiEntities());
+		auto _1 = g->panel();
+		auto _2 = g->scrollbars();
+		auto _3 = g->alignment();
+		auto _4 = g->verticalTable(array_size(fontSizes) + 1);
+		{
+			g->label().text("");
+			for (Real size : fontSizes)
+				g->label().text(Stringizer() + size);
+		}
+		for (uint32 fontIndex = 0; fontIndex < fontsCount; fontIndex++)
+		{
+			g->label().text(labelTexts[fontIndex]);
+			for (Real size : fontSizes)
+			{
+				GuiTextFormatComponent f;
+				f.font = HashString(fontNames[fontIndex]);
+				f.size = size;
+				g->label().text(multilineText).textFormat(f);
+			}
+		}
+	}
+};
+
+MAIN(GuiTestImpl, "fonts sizes")
diff --git a/sources/gui/fontTypography.cpp → sources/gui/texts/fontTypography.cpp b/sources/gui/fontTypography.cpp → sources/gui/texts/fontTypography.cpp
@@ -1,4 +1,4 @@
-#include "gui.h"
+#include "../gui.h"
 
 using namespace cage;
 

diff --git a/sources/gui/utf8test.cpp → sources/gui/texts/utf8test.cpp b/sources/gui/utf8test.cpp → sources/gui/texts/utf8test.cpp
@@ -1,4 +1,4 @@
-#include "gui.h"
+#include "../gui.h"
 
 // *************************************************************************
 // This process may fail due to the text containing malformed utf-8 text.
+1 −1		data/cage/shader/engine/engine.assets
+1 −2		data/cage/shader/engine/engine.pack
+48 −0		data/cage/shader/engine/font.glsl
+4 −6		data/cage/shader/gui/font.glsl
+1 −1		externals/avir/avir
+1 −1		externals/cubeb/cubeb
+1 −1		externals/dr_libs/dr_libs
+1 −1		externals/fastnoise/fastnoise
+13 −0		externals/fetch_latest.sh
+1 −1		externals/glfw/glfw
+1 −1		externals/glm/glm
+1 −1		externals/jpeg/jpeg
+1 −1		externals/msdfgen/msdfgen
+1 −1		externals/openxr-sdk/OpenXR-SDK
+1 −1		externals/plf/plf_colony
+1 −1		externals/plf/plf_list
+1 −1		externals/plf/plf_stack
+1 −1		externals/pmp/pmp
+1 −1		externals/png/png
+1 −1		externals/samplerate/libsamplerate
+1 −1		externals/stb/stb
+1 −1		externals/tiff/tiff
+1 −1		externals/unordered_dense/unordered_dense
+1 −1		externals/utfcpp/utfcpp
+1 −1		externals/zlib-ng/zlib-ng
+1 −1		externals/zstd/zstd
+1 −1		sources/asset-processor/font.cpp
+1 −2		sources/include/cage-engine/font.h
+1 −0		sources/include/cage-engine/guiComponents.h
+3 −12		sources/libengine/graphics/font.cpp
+2 −2		sources/libengine/graphics/renderPipeline.cpp
+8 −6		sources/libengine/gui/graphics.cpp
+1 −0		sources/libengine/gui/private.h
+1 −1		sources/libengine/gui/tooltips.cpp