From 345304058f3f49f71e06aa241bedec41ef537b5b Mon Sep 17 00:00:00 2001
From: Gaia Clary <gaia.clary@machinimatrix.org>
Date: Tue, 28 May 2019 00:04:07 +0200
Subject: refactor collada: Moved basic typedefs in own file

---
 source/blender/collada/BlenderContext.h | 23 +-------------------
 source/blender/collada/BlenderTypes.h   | 37 +++++++++++++++++++++++++++++++++
 source/blender/collada/CMakeLists.txt   |  1 +
 3 files changed, 39 insertions(+), 22 deletions(-)
 create mode 100644 source/blender/collada/BlenderTypes.h

(limited to 'source/blender/collada')

diff --git a/source/blender/collada/BlenderContext.h b/source/blender/collada/BlenderContext.h
index c23a1b0f312..bf5c0e85280 100644
--- a/source/blender/collada/BlenderContext.h
+++ b/source/blender/collada/BlenderContext.h
@@ -33,28 +33,7 @@ extern "C" {
 #include "DEG_depsgraph.h"
 #include "DEG_depsgraph_query.h"
 #include "DNA_layer_types.h"
-
-typedef float(Vector)[3];
-typedef float(Matrix)[4][4];
-typedef double(DMatrix)[4][4];
-
-typedef enum BC_global_forward_axis {
-  BC_GLOBAL_FORWARD_X = 0,
-  BC_GLOBAL_FORWARD_Y = 1,
-  BC_GLOBAL_FORWARD_Z = 2,
-  BC_GLOBAL_FORWARD_MINUS_X = 3,
-  BC_GLOBAL_FORWARD_MINUS_Y = 4,
-  BC_GLOBAL_FORWARD_MINUS_Z = 5
-} BC_global_forward_axis;
-
-typedef enum BC_global_up_axis {
-  BC_GLOBAL_UP_X = 0,
-  BC_GLOBAL_UP_Y = 1,
-  BC_GLOBAL_UP_Z = 2,
-  BC_GLOBAL_UP_MINUS_X = 3,
-  BC_GLOBAL_UP_MINUS_Y = 4,
-  BC_GLOBAL_UP_MINUS_Z = 5
-} BC_global_up_axis;
+#include "BlenderTypes.h"
 
 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;
diff --git a/source/blender/collada/BlenderTypes.h b/source/blender/collada/BlenderTypes.h
new file mode 100644
index 00000000000..5eca74219dc
--- /dev/null
+++ b/source/blender/collada/BlenderTypes.h
@@ -0,0 +1,37 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+typedef float(Vector)[3];
+typedef float(Matrix)[4][4];
+typedef double(DMatrix)[4][4];
+
+typedef enum BC_global_forward_axis {
+  BC_GLOBAL_FORWARD_X = 0,
+  BC_GLOBAL_FORWARD_Y = 1,
+  BC_GLOBAL_FORWARD_Z = 2,
+  BC_GLOBAL_FORWARD_MINUS_X = 3,
+  BC_GLOBAL_FORWARD_MINUS_Y = 4,
+  BC_GLOBAL_FORWARD_MINUS_Z = 5
+} BC_global_forward_axis;
+
+typedef enum BC_global_up_axis {
+  BC_GLOBAL_UP_X = 0,
+  BC_GLOBAL_UP_Y = 1,
+  BC_GLOBAL_UP_Z = 2,
+  BC_GLOBAL_UP_MINUS_X = 3,
+  BC_GLOBAL_UP_MINUS_Y = 4,
+  BC_GLOBAL_UP_MINUS_Z = 5
+} BC_global_up_axis;
diff --git a/source/blender/collada/CMakeLists.txt b/source/blender/collada/CMakeLists.txt
index e54b788903d..07e9cc1c2df 100644
--- a/source/blender/collada/CMakeLists.txt
+++ b/source/blender/collada/CMakeLists.txt
@@ -99,6 +99,7 @@ set(SRC
   BCAnimationSampler.h
   BCSampleData.h
   BlenderContext.h
+  BlenderTypes.h
   CameraExporter.h
   ControllerExporter.h
   DocumentExporter.h
-- 
cgit v1.2.3