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
233 lines
7.8 KiB
C++
233 lines
7.8 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_ViewMap.h"
|
|
|
|
#include "BPy_BBox.h"
|
|
#include "BPy_Convert.h"
|
|
#include "Interface1D/BPy_FEdge.h"
|
|
#include "Interface1D/BPy_ViewEdge.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
using namespace Freestyle;
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
//-------------------MODULE INITIALIZATION--------------------------------
|
|
int ViewMap_Init(PyObject *module)
|
|
{
|
|
if (module == nullptr) {
|
|
return -1;
|
|
}
|
|
|
|
if (PyType_Ready(&ViewMap_Type) < 0) {
|
|
return -1;
|
|
}
|
|
Py_INCREF(&ViewMap_Type);
|
|
PyModule_AddObject(module, "ViewMap", (PyObject *)&ViewMap_Type);
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*----------------------ViewMap methods----------------------------*/
|
|
|
|
PyDoc_STRVAR(ViewMap_doc,
|
|
"Class defining the ViewMap.\n"
|
|
"\n"
|
|
".. method:: __init__()\n"
|
|
"\n"
|
|
" Default constructor.");
|
|
|
|
static int ViewMap_init(BPy_ViewMap *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {nullptr};
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "", (char **)kwlist)) {
|
|
return -1;
|
|
}
|
|
self->vm = new ViewMap();
|
|
return 0;
|
|
}
|
|
|
|
static void ViewMap_dealloc(BPy_ViewMap *self)
|
|
{
|
|
delete self->vm;
|
|
Py_TYPE(self)->tp_free((PyObject *)self);
|
|
}
|
|
|
|
static PyObject *ViewMap_repr(BPy_ViewMap *self)
|
|
{
|
|
return PyUnicode_FromFormat("ViewMap - address: %p", self->vm);
|
|
}
|
|
|
|
PyDoc_STRVAR(ViewMap_get_closest_viewedge_doc,
|
|
".. method:: get_closest_viewedge(x, y)\n"
|
|
"\n"
|
|
" Gets the ViewEdge nearest to the 2D point specified as arguments.\n"
|
|
"\n"
|
|
" :arg x: X coordinate of a 2D point.\n"
|
|
" :type x: float\n"
|
|
" :arg y: Y coordinate of a 2D point.\n"
|
|
" :type y: float\n"
|
|
" :return: The ViewEdge nearest to the specified 2D point.\n"
|
|
" :rtype: :class:`ViewEdge`");
|
|
|
|
static PyObject *ViewMap_get_closest_viewedge(BPy_ViewMap *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {"x", "y", nullptr};
|
|
double x, y;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "dd", (char **)kwlist, &x, &y)) {
|
|
return nullptr;
|
|
}
|
|
ViewEdge *ve = const_cast<ViewEdge *>(self->vm->getClosestViewEdge(x, y));
|
|
if (ve) {
|
|
return BPy_ViewEdge_from_ViewEdge(*ve);
|
|
}
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
PyDoc_STRVAR(ViewMap_get_closest_fedge_doc,
|
|
".. method:: get_closest_fedge(x, y)\n"
|
|
"\n"
|
|
" Gets the FEdge nearest to the 2D point specified as arguments.\n"
|
|
"\n"
|
|
" :arg x: X coordinate of a 2D point.\n"
|
|
" :type x: float\n"
|
|
" :arg y: Y coordinate of a 2D point.\n"
|
|
" :type y: float\n"
|
|
" :return: The FEdge nearest to the specified 2D point.\n"
|
|
" :rtype: :class:`FEdge`");
|
|
|
|
static PyObject *ViewMap_get_closest_fedge(BPy_ViewMap *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
static const char *kwlist[] = {"x", "y", nullptr};
|
|
double x, y;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "dd", (char **)kwlist, &x, &y)) {
|
|
return nullptr;
|
|
}
|
|
FEdge *fe = const_cast<FEdge *>(self->vm->getClosestFEdge(x, y));
|
|
if (fe) {
|
|
return Any_BPy_FEdge_from_FEdge(*fe);
|
|
}
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
// static ViewMap *getInstance ();
|
|
|
|
static PyMethodDef BPy_ViewMap_methods[] = {
|
|
{"get_closest_viewedge",
|
|
(PyCFunction)ViewMap_get_closest_viewedge,
|
|
METH_VARARGS | METH_KEYWORDS,
|
|
ViewMap_get_closest_viewedge_doc},
|
|
{"get_closest_fedge",
|
|
(PyCFunction)ViewMap_get_closest_fedge,
|
|
METH_VARARGS | METH_KEYWORDS,
|
|
ViewMap_get_closest_fedge_doc},
|
|
{nullptr, nullptr, 0, nullptr},
|
|
};
|
|
|
|
/*----------------------ViewMap get/setters ----------------------------*/
|
|
|
|
PyDoc_STRVAR(ViewMap_scene_bbox_doc,
|
|
"The 3D bounding box of the scene.\n"
|
|
"\n"
|
|
":type: :class:`BBox`");
|
|
|
|
static PyObject *ViewMap_scene_bbox_get(BPy_ViewMap *self, void *UNUSED(closure))
|
|
{
|
|
return BPy_BBox_from_BBox(self->vm->getScene3dBBox());
|
|
}
|
|
|
|
static int ViewMap_scene_bbox_set(BPy_ViewMap *self, PyObject *value, void *UNUSED(closure))
|
|
{
|
|
if (!BPy_BBox_Check(value)) {
|
|
PyErr_SetString(PyExc_TypeError, "value must be a BBox");
|
|
return -1;
|
|
}
|
|
self->vm->setScene3dBBox(*(((BPy_BBox *)value)->bb));
|
|
return 0;
|
|
}
|
|
|
|
static PyGetSetDef BPy_ViewMap_getseters[] = {
|
|
{"scene_bbox",
|
|
(getter)ViewMap_scene_bbox_get,
|
|
(setter)ViewMap_scene_bbox_set,
|
|
ViewMap_scene_bbox_doc,
|
|
nullptr},
|
|
{nullptr, nullptr, nullptr, nullptr, nullptr} /* Sentinel */
|
|
};
|
|
|
|
/*-----------------------BPy_ViewMap type definition ------------------------------*/
|
|
|
|
PyTypeObject ViewMap_Type = {
|
|
PyVarObject_HEAD_INIT(nullptr, 0) "ViewMap", /* tp_name */
|
|
sizeof(BPy_ViewMap), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
(destructor)ViewMap_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)ViewMap_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 */
|
|
ViewMap_doc, /* tp_doc */
|
|
nullptr, /* tp_traverse */
|
|
nullptr, /* tp_clear */
|
|
nullptr, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
nullptr, /* tp_iter */
|
|
nullptr, /* tp_iternext */
|
|
BPy_ViewMap_methods, /* tp_methods */
|
|
nullptr, /* tp_members */
|
|
BPy_ViewMap_getseters, /* tp_getset */
|
|
nullptr, /* tp_base */
|
|
nullptr, /* tp_dict */
|
|
nullptr, /* tp_descr_get */
|
|
nullptr, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
(initproc)ViewMap_init, /* tp_init */
|
|
nullptr, /* tp_alloc */
|
|
PyType_GenericNew, /* tp_new */
|
|
};
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|