[Bf-blender-cvs] [a5914242685] master: refactor collada: reorganize class methods in file
Gaia Clary
noreply at git.blender.org
Sun Jun 2 23:01:37 CEST 2019
Commit: a5914242685d61fc6c341aa65f6e7fe8d7073f83
Author: Gaia Clary
Date: Mon May 27 23:54:12 2019 +0200
Branches: master
https://developer.blender.org/rBa5914242685d61fc6c341aa65f6e7fe8d7073f83
refactor collada: reorganize class methods in file
===================================================================
M source/blender/collada/BCSampleData.cpp
===================================================================
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: */
More information about the Bf-blender-cvs
mailing list