[Bf-blender-cvs] [e0c546e45a8] temp-sybren-usd-patch-02: USD: renamed 'xform' to 'transform'
Sybren A. Stüvel
noreply at git.blender.org
Wed Dec 11 16:37:12 CET 2019
Commit: e0c546e45a821e8d353cd1841d5c4a7e3970b52f
Author: Sybren A. Stüvel
Date: Wed Dec 11 16:02:55 2019 +0100
Branches: temp-sybren-usd-patch-02
https://developer.blender.org/rBe0c546e45a821e8d353cd1841d5c4a7e3970b52f
USD: renamed 'xform' to 'transform'
Sergey and I don't agree on 'tfm' vs. 'xform', so I just chose to not to
use either and avoid abbreviating altogether.
===================================================================
M source/blender/usd/intern/abstract_hierarchy_iterator.cc
M source/blender/usd/intern/abstract_hierarchy_iterator.h
M source/blender/usd/intern/usd_hierarchy_iterator.cc
M source/blender/usd/intern/usd_hierarchy_iterator.h
M tests/gtests/usd/abstract_hierarchy_iterator_test.cc
===================================================================
diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.cc b/source/blender/usd/intern/abstract_hierarchy_iterator.cc
index b0e01f55d66..0f1ec054df1 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.cc
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.cc
@@ -404,7 +404,7 @@ void AbstractHierarchyIterator::determine_duplication_references(
void AbstractHierarchyIterator::make_writers(const HierarchyContext *parent_context)
{
- AbstractHierarchyWriter *xform_writer = nullptr;
+ AbstractHierarchyWriter *transform_writer = nullptr;
float parent_matrix_inv_world[4][4];
if (parent_context) {
@@ -420,8 +420,8 @@ void AbstractHierarchyIterator::make_writers(const HierarchyContext *parent_cont
copy_m4_m4(context->parent_matrix_inv_world, parent_matrix_inv_world);
// Get or create the transform writer.
- xform_writer = ensure_writer(context, &AbstractHierarchyIterator::create_xform_writer);
- if (xform_writer == nullptr) {
+ transform_writer = ensure_writer(context, &AbstractHierarchyIterator::create_transform_writer);
+ if (transform_writer == nullptr) {
// Unable to export, so there is nothing to attach any children to; just abort this entire
// branch of the export hierarchy.
return;
@@ -431,7 +431,7 @@ void AbstractHierarchyIterator::make_writers(const HierarchyContext *parent_cont
/* XXX This can lead to too many XForms being written. For example, a camera writer can refuse
* to write an orthographic camera. By the time that this is known, the XForm has already been
* written. */
- xform_writer->write(*context);
+ transform_writer->write(*context);
if (!context->weak_export) {
make_writers_particle_systems(context);
@@ -474,17 +474,17 @@ void AbstractHierarchyIterator::make_writer_object_data(const HierarchyContext *
}
void AbstractHierarchyIterator::make_writers_particle_systems(
- const HierarchyContext *xform_context)
+ const HierarchyContext *transform_context)
{
- Object *object = xform_context->object;
+ Object *object = transform_context->object;
ParticleSystem *psys = static_cast<ParticleSystem *>(object->particlesystem.first);
for (; psys; psys = psys->next) {
if (!psys_check_enabled(object, psys, true)) {
continue;
}
- HierarchyContext hair_context = *xform_context;
- hair_context.export_path = path_concatenate(xform_context->export_path,
+ HierarchyContext hair_context = *transform_context;
+ hair_context.export_path = path_concatenate(transform_context->export_path,
get_id_name(&psys->part->id));
hair_context.particle_system = psys;
diff --git a/source/blender/usd/intern/abstract_hierarchy_iterator.h b/source/blender/usd/intern/abstract_hierarchy_iterator.h
index 18d0b891ddc..db1e4248cab 100644
--- a/source/blender/usd/intern/abstract_hierarchy_iterator.h
+++ b/source/blender/usd/intern/abstract_hierarchy_iterator.h
@@ -232,11 +232,9 @@ class AbstractHierarchyIterator {
* nullptr if the object or its data should not be exported. Returning a nullptr for
* data/hair/particle will NOT prevent the transform to be written.
*
- * 'Xform' is used for 'transform' to be consistent with the terminology of USD and Alembic.
- *
* The returned writer is owned by the AbstractHierarchyWriter, and should be freed in
* delete_object_writer(). */
- virtual AbstractHierarchyWriter *create_xform_writer(const HierarchyContext *context) = 0;
+ virtual AbstractHierarchyWriter *create_transform_writer(const HierarchyContext *context) = 0;
virtual AbstractHierarchyWriter *create_data_writer(const HierarchyContext *context) = 0;
virtual AbstractHierarchyWriter *create_hair_writer(const HierarchyContext *context) = 0;
virtual AbstractHierarchyWriter *create_particle_writer(const HierarchyContext *context) = 0;
diff --git a/source/blender/usd/intern/usd_hierarchy_iterator.cc b/source/blender/usd/intern/usd_hierarchy_iterator.cc
index b7912b8ea46..c93a678d9be 100644
--- a/source/blender/usd/intern/usd_hierarchy_iterator.cc
+++ b/source/blender/usd/intern/usd_hierarchy_iterator.cc
@@ -88,7 +88,8 @@ USDExporterContext USDHierarchyIterator::create_usd_export_context(const Hierarc
return USDExporterContext{depsgraph_, stage, pxr::SdfPath(context->export_path), this, params};
}
-AbstractHierarchyWriter *USDHierarchyIterator::create_xform_writer(const HierarchyContext *context)
+AbstractHierarchyWriter *USDHierarchyIterator::create_transform_writer(
+ const HierarchyContext *context)
{
return new USDTransformWriter(create_usd_export_context(context));
}
diff --git a/source/blender/usd/intern/usd_hierarchy_iterator.h b/source/blender/usd/intern/usd_hierarchy_iterator.h
index 2a61f2ae3d7..cbff9f38ee7 100644
--- a/source/blender/usd/intern/usd_hierarchy_iterator.h
+++ b/source/blender/usd/intern/usd_hierarchy_iterator.h
@@ -53,7 +53,8 @@ class USDHierarchyIterator : public AbstractHierarchyIterator {
protected:
virtual bool mark_as_weak_export(const Object *object) const override;
- virtual AbstractHierarchyWriter *create_xform_writer(const HierarchyContext *context) override;
+ virtual AbstractHierarchyWriter *create_transform_writer(
+ const HierarchyContext *context) override;
virtual AbstractHierarchyWriter *create_data_writer(const HierarchyContext *context) override;
virtual AbstractHierarchyWriter *create_hair_writer(const HierarchyContext *context) override;
virtual AbstractHierarchyWriter *create_particle_writer(
diff --git a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
index 6174beb9215..e87ef547052 100644
--- a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
+++ b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
@@ -65,7 +65,7 @@ void debug_print_writers(const char *label, const created_writers &writers_map)
class TestingHierarchyIterator : public AbstractHierarchyIterator {
public: /* Public so that the test cases can directly inspect the created writers. */
- created_writers xform_writers;
+ created_writers transform_writers;
created_writers data_writers;
created_writers hair_writers;
created_writers particle_writers;
@@ -79,9 +79,9 @@ class TestingHierarchyIterator : public AbstractHierarchyIterator {
}
protected:
- AbstractHierarchyWriter *create_xform_writer(const HierarchyContext *context) override
+ AbstractHierarchyWriter *create_transform_writer(const HierarchyContext *context) override
{
- return new TestHierarchyWriter(xform_writers);
+ return new TestHierarchyWriter(transform_writers);
}
AbstractHierarchyWriter *create_data_writer(const HierarchyContext *context) override
{
@@ -146,7 +146,7 @@ TEST_F(USDHierarchyIteratorTest, ExportHierarchyTest)
iterator->iterate_and_write();
// Mapping from object name to set of export paths.
- created_writers expected_xforms = {
+ created_writers expected_transforms = {
{"OBCamera", {"/Camera"}},
{"OBDupli1", {"/Dupli1"}},
{"OBDupli2", {"/ParentOfDupli2/Dupli2"}},
@@ -170,7 +170,7 @@ TEST_F(USDHierarchyIteratorTest, ExportHierarchyTest)
{"OBOutsideDupliGrandParent", {"/Ground plane/OutsideDupliGrandParent"}},
{"OBOutsideDupliParent", {"/Ground plane/OutsideDupliGrandParent/OutsideDupliParent"}},
{"OBParentOfDupli2", {"/ParentOfDupli2"}}};
- EXPECT_EQ(expected_xforms, iterator->xform_writers);
+ EXPECT_EQ(expected_transforms, iterator->transform_writers);
created_writers expected_data = {
{"OBCamera", {"/Camera/Camera"}},
More information about the Bf-blender-cvs
mailing list