2008-07-23 07:56:08 +00:00
|
|
|
#include "BPy_ViewVertex.h"
|
2008-07-18 20:31:40 +00:00
|
|
|
|
2008-07-23 07:56:08 +00:00
|
|
|
#include "../BPy_Convert.h"
|
2008-07-25 00:18:10 +00:00
|
|
|
#include "../Interface1D/BPy_ViewEdge.h"
|
2008-07-24 20:39:13 +00:00
|
|
|
#include "../BPy_Nature.h"
|
2008-07-18 20:31:40 +00:00
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
extern "C" {
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
//------------------------INSTANCE METHODS ----------------------------------
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char ViewVertex___doc__[] =
|
2010-08-12 12:17:47 +00:00
|
|
|
"Class hierarchy: :class:`Interface0D` > :class:`ViewVertex`\n"
|
|
|
|
|
"\n"
|
2010-04-17 23:47:47 +00:00
|
|
|
"Class to define a view vertex. A view vertex is a feature vertex\n"
|
|
|
|
|
"corresponding to a point of the image graph, where the characteristics\n"
|
|
|
|
|
"of an edge (e.g., nature and visibility) might change. A\n"
|
|
|
|
|
":class:`ViewVertex` can be of two kinds: A :class:`TVertex` when it\n"
|
|
|
|
|
"corresponds to the intersection between two ViewEdges or a\n"
|
|
|
|
|
":class:`NonTVertex` when it corresponds to a vertex of the initial\n"
|
|
|
|
|
"input mesh (it is the case for vertices such as corners for example).\n"
|
|
|
|
|
"Thus, this class can be specialized into two classes, the\n"
|
|
|
|
|
":class:`TVertex` class and the :class:`NonTVertex` class.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Default constructor.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__(iBrother)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Copy constructor.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iBrother: A ViewVertex object.\n"
|
|
|
|
|
" :type iBrother: :class:`ViewVertex`\n";
|
|
|
|
|
|
|
|
|
|
static int ViewVertex___init__( BPy_ViewVertex *self, PyObject *args, PyObject *kwds )
|
2008-07-20 05:01:29 +00:00
|
|
|
{
|
2009-08-02 22:39:21 +00:00
|
|
|
if( !PyArg_ParseTuple(args, "") )
|
|
|
|
|
return -1;
|
2008-07-25 00:18:10 +00:00
|
|
|
self->vv = 0; // ViewVertex is abstract
|
2009-08-02 22:39:21 +00:00
|
|
|
self->py_if0D.if0D = self->vv;
|
SWIG/directors dependency removal (cont'd)
* Added to python/BPy_Convert.{cpp,h} 4 utility converters below for
better introspection-based automatic type conversion.
PyObject * Any_BPy_Interface0D_from_Interface0D( Interface0D& if0D );
PyObject * Any_BPy_Interface1D_from_Interface1D( Interface1D& if1D );
PyObject * Any_BPy_FEdge_from_FEdge( FEdge& fe );
PyObject * Any_BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );
There are 4 corresponding converters without the "Any_" prefix. All
calls of them in the code base were replaced with these new converters
so that the introspection-based automatic conversion would take place
universally.
* python/BPy_Convert.{cpp,h}: Those C++ to Python converters having
had a "_ptr" suffix were renamed to a name without the suffix, and
their arguments were changed so as to take a reference (e.g.,
ViewVertex&) instead of a pointer (e.g., ViewVertex *). The changed
converters and their new function prototypes are listed below. These
converters now return a Python wrapper object that retains the passed
reference, instead of retaining a newly created C++ object by the
converters.
// Interface0D converters
PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp );
PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
PyObject * BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );
PyObject * BPy_TVertex_from_TVertex( TVertex& tv );
PyObject * BPy_NonTVertex_from_NonTVertex( NonTVertex& ntv );
// Interface1D converters
PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D );
PyObject * BPy_Chain_from_Chain( Chain& c );
PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
PyObject * BPy_FEdgeSharp_from_FEdgeSharp( FEdgeSharp& fes );
PyObject * BPy_FEdgeSmooth_from_FEdgeSmooth( FEdgeSmooth& fes );
PyObject * BPy_Stroke_from_Stroke( Stroke& s );
PyObject * BPy_ViewEdge_from_ViewEdge( ViewEdge& ve );
PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve );
// some other converters
PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs );
PyObject * BPy_SShape_from_SShape( SShape& ss );
PyObject * BPy_FrsMaterial_from_FrsMaterial( FrsMaterial& m );
PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );
* Added a "borrowed" flag to the definitions of Python types being
used to wrap C++ components of Freestyle's internal data structures.
The flag indicates whether or not a Python wrapper object has a
reference to a C++ object that comprises the internal data structures.
The deallocation routines of the Python types check this flag and
release a wrapped C++ object only when it is not part of the internal
data structures. The following files were modified:
python/BPy_FrsMaterial.{cpp,h}
python/BPy_Interface0D.{cpp,h}
python/BPy_Interface1D.{cpp,h}
python/BPy_SShape.{cpp,h}
python/BPy_StrokeAttribute.{cpp,h}
python/BPy_ViewShape.{cpp,h}
python/Interface0D/BPy_CurvePoint.cpp
python/Interface0D/BPy_SVertex.cpp
python/Interface0D/BPy_ViewVertex.cpp
python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
python/Interface0D/ViewVertex/BPy_TVertex.cpp
python/Interface1D/BPy_FEdge.cpp
python/Interface1D/BPy_FrsCurve.cpp
python/Interface1D/BPy_Stroke.cpp
python/Interface1D/BPy_ViewEdge.cpp
python/Interface1D/Curve/BPy_Chain.cpp
python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
* view_map/Interface[01]D.h, python/BPy_Interface[01]D.cpp: Removed
from the Interface0D and Interface1D C++ classes a back pointer to a
Python wrapper object and all "director" calls. These classes (and
their subclasses) are used to build Freestyle's main data structures
(such as a view map and strokes) and their class hierarchy is static.
Python wrappers of these C++ classes are only used to access the data
structures from the Python layer, and not intended to extend the data
structures by subclassing the Python wrappers. Without the necessity
of subclassing in the Python layer, the back pointer to a wrapping
Python object and "director" calls would be useless (actually they
were not used at all), so they were all removed.
* python/Director.{cpp,h}: Removed the definitions of directors that
were no longer used.
* stroke/Stroke.{cpp,h}: Removed an (unused) back pointer to a Python
wrapper object.
* python/BPy_ViewMap.cpp: Fixed a possible null pointer reference.
* python/Interface1D/BPy_FEdge.cpp: Fixed parameter checking in
FEdge___init__().
2009-08-02 16:23:18 +00:00
|
|
|
self->py_if0D.borrowed = 0;
|
2008-07-18 20:31:40 +00:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char ViewVertex_setNature___doc__[] =
|
|
|
|
|
".. method:: setNature(iNature)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Sets the nature of the vertex.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iNature: A Nature object.\n"
|
|
|
|
|
" :type iNature: :class:`Nature`\n";
|
2008-07-24 20:39:13 +00:00
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args ) {
|
2008-07-20 05:01:29 +00:00
|
|
|
PyObject *py_n;
|
|
|
|
|
|
2008-07-25 00:18:10 +00:00
|
|
|
if( !self->vv )
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
|
2009-04-04 15:26:12 +00:00
|
|
|
if(!( PyArg_ParseTuple(args, "O!", &Nature_Type, &py_n) ))
|
|
|
|
|
return NULL;
|
2008-07-20 05:01:29 +00:00
|
|
|
|
|
|
|
|
PyObject *i = (PyObject *) &( ((BPy_Nature *) py_n)->i );
|
2009-09-27 00:32:20 +00:00
|
|
|
((ViewVertex *) self->py_if0D.if0D)->setNature( PyLong_AsLong(i) );
|
2008-07-20 05:01:29 +00:00
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char ViewVertex_edgesBegin___doc__[] =
|
|
|
|
|
".. method:: edgesBegin()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns an iterator over the ViewEdges that goes to or comes from\n"
|
|
|
|
|
" this ViewVertex pointing to the first ViewEdge of the list. The\n"
|
|
|
|
|
" orientedViewEdgeIterator allows to iterate in CCW order over these\n"
|
|
|
|
|
" ViewEdges and to get the orientation for each ViewEdge\n"
|
|
|
|
|
" (incoming/outgoing).\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :return: An orientedViewEdgeIterator pointing to the first ViewEdge.\n"
|
|
|
|
|
" :rtype: :class:`orientedViewEdgeIterator`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * ViewVertex_edgesBegin( BPy_ViewVertex *self ) {
|
2008-07-25 00:18:10 +00:00
|
|
|
if( !self->vv )
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
|
|
|
|
|
ViewVertexInternal::orientedViewEdgeIterator ove_it( self->vv->edgesBegin() );
|
2009-07-31 22:13:48 +00:00
|
|
|
return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ove_it, 0 );
|
2008-07-25 00:18:10 +00:00
|
|
|
}
|
2008-07-18 20:31:40 +00:00
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char ViewVertex_edgesEnd___doc__[] =
|
|
|
|
|
".. method:: edgesEnd()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns an orientedViewEdgeIterator over the ViewEdges around this\n"
|
|
|
|
|
" ViewVertex, pointing after the last ViewEdge.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :return: An orientedViewEdgeIterator pointing after the last ViewEdge.\n"
|
|
|
|
|
" :rtype: :class:`orientedViewEdgeIterator`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * ViewVertex_edgesEnd( BPy_ViewVertex *self ) {
|
2009-07-31 23:49:12 +00:00
|
|
|
#if 0
|
2008-07-25 00:18:10 +00:00
|
|
|
if( !self->vv )
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
|
|
|
|
|
ViewVertexInternal::orientedViewEdgeIterator ove_it( self->vv->edgesEnd() );
|
2009-07-31 22:13:48 +00:00
|
|
|
return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ove_it, 1 );
|
2009-07-31 23:49:12 +00:00
|
|
|
#else
|
|
|
|
|
PyErr_SetString(PyExc_NotImplementedError, "edgesEnd method currently disabled");
|
|
|
|
|
return NULL;
|
|
|
|
|
#endif
|
2008-07-25 00:18:10 +00:00
|
|
|
}
|
2008-07-18 20:31:40 +00:00
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char ViewVertex_edgesIterator___doc__[] =
|
|
|
|
|
".. method:: edgesIterator(iEdge)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns an orientedViewEdgeIterator pointing to the ViewEdge given\n"
|
|
|
|
|
" as argument.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iEdge: A ViewEdge object.\n"
|
|
|
|
|
" :type iEdge: :class:`ViewEdge`\n"
|
|
|
|
|
" :return: An orientedViewEdgeIterator pointing to the given ViewEdge.\n"
|
|
|
|
|
" :rtype: :class:`orientedViewEdgeIterator`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * ViewVertex_edgesIterator( BPy_ViewVertex *self, PyObject *args ) {
|
2008-07-25 00:18:10 +00:00
|
|
|
PyObject *py_ve;
|
|
|
|
|
|
|
|
|
|
if( !self->vv )
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
|
2009-04-04 15:26:12 +00:00
|
|
|
if(!( PyArg_ParseTuple(args, "O!", &ViewEdge_Type, &py_ve) ))
|
|
|
|
|
return NULL;
|
2008-07-25 00:18:10 +00:00
|
|
|
|
|
|
|
|
ViewEdge *ve = ((BPy_ViewEdge *) py_ve)->ve;
|
|
|
|
|
ViewVertexInternal::orientedViewEdgeIterator ove_it( self->vv->edgesIterator( ve ) );
|
2009-07-31 22:13:48 +00:00
|
|
|
return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ove_it, 0 );
|
2008-07-18 20:31:40 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
/*----------------------ViewVertex instance definitions ----------------------------*/
|
|
|
|
|
static PyMethodDef BPy_ViewVertex_methods[] = {
|
|
|
|
|
{"setNature", ( PyCFunction ) ViewVertex_setNature, METH_VARARGS, ViewVertex_setNature___doc__},
|
|
|
|
|
{"edgesBegin", ( PyCFunction ) ViewVertex_edgesBegin, METH_NOARGS, ViewVertex_edgesBegin___doc__},
|
|
|
|
|
{"edgesEnd", ( PyCFunction ) ViewVertex_edgesEnd, METH_NOARGS, ViewVertex_edgesEnd___doc__},
|
|
|
|
|
{"edgesIterator", ( PyCFunction ) ViewVertex_edgesIterator, METH_VARARGS, ViewVertex_edgesIterator___doc__},
|
|
|
|
|
{NULL, NULL, 0, NULL}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*-----------------------BPy_ViewVertex type definition ------------------------------*/
|
|
|
|
|
PyTypeObject ViewVertex_Type = {
|
|
|
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
|
|
|
|
"ViewVertex", /* tp_name */
|
|
|
|
|
sizeof(BPy_ViewVertex), /* 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 */
|
|
|
|
|
ViewVertex___doc__, /* tp_doc */
|
|
|
|
|
0, /* tp_traverse */
|
|
|
|
|
0, /* tp_clear */
|
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
|
0, /* tp_iter */
|
|
|
|
|
0, /* tp_iternext */
|
|
|
|
|
BPy_ViewVertex_methods, /* tp_methods */
|
|
|
|
|
0, /* tp_members */
|
|
|
|
|
0, /* tp_getset */
|
|
|
|
|
&Interface0D_Type, /* tp_base */
|
|
|
|
|
0, /* tp_dict */
|
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
|
(initproc)ViewVertex___init__, /* tp_init */
|
|
|
|
|
0, /* tp_alloc */
|
|
|
|
|
0, /* tp_new */
|
|
|
|
|
};
|
2008-07-18 20:31:40 +00:00
|
|
|
|
2008-07-25 00:18:10 +00:00
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
2008-07-20 05:01:29 +00:00
|
|
|
|
2008-07-25 00:18:10 +00:00
|
|
|
#ifdef __cplusplus
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2008-07-24 20:39:13 +00:00
|
|
|
|