diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2019-05-28 10:23:05 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2019-06-03 00:00:56 +0300 |
commit | 122b9478c66e13fa3c14da606cfa92528acd0b87 (patch) | |
tree | d2105c15b7b67aac115b3e1271dbe8996433d1ec /source/blender/collada/BlenderContext.h | |
parent | 70bc179c45414bd426af49c883fcab1e3bebabf8 (diff) |
refactor collada: replace bc_sanitize_mat() by static class method in BCMatrix
Diffstat (limited to 'source/blender/collada/BlenderContext.h')
-rw-r--r-- | source/blender/collada/BlenderContext.h | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/source/blender/collada/BlenderContext.h b/source/blender/collada/BlenderContext.h index bf5c0e85280..50781e8eede 100644 --- a/source/blender/collada/BlenderContext.h +++ b/source/blender/collada/BlenderContext.h @@ -50,55 +50,6 @@ void bc_set_mark(Object *ob); #ifdef __cplusplus } -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); - - public: - float (&location() const)[3]; - float (&rotation() const)[3]; - float (&scale() const)[3]; - float (&quat() const)[4]; - - BCMatrix(BC_global_forward_axis global_forward_axis, BC_global_up_axis global_up_axis); - BCMatrix(const BCMatrix &mat); - BCMatrix(Matrix &mat); - BCMatrix(Object *ob); - BCMatrix(); - - void get_matrix(DMatrix &matrix, const bool transposed = false, const int precision = -1) const; - void get_matrix(Matrix &matrix, - const bool transposed = false, - const int precision = -1, - const bool inverted = false) const; - void set_transform(Object *ob); - void set_transform(Matrix &mat); - void add_transform(Matrix &to, - const Matrix &transform, - const Matrix &from, - const bool inverted = false); - void apply_transform(Matrix &to, - const Matrix &transform, - const Matrix &from, - const bool inverted = false); - void add_inverted_transform(Matrix &to, const Matrix &transform, const Matrix &from); - void add_transform(const Matrix &matrix, const bool inverted = false); - void add_transform(const BCMatrix &matrix, const bool inverted = false); - void apply_transform(const BCMatrix &matrix, const bool inverted = false); - - const bool in_range(const BCMatrix &other, float distance) const; - static void sanitize(Matrix &matrix, int precision); - static void transpose(Matrix &matrix); -}; - class BlenderContext { private: bContext *context; |