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/Interface1D/FEdge/BPy_FEdgeSmooth.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/Interface1D/FEdge/BPy_FEdgeSmooth.cpp')
-rw-r--r--source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp334
1 files changed, 176 insertions, 158 deletions
diff --git a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
index 726fe97b3ea..08d18123172 100644
--- a/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
+++ b/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
@@ -32,243 +32,261 @@ extern "C" {
/*----------------------FEdgeSmooth methods ----------------------------*/
PyDoc_STRVAR(FEdgeSmooth_doc,
-"Class hierarchy: :class:`Interface1D` > :class:`FEdge` > :class:`FEdgeSmooth`\n"
-"\n"
-"Class defining a smooth edge. This kind of edge typically runs across\n"
-"a face of the input mesh. It can be a silhouette, a ridge or valley,\n"
-"a suggestive contour.\n"
-"\n"
-".. method:: __init__()\n"
-"\n"
-" Default constructor.\n"
-"\n"
-".. method:: __init__(brother)\n"
-"\n"
-" Copy constructor.\n"
-"\n"
-" :arg brother: An FEdgeSmooth object.\n"
-" :type brother: :class:`FEdgeSmooth`\n"
-"\n"
-".. method:: __init__(first_vertex, second_vertex)\n"
-"\n"
-" Builds an FEdgeSmooth going from the first to the second.\n"
-"\n"
-" :arg first_vertex: The first SVertex object.\n"
-" :type first_vertex: :class:`SVertex`\n"
-" :arg second_vertex: The second SVertex object.\n"
-" :type second_vertex: :class:`SVertex`");
+ "Class hierarchy: :class:`Interface1D` > :class:`FEdge` > :class:`FEdgeSmooth`\n"
+ "\n"
+ "Class defining a smooth edge. This kind of edge typically runs across\n"
+ "a face of the input mesh. It can be a silhouette, a ridge or valley,\n"
+ "a suggestive contour.\n"
+ "\n"
+ ".. method:: __init__()\n"
+ "\n"
+ " Default constructor.\n"
+ "\n"
+ ".. method:: __init__(brother)\n"
+ "\n"
+ " Copy constructor.\n"
+ "\n"
+ " :arg brother: An FEdgeSmooth object.\n"
+ " :type brother: :class:`FEdgeSmooth`\n"
+ "\n"
+ ".. method:: __init__(first_vertex, second_vertex)\n"
+ "\n"
+ " Builds an FEdgeSmooth going from the first to the second.\n"
+ "\n"
+ " :arg first_vertex: The first SVertex object.\n"
+ " :type first_vertex: :class:`SVertex`\n"
+ " :arg second_vertex: The second SVertex object.\n"
+ " :type second_vertex: :class:`SVertex`");
static int FEdgeSmooth_init(BPy_FEdgeSmooth *self, PyObject *args, PyObject *kwds)
{
- static const char *kwlist_1[] = {"brother", NULL};
- static const char *kwlist_2[] = {"first_vertex", "second_vertex", NULL};
- PyObject *obj1 = 0, *obj2 = 0;
-
- if (PyArg_ParseTupleAndKeywords(args, kwds, "|O!", (char **)kwlist_1, &FEdgeSmooth_Type, &obj1)) {
- if (!obj1)
- self->fes = new FEdgeSmooth();
- else
- self->fes = new FEdgeSmooth(*(((BPy_FEdgeSmooth *)obj1)->fes));
- }
- else if (PyErr_Clear(),
- PyArg_ParseTupleAndKeywords(args, kwds, "O!O!", (char **)kwlist_2,
- &SVertex_Type, &obj1, &SVertex_Type, &obj2))
- {
- self->fes = new FEdgeSmooth(((BPy_SVertex *)obj1)->sv, ((BPy_SVertex *)obj2)->sv);
- }
- else {
- PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
- return -1;
- }
- self->py_fe.fe = self->fes;
- self->py_fe.py_if1D.if1D = self->fes;
- self->py_fe.py_if1D.borrowed = false;
- return 0;
+ static const char *kwlist_1[] = {"brother", NULL};
+ static const char *kwlist_2[] = {"first_vertex", "second_vertex", NULL};
+ PyObject *obj1 = 0, *obj2 = 0;
+
+ if (PyArg_ParseTupleAndKeywords(
+ args, kwds, "|O!", (char **)kwlist_1, &FEdgeSmooth_Type, &obj1)) {
+ if (!obj1)
+ self->fes = new FEdgeSmooth();
+ else
+ self->fes = new FEdgeSmooth(*(((BPy_FEdgeSmooth *)obj1)->fes));
+ }
+ else if (PyErr_Clear(),
+ PyArg_ParseTupleAndKeywords(args,
+ kwds,
+ "O!O!",
+ (char **)kwlist_2,
+ &SVertex_Type,
+ &obj1,
+ &SVertex_Type,
+ &obj2)) {
+ self->fes = new FEdgeSmooth(((BPy_SVertex *)obj1)->sv, ((BPy_SVertex *)obj2)->sv);
+ }
+ else {
+ PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
+ return -1;
+ }
+ self->py_fe.fe = self->fes;
+ self->py_fe.py_if1D.if1D = self->fes;
+ self->py_fe.py_if1D.borrowed = false;
+ return 0;
}
/*----------------------mathutils callbacks ----------------------------*/
static int FEdgeSmooth_mathutils_check(BaseMathObject *bmo)
{
- if (!BPy_FEdgeSmooth_Check(bmo->cb_user))
- return -1;
- return 0;
+ if (!BPy_FEdgeSmooth_Check(bmo->cb_user))
+ return -1;
+ return 0;
}
static int FEdgeSmooth_mathutils_get(BaseMathObject *bmo, int /*subtype*/)
{
- BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user;
- Vec3r p(self->fes->normal());
- bmo->data[0] = p[0];
- bmo->data[1] = p[1];
- bmo->data[2] = p[2];
- return 0;
+ BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user;
+ Vec3r p(self->fes->normal());
+ bmo->data[0] = p[0];
+ bmo->data[1] = p[1];
+ bmo->data[2] = p[2];
+ return 0;
}
static int FEdgeSmooth_mathutils_set(BaseMathObject *bmo, int /*subtype*/)
{
- BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user;
- Vec3r p(bmo->data[0], bmo->data[1], bmo->data[2]);
- self->fes->setNormal(p);
- return 0;
+ BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user;
+ Vec3r p(bmo->data[0], bmo->data[1], bmo->data[2]);
+ self->fes->setNormal(p);
+ return 0;
}
static int FEdgeSmooth_mathutils_get_index(BaseMathObject *bmo, int /*subtype*/, int index)
{
- BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user;
- Vec3r p(self->fes->normal());
- bmo->data[index] = p[index];
- return 0;
+ BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user;
+ Vec3r p(self->fes->normal());
+ bmo->data[index] = p[index];
+ return 0;
}
static int FEdgeSmooth_mathutils_set_index(BaseMathObject *bmo, int /*subtype*/, int index)
{
- BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user;
- Vec3r p(self->fes->normal());
- p[index] = bmo->data[index];
- self->fes->setNormal(p);
- return 0;
+ BPy_FEdgeSmooth *self = (BPy_FEdgeSmooth *)bmo->cb_user;
+ Vec3r p(self->fes->normal());
+ p[index] = bmo->data[index];
+ self->fes->setNormal(p);
+ return 0;
}
static Mathutils_Callback FEdgeSmooth_mathutils_cb = {
- FEdgeSmooth_mathutils_check,
- FEdgeSmooth_mathutils_get,
- FEdgeSmooth_mathutils_set,
- FEdgeSmooth_mathutils_get_index,
- FEdgeSmooth_mathutils_set_index,
+ FEdgeSmooth_mathutils_check,
+ FEdgeSmooth_mathutils_get,
+ FEdgeSmooth_mathutils_set,
+ FEdgeSmooth_mathutils_get_index,
+ FEdgeSmooth_mathutils_set_index,
};
static unsigned char FEdgeSmooth_mathutils_cb_index = -1;
void FEdgeSmooth_mathutils_register_callback()
{
- FEdgeSmooth_mathutils_cb_index = Mathutils_RegisterCallback(&FEdgeSmooth_mathutils_cb);
+ FEdgeSmooth_mathutils_cb_index = Mathutils_RegisterCallback(&FEdgeSmooth_mathutils_cb);
}
/*----------------------FEdgeSmooth get/setters ----------------------------*/
PyDoc_STRVAR(FEdgeSmooth_normal_doc,
-"The normal of the face that this FEdge is running across.\n"
-"\n"
-":type: :class:`mathutils.Vector`");
+ "The normal of the face that this FEdge is running across.\n"
+ "\n"
+ ":type: :class:`mathutils.Vector`");
static PyObject *FEdgeSmooth_normal_get(BPy_FEdgeSmooth *self, void *UNUSED(closure))
{
- return Vector_CreatePyObject_cb((PyObject *)self, 3, FEdgeSmooth_mathutils_cb_index, 0);
+ return Vector_CreatePyObject_cb((PyObject *)self, 3, FEdgeSmooth_mathutils_cb_index, 0);
}
static int FEdgeSmooth_normal_set(BPy_FEdgeSmooth *self, PyObject *value, void *UNUSED(closure))
{
- float v[3];
- if (mathutils_array_parse(v, 3, 3, value,
- "value must be a 3-dimensional vector") == -1)
- {
- return -1;
- }
- Vec3r p(v[0], v[1], v[2]);
- self->fes->setNormal(p);
- return 0;
+ float v[3];
+ if (mathutils_array_parse(v, 3, 3, value, "value must be a 3-dimensional vector") == -1) {
+ return -1;
+ }
+ Vec3r p(v[0], v[1], v[2]);
+ self->fes->setNormal(p);
+ return 0;
}
PyDoc_STRVAR(FEdgeSmooth_material_index_doc,
-"The index of the material of the face that this FEdge is running across.\n"
-"\n"
-":type: int");
+ "The index of the material of the face that this FEdge is running across.\n"
+ "\n"
+ ":type: int");
static PyObject *FEdgeSmooth_material_index_get(BPy_FEdgeSmooth *self, void *UNUSED(closure))
{
- return PyLong_FromLong(self->fes->frs_materialIndex());
+ return PyLong_FromLong(self->fes->frs_materialIndex());
}
-static int FEdgeSmooth_material_index_set(BPy_FEdgeSmooth *self, PyObject *value, void *UNUSED(closure))
+static int FEdgeSmooth_material_index_set(BPy_FEdgeSmooth *self,
+ PyObject *value,
+ void *UNUSED(closure))
{
- unsigned int i = PyLong_AsUnsignedLong(value);
- if (PyErr_Occurred())
- return -1;
- self->fes->setFrsMaterialIndex(i);
- return 0;
+ unsigned int i = PyLong_AsUnsignedLong(value);
+ if (PyErr_Occurred())
+ return -1;
+ self->fes->setFrsMaterialIndex(i);
+ return 0;
}
PyDoc_STRVAR(FEdgeSmooth_material_doc,
-"The material of the face that this FEdge is running across.\n"
-"\n"
-":type: :class:`Material`");
+ "The material of the face that this FEdge is running across.\n"
+ "\n"
+ ":type: :class:`Material`");
static PyObject *FEdgeSmooth_material_get(BPy_FEdgeSmooth *self, void *UNUSED(closure))
{
- return BPy_FrsMaterial_from_FrsMaterial(self->fes->frs_material());
+ return BPy_FrsMaterial_from_FrsMaterial(self->fes->frs_material());
}
PyDoc_STRVAR(FEdgeSmooth_face_mark_doc,
-"The face mark of the face that this FEdge is running across.\n"
-"\n"
-":type: bool");
+ "The face mark of the face that this FEdge is running across.\n"
+ "\n"
+ ":type: bool");
static PyObject *FEdgeSmooth_face_mark_get(BPy_FEdgeSmooth *self, void *UNUSED(closure))
{
- return PyBool_from_bool(self->fes->faceMark());
+ return PyBool_from_bool(self->fes->faceMark());
}
static int FEdgeSmooth_face_mark_set(BPy_FEdgeSmooth *self, PyObject *value, void *UNUSED(closure))
{
- if (!PyBool_Check(value))
- return -1;
- self->fes->setFaceMark(bool_from_PyBool(value));
- return 0;
+ if (!PyBool_Check(value))
+ return -1;
+ self->fes->setFaceMark(bool_from_PyBool(value));
+ return 0;
}
static PyGetSetDef BPy_FEdgeSmooth_getseters[] = {
- {(char *)"normal", (getter)FEdgeSmooth_normal_get, (setter)FEdgeSmooth_normal_set,
- (char *)FEdgeSmooth_normal_doc, NULL},
- {(char *)"material_index", (getter)FEdgeSmooth_material_index_get, (setter)FEdgeSmooth_material_index_set,
- (char *)FEdgeSmooth_material_index_doc, NULL},
- {(char *)"material", (getter)FEdgeSmooth_material_get, (setter)NULL, (char *)FEdgeSmooth_material_doc, NULL},
- {(char *)"face_mark", (getter)FEdgeSmooth_face_mark_get, (setter)FEdgeSmooth_face_mark_set,
- (char *)FEdgeSmooth_face_mark_doc, NULL},
- {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
+ {(char *)"normal",
+ (getter)FEdgeSmooth_normal_get,
+ (setter)FEdgeSmooth_normal_set,
+ (char *)FEdgeSmooth_normal_doc,
+ NULL},
+ {(char *)"material_index",
+ (getter)FEdgeSmooth_material_index_get,
+ (setter)FEdgeSmooth_material_index_set,
+ (char *)FEdgeSmooth_material_index_doc,
+ NULL},
+ {(char *)"material",
+ (getter)FEdgeSmooth_material_get,
+ (setter)NULL,
+ (char *)FEdgeSmooth_material_doc,
+ NULL},
+ {(char *)"face_mark",
+ (getter)FEdgeSmooth_face_mark_get,
+ (setter)FEdgeSmooth_face_mark_set,
+ (char *)FEdgeSmooth_face_mark_doc,
+ NULL},
+ {NULL, NULL, NULL, NULL, NULL} /* Sentinel */
};
/*-----------------------BPy_FEdgeSmooth type definition ------------------------------*/
PyTypeObject FEdgeSmooth_Type = {
- PyVarObject_HEAD_INIT(NULL, 0)
- "FEdgeSmooth", /* tp_name */
- sizeof(BPy_FEdgeSmooth), /* 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 */
- FEdgeSmooth_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_FEdgeSmooth_getseters, /* tp_getset */
- &FEdge_Type, /* tp_base */
- 0, /* tp_dict */
- 0, /* tp_descr_get */
- 0, /* tp_descr_set */
- 0, /* tp_dictoffset */
- (initproc)FEdgeSmooth_init, /* tp_init */
- 0, /* tp_alloc */
- 0, /* tp_new */
+ PyVarObject_HEAD_INIT(NULL, 0) "FEdgeSmooth", /* tp_name */
+ sizeof(BPy_FEdgeSmooth), /* 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 */
+ FEdgeSmooth_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_FEdgeSmooth_getseters, /* tp_getset */
+ &FEdge_Type, /* tp_base */
+ 0, /* tp_dict */
+ 0, /* tp_descr_get */
+ 0, /* tp_descr_set */
+ 0, /* tp_dictoffset */
+ (initproc)FEdgeSmooth_init, /* tp_init */
+ 0, /* tp_alloc */
+ 0, /* tp_new */
};
///////////////////////////////////////////////////////////////////////////////////////////