From 2115232a16d81d28dbdb8042ed8e9316858514c6 Mon Sep 17 00:00:00 2001 From: Sebastian Parborg Date: Fri, 4 Sep 2020 20:59:13 +0200 Subject: Cleanup: Clang-Tidy readability-inconsistent-declaration-parameter-name fix No functional changes --- source/blender/io/collada/AnimationExporter.h | 10 +++++----- source/blender/io/collada/ArmatureImporter.cpp | 26 ++++++++++++++------------ source/blender/io/collada/BCAnimationSampler.h | 6 +++--- source/blender/io/collada/BCMath.cpp | 4 ++-- source/blender/io/collada/BCMath.h | 2 +- source/blender/io/collada/CameraExporter.h | 2 +- source/blender/io/collada/DocumentExporter.cpp | 5 +++-- source/blender/io/collada/EffectExporter.h | 4 ++-- source/blender/io/collada/GeometryExporter.h | 2 +- source/blender/io/collada/ImageExporter.h | 2 +- source/blender/io/collada/MeshImporter.cpp | 12 ++++++------ source/blender/io/collada/MeshImporter.h | 2 +- source/blender/io/collada/collada_utils.h | 8 ++++---- 13 files changed, 44 insertions(+), 41 deletions(-) (limited to 'source/blender/io/collada') diff --git a/source/blender/io/collada/AnimationExporter.h b/source/blender/io/collada/AnimationExporter.h index ded547949f9..2d38a541347 100644 --- a/source/blender/io/collada/AnimationExporter.h +++ b/source/blender/io/collada/AnimationExporter.h @@ -152,7 +152,7 @@ class AnimationExporter : COLLADASW::LibraryAnimations { void exportAnimation(Object *ob, BCAnimationSampler &sampler); /* export animation as separate trans/rot/scale curves */ - void export_curve_animation_set(Object *ob, BCAnimationSampler &sampler, bool export_tm_curves); + void export_curve_animation_set(Object *ob, BCAnimationSampler &sampler, bool export_as_matrix); /* export one single curve */ void export_curve_animation(Object *ob, BCAnimationCurve &curve); @@ -164,7 +164,7 @@ class AnimationExporter : COLLADASW::LibraryAnimations { void export_bone_animations_recursive(Object *ob_arm, Bone *bone, BCAnimationSampler &sampler); /* Export for one bone */ - void export_bone_animation(Object *ob, Bone *bone, BCFrames &frames, BCMatrixSampleMap &outmats); + void export_bone_animation(Object *ob, Bone *bone, BCFrames &frames, BCMatrixSampleMap &samples); /* call to the low level collada exporter */ void export_collada_curve_animation(std::string id, @@ -179,7 +179,7 @@ class AnimationExporter : COLLADASW::LibraryAnimations { std::string name, std::string target, BCFrames &frames, - BCMatrixSampleMap &outmats, + BCMatrixSampleMap &samples, BC_global_rotation_type global_rotation_type, Matrix &parentinv); @@ -193,7 +193,7 @@ class AnimationExporter : COLLADASW::LibraryAnimations { void close_animation_container(bool has_container); /* Input and Output sources (single valued) */ - std::string collada_source_from_values(BC_animation_source_type tm_channel, + std::string collada_source_from_values(BC_animation_source_type source_type, COLLADASW::InputSemantic::Semantics semantic, std::vector &values, const std::string &anim_id, @@ -239,7 +239,7 @@ class AnimationExporter : COLLADASW::LibraryAnimations { bool *has_tangents); std::string get_axis_name(std::string channel, int id); - std::string get_collada_name(std::string channel_target) const; + std::string get_collada_name(std::string channel_type) const; std::string get_collada_sid(const BCAnimationCurve &curve, const std::string axis_name); /* ===================================== */ diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp index bd5bd913a18..dbb0ad328f5 100644 --- a/source/blender/io/collada/ArmatureImporter.cpp +++ b/source/blender/io/collada/ArmatureImporter.cpp @@ -292,7 +292,9 @@ void ArmatureImporter::fix_parent_connect(bArmature *armature, Bone *bone) } } -void ArmatureImporter::connect_bone_chains(bArmature *armature, Bone *parentbone, int clip) +void ArmatureImporter::connect_bone_chains(bArmature *armature, + Bone *parentbone, + int max_chain_length) { BoneExtensionMap &extended_bones = bone_extension_manager.getExtensionMap(armature); BoneExtended *dominant_child = NULL; @@ -308,7 +310,7 @@ void ArmatureImporter::connect_bone_chains(bArmature *armature, Bone *parentbone BoneExtended *be = extended_bones[child->name]; if (be != NULL) { int chain_len = be->get_chain_length(); - if (chain_len <= clip) { + if (chain_len <= max_chain_length) { if (chain_len > maxlen) { dominant_child = be; maxlen = chain_len; @@ -470,7 +472,7 @@ ArmatureJoints &ArmatureImporter::get_armature_joints(Object *ob_arm) return armature_joints.back(); } #endif -void ArmatureImporter::create_armature_bones(Main *bmain, std::vector &ob_arms) +void ArmatureImporter::create_armature_bones(Main *bmain, std::vector &arm_objs) { std::vector::iterator ri; std::vector layer_labels; @@ -523,9 +525,9 @@ void ArmatureImporter::create_armature_bones(Main *bmain, std::vector set_bone_transformation_type(node, ob_arm); - int index = std::find(ob_arms.begin(), ob_arms.end(), ob_arm) - ob_arms.begin(); + int index = std::find(arm_objs.begin(), arm_objs.end(), ob_arm) - arm_objs.begin(); if (index == 0) { - ob_arms.push_back(ob_arm); + arm_objs.push_back(ob_arm); } DEG_id_tag_update(&ob_arm->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY); @@ -787,7 +789,7 @@ void ArmatureImporter::add_root_joint(COLLADAFW::Node *node) void ArmatureImporter::make_armatures(bContext *C, std::vector &objects_to_scale) { Main *bmain = CTX_data_main(C); - std::vector ob_arms; + std::vector arm_objs; std::map::iterator it; /* TODO: Make this work for more than one armature in the import file. */ @@ -820,8 +822,8 @@ void ArmatureImporter::make_armatures(bContext *C, std::vector &object objects_to_scale.push_back(ob_arm); } - if (std::find(ob_arms.begin(), ob_arms.end(), ob_arm) == ob_arms.end()) { - ob_arms.push_back(ob_arm); + if (std::find(arm_objs.begin(), arm_objs.end(), ob_arm) == arm_objs.end()) { + arm_objs.push_back(ob_arm); } } else { @@ -843,11 +845,11 @@ void ArmatureImporter::make_armatures(bContext *C, std::vector &object } /* for bones without skins */ - create_armature_bones(bmain, ob_arms); + create_armature_bones(bmain, arm_objs); /* Fix bone relations */ std::vector::iterator ob_arm_it; - for (ob_arm_it = ob_arms.begin(); ob_arm_it != ob_arms.end(); ob_arm_it++) { + for (ob_arm_it = arm_objs.begin(); ob_arm_it != arm_objs.end(); ob_arm_it++) { Object *ob_arm = *ob_arm_it; bArmature *armature = (bArmature *)ob_arm->data; @@ -1025,9 +1027,9 @@ Object *ArmatureImporter::get_armature_for_joint(COLLADAFW::Node *node) return NULL; } -void ArmatureImporter::set_tags_map(TagsMap &tagsMap) +void ArmatureImporter::set_tags_map(TagsMap &tags_map) { - this->uid_tags_map = tagsMap; + this->uid_tags_map = tags_map; } void ArmatureImporter::get_rna_path_for_joint(COLLADAFW::Node *node, diff --git a/source/blender/io/collada/BCAnimationSampler.h b/source/blender/io/collada/BCAnimationSampler.h index 9c6eaf0a140..34aec00374e 100644 --- a/source/blender/io/collada/BCAnimationSampler.h +++ b/source/blender/io/collada/BCAnimationSampler.h @@ -140,8 +140,8 @@ class BCSampleFrameContainer { int get_frames(Object *ob, Bone *bone, BCFrames &frames) const; int get_samples(Object *ob, BCFrameSampleMap &samples) const; - int get_matrices(Object *ob, BCMatrixSampleMap &matrices) const; - int get_matrices(Object *ob, Bone *bone, BCMatrixSampleMap &bones) const; + int get_matrices(Object *ob, BCMatrixSampleMap &samples) const; + int get_matrices(Object *ob, Bone *bone, BCMatrixSampleMap &samples) const; }; class BCAnimationSampler { @@ -168,7 +168,7 @@ class BCAnimationSampler { BCAnimation &animation, float *ref, float *val, std::string data_path, int length); public: - BCAnimationSampler(BCExportSettings &export_settings, BCObjectSet &animated_subset); + BCAnimationSampler(BCExportSettings &export_settings, BCObjectSet &object_set); ~BCAnimationSampler(); void add_object(Object *ob); diff --git a/source/blender/io/collada/BCMath.cpp b/source/blender/io/collada/BCMath.cpp index 9a42d1ba843..85d4c212141 100644 --- a/source/blender/io/collada/BCMath.cpp +++ b/source/blender/io/collada/BCMath.cpp @@ -143,10 +143,10 @@ void BCMatrix::set_transform(Matrix &mat) quat_to_eul(this->rot, this->q); } -void BCMatrix::copy(Matrix &out, Matrix &in) +void BCMatrix::copy(Matrix &r, Matrix &a) { /* destination comes first: */ - memcpy(out, in, sizeof(Matrix)); + memcpy(r, a, sizeof(Matrix)); } void BCMatrix::transpose(Matrix &mat) diff --git a/source/blender/io/collada/BCMath.h b/source/blender/io/collada/BCMath.h index 0b18b86a961..c57d5c6301f 100644 --- a/source/blender/io/collada/BCMath.h +++ b/source/blender/io/collada/BCMath.h @@ -92,7 +92,7 @@ class BCMatrix { void apply_transform(Matrix &to, const Matrix &transform, const Matrix &from, - const bool inverted = false); + const bool inverse = false); void add_inverted_transform(Matrix &to, const Matrix &transform, const Matrix &from); void add_transform(const Matrix &matrix, const bool inverted = false); void add_transform(const BCMatrix &matrix, const bool inverted = false); diff --git a/source/blender/io/collada/CameraExporter.h b/source/blender/io/collada/CameraExporter.h index cc4f7aee165..6835aef8044 100644 --- a/source/blender/io/collada/CameraExporter.h +++ b/source/blender/io/collada/CameraExporter.h @@ -36,6 +36,6 @@ class CamerasExporter : COLLADASW::LibraryCameras { void operator()(Object *ob, Scene *sce); private: - bool exportBlenderProfile(COLLADASW::Camera &cla, Camera *cam); + bool exportBlenderProfile(COLLADASW::Camera &cm, Camera *cam); BCExportSettings &export_settings; }; diff --git a/source/blender/io/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp index 314e4f8116f..6be441a9e27 100644 --- a/source/blender/io/collada/DocumentExporter.cpp +++ b/source/blender/io/collada/DocumentExporter.cpp @@ -144,9 +144,10 @@ char *bc_CustomData_get_active_layer_name(const CustomData *data, int type) return data->layers[layer_index].name; } -DocumentExporter::DocumentExporter(BlenderContext &blender_context, ExportSettings *exportSettings) +DocumentExporter::DocumentExporter(BlenderContext &blender_context, + ExportSettings *export_settings) : blender_context(blender_context), - export_settings(BCExportSettings(exportSettings, blender_context)) + export_settings(BCExportSettings(export_settings, blender_context)) { } diff --git a/source/blender/io/collada/EffectExporter.h b/source/blender/io/collada/EffectExporter.h index c844d93b040..ab875382b27 100644 --- a/source/blender/io/collada/EffectExporter.h +++ b/source/blender/io/collada/EffectExporter.h @@ -65,9 +65,9 @@ class EffectsExporter : COLLADASW::LibraryEffects { void set_specular(COLLADASW::EffectProfile &ep, Material *ma); void set_reflective(COLLADASW::EffectProfile &ep, Material *ma); - void get_images(Material *ma, KeyImageMap &uid_image_map); + void get_images(Material *ma, KeyImageMap &material_image_map); void create_image_samplers(COLLADASW::EffectProfile &ep, - KeyImageMap &uid_image_map, + KeyImageMap &material_image_map, std::string &active_uv); void writeTextures(COLLADASW::EffectProfile &ep, diff --git a/source/blender/io/collada/GeometryExporter.h b/source/blender/io/collada/GeometryExporter.h index d91f3d1ec5a..51879f43272 100644 --- a/source/blender/io/collada/GeometryExporter.h +++ b/source/blender/io/collada/GeometryExporter.h @@ -96,7 +96,7 @@ class GeometryExporter : COLLADASW::LibraryGeometries { void createNormalsSource(std::string geom_id, Mesh *me, std::vector &nor); void create_normals(std::vector &nor, - std::vector &ind, + std::vector &polygons_normals, Mesh *me); std::string getIdBySemantics(std::string geom_id, diff --git a/source/blender/io/collada/ImageExporter.h b/source/blender/io/collada/ImageExporter.h index e1fdcc12272..be10a0a2d58 100644 --- a/source/blender/io/collada/ImageExporter.h +++ b/source/blender/io/collada/ImageExporter.h @@ -44,5 +44,5 @@ class ImagesExporter : COLLADASW::LibraryImages { private: BCExportSettings &export_settings; KeyImageMap &key_image_map; - void export_UV_Image(Image *image, bool use_texture_copies); + void export_UV_Image(Image *image, bool use_copies); }; diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp index a0d0507d472..3d9c4d3ad6f 100644 --- a/source/blender/io/collada/MeshImporter.cpp +++ b/source/blender/io/collada/MeshImporter.cpp @@ -228,16 +228,16 @@ bool MeshImporter::set_poly_indices( return broken_loop; } -void MeshImporter::set_vcol(MLoopCol *mlc, +void MeshImporter::set_vcol(MLoopCol *mloopcol, VCOLDataWrapper &vob, int loop_index, COLLADAFW::IndexList &index_list, int count) { int index; - for (index = 0; index < count; index++, mlc++) { + for (index = 0; index < count; index++, mloopcol++) { int v_index = index_list.getIndex(index + loop_index); - vob.get_vcol(v_index, mlc); + vob.get_vcol(v_index, mloopcol); } } @@ -891,10 +891,10 @@ Object *MeshImporter::get_object_by_geom_uid(const COLLADAFW::UniqueId &geom_uid return NULL; } -Mesh *MeshImporter::get_mesh_by_geom_uid(const COLLADAFW::UniqueId &mesh_uid) +Mesh *MeshImporter::get_mesh_by_geom_uid(const COLLADAFW::UniqueId &geom_uid) { - if (uid_mesh_map.find(mesh_uid) != uid_mesh_map.end()) { - return uid_mesh_map[mesh_uid]; + if (uid_mesh_map.find(geom_uid) != uid_mesh_map.end()) { + return uid_mesh_map[geom_uid]; } return NULL; } diff --git a/source/blender/io/collada/MeshImporter.h b/source/blender/io/collada/MeshImporter.h index a63cb0da987..6f4f62b7f0f 100644 --- a/source/blender/io/collada/MeshImporter.h +++ b/source/blender/io/collada/MeshImporter.h @@ -108,7 +108,7 @@ class MeshImporter : public MeshImporterBase { void set_face_uv(MLoopUV *mloopuv, UVDataWrapper &uvs, - int loop_index, + int start_index, COLLADAFW::IndexList &index_list, int count); diff --git a/source/blender/io/collada/collada_utils.h b/source/blender/io/collada/collada_utils.h index 38050556b47..24ee1054e11 100644 --- a/source/blender/io/collada/collada_utils.h +++ b/source/blender/io/collada/collada_utils.h @@ -199,7 +199,7 @@ extern std::string bc_replace_string(std::string data, extern std::string bc_url_encode(std::string data); extern void bc_match_scale(Object *ob, UnitConverter &bc_unit, bool scale_to_scene); extern void bc_match_scale(std::vector *objects_done, - UnitConverter &unit_converter, + UnitConverter &bc_unit, bool scale_to_scene); extern void bc_decompose(float mat[4][4], float *loc, float eul[3], float quat[4], float *size); @@ -221,7 +221,7 @@ void bc_copy_m4_farray(float r[4][4], float *a); void bc_copy_farray_m4(float *r, float a[4][4]); void bc_copy_darray_m4d(double *r, double a[4][4]); void bc_copy_m4d_v44(double (&r)[4][4], std::vector> &a); -void bc_copy_v44_m4d(std::vector> &a, double (&r)[4][4]); +void bc_copy_v44_m4d(std::vector> &r, double (&a)[4][4]); void bc_sanitize_v3(double v[3], int precision); void bc_sanitize_v3(float v[3], int precision); @@ -237,7 +237,7 @@ extern bool bc_get_property_matrix(Bone *bone, std::string key, float mat[4][4]) extern void bc_enable_fcurves(bAction *act, char *bone_name); extern bool bc_bone_matrix_local_get(Object *ob, Bone *bone, Matrix &mat, bool for_opensim); extern bool bc_is_animated(BCMatrixSampleMap &values); -extern bool bc_has_animations(Scene *sce, LinkNode *node); +extern bool bc_has_animations(Scene *sce, LinkNode *export_set); extern bool bc_has_animations(Object *ob); extern void bc_add_global_transform(Matrix &to_mat, @@ -384,7 +384,7 @@ double bc_get_alpha(Material *ma); double bc_get_ior(Material *ma); double bc_get_shininess(Material *ma); -double bc_get_float_from_shader(bNode *shader, double &ior, std::string nodeid); +double bc_get_float_from_shader(bNode *shader, double &val, std::string nodeid); COLLADASW::ColorOrTexture bc_get_cot_from_shader(bNode *shader, std::string nodeid, Color &default_color, -- cgit v1.2.3