diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-02-11 02:51:25 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-11 02:51:25 +0300 |
commit | ffd0fee97c364866d387718a9ee172466054133b (patch) | |
tree | 3a057118eb8fd09e857853ae16277853cecd286a /source/blender/collada | |
parent | 9ca6fc41ae7cc9d8e5ce89b10d1237c035ce5d63 (diff) |
Cleanup: comment indentation & spelling
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/AnimationExporter.cpp | 16 | ||||
-rw-r--r-- | source/blender/collada/BCAnimationCurve.cpp | 6 | ||||
-rw-r--r-- | source/blender/collada/BCAnimationSampler.cpp | 10 | ||||
-rw-r--r-- | source/blender/collada/BCAnimationSampler.h | 44 | ||||
-rw-r--r-- | source/blender/collada/collada_utils.cpp | 17 |
5 files changed, 46 insertions, 47 deletions
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp index f8644f25a64..179671885ad 100644 --- a/source/blender/collada/AnimationExporter.cpp +++ b/source/blender/collada/AnimationExporter.cpp @@ -258,14 +258,14 @@ void AnimationExporter::export_bone_animations_recursive(Object *ob, Bone *bone, export_bone_animations_recursive(ob, child, sampler); } -/* -* In some special cases the exported Curve needs to be replaced -* by a modified curve (for collada purposes) -* This method checks if a conversion is necessary and if applicable -* returns a pointer to the modified BCAnimationCurve. -* IMPORTANT: the modified curve must be deleted by the caller when no longer needed -* if no conversion is needed this method returns a NULL; -*/ +/** + * In some special cases the exported Curve needs to be replaced + * by a modified curve (for collada purposes) + * This method checks if a conversion is necessary and if applicable + * returns a pointer to the modified BCAnimationCurve. + * IMPORTANT: the modified curve must be deleted by the caller when no longer needed + * if no conversion is needed this method returns a NULL; + */ BCAnimationCurve *AnimationExporter::get_modified_export_curve(Object *ob, BCAnimationCurve &curve, BCAnimationCurveMap &curves) { std::string channel_target = curve.get_channel_target(); diff --git a/source/blender/collada/BCAnimationCurve.cpp b/source/blender/collada/BCAnimationCurve.cpp index 144a3290652..180e351d669 100644 --- a/source/blender/collada/BCAnimationCurve.cpp +++ b/source/blender/collada/BCAnimationCurve.cpp @@ -398,9 +398,9 @@ bool BCAnimationCurve::add_value_from_matrix(const BCSample &sample, const int f int array_index = curve_key.get_array_index(); /* transformation curves are feeded directly from the transformation matrix - * to resolve parent inverse matrix issues with object hierarchies. - * Maybe this can be unified with the - */ + * to resolve parent inverse matrix issues with object hierarchies. + * Maybe this can be unified with the + */ const std::string channel_target = get_channel_target(); float val = 0; /* Pick the value from the sample according to the definition of the FCurve */ diff --git a/source/blender/collada/BCAnimationSampler.cpp b/source/blender/collada/BCAnimationSampler.cpp index c22a5d5f175..10a5bb8b031 100644 --- a/source/blender/collada/BCAnimationSampler.cpp +++ b/source/blender/collada/BCAnimationSampler.cpp @@ -394,11 +394,11 @@ void BCAnimationSampler::generate_transforms(Object *ob, Bone *bone, BCAnimation generate_transforms(ob, child, curves); } -/* -* Collect all keyframes from all animation curves related to the object -* The bc_get... functions check for NULL and correct object type -* The add_keyframes_from() function checks for NULL -*/ +/** + * Collect all keyframes from all animation curves related to the object + * The bc_get... functions check for NULL and correct object type + * The add_keyframes_from() function checks for NULL + */ void BCAnimationSampler::initialize_keyframes(BCFrameSet &frameset, Object *ob) { frameset.clear(); diff --git a/source/blender/collada/BCAnimationSampler.h b/source/blender/collada/BCAnimationSampler.h index e00d28755b7..19ccb88fa9e 100644 --- a/source/blender/collada/BCAnimationSampler.h +++ b/source/blender/collada/BCAnimationSampler.h @@ -108,28 +108,28 @@ typedef std::map<int, BCSampleFrame> BCSampleFrameMap; class BCSampleFrameContainer { /* - * The BCSampleFrameContainer stores a map of BCSampleFrame objects - * with the timeline frame as key. - * - * Some details on the purpose: - * An Animation is made of multiple FCurves where each FCurve can - * have multiple keyframes. When we want to export the animation we - * also can decide whether we want to export the keyframes or a set - * of sample frames at equidistant locations (sample period). - * In any case we must resample first need to resample it fully - * to resolve things like: - * - * - animations by constraints - * - animations by drivers - * - * For this purpose we need to step through the entire animation and - * then sample each frame that contains at least one keyFrame or - * sampleFrame. Then for each frame we have to store the transform - * information for all exported objects in a BCSampleframe - * - * The entire set of BCSampleframes is finally collected into - * a BCSampleframneContainer - */ + * The BCSampleFrameContainer stores a map of BCSampleFrame objects + * with the timeline frame as key. + * + * Some details on the purpose: + * An Animation is made of multiple FCurves where each FCurve can + * have multiple keyframes. When we want to export the animation we + * also can decide whether we want to export the keyframes or a set + * of sample frames at equidistant locations (sample period). + * In any case we must resample first need to resample it fully + * to resolve things like: + * + * - animations by constraints + * - animations by drivers + * + * For this purpose we need to step through the entire animation and + * then sample each frame that contains at least one keyFrame or + * sampleFrame. Then for each frame we have to store the transform + * information for all exported objects in a BCSampleframe + * + * The entire set of BCSampleframes is finally collected into + * a BCSampleframneContainer + */ private: BCSampleFrameMap sample_frames; diff --git a/source/blender/collada/collada_utils.cpp b/source/blender/collada/collada_utils.cpp index cf9a800290d..daf001bc810 100644 --- a/source/blender/collada/collada_utils.cpp +++ b/source/blender/collada/collada_utils.cpp @@ -310,12 +310,12 @@ Object *bc_get_assigned_armature(Object *ob) return ob_arm; } -/* -* Returns the highest selected ancestor -* returns NULL if no ancestor is selected -* IMPORTANT: This function expects that all exported objects have set: -* ob->id.tag & LIB_TAG_DOIT -*/ +/** + * Returns the highest selected ancestor + * returns NULL if no ancestor is selected + * IMPORTANT: This function expects that all exported objects have set: + * ob->id.tag & LIB_TAG_DOIT + */ Object *bc_get_highest_selected_ancestor_or_self(LinkNode *export_set, Object *ob) { @@ -969,9 +969,8 @@ bool bc_bone_matrix_local_get(Object *ob, Bone *bone, Matrix &mat, bool for_open copy_m4_m4(mat, pchan->pose_mat); /* OPEN_SIM_COMPATIBILITY - * AFAIK animation to second life is via BVH, but no - * reason to not have the collada-animation be correct - */ + * AFAIK animation to second life is via BVH, but no + * reason to not have the collada-animation be correct */ if (for_opensim) { float temp[4][4]; copy_m4_m4(temp, bone->arm_mat); |