diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2019-05-28 00:54:12 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2019-06-03 00:00:55 +0300 |
commit | a5914242685d61fc6c341aa65f6e7fe8d7073f83 (patch) | |
tree | 4a284e18a7ed671b45a6f63875d9e118045526fd /source | |
parent | 04c36921240ac90efbf5701468725ff9dc73f09c (diff) |
refactor collada: reorganize class methods in file
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/collada/BCSampleData.cpp | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/source/blender/collada/BCSampleData.cpp b/source/blender/collada/BCSampleData.cpp index 0734a2eb048..6258c9c9bdb 100644 --- a/source/blender/collada/BCSampleData.cpp +++ b/source/blender/collada/BCSampleData.cpp @@ -39,6 +39,43 @@ void BCSample::add_bone_matrix(Bone *bone, Matrix &mat) bonemats[bone] = matrix; } +/* Get channel value */ +const bool BCSample::get_value(std::string channel_target, const int array_index, float *val) const +{ + if (channel_target == "location") { + *val = obmat.location()[array_index]; + } + else if (channel_target == "scale") { + *val = obmat.scale()[array_index]; + } + else if (channel_target == "rotation" || channel_target == "rotation_euler") { + *val = obmat.rotation()[array_index]; + } + else if (channel_target == "rotation_quat") { + *val = obmat.quat()[array_index]; + } + else { + *val = 0; + return false; + } + + return true; +} + +const BCMatrix *BCSample::get_matrix(Bone *bone) const +{ + BCBoneMatrixMap::const_iterator it = bonemats.find(bone); + if (it == bonemats.end()) { + return NULL; + } + return it->second; +} + +const BCMatrix &BCSample::get_matrix() const +{ + return obmat; +} + BCMatrix::BCMatrix(const BCMatrix &mat) { set_transform(mat.matrix); @@ -139,43 +176,6 @@ void BCMatrix::set_transform(Matrix &mat) quat_to_eul(this->rot, this->q); } -const BCMatrix *BCSample::get_matrix(Bone *bone) const -{ - BCBoneMatrixMap::const_iterator it = bonemats.find(bone); - if (it == bonemats.end()) { - return NULL; - } - return it->second; -} - -const BCMatrix &BCSample::get_matrix() const -{ - return obmat; -} - -/* Get channel value */ -const bool BCSample::get_value(std::string channel_target, const int array_index, float *val) const -{ - if (channel_target == "location") { - *val = obmat.location()[array_index]; - } - else if (channel_target == "scale") { - *val = obmat.scale()[array_index]; - } - else if (channel_target == "rotation" || channel_target == "rotation_euler") { - *val = obmat.rotation()[array_index]; - } - else if (channel_target == "rotation_quat") { - *val = obmat.quat()[array_index]; - } - else { - *val = 0; - return false; - } - - return true; -} - void BCMatrix::copy(Matrix &out, Matrix &in) { /* destination comes first: */ |