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

Alembic: added some r_ prefixes for return parameters

Browse Source
This commit is contained in:
Sybren A. Stüvel
2017-03-02 09:56:57 +01:00
parent f226b808ff
commit 8b2555e798
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -262,7 +262,8 @@ Alembic::AbcGeom::IXform AbcObjectReader::xform()
return IXform(); return IXform();
} }
void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float scale, bool &is_constant) void AbcObjectReader::read_matrix(float r_mat[4][4], const float time,
const float scale, bool &is_constant)
{ {
IXform ixform = xform(); IXform ixform = xform();
if (!ixform) { if (!ixform) {
@@ -288,7 +289,7 @@ void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float
} }
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, r_mat, scale, has_alembic_parent);
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
@@ -297,7 +298,7 @@ void AbcObjectReader::read_matrix(float mat[4][4], const float time, const float
* parent object is already updated for the current timekey, and use its * parent object is already updated for the current timekey, and use its
* world matrix. */ * world matrix. */
BLI_assert(m_object->parent); BLI_assert(m_object->parent);
mul_m4_m4m4(mat, m_object->parent->obmat, mat); mul_m4_m4m4(r_mat, m_object->parent->obmat, r_mat);
} }
is_constant = schema.isConstant(); is_constant = schema.isConstant();

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

@@ -187,7 +187,8 @@ public:
void incref(); void incref();
void decref(); void decref();
void read_matrix(float mat[4][4], const float time, const float scale, bool &is_constant); void read_matrix(float r_mat[4][4], const float time,
const float scale, bool &is_constant);
}; };
Imath::M44d get_matrix(const Alembic::AbcGeom::IXformSchema &schema, const float time); Imath::M44d get_matrix(const Alembic::AbcGeom::IXformSchema &schema, const float time);

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

@@ -254,7 +254,7 @@ void convert_matrix(const Imath::M44d &xform, Object *ob,
/* Recompute transform matrix of object in new coordinate system /* Recompute transform matrix of object in new coordinate system
* (from Z-Up to Y-Up). */ * (from Z-Up to Y-Up). */
void create_transform_matrix(Object *obj, float yup_mat[4][4]) void create_transform_matrix(Object *obj, float r_yup_mat[4][4])
{ {
float zup_mat[4][4]; float zup_mat[4][4];
@@ -273,7 +273,7 @@ void create_transform_matrix(Object *obj, float yup_mat[4][4])
} }
copy_m44_axis_swap(yup_mat, zup_mat, ABC_YUP_FROM_ZUP); copy_m44_axis_swap(r_yup_mat, zup_mat, ABC_YUP_FROM_ZUP);
} }
bool has_property(const Alembic::Abc::ICompoundProperty &prop, const std::string &name) bool has_property(const Alembic::Abc::ICompoundProperty &prop, const std::string &name)

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

@@ -52,7 +52,7 @@ bool object_selected(Object *ob);
bool parent_selected(Object *ob); bool parent_selected(Object *ob);
Imath::M44d convert_matrix(float mat[4][4]); Imath::M44d convert_matrix(float mat[4][4]);
void create_transform_matrix(Object *obj, float transform_mat[4][4]); void create_transform_matrix(Object *obj, float r_transform_mat[4][4]);
void split(const std::string &s, const char delim, std::vector<std::string> &tokens); void split(const std::string &s, const char delim, std::vector<std::string> &tokens);