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/BPy_Interface0D.cpp | |
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/BPy_Interface0D.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/BPy_Interface0D.cpp | 392 |
1 files changed, 210 insertions, 182 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp index a08946660b5..897f2f06c28 100644 --- a/source/blender/freestyle/intern/python/BPy_Interface0D.cpp +++ b/source/blender/freestyle/intern/python/BPy_Interface0D.cpp @@ -39,272 +39,300 @@ extern "C" { //-------------------MODULE INITIALIZATION-------------------------------- int Interface0D_Init(PyObject *module) { - if (module == NULL) - return -1; - - if (PyType_Ready(&Interface0D_Type) < 0) - return -1; - Py_INCREF(&Interface0D_Type); - PyModule_AddObject(module, "Interface0D", (PyObject *)&Interface0D_Type); - - if (PyType_Ready(&CurvePoint_Type) < 0) - return -1; - Py_INCREF(&CurvePoint_Type); - PyModule_AddObject(module, "CurvePoint", (PyObject *)&CurvePoint_Type); - - if (PyType_Ready(&SVertex_Type) < 0) - return -1; - Py_INCREF(&SVertex_Type); - PyModule_AddObject(module, "SVertex", (PyObject *)&SVertex_Type); - - if (PyType_Ready(&ViewVertex_Type) < 0) - return -1; - Py_INCREF(&ViewVertex_Type); - PyModule_AddObject(module, "ViewVertex", (PyObject *)&ViewVertex_Type); - - if (PyType_Ready(&StrokeVertex_Type) < 0) - return -1; - Py_INCREF(&StrokeVertex_Type); - PyModule_AddObject(module, "StrokeVertex", (PyObject *)&StrokeVertex_Type); - - if (PyType_Ready(&NonTVertex_Type) < 0) - return -1; - Py_INCREF(&NonTVertex_Type); - PyModule_AddObject(module, "NonTVertex", (PyObject *)&NonTVertex_Type); - - if (PyType_Ready(&TVertex_Type) < 0) - return -1; - Py_INCREF(&TVertex_Type); - PyModule_AddObject(module, "TVertex", (PyObject *)&TVertex_Type); - - SVertex_mathutils_register_callback(); - StrokeVertex_mathutils_register_callback(); - - return 0; + if (module == NULL) + return -1; + + if (PyType_Ready(&Interface0D_Type) < 0) + return -1; + Py_INCREF(&Interface0D_Type); + PyModule_AddObject(module, "Interface0D", (PyObject *)&Interface0D_Type); + + if (PyType_Ready(&CurvePoint_Type) < 0) + return -1; + Py_INCREF(&CurvePoint_Type); + PyModule_AddObject(module, "CurvePoint", (PyObject *)&CurvePoint_Type); + + if (PyType_Ready(&SVertex_Type) < 0) + return -1; + Py_INCREF(&SVertex_Type); + PyModule_AddObject(module, "SVertex", (PyObject *)&SVertex_Type); + + if (PyType_Ready(&ViewVertex_Type) < 0) + return -1; + Py_INCREF(&ViewVertex_Type); + PyModule_AddObject(module, "ViewVertex", (PyObject *)&ViewVertex_Type); + + if (PyType_Ready(&StrokeVertex_Type) < 0) + return -1; + Py_INCREF(&StrokeVertex_Type); + PyModule_AddObject(module, "StrokeVertex", (PyObject *)&StrokeVertex_Type); + + if (PyType_Ready(&NonTVertex_Type) < 0) + return -1; + Py_INCREF(&NonTVertex_Type); + PyModule_AddObject(module, "NonTVertex", (PyObject *)&NonTVertex_Type); + + if (PyType_Ready(&TVertex_Type) < 0) + return -1; + Py_INCREF(&TVertex_Type); + PyModule_AddObject(module, "TVertex", (PyObject *)&TVertex_Type); + + SVertex_mathutils_register_callback(); + StrokeVertex_mathutils_register_callback(); + + return 0; } /*----------------------Interface1D methods ----------------------------*/ PyDoc_STRVAR(Interface0D_doc, -"Base class for any 0D element.\n" -"\n" -".. method:: __init__()\n" -"\n" -" Default constructor."); + "Base class for any 0D element.\n" + "\n" + ".. method:: __init__()\n" + "\n" + " Default constructor."); static int Interface0D_init(BPy_Interface0D *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {NULL}; + static const char *kwlist[] = {NULL}; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist)) - return -1; - self->if0D = new Interface0D(); - self->borrowed = false; - return 0; + if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist)) + return -1; + self->if0D = new Interface0D(); + self->borrowed = false; + return 0; } static void Interface0D_dealloc(BPy_Interface0D *self) { - if (self->if0D && !self->borrowed) - delete self->if0D; - Py_TYPE(self)->tp_free((PyObject *)self); + if (self->if0D && !self->borrowed) + delete self->if0D; + Py_TYPE(self)->tp_free((PyObject *)self); } static PyObject *Interface0D_repr(BPy_Interface0D *self) { - return PyUnicode_FromFormat("type: %s - address: %p", self->if0D->getExactTypeName().c_str(), self->if0D); + return PyUnicode_FromFormat( + "type: %s - address: %p", self->if0D->getExactTypeName().c_str(), self->if0D); } PyDoc_STRVAR(Interface0D_get_fedge_doc, -".. method:: get_fedge(inter)\n" -"\n" -" Returns the FEdge that lies between this 0D element and the 0D\n" -" element given as the argument.\n" -"\n" -" :arg inter: A 0D element.\n" -" :type inter: :class:`Interface0D`\n" -" :return: The FEdge lying between the two 0D elements.\n" -" :rtype: :class:`FEdge`"); + ".. method:: get_fedge(inter)\n" + "\n" + " Returns the FEdge that lies between this 0D element and the 0D\n" + " element given as the argument.\n" + "\n" + " :arg inter: A 0D element.\n" + " :type inter: :class:`Interface0D`\n" + " :return: The FEdge lying between the two 0D elements.\n" + " :rtype: :class:`FEdge`"); static PyObject *Interface0D_get_fedge(BPy_Interface0D *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"inter", NULL}; - PyObject *py_if0D; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &Interface0D_Type, &py_if0D)) - return NULL; - FEdge *fe = self->if0D->getFEdge(*(((BPy_Interface0D *)py_if0D)->if0D)); - if (PyErr_Occurred()) - return NULL; - if (fe) - return Any_BPy_FEdge_from_FEdge(*fe); - Py_RETURN_NONE; + static const char *kwlist[] = {"inter", NULL}; + PyObject *py_if0D; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &Interface0D_Type, &py_if0D)) + return NULL; + FEdge *fe = self->if0D->getFEdge(*(((BPy_Interface0D *)py_if0D)->if0D)); + if (PyErr_Occurred()) + return NULL; + if (fe) + return Any_BPy_FEdge_from_FEdge(*fe); + Py_RETURN_NONE; } static PyMethodDef BPy_Interface0D_methods[] = { - {"get_fedge", (PyCFunction)Interface0D_get_fedge, METH_VARARGS | METH_KEYWORDS, Interface0D_get_fedge_doc}, - {NULL, NULL, 0, NULL}, + {"get_fedge", + (PyCFunction)Interface0D_get_fedge, + METH_VARARGS | METH_KEYWORDS, + Interface0D_get_fedge_doc}, + {NULL, NULL, 0, NULL}, }; /*----------------------Interface1D get/setters ----------------------------*/ PyDoc_STRVAR(Interface0D_name_doc, -"The string of the name of this 0D element.\n" -"\n" -":type: str"); + "The string of the name of this 0D element.\n" + "\n" + ":type: str"); static PyObject *Interface0D_name_get(BPy_Interface0D *self, void *UNUSED(closure)) { - return PyUnicode_FromString(Py_TYPE(self)->tp_name); + return PyUnicode_FromString(Py_TYPE(self)->tp_name); } PyDoc_STRVAR(Interface0D_point_3d_doc, -"The 3D point of this 0D element.\n" -"\n" -":type: :class:`mathutils.Vector`"); + "The 3D point of this 0D element.\n" + "\n" + ":type: :class:`mathutils.Vector`"); static PyObject *Interface0D_point_3d_get(BPy_Interface0D *self, void *UNUSED(closure)) { - Vec3f p(self->if0D->getPoint3D()); - if (PyErr_Occurred()) - return NULL; - return Vector_from_Vec3f(p); + Vec3f p(self->if0D->getPoint3D()); + if (PyErr_Occurred()) + return NULL; + return Vector_from_Vec3f(p); } PyDoc_STRVAR(Interface0D_projected_x_doc, -"The X coordinate of the projected 3D point of this 0D element.\n" -"\n" -":type: float"); + "The X coordinate of the projected 3D point of this 0D element.\n" + "\n" + ":type: float"); static PyObject *Interface0D_projected_x_get(BPy_Interface0D *self, void *UNUSED(closure)) { - real x = self->if0D->getProjectedX(); - if (PyErr_Occurred()) - return NULL; - return PyFloat_FromDouble(x); + real x = self->if0D->getProjectedX(); + if (PyErr_Occurred()) + return NULL; + return PyFloat_FromDouble(x); } PyDoc_STRVAR(Interface0D_projected_y_doc, -"The Y coordinate of the projected 3D point of this 0D element.\n" -"\n" -":type: float"); + "The Y coordinate of the projected 3D point of this 0D element.\n" + "\n" + ":type: float"); static PyObject *Interface0D_projected_y_get(BPy_Interface0D *self, void *UNUSED(closure)) { - real y = self->if0D->getProjectedY(); - if (PyErr_Occurred()) - return NULL; - return PyFloat_FromDouble(y); + real y = self->if0D->getProjectedY(); + if (PyErr_Occurred()) + return NULL; + return PyFloat_FromDouble(y); } PyDoc_STRVAR(Interface0D_projected_z_doc, -"The Z coordinate of the projected 3D point of this 0D element.\n" -"\n" -":type: float"); + "The Z coordinate of the projected 3D point of this 0D element.\n" + "\n" + ":type: float"); static PyObject *Interface0D_projected_z_get(BPy_Interface0D *self, void *UNUSED(closure)) { - real z = self->if0D->getProjectedZ(); - if (PyErr_Occurred()) - return NULL; - return PyFloat_FromDouble(z); + real z = self->if0D->getProjectedZ(); + if (PyErr_Occurred()) + return NULL; + return PyFloat_FromDouble(z); } PyDoc_STRVAR(Interface0D_point_2d_doc, -"The 2D point of this 0D element.\n" -"\n" -":type: :class:`mathutils.Vector`"); + "The 2D point of this 0D element.\n" + "\n" + ":type: :class:`mathutils.Vector`"); static PyObject *Interface0D_point_2d_get(BPy_Interface0D *self, void *UNUSED(closure)) { - Vec2f p(self->if0D->getPoint2D()); - if (PyErr_Occurred()) - return NULL; - return Vector_from_Vec2f(p); + Vec2f p(self->if0D->getPoint2D()); + if (PyErr_Occurred()) + return NULL; + return Vector_from_Vec2f(p); } PyDoc_STRVAR(Interface0D_id_doc, -"The Id of this 0D element.\n" -"\n" -":type: :class:`Id`"); + "The Id of this 0D element.\n" + "\n" + ":type: :class:`Id`"); static PyObject *Interface0D_id_get(BPy_Interface0D *self, void *UNUSED(closure)) { - Id id(self->if0D->getId()); - if (PyErr_Occurred()) - return NULL; - return BPy_Id_from_Id(id); // return a copy + Id id(self->if0D->getId()); + if (PyErr_Occurred()) + return NULL; + return BPy_Id_from_Id(id); // return a copy } PyDoc_STRVAR(Interface0D_nature_doc, -"The nature of this 0D element.\n" -"\n" -":type: :class:`Nature`"); + "The nature of this 0D element.\n" + "\n" + ":type: :class:`Nature`"); static PyObject *Interface0D_nature_get(BPy_Interface0D *self, void *UNUSED(closure)) { - Nature::VertexNature nature = self->if0D->getNature(); - if (PyErr_Occurred()) - return NULL; - return BPy_Nature_from_Nature(nature); + Nature::VertexNature nature = self->if0D->getNature(); + if (PyErr_Occurred()) + return NULL; + return BPy_Nature_from_Nature(nature); } static PyGetSetDef BPy_Interface0D_getseters[] = { - {(char *)"name", (getter)Interface0D_name_get, (setter)NULL, (char *)Interface0D_name_doc, NULL}, - {(char *)"point_3d", (getter)Interface0D_point_3d_get, (setter)NULL, (char *)Interface0D_point_3d_doc, NULL}, - {(char *)"projected_x", (getter)Interface0D_projected_x_get, (setter)NULL, - (char *)Interface0D_projected_x_doc, NULL}, - {(char *)"projected_y", (getter)Interface0D_projected_y_get, (setter)NULL, - (char *)Interface0D_projected_y_doc, NULL}, - {(char *)"projected_z", (getter)Interface0D_projected_z_get, (setter)NULL, - (char *)Interface0D_projected_z_doc, NULL}, - {(char *)"point_2d", (getter)Interface0D_point_2d_get, (setter)NULL, (char *)Interface0D_point_2d_doc, NULL}, - {(char *)"id", (getter)Interface0D_id_get, (setter)NULL, (char *)Interface0D_id_doc, NULL}, - {(char *)"nature", (getter)Interface0D_nature_get, (setter)NULL, (char *)Interface0D_nature_doc, NULL}, - {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ + {(char *)"name", + (getter)Interface0D_name_get, + (setter)NULL, + (char *)Interface0D_name_doc, + NULL}, + {(char *)"point_3d", + (getter)Interface0D_point_3d_get, + (setter)NULL, + (char *)Interface0D_point_3d_doc, + NULL}, + {(char *)"projected_x", + (getter)Interface0D_projected_x_get, + (setter)NULL, + (char *)Interface0D_projected_x_doc, + NULL}, + {(char *)"projected_y", + (getter)Interface0D_projected_y_get, + (setter)NULL, + (char *)Interface0D_projected_y_doc, + NULL}, + {(char *)"projected_z", + (getter)Interface0D_projected_z_get, + (setter)NULL, + (char *)Interface0D_projected_z_doc, + NULL}, + {(char *)"point_2d", + (getter)Interface0D_point_2d_get, + (setter)NULL, + (char *)Interface0D_point_2d_doc, + NULL}, + {(char *)"id", (getter)Interface0D_id_get, (setter)NULL, (char *)Interface0D_id_doc, NULL}, + {(char *)"nature", + (getter)Interface0D_nature_get, + (setter)NULL, + (char *)Interface0D_nature_doc, + NULL}, + {NULL, NULL, NULL, NULL, NULL} /* Sentinel */ }; /*-----------------------BPy_Interface0D type definition ------------------------------*/ PyTypeObject Interface0D_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "Interface0D", /* tp_name */ - sizeof(BPy_Interface0D), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)Interface0D_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - (reprfunc)Interface0D_repr, /* 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 */ - Interface0D_doc, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - BPy_Interface0D_methods, /* tp_methods */ - 0, /* tp_members */ - BPy_Interface0D_getseters, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)Interface0D_init, /* tp_init */ - 0, /* tp_alloc */ - PyType_GenericNew, /* tp_new */ + PyVarObject_HEAD_INIT(NULL, 0) "Interface0D", /* tp_name */ + sizeof(BPy_Interface0D), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor)Interface0D_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + (reprfunc)Interface0D_repr, /* 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 */ + Interface0D_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + BPy_Interface0D_methods, /* tp_methods */ + 0, /* tp_members */ + BPy_Interface0D_getseters, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)Interface0D_init, /* tp_init */ + 0, /* tp_alloc */ + PyType_GenericNew, /* tp_new */ }; /////////////////////////////////////////////////////////////////////////////////////////// |