[jasper/world/studio] Simplify Person template

project/Palettes/World/Person.npal

@@ -2,18 +2,51 @@ K1;56759edb-78b4-4108-b932-3cc5759b3921;O1;net.drinkingtea.nostalgia.gfx.Palette
 	"colorNames" : 
 	[
 		"Transparent",
-		"White"
+		"Shoe",
+		"Black",
+		"Skin",
+		"Hair",
+		"Red",
+		"Trousers",
+		"Backpack"
 	],
 	"pages" : 
 	[
 		{
 			"colors" : 
 			[
-				{},
+				{
+					"b" : 5,
+					"g" : 5,
+					"r" : 5
+				},
 				{
 					"b" : 31,
 					"g" : 31,
 					"r" : 31
+				},
+				{},
+				{
+					"b" : 20,
+					"g" : 20,
+					"r" : 23
+				},
+				{
+					"b" : 8,
+					"g" : 8,
+					"r" : 10
+				},
+				{
+					"g" : 6,
+					"r" : 24
+				},
+				{
+					"b" : 10,
+					"g" : 5
+				},
+				{
+					"b" : 20,
+					"g" : 15
 				}
 			],
 			"name" : "Day"
@@ -21,14 +54,41 @@ K1;56759edb-78b4-4108-b932-3cc5759b3921;O1;net.drinkingtea.nostalgia.gfx.Palette
 		{
 			"colors" : 
 			[
-				{},
+				{
+					"b" : 5,
+					"g" : 5,
+					"r" : 5
+				},
 				{
 					"b" : 31,
 					"g" : 31,
 					"r" : 31
+				},
+				{},
+				{
+					"b" : 20,
+					"g" : 20,
+					"r" : 23
+				},
+				{
+					"b" : 8,
+					"g" : 8,
+					"r" : 10
+				},
+				{
+					"g" : 6,
+					"r" : 24
+				},
+				{
+					"b" : 10,
+					"g" : 5
+				},
+				{
+					"b" : 20,
+					"g" : 15
 				}
 			],
 			"name" : "Night"
 		}
 	]
-}
+}

src/jasper/modules/world/src/studio/studiomodule.cpp

@@ -32,30 +32,27 @@ static class: public studio::Module {
 	ox::Vector<ox::UPtr<studio::ItemTemplate>> itemTemplates(studio::Context&) const noexcept override {
 		ox::Vector<ox::UniquePtr<studio::ItemTemplate>> out;
 		// Person TileSheet
-		{
+		ngfx::TileSheetV5 ts;
-			ngfx::TileSheetV5 ts;
+		ts.bpp = 4;
-			ts.bpp = 4;
+		auto const addSheet = [&ts](
-			auto const addSheet = [&ts](
+			ngfx::TileSheetV5::SubSheet &ss,
-				ngfx::TileSheetV5::SubSheet &ss,
+			ox::StringParam name,
-				ox::StringParam name,
+			int const cols,
-				int const cols,
+			int const rows) -> auto& {
-				int const rows) -> auto& {
+			return ss.subsheets.emplace_back(++ts.idIt, std::move(name), cols, rows);
-				return ss.subsheets.emplace_back(++ts.idIt, std::move(name), cols, rows);
+		};
-			};
+		auto const addSheetSet = [&ts, &addSheet](ox::StringParam name) {
-			auto const addSheetSet = [&ts, &addSheet](ox::StringParam name) {
+			auto &s = addSheet(ts.subsheet, std::move(name), -1, -1);
-				auto &s = addSheet(ts.subsheet, std::move(name), -1, -1);
+			addSheet(s, "Still", 2, 3);
-				addSheet(s, "Still", 2, 3);
+			addSheet(s, "Step 1", 2, 3);
-				addSheet(s, "Step 1", 2, 3);
+			addSheet(s, "Step 2", 2, 3);
-				addSheet(s, "Step 2", 2, 3);
+		};
-			};
+		addSheetSet("Front");
-			addSheetSet("Front");
+		addSheetSet("Back");
-			addSheetSet("Back");
+		addSheetSet("Side");
-			addSheetSet("Left");
+		out.emplace_back(ox::make<studio::ItemTemplateT<ngfx::TileSheetV5>>(
-			addSheetSet("Right");
+			"Jasper World Person",
-			out.emplace_back(ox::make<studio::ItemTemplateT<ngfx::TileSheetV5>>(
+			std::move(ts)));
-				"Jasper World Person",
-				std::move(ts)));
-		}
 		return out;
 	}