Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (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/BPy_UnaryFunction1DVec3f.cpp')
-rw-r--r--source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp239
1 files changed, 124 insertions, 115 deletions
diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
index ace1fb7f153..61b393cd732 100644
--- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
+++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp
@@ -36,164 +36,173 @@ extern "C" {
int UnaryFunction1DVec3f_Init(PyObject *module)
{
- if (module == NULL)
- return -1;
+ if (module == NULL)
+ return -1;
- if (PyType_Ready(&UnaryFunction1DVec3f_Type) < 0)
- return -1;
- Py_INCREF(&UnaryFunction1DVec3f_Type);
- PyModule_AddObject(module, "UnaryFunction1DVec3f", (PyObject *)&UnaryFunction1DVec3f_Type);
+ if (PyType_Ready(&UnaryFunction1DVec3f_Type) < 0)
+ return -1;
+ Py_INCREF(&UnaryFunction1DVec3f_Type);
+ PyModule_AddObject(module, "UnaryFunction1DVec3f", (PyObject *)&UnaryFunction1DVec3f_Type);
- if (PyType_Ready(&Orientation3DF1D_Type) < 0)
- return -1;
- Py_INCREF(&Orientation3DF1D_Type);
- PyModule_AddObject(module, "Orientation3DF1D", (PyObject *)&Orientation3DF1D_Type);
+ if (PyType_Ready(&Orientation3DF1D_Type) < 0)
+ return -1;
+ Py_INCREF(&Orientation3DF1D_Type);
+ PyModule_AddObject(module, "Orientation3DF1D", (PyObject *)&Orientation3DF1D_Type);
- return 0;
+ return 0;
}
//------------------------INSTANCE METHODS ----------------------------------
static char UnaryFunction1DVec3f___doc__[] =
-"Class hierarchy: :class:`UnaryFunction1D` > :class:`UnaryFunction1DVec3f`\n"
-"\n"
-"Base class for unary functions (functors) that work on\n"
-":class:`Interface1D` and return a 3D vector.\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 UnaryFunction1DVec3f___init__(BPy_UnaryFunction1DVec3f *self, PyObject *args, PyObject *kwds)
+ "Class hierarchy: :class:`UnaryFunction1D` > :class:`UnaryFunction1DVec3f`\n"
+ "\n"
+ "Base class for unary functions (functors) that work on\n"
+ ":class:`Interface1D` and return a 3D vector.\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 UnaryFunction1DVec3f___init__(BPy_UnaryFunction1DVec3f *self,
+ 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_vec3f = new UnaryFunction1D<Vec3f>();
- else {
- self->uf1D_vec3f = new UnaryFunction1D<Vec3f>(IntegrationType_from_BPy_IntegrationType(obj));
- }
+ if (!obj)
+ self->uf1D_vec3f = new UnaryFunction1D<Vec3f>();
+ else {
+ self->uf1D_vec3f = new UnaryFunction1D<Vec3f>(IntegrationType_from_BPy_IntegrationType(obj));
+ }
- self->uf1D_vec3f->py_uf1D = (PyObject *)self;
+ self->uf1D_vec3f->py_uf1D = (PyObject *)self;
- return 0;
+ return 0;
}
static void UnaryFunction1DVec3f___dealloc__(BPy_UnaryFunction1DVec3f *self)
{
- if (self->uf1D_vec3f)
- delete self->uf1D_vec3f;
- UnaryFunction1D_Type.tp_dealloc((PyObject *)self);
+ if (self->uf1D_vec3f)
+ delete self->uf1D_vec3f;
+ UnaryFunction1D_Type.tp_dealloc((PyObject *)self);
}
static PyObject *UnaryFunction1DVec3f___repr__(BPy_UnaryFunction1DVec3f *self)
{
- return PyUnicode_FromFormat("type: %s - address: %p", Py_TYPE(self)->tp_name, self->uf1D_vec3f);
+ return PyUnicode_FromFormat("type: %s - address: %p", Py_TYPE(self)->tp_name, self->uf1D_vec3f);
}
-static PyObject *UnaryFunction1DVec3f___call__(BPy_UnaryFunction1DVec3f *self, PyObject *args, PyObject *kwds)
+static PyObject *UnaryFunction1DVec3f___call__(BPy_UnaryFunction1DVec3f *self,
+ 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_vec3f)) == typeid(UnaryFunction1D<Vec3f>)) {
- PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden");
- return NULL;
- }
- if (self->uf1D_vec3f->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;
- }
- return Vector_from_Vec3f(self->uf1D_vec3f->result);
+ 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_vec3f)) == typeid(UnaryFunction1D<Vec3f>)) {
+ PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden");
+ return NULL;
+ }
+ if (self->uf1D_vec3f->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;
+ }
+ return Vector_from_Vec3f(self->uf1D_vec3f->result);
}
/*----------------------UnaryFunction1DVec3f 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_UnaryFunction1DVec3f *self, void *UNUSED(closure))
{
- return BPy_IntegrationType_from_IntegrationType(self->uf1D_vec3f->getIntegrationType());
+ return BPy_IntegrationType_from_IntegrationType(self->uf1D_vec3f->getIntegrationType());
}
-static int integration_type_set(BPy_UnaryFunction1DVec3f *self, PyObject *value, void *UNUSED(closure))
+static int integration_type_set(BPy_UnaryFunction1DVec3f *self,
+ PyObject *value,
+ void *UNUSED(closure))
{
- if (!BPy_IntegrationType_Check(value)) {
- PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType");
- return -1;
- }
- self->uf1D_vec3f->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_vec3f->setIntegrationType(IntegrationType_from_BPy_IntegrationType(value));
+ return 0;
}
static PyGetSetDef BPy_UnaryFunction1DVec3f_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_UnaryFunction1DVec3f type definition ------------------------------*/
PyTypeObject UnaryFunction1DVec3f_Type = {
- PyVarObject_HEAD_INIT(NULL, 0)
- "UnaryFunction1DVec3f", /* tp_name */
- sizeof(BPy_UnaryFunction1DVec3f), /* tp_basicsize */
- 0, /* tp_itemsize */
- (destructor)UnaryFunction1DVec3f___dealloc__, /* tp_dealloc */
- 0, /* tp_print */
- 0, /* tp_getattr */
- 0, /* tp_setattr */
- 0, /* tp_reserved */
- (reprfunc)UnaryFunction1DVec3f___repr__, /* tp_repr */
- 0, /* tp_as_number */
- 0, /* tp_as_sequence */
- 0, /* tp_as_mapping */
- 0, /* tp_hash */
- (ternaryfunc)UnaryFunction1DVec3f___call__, /* tp_call */
- 0, /* tp_str */
- 0, /* tp_getattro */
- 0, /* tp_setattro */
- 0, /* tp_as_buffer */
- Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
- UnaryFunction1DVec3f___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_UnaryFunction1DVec3f_getseters, /* tp_getset */
- &UnaryFunction1D_Type, /* tp_base */
- 0, /* tp_dict */
- 0, /* tp_descr_get */
- 0, /* tp_descr_set */
- 0, /* tp_dictoffset */
- (initproc)UnaryFunction1DVec3f___init__, /* tp_init */
- 0, /* tp_alloc */
- 0, /* tp_new */
+ PyVarObject_HEAD_INIT(NULL, 0) "UnaryFunction1DVec3f", /* tp_name */
+ sizeof(BPy_UnaryFunction1DVec3f), /* tp_basicsize */
+ 0, /* tp_itemsize */
+ (destructor)UnaryFunction1DVec3f___dealloc__, /* tp_dealloc */
+ 0, /* tp_print */
+ 0, /* tp_getattr */
+ 0, /* tp_setattr */
+ 0, /* tp_reserved */
+ (reprfunc)UnaryFunction1DVec3f___repr__, /* tp_repr */
+ 0, /* tp_as_number */
+ 0, /* tp_as_sequence */
+ 0, /* tp_as_mapping */
+ 0, /* tp_hash */
+ (ternaryfunc)UnaryFunction1DVec3f___call__, /* tp_call */
+ 0, /* tp_str */
+ 0, /* tp_getattro */
+ 0, /* tp_setattro */
+ 0, /* tp_as_buffer */
+ Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
+ UnaryFunction1DVec3f___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_UnaryFunction1DVec3f_getseters, /* tp_getset */
+ &UnaryFunction1D_Type, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ (initproc)UnaryFunction1DVec3f___init__, /* tp_init */
+ 0, /* tp_alloc */
+ 0, /* tp_new */
};
///////////////////////////////////////////////////////////////////////////////////////////