BlackMATov/enduro2d
1
0
Fork 0
mirror of https://github.com/enduro2d/enduro2d.git synced 2025-12-15 00:11:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

add sprite making using atlas

Browse Source
This commit is contained in:
Matvey Cherevko
2019-03-26 18:44:10 +07:00
parent ddc580a727
commit 84adbda65c
12 changed files with 212 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
untests/bin/library/sprite.json
View File

@@ -1,7 +0,0 @@
{
"size" : { "x" : 10, "y" : 20 },
"pivot" : { "x" : 0.5, "y" : 0.7 },
"texrect" : { "w" : 0.5, "h" : 1 },
"texture" : "image.png",
"material" : "material.json"
}

7
untests/bin/library/sprite_a.json Normal file
View File

@@ -0,0 +1,7 @@
{
"atlas" : {
"atlas" : "atlas.json",
"region" : "sprite"
},
"material" : "material.json"
}

8
untests/bin/library/sprite_t.json Normal file
View File

@@ -0,0 +1,8 @@
{
"texture" : {
"texture" : "image.png",
"pivot" : { "x" : 1, "y" : 2 },
"texrect" : { "x" : 5, "y" : 6, "w" : 7, "h" : 8 }
},
"material" : "material.json"
}

27
untests/sources/untests_high/library.cpp
View File

@@ -96,6 +96,9 @@ TEST_CASE("library"){
REQUIRE(texture_res);
REQUIRE(texture_res->content());
auto material_res = l.load_asset<material_asset>("material.json");
REQUIRE(material_res);
auto atlas_res = l.load_asset<atlas_asset>("atlas.json");
REQUIRE(atlas_res);
REQUIRE(atlas_res->content().texture() == texture_res);
@@ -116,13 +119,23 @@ TEST_CASE("library"){
});
REQUIRE_FALSE(atlas_res->content().find_shape_region("shape_sprite2"));
auto sprite_res = l.load_asset<sprite_asset>("sprite.json");
REQUIRE(sprite_res);
REQUIRE(sprite_res->content().size() == v2f(10.f, 20.f));
REQUIRE(sprite_res->content().pivot() == v2f(0.5f, 0.7f));
REQUIRE(sprite_res->content().texrect() == b2f(0.5f, 1.f));
REQUIRE(sprite_res->content().texture());
REQUIRE(sprite_res->content().material());
{
auto sprite_res = l.load_asset<sprite_asset>("sprite_a.json");
REQUIRE(sprite_res);
REQUIRE(sprite_res->content().pivot() == v2f(1.f, 2.f));
REQUIRE(sprite_res->content().texrect() == b2f(5.f, 6.f, 7.f, 8.f));
REQUIRE(sprite_res->content().texture() == texture_res);
REQUIRE(sprite_res->content().material() == material_res);
}
{
auto sprite_res = l.load_asset<sprite_asset>("sprite_t.json");
REQUIRE(sprite_res);
REQUIRE(sprite_res->content().pivot() == v2f(1.f, 2.f));
REQUIRE(sprite_res->content().texrect() == b2f(5.f, 6.f, 7.f, 8.f));
REQUIRE(sprite_res->content().texture() == texture_res);
REQUIRE(sprite_res->content().material() == material_res);
}
auto model_res = l.load_asset<model_asset>("model.json");
REQUIRE(model_res);