diff options
Diffstat (limited to 'src/skeletal_model.cpp')
| -rw-r--r-- | src/skeletal_model.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/skeletal_model.cpp b/src/skeletal_model.cpp index a8dc62a..3a3596e 100644 --- a/src/skeletal_model.cpp +++ b/src/skeletal_model.cpp @@ -20,12 +20,12 @@ #include "vector_3d.hpp" #include "skeletal_mesh.hpp" #include "texture.hpp" -#include "vk/skeletal_model.hpp" +#include "blucat/skeletal_model.hpp" void cg_free_skeletal_model(mrb_state *mrb, void *obj) { - auto ptr = static_cast<std::shared_ptr<VK::SkeletalModel>*>(obj); + auto ptr = static_cast<std::shared_ptr<BluCat::SkeletalModel>*>(obj); ptr->~shared_ptr(); mrb_free(mrb, ptr); @@ -37,23 +37,23 @@ const struct mrb_data_type cg_skeletal_model_type = { static mrb_value cg_cSkeletalModel_initialize(mrb_state *mrb, mrb_value self) { - std::shared_ptr<VK::SkeletalMesh> *skeletal_mesh; - std::shared_ptr<VK::Texture> *texture; + std::shared_ptr<BluCat::SkeletalMesh> *skeletal_mesh; + std::shared_ptr<BluCat::Texture> *texture; std::shared_ptr<glm::vec3> *position; std::shared_ptr<glm::quat> *orientation; - std::shared_ptr<VK::SkeletalModel> *ptr; + std::shared_ptr<BluCat::SkeletalModel> *ptr; mrb_get_args( mrb, "dddd", &skeletal_mesh, &cg_skeletal_mesh_type, &texture, &cg_texture_type, &position, &cg_vector_3d_type, &orientation, &cg_orientation_3d_type); - ptr = (std::shared_ptr<VK::SkeletalModel>*)DATA_PTR(self); + ptr = (std::shared_ptr<BluCat::SkeletalModel>*)DATA_PTR(self); if(ptr) mrb_free(mrb, ptr); - ptr = (std::shared_ptr<VK::SkeletalModel>*)mrb_malloc( - mrb, sizeof(std::shared_ptr<VK::SkeletalModel>)); + ptr = (std::shared_ptr<BluCat::SkeletalModel>*)mrb_malloc( + mrb, sizeof(std::shared_ptr<BluCat::SkeletalModel>)); - new(ptr)std::shared_ptr<VK::SkeletalModel>( - std::make_shared<VK::SkeletalModel>( + new(ptr)std::shared_ptr<BluCat::SkeletalModel>( + std::make_shared<BluCat::SkeletalModel>( *skeletal_mesh, *texture, *position, *orientation)); mrb_data_init(self, ptr, &cg_skeletal_model_type); @@ -63,7 +63,7 @@ cg_cSkeletalModel_initialize(mrb_state *mrb, mrb_value self) static mrb_value cg_cSkeletalModel_set_orientation(mrb_state *mrb, mrb_value self) { - auto ptr = (std::shared_ptr<VK::SkeletalModel>*)DATA_PTR(self); + auto ptr = (std::shared_ptr<BluCat::SkeletalModel>*)DATA_PTR(self); std::shared_ptr<glm::quat> *orientation; mrb_get_args(mrb, "d", &orientation, &cg_orientation_3d_type); @@ -75,7 +75,7 @@ cg_cSkeletalModel_set_orientation(mrb_state *mrb, mrb_value self) static mrb_value cg_cSkeletalModel_set_position(mrb_state *mrb, mrb_value self) { - auto ptr = (std::shared_ptr<VK::SkeletalModel>*)DATA_PTR(self); + auto ptr = (std::shared_ptr<BluCat::SkeletalModel>*)DATA_PTR(self); std::shared_ptr<glm::vec3> *position; mrb_get_args(mrb, "d", &position, &cg_vector_3d_type); @@ -87,7 +87,7 @@ cg_cSkeletalModel_set_position(mrb_state *mrb, mrb_value self) static mrb_value cg_cSkeletalModel_set_animation(mrb_state *mrb, mrb_value self) { - auto ptr = (std::shared_ptr<VK::SkeletalModel>*)DATA_PTR(self); + auto ptr = (std::shared_ptr<BluCat::SkeletalModel>*)DATA_PTR(self); mrb_int animation_index; mrb_get_args(mrb, "i", &animation_index); @@ -99,7 +99,7 @@ cg_cSkeletalModel_set_animation(mrb_state *mrb, mrb_value self) static mrb_value cg_cSkeletalModel_draw(mrb_state *mrb, mrb_value self) { - auto ptr = (std::shared_ptr<VK::SkeletalModel>*)DATA_PTR(self); + auto ptr = (std::shared_ptr<BluCat::SkeletalModel>*)DATA_PTR(self); auto &instances = cg_core.vk_renderer->skeletal_models_to_draw[ cg_core.vk_swapchain->current_frame][(*ptr)->skeletal_mesh]; |