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/python/mathutils/mathutils.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/python/mathutils/mathutils.h')
-rw-r--r-- | source/blender/python/mathutils/mathutils.h | 121 |
1 files changed, 69 insertions, 52 deletions
diff --git a/source/blender/python/mathutils/mathutils.h b/source/blender/python/mathutils/mathutils.h index bc5490a3acd..4ec2c869499 100644 --- a/source/blender/python/mathutils/mathutils.h +++ b/source/blender/python/mathutils/mathutils.h @@ -32,37 +32,39 @@ extern char BaseMathObject_is_frozen_doc[]; extern char BaseMathObject_owner_doc[]; #define BASE_MATH_NEW(struct_name, root_type, base_type) \ - (struct_name *)((base_type ? (base_type)->tp_alloc(base_type, 0) : _PyObject_GC_New(&(root_type)))); - + (struct_name *)((base_type ? (base_type)->tp_alloc(base_type, 0) : \ + _PyObject_GC_New(&(root_type)))); /** BaseMathObject.flag */ enum { - /** - * Do not own the memory used in this vector, - * \note This is error prone if the memory may be freed while this vector is in use. - * Prefer using callbacks where possible, see: #Mathutils_RegisterCallback - */ - BASE_MATH_FLAG_IS_WRAP = (1 << 0), - /** - * Prevent changes to the vector so it can be used as a set or dictionary key for example. - * (typical use cases for tuple). - */ - BASE_MATH_FLAG_IS_FROZEN = (1 << 1), + /** + * Do not own the memory used in this vector, + * \note This is error prone if the memory may be freed while this vector is in use. + * Prefer using callbacks where possible, see: #Mathutils_RegisterCallback + */ + BASE_MATH_FLAG_IS_WRAP = (1 << 0), + /** + * Prevent changes to the vector so it can be used as a set or dictionary key for example. + * (typical use cases for tuple). + */ + BASE_MATH_FLAG_IS_FROZEN = (1 << 1), }; #define BASE_MATH_FLAG_DEFAULT 0 -#define BASE_MATH_MEMBERS(_data) \ - PyObject_VAR_HEAD \ - float *_data; /* array of data (alias), wrapped status depends on wrapped status */ \ - PyObject *cb_user; /* if this vector references another object, otherwise NULL, \ - * *Note* this owns its reference */ \ - unsigned char cb_type; /* which user funcs do we adhere to, RNA, etc */ \ - unsigned char cb_subtype; /* subtype: location, rotation... \ - * to avoid defining many new functions for every attribute of the same type */ \ - unsigned char flag /* wrapped data type? */ \ +#define BASE_MATH_MEMBERS(_data) \ + PyObject_VAR_HEAD float \ + *_data; /* array of data (alias), wrapped status depends on wrapped status */ \ + PyObject * \ + cb_user; /* if this vector references another object, otherwise NULL, \ + * *Note* this owns its reference */ \ + unsigned char cb_type; /* which user funcs do we adhere to, RNA, etc */ \ + unsigned char \ + cb_subtype; /* subtype: location, rotation... \ + * to avoid defining many new functions for every attribute of the same type */ \ + unsigned char flag /* wrapped data type? */ typedef struct { - BASE_MATH_MEMBERS(data); + BASE_MATH_MEMBERS(data); } BaseMathObject; /* types */ @@ -73,8 +75,7 @@ typedef struct { #include "mathutils_Color.h" /* avoid checking all types */ -#define BaseMathObject_CheckExact(v) \ - (Py_TYPE(v)->tp_dealloc == (destructor)BaseMathObject_dealloc) +#define BaseMathObject_CheckExact(v) (Py_TYPE(v)->tp_dealloc == (destructor)BaseMathObject_dealloc) PyObject *BaseMathObject_owner_get(BaseMathObject *self, void *); PyObject *BaseMathObject_is_wrapped_get(BaseMathObject *self, void *); @@ -94,18 +95,23 @@ int EXPP_VectorsAreEqual(const float *vecA, const float *vecB, int size, int flo typedef struct Mathutils_Callback Mathutils_Callback; -typedef int (*BaseMathCheckFunc)(BaseMathObject *); /* checks the user is still valid */ -typedef int (*BaseMathGetFunc)(BaseMathObject *, int); /* gets the vector from the user */ -typedef int (*BaseMathSetFunc)(BaseMathObject *, int); /* sets the users vector values once its modified */ -typedef int (*BaseMathGetIndexFunc)(BaseMathObject *, int, int); /* same as above but only for an index */ -typedef int (*BaseMathSetIndexFunc)(BaseMathObject *, int, int); /* same as above but only for an index */ +typedef int (*BaseMathCheckFunc)(BaseMathObject *); /* checks the user is still valid */ +typedef int (*BaseMathGetFunc)(BaseMathObject *, int); /* gets the vector from the user */ +typedef int (*BaseMathSetFunc)(BaseMathObject *, + int); /* sets the users vector values once its modified */ +typedef int (*BaseMathGetIndexFunc)(BaseMathObject *, + int, + int); /* same as above but only for an index */ +typedef int (*BaseMathSetIndexFunc)(BaseMathObject *, + int, + int); /* same as above but only for an index */ struct Mathutils_Callback { - BaseMathCheckFunc check; - BaseMathGetFunc get; - BaseMathSetFunc set; - BaseMathGetIndexFunc get_index; - BaseMathSetIndexFunc set_index; + BaseMathCheckFunc check; + BaseMathGetFunc get; + BaseMathSetFunc set; + BaseMathGetIndexFunc get_index; + BaseMathSetIndexFunc set_index; }; unsigned char Mathutils_RegisterCallback(Mathutils_Callback *cb); @@ -120,44 +126,55 @@ void _BaseMathObject_RaiseNotFrozenExc(const BaseMathObject *self); /* since this is called so often avoid where possible */ #define BaseMath_ReadCallback(_self) \ - (((_self)->cb_user ? _BaseMathObject_ReadCallback((BaseMathObject *)_self) : 0)) + (((_self)->cb_user ? _BaseMathObject_ReadCallback((BaseMathObject *)_self) : 0)) #define BaseMath_WriteCallback(_self) \ - (((_self)->cb_user ?_BaseMathObject_WriteCallback((BaseMathObject *)_self) : 0)) + (((_self)->cb_user ? _BaseMathObject_WriteCallback((BaseMathObject *)_self) : 0)) #define BaseMath_ReadIndexCallback(_self, _index) \ - (((_self)->cb_user ? _BaseMathObject_ReadIndexCallback((BaseMathObject *)_self, _index) : 0)) + (((_self)->cb_user ? _BaseMathObject_ReadIndexCallback((BaseMathObject *)_self, _index) : 0)) #define BaseMath_WriteIndexCallback(_self, _index) \ - (((_self)->cb_user ? _BaseMathObject_WriteIndexCallback((BaseMathObject *)_self, _index) : 0)) + (((_self)->cb_user ? _BaseMathObject_WriteIndexCallback((BaseMathObject *)_self, _index) : 0)) /* support BASE_MATH_FLAG_IS_FROZEN */ #define BaseMath_ReadCallback_ForWrite(_self) \ - (UNLIKELY((_self)->flag & BASE_MATH_FLAG_IS_FROZEN) ? \ - (_BaseMathObject_RaiseFrozenExc((BaseMathObject *)_self), -1) : (BaseMath_ReadCallback(_self))) + (UNLIKELY((_self)->flag & BASE_MATH_FLAG_IS_FROZEN) ? \ + (_BaseMathObject_RaiseFrozenExc((BaseMathObject *)_self), -1) : \ + (BaseMath_ReadCallback(_self))) #define BaseMath_ReadIndexCallback_ForWrite(_self, _index) \ - (UNLIKELY((_self)->flag & BASE_MATH_FLAG_IS_FROZEN) ? \ - (_BaseMathObject_RaiseFrozenExc((BaseMathObject *)_self), -1) : (BaseMath_ReadIndexCallback(_self, _index))) + (UNLIKELY((_self)->flag & BASE_MATH_FLAG_IS_FROZEN) ? \ + (_BaseMathObject_RaiseFrozenExc((BaseMathObject *)_self), -1) : \ + (BaseMath_ReadIndexCallback(_self, _index))) #define BaseMath_Prepare_ForWrite(_self) \ - (UNLIKELY((_self)->flag & BASE_MATH_FLAG_IS_FROZEN) ? \ - (_BaseMathObject_RaiseFrozenExc((BaseMathObject *)_self), -1) : 0) + (UNLIKELY((_self)->flag & BASE_MATH_FLAG_IS_FROZEN) ? \ + (_BaseMathObject_RaiseFrozenExc((BaseMathObject *)_self), -1) : \ + 0) #define BaseMathObject_Prepare_ForHash(_self) \ - (UNLIKELY(((_self)->flag & BASE_MATH_FLAG_IS_FROZEN) == 0) ? \ - (_BaseMathObject_RaiseNotFrozenExc((BaseMathObject *)_self), -1) : 0) + (UNLIKELY(((_self)->flag & BASE_MATH_FLAG_IS_FROZEN) == 0) ? \ + (_BaseMathObject_RaiseNotFrozenExc((BaseMathObject *)_self), -1) : \ + 0) /* utility func */ -int mathutils_array_parse(float *array, int array_min, int array_max, PyObject *value, const char *error_prefix); -int mathutils_array_parse_alloc(float **array, int array_min, PyObject *value, const char *error_prefix); -int mathutils_array_parse_alloc_v(float **array, int array_dim, PyObject *value, const char *error_prefix); +int mathutils_array_parse( + float *array, int array_min, int array_max, PyObject *value, const char *error_prefix); +int mathutils_array_parse_alloc(float **array, + int array_min, + PyObject *value, + const char *error_prefix); +int mathutils_array_parse_alloc_v(float **array, + int array_dim, + PyObject *value, + const char *error_prefix); int mathutils_any_to_rotmat(float rmat[3][3], PyObject *value, const char *error_prefix); Py_hash_t mathutils_array_hash(const float *float_array, size_t array_len); /* zero remaining unused elements of the array */ -#define MU_ARRAY_ZERO (1u << 30) +#define MU_ARRAY_ZERO (1u << 30) /* ignore larger py sequences than requested (just use first elements), * handy when using 3d vectors as 2d */ -#define MU_ARRAY_SPILL (1u << 31) +#define MU_ARRAY_SPILL (1u << 31) #define MU_ARRAY_FLAGS (MU_ARRAY_ZERO | MU_ARRAY_SPILL) |