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_FrsNoise.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_FrsNoise.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/BPy_FrsNoise.cpp | 466 |
1 files changed, 245 insertions, 221 deletions
diff --git a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp index 871fe517bed..dc8a2ba6105 100644 --- a/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp +++ b/source/blender/freestyle/intern/python/BPy_FrsNoise.cpp @@ -34,301 +34,325 @@ extern "C" { //-------------------MODULE INITIALIZATION-------------------------------- int FrsNoise_Init(PyObject *module) { - if (module == NULL) - return -1; + if (module == NULL) + return -1; - if (PyType_Ready(&FrsNoise_Type) < 0) - return -1; - Py_INCREF(&FrsNoise_Type); - PyModule_AddObject(module, "Noise", (PyObject *)&FrsNoise_Type); + if (PyType_Ready(&FrsNoise_Type) < 0) + return -1; + Py_INCREF(&FrsNoise_Type); + PyModule_AddObject(module, "Noise", (PyObject *)&FrsNoise_Type); - return 0; + return 0; } //------------------------INSTANCE METHODS ---------------------------------- PyDoc_STRVAR(FrsNoise_doc, -"Class to provide Perlin noise functionalities.\n" -"\n" -".. method:: __init__(seed = -1)\n" -"\n" -" Builds a Noise object. Seed is an optional argument. The seed value is used\n" -" as a seed for random number generation if it is equal to or greater than zero;\n" -" otherwise, time is used as a seed.\n" -"\n" -" :arg seed: Seed for random number generation.\n" -" :type seed: int"); + "Class to provide Perlin noise functionalities.\n" + "\n" + ".. method:: __init__(seed = -1)\n" + "\n" + " Builds a Noise object. Seed is an optional argument. The seed value is used\n" + " as a seed for random number generation if it is equal to or greater than zero;\n" + " otherwise, time is used as a seed.\n" + "\n" + " :arg seed: Seed for random number generation.\n" + " :type seed: int"); static int FrsNoise_init(BPy_FrsNoise *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"seed", NULL}; - long seed = -1; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|l", (char **)kwlist, &seed)) - return -1; - self->n = new Noise(seed); - self->pn = new PseudoNoise(); - return 0; + static const char *kwlist[] = {"seed", NULL}; + long seed = -1; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|l", (char **)kwlist, &seed)) + return -1; + self->n = new Noise(seed); + self->pn = new PseudoNoise(); + return 0; } static void FrsNoise_dealloc(BPy_FrsNoise *self) { - delete self->n; - delete self->pn; - Py_TYPE(self)->tp_free((PyObject *)self); + delete self->n; + delete self->pn; + Py_TYPE(self)->tp_free((PyObject *)self); } static PyObject *FrsNoise_repr(BPy_FrsNoise *self) { - return PyUnicode_FromFormat("Noise - address: %p", self->n); + return PyUnicode_FromFormat("Noise - address: %p", self->n); } PyDoc_STRVAR(FrsNoise_turbulence1_doc, -".. method:: turbulence1(v, freq, amp, oct=4)\n" -"\n" -" Returns a noise value for a 1D element.\n" -"\n" -" :arg v: One-dimensional sample point.\n" -" :type v: float\n" -" :arg freq: Noise frequency.\n" -" :type freq: float\n" -" :arg amp: Amplitude.\n" -" :type amp: float\n" -" :arg oct: Number of octaves.\n" -" :type oct: int\n" -" :return: A noise value.\n" -" :rtype: float"); + ".. method:: turbulence1(v, freq, amp, oct=4)\n" + "\n" + " Returns a noise value for a 1D element.\n" + "\n" + " :arg v: One-dimensional sample point.\n" + " :type v: float\n" + " :arg freq: Noise frequency.\n" + " :type freq: float\n" + " :arg amp: Amplitude.\n" + " :type amp: float\n" + " :arg oct: Number of octaves.\n" + " :type oct: int\n" + " :return: A noise value.\n" + " :rtype: float"); static PyObject *FrsNoise_drand(BPy_FrsNoise * /*self*/, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"seed", NULL}; - long seed = 0; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "|I", (char **)kwlist, &seed)) { - PyErr_SetString(PyExc_TypeError, "optional argument 1 must be of type int"); - return NULL; - } - if (seed) { - RandGen::srand48(seed); - } - return PyFloat_FromDouble(RandGen::drand48()); + static const char *kwlist[] = {"seed", NULL}; + long seed = 0; + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|I", (char **)kwlist, &seed)) { + PyErr_SetString(PyExc_TypeError, "optional argument 1 must be of type int"); + return NULL; + } + if (seed) { + RandGen::srand48(seed); + } + return PyFloat_FromDouble(RandGen::drand48()); } static PyObject *FrsNoise_turbulence_smooth(BPy_FrsNoise *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"v", "oct", NULL}; + static const char *kwlist[] = {"v", "oct", NULL}; - double x; // note: this has to be a double (not float) - unsigned nbOctaves = 8; + double x; // note: this has to be a double (not float) + unsigned nbOctaves = 8; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "d|I", (char **)kwlist, &x, &nbOctaves)) - return NULL; - return PyFloat_FromDouble(self->pn->turbulenceSmooth(x, nbOctaves)); + if (!PyArg_ParseTupleAndKeywords(args, kwds, "d|I", (char **)kwlist, &x, &nbOctaves)) + return NULL; + return PyFloat_FromDouble(self->pn->turbulenceSmooth(x, nbOctaves)); } static PyObject *FrsNoise_turbulence1(BPy_FrsNoise *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"v", "freq", "amp", "oct", NULL}; - float f1, f2, f3; - unsigned int i = 4; + static const char *kwlist[] = {"v", "freq", "amp", "oct", NULL}; + float f1, f2, f3; + unsigned int i = 4; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "fff|I", (char **)kwlist, &f1, &f2, &f3, &i)) - return NULL; - return PyFloat_FromDouble(self->n->turbulence1(f1, f2, f3, i)); + if (!PyArg_ParseTupleAndKeywords(args, kwds, "fff|I", (char **)kwlist, &f1, &f2, &f3, &i)) + return NULL; + return PyFloat_FromDouble(self->n->turbulence1(f1, f2, f3, i)); } PyDoc_STRVAR(FrsNoise_turbulence2_doc, -".. method:: turbulence2(v, freq, amp, oct=4)\n" -"\n" -" Returns a noise value for a 2D element.\n" -"\n" -" :arg v: Two-dimensional sample point.\n" -" :type v: :class:`mathutils.Vector`, list or tuple of 2 real numbers\n" -" :arg freq: Noise frequency.\n" -" :type freq: float\n" -" :arg amp: Amplitude.\n" -" :type amp: float\n" -" :arg oct: Number of octaves.\n" -" :type oct: int\n" -" :return: A noise value.\n" -" :rtype: float"); + ".. method:: turbulence2(v, freq, amp, oct=4)\n" + "\n" + " Returns a noise value for a 2D element.\n" + "\n" + " :arg v: Two-dimensional sample point.\n" + " :type v: :class:`mathutils.Vector`, list or tuple of 2 real numbers\n" + " :arg freq: Noise frequency.\n" + " :type freq: float\n" + " :arg amp: Amplitude.\n" + " :type amp: float\n" + " :arg oct: Number of octaves.\n" + " :type oct: int\n" + " :return: A noise value.\n" + " :rtype: float"); static PyObject *FrsNoise_turbulence2(BPy_FrsNoise *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"v", "freq", "amp", "oct", NULL}; - PyObject *obj1; - float f2, f3; - unsigned int i = 4; - Vec2f vec; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "Off|I", (char **)kwlist, &obj1, &f2, &f3, &i)) - return NULL; - if (!Vec2f_ptr_from_PyObject(obj1, vec)) { - PyErr_SetString(PyExc_TypeError, "argument 1 must be a 2D vector (either a list of 2 elements or Vector)"); - return NULL; - } - float t = self->n->turbulence2(vec, f2, f3, i); - return PyFloat_FromDouble(t); + static const char *kwlist[] = {"v", "freq", "amp", "oct", NULL}; + PyObject *obj1; + float f2, f3; + unsigned int i = 4; + Vec2f vec; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "Off|I", (char **)kwlist, &obj1, &f2, &f3, &i)) + return NULL; + if (!Vec2f_ptr_from_PyObject(obj1, vec)) { + PyErr_SetString(PyExc_TypeError, + "argument 1 must be a 2D vector (either a list of 2 elements or Vector)"); + return NULL; + } + float t = self->n->turbulence2(vec, f2, f3, i); + return PyFloat_FromDouble(t); } PyDoc_STRVAR(FrsNoise_turbulence3_doc, -".. method:: turbulence3(v, freq, amp, oct=4)\n" -"\n" -" Returns a noise value for a 3D element.\n" -"\n" -" :arg v: Three-dimensional sample point.\n" -" :type v: :class:`mathutils.Vector`, list or tuple of 3 real numbers\n" -" :arg freq: Noise frequency.\n" -" :type freq: float\n" -" :arg amp: Amplitude.\n" -" :type amp: float\n" -" :arg oct: Number of octaves.\n" -" :type oct: int\n" -" :return: A noise value.\n" -" :rtype: float"); + ".. method:: turbulence3(v, freq, amp, oct=4)\n" + "\n" + " Returns a noise value for a 3D element.\n" + "\n" + " :arg v: Three-dimensional sample point.\n" + " :type v: :class:`mathutils.Vector`, list or tuple of 3 real numbers\n" + " :arg freq: Noise frequency.\n" + " :type freq: float\n" + " :arg amp: Amplitude.\n" + " :type amp: float\n" + " :arg oct: Number of octaves.\n" + " :type oct: int\n" + " :return: A noise value.\n" + " :rtype: float"); static PyObject *FrsNoise_turbulence3(BPy_FrsNoise *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"v", "freq", "amp", "oct", NULL}; - PyObject *obj1; - float f2, f3; - unsigned int i = 4; - Vec3f vec; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "Off|I", (char **)kwlist, &obj1, &f2, &f3, &i)) - return NULL; - if (!Vec3f_ptr_from_PyObject(obj1, vec)) { - PyErr_SetString(PyExc_TypeError, "argument 1 must be a 3D vector (either a list of 3 elements or Vector)"); - return NULL; - } - float t = self->n->turbulence3(vec, f2, f3, i); - return PyFloat_FromDouble(t); + static const char *kwlist[] = {"v", "freq", "amp", "oct", NULL}; + PyObject *obj1; + float f2, f3; + unsigned int i = 4; + Vec3f vec; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "Off|I", (char **)kwlist, &obj1, &f2, &f3, &i)) + return NULL; + if (!Vec3f_ptr_from_PyObject(obj1, vec)) { + PyErr_SetString(PyExc_TypeError, + "argument 1 must be a 3D vector (either a list of 3 elements or Vector)"); + return NULL; + } + float t = self->n->turbulence3(vec, f2, f3, i); + return PyFloat_FromDouble(t); } PyDoc_STRVAR(FrsNoise_smoothNoise1_doc, -".. method:: smoothNoise1(v)\n" -"\n" -" Returns a smooth noise value for a 1D element.\n" -"\n" -" :arg v: One-dimensional sample point.\n" -" :type v: float\n" -" :return: A smooth noise value.\n" -" :rtype: float"); + ".. method:: smoothNoise1(v)\n" + "\n" + " Returns a smooth noise value for a 1D element.\n" + "\n" + " :arg v: One-dimensional sample point.\n" + " :type v: float\n" + " :return: A smooth noise value.\n" + " :rtype: float"); static PyObject *FrsNoise_smoothNoise1(BPy_FrsNoise *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"v", NULL}; - float f; + static const char *kwlist[] = {"v", NULL}; + float f; - if (!PyArg_ParseTupleAndKeywords(args, kwds, "f", (char **)kwlist, &f)) - return NULL; - return PyFloat_FromDouble(self->n->smoothNoise1(f)); + if (!PyArg_ParseTupleAndKeywords(args, kwds, "f", (char **)kwlist, &f)) + return NULL; + return PyFloat_FromDouble(self->n->smoothNoise1(f)); } PyDoc_STRVAR(FrsNoise_smoothNoise2_doc, -".. method:: smoothNoise2(v)\n" -"\n" -" Returns a smooth noise value for a 2D element.\n" -"\n" -" :arg v: Two-dimensional sample point.\n" -" :type v: :class:`mathutils.Vector`, list or tuple of 2 real numbers\n" -" :return: A smooth noise value.\n" -" :rtype: float"); + ".. method:: smoothNoise2(v)\n" + "\n" + " Returns a smooth noise value for a 2D element.\n" + "\n" + " :arg v: Two-dimensional sample point.\n" + " :type v: :class:`mathutils.Vector`, list or tuple of 2 real numbers\n" + " :return: A smooth noise value.\n" + " :rtype: float"); static PyObject *FrsNoise_smoothNoise2(BPy_FrsNoise *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"v", NULL}; - PyObject *obj; - Vec2f vec; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", (char **)kwlist, &obj)) - return NULL; - if (!Vec2f_ptr_from_PyObject(obj, vec)) { - PyErr_SetString(PyExc_TypeError, "argument 1 must be a 2D vector (either a list of 2 elements or Vector)"); - return NULL; - } - float t = self->n->smoothNoise2(vec); - return PyFloat_FromDouble(t); + static const char *kwlist[] = {"v", NULL}; + PyObject *obj; + Vec2f vec; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", (char **)kwlist, &obj)) + return NULL; + if (!Vec2f_ptr_from_PyObject(obj, vec)) { + PyErr_SetString(PyExc_TypeError, + "argument 1 must be a 2D vector (either a list of 2 elements or Vector)"); + return NULL; + } + float t = self->n->smoothNoise2(vec); + return PyFloat_FromDouble(t); } PyDoc_STRVAR(FrsNoise_smoothNoise3_doc, -".. method:: smoothNoise3(v)\n" -"\n" -" Returns a smooth noise value for a 3D element.\n" -"\n" -" :arg v: Three-dimensional sample point.\n" -" :type v: :class:`mathutils.Vector`, list or tuple of 3 real numbers\n" -" :return: A smooth noise value.\n" -" :rtype: float"); + ".. method:: smoothNoise3(v)\n" + "\n" + " Returns a smooth noise value for a 3D element.\n" + "\n" + " :arg v: Three-dimensional sample point.\n" + " :type v: :class:`mathutils.Vector`, list or tuple of 3 real numbers\n" + " :return: A smooth noise value.\n" + " :rtype: float"); static PyObject *FrsNoise_smoothNoise3(BPy_FrsNoise *self, PyObject *args, PyObject *kwds) { - static const char *kwlist[] = {"v", NULL}; - PyObject *obj; - Vec3f vec; - - if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", (char **)kwlist, &obj)) - return NULL; - if (!Vec3f_ptr_from_PyObject(obj, vec)) { - PyErr_SetString(PyExc_TypeError, "argument 1 must be a 3D vector (either a list of 3 elements or Vector)"); - return NULL; - } - float t = self->n->smoothNoise3(vec); - return PyFloat_FromDouble(t); + static const char *kwlist[] = {"v", NULL}; + PyObject *obj; + Vec3f vec; + + if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", (char **)kwlist, &obj)) + return NULL; + if (!Vec3f_ptr_from_PyObject(obj, vec)) { + PyErr_SetString(PyExc_TypeError, + "argument 1 must be a 3D vector (either a list of 3 elements or Vector)"); + return NULL; + } + float t = self->n->smoothNoise3(vec); + return PyFloat_FromDouble(t); } static PyMethodDef BPy_FrsNoise_methods[] = { - {"turbulence1", (PyCFunction)FrsNoise_turbulence1, METH_VARARGS | METH_KEYWORDS, FrsNoise_turbulence1_doc}, - {"turbulence2", (PyCFunction)FrsNoise_turbulence2, METH_VARARGS | METH_KEYWORDS, FrsNoise_turbulence2_doc}, - {"turbulence3", (PyCFunction)FrsNoise_turbulence3, METH_VARARGS | METH_KEYWORDS, FrsNoise_turbulence3_doc}, - {"smoothNoise1", (PyCFunction)FrsNoise_smoothNoise1, METH_VARARGS | METH_KEYWORDS, FrsNoise_smoothNoise1_doc}, - {"smoothNoise2", (PyCFunction)FrsNoise_smoothNoise2, METH_VARARGS | METH_KEYWORDS, FrsNoise_smoothNoise2_doc}, - {"smoothNoise3", (PyCFunction)FrsNoise_smoothNoise3, METH_VARARGS | METH_KEYWORDS, FrsNoise_smoothNoise3_doc}, - {"rand", (PyCFunction)FrsNoise_drand, METH_VARARGS | METH_KEYWORDS, NULL}, - {"turbulence_smooth", (PyCFunction)FrsNoise_turbulence_smooth, METH_VARARGS | METH_KEYWORDS, NULL}, - {NULL, NULL, 0, NULL}, + {"turbulence1", + (PyCFunction)FrsNoise_turbulence1, + METH_VARARGS | METH_KEYWORDS, + FrsNoise_turbulence1_doc}, + {"turbulence2", + (PyCFunction)FrsNoise_turbulence2, + METH_VARARGS | METH_KEYWORDS, + FrsNoise_turbulence2_doc}, + {"turbulence3", + (PyCFunction)FrsNoise_turbulence3, + METH_VARARGS | METH_KEYWORDS, + FrsNoise_turbulence3_doc}, + {"smoothNoise1", + (PyCFunction)FrsNoise_smoothNoise1, + METH_VARARGS | METH_KEYWORDS, + FrsNoise_smoothNoise1_doc}, + {"smoothNoise2", + (PyCFunction)FrsNoise_smoothNoise2, + METH_VARARGS | METH_KEYWORDS, + FrsNoise_smoothNoise2_doc}, + {"smoothNoise3", + (PyCFunction)FrsNoise_smoothNoise3, + METH_VARARGS | METH_KEYWORDS, + FrsNoise_smoothNoise3_doc}, + {"rand", (PyCFunction)FrsNoise_drand, METH_VARARGS | METH_KEYWORDS, NULL}, + {"turbulence_smooth", + (PyCFunction)FrsNoise_turbulence_smooth, + METH_VARARGS | METH_KEYWORDS, + NULL}, + {NULL, NULL, 0, NULL}, }; /*-----------------------BPy_FrsNoise type definition ------------------------------*/ PyTypeObject FrsNoise_Type = { - PyVarObject_HEAD_INIT(NULL, 0) - "Noise", /* tp_name */ - sizeof(BPy_FrsNoise), /* tp_basicsize */ - 0, /* tp_itemsize */ - (destructor)FrsNoise_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_reserved */ - (reprfunc)FrsNoise_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 */ - FrsNoise_doc, /* tp_doc */ - 0, /* tp_traverse */ - 0, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - BPy_FrsNoise_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - (initproc)FrsNoise_init, /* tp_init */ - 0, /* tp_alloc */ - PyType_GenericNew, /* tp_new */ + PyVarObject_HEAD_INIT(NULL, 0) "Noise", /* tp_name */ + sizeof(BPy_FrsNoise), /* tp_basicsize */ + 0, /* tp_itemsize */ + (destructor)FrsNoise_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_reserved */ + (reprfunc)FrsNoise_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 */ + FrsNoise_doc, /* tp_doc */ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + BPy_FrsNoise_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + (initproc)FrsNoise_init, /* tp_init */ + 0, /* tp_alloc */ + PyType_GenericNew, /* tp_new */ }; /////////////////////////////////////////////////////////////////////////////////////////// |