[Bf-blender-cvs] [fcc23dcf896] temp-alembic-exporter-T73363-ms2: WIP Alembic: got the new exporter building, but far from functional
Sybren A. Stüvel
noreply at git.blender.org
Fri Mar 13 18:26:46 CET 2020
Commit: fcc23dcf896c5be2ea92eab2557cf3faf923c307
Author: Sybren A. Stüvel
Date: Fri Mar 13 18:25:43 2020 +0100
Branches: temp-alembic-exporter-T73363-ms2
https://developer.blender.org/rBfcc23dcf896c5be2ea92eab2557cf3faf923c307
WIP Alembic: got the new exporter building, but far from functional
The biggest hurdle to take now is to only write transforms on certain
frames, only shapes on others, and both on yet other frames.
===================================================================
M source/blender/io/alembic/CMakeLists.txt
M source/blender/io/alembic/intern/alembic_capi.cc
A source/blender/io/alembic/intern/export/abc_archive.cc
A source/blender/io/alembic/intern/export/abc_archive.h
A source/blender/io/alembic/intern/export/abc_export_capi.cc
A source/blender/io/alembic/intern/export/abc_hierarchy_iterator.cc
A source/blender/io/alembic/intern/export/abc_hierarchy_iterator.h
A source/blender/io/alembic/intern/export/abc_writer_abstract.cc
A source/blender/io/alembic/intern/export/abc_writer_abstract.h
A source/blender/io/alembic/intern/export/abc_writer_transform.cc
A source/blender/io/alembic/intern/export/abc_writer_transform.h
M source/blender/io/usd/intern/abstract_hierarchy_iterator.cc
M source/blender/io/usd/intern/abstract_hierarchy_iterator.h
M source/blender/io/usd/intern/usd_exporter_context.h
===================================================================
diff --git a/source/blender/io/alembic/CMakeLists.txt b/source/blender/io/alembic/CMakeLists.txt
index cbcdfaf4b77..1685eedf580 100644
--- a/source/blender/io/alembic/CMakeLists.txt
+++ b/source/blender/io/alembic/CMakeLists.txt
@@ -20,6 +20,7 @@
set(INC
.
+ ../usd/intern
../../blenkernel
../../blenlib
../../blenloader
@@ -42,7 +43,7 @@ set(INC_SYS
set(SRC
intern/abc_customdata.cc
- intern/abc_exporter.cc
+ # intern/abc_exporter.cc
intern/abc_reader_archive.cc
intern/abc_reader_camera.cc
intern/abc_reader_curves.cc
@@ -52,16 +53,16 @@ set(SRC
intern/abc_reader_points.cc
intern/abc_reader_transform.cc
intern/abc_util.cc
- intern/abc_writer_archive.cc
- intern/abc_writer_camera.cc
- intern/abc_writer_curves.cc
- intern/abc_writer_hair.cc
- intern/abc_writer_mball.cc
- intern/abc_writer_mesh.cc
- intern/abc_writer_nurbs.cc
- intern/abc_writer_object.cc
- intern/abc_writer_points.cc
- intern/abc_writer_transform.cc
+ # intern/abc_writer_archive.cc
+ # intern/abc_writer_camera.cc
+ # intern/abc_writer_curves.cc
+ # intern/abc_writer_hair.cc
+ # intern/abc_writer_mball.cc
+ # intern/abc_writer_mesh.cc
+ # intern/abc_writer_nurbs.cc
+ # intern/abc_writer_object.cc
+ # intern/abc_writer_points.cc
+ # intern/abc_writer_transform.cc
intern/alembic_capi.cc
ABC_alembic.h
@@ -76,16 +77,29 @@ set(SRC
intern/abc_reader_points.h
intern/abc_reader_transform.h
intern/abc_util.h
- intern/abc_writer_archive.h
- intern/abc_writer_camera.h
- intern/abc_writer_curves.h
- intern/abc_writer_hair.h
- intern/abc_writer_mball.h
- intern/abc_writer_mesh.h
- intern/abc_writer_nurbs.h
- intern/abc_writer_object.h
- intern/abc_writer_points.h
- intern/abc_writer_transform.h
+ # intern/abc_writer_archive.h
+ # intern/abc_writer_camera.h
+ # intern/abc_writer_curves.h
+ # intern/abc_writer_hair.h
+ # intern/abc_writer_mball.h
+ # intern/abc_writer_mesh.h
+ # intern/abc_writer_nurbs.h
+ # intern/abc_writer_object.h
+ # intern/abc_writer_points.h
+ # intern/abc_writer_transform.h
+
+
+ intern/export/abc_archive.cc
+ intern/export/abc_export_capi.cc
+ intern/export/abc_hierarchy_iterator.cc
+ intern/export/abc_writer_abstract.cc
+ intern/export/abc_writer_transform.cc
+
+ intern/export/abc_archive.h
+ intern/export/abc_hierarchy_iterator.h
+ intern/export/abc_writer_abstract.h
+ intern/export/abc_writer_transform.h
+
)
set(LIB
diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc
index ced5791e0e8..a4d1e3826fd 100644
--- a/source/blender/io/alembic/intern/alembic_capi.cc
+++ b/source/blender/io/alembic/intern/alembic_capi.cc
@@ -227,195 +227,196 @@ static void find_iobject(const IObject &object, IObject &ret, const std::string
ret = tmp;
}
-struct ExportJobData {
- ViewLayer *view_layer;
- Main *bmain;
- wmWindowManager *wm;
-
- char filename[1024];
- ExportSettings settings;
-
- short *stop;
- short *do_update;
- float *progress;
-
- bool was_canceled;
- bool export_ok;
-};
-
-static void export_startjob(void *customdata, short *stop, short *do_update, float *progress)
-{
- ExportJobData *data = static_cast<ExportJobData *>(customdata);
-
- data->stop = stop;
- data->do_update = do_update;
- data->progress = progress;
-
- /* XXX annoying hack: needed to prevent data corruption when changing
- * scene frame in separate threads
- */
- G.is_rendering = true;
- WM_set_locked_interface(data->wm, true);
- G.is_break = false;
-
- DEG_graph_build_from_view_layer(
- data->settings.depsgraph, data->bmain, data->settings.scene, data->view_layer);
- BKE_scene_graph_update_tagged(data->settings.depsgraph, data->bmain);
-
- try {
- AbcExporter exporter(data->bmain, data->filename, data->settings);
-
- Scene *scene = data->settings.scene; /* for the CFRA macro */
- const int orig_frame = CFRA;
-
- data->was_canceled = false;
- exporter(do_update, progress, &data->was_canceled);
-
- if (CFRA != orig_frame) {
- CFRA = orig_frame;
-
- BKE_scene_graph_update_for_newframe(data->settings.depsgraph, data->bmain);
- }
-
- data->export_ok = !data->was_canceled;
- }
- catch (const std::exception &e) {
- ABC_LOG(data->settings.logger) << "Abc Export error: " << e.what() << '\n';
- }
- catch (...) {
- ABC_LOG(data->settings.logger) << "Abc Export: unknown error...\n";
- }
-}
-
-static void export_endjob(void *customdata)
-{
- ExportJobData *data = static_cast<ExportJobData *>(customdata);
-
- DEG_graph_free(data->settings.depsgraph);
-
- if (data->was_canceled && BLI_exists(data->filename)) {
- BLI_delete(data->filename, false, false);
- }
-
- std::string log = data->settings.logger.str();
- if (!log.empty()) {
- std::cerr << log;
- WM_report(RPT_ERROR, "Errors occurred during the export, look in the console to know more...");
- }
-
- G.is_rendering = false;
- WM_set_locked_interface(data->wm, false);
-}
-
-bool ABC_export(Scene *scene,
- bContext *C,
- const char *filepath,
- const struct AlembicExportParams *params,
- bool as_background_job)
-{
- ExportJobData *job = static_cast<ExportJobData *>(
- MEM_mallocN(sizeof(ExportJobData), "ExportJobData"));
-
- job->view_layer = CTX_data_view_layer(C);
- job->bmain = CTX_data_main(C);
- job->wm = CTX_wm_manager(C);
- job->export_ok = false;
- BLI_strncpy(job->filename, filepath, 1024);
-
- /* Alright, alright, alright....
- *
- * ExportJobData contains an ExportSettings containing a SimpleLogger.
- *
- * Since ExportJobData is a C-style struct dynamically allocated with
- * MEM_mallocN (see above), its constructor is never called, therefore the
- * ExportSettings constructor is not called which implies that the
- * SimpleLogger one is not called either. SimpleLogger in turn does not call
- * the constructor of its data members which ultimately means that its
- * std::ostringstream member has a NULL pointer. To be able to properly use
- * the stream's operator<<, the pointer needs to be set, therefore we have
- * to properly construct everything. And this is done using the placement
- * new operator as here below. It seems hackish, but I'm too lazy to
- * do bigger refactor and maybe there is a better way which does not involve
- * hardcore refactoring. */
- new (&job->settings) ExportSettings();
- job->settings.scene = scene;
- job->settings.depsgraph = DEG_graph_new(job->bmain, scene, job->view_layer, DAG_EVAL_RENDER);
-
- /* TODO(Sybren): for now we only export the active scene layer.
- * Later in the 2.8 development process this may be replaced by using
- * a specific collection for Alembic I/O, which can then be toggled
- * between "real" objects and cached Alembic files. */
- job->settings.view_layer = job->view_layer;
-
- job->settings.frame_start = params->frame_start;
- job->settings.frame_end = params->frame_end;
- job->settings.frame_samples_xform = params->frame_samples_xform;
- job->settings.frame_samples_shape = params->frame_samples_shape;
- job->settings.shutter_open = params->shutter_open;
- job->settings.shutter_close = params->shutter_close;
-
- /* TODO(Sybren): For now this is ignored, until we can get selection
- * detection working through Base pointers (instead of ob->flags). */
- job->settings.selected_only = params->selected_only;
-
- job->settings.export_face_sets = params->face_sets;
- job->settings.export_normals = params->normals;
- job->settings.export_uvs = params->uvs;
- job->settings.export_vcols = params->vcolors;
- job->settings.export_hair = params->export_hair;
- job->settings.export_particles = params->export_particles;
- job->settings.apply_subdiv = params->apply_subdiv;
- job->settings.curves_as_mesh = params->curves_as_mesh;
- job->settings.flatten_hierarchy = params->flatten_hierarchy;
-
- /* TODO(Sybren): visible_layer & renderable only is ignored for now,
- * to be replaced with collections later in the 2.8 dev process
- * (also see note above). */
- job->settings.visible_objects_only = params->visible_objects_only;
- job->settings.renderable_only = params->renderable_only;
-
- job->settings.use_subdiv_schema = params->use_subdiv_schema;
- job->settings.export_ogawa = (params->compression_type == ABC_ARCHIVE_OGAWA);
- job->settings.pack_uv = params->packuv;
- job->settings.global_scale = params->global_scale;
- job->settings.triangulate = params->triangulate;
- job->settings.quad_method = params->quad_method;
- job->settings.ngon_method = params->ngon_method;
-
- if (job->settings.frame_start > job->settings.frame_end) {
- std::swap(job->settings.frame_start, job->settings.frame_end);
- }
-
- bool export_ok = false;
- if (as_background_job) {
- wmJob *wm_job = WM_jobs_get(CTX_wm_manager(C),
- CTX_wm_window(C),
- job->settings.scene,
- "Alembic Export",
- WM_JOB_PROGRESS,
- WM_JOB_TYPE_ALEMBIC);
-
- /* setup job */
- WM_jobs_customdata_set(wm_job, job, MEM_freeN);
- WM_jobs_timer(wm_job, 0.1, NC_SCENE | ND_FRAME, NC_SCENE | ND_FRAME);
- WM_jobs_callbacks(wm_job, export_startjob, NULL, NULL, export_endjob);
-
- WM_jobs_start(CTX_wm_manager(C), wm_job);
- }
- else {
- /* Fake a job context, so that we don't need NULL pointer checks while exporting. */
- short stop = 0, do_update = 0;
- float progress = 0.f;
-
- export_startjob(job, &stop, &do_update, &progress);
- export_endjob(job);
- export_ok = job->export_ok;
-
- MEM_freeN(job);
- }
-
- return export_ok;
-}
+// struct ExportJobData {
+// ViewLayer *view_layer;
+// Main *bmain;
+// wmWindowManager *wm;
+
+// char filename[1024];
+// ExportSettings settings;
+
+// short *stop;
+// short *do_update;
+// float *progress;
+
+// bool was_canceled;
+// bool export_ok;
+// };
+
+// static void export_startjob(void *customdata, short *stop, short *do_update, float *progress)
+// {
+// ExportJobData *data = static_cast<ExportJobData *>(customdata);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list