Omar Emara
21a2b975b8
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
317 lines
11 KiB
C++
317 lines
11 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_UnaryFunction1DDouble.h"
|
|
|
|
#include "../BPy_Convert.h"
|
|
#include "../BPy_IntegrationType.h"
|
|
#include "../BPy_Interface1D.h"
|
|
|
|
#include "UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_DensityF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_GetProjectedXF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_GetProjectedYF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_GetProjectedZF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_GetXF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_GetYF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_GetZF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h"
|
|
#include "UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
using namespace Freestyle;
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
//-------------------MODULE INITIALIZATION--------------------------------
|
|
|
|
int UnaryFunction1DDouble_Init(PyObject *module)
|
|
{
|
|
if (module == nullptr) {
|
|
return -1;
|
|
}
|
|
|
|
if (PyType_Ready(&UnaryFunction1DDouble_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&UnaryFunction1DDouble_Type);
|
|
PyModule_AddObject(module, "UnaryFunction1DDouble", (PyObject *)&UnaryFunction1DDouble_Type);
|
|
|
|
if (PyType_Ready(&DensityF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&DensityF1D_Type);
|
|
PyModule_AddObject(module, "DensityF1D", (PyObject *)&DensityF1D_Type);
|
|
|
|
if (PyType_Ready(&Curvature2DAngleF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&Curvature2DAngleF1D_Type);
|
|
PyModule_AddObject(module, "Curvature2DAngleF1D", (PyObject *)&Curvature2DAngleF1D_Type);
|
|
|
|
if (PyType_Ready(&GetCompleteViewMapDensityF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&GetCompleteViewMapDensityF1D_Type);
|
|
PyModule_AddObject(
|
|
module, "GetCompleteViewMapDensityF1D", (PyObject *)&GetCompleteViewMapDensityF1D_Type);
|
|
|
|
if (PyType_Ready(&GetDirectionalViewMapDensityF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&GetDirectionalViewMapDensityF1D_Type);
|
|
PyModule_AddObject(module,
|
|
"GetDirectionalViewMapDensityF1D",
|
|
(PyObject *)&GetDirectionalViewMapDensityF1D_Type);
|
|
|
|
if (PyType_Ready(&GetProjectedXF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&GetProjectedXF1D_Type);
|
|
PyModule_AddObject(module, "GetProjectedXF1D", (PyObject *)&GetProjectedXF1D_Type);
|
|
|
|
if (PyType_Ready(&GetProjectedYF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&GetProjectedYF1D_Type);
|
|
PyModule_AddObject(module, "GetProjectedYF1D", (PyObject *)&GetProjectedYF1D_Type);
|
|
|
|
if (PyType_Ready(&GetProjectedZF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&GetProjectedZF1D_Type);
|
|
PyModule_AddObject(module, "GetProjectedZF1D", (PyObject *)&GetProjectedZF1D_Type);
|
|
|
|
if (PyType_Ready(&GetSteerableViewMapDensityF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&GetSteerableViewMapDensityF1D_Type);
|
|
PyModule_AddObject(
|
|
module, "GetSteerableViewMapDensityF1D", (PyObject *)&GetSteerableViewMapDensityF1D_Type);
|
|
|
|
if (PyType_Ready(&GetViewMapGradientNormF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&GetViewMapGradientNormF1D_Type);
|
|
PyModule_AddObject(
|
|
module, "GetViewMapGradientNormF1D", (PyObject *)&GetViewMapGradientNormF1D_Type);
|
|
|
|
if (PyType_Ready(&GetXF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&GetXF1D_Type);
|
|
PyModule_AddObject(module, "GetXF1D", (PyObject *)&GetXF1D_Type);
|
|
|
|
if (PyType_Ready(&GetYF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&GetYF1D_Type);
|
|
PyModule_AddObject(module, "GetYF1D", (PyObject *)&GetYF1D_Type);
|
|
|
|
if (PyType_Ready(&GetZF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&GetZF1D_Type);
|
|
PyModule_AddObject(module, "GetZF1D", (PyObject *)&GetZF1D_Type);
|
|
|
|
if (PyType_Ready(&LocalAverageDepthF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&LocalAverageDepthF1D_Type);
|
|
PyModule_AddObject(module, "LocalAverageDepthF1D", (PyObject *)&LocalAverageDepthF1D_Type);
|
|
|
|
if (PyType_Ready(&ZDiscontinuityF1D_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&ZDiscontinuityF1D_Type);
|
|
PyModule_AddObject(module, "ZDiscontinuityF1D", (PyObject *)&ZDiscontinuityF1D_Type);
|
|
|
|
return 0;
|
|
}
|
|
|
|
//------------------------INSTANCE METHODS ----------------------------------
|
|
|
|
static char UnaryFunction1DDouble___doc__[] =
|
|
"Class hierarchy: :class:`UnaryFunction1D` > :class:`UnaryFunction1DDouble`\n"
|
|
"\n"
|
|
"Base class for unary functions (functors) that work on\n"
|
|
":class:`Interface1D` and return a float value.\n"
|
|
"\n"
|
|
".. method:: __init__()\n"
|
|
" __init__(integration_type)\n"
|
|
"\n"
|
|
" Builds a unary 1D function using the default constructor\n"
|
|
" or the integration method given as an argument.\n"
|
|
"\n"
|
|
" :arg integration_type: An integration method.\n"
|
|
" :type integration_type: :class:`IntegrationType`\n";
|
|
|
|
static int UnaryFunction1DDouble___init__(BPy_UnaryFunction1DDouble *self,
|
|
PyObject *args,
|
|
PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {"integration", nullptr};
|
|
PyObject *obj = nullptr;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(
|
|
args, kwds, "|O!", (char **)kwlist, &IntegrationType_Type, &obj)) {
|
|
return -1;
|
|
}
|
|
|
|
if (!obj) {
|
|
self->uf1D_double = new UnaryFunction1D<double>();
|
|
}
|
|
else {
|
|
self->uf1D_double = new UnaryFunction1D<double>(IntegrationType_from_BPy_IntegrationType(obj));
|
|
}
|
|
|
|
self->uf1D_double->py_uf1D = (PyObject *)self;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static void UnaryFunction1DDouble___dealloc__(BPy_UnaryFunction1DDouble *self)
|
|
{
|
|
delete self->uf1D_double;
|
|
UnaryFunction1D_Type.tp_dealloc((PyObject *)self);
|
|
}
|
|
|
|
static PyObject *UnaryFunction1DDouble___repr__(BPy_UnaryFunction1DDouble *self)
|
|
{
|
|
return PyUnicode_FromFormat("type: %s - address: %p", Py_TYPE(self)->tp_name, self->uf1D_double);
|
|
}
|
|
|
|
static PyObject *UnaryFunction1DDouble___call__(BPy_UnaryFunction1DDouble *self,
|
|
PyObject *args,
|
|
PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {"inter", nullptr};
|
|
PyObject *obj = nullptr;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O!", (char **)kwlist, &Interface1D_Type, &obj)) {
|
|
return nullptr;
|
|
}
|
|
|
|
if (typeid(*(self->uf1D_double)) == typeid(UnaryFunction1D<double>)) {
|
|
PyErr_SetString(PyExc_TypeError, "__call__ method not properly overridden");
|
|
return nullptr;
|
|
}
|
|
if (self->uf1D_double->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 nullptr;
|
|
}
|
|
return PyFloat_FromDouble(self->uf1D_double->result);
|
|
}
|
|
|
|
/*----------------------UnaryFunction1DDouble get/setters ----------------------------*/
|
|
|
|
PyDoc_STRVAR(integration_type_doc,
|
|
"The integration method.\n"
|
|
"\n"
|
|
":type: :class:`IntegrationType`");
|
|
|
|
static PyObject *integration_type_get(BPy_UnaryFunction1DDouble *self, void *UNUSED(closure))
|
|
{
|
|
return BPy_IntegrationType_from_IntegrationType(self->uf1D_double->getIntegrationType());
|
|
}
|
|
|
|
static int integration_type_set(BPy_UnaryFunction1DDouble *self,
|
|
PyObject *value,
|
|
void *UNUSED(closure))
|
|
{
|
|
if (!BPy_IntegrationType_Check(value)) {
|
|
PyErr_SetString(PyExc_TypeError, "value must be an IntegrationType");
|
|
return -1;
|
|
}
|
|
self->uf1D_double->setIntegrationType(IntegrationType_from_BPy_IntegrationType(value));
|
|
return 0;
|
|
}
|
|
|
|
static PyGetSetDef BPy_UnaryFunction1DDouble_getseters[] = {
|
|
{"integration_type",
|
|
(getter)integration_type_get,
|
|
(setter)integration_type_set,
|
|
integration_type_doc,
|
|
nullptr},
|
|
{nullptr, nullptr, nullptr, nullptr, nullptr} /* Sentinel */
|
|
};
|
|
|
|
/*-----------------------BPy_UnaryFunction1DDouble type definition ------------------------------*/
|
|
|
|
PyTypeObject UnaryFunction1DDouble_Type = {
|
|
PyVarObject_HEAD_INIT(nullptr, 0) "UnaryFunction1DDouble", /* tp_name */
|
|
sizeof(BPy_UnaryFunction1DDouble), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
(destructor)UnaryFunction1DDouble___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)UnaryFunction1DDouble___repr__, /* tp_repr */
|
|
nullptr, /* tp_as_number */
|
|
nullptr, /* tp_as_sequence */
|
|
nullptr, /* tp_as_mapping */
|
|
nullptr, /* tp_hash */
|
|
(ternaryfunc)UnaryFunction1DDouble___call__, /* tp_call */
|
|
nullptr, /* tp_str */
|
|
nullptr, /* tp_getattro */
|
|
nullptr, /* tp_setattro */
|
|
nullptr, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
UnaryFunction1DDouble___doc__, /* tp_doc */
|
|
nullptr, /* tp_traverse */
|
|
nullptr, /* tp_clear */
|
|
nullptr, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
nullptr, /* tp_iter */
|
|
nullptr, /* tp_iternext */
|
|
nullptr, /* tp_methods */
|
|
nullptr, /* tp_members */
|
|
BPy_UnaryFunction1DDouble_getseters, /* tp_getset */
|
|
&UnaryFunction1D_Type, /* tp_base */
|
|
nullptr, /* tp_dict */
|
|
nullptr, /* tp_descr_get */
|
|
nullptr, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
(initproc)UnaryFunction1DDouble___init__, /* tp_init */
|
|
nullptr, /* tp_alloc */
|
|
nullptr, /* tp_new */
|
|
};
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|