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/collada_utils.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/collada_utils.h')
-rw-r--r-- | source/blender/collada/collada_utils.h | 210 |
1 files changed, 112 insertions, 98 deletions
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index b68da4e8154..61b5e306623 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -28,7 +28,6 @@ #include "COLLADASWEffectProfile.h" #include "COLLADAFWColorOrTexture.h" - #include <vector> #include <map> #include <set> @@ -72,9 +71,9 @@ constexpr int LIMITTED_PRECISION = 6; struct Depsgraph; -typedef std::map<COLLADAFW::UniqueId, Image*> UidImageMap; -typedef std::map<std::string, Image*> KeyImageMap; -typedef std::map<COLLADAFW::TextureMapId, std::vector<MTex *> > TexIndexTextureArrayMap; +typedef std::map<COLLADAFW::UniqueId, Image *> UidImageMap; +typedef std::map<std::string, Image *> KeyImageMap; +typedef std::map<COLLADAFW::TextureMapId, std::vector<MTex *>> TexIndexTextureArrayMap; typedef std::set<Object *> BCObjectSet; extern void bc_update_scene(BlenderContext &blender_context, float ctime); @@ -87,57 +86,64 @@ std::vector<bAction *> bc_getSceneActions(const bContext *C, Object *ob, bool al inline bAction *bc_getSceneObjectAction(Object *ob) { - return (ob->adt && ob->adt->action) ? ob->adt->action : NULL; + return (ob->adt && ob->adt->action) ? ob->adt->action : NULL; } /* Returns Light Action or NULL */ inline bAction *bc_getSceneLightAction(Object *ob) { - if (ob->type != OB_LAMP) - return NULL; + if (ob->type != OB_LAMP) + return NULL; - Light *lamp = (Light *)ob->data; - return (lamp->adt && lamp->adt->action) ? lamp->adt->action : NULL; + Light *lamp = (Light *)ob->data; + return (lamp->adt && lamp->adt->action) ? lamp->adt->action : NULL; } /* Return Camera Action or NULL */ inline bAction *bc_getSceneCameraAction(Object *ob) { - if (ob->type != OB_CAMERA) - return NULL; + if (ob->type != OB_CAMERA) + return NULL; - Camera *camera = (Camera *)ob->data; - return (camera->adt && camera->adt->action) ? camera->adt->action : NULL; + Camera *camera = (Camera *)ob->data; + return (camera->adt && camera->adt->action) ? camera->adt->action : NULL; } /* returns material action or NULL */ inline bAction *bc_getSceneMaterialAction(Material *ma) { - if (ma == NULL) - return NULL; + if (ma == NULL) + return NULL; - return (ma->adt && ma->adt->action) ? ma->adt->action : NULL; + return (ma->adt && ma->adt->action) ? ma->adt->action : NULL; } inline void bc_setSceneObjectAction(bAction *action, Object *ob) { - if (ob->adt) - ob->adt->action = action; + if (ob->adt) + ob->adt->action = action; } -std::string bc_get_action_id(std::string action_name, std::string ob_name, std::string channel_type, std::string axis_name, std::string axis_separator = "_"); - +std::string bc_get_action_id(std::string action_name, + std::string ob_name, + std::string channel_type, + std::string axis_name, + std::string axis_separator = "_"); -extern float bc_get_float_value(const COLLADAFW::FloatOrDoubleArray& array, unsigned int index); +extern float bc_get_float_value(const COLLADAFW::FloatOrDoubleArray &array, unsigned int index); extern int bc_test_parent_loop(Object *par, Object *ob); extern void bc_get_children(std::vector<Object *> &child_set, Object *ob, ViewLayer *view_layer); extern bool bc_validateConstraints(bConstraint *con); extern int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space = true); -extern Object *bc_add_object(Main *bmain, Scene *scene, ViewLayer *view_layer, int type, const char *name); -extern Mesh *bc_get_mesh_copy( - BlenderContext &blender_context, Object *ob, BC_export_mesh_type export_mesh_type, bool apply_modifiers, bool triangulate); +extern Object *bc_add_object( + Main *bmain, Scene *scene, ViewLayer *view_layer, int type, const char *name); +extern Mesh *bc_get_mesh_copy(BlenderContext &blender_context, + Object *ob, + BC_export_mesh_type export_mesh_type, + bool apply_modifiers, + bool triangulate); extern Object *bc_get_assigned_armature(Object *ob); extern Object *bc_get_highest_selected_ancestor_or_self(LinkNode *export_set, Object *ob); @@ -154,56 +160,63 @@ extern char *bc_CustomData_get_active_layer_name(const CustomData *data, int typ extern void bc_bubble_sort_by_Object_name(LinkNode *export_set); extern bool bc_is_root_bone(Bone *aBone, bool deform_bones_only); -extern int bc_get_active_UVLayer(Object *ob); +extern int bc_get_active_UVLayer(Object *ob); std::string bc_find_bonename_in_path(std::string path, std::string probe); -inline std::string bc_string_after(const std::string& s, const char c) +inline std::string bc_string_after(const std::string &s, const char c) { - size_t i = s.rfind(c, s.length()); - if (i != std::string::npos) { - return(s.substr(i + 1, s.length() - i)); - } - return(s); + size_t i = s.rfind(c, s.length()); + if (i != std::string::npos) { + return (s.substr(i + 1, s.length() - i)); + } + return (s); } -inline bool bc_startswith(std::string const & value, std::string const & starting) +inline bool bc_startswith(std::string const &value, std::string const &starting) { - if (starting.size() > value.size()) - return false; - return (value.substr(0, starting.size()) == starting); + if (starting.size() > value.size()) + return false; + return (value.substr(0, starting.size()) == starting); } -#if 0 /* UNUSED */ +#if 0 /* UNUSED */ inline bool bc_endswith(std::string const & value, std::string const & ending) { - if (ending.size() > value.size()) return false; - return std::equal(ending.rbegin(), ending.rend(), value.rbegin()); + if (ending.size() > value.size()) return false; + return std::equal(ending.rbegin(), ending.rend(), value.rbegin()); } #endif -extern std::string bc_replace_string(std::string data, const std::string& pattern, const std::string& replacement); +extern std::string bc_replace_string(std::string data, + const std::string &pattern, + const std::string &replacement); 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<Object *> *objects_done, UnitConverter &unit_converter, bool scale_to_scene); +extern void bc_match_scale(std::vector<Object *> *objects_done, + UnitConverter &unit_converter, + bool scale_to_scene); extern void bc_decompose(float mat[4][4], float *loc, float eul[3], float quat[4], float *size); -extern void bc_rotate_from_reference_quat(float quat_to[4], float quat_from[4], float mat_to[4][4]); +extern void bc_rotate_from_reference_quat(float quat_to[4], + float quat_from[4], + float mat_to[4][4]); extern void bc_triangulate_mesh(Mesh *me); extern bool bc_is_leaf_bone(Bone *bone); -extern EditBone *bc_get_edit_bone(bArmature * armature, char *name); +extern EditBone *bc_get_edit_bone(bArmature *armature, char *name); extern int bc_set_layer(int bitfield, int layer, bool enable); extern int bc_set_layer(int bitfield, int layer); -inline bool bc_in_range(float a, float b, float range) { - return fabsf(a - b) < range; +inline bool bc_in_range(float a, float b, float range) +{ + return fabsf(a - b) < range; } 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<std::vector<double>> &a); -void bc_copy_v44_m4d(std::vector<std::vector<double>> &a, double(&r)[4][4]); +void bc_copy_m4d_v44(double (&r)[4][4], std::vector<std::vector<double>> &a); +void bc_copy_v44_m4d(std::vector<std::vector<double>> &a, double (&r)[4][4]); void bc_sanitize_mat(float mat[4][4], int precision); void bc_sanitize_mat(double mat[4][4], int precision); @@ -224,66 +237,67 @@ extern bool bc_is_animated(BCMatrixSampleMap &values); extern bool bc_has_animations(Scene *sce, LinkNode &node); extern bool bc_has_animations(Object *ob); - -extern void bc_create_restpose_mat(const ExportSettings *export_settings, Bone *bone, float to_mat[4][4], float world[4][4], bool use_local_space); - -class BCPolygonNormalsIndices -{ - std::vector<unsigned int> normal_indices; - - public: - - void add_index(unsigned int index) { - normal_indices.push_back(index); - } - - unsigned int operator[](unsigned int i) { - return normal_indices[i]; - } - +extern void bc_create_restpose_mat(const ExportSettings *export_settings, + Bone *bone, + float to_mat[4][4], + float world[4][4], + bool use_local_space); + +class BCPolygonNormalsIndices { + std::vector<unsigned int> normal_indices; + + public: + void add_index(unsigned int index) + { + normal_indices.push_back(index); + } + + unsigned int operator[](unsigned int i) + { + return normal_indices[i]; + } }; class BoneExtended { -private: - char name[MAXBONENAME]; - int chain_length; - bool is_leaf; - float tail[3]; - float roll; - - int bone_layers; - int use_connect; - bool has_custom_tail; - bool has_custom_roll; + private: + char name[MAXBONENAME]; + int chain_length; + bool is_leaf; + float tail[3]; + float roll; -public: + int bone_layers; + int use_connect; + bool has_custom_tail; + bool has_custom_roll; - BoneExtended(EditBone *aBone); + public: + BoneExtended(EditBone *aBone); - void set_name(char *aName); - char *get_name(); + void set_name(char *aName); + char *get_name(); - void set_chain_length(const int aLength); - int get_chain_length(); + void set_chain_length(const int aLength); + int get_chain_length(); - void set_leaf_bone(bool state); - bool is_leaf_bone(); + void set_leaf_bone(bool state); + bool is_leaf_bone(); - void set_bone_layers(std::string layers, std::vector<std::string> &layer_labels); - int get_bone_layers(); - static std::string get_bone_layers(int bitfield); + void set_bone_layers(std::string layers, std::vector<std::string> &layer_labels); + int get_bone_layers(); + static std::string get_bone_layers(int bitfield); - void set_roll(float roll); - bool has_roll(); - float get_roll(); + void set_roll(float roll); + bool has_roll(); + float get_roll(); - void set_tail(float *vec); - float *get_tail(); - bool has_tail(); + void set_tail(float *vec); + float *get_tail(); + bool has_tail(); - void set_use_connect(int use_connect); - int get_use_connect(); + void set_use_connect(int use_connect); + int get_use_connect(); }; /* a map to store bone extension maps @@ -298,12 +312,12 @@ typedef std::map<std::string, BoneExtended *> BoneExtensionMap; * separate armatures. */ class BoneExtensionManager { -private: - std::map<std::string, BoneExtensionMap *> extended_bone_maps; + private: + std::map<std::string, BoneExtensionMap *> extended_bone_maps; -public: - BoneExtensionMap &getExtensionMap(bArmature *armature); - ~BoneExtensionManager(); + public: + BoneExtensionMap &getExtensionMap(bArmature *armature); + ~BoneExtensionManager(); }; void bc_add_default_shader(bContext *C, Material *ma); |