2008-08-01 02:15:25 +00:00
|
|
|
#include "BPy_FrsCurve.h"
|
2008-07-25 02:18:02 +00:00
|
|
|
|
|
|
|
|
#include "../BPy_Convert.h"
|
|
|
|
|
#include "../BPy_Id.h"
|
|
|
|
|
#include "../Interface0D/BPy_CurvePoint.h"
|
|
|
|
|
#include "../Interface0D/BPy_SVertex.h"
|
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
extern "C" {
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
//------------------------INSTANCE METHODS ----------------------------------
|
2010-04-17 23:47:47 +00:00
|
|
|
|
|
|
|
|
static char FrsCurve___doc__[] =
|
|
|
|
|
"Base class for curves made of CurvePoints. :class:`SVertex` is the\n"
|
|
|
|
|
"type of the initial curve vertices. A :class:`Chain` is a\n"
|
|
|
|
|
"specialization of a Curve.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Default Constructor.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__(iBrother)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Copy Constructor.\n"
|
|
|
|
|
"\n"
|
2010-05-14 21:29:13 +00:00
|
|
|
" :arg iBrother: A Curve object.\n"
|
2010-05-09 18:05:33 +00:00
|
|
|
" :type iBrother: :class:`Curve`\n"
|
2010-04-17 23:47:47 +00:00
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__(iId)\n"
|
|
|
|
|
"\n"
|
2010-05-14 21:29:13 +00:00
|
|
|
" Builds a Curve from its Id.\n"
|
2010-04-17 23:47:47 +00:00
|
|
|
"\n"
|
|
|
|
|
" :arg iId: An Id object.\n"
|
|
|
|
|
" :type iId: :class:`Id`\n";
|
|
|
|
|
|
|
|
|
|
static int FrsCurve___init__(BPy_FrsCurve *self, PyObject *args, PyObject *kwds)
|
2008-07-25 02:18:02 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
|
|
PyObject *obj = 0;
|
|
|
|
|
|
|
|
|
|
if (! PyArg_ParseTuple(args, "|O", &obj) )
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
if( !obj ){
|
|
|
|
|
self->c = new Curve();
|
|
|
|
|
|
2008-08-01 02:15:25 +00:00
|
|
|
} else if( BPy_FrsCurve_Check(obj) ) {
|
2009-03-29 21:50:10 +00:00
|
|
|
self->c = new Curve(*( ((BPy_FrsCurve *) obj)->c ));
|
2008-07-25 02:18:02 +00:00
|
|
|
|
|
|
|
|
} else if( BPy_Id_Check(obj) ) {
|
2009-03-29 21:50:10 +00:00
|
|
|
self->c = new Curve(*( ((BPy_Id *) obj)->id ));
|
2008-07-25 02:18:02 +00:00
|
|
|
|
|
|
|
|
} else {
|
2009-03-29 21:50:10 +00:00
|
|
|
PyErr_SetString(PyExc_TypeError, "invalid argument");
|
2008-07-25 02:18:02 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-25 02:18:02 +00:00
|
|
|
self->py_if1D.if1D = self->c;
|
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_if1D.borrowed = 0;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-25 02:18:02 +00:00
|
|
|
return 0;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char FrsCurve_push_vertex_back___doc__[] =
|
|
|
|
|
".. method:: push_vertex_back(iVertex)\n"
|
|
|
|
|
"\n"
|
2010-05-14 21:29:13 +00:00
|
|
|
" Adds a single vertex at the end of the Curve.\n"
|
2010-04-17 23:47:47 +00:00
|
|
|
"\n"
|
|
|
|
|
" :arg iVertex: A vertex object.\n"
|
|
|
|
|
" :type iVertex: :class:`SVertex` or :class:`CurvePoint`\n";
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static PyObject * FrsCurve_push_vertex_back( BPy_FrsCurve *self, PyObject *args ) {
|
2008-07-25 02:18:02 +00:00
|
|
|
PyObject *obj;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2009-03-29 21:50:10 +00:00
|
|
|
if(!( PyArg_ParseTuple(args, "O", &obj) ))
|
|
|
|
|
return NULL;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-25 02:18:02 +00:00
|
|
|
if( BPy_CurvePoint_Check(obj) ) {
|
|
|
|
|
self->c->push_vertex_back( ((BPy_CurvePoint *) obj)->cp );
|
|
|
|
|
} else if( BPy_SVertex_Check(obj) ) {
|
|
|
|
|
self->c->push_vertex_back( ((BPy_SVertex *) obj)->sv );
|
2009-03-29 21:50:10 +00:00
|
|
|
} else {
|
|
|
|
|
PyErr_SetString(PyExc_TypeError, "invalid argument");
|
|
|
|
|
return NULL;
|
2008-07-25 02:18:02 +00:00
|
|
|
}
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-25 02:18:02 +00:00
|
|
|
Py_RETURN_NONE;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char FrsCurve_push_vertex_front___doc__[] =
|
|
|
|
|
".. method:: push_vertex_front(iVertex)\n"
|
|
|
|
|
"\n"
|
2010-05-14 21:29:13 +00:00
|
|
|
" Adds a single vertex at the front of the Curve.\n"
|
2010-04-17 23:47:47 +00:00
|
|
|
"\n"
|
|
|
|
|
" :arg iVertex: A vertex object.\n"
|
|
|
|
|
" :type iVertex: :class:`SVertex` or :class:`CurvePoint`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * FrsCurve_push_vertex_front( BPy_FrsCurve *self, PyObject *args ) {
|
2009-03-29 21:50:10 +00:00
|
|
|
PyObject *obj;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2009-03-29 21:50:10 +00:00
|
|
|
if(!( PyArg_ParseTuple(args, "O", &obj) ))
|
|
|
|
|
return NULL;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2009-03-29 21:50:10 +00:00
|
|
|
if( BPy_CurvePoint_Check(obj) ) {
|
|
|
|
|
self->c->push_vertex_front( ((BPy_CurvePoint *) obj)->cp );
|
|
|
|
|
} else if( BPy_SVertex_Check(obj) ) {
|
|
|
|
|
self->c->push_vertex_front( ((BPy_SVertex *) obj)->sv );
|
|
|
|
|
} else {
|
|
|
|
|
PyErr_SetString(PyExc_TypeError, "invalid argument");
|
|
|
|
|
return NULL;
|
2008-07-25 02:18:02 +00:00
|
|
|
}
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2009-03-29 21:50:10 +00:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char FrsCurve_empty___doc__[] =
|
|
|
|
|
".. method:: empty()\n"
|
|
|
|
|
"\n"
|
2010-05-14 21:29:13 +00:00
|
|
|
" Returns true if the Curve doesn't have any Vertex yet.\n"
|
2010-04-17 23:47:47 +00:00
|
|
|
"\n"
|
2010-05-14 21:29:13 +00:00
|
|
|
" :return: True if the Curve has no vertices.\n"
|
2010-04-17 23:47:47 +00:00
|
|
|
" :rtype: bool\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * FrsCurve_empty( BPy_FrsCurve *self ) {
|
2008-07-25 02:18:02 +00:00
|
|
|
return PyBool_from_bool( self->c->empty() );
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char FrsCurve_nSegments___doc__[] =
|
|
|
|
|
".. method:: nSegments()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns the number of segments in the polyline constituing the\n"
|
2010-05-14 21:29:13 +00:00
|
|
|
" Curve.\n"
|
2010-04-17 23:47:47 +00:00
|
|
|
"\n"
|
|
|
|
|
" :return: The number of segments.\n"
|
|
|
|
|
" :rtype: int\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * FrsCurve_nSegments( BPy_FrsCurve *self ) {
|
2009-09-27 00:32:20 +00:00
|
|
|
return PyLong_FromLong( self->c->nSegments() );
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
/*----------------------FrsCurve instance definitions ----------------------------*/
|
|
|
|
|
static PyMethodDef BPy_FrsCurve_methods[] = {
|
|
|
|
|
{"push_vertex_back", ( PyCFunction ) FrsCurve_push_vertex_back, METH_VARARGS, FrsCurve_push_vertex_back___doc__},
|
|
|
|
|
{"push_vertex_front", ( PyCFunction ) FrsCurve_push_vertex_front, METH_VARARGS, FrsCurve_push_vertex_front___doc__},
|
|
|
|
|
{"empty", ( PyCFunction ) FrsCurve_empty, METH_NOARGS, FrsCurve_empty___doc__},
|
|
|
|
|
{"nSegments", ( PyCFunction ) FrsCurve_nSegments, METH_NOARGS, FrsCurve_nSegments___doc__},
|
|
|
|
|
{NULL, NULL, 0, NULL}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*-----------------------BPy_FrsCurve type definition ------------------------------*/
|
|
|
|
|
|
|
|
|
|
PyTypeObject FrsCurve_Type = {
|
|
|
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
2010-05-09 18:05:33 +00:00
|
|
|
"Curve", /* tp_name */
|
2010-04-17 23:47:47 +00:00
|
|
|
sizeof(BPy_FrsCurve), /* 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 */
|
|
|
|
|
FrsCurve___doc__, /* tp_doc */
|
|
|
|
|
0, /* tp_traverse */
|
|
|
|
|
0, /* tp_clear */
|
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
|
0, /* tp_iter */
|
|
|
|
|
0, /* tp_iternext */
|
|
|
|
|
BPy_FrsCurve_methods, /* tp_methods */
|
|
|
|
|
0, /* tp_members */
|
|
|
|
|
0, /* tp_getset */
|
|
|
|
|
&Interface1D_Type, /* tp_base */
|
|
|
|
|
0, /* tp_dict */
|
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
|
(initproc)FrsCurve___init__, /* tp_init */
|
|
|
|
|
0, /* tp_alloc */
|
|
|
|
|
0, /* tp_new */
|
|
|
|
|
};
|
|
|
|
|
|
2008-07-25 02:18:02 +00:00
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-25 02:18:02 +00:00
|
|
|
#ifdef __cplusplus
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
2008-07-25 02:18:02 +00:00
|
|
|
#endif
|