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

Alembic import: moved import-time scaling to different function

Browse Source 
convert_matrix() now only converts from Imath::M44d to float[4][4] (taking
different camera orientations into account). Import-time scaling is now
performed by the caller.
This commit is contained in:
Sybren A. Stüvel
2017-03-02 10:03:51 +01:00
parent 4cb5114e13
commit 5e86144cd3
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,7 +289,7 @@ void AbcObjectReader::read_matrix(float r_mat[4][4], const float time,
} }
const Imath::M44d matrix = get_matrix(schema, time); const Imath::M44d matrix = get_matrix(schema, time);
convert_matrix(matrix, m_object, r_mat, scale, has_alembic_parent); convert_matrix(matrix, m_object, r_mat);
if (has_alembic_parent) { if (has_alembic_parent) {
/* In this case, the matrix in Alembic is in local coordinates, so /* In this case, the matrix in Alembic is in local coordinates, so
@@ -300,6 +300,13 @@ void AbcObjectReader::read_matrix(float r_mat[4][4], const float time,
BLI_assert(m_object->parent); BLI_assert(m_object->parent);
mul_m4_m4m4(r_mat, m_object->parent->obmat, r_mat); mul_m4_m4m4(r_mat, m_object->parent->obmat, r_mat);
} }
else {
/* Only apply scaling to root objects, parenting will propagate it. */
float scale_mat[4][4];
scale_m4_fl(scale_mat, scale);
mul_m4_m4m4(r_mat, r_mat, scale_mat);
mul_v3_fl(r_mat[3], scale);
}
is_constant = schema.isConstant(); is_constant = schema.isConstant();
} }

11
source/blender/alembic/intern/abc_util.cc
View File

@@ -226,8 +226,7 @@ void copy_m44_axis_swap(float dst_mat[4][4], float src_mat[4][4], AbcAxisSwapMod
mul_m4_m4m4(dst_mat, dst_mat, dst_scale_mat); mul_m4_m4m4(dst_mat, dst_mat, dst_scale_mat);
} }
void convert_matrix(const Imath::M44d &xform, Object *ob, void convert_matrix(const Imath::M44d &xform, Object *ob, float r_mat[4][4])
float r_mat[4][4], float scale, bool has_alembic_parent)
{ {
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j) { for (int j = 0; j < 4; ++j) {
@@ -242,14 +241,6 @@ void convert_matrix(const Imath::M44d &xform, Object *ob,
} }
copy_m44_axis_swap(r_mat, r_mat, ABC_ZUP_FROM_YUP); copy_m44_axis_swap(r_mat, r_mat, ABC_ZUP_FROM_YUP);
if (!has_alembic_parent) {
/* Only apply scaling to root objects, parenting will propagate it. */
float scale_mat[4][4];
scale_m4_fl(scale_mat, scale);
mul_m4_m4m4(r_mat, r_mat, scale_mat);
mul_v3_fl(r_mat[3], scale);
}
} }
/* Recompute transform matrix of object in new coordinate system /* Recompute transform matrix of object in new coordinate system

3
source/blender/alembic/intern/abc_util.h
View File

@@ -63,8 +63,7 @@ bool begins_with(const TContainer &input, const TContainer &match)
&& std::equal(match.begin(), match.end(), input.begin()); && std::equal(match.begin(), match.end(), input.begin());
} }
void convert_matrix(const Imath::M44d &xform, Object *ob, void convert_matrix(const Imath::M44d &xform, Object *ob, float r_mat[4][4]);
float r_mat[4][4], float scale, bool has_alembic_parent = false);
template <typename Schema> template <typename Schema>
void get_min_max_time_ex(const Schema &schema, chrono_t &min, chrono_t &max) void get_min_max_time_ex(const Schema &schema, chrono_t &min, chrono_t &max)