Collada: Moved structure definitions for export settings to the exportSettings.h...
authorGaia Clary <gaia.clary@machinimatrix.org>
Wed, 28 Feb 2018 14:53:00 +0000 (15:53 +0100)
committerGaia Clary <gaia.clary@machinimatrix.org>
Wed, 28 Feb 2018 15:05:28 +0000 (16:05 +0100)
source/blender/collada/DocumentExporter.h
source/blender/collada/ExportSettings.h
source/blender/collada/ImportSettings.h
source/blender/collada/collada.h

index b2d8214212cc905ed7bd595370898f7fa22462e4..1bc4851da3d45750fbb5288f9b4931e6cf13ed5c 100644 (file)
@@ -27,7 +27,7 @@
 #ifndef __DOCUMENTEXPORTER_H__
 #define __DOCUMENTEXPORTER_H__
 
-#include "ExportSettings.h"
+#include "collada.h"
 
 extern "C" {
 #include "DNA_customdata_types.h"
index 73a101108a9d0423cf665a5b835f364fd5dfc64e..fa6751bef6093a84f27ca603525ea3b565d304e7 100644 (file)
 #ifndef __EXPORTSETTINGS_H__
 #define __EXPORTSETTINGS_H__
 
-#include "collada.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "BLI_linklist.h"
+
+typedef enum BC_export_mesh_type {
+       BC_MESH_TYPE_VIEW,
+       BC_MESH_TYPE_RENDER
+} BC_export_mesh_type;
+
+typedef enum BC_export_transformation_type {
+       BC_TRANSFORMATION_TYPE_MATRIX,
+       BC_TRANSFORMATION_TYPE_TRANSROTLOC
+} BC_export_transformation_type;
 
-struct ExportSettings {
-public:
+typedef enum BC_export_texture_type {
+       BC_TEXTURE_TYPE_MAT,
+       BC_TEXTURE_TYPE_UV
+} BC_export_texture_type;
+
+typedef struct ExportSettings {
        bool apply_modifiers;
        BC_export_mesh_type export_mesh_type;
 
@@ -58,6 +76,10 @@ public:
 
        char *filepath;
        LinkNode *export_set;
-};
+} ExportSettings;
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif
index 4a2d4e8046a44108549f1ebf075334bab12ba987..fb4277b048ff34f4fc7271a9ea1e86ce5d60fc6e 100644 (file)
 #ifndef __IMPORTSETTINGS_H__
 #define __IMPORTSETTINGS_H__
 
-#include "collada.h"
-
-struct ImportSettings {
-public:
+typedef struct ImportSettings {
        bool import_units;
        bool find_chains;
        bool auto_connect;
@@ -38,6 +35,6 @@ public:
        int  min_chain_length;
        char *filepath;
        bool keep_bind_info;
-};
+} ImportSettings;
 
 #endif
index 09b46c1de581ca16a647d0488b97f9798b991e98..cc975abd1984ad4c4a9e842ac87aa11dd547f014 100644 (file)
 #define __COLLADA_H__
 
 #include <stdlib.h>
+
+#include "ImportSettings.h"
+#include "ExportSettings.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -37,20 +41,6 @@ extern "C" {
 #include "BLI_path_util.h"
 #include "RNA_types.h"
 
-typedef enum BC_export_mesh_type {
-       BC_MESH_TYPE_VIEW,
-       BC_MESH_TYPE_RENDER
-} BC_export_mesh_type;
-
-typedef enum BC_export_transformation_type {
-       BC_TRANSFORMATION_TYPE_MATRIX,
-       BC_TRANSFORMATION_TYPE_TRANSROTLOC
-} BC_export_transformation_type;
-
-typedef enum BC_export_texture_type {
-       BC_TEXTURE_TYPE_MAT,
-       BC_TEXTURE_TYPE_UV
-} BC_export_texture_type;
 
 struct EvaluationContext;
 struct bContext;