diff options
Diffstat (limited to 'src/skeletal_model.cpp')
| -rw-r--r-- | src/skeletal_model.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/skeletal_model.cpp b/src/skeletal_model.cpp index 0165e91..a8dc62a 100644 --- a/src/skeletal_model.cpp +++ b/src/skeletal_model.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2022-2023 Frederico de Oliveira Linhares + * Copyright 2022-2024 Frederico de Oliveira Linhares * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,8 +16,8 @@ #include "skeletal_model.hpp" +#include "orientation_3d.hpp" #include "vector_3d.hpp" -#include "rotation_3d.hpp" #include "skeletal_mesh.hpp" #include "texture.hpp" #include "vk/skeletal_model.hpp" @@ -40,13 +40,13 @@ 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<glm::vec3> *position; - std::shared_ptr<glm::vec3> *rotation; + std::shared_ptr<glm::quat> *orientation; std::shared_ptr<VK::SkeletalModel> *ptr; mrb_get_args( mrb, "dddd", &skeletal_mesh, &cg_skeletal_mesh_type, &texture, - &cg_texture_type, &position, &cg_vector_3d_type, &rotation, - &cg_rotation_3d_type); + &cg_texture_type, &position, &cg_vector_3d_type, &orientation, + &cg_orientation_3d_type); ptr = (std::shared_ptr<VK::SkeletalModel>*)DATA_PTR(self); if(ptr) mrb_free(mrb, ptr); ptr = (std::shared_ptr<VK::SkeletalModel>*)mrb_malloc( @@ -54,20 +54,20 @@ cg_cSkeletalModel_initialize(mrb_state *mrb, mrb_value self) new(ptr)std::shared_ptr<VK::SkeletalModel>( std::make_shared<VK::SkeletalModel>( - *skeletal_mesh, *texture, *position, *rotation)); + *skeletal_mesh, *texture, *position, *orientation)); mrb_data_init(self, ptr, &cg_skeletal_model_type); return self; } static mrb_value -cg_cSkeletalModel_set_rotation(mrb_state *mrb, mrb_value self) +cg_cSkeletalModel_set_orientation(mrb_state *mrb, mrb_value self) { auto ptr = (std::shared_ptr<VK::SkeletalModel>*)DATA_PTR(self); - std::shared_ptr<glm::vec3> *rotation; + std::shared_ptr<glm::quat> *orientation; - mrb_get_args(mrb, "d", &rotation, &cg_rotation_3d_type); - (*ptr)->rotation = *rotation; + mrb_get_args(mrb, "d", &orientation, &cg_orientation_3d_type); + (*ptr)->orientation = *orientation; return self; } @@ -124,7 +124,7 @@ cg_skeletal_model_init(mrb_state *mrb) mrb, cg_cSkeletalModel, "position=", cg_cSkeletalModel_set_position, MRB_ARGS_REQ(1)); mrb_define_method( - mrb, cg_cSkeletalModel, "rotation=", cg_cSkeletalModel_set_rotation, + mrb, cg_cSkeletalModel, "orientation=", cg_cSkeletalModel_set_orientation, MRB_ARGS_REQ(1)); mrb_define_method( mrb, cg_cSkeletalModel, "animation=", cg_cSkeletalModel_set_animation, |