Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Alembic: cleaned up hack in AbcObjectReader::read_matrix()

Browse Source
This commit is contained in:
Sybren A. Stüvel
2017-02-15 15:29:41 +01:00
parent 347a4956a0
commit 62a47f9660
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/alembic/intern/abc_object.cc
View File

@@ -239,35 +239,24 @@ void AbcObjectReader::readObjectMatrix(const float time)
void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float scale, bool &is_constant) void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float scale, bool &is_constant)
{ {
IXform ixform; IXform ixform;
bool has_alembic_parent = false; IObject ixform_parent;
/* Check that we have an empty object (locator, bone head/tail...). */ /* Check that we have an empty object (locator, bone head/tail...). */
if (IXform::matches(m_iobject.getMetaData())) { if (IXform::matches(m_iobject.getMetaData())) {
ixform = IXform(m_iobject, Alembic::AbcGeom::kWrapExisting); ixform = IXform(m_iobject, Alembic::AbcGeom::kWrapExisting);
ixform_parent = m_iobject.getParent();
/* See comment below. */
has_alembic_parent = m_iobject.getParent().getParent().valid();
} }
/* Check that we have an object with actual data. */ /* Check that we have an object with actual data. */
else if (IXform::matches(m_iobject.getParent().getMetaData())) { else if (IXform::matches(m_iobject.getParent().getMetaData())) {
ixform = IXform(m_iobject.getParent(), Alembic::AbcGeom::kWrapExisting); ixform = IXform(m_iobject.getParent(), Alembic::AbcGeom::kWrapExisting);
ixform_parent = m_iobject.getParent().getParent();
/* This is a bit hackish, but we need to make sure that extra
* transformations added to the matrix (rotation/scale) are only applied
* to root objects. The way objects and their hierarchy are created will
* need to be revisited at some point but for now this seems to do the
* trick.
*
* Explanation of the trick:
* The first getParent() will return this object's transformation matrix.
* The second getParent() will get the parent of the transform, but this
* might be the archive root ('/') which is valid, so we go passed it to
* make sure that there is no parent.
*/
has_alembic_parent = m_iobject.getParent().getParent().getParent().valid();
} }
/* Should not happen. */ /* Should not happen. */
else { else {
std::cerr << "AbcObjectReader::read_matrix: "
<< "unable to find IXform for Alembic object '"
<< m_iobject.getFullName() << "'\n";
BLI_assert(false);
return; return;
} }
@@ -277,6 +266,16 @@ void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float
return; return;
} }
bool has_alembic_parent;
if (!ixform_parent.getParent()) {
/* The archive top object certainly is not a transform itself, so handle
* it as "no parent". */
has_alembic_parent = false;
}
else {
has_alembic_parent = ixform_parent && schema.getInheritsXforms();
}
const Imath::M44d matrix = get_matrix(schema, time); const Imath::M44d matrix = get_matrix(schema, time);
convert_matrix(matrix, m_object, mat, scale, has_alembic_parent); convert_matrix(matrix, m_object, mat, scale, has_alembic_parent);