From e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 17 Apr 2019 06:17:24 +0200 Subject: 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 --- .../BPy_UnaryFunction1DVectorViewShape.cpp | 288 +++++++++++---------- 1 file changed, 150 insertions(+), 138 deletions(-) (limited to 'source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp') diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp index 1be830c2e89..f7a80a270b6 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp @@ -38,186 +38,198 @@ extern "C" { int UnaryFunction1DVectorViewShape_Init(PyObject *module) { - if (module == NULL) - return -1; - - if (PyType_Ready(&UnaryFunction1DVectorViewShape_Type) < 0) - return -1; - Py_INCREF(&UnaryFunction1DVectorViewShape_Type); - PyModule_AddObject(module, "UnaryFunction1DVectorViewShape", (PyObject *)&UnaryFunction1DVectorViewShape_Type); - - if (PyType_Ready(&GetOccludeeF1D_Type) < 0) - return -1; - Py_INCREF(&GetOccludeeF1D_Type); - PyModule_AddObject(module, "GetOccludeeF1D", (PyObject *)&GetOccludeeF1D_Type); - - if (PyType_Ready(&GetOccludersF1D_Type) < 0) - return -1; - Py_INCREF(&GetOccludersF1D_Type); - PyModule_AddObject(module, "GetOccludersF1D", (PyObject *)&GetOccludersF1D_Type); - - if (PyType_Ready(&GetShapeF1D_Type) < 0) - return -1; - Py_INCREF(&GetShapeF1D_Type); - PyModule_AddObject(module, "GetShapeF1D", (PyObject *)&GetShapeF1D_Type); - - return 0; + if (module == NULL) + return -1; + + if (PyType_Ready(&UnaryFunction1DVectorViewShape_Type) < 0) + return -1; + Py_INCREF(&UnaryFunction1DVectorViewShape_Type); + PyModule_AddObject( + module, "UnaryFunction1DVectorViewShape", (PyObject *)&UnaryFunction1DVectorViewShape_Type); + + if (PyType_Ready(&GetOccludeeF1D_Type) < 0) + return -1; + Py_INCREF(&GetOccludeeF1D_Type); + PyModule_AddObject(module, "GetOccludeeF1D", (PyObject *)&GetOccludeeF1D_Type); + + if (PyType_Ready(&GetOccludersF1D_Type) < 0) + return -1; + Py_INCREF(&GetOccludersF1D_Type); + PyModule_AddObject(module, "GetOccludersF1D", (PyObject *)&GetOccludersF1D_Type); + + if (PyType_Ready(&GetShapeF1D_Type) < 0) + return -1; + Py_INCREF(&GetShapeF1D_Type); + PyModule_AddObject(module, "GetShapeF1D", (PyObject *)&GetShapeF1D_Type); + + return 0; } //------------------------INSTANCE METHODS ---------------------------------- static char UnaryFunction1DVectorViewShape___doc__[] = -"Class hierarchy: :class:`UnaryFunction1D` > :class:`UnaryFunction1DVectorViewShape`\n" -"\n" -"Base class for unary functions (functors) that work on\n" -":class:`Interface1D` and return a list of :class:`ViewShape`\n" -"objects.\n" -"\n" -".. method:: __init__()\n" -"\n" -" Default constructor.\n" -"\n" -".. method:: __init__(integration_type)\n" -"\n" -" Builds a unary 1D function using the integration method given as\n" -" argument.\n" -"\n" -" :arg integration_type: An integration method.\n" -" :type integration_type: :class:`IntegrationType`\n"; + "Class hierarchy: :class:`UnaryFunction1D` > :class:`UnaryFunction1DVectorViewShape`\n" + "\n" + "Base class for unary functions (functors) that work on\n" + ":class:`Interface1D` and return a list of :class:`ViewShape`\n" + "objects.\n" + "\n" + ".. method:: __init__()\n" + "\n" + " Default constructor.\n" + "\n" + ".. method:: __init__(integration_type)\n" + "\n" + " Builds a unary 1D function using the integration method given as\n" + " argument.\n" + "\n" + " :arg integration_type: An integration method.\n" + " :type integration_type: :class:`IntegrationType`\n"; static int UnaryFunction1DVectorViewShape___init__(BPy_UnaryFunction1DVectorViewShape *self, - PyObject *args, PyObject *kwds) + PyObject *args, + PyObject *kwds) { - static const char *kwlist[] = {"integration", NULL}; - PyObject *obj = 0; + static const char *kwlist[] = {"integration", NULL}; + PyObject *obj = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj)) - return -1; + if (!PyArg_ParseTupleAndKeywords( + args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj)) + return -1; - if (!obj) { - self->uf1D_vectorviewshape = new UnaryFunction1D< std::vector >(); - } - else { - self->uf1D_vectorviewshape = new UnaryFunction1D< std::vector >(IntegrationType_from_BPy_IntegrationType(obj)); - } + if (!obj) { + self->uf1D_vectorviewshape = new UnaryFunction1D>(); + } + else { + self->uf1D_vectorviewshape = new UnaryFunction1D>( + IntegrationType_from_BPy_IntegrationType(obj)); + } - self->uf1D_vectorviewshape->py_uf1D = (PyObject *)self; + self->uf1D_vectorviewshape->py_uf1D = (PyObject *)self; - return 0; + return 0; } static void UnaryFunction1DVectorViewShape___dealloc__(BPy_UnaryFunction1DVectorViewShape *self) { - if (self->uf1D_vectorviewshape) - delete self->uf1D_vectorviewshape; - UnaryFunction1D_Type.tp_dealloc((PyObject *)self); + if (self->uf1D_vectorviewshape) + delete self->uf1D_vectorviewshape; + UnaryFunction1D_Type.tp_dealloc((PyObject *)self); } static PyObject *UnaryFunction1DVectorViewShape___repr__(BPy_UnaryFunction1DVectorViewShape *self) { - return PyUnicode_FromFormat("type: %s - address: %p", Py_TYPE(self)->tp_name, self->uf1D_vectorviewshape); + return PyUnicode_FromFormat( + "type: %s - address: %p", Py_TYPE(self)->tp_name, self->uf1D_vectorviewshape); } static PyObject *UnaryFunction1DVectorViewShape___call__(BPy_UnaryFunction1DVectorViewShape *self, - PyObject *args, PyObject *kwds) + PyObject *args, + PyObject *kwds) { - static const char *kwlist[] = {"inter", NULL}; - PyObject *obj = 0; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &Interface1D_Type, &obj)) - return NULL; - - if (typeid(*(self->uf1D_vectorviewshape)) == typeid(UnaryFunction1D< std::vector >)) { - PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden"); - return NULL; - } - if (self->uf1D_vectorviewshape->operator()(*(((BPy_Interface1D *) obj)->if1D)) < 0) { - if (!PyErr_Occurred()) { - string class_name(Py_TYPE(self)->tp_name); - PyErr_SetString(PyExc_RuntimeError, (class_name + " __call__ method failed").c_str()); - } - return NULL; - } - - const unsigned int list_len = self->uf1D_vectorviewshape->result.size(); - PyObject *list = PyList_New(list_len); - for (unsigned int i = 0; i < list_len; i++) { - ViewShape *v = self->uf1D_vectorviewshape->result[i]; - PyList_SET_ITEM(list, i, v ? BPy_ViewShape_from_ViewShape(*v) : (Py_INCREF(Py_None), Py_None)); - } - - return list; + static const char *kwlist[] = {"inter", NULL}; + PyObject *obj = 0; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &Interface1D_Type, &obj)) + return NULL; + + if (typeid(*(self->uf1D_vectorviewshape)) == typeid(UnaryFunction1D>)) { + PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden"); + return NULL; + } + if (self->uf1D_vectorviewshape->operator()(*(((BPy_Interface1D *)obj)->if1D)) < 0) { + if (!PyErr_Occurred()) { + string class_name(Py_TYPE(self)->tp_name); + PyErr_SetString(PyExc_RuntimeError, (class_name + " __call__ method failed").c_str()); + } + return NULL; + } + + const unsigned int list_len = self->uf1D_vectorviewshape->result.size(); + PyObject *list = PyList_New(list_len); + for (unsigned int i = 0; i < list_len; i++) { + ViewShape *v = self->uf1D_vectorviewshape->result[i]; + PyList_SET_ITEM(list, i, v ? BPy_ViewShape_from_ViewShape(*v) : (Py_INCREF(Py_None), Py_None)); + } + + return list; } /*----------------------UnaryFunction1DVectorViewShape get/setters ----------------------------*/ PyDoc_STRVAR(integration_type_doc, -"The integration method.\n" -"\n" -":type: :class:`IntegrationType`"); + "The integration method.\n" + "\n" + ":type: :class:`IntegrationType`"); -static PyObject *integration_type_get(BPy_UnaryFunction1DVectorViewShape *self, void *UNUSED(closure)) +static PyObject *integration_type_get(BPy_UnaryFunction1DVectorViewShape *self, + void *UNUSED(closure)) { - return BPy_IntegrationType_from_IntegrationType(self->uf1D_vectorviewshape->getIntegrationType()); + return BPy_IntegrationType_from_IntegrationType( + self->uf1D_vectorviewshape->getIntegrationType()); } -static int integration_type_set(BPy_UnaryFunction1DVectorViewShape *self, PyObject *value, void *UNUSED(closure)) +static int integration_type_set(BPy_UnaryFunction1DVectorViewShape *self, + PyObject *value, + void *UNUSED(closure)) { - if (!BPy_IntegrationType_Check(value)) { - PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType"); - return -1; - } - self->uf1D_vectorviewshape->setIntegrationType(IntegrationType_from_BPy_IntegrationType(value)); - return 0; + if (!BPy_IntegrationType_Check(value)) { + PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType"); + return -1; + } + self->uf1D_vectorviewshape->setIntegrationType(IntegrationType_from_BPy_IntegrationType(value)); + return 0; } static PyGetSetDef BPy_UnaryFunction1DVectorViewShape_getseters[] = { - {(char *)"integration_type", (getter)integration_type_get, (setter)integration_type_set, - (char *)integration_type_doc, NULL}, - {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ + {(char *)"integration_type", + (getter)integration_type_get, + (setter)integration_type_set, + (char *)integration_type_doc, + NULL}, + {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; /*-----------------------BPy_UnaryFunction1DVectorViewShape type definition ------------------------------*/ PyTypeObject UnaryFunction1DVectorViewShape_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "UnaryFunction1DVectorViewShape", /* tp_name */ - sizeof(BPy_UnaryFunction1DVectorViewShape), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)UnaryFunction1DVectorViewShape___dealloc__, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - (reprfunc)UnaryFunction1DVectorViewShape___repr__, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - (ternaryfunc)UnaryFunction1DVectorViewShape___call__, /* tp_call */ - 0, /* tp_str */ - 0, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ - UnaryFunction1DVectorViewShape___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 */ - BPy_UnaryFunction1DVectorViewShape_getseters, /* tp_getset */ - &UnaryFunction1D_Type, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)UnaryFunction1DVectorViewShape___init__, /* tp_init */ - 0, /* tp_alloc */ - 0, /* tp_new */ + PyVarObject_HEAD_INIT(NULL, 0) "UnaryFunction1DVectorViewShape", /* tp_name */ + sizeof(BPy_UnaryFunction1DVectorViewShape), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor)UnaryFunction1DVectorViewShape___dealloc__, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + (reprfunc)UnaryFunction1DVectorViewShape___repr__, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + (ternaryfunc)UnaryFunction1DVectorViewShape___call__, /* tp_call */ + 0, /* tp_str */ + 0, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */ + UnaryFunction1DVectorViewShape___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 */ + BPy_UnaryFunction1DVectorViewShape_getseters, /* tp_getset */ + &UnaryFunction1D_Type, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)UnaryFunction1DVectorViewShape___init__, /* tp_init */ + 0, /* tp_alloc */ + 0, /* tp_new */ }; /////////////////////////////////////////////////////////////////////////////////////////// -- cgit v1.2.3