summaryrefslogtreecommitdiffhomepage
path: root/loader
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2023-05-19 05:50:06 +0200
committerStanislaw Halik <sthalik@misaki.pl>2023-05-19 05:50:06 +0200
commita4870b515381b222f5dcb9d4d3cfe34102967ce4 (patch)
tree26c21db43a47635ca28594153bd5640f95ebcf62 /loader
parentf5a7dc9d264c4231d9f688704ceef6971bddf272 (diff)
add selecting and placing vobj's
TODO: - saving to disk - inspect dialog - actual lightmap shader
Diffstat (limited to 'loader')
-rw-r--r--loader/vobj.cpp22
1 files changed, 13 insertions, 9 deletions
diff --git a/loader/vobj.cpp b/loader/vobj.cpp
index 9d167368..75351cd4 100644
--- a/loader/vobj.cpp
+++ b/loader/vobj.cpp
@@ -41,23 +41,27 @@ void nlohmann::adl_serializer<vobj>::from_json(const json& j, vobj& val)
namespace floormat::loader_detail {
+#if defined __GNUG__ && !defined __clang__
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+#endif
+
std::shared_ptr<struct anim_atlas> loader_impl::make_vobj_anim_atlas(StringView name, StringView image_filename)
{
auto tex = texture(VOBJ_PATH, image_filename);
anim_def def;
def.object_name = name;
const auto size = tex.pixels().size();
- const auto width = size[1], height = size[0];
- def.pixel_size = { (unsigned)width, (unsigned)height };
+ const auto width = (unsigned)size[1], height = (unsigned)size[0];
+ def.pixel_size = { width, height };
def.nframes = 1;
def.fps = 0;
- anim_group g;
- g.name = "n"_s;
- anim_frame f;
- f.size = def.pixel_size;
- g.frames = { f };
- def.groups = { std::move(g) };
-
+ def.groups = {{
+ .name = "n"_s,
+ .frames = {{
+ .ground = Vector2i(def.pixel_size/2),
+ .size = def.pixel_size
+ }}
+ }};
auto atlas = std::make_shared<struct anim_atlas>(name, tex, std::move(def));
return atlas;
}