diff options
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 10 | ||||
-rw-r--r-- | source/blender/collada/ArmatureImporter.h | 10 | ||||
-rw-r--r-- | source/blender/collada/SConscript | 3 | ||||
-rw-r--r-- | source/blender/collada/SkinInfo.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/SkinInfo.h | 2 | ||||
-rw-r--r-- | source/blender/collada/TransformReader.cpp | 10 | ||||
-rw-r--r-- | source/blender/collada/TransformReader.h | 10 | ||||
-rw-r--r-- | source/blender/collada/TransformWriter.cpp | 2 | ||||
-rw-r--r-- | source/blender/collada/TransformWriter.h | 2 | ||||
-rw-r--r-- | source/blender/collada/collada_internal.cpp | 8 | ||||
-rw-r--r-- | source/blender/collada/collada_internal.h | 8 |
11 files changed, 34 insertions, 33 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index cd2574d055e..f1cf732e695 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -79,7 +79,7 @@ JointData *ArmatureImporter::get_joint_data(COLLADAFW::Node *node); } #endif void ArmatureImporter::create_unskinned_bone(COLLADAFW::Node *node, EditBone *parent, int totchild, - float parent_mat[][4], Object *ob_arm) + float parent_mat[4][4], Object *ob_arm) { std::vector<COLLADAFW::Node *>::iterator it; it = std::find(finished_joints.begin(), finished_joints.end(), node); @@ -156,7 +156,7 @@ void ArmatureImporter::create_unskinned_bone(COLLADAFW::Node *node, EditBone *pa } void ArmatureImporter::create_bone(SkinInfo& skin, COLLADAFW::Node *node, EditBone *parent, int totchild, - float parent_mat[][4], bArmature *arm) + float parent_mat[4][4], bArmature *arm) { //Checking if bone is already made. std::vector<COLLADAFW::Node *>::iterator it; @@ -268,7 +268,7 @@ void ArmatureImporter::create_bone(SkinInfo& skin, COLLADAFW::Node *node, EditBo finished_joints.push_back(node); } -void ArmatureImporter::add_leaf_bone(float mat[][4], EditBone *bone, COLLADAFW::Node *node) +void ArmatureImporter::add_leaf_bone(float mat[4][4], EditBone *bone, COLLADAFW::Node *node) { LeafBone leaf; @@ -572,7 +572,7 @@ void ArmatureImporter::create_armature_bones(SkinInfo& skin) // is a child of a node (not joint), root should be true since // this is where we build armature bones from -void ArmatureImporter::set_pose(Object *ob_arm, COLLADAFW::Node *root_node, const char *parentname, float parent_mat[][4]) +void ArmatureImporter::set_pose(Object *ob_arm, COLLADAFW::Node *root_node, const char *parentname, float parent_mat[4][4]) { char *bone_name = (char *) bc_get_joint_name(root_node); float mat[4][4]; @@ -792,7 +792,7 @@ void ArmatureImporter::get_rna_path_for_joint(COLLADAFW::Node *node, char *joint } // gives a world-space mat -bool ArmatureImporter::get_joint_bind_mat(float m[][4], COLLADAFW::Node *joint) +bool ArmatureImporter::get_joint_bind_mat(float m[4][4], COLLADAFW::Node *joint) { std::map<COLLADAFW::UniqueId, SkinInfo>::iterator it; bool found = false; diff --git a/source/blender/collada/ArmatureImporter.h b/source/blender/collada/ArmatureImporter.h index a6b37287479..bb710f09490 100644 --- a/source/blender/collada/ArmatureImporter.h +++ b/source/blender/collada/ArmatureImporter.h @@ -104,16 +104,16 @@ private: #endif void create_bone(SkinInfo& skin, COLLADAFW::Node *node, EditBone *parent, int totchild, - float parent_mat[][4], bArmature *arm); + float parent_mat[4][4], bArmature *arm); void create_unskinned_bone(COLLADAFW::Node *node, EditBone *parent, int totchild, - float parent_mat[][4], Object * ob_arm); + float parent_mat[4][4], Object * ob_arm); - void add_leaf_bone(float mat[][4], EditBone *bone, COLLADAFW::Node * node); + void add_leaf_bone(float mat[4][4], EditBone *bone, COLLADAFW::Node * node); void fix_leaf_bones(); - void set_pose ( Object * ob_arm, COLLADAFW::Node * root_node, const char *parentname, float parent_mat[][4]); + void set_pose ( Object * ob_arm, COLLADAFW::Node * root_node, const char *parentname, float parent_mat[4][4]); #if 0 @@ -168,7 +168,7 @@ public: void get_rna_path_for_joint(COLLADAFW::Node *node, char *joint_path, size_t count); // gives a world-space mat - bool get_joint_bind_mat(float m[][4], COLLADAFW::Node *joint); + bool get_joint_bind_mat(float m[4][4], COLLADAFW::Node *joint); void set_tags_map( TagsMap& tags_map); diff --git a/source/blender/collada/SConscript b/source/blender/collada/SConscript index 5d921681aea..1351441e41b 100644 --- a/source/blender/collada/SConscript +++ b/source/blender/collada/SConscript @@ -1,4 +1,5 @@ -#!/usr/bin/python +#!/usr/bin/env python +# # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/source/blender/collada/SkinInfo.cpp b/source/blender/collada/SkinInfo.cpp index 9b0d59d66ea..470f663f716 100644 --- a/source/blender/collada/SkinInfo.cpp +++ b/source/blender/collada/SkinInfo.cpp @@ -168,7 +168,7 @@ Object *SkinInfo::set_armature(Object *ob_arm) return ob_arm; } -bool SkinInfo::get_joint_inv_bind_matrix(float inv_bind_mat[][4], COLLADAFW::Node *node) +bool SkinInfo::get_joint_inv_bind_matrix(float inv_bind_mat[4][4], COLLADAFW::Node *node) { const COLLADAFW::UniqueId& uid = node->getUniqueId(); std::vector<JointData>::iterator it; diff --git a/source/blender/collada/SkinInfo.h b/source/blender/collada/SkinInfo.h index 894f53f07c3..e074f59cffc 100644 --- a/source/blender/collada/SkinInfo.h +++ b/source/blender/collada/SkinInfo.h @@ -103,7 +103,7 @@ public: Object* set_armature(Object *ob_arm); - bool get_joint_inv_bind_matrix(float inv_bind_mat[][4], COLLADAFW::Node *node); + bool get_joint_inv_bind_matrix(float inv_bind_mat[4][4], COLLADAFW::Node *node); Object *BKE_armature_from_object(); diff --git a/source/blender/collada/TransformReader.cpp b/source/blender/collada/TransformReader.cpp index 61793589422..5bc135e9b67 100644 --- a/source/blender/collada/TransformReader.cpp +++ b/source/blender/collada/TransformReader.cpp @@ -34,7 +34,7 @@ TransformReader::TransformReader(UnitConverter *conv) : unit_converter(conv) /* pass */ } -void TransformReader::get_node_mat(float mat[][4], COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Animation> *animation_map, Object *ob) +void TransformReader::get_node_mat(float mat[4][4], COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Animation> *animation_map, Object *ob) { float cur[4][4]; float copy[4][4]; @@ -79,7 +79,7 @@ void TransformReader::get_node_mat(float mat[][4], COLLADAFW::Node *node, std::m } } -void TransformReader::dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[][4]) +void TransformReader::dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]) { COLLADAFW::Rotate *ro = (COLLADAFW::Rotate *)tm; COLLADABU::Math::Vector3& axis = ro->getRotationAxis(); @@ -91,7 +91,7 @@ void TransformReader::dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[ axis_angle_to_mat4(m, ax, angle); } -void TransformReader::dae_translate_to_mat4(COLLADAFW::Transformation *tm, float m[][4]) +void TransformReader::dae_translate_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]) { COLLADAFW::Translate *tra = (COLLADAFW::Translate *)tm; COLLADABU::Math::Vector3& t = tra->getTranslation(); @@ -103,14 +103,14 @@ void TransformReader::dae_translate_to_mat4(COLLADAFW::Transformation *tm, float m[3][2] = (float)t[2]; } -void TransformReader::dae_scale_to_mat4(COLLADAFW::Transformation *tm, float m[][4]) +void TransformReader::dae_scale_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]) { COLLADABU::Math::Vector3& s = ((COLLADAFW::Scale *)tm)->getScale(); float size[3] = {(float)s[0], (float)s[1], (float)s[2]}; size_to_mat4(m, size); } -void TransformReader::dae_matrix_to_mat4(COLLADAFW::Transformation *tm, float m[][4]) +void TransformReader::dae_matrix_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]) { unit_converter->dae_matrix_to_mat4_(m, ((COLLADAFW::Matrix *)tm)->getMatrix()); } diff --git a/source/blender/collada/TransformReader.h b/source/blender/collada/TransformReader.h index 47e59a1bf52..ab974b9ba85 100644 --- a/source/blender/collada/TransformReader.h +++ b/source/blender/collada/TransformReader.h @@ -58,12 +58,12 @@ public: TransformReader(UnitConverter *conv); - void get_node_mat(float mat[][4], COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Animation> *animation_map, Object *ob); + void get_node_mat(float mat[4][4], COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Animation> *animation_map, Object *ob); - void dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[][4]); - void dae_translate_to_mat4(COLLADAFW::Transformation *tm, float m[][4]); - void dae_scale_to_mat4(COLLADAFW::Transformation *tm, float m[][4]); - void dae_matrix_to_mat4(COLLADAFW::Transformation *tm, float m[][4]); + void dae_rotate_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); + void dae_translate_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); + void dae_scale_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); + void dae_matrix_to_mat4(COLLADAFW::Transformation *tm, float m[4][4]); void dae_translate_to_v3(COLLADAFW::Transformation *tm, float v[3]); void dae_scale_to_v3(COLLADAFW::Transformation *tm, float v[3]); void dae_vector3_to_v3(const COLLADABU::Math::Vector3 &v3, float v[3]); diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp index 0d6e3831637..3fe3f620a68 100644 --- a/source/blender/collada/TransformWriter.cpp +++ b/source/blender/collada/TransformWriter.cpp @@ -32,7 +32,7 @@ #include "BLI_math.h" -void TransformWriter::add_node_transform(COLLADASW::Node& node, float mat[][4], float parent_mat[][4]) +void TransformWriter::add_node_transform(COLLADASW::Node& node, float mat[4][4], float parent_mat[4][4]) { float loc[3], rot[3], scale[3]; float local[4][4]; diff --git a/source/blender/collada/TransformWriter.h b/source/blender/collada/TransformWriter.h index 917e26dac1a..d2a4b54a570 100644 --- a/source/blender/collada/TransformWriter.h +++ b/source/blender/collada/TransformWriter.h @@ -37,7 +37,7 @@ class TransformWriter : protected TransformBase { protected: - void add_node_transform(COLLADASW::Node& node, float mat[][4], float parent_mat[][4]); + void add_node_transform(COLLADASW::Node& node, float mat[4][4], float parent_mat[4][4]); void add_node_transform_ob(COLLADASW::Node& node, Object *ob); diff --git a/source/blender/collada/collada_internal.cpp b/source/blender/collada/collada_internal.cpp index a4969735757..51d81dc164b 100644 --- a/source/blender/collada/collada_internal.cpp +++ b/source/blender/collada/collada_internal.cpp @@ -74,7 +74,7 @@ void UnitConverter::convertVector3(COLLADABU::Math::Vector3 &vec, float *v) // TODO need also for angle conversion, time conversion... -void UnitConverter::dae_matrix_to_mat4_(float out[][4], const COLLADABU::Math::Matrix4& in) +void UnitConverter::dae_matrix_to_mat4_(float out[4][4], const COLLADABU::Math::Matrix4& in) { // in DAE, matrices use columns vectors, (see comments in COLLADABUMathMatrix4.h) // so here, to make a blender matrix, we swap columns and rows @@ -85,13 +85,13 @@ void UnitConverter::dae_matrix_to_mat4_(float out[][4], const COLLADABU::Math::M } } -void UnitConverter::mat4_to_dae(float out[][4], float in[][4]) +void UnitConverter::mat4_to_dae(float out[4][4], float in[4][4]) { copy_m4_m4(out, in); transpose_m4(out); } -void UnitConverter::mat4_to_dae_double(double out[][4], float in[][4]) +void UnitConverter::mat4_to_dae_double(double out[4][4], float in[4][4]) { float mat[4][4]; @@ -102,7 +102,7 @@ void UnitConverter::mat4_to_dae_double(double out[][4], float in[][4]) out[i][j] = mat[i][j]; } -void TransformBase::decompose(float mat[][4], float *loc, float eul[3], float quat[4], float *size) +void TransformBase::decompose(float mat[4][4], float *loc, float eul[3], float quat[4], float *size) { mat4_to_size(size, mat); if (eul) { diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h index 6eec6a1675e..d92f53f714c 100644 --- a/source/blender/collada/collada_internal.h +++ b/source/blender/collada/collada_internal.h @@ -69,17 +69,17 @@ public: // TODO need also for angle conversion, time conversion... - void dae_matrix_to_mat4_(float out[][4], const COLLADABU::Math::Matrix4& in); + void dae_matrix_to_mat4_(float out[4][4], const COLLADABU::Math::Matrix4& in); - void mat4_to_dae(float out[][4], float in[][4]); + void mat4_to_dae(float out[4][4], float in[4][4]); - void mat4_to_dae_double(double out[][4], float in[][4]); + void mat4_to_dae_double(double out[4][4], float in[4][4]); }; class TransformBase { public: - void decompose(float mat[][4], float *loc, float eul[3], float quat[4], float *size); + void decompose(float mat[4][4], float *loc, float eul[3], float quat[4], float *size); }; extern void clear_global_id_map(); |