[Bf-blender-cvs] [1335b7d01aa] collada: refactor: Collada: Moved class BCMatrix into BlenderContext

[Gaia Clary]

Commit: 1335b7d01aa2c94e51087e197d059fc15df90b0d
Author: Gaia Clary
Date:   Sat Apr 6 20:23:09 2019 +0200
Branches: collada
https://developer.blender.org/rB1335b7d01aa2c94e51087e197d059fc15df90b0d

refactor: Collada: Moved class BCMatrix into BlenderContext

===================================================================

M	source/blender/collada/BCSampleData.h
M	source/blender/collada/BlenderContext.h
M	source/blender/collada/ExportSettings.h

===================================================================

diff --git a/source/blender/collada/BCSampleData.h b/source/blender/collada/BCSampleData.h
index 81e0e514ae2..b85a88f1767 100644
--- a/source/blender/collada/BCSampleData.h
+++ b/source/blender/collada/BCSampleData.h
@@ -37,41 +37,6 @@ extern "C"
 #include "DNA_camera_types.h"
 }
 
-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(BC_global_forward_axis global_forward_axis, BC_global_up_axis global_up_axis);
-	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;
-
-	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{
diff --git a/source/blender/collada/BlenderContext.h b/source/blender/collada/BlenderContext.h
index 64c10e04e9c..dbacbb1c6fc 100644
--- a/source/blender/collada/BlenderContext.h
+++ b/source/blender/collada/BlenderContext.h
@@ -22,14 +22,17 @@
 #define __BLENDERCONTEXT_H__
 
 #ifdef __cplusplus
+
 extern "C" {
 #endif
 
 #include "DNA_object_types.h"
+#include "BLI_linklist.h"
 #include "BKE_context.h"
 #include "BKE_main.h"
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"
+#include "DNA_layer_types.h"
 
 typedef float(Vector)[3];
 typedef float(Matrix)[4][4];
@@ -56,9 +59,49 @@ typedef enum BC_global_up_axis {
 static const BC_global_forward_axis BC_DEFAULT_FORWARD = BC_GLOBAL_FORWARD_Y;
 static const BC_global_up_axis BC_DEFAULT_UP = BC_GLOBAL_UP_Z;
 
+bool bc_is_in_Export_set(LinkNode *export_set, Object *ob, ViewLayer *view_layer);
+int bc_is_marked(Object *ob);
+void bc_remove_mark(Object *ob);
+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);
+	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(BC_global_forward_axis global_forward_axis, BC_global_up_axis global_up_axis);
+	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;
+
+	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:
diff --git a/source/blender/collada/ExportSettings.h b/source/blender/collada/ExportSettings.h
index c3535e09031..0f1f2be47aa 100644
--- a/source/blender/collada/ExportSettings.h
+++ b/source/blender/collada/ExportSettings.h
@@ -90,7 +90,7 @@ typedef struct ExportSettings {
 	LinkNode *export_set;
 } ExportSettings;
 
- bool bc_is_base_node(LinkNode *export_set, Object *ob);
+bool bc_is_base_node(LinkNode *export_set, Object *ob);
 
 #ifdef __cplusplus
 }