diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-06-23 12:07:44 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-06-23 12:07:52 +0300 |
commit | 13a5b954c350518cf21c9beb97e2e160f7372a9b (patch) | |
tree | 515f084e9d431476fdabb6cc94cc8c1bf46d84d6 | |
parent | 309cfbceaa590828b61bfd72f12ef976f9808392 (diff) |
Cleanup: USD, move code from `USD` to `blender::io::usd` namespace
No functional changes.
18 files changed, 117 insertions, 41 deletions
diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc index cf962446d04..2d3972410a4 100644 --- a/source/blender/io/usd/intern/usd_capi.cc +++ b/source/blender/io/usd/intern/usd_capi.cc @@ -44,7 +44,9 @@ #include "WM_api.h" #include "WM_types.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { struct ExportJobData { Main *bmain; @@ -157,7 +159,9 @@ static void export_endjob(void *customdata) WM_set_locked_interface(data->wm, false); } -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender bool USD_export(bContext *C, const char *filepath, @@ -167,8 +171,8 @@ bool USD_export(bContext *C, ViewLayer *view_layer = CTX_data_view_layer(C); Scene *scene = CTX_data_scene(C); - USD::ExportJobData *job = static_cast<USD::ExportJobData *>( - MEM_mallocN(sizeof(USD::ExportJobData), "ExportJobData")); + blender::io::usd::ExportJobData *job = static_cast<blender::io::usd::ExportJobData *>( + MEM_mallocN(sizeof(blender::io::usd::ExportJobData), "ExportJobData")); job->bmain = CTX_data_main(C); job->wm = CTX_wm_manager(C); @@ -186,7 +190,11 @@ bool USD_export(bContext *C, /* 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, USD::export_startjob, nullptr, nullptr, USD::export_endjob); + WM_jobs_callbacks(wm_job, + blender::io::usd::export_startjob, + nullptr, + nullptr, + blender::io::usd::export_endjob); WM_jobs_start(CTX_wm_manager(C), wm_job); } @@ -195,8 +203,8 @@ bool USD_export(bContext *C, short stop = 0, do_update = 0; float progress = 0.f; - USD::export_startjob(job, &stop, &do_update, &progress); - USD::export_endjob(job); + blender::io::usd::export_startjob(job, &stop, &do_update, &progress); + blender::io::usd::export_endjob(job); export_ok = job->export_ok; MEM_freeN(job); diff --git a/source/blender/io/usd/intern/usd_exporter_context.h b/source/blender/io/usd/intern/usd_exporter_context.h index 4ae415b3d34..07a9d0fc0c5 100644 --- a/source/blender/io/usd/intern/usd_exporter_context.h +++ b/source/blender/io/usd/intern/usd_exporter_context.h @@ -27,7 +27,9 @@ struct Depsgraph; struct Object; -namespace USD { +namespace blender { +namespace io { +namespace usd { class USDHierarchyIterator; @@ -39,6 +41,8 @@ struct USDExporterContext { const USDExportParams &export_params; }; -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender #endif /* __USD_EXPORTER_CONTEXT_H__ */ diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc index 56e367dd877..388b588b331 100644 --- a/source/blender/io/usd/intern/usd_hierarchy_iterator.cc +++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.cc @@ -41,7 +41,9 @@ #include "DNA_layer_types.h" #include "DNA_object_types.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { USDHierarchyIterator::USDHierarchyIterator(Depsgraph *depsgraph, pxr::UsdStageRefPtr stage, @@ -145,4 +147,6 @@ AbstractHierarchyWriter *USDHierarchyIterator::create_particle_writer(const Hier return nullptr; } -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender diff --git a/source/blender/io/usd/intern/usd_hierarchy_iterator.h b/source/blender/io/usd/intern/usd_hierarchy_iterator.h index c61a0d2bf07..7d750bff0cb 100644 --- a/source/blender/io/usd/intern/usd_hierarchy_iterator.h +++ b/source/blender/io/usd/intern/usd_hierarchy_iterator.h @@ -32,7 +32,9 @@ struct Depsgraph; struct ID; struct Object; -namespace USD { +namespace blender { +namespace io { +namespace usd { using blender::io::AbstractHierarchyIterator; using blender::io::AbstractHierarchyWriter; @@ -70,6 +72,8 @@ class USDHierarchyIterator : public AbstractHierarchyIterator { USDExporterContext create_usd_export_context(const HierarchyContext *context); }; -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender #endif /* __USD_HIERARCHY_ITERATOR_H__ */ diff --git a/source/blender/io/usd/intern/usd_writer_abstract.cc b/source/blender/io/usd/intern/usd_writer_abstract.cc index 76a2436ee92..a416941fb4d 100644 --- a/source/blender/io/usd/intern/usd_writer_abstract.cc +++ b/source/blender/io/usd/intern/usd_writer_abstract.cc @@ -32,7 +32,9 @@ static const pxr::TfToken roughness("roughness", pxr::TfToken::Immortal); static const pxr::TfToken surface("surface", pxr::TfToken::Immortal); } // namespace usdtokens -namespace USD { +namespace blender { +namespace io { +namespace usd { USDAbstractWriter::USDAbstractWriter(const USDExporterContext &usd_export_context) : usd_export_context_(usd_export_context), @@ -112,4 +114,6 @@ pxr::UsdShadeMaterial USDAbstractWriter::ensure_usd_material(Material *material) return usd_material; } -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender diff --git a/source/blender/io/usd/intern/usd_writer_abstract.h b/source/blender/io/usd/intern/usd_writer_abstract.h index 03c4c263e32..f81cf5197af 100644 --- a/source/blender/io/usd/intern/usd_writer_abstract.h +++ b/source/blender/io/usd/intern/usd_writer_abstract.h @@ -36,7 +36,9 @@ struct Material; struct Object; -namespace USD { +namespace blender { +namespace io { +namespace usd { using blender::io::AbstractHierarchyWriter; using blender::io::HierarchyContext; @@ -73,6 +75,8 @@ class USDAbstractWriter : public AbstractHierarchyWriter { pxr::UsdShadeMaterial ensure_usd_material(Material *material); }; -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender #endif /* __USD_WRITER_ABSTRACT_H__ */ diff --git a/source/blender/io/usd/intern/usd_writer_camera.cc b/source/blender/io/usd/intern/usd_writer_camera.cc index ea551a43c9f..d51eb32d3fd 100644 --- a/source/blender/io/usd/intern/usd_writer_camera.cc +++ b/source/blender/io/usd/intern/usd_writer_camera.cc @@ -28,7 +28,9 @@ #include "DNA_camera_types.h" #include "DNA_scene_types.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { USDCameraWriter::USDCameraWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) { @@ -106,4 +108,6 @@ void USDCameraWriter::do_write(HierarchyContext &context) } } -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender diff --git a/source/blender/io/usd/intern/usd_writer_camera.h b/source/blender/io/usd/intern/usd_writer_camera.h index 971264ef11e..8b5795d7d9f 100644 --- a/source/blender/io/usd/intern/usd_writer_camera.h +++ b/source/blender/io/usd/intern/usd_writer_camera.h @@ -21,7 +21,9 @@ #include "usd_writer_abstract.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { /* Writer for writing camera data to UsdGeomCamera. */ class USDCameraWriter : public USDAbstractWriter { @@ -33,6 +35,8 @@ class USDCameraWriter : public USDAbstractWriter { virtual void do_write(HierarchyContext &context) override; }; -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender #endif /* __USD_WRITER_CAMERA_H__ */ diff --git a/source/blender/io/usd/intern/usd_writer_hair.cc b/source/blender/io/usd/intern/usd_writer_hair.cc index d38c1032969..0e0256bdb69 100644 --- a/source/blender/io/usd/intern/usd_writer_hair.cc +++ b/source/blender/io/usd/intern/usd_writer_hair.cc @@ -26,7 +26,9 @@ #include "DNA_particle_types.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { USDHairWriter::USDHairWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) { @@ -85,4 +87,6 @@ bool USDHairWriter::check_is_animated(const HierarchyContext &) const return true; } -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender diff --git a/source/blender/io/usd/intern/usd_writer_hair.h b/source/blender/io/usd/intern/usd_writer_hair.h index 1e882fa1654..cecacd0a355 100644 --- a/source/blender/io/usd/intern/usd_writer_hair.h +++ b/source/blender/io/usd/intern/usd_writer_hair.h @@ -21,7 +21,9 @@ #include "usd_writer_abstract.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { /* Writer for writing hair particle data as USD curves. */ class USDHairWriter : public USDAbstractWriter { @@ -33,6 +35,8 @@ class USDHairWriter : public USDAbstractWriter { virtual bool check_is_animated(const HierarchyContext &context) const override; }; -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender #endif /* __USD_WRITER_HAIR_H__ */ diff --git a/source/blender/io/usd/intern/usd_writer_light.cc b/source/blender/io/usd/intern/usd_writer_light.cc index 0ce3ee5f8ce..19115dd1a4e 100644 --- a/source/blender/io/usd/intern/usd_writer_light.cc +++ b/source/blender/io/usd/intern/usd_writer_light.cc @@ -30,7 +30,9 @@ #include "DNA_light_types.h" #include "DNA_object_types.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { USDLightWriter::USDLightWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) { @@ -107,4 +109,6 @@ void USDLightWriter::do_write(HierarchyContext &context) usd_light.CreateSpecularAttr().Set(light->spec_fac, timecode); } -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender diff --git a/source/blender/io/usd/intern/usd_writer_light.h b/source/blender/io/usd/intern/usd_writer_light.h index 349c034b6bc..73666622af1 100644 --- a/source/blender/io/usd/intern/usd_writer_light.h +++ b/source/blender/io/usd/intern/usd_writer_light.h @@ -21,7 +21,9 @@ #include "usd_writer_abstract.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { class USDLightWriter : public USDAbstractWriter { public: @@ -32,6 +34,8 @@ class USDLightWriter : public USDAbstractWriter { virtual void do_write(HierarchyContext &context) override; }; -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender #endif /* __USD_WRITER_LIGHT_H__ */ diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc index 61337beff20..29a9734f876 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.cc +++ b/source/blender/io/usd/intern/usd_writer_mesh.cc @@ -42,7 +42,9 @@ #include "DNA_object_fluidsim_types.h" #include "DNA_particle_types.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { USDGenericMeshWriter::USDGenericMeshWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) { @@ -484,4 +486,6 @@ Mesh *USDMeshWriter::get_export_mesh(Object *object_eval, bool & /*r_needsfree*/ return BKE_object_get_evaluated_mesh(object_eval); } -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender diff --git a/source/blender/io/usd/intern/usd_writer_mesh.h b/source/blender/io/usd/intern/usd_writer_mesh.h index 4175e2b7e27..a14ceecfa53 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.h +++ b/source/blender/io/usd/intern/usd_writer_mesh.h @@ -23,7 +23,9 @@ #include <pxr/usd/usdGeom/mesh.h> -namespace USD { +namespace blender { +namespace io { +namespace usd { struct USDMeshData; @@ -61,6 +63,8 @@ class USDMeshWriter : public USDGenericMeshWriter { virtual Mesh *get_export_mesh(Object *object_eval, bool &r_needsfree) override; }; -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender #endif /* __USD_WRITER_MESH_H__ */ diff --git a/source/blender/io/usd/intern/usd_writer_metaball.cc b/source/blender/io/usd/intern/usd_writer_metaball.cc index 96bf854d327..f003fba18a4 100644 --- a/source/blender/io/usd/intern/usd_writer_metaball.cc +++ b/source/blender/io/usd/intern/usd_writer_metaball.cc @@ -34,7 +34,9 @@ #include "DNA_mesh_types.h" #include "DNA_meta_types.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { USDMetaballWriter::USDMetaballWriter(const USDExporterContext &ctx) : USDGenericMeshWriter(ctx) { @@ -76,4 +78,6 @@ bool USDMetaballWriter::is_basis_ball(Scene *scene, Object *ob) const return ob == basis_ob; } -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender diff --git a/source/blender/io/usd/intern/usd_writer_metaball.h b/source/blender/io/usd/intern/usd_writer_metaball.h index 1a86daae2ae..9f51a3314a5 100644 --- a/source/blender/io/usd/intern/usd_writer_metaball.h +++ b/source/blender/io/usd/intern/usd_writer_metaball.h @@ -21,7 +21,9 @@ #include "usd_writer_mesh.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { class USDMetaballWriter : public USDGenericMeshWriter { public: @@ -37,6 +39,8 @@ class USDMetaballWriter : public USDGenericMeshWriter { bool is_basis_ball(Scene *scene, Object *ob) const; }; -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender #endif /* __USD_WRITER_METABALL_H__ */ diff --git a/source/blender/io/usd/intern/usd_writer_transform.cc b/source/blender/io/usd/intern/usd_writer_transform.cc index 0694d873002..643f1a8f4b1 100644 --- a/source/blender/io/usd/intern/usd_writer_transform.cc +++ b/source/blender/io/usd/intern/usd_writer_transform.cc @@ -28,7 +28,9 @@ #include "DNA_layer_types.h" -namespace USD { +namespace blender { +namespace io { +namespace usd { USDTransformWriter::USDTransformWriter(const USDExporterContext &ctx) : USDAbstractWriter(ctx) { @@ -59,4 +61,6 @@ bool USDTransformWriter::check_is_animated(const HierarchyContext &context) cons return BKE_object_moves_in_time(context.object, context.animation_check_include_parent); } -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender diff --git a/source/blender/io/usd/intern/usd_writer_transform.h b/source/blender/io/usd/intern/usd_writer_transform.h index 52c4a657f33..8b4741f1177 100644 --- a/source/blender/io/usd/intern/usd_writer_transform.h +++ b/source/blender/io/usd/intern/usd_writer_transform.h @@ -23,7 +23,9 @@ #include <pxr/usd/usdGeom/xform.h> -namespace USD { +namespace blender { +namespace io { +namespace usd { class USDTransformWriter : public USDAbstractWriter { private: @@ -37,6 +39,8 @@ class USDTransformWriter : public USDAbstractWriter { bool check_is_animated(const HierarchyContext &context) const override; }; -} // namespace USD +} // namespace usd +} // namespace io +} // namespace blender #endif /* __USD_WRITER_TRANSFORM_H__ */ |