ClangFormat: apply to source, most of intern

Apply clang format as proposed in T53211.

For details on usage and instructions for migrating branches
without conflicts, see:

https://wiki.blender.org/wiki/Tools/ClangFormat

1 files changed, 150 insertions, 146 deletions

diff --git a/source/blender/collada/BCAnimationSampler.h b/source/blender/collada/BCAnimationSampler.h
index 95ec642ef33..6be386682e1 100644
--- a/source/blender/collada/BCAnimationSampler.h
+++ b/source/blender/collada/BCAnimationSampler.h
@@ -30,167 +30,171 @@ extern "C" {
 
 /* Collection of animation curves */
 class BCAnimation {
-private:
-	Object *reference = NULL;
-	bContext *mContext;
-
-
-public:
-	BCFrameSet frame_set;
-	BCAnimationCurveMap curve_map;
-
-	BCAnimation(bContext *C, Object *ob):
-		mContext(C)
-	{
-		Main *bmain = CTX_data_main(mContext);
-		reference = BKE_object_copy(bmain, ob);
-	}
-
-	~BCAnimation()
-	{
-		BCAnimationCurveMap::iterator it;
-		for (it = curve_map.begin(); it != curve_map.end(); ++it) {
-			delete it->second;
-		}
-
-		if (reference && reference->id.us == 0)
-		{
-			Main *bmain = CTX_data_main(mContext);
-			BKE_id_delete(bmain, &reference->id);
-		}
-		curve_map.clear();
-	}
-
-	Object *get_reference()
-	{
-		return reference;
-	}
+ private:
+  Object *reference = NULL;
+  bContext *mContext;
+
+ public:
+  BCFrameSet frame_set;
+  BCAnimationCurveMap curve_map;
+
+  BCAnimation(bContext *C, Object *ob) : mContext(C)
+  {
+    Main *bmain = CTX_data_main(mContext);
+    reference = BKE_object_copy(bmain, ob);
+  }
+
+  ~BCAnimation()
+  {
+    BCAnimationCurveMap::iterator it;
+    for (it = curve_map.begin(); it != curve_map.end(); ++it) {
+      delete it->second;
+    }
+
+    if (reference && reference->id.us == 0) {
+      Main *bmain = CTX_data_main(mContext);
+      BKE_id_delete(bmain, &reference->id);
+    }
+    curve_map.clear();
+  }
+
+  Object *get_reference()
+  {
+    return reference;
+  }
 };
 
 typedef std::map<Object *, BCAnimation *> BCAnimationObjectMap;
 
 class BCSampleFrame {
 
-	/*
-	Each frame on the timeline that needs to be sampled will have
-	one BCSampleFrame where we collect sample information about all objects
-	that need to be sampled for that frame.
-	*/
-
-private:
-	BCSampleMap sampleMap;
-
-public:
-
-	~BCSampleFrame()
-	{
-		BCSampleMap::iterator it;
-		for (it = sampleMap.begin(); it != sampleMap.end(); ++it) {
-			BCSample *sample = it->second;
-			delete sample;
-		}
-		sampleMap.clear();
-	}
-
-	BCSample &add(Object *ob);
-
-	/* Following methods return NULL if object is not in the sampleMap*/
-	const BCSample *get_sample(Object *ob) const;
-	const BCMatrix *get_sample_matrix(Object *ob) const;
-	const BCMatrix *get_sample_matrix(Object *ob, Bone *bone) const;
-
-	const bool has_sample_for(Object *ob) const;
-	const bool has_sample_for(Object *ob, Bone *bone) const;
+  /*
+  Each frame on the timeline that needs to be sampled will have
+  one BCSampleFrame where we collect sample information about all objects
+  that need to be sampled for that frame.
+  */
+
+ private:
+  BCSampleMap sampleMap;
+
+ public:
+  ~BCSampleFrame()
+  {
+    BCSampleMap::iterator it;
+    for (it = sampleMap.begin(); it != sampleMap.end(); ++it) {
+      BCSample *sample = it->second;
+      delete sample;
+    }
+    sampleMap.clear();
+  }
+
+  BCSample &add(Object *ob);
+
+  /* Following methods return NULL if object is not in the sampleMap*/
+  const BCSample *get_sample(Object *ob) const;
+  const BCMatrix *get_sample_matrix(Object *ob) const;
+  const BCMatrix *get_sample_matrix(Object *ob, Bone *bone) const;
+
+  const bool has_sample_for(Object *ob) const;
+  const bool has_sample_for(Object *ob, Bone *bone) const;
 };
 
 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
-	 */
-
-private:
-	BCSampleFrameMap sample_frames;
-
-public:
-
-	~BCSampleFrameContainer()
-	{
-	}
-
-	BCSample &add(Object *ob, int frame_index);
-	BCSampleFrame *get_frame(int frame_index); // returns NULL if frame does not exist
-
-	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_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;
+  /*
+   * 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;
+
+ public:
+  ~BCSampleFrameContainer()
+  {
+  }
+
+  BCSample &add(Object *ob, int frame_index);
+  BCSampleFrame *get_frame(int frame_index);  // returns NULL if frame does not exist
+
+  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_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;
 };
 
 class BCAnimationSampler {
-private:
-	BlenderContext &blender_context;
-	BCSampleFrameContainer sample_data;
-	BCAnimationObjectMap objects;
-
-	void generate_transform(Object *ob, const BCCurveKey &key, BCAnimationCurveMap &curves);
-	void generate_transforms(Object *ob, const std::string prep, const BC_animation_type type, BCAnimationCurveMap &curves);
-	void generate_transforms(Object *ob, Bone *bone, BCAnimationCurveMap &curves);
-
-	void initialize_curves(BCAnimationCurveMap &curves, Object *ob);
-	void initialize_keyframes(BCFrameSet &frameset, Object *ob);
-	BCSample &sample_object(Object *ob, int frame_index, bool for_opensim);
-	void update_animation_curves(BCAnimation &animation, BCSample &sample, Object *ob, int frame_index);
-	void check_property_is_animated(BCAnimation &animation, float *ref, float *val, std::string data_path, int length);
-
-public:
-	BCAnimationSampler(BlenderContext &blender_context, BCObjectSet &animated_subset);
-	~BCAnimationSampler();
-
-	void add_object(Object *ob);
-
-	void sample_scene(
-	        int sampling_rate,
-	        int keyframe_at_end,
-	        bool for_opensim,
-	        bool keep_keyframes,
-	        BC_export_animation_type export_animation_type);
-
-	BCAnimationCurveMap *get_curves(Object *ob);
-	void get_object_frames(BCFrames &frames, Object *ob);
-	bool get_object_samples(BCMatrixSampleMap &samples, Object *ob);
-	void get_bone_frames(BCFrames &frames, Object *ob, Bone *bone);
-	bool get_bone_samples(BCMatrixSampleMap &samples, Object *ob, Bone *bone);
-
-	static void get_animated_from_export_set(std::set<Object *> &animated_objects, LinkNode &export_set);
-	static void find_depending_animated(std::set<Object *> &animated_objects, std::set<Object *> &candidates);
-	static bool is_animated_by_constraint(Object *ob, ListBase *conlist, std::set<Object *> &animated_objects);
-
+ private:
+  BlenderContext &blender_context;
+  BCSampleFrameContainer sample_data;
+  BCAnimationObjectMap objects;
+
+  void generate_transform(Object *ob, const BCCurveKey &key, BCAnimationCurveMap &curves);
+  void generate_transforms(Object *ob,
+                           const std::string prep,
+                           const BC_animation_type type,
+                           BCAnimationCurveMap &curves);
+  void generate_transforms(Object *ob, Bone *bone, BCAnimationCurveMap &curves);
+
+  void initialize_curves(BCAnimationCurveMap &curves, Object *ob);
+  void initialize_keyframes(BCFrameSet &frameset, Object *ob);
+  BCSample &sample_object(Object *ob, int frame_index, bool for_opensim);
+  void update_animation_curves(BCAnimation &animation,
+                               BCSample &sample,
+                               Object *ob,
+                               int frame_index);
+  void check_property_is_animated(
+      BCAnimation &animation, float *ref, float *val, std::string data_path, int length);
+
+ public:
+  BCAnimationSampler(BlenderContext &blender_context, BCObjectSet &animated_subset);
+  ~BCAnimationSampler();
+
+  void add_object(Object *ob);
+
+  void sample_scene(int sampling_rate,
+                    int keyframe_at_end,
+                    bool for_opensim,
+                    bool keep_keyframes,
+                    BC_export_animation_type export_animation_type);
+
+  BCAnimationCurveMap *get_curves(Object *ob);
+  void get_object_frames(BCFrames &frames, Object *ob);
+  bool get_object_samples(BCMatrixSampleMap &samples, Object *ob);
+  void get_bone_frames(BCFrames &frames, Object *ob, Bone *bone);
+  bool get_bone_samples(BCMatrixSampleMap &samples, Object *ob, Bone *bone);
+
+  static void get_animated_from_export_set(std::set<Object *> &animated_objects,
+                                           LinkNode &export_set);
+  static void find_depending_animated(std::set<Object *> &animated_objects,
+                                      std::set<Object *> &candidates);
+  static bool is_animated_by_constraint(Object *ob,
+                                        ListBase *conlist,
+                                        std::set<Object *> &animated_objects);
 };
 
 #endif