gui skin index; gui accent

ucpu · Nov 24, 2024 · 24a6625 · 24a6625
1 parent 36a14a1
commit 24a6625
Show file tree

Hide file tree

Showing 8 changed files with 49 additions and 32 deletions.
diff --git a/externals/cage b/externals/cage
diff --git a/sources/gui/exportSkinTemplate.cpp b/sources/gui/exportSkinTemplate.cpp
@@ -10,7 +10,7 @@ class GuiTestImpl : public GuiTestClass
 public:
 	void initialize() override
 	{
-		detail::guiSkinTemplateExport(engineGuiManager()->skin(0), 2048)->exportFile("guiSkinTemplate.png");
+		detail::guiSkinTemplateExport(engineGuiManager()->skin(GuiSkinDefault), 2048)->exportFile("guiSkinTemplate.png");
 		engineStop();
 	}
 };

diff --git a/sources/gui/gui.h b/sources/gui/gui.h
@@ -128,11 +128,7 @@ namespace GuiTestClassNS
 		{
 			try
 			{
-				// log to console
-				Holder<Logger> log1 = newLogger();
-				log1->format.bind<logFormatConsole>();
-				log1->output.bind<logOutputStdOut>();
-
+				initializeConsoleLogger();
 				initializeEngine();
 
 				// events

diff --git a/sources/gui/guiBuilder.cpp b/sources/gui/guiBuilder.cpp
@@ -14,7 +14,7 @@ class GuiTestImpl : public GuiTestClass
 	bool switchSkin(input::GuiValue in)
 	{
 		EntityManager *ents = engineGuiEntities();
-		ents->get(3)->value<GuiWidgetStateComponent>().skinIndex = in.entity->value<GuiComboBoxComponent>().selected;
+		ents->get(3)->value<GuiWidgetStateComponent>().skin = GuiSkinIndex(in.entity->value<GuiComboBoxComponent>().selected);
 		return true;
 	}
 
@@ -102,6 +102,27 @@ class GuiTestImpl : public GuiTestClass
 
 			g->label().text("updated label");
 			g->label().text("").update([&](Entity *e) { e->value<GuiTextComponent>().value = Stringizer() + updatedIndex++; });
+
+			g->label().text("red accent");
+			{
+				auto _ = g->row();
+				for (Real a = 0.1; a < 0.51; a += 0.1)
+					g->button().text(Stringizer() + a).accent(Vec4(1, 0, 0, a));
+			}
+
+			g->label().text("green accent");
+			{
+				auto _ = g->row();
+				for (Real a = 0.1; a < 0.51; a += 0.1)
+					g->button().text(Stringizer() + a).accent(Vec4(0, 1, 0, a));
+			}
+
+			g->label().text("blue accent");
+			{
+				auto _ = g->row();
+				for (Real a = 0.1; a < 0.51; a += 0.1)
+					g->button().text(Stringizer() + a).accent(Vec4(0, 0, 1, a));
+			}
 		}
 	}
 };

diff --git a/sources/gui/layouts/line.cpp b/sources/gui/layouts/line.cpp
@@ -33,7 +33,7 @@ class GuiTestImpl : public GuiTestClass
 	{
 		for (uint32 i = 0; i < count; i++)
 		{
-			auto _1 = g->panel().text(Stringizer() + i).skin(3);
+			auto _1 = g->panel().text(Stringizer() + i).skin(GuiSkinTooltips);
 			auto _2 = g->column();
 			const uint32 cnt = randomRange(0, 3);
 			for (uint32 j = 0; j < cnt; j++)
@@ -264,8 +264,8 @@ class GuiTestImpl : public GuiTestClass
 				{
 					auto _1 = g->panel().text(Stringizer() + w).size(Vec2(w, Real::Nan()));
 					auto _2 = g->leftRowStretchRight();
-					g->panel().skin(3).text("fixed left");
-					g->panel().skin(3).text("flexible right");
+					g->panel().skin(GuiSkinTooltips).text("fixed left");
+					g->panel().skin(GuiSkinTooltips).text("flexible right");
 				}
 			}
 			{
@@ -275,8 +275,8 @@ class GuiTestImpl : public GuiTestClass
 				{
 					auto _1 = g->panel().text(Stringizer() + w).size(Vec2(w, Real::Nan()));
 					auto _2 = g->centerRowStretchBoth();
-					g->panel().skin(3).text("flexible left");
-					g->panel().skin(3).text("flexible right");
+					g->panel().skin(GuiSkinTooltips).text("flexible left");
+					g->panel().skin(GuiSkinTooltips).text("flexible right");
 				}
 			}
 			{
@@ -286,8 +286,8 @@ class GuiTestImpl : public GuiTestClass
 				{
 					auto _1 = g->panel().text(Stringizer() + w).size(Vec2(w, Real::Nan()));
 					auto _2 = g->rightRowStretchLeft();
-					g->panel().skin(3).text("flexible left");
-					g->panel().skin(3).text("fixed right");
+					g->panel().skin(GuiSkinTooltips).text("flexible left");
+					g->panel().skin(GuiSkinTooltips).text("fixed right");
 				}
 			}
 		}
@@ -304,7 +304,7 @@ class GuiTestImpl : public GuiTestClass
 					auto _1 = g->panel().text(Stringizer() + cnt);
 					auto _2 = g->leftRowStretchRight();
 					{
-						auto _ = g->panel().skin(3).text("fixed left");
+						auto _ = g->panel().skin(GuiSkinTooltips).text("fixed left");
 						g->label().text("hej");
 					}
 					generate(g, cnt);

diff --git a/sources/gui/layouts/split.cpp b/sources/gui/layouts/split.cpp
@@ -9,7 +9,7 @@ class GuiTestImpl : public GuiTestClass
 	{
 		for (uint32 i = 0; i < count; i++)
 		{
-			auto _1 = g->panel().text(Stringizer() + i).skin(3);
+			auto _1 = g->panel().text(Stringizer() + i).skin(GuiSkinTooltips);
 			auto _2 = g->column();
 			const uint32 cnt = randomRange(0, 3);
 			for (uint32 j = 0; j < cnt; j++)

diff --git a/sources/gui/mixture.cpp b/sources/gui/mixture.cpp
@@ -13,7 +13,7 @@ class GuiTestImpl : public GuiTestClass
 	bool switchSkin(input::GuiValue in)
 	{
 		EntityManager *ents = engineGuiEntities();
-		ents->get(3)->value<GuiWidgetStateComponent>().skinIndex = in.entity->value<GuiComboBoxComponent>().selected;
+		ents->get(3)->value<GuiWidgetStateComponent>().skin = GuiSkinIndex(in.entity->value<GuiComboBoxComponent>().selected);
 		return true;
 	}
 

diff --git a/sources/gui/skins.cpp b/sources/gui/skins.cpp
@@ -36,9 +36,9 @@ class GuiTestImpl : public GuiTestClass
 		for (uint32 i = 0; i < 4; i++)
 			a4[i] = (steeper(Rads(t) + Rads::Full() * Real(i) / 4) * 0.5 + 0.5) * 20;
 
-		const auto &generate = [&](uint32 styleIndex)
+		const auto &generate = [&](GuiSkinIndex style)
 		{
-			GuiSkinConfig skin = detail::guiSkinGenerate(styleIndex);
+			GuiSkinConfig skin = detail::guiSkinGenerate(style);
 			switch (animateOption)
 			{
 				case 0: // margins
@@ -76,12 +76,12 @@ class GuiTestImpl : public GuiTestClass
 			return skin;
 		};
 
-		engineGuiManager()->skin(0) = generate(0);
-		engineGuiManager()->skin(1) = generate(1);
-		engineGuiManager()->skin(2) = generate(2);
-		engineGuiManager()->skin(3) = generate(3);
-		engineGuiManager()->skin(4) = generate(0);
-		engineGuiManager()->skin(4).textureName = HashString("cage-tests/gui/skin.png");
+		engineGuiManager()->skin(GuiSkinDefault) = generate(GuiSkinDefault);
+		engineGuiManager()->skin(GuiSkinLarge) = generate(GuiSkinLarge);
+		engineGuiManager()->skin(GuiSkinCompact) = generate(GuiSkinCompact);
+		engineGuiManager()->skin(GuiSkinTooltips) = generate(GuiSkinTooltips);
+		engineGuiManager()->skin(GuiSkinIndex(4)) = generate(GuiSkinDefault);
+		engineGuiManager()->skin(GuiSkinIndex(4)).textureName = HashString("cage-tests/gui/skin.png");
 	}
 
 	void initializeEngine() override
@@ -174,7 +174,7 @@ class GuiTestImpl : public GuiTestClass
 			p.order = index++;
 			e->value<GuiInputComponent>();
 			e->value<GuiTextComponent>().value = "large input box";
-			e->value<GuiWidgetStateComponent>().skinIndex = 1;
+			e->value<GuiWidgetStateComponent>().skin = GuiSkinLarge;
 		}
 		{ // compact input box
 			Entity *e = ents->createUnique();
@@ -183,7 +183,7 @@ class GuiTestImpl : public GuiTestClass
 			p.order = index++;
 			e->value<GuiInputComponent>();
 			e->value<GuiTextComponent>().value = "compact input box";
-			e->value<GuiWidgetStateComponent>().skinIndex = 2;
+			e->value<GuiWidgetStateComponent>().skin = GuiSkinCompact;
 		}
 		{ // checkbox
 			Entity *e = ents->createUnique();
@@ -329,10 +329,10 @@ class GuiTestImpl : public GuiTestClass
 		initializeSide(6, "compact skin");
 		initializeSide(7, "tooltips skin");
 		initializeSide(8, "default skin - texture template");
-		ents->get(5)->value<GuiWidgetStateComponent>().skinIndex = 1;
-		ents->get(6)->value<GuiWidgetStateComponent>().skinIndex = 2;
-		ents->get(7)->value<GuiWidgetStateComponent>().skinIndex = 3;
-		ents->get(8)->value<GuiWidgetStateComponent>().skinIndex = 4;
+		ents->get(5)->value<GuiWidgetStateComponent>().skin = GuiSkinLarge;
+		ents->get(6)->value<GuiWidgetStateComponent>().skin = GuiSkinCompact;
+		ents->get(7)->value<GuiWidgetStateComponent>().skin = GuiSkinTooltips;
+		ents->get(8)->value<GuiWidgetStateComponent>().skin = GuiSkinIndex(4);
 	}
 };
+12 −4		data/cage/shader/gui/element.glsl
+2 −1		sources/include/cage-engine/guiBuilder.h
+15 −1		sources/include/cage-engine/guiComponents.h
+3 −2		sources/include/cage-engine/guiManager.h
+2 −5		sources/include/cage-engine/guiSkins.h
+12 −9		sources/libengine/graphics/provisionalGraphics.cpp
+0 −3		sources/libengine/graphics/screenSpaceEffects.cpp
+4 −4		sources/libengine/gui/elementsTemplate.cpp
+18 −4		sources/libengine/gui/graphics.cpp
+15 −10		sources/libengine/gui/gui.cpp
+8 −2		sources/libengine/gui/guiBuilder.cpp
+1 −0		sources/libengine/gui/private.h
+61 −18		sources/libengine/gui/skin.cpp
+1 −1		sources/libengine/gui/tooltips.cpp
+17 −12		sources/libsimple/graphics.cpp
+1 −1		sources/libsimple/statisticsGui.cpp