Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/collada/BCSampleData.h
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/collada/BCSampleData.h')
-rw-r--r--source/blender/collada/BCSampleData.h83
1 files changed, 40 insertions, 43 deletions
diff --git a/source/blender/collada/BCSampleData.h b/source/blender/collada/BCSampleData.h
index ec7f14f8c3a..9cb56c95e0f 100644
--- a/source/blender/collada/BCSampleData.h
+++ b/source/blender/collada/BCSampleData.h
@@ -24,8 +24,7 @@
#include <map>
#include <algorithm>
-extern "C"
-{
+extern "C" {
#include "BKE_object.h"
#include "BLI_math_rotation.h"
#include "DNA_object_types.h"
@@ -39,54 +38,52 @@ typedef float(Matrix)[4][4];
class BCMatrix {
-private:
- mutable float matrix[4][4];
- mutable float size[3];
- mutable float rot[3];
- mutable float loc[3];
- mutable float q[4];
-
- void unit();
- void copy(Matrix &r, Matrix &a);
- void set_transform(Object *ob);
- void set_transform(Matrix &mat);
-
-public:
-
- float(&location() const)[3];
- float(&rotation() const)[3];
- float(&scale() const)[3];
- float(&quat() const)[4];
-
- BCMatrix(Matrix &mat);
- BCMatrix(Object *ob);
-
- void get_matrix(double(&mat)[4][4], const bool transposed = false, const int precision = -1) const;
-
- const bool in_range(const BCMatrix &other, float distance) const;
- static void sanitize(Matrix &matrix, int precision);
- static void transpose(Matrix &matrix);
-
+ private:
+ mutable float matrix[4][4];
+ mutable float size[3];
+ mutable float rot[3];
+ mutable float loc[3];
+ mutable float q[4];
+
+ void unit();
+ void copy(Matrix &r, Matrix &a);
+ void set_transform(Object *ob);
+ void set_transform(Matrix &mat);
+
+ public:
+ float (&location() const)[3];
+ float (&rotation() const)[3];
+ float (&scale() const)[3];
+ float (&quat() const)[4];
+
+ BCMatrix(Matrix &mat);
+ BCMatrix(Object *ob);
+
+ void get_matrix(double (&mat)[4][4],
+ const bool transposed = false,
+ const int precision = -1) const;
+
+ const bool in_range(const BCMatrix &other, float distance) const;
+ static void sanitize(Matrix &matrix, int precision);
+ static void transpose(Matrix &matrix);
};
typedef std::map<Bone *, BCMatrix *> BCBoneMatrixMap;
-class BCSample{
-private:
-
- BCMatrix obmat;
- BCBoneMatrixMap bonemats; /* For Armature animation */
-
-public:
- BCSample(Object *ob);
- ~BCSample();
+class BCSample {
+ private:
+ BCMatrix obmat;
+ BCBoneMatrixMap bonemats; /* For Armature animation */
- void add_bone_matrix(Bone *bone, Matrix &mat);
+ public:
+ BCSample(Object *ob);
+ ~BCSample();
- const bool get_value(std::string channel_target, const int array_index, float *val) const;
- const BCMatrix &get_matrix() const;
- const BCMatrix *get_matrix(Bone *bone) const; // returns NULL if bone is not animated
+ void add_bone_matrix(Bone *bone, Matrix &mat);
+ const bool get_value(std::string channel_target, const int array_index, float *val) const;
+ const BCMatrix &get_matrix() const;
+ const BCMatrix *get_matrix(Bone *bone) const; // returns NULL if bone is not animated
};
typedef std::map<Object *, BCSample *> BCSampleMap;