[Bf-blender-cvs] [3e0f68eb76f] collada: cleanup Collada: renamed method, removed not needed method

[Gaia Clary]

Commit: 3e0f68eb76fd27064fa01cf2e668382f618389c6
Author: Gaia Clary
Date:   Wed Mar 28 19:24:35 2018 +0200
Branches: collada
https://developer.blender.org/rB3e0f68eb76fd27064fa01cf2e668382f618389c6

cleanup Collada: renamed method, removed not needed method

* renamed get_matrices() to get_samples()
  Because the returned list no longer contains a set of matrices

* removed is_flat() test method on BCSamples becasue it actually makes
  no sense here.

===================================================================

M	source/blender/collada/AnimationExporter.cpp
M	source/blender/collada/BCAnimationCurveContainer.cpp
M	source/blender/collada/BCAnimationCurveContainer.h

===================================================================

diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index ad3b572ffb5..f80b3c3b823 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -227,10 +227,7 @@ void AnimationExporter::export_curve_animation_set(Object *ob, BCAnimationSample
 	BCAnimationCurveMap curves;
 
 	sampler.get_curves(curves, ob);
-	bool is_flat = sampler.get_samples(samples, ob);
-
-	if (is_flat)
-		return;
+	sampler.get_samples(samples, ob);
 
 	BCAnimationCurveMap::iterator it;
 	for (it = curves.begin(); it != curves.end(); ++it) {
diff --git a/source/blender/collada/BCAnimationCurveContainer.cpp b/source/blender/collada/BCAnimationCurveContainer.cpp
index 876496ea85d..64e6fd35e9a 100644
--- a/source/blender/collada/BCAnimationCurveContainer.cpp
+++ b/source/blender/collada/BCAnimationCurveContainer.cpp
@@ -348,29 +348,6 @@ void BCAnimationSampler::get_keyframes(Object *ob, BCFrameSet &frameset)
 	}
 }
 
-bool BCAnimationSampler::is_flat_line(BCFrameSampleMap &values) const
-{
-	static float MIN_DISTANCE = 0.00001;
-
-	if (values.size() < 2)
-		return true; // need at least 2 entries to be not flat
-
-	BCFrameSampleMap::iterator it;
-	const BCSample *refmat = nullptr;
-	for (it = values.begin(); it != values.end(); ++it) {
-		const BCSample *matrix = it->second;
-
-		if (refmat == nullptr) {
-			refmat = matrix;
-			continue;
-		}
-
-		if (!matrix->in_range(*refmat, MIN_DISTANCE))
-			return false;
-	}
-	return true;
-}
-
 bool BCAnimationSampler::is_flat_line(BCMatrixSampleMap &values) const
 {
 	static float MIN_DISTANCE = 0.00001;
@@ -420,10 +397,9 @@ bool BCAnimationSampler::get_samples(BCMatrixSampleMap &samples, Object *ob, Bon
 	return is_flat_line(samples);
 }
 
-bool BCAnimationSampler::get_samples(BCFrameSampleMap &samples, Object *ob)
+void BCAnimationSampler::get_samples(BCFrameSampleMap &samples, Object *ob)
 {
-	sample_data.get_matrices(ob, samples);
-	return is_flat_line(samples);
+	sample_data.get_samples(ob, samples);
 }
 
 bool BCAnimationSampler::get_samples(BCMatrixSampleMap &samples, Object *ob)
@@ -771,7 +747,7 @@ const int BCSampleFrames::get_frames(Object *ob, Bone *bone, BCFrames &frames) c
 	return frames.size();
 }
 
-const int BCSampleFrames::get_matrices(Object *ob, BCFrameSampleMap &samples) const
+const int BCSampleFrames::get_samples(Object *ob, BCFrameSampleMap &samples) const
 {
 	samples.clear(); // safety;
 	BCSampleFrameMap::const_iterator it;
diff --git a/source/blender/collada/BCAnimationCurveContainer.h b/source/blender/collada/BCAnimationCurveContainer.h
index a9d7a847819..942f17ae8fc 100644
--- a/source/blender/collada/BCAnimationCurveContainer.h
+++ b/source/blender/collada/BCAnimationCurveContainer.h
@@ -31,6 +31,7 @@
 
 extern "C" {
 #include "BKE_action.h"
+#include "BLI_math_rotation.h"
 #include "DNA_action_types.h"
 }
 
@@ -160,7 +161,7 @@ public:
 	const int get_frames(std::vector<int> &frames) const;
 	const int get_frames(Object *ob, BCFrames &frames) const;
 	const int get_frames(Object *ob, Bone *bone, BCFrames &frames) const;
-	const int get_matrices(Object *ob, BCFrameSampleMap &matrices) const;
+	const int get_samples(Object *ob, BCFrameSampleMap &samples) const;
 	const int get_matrices(Object *ob, BCMatrixSampleMap &matrices) const;
 	const int get_matrices(Object *ob, Bone *bone, BCMatrixSampleMap &bones) const;
 };
@@ -209,7 +210,6 @@ public:
 		bool keep_keyframes,
 		BC_export_animation_type export_animation_type);
 
-	bool is_flat_line(BCFrameSampleMap &values) const;
 	bool is_flat_line(BCMatrixSampleMap &values) const;
 	bool is_flat_line(std::vector<float> &values) const;
 
@@ -221,8 +221,8 @@ public:
 	void get_frame_set(BCFrames &frames, Object *ob, Bone *bone);
 	void get_frame_set(BCFrames &frames, Object *ob, const BCAnimationCurve &curve);
 	bool get_samples(BCMatrixSampleMap &samples, Object *ob, Bone *bone);
-	bool get_samples(BCFrameSampleMap &samples, Object *ob);
 	bool get_samples(BCMatrixSampleMap &samples, Object *ob);
+	void get_samples(BCFrameSampleMap &samples, Object *ob);
 
 
 	static void get_keyframes(Object *ob, BCFrameSet &frameset);