Commit de24ce21 authored by Lázár Bence Kis's avatar Lázár Bence Kis
Browse files

Skeleton pointer fixed in gltf_importer

parent ef40d867

gfx/src/renderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ void Renderer::present_object(com::Folder *const object, CommonVisitData const & 
        INVARIANT(frame != nullptr);



        if (auto instance_folder = object_system()->get_skeleton_instance(frame_link)) {

            calculate_bone_matrices(bone_uniforms, instance_folder, skeleton_folder->folder(), frame);

            calculate_bone_matrices(bone_uniforms, instance_folder, skeleton_folder, frame);

            buffer->update_bone_ubo(bone_uniforms);

        }

utils/src/gltf_importer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ GLTFObject import_gltf(const std::vector<uint8_t>& data, const std::string& path 
                skins.push_back(skin_ptr);



                std::vector<mat4x4> inverses(bind_ptr, bind_ptr + bind_accessor.count);

                skin_ptr->push_back<com::FileMat4x4Array>("inverseBindMatrices", inverses);

                skin_ptr->folder()->push_back<com::FileMat4x4Array>("inverseBindMatrices", inverses);



                auto root_joints = get_root_joints(model, skin.joints);
@@ -425,7 +425,7 @@ GLTFObject import_gltf(const std::vector<uint8_t>& data, const std::string& path 
            primitives.back().push_back(gltf_primitive);



            if (!skins.empty()) {

                gltf_primitive->push_back<com::Link>(gfx::object_system()->skeleton_link_name(), skins[0]);

                gltf_primitive->push_back<com::Link>(gfx::object_system()->skeleton_link_name(), skins[0]->folder());

            }



            auto* frame_link = gfx::object_system()->push_frame_back(