Merge branch 'dev' into pathfinding

This commit is contained in:
MihailRis
2025-08-24 17:32:13 +03:00
9 changed files with 73 additions and 24 deletions
+30 -7
View File
@@ -16,7 +16,7 @@ using namespace scripting;
static int l_save_fragment(lua::State* L) {
auto fragment = lua::touserdata<lua::LuaVoxelFragment>(L, 1);
auto file = lua::require_string(L, 2);
auto map = fragment->getFragment()->serialize();
auto map = fragment->getFragment(0)->serialize();
auto bytes = json::to_binary(map, true);
io::write_bytes(file, bytes.data(), bytes.size());
return 0;
@@ -30,22 +30,45 @@ static int l_create_fragment(lua::State* L) {
auto fragment =
VoxelFragment::create(*level, pointA, pointB, crop, saveEntities);
fragment->prepare(*content);
std::array<std::shared_ptr<VoxelFragment>, 4> fragmentVariants {
std::move(fragment)
};
for (size_t i = 1; i < 4; i++) {
fragmentVariants[i] = fragmentVariants[i - 1]->rotated(*content);
}
return lua::newuserdata<lua::LuaVoxelFragment>(
L, std::shared_ptr<VoxelFragment>(std::move(fragment))
L, std::move(fragmentVariants)
);
}
static int l_load_fragment(lua::State* L) {
io::path path = lua::require_string(L, 1);
if (!io::exists(path)) {
throw std::runtime_error("file "+path.string()+" does not exist");
dv::value map;
if (!lua::isstring(L, 1)) {
io::path path = lua::require_string(L, 1);
if (!io::exists(path)) {
throw std::runtime_error("file "+path.string()+" does not exist");
}
map = io::read_binary_json(path);
} else {
auto bytearray = lua::bytearray_as_string(L, 1);
map = json::from_binary(
reinterpret_cast<const ubyte*>(bytearray.data()), bytearray.size()
);
}
auto map = io::read_binary_json(path);
auto fragment = std::make_shared<VoxelFragment>();
fragment->deserialize(map);
fragment->prepare(*content);
return lua::newuserdata<lua::LuaVoxelFragment>(L, std::move(fragment));
std::array<std::shared_ptr<VoxelFragment>, 4> fragmentVariants {
std::move(fragment)
};
for (size_t i = 1; i < 4; i++) {
fragmentVariants[i] = fragmentVariants[i - 1]->rotated(*content);
}
return lua::newuserdata<lua::LuaVoxelFragment>(
L, std::move(fragmentVariants)
);
}
/// @brief Get a list of all world generators