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/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature | |
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/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature')
2 files changed, 73 insertions, 72 deletions
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp index 77c8d48305d..248f1cc0ca1 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp @@ -33,84 +33,85 @@ extern "C" { //------------------------INSTANCE METHODS ---------------------------------- static char CurveNatureF1D___doc__[] = -"Class hierarchy: :class:`freestyle.types.UnaryFunction1D` > :class:`freestyle.types.UnaryFunction1DEdgeNature` > :class:`CurveNatureF1D`\n" -"\n" -".. method:: __init__(integration_type=IntegrationType.MEAN)\n" -"\n" -" Builds a CurveNatureF1D object.\n" -"\n" -" :arg integration_type: The integration method used to compute a single value\n" -" from a set of values.\n" -" :type integration_type: :class:`freestyle.types.IntegrationType`\n" -"\n" -".. method:: __call__(inter)\n" -"\n" -" Returns the nature of the Interface1D (silhouette, ridge, crease, and\n" -" so on). Except if the Interface1D is a\n" -" :class:`freestyle.types.ViewEdge`, this result might be ambiguous.\n" -" Indeed, the Interface1D might result from the gathering of several 1D\n" -" elements, each one being of a different nature. An integration\n" -" method, such as the MEAN, might give, in this case, irrelevant\n" -" results.\n" -"\n" -" :arg inter: An Interface1D object.\n" -" :type inter: :class:`freestyle.types.Interface1D`\n" -" :return: The nature of the Interface1D.\n" -" :rtype: :class:`freestyle.types.Nature`\n"; + "Class hierarchy: :class:`freestyle.types.UnaryFunction1D` > " + ":class:`freestyle.types.UnaryFunction1DEdgeNature` > :class:`CurveNatureF1D`\n" + "\n" + ".. method:: __init__(integration_type=IntegrationType.MEAN)\n" + "\n" + " Builds a CurveNatureF1D object.\n" + "\n" + " :arg integration_type: The integration method used to compute a single value\n" + " from a set of values.\n" + " :type integration_type: :class:`freestyle.types.IntegrationType`\n" + "\n" + ".. method:: __call__(inter)\n" + "\n" + " Returns the nature of the Interface1D (silhouette, ridge, crease, and\n" + " so on). Except if the Interface1D is a\n" + " :class:`freestyle.types.ViewEdge`, this result might be ambiguous.\n" + " Indeed, the Interface1D might result from the gathering of several 1D\n" + " elements, each one being of a different nature. An integration\n" + " method, such as the MEAN, might give, in this case, irrelevant\n" + " results.\n" + "\n" + " :arg inter: An Interface1D object.\n" + " :type inter: :class:`freestyle.types.Interface1D`\n" + " :return: The nature of the Interface1D.\n" + " :rtype: :class:`freestyle.types.Nature`\n"; static int CurveNatureF1D___init__(BPy_CurveNatureF1D *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"integration_type", NULL}; - PyObject *obj = 0; + static const char *kwlist[] = {"integration_type", NULL}; + PyObject *obj = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj)) - return -1; - IntegrationType t = (obj) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN; - self->py_uf1D_edgenature.uf1D_edgenature = new Functions1D::CurveNatureF1D(t); - return 0; + if (!PyArg_ParseTupleAndKeywords( + args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj)) + return -1; + IntegrationType t = (obj) ? IntegrationType_from_BPy_IntegrationType(obj) : MEAN; + self->py_uf1D_edgenature.uf1D_edgenature = new Functions1D::CurveNatureF1D(t); + return 0; } /*-----------------------BPy_CurveNatureF1D type definition ------------------------------*/ PyTypeObject CurveNatureF1D_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "CurveNatureF1D", /* tp_name */ - sizeof(BPy_CurveNatureF1D), /* tp_basicsize */ - 0, /* tp_itemsize */ - 0, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - CurveNatureF1D___doc__, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - &UnaryFunction1DEdgeNature_Type, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)CurveNatureF1D___init__, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ + PyVarObject_HEAD_INIT(NULL, 0) "CurveNatureF1D", /* tp_name */ + sizeof(BPy_CurveNatureF1D), /* tp_basicsize */ + 0, /* tp_itemsize */ + 0, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + CurveNatureF1D___doc__, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + &UnaryFunction1DEdgeNature_Type, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)CurveNatureF1D___init__, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ }; /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h index 211f7148fef..15c381eb279 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h @@ -31,14 +31,14 @@ extern "C" { extern PyTypeObject CurveNatureF1D_Type; -#define BPy_CurveNatureF1D_Check(v) (PyObject_IsInstance((PyObject *)v, (PyObject *)&CurveNatureF1D_Type)) +#define BPy_CurveNatureF1D_Check(v) \ + (PyObject_IsInstance((PyObject *)v, (PyObject *)&CurveNatureF1D_Type)) /*---------------------------Python BPy_CurveNatureF1D structure definition----------*/ typedef struct { - BPy_UnaryFunction1DEdgeNature py_uf1D_edgenature; + BPy_UnaryFunction1DEdgeNature py_uf1D_edgenature; } BPy_CurveNatureF1D; - /////////////////////////////////////////////////////////////////////////////////////////// #ifdef __cplusplus |