[Bf-blender-cvs] [7c19ab2c61e] soc-2020-io-performance: Rename files from obj to wavefront; move to intern
Ankit Meel
noreply at git.blender.org
Sat Jun 6 14:54:19 CEST 2020
Commit: 7c19ab2c61ea529d1938480114018ef29b51bcba
Author: Ankit Meel
Date: Thu Jun 4 18:31:36 2020 +0530
Branches: soc-2020-io-performance
https://developer.blender.org/rB7c19ab2c61ea529d1938480114018ef29b51bcba
Rename files from obj to wavefront; move to intern
Changes here:
Move the files in `blender/io/obj` to `blender/io/obj/intern` following
the rest of the code structure.
Prefix `obj` in filenames with `wavefront_` to avoid confusion with
Blender object data type or compiled C file.
Include guards renaming according to new filenames.
`#include "*"` renames: for example
`#include "obj.h"` to `#include "wavefront_obj.h`
Rename `bf_obj` to `bf_wavefront_obj` in CMakeLists.txt.
===================================================================
M source/blender/editors/io/CMakeLists.txt
M source/blender/editors/io/io_obj.c
M source/blender/io/CMakeLists.txt
R077 source/blender/io/obj/CMakeLists.txt source/blender/io/wavefront_obj/CMakeLists.txt
A source/blender/io/wavefront_obj/IO_wavefront_obj.h
R095 source/blender/io/obj/obj.cc source/blender/io/wavefront_obj/intern/wavefront_obj.cc
R094 source/blender/io/obj/obj.h source/blender/io/wavefront_obj/intern/wavefront_obj.h
R097 source/blender/io/obj/obj_exporter.cc source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
R090 source/blender/io/obj/obj_exporter.h source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.h
R098 source/blender/io/obj/obj_file_handler.cc source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
R089 source/blender/io/obj/obj_file_handler.h source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.h
R095 source/blender/io/obj/obj_importer.cc source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
R092 source/blender/io/obj/obj_importer.h source/blender/io/wavefront_obj/intern/wavefront_obj_importer.h
===================================================================
diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt
index 752bd871697..b52188630e9 100644
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -24,7 +24,7 @@ set(INC
../../depsgraph
../../io/alembic
../../io/collada
- ../../io/obj
+ ../../io/wavefront_obj
../../io/usd
../../makesdna
../../makesrna
@@ -55,7 +55,7 @@ set(SRC
set(LIB
bf_blenkernel
bf_blenlib
- bf_obj
+ bf_wavefront_obj
)
if(WITH_OPENCOLLADA)
diff --git a/source/blender/editors/io/io_obj.c b/source/blender/editors/io/io_obj.c
index d58cd8c8470..138b783c498 100644
--- a/source/blender/editors/io/io_obj.c
+++ b/source/blender/editors/io/io_obj.c
@@ -47,7 +47,7 @@
#include "DEG_depsgraph.h"
#include "io_obj.h"
-#include "obj.h"
+#include "IO_wavefront_obj.h"
static int wm_obj_export_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
diff --git a/source/blender/io/CMakeLists.txt b/source/blender/io/CMakeLists.txt
index 05abfdf51c1..7cb4d463753 100644
--- a/source/blender/io/CMakeLists.txt
+++ b/source/blender/io/CMakeLists.txt
@@ -34,4 +34,4 @@ if(WITH_USD)
add_subdirectory(usd)
endif()
-add_subdirectory(obj)
\ No newline at end of file
+add_subdirectory(wavefront_obj)
\ No newline at end of file
diff --git a/source/blender/io/obj/CMakeLists.txt b/source/blender/io/wavefront_obj/CMakeLists.txt
similarity index 77%
rename from source/blender/io/obj/CMakeLists.txt
rename to source/blender/io/wavefront_obj/CMakeLists.txt
index 547cb87f6cc..9e18a1c45f5 100644
--- a/source/blender/io/obj/CMakeLists.txt
+++ b/source/blender/io/wavefront_obj/CMakeLists.txt
@@ -40,19 +40,19 @@ set(INC_SYS
)
set(SRC
- obj.cc
- obj_exporter.cc
- obj_file_handler.cc
- obj_importer.cc
-
- obj.h
- obj_exporter.h
- obj_file_handler.h
- obj_importer.h
+ intern/wavefront_obj.cc
+ intern/wavefront_obj_exporter.cc
+ intern/wavefront_obj_file_handler.cc
+ intern/wavefront_obj_importer.cc
+
+ intern/wavefront_obj.h
+ intern/wavefront_obj_exporter.h
+ intern/wavefront_obj_file_handler.h
+ intern/wavefront_obj_importer.h
)
set(LIB
)
-blender_add_lib(bf_obj "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
+blender_add_lib(bf_wavefront_obj "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/io/obj/obj.h b/source/blender/io/wavefront_obj/IO_wavefront_obj.h
similarity index 69%
copy from source/blender/io/obj/obj.h
copy to source/blender/io/wavefront_obj/IO_wavefront_obj.h
index 94a2ff98033..53cce98b244 100644
--- a/source/blender/io/obj/obj.h
+++ b/source/blender/io/wavefront_obj/IO_wavefront_obj.h
@@ -18,8 +18,8 @@
* \ingroup obj
*/
-#ifndef __OBJ_H__
-#define __OBJ_H__
+#ifndef __IO_WAVEFRONT_OBJ_H__
+#define __IO_WAVEFRONT_OBJ_H__
#include "BKE_context.h"
@@ -40,28 +40,28 @@ struct OBJ_data_to_export {
};
extern "C" {
#endif
-
-struct OBJExportParams {
- const char *filepath;
-
- bContext *C;
- Depsgraph *depsgraph;
- Scene *scene;
-
- bool print_name;
- float number;
-};
-struct OBJImportParams {
- bool print_name;
- float number;
-};
-
-bool OBJ_import(struct bContext *C, const char *filepath, struct OBJImportParams *import_params);
-
-bool OBJ_export(struct bContext *C, struct OBJExportParams *export_params);
-
+
+ struct OBJExportParams {
+ const char *filepath;
+
+ bContext *C;
+ Depsgraph *depsgraph;
+ Scene *scene;
+
+ bool print_name;
+ float number;
+ };
+ struct OBJImportParams {
+ bool print_name;
+ float number;
+ };
+
+ bool OBJ_import(struct bContext *C, const char *filepath, struct OBJImportParams *import_params);
+
+ bool OBJ_export(struct bContext *C, struct OBJExportParams *export_params);
+
#ifdef __cplusplus
}
#endif
-#endif /* __OBJ_H__ */
+#endif /* __IO_WAVEFRONT_OBJ_H__ */
diff --git a/source/blender/io/obj/obj.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
similarity index 95%
rename from source/blender/io/obj/obj.cc
rename to source/blender/io/wavefront_obj/intern/wavefront_obj.cc
index f4a5fbcbed1..ae9583f393c 100644
--- a/source/blender/io/obj/obj.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj.cc
@@ -21,8 +21,8 @@
* \ingroup obj
*/
-#include "obj.h"
-#include "obj_exporter.h"
+#include "wavefront_obj.h"
+#include "wavefront_obj_exporter.h"
bool OBJ_export(bContext *C, OBJExportParams *export_params)
{
diff --git a/source/blender/io/obj/obj.h b/source/blender/io/wavefront_obj/intern/wavefront_obj.h
similarity index 94%
rename from source/blender/io/obj/obj.h
rename to source/blender/io/wavefront_obj/intern/wavefront_obj.h
index 94a2ff98033..5dd4c508c03 100644
--- a/source/blender/io/obj/obj.h
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj.h
@@ -18,8 +18,8 @@
* \ingroup obj
*/
-#ifndef __OBJ_H__
-#define __OBJ_H__
+#ifndef __WAVEFRONT_OBJ_H__
+#define __WAVEFRONT_OBJ_H__
#include "BKE_context.h"
@@ -64,4 +64,4 @@ bool OBJ_export(struct bContext *C, struct OBJExportParams *export_params);
}
#endif
-#endif /* __OBJ_H__ */
+#endif /* __WAVEFRONT_OBJ_H__ */
diff --git a/source/blender/io/obj/obj_exporter.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
similarity index 97%
rename from source/blender/io/obj/obj_exporter.cc
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
index 1e74fc430a5..ff6ef53576b 100644
--- a/source/blender/io/obj/obj_exporter.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.cc
@@ -21,8 +21,8 @@
* \ingroup obj
*/
-#include "obj_exporter.h"
-#include "obj_file_handler.h"
+#include "wavefront_obj_exporter.h"
+#include "wavefront_obj_file_handler.h"
#include <array>
#include <fstream>
diff --git a/source/blender/io/obj/obj_exporter.h b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.h
similarity index 90%
rename from source/blender/io/obj/obj_exporter.h
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.h
index 5bc6d4c309d..8710aa0f887 100644
--- a/source/blender/io/obj/obj_exporter.h
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_exporter.h
@@ -21,10 +21,10 @@
* \ingroup obj
*/
-#ifndef __OBJ_EXPORTER_H__
-#define __OBJ_EXPORTER_H__
+#ifndef __WAVEFRONT_OBJ_EXPORTER_H__
+#define __WAVEFRONT_OBJ_EXPORTER_H__
-#include "obj.h"
+#include "wavefront_obj.h"
void prepare_vertices(Object *ob_eval, OBJ_data_to_export *data_to_export);
diff --git a/source/blender/io/obj/obj_file_handler.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
similarity index 98%
rename from source/blender/io/obj/obj_file_handler.cc
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
index 358bb1a30e7..524c478950a 100644
--- a/source/blender/io/obj/obj_file_handler.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.cc
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <vector>
-#include "obj_file_handler.h"
+#include "wavefront_obj_file_handler.h"
#include "DNA_meshdata_types.h"
diff --git a/source/blender/io/obj/obj_file_handler.h b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.h
similarity index 89%
rename from source/blender/io/obj/obj_file_handler.h
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.h
index 5c2d3cad02c..3fbe225916b 100644
--- a/source/blender/io/obj/obj_file_handler.h
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_file_handler.h
@@ -20,13 +20,13 @@
/** \file
* \ingroup obj
*/
-#ifndef __OBJ_FILE_HANDLER_H__
-#define __OBJ_FILE_HANDLER_H__
+#ifndef __WAVEFRONT_OBJ_FILE_HANDLER_H__
+#define __WAVEFRONT_OBJ_FILE_HANDLER_H__
#include <fstream>
#include <stdio.h>
-#include "obj.h"
+#include "wavefront_obj.h"
void write_prepared_data(const char *filepath, OBJ_data_to_export *data_to_export);
diff --git a/source/blender/io/obj/obj_importer.cc b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
similarity index 95%
rename from source/blender/io/obj/obj_importer.cc
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
index 2339ea433e1..1788ff98edd 100644
--- a/source/blender/io/obj/obj_importer.cc
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.cc
@@ -21,4 +21,4 @@
* \ingroup obj
*/
-#include "obj_file_handler.h"
+#include "wavefront_obj_file_handler.h"
diff --git a/source/blender/io/obj/obj_importer.h b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.h
similarity index 92%
rename from source/blender/io/obj/obj_importer.h
rename to source/blender/io/wavefront_obj/intern/wavefront_obj_importer.h
index a4bbb0f9c9b..95fe85ec365 100644
--- a/source/blender/io/obj/obj_importer.h
+++ b/source/blender/io/wavefront_obj/intern/wavefront_obj_importer.h
@@ -21,7 +21,7 @@
* \ingroup obj
*/
-#ifndef __OBJ_IMPORTER_H__
-#define __OBJ_IMPORTER_H__
+#ifndef __WAVEFRONT_OBJ_IMPORTER_H__
+#define __WAVEFRONT_OBJ_IMPORTER_H__
#endif
More information about the Bf-blender-cvs
mailing list