The header files in freestyle utilize the using-directive at the global file scope. This is a bad practice as it pollutes the global name space causing possible ambiguous reference compilation errors. In particular, the DNA files that are included by freestyle will cause those ambiguous reference errors when the developers adds a DNA member with a type name that also exist in the Freestyle name space, such as Curve and possibly others. This patch does the minimal work needed to resolve that by moving the using-directives from the headers into the corresponding translation units. Reviewed By: Brecht Differential Revision: https://developer.blender.org/D10351
379 lines
13 KiB
C++
379 lines
13 KiB
C++
/*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*/
|
|
|
|
/** \file
|
|
* \ingroup freestyle
|
|
*/
|
|
|
|
#include "BPy_FrsNoise.h"
|
|
#include "BPy_Convert.h"
|
|
|
|
#include "../system/RandGen.h"
|
|
|
|
#include <sstream>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
using namespace Freestyle;
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
//-------------------MODULE INITIALIZATION--------------------------------
|
|
int FrsNoise_Init(PyObject *module)
|
|
{
|
|
if (module == nullptr) {
|
|
return -1;
|
|
}
|
|
|
|
if (PyType_Ready(&FrsNoise_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&FrsNoise_Type);
|
|
PyModule_AddObject(module, "Noise", (PyObject *)&FrsNoise_Type);
|
|
|
|
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");
|
|
|
|
static int FrsNoise_init(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {"seed", nullptr};
|
|
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);
|
|
}
|
|
|
|
static PyObject *FrsNoise_repr(BPy_FrsNoise *self)
|
|
{
|
|
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");
|
|
|
|
static PyObject *FrsNoise_drand(BPy_FrsNoise * /*self*/, PyObject *args, PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {"seed", nullptr};
|
|
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 nullptr;
|
|
}
|
|
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", nullptr};
|
|
|
|
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 nullptr;
|
|
}
|
|
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", nullptr};
|
|
float f1, f2, f3;
|
|
unsigned int i = 4;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "fff|I", (char **)kwlist, &f1, &f2, &f3, &i)) {
|
|
return nullptr;
|
|
}
|
|
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");
|
|
|
|
static PyObject *FrsNoise_turbulence2(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {"v", "freq", "amp", "oct", nullptr};
|
|
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 nullptr;
|
|
}
|
|
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 nullptr;
|
|
}
|
|
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");
|
|
|
|
static PyObject *FrsNoise_turbulence3(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {"v", "freq", "amp", "oct", nullptr};
|
|
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 nullptr;
|
|
}
|
|
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 nullptr;
|
|
}
|
|
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");
|
|
|
|
static PyObject *FrsNoise_smoothNoise1(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {"v", nullptr};
|
|
float f;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "f", (char **)kwlist, &f)) {
|
|
return nullptr;
|
|
}
|
|
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");
|
|
|
|
static PyObject *FrsNoise_smoothNoise2(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {"v", nullptr};
|
|
PyObject *obj;
|
|
Vec2f vec;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", (char **)kwlist, &obj)) {
|
|
return nullptr;
|
|
}
|
|
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 nullptr;
|
|
}
|
|
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");
|
|
|
|
static PyObject *FrsNoise_smoothNoise3(BPy_FrsNoise *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {"v", nullptr};
|
|
PyObject *obj;
|
|
Vec3f vec;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O", (char **)kwlist, &obj)) {
|
|
return nullptr;
|
|
}
|
|
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 nullptr;
|
|
}
|
|
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, nullptr},
|
|
{"turbulence_smooth",
|
|
(PyCFunction)FrsNoise_turbulence_smooth,
|
|
METH_VARARGS | METH_KEYWORDS,
|
|
nullptr},
|
|
{nullptr, nullptr, 0, nullptr},
|
|
};
|
|
|
|
/*-----------------------BPy_FrsNoise type definition ------------------------------*/
|
|
|
|
PyTypeObject FrsNoise_Type = {
|
|
PyVarObject_HEAD_INIT(nullptr, 0) "Noise", /* tp_name */
|
|
sizeof(BPy_FrsNoise), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
(destructor)FrsNoise_dealloc, /* tp_dealloc */
|
|
#if PY_VERSION_HEX >= 0x03080000
|
|
0, /* tp_vectorcall_offset */
|
|
#else
|
|
nullptr, /* tp_print */
|
|
#endif
|
|
nullptr, /* tp_getattr */
|
|
nullptr, /* tp_setattr */
|
|
nullptr, /* tp_reserved */
|
|
(reprfunc)FrsNoise_repr, /* tp_repr */
|
|
nullptr, /* tp_as_number */
|
|
nullptr, /* tp_as_sequence */
|
|
nullptr, /* tp_as_mapping */
|
|
nullptr, /* tp_hash */
|
|
nullptr, /* tp_call */
|
|
nullptr, /* tp_str */
|
|
nullptr, /* tp_getattro */
|
|
nullptr, /* tp_setattro */
|
|
nullptr, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
FrsNoise_doc, /* tp_doc */
|
|
nullptr, /* tp_traverse */
|
|
nullptr, /* tp_clear */
|
|
nullptr, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
nullptr, /* tp_iter */
|
|
nullptr, /* tp_iternext */
|
|
BPy_FrsNoise_methods, /* tp_methods */
|
|
nullptr, /* tp_members */
|
|
nullptr, /* tp_getset */
|
|
nullptr, /* tp_base */
|
|
nullptr, /* tp_dict */
|
|
nullptr, /* tp_descr_get */
|
|
nullptr, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
(initproc)FrsNoise_init, /* tp_init */
|
|
nullptr, /* tp_alloc */
|
|
PyType_GenericNew, /* tp_new */
|
|
};
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|