drinkingtea/jasper
drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Compare commits

base: drinkingtea:fbb2d290e3fe553bfe01d0296cda8b94c8b805e9
Branches Tags
drinkingtea:master
..
compare: drinkingtea:b6f1bdbbcdb3e2cc06439f67c107e006c4ca7292
Branches Tags
drinkingtea:master

No commits in common. "fbb2d290e3fe553bfe01d0296cda8b94c8b805e9" and "b6f1bdbbcdb3e2cc06439f67c107e006c4ca7292" have entirely different histories.
fbb2d290e3 ... b6f1bdbbcd

4 changed files with 1516 additions and 385 deletions
Show Stats Expand all files Collapse all files

66
project/Palettes/World/Person.npal
View File

@ -2,51 +2,18 @@ K1;56759edb-78b4-4108-b932-3cc5759b3921;O1;net.drinkingtea.nostalgia.gfx.Palette
"colorNames" : "colorNames" :
[ [
"Transparent", "Transparent",
"Shoe", "White"
"Black",
"Skin",
"Brown",
"Red",
"Trousers",
"Backpack"
], ],
"pages" : "pages" :
[ [
{ {
"colors" : "colors" :
[ [
{ {},
"b" : 5,
"g" : 5,
"r" : 5
},
{ {
"b" : 31, "b" : 31,
"g" : 31, "g" : 31,
"r" : 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" "name" : "Day"
@ -54,38 +21,11 @@ K1;56759edb-78b4-4108-b932-3cc5759b3921;O1;net.drinkingtea.nostalgia.gfx.Palette
{ {
"colors" : "colors" :
[ [
{ {},
"b" : 5,
"g" : 5,
"r" : 5
},
{ {
"b" : 31, "b" : 31,
"g" : 31, "g" : 31,
"r" : 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" "name" : "Night"

BIN
project/TileSheets/NS_Logo.nts
View File

Binary file not shown.

1790
project/TileSheets/World/People/Player.nts
View File

File diff suppressed because it is too large Load Diff

45
src/jasper/modules/world/src/studio/studiomodule.cpp
View File

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