diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/collada/ArmatureExporter.h | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
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
Diffstat (limited to 'source/blender/collada/ArmatureExporter.h')
-rw-r--r-- | source/blender/collada/ArmatureExporter.h | 77 |
1 files changed, 39 insertions, 38 deletions
diff --git a/source/blender/collada/ArmatureExporter.h b/source/blender/collada/ArmatureExporter.h index 11f853621a0..f0da8680476 100644 --- a/source/blender/collada/ArmatureExporter.h +++ b/source/blender/collada/ArmatureExporter.h @@ -47,54 +47,55 @@ class SceneExporter; // XXX exporter writes wrong data for shared armatures. A separate // controller should be written for each armature-mesh binding how do // we make controller ids then? -class ArmatureExporter : public COLLADASW::LibraryControllers, protected TransformWriter, protected InstanceWriter -{ -public: - - // XXX exporter writes wrong data for shared armatures. A separate - // controller should be written for each armature-mesh binding how do - // we make controller ids then? - ArmatureExporter(BlenderContext &blender_context, COLLADASW::StreamWriter *sw, const ExportSettings *export_settings) : - COLLADASW::LibraryControllers(sw), - blender_context(blender_context), - export_settings(export_settings) - {} - - void add_armature_bones( - Object *ob_arm, - ViewLayer *view_layer, - SceneExporter *se, - std::vector<Object *>& child_objects); - - bool add_instance_controller(Object *ob); - -private: - BlenderContext &blender_context; - const ExportSettings *export_settings; +class ArmatureExporter : public COLLADASW::LibraryControllers, + protected TransformWriter, + protected InstanceWriter { + public: + // XXX exporter writes wrong data for shared armatures. A separate + // controller should be written for each armature-mesh binding how do + // we make controller ids then? + ArmatureExporter(BlenderContext &blender_context, + COLLADASW::StreamWriter *sw, + const ExportSettings *export_settings) + : COLLADASW::LibraryControllers(sw), + blender_context(blender_context), + export_settings(export_settings) + { + } + + void add_armature_bones(Object *ob_arm, + ViewLayer *view_layer, + SceneExporter *se, + std::vector<Object *> &child_objects); + + bool add_instance_controller(Object *ob); + + private: + BlenderContext &blender_context; + const ExportSettings *export_settings; #if 0 - std::vector<Object *> written_armatures; + std::vector<Object *> written_armatures; - bool already_written(Object *ob_arm); + bool already_written(Object *ob_arm); - void wrote(Object *ob_arm); + void wrote(Object *ob_arm); - void find_objects_using_armature(Object *ob_arm, std::vector<Object *>& objects, Scene *sce); + void find_objects_using_armature(Object *ob_arm, std::vector<Object *>& objects, Scene *sce); #endif - // Scene, SceneExporter and the list of child_objects - // are required for writing bone parented objects - void add_bone_node( - Bone *bone, - Object *ob_arm, - SceneExporter *se, - std::vector<Object *>& child_objects); + // Scene, SceneExporter and the list of child_objects + // are required for writing bone parented objects + void add_bone_node(Bone *bone, + Object *ob_arm, + SceneExporter *se, + std::vector<Object *> &child_objects); - void add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW::Node& node); + void add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW::Node &node); - std::string get_controller_id(Object *ob_arm, Object *ob); + std::string get_controller_id(Object *ob_arm, Object *ob); - void write_bone_URLs(COLLADASW::InstanceController &ins, Object *ob_arm, Bone *bone); + void write_bone_URLs(COLLADASW::InstanceController &ins, Object *ob_arm, Bone *bone); }; #endif |