voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-12 22:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix skeletons behaviour in preload.json

Browse source
This commit is contained in:
MihailRis 2026-04-11 13:15:30 +03:00
parent ea64560b5d
commit acff945492
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/assets/AssetsLoader.cpp
View file

@ -287,7 +287,7 @@ void AssetsLoader::addDefaults(AssetsLoader& loader, const Content* content) {
for (const auto& file : io::directory_iterator(skeletonsDir)) { for (const auto& file : io::directory_iterator(skeletonsDir)) {
loader.add( loader.add(
AssetType::SKELETON, AssetType::SKELETON,
file.string(), (file.parent() / file.stem()).string(),
entry.first + ":" + file.stem() entry.first + ":" + file.stem()
); );
} }

3
src/assets/assetload_funcs.cpp
View file

@ -455,7 +455,8 @@ assetload::postfunc assetload::skeleton(
const std::shared_ptr<AssetCfg>& settings const std::shared_ptr<AssetCfg>& settings
) { ) {
return [=](auto assets) { return [=](auto assets) {
std::string text = io::read_string(file); auto path = paths.find(file + ".json");
std::string text = io::read_string(path);
auto skeleton = rigging::SkeletonConfig::parse(text, file, name); auto skeleton = rigging::SkeletonConfig::parse(text, file, name);
for (auto& bone : skeleton->getBones()) { for (auto& bone : skeleton->getBones()) {
std::string model = bone->model.name; std::string model = bone->model.name;