2008-07-24 08:29:48 +00:00
|
|
|
#include "BPy_SShape.h"
|
|
|
|
|
|
|
|
|
|
#include "BPy_Convert.h"
|
2008-07-24 20:39:13 +00:00
|
|
|
#include "BPy_BBox.h"
|
|
|
|
|
#include "BPy_Id.h"
|
2008-07-24 08:29:48 +00:00
|
|
|
#include "Interface0D/BPy_SVertex.h"
|
|
|
|
|
#include "Interface1D/BPy_FEdge.h"
|
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
extern "C" {
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
//-------------------MODULE INITIALIZATION--------------------------------
|
2009-09-27 00:32:20 +00:00
|
|
|
int SShape_Init( PyObject *module )
|
2008-07-24 08:29:48 +00:00
|
|
|
{
|
|
|
|
|
if( module == NULL )
|
2009-09-27 00:32:20 +00:00
|
|
|
return -1;
|
2008-07-24 08:29:48 +00:00
|
|
|
|
|
|
|
|
if( PyType_Ready( &SShape_Type ) < 0 )
|
2009-09-27 00:32:20 +00:00
|
|
|
return -1;
|
2008-07-24 08:29:48 +00:00
|
|
|
|
|
|
|
|
Py_INCREF( &SShape_Type );
|
|
|
|
|
PyModule_AddObject(module, "SShape", (PyObject *)&SShape_Type);
|
2009-09-27 00:32:20 +00:00
|
|
|
return 0;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
//------------------------INSTANCE METHODS ----------------------------------
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char SShape___doc__[] =
|
|
|
|
|
"Class to define a feature shape. It is the gathering of feature\n"
|
|
|
|
|
"elements from an identified input shape.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Default constructor.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__(iBrother)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Copy constructor.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iBrother: An SShape object.\n"
|
|
|
|
|
" :type iBrother: :class:`SShape`\n";
|
|
|
|
|
|
|
|
|
|
static int SShape___init__(BPy_SShape *self, PyObject *args, PyObject *kwds)
|
2008-07-24 08:29:48 +00:00
|
|
|
{
|
2009-03-29 17:44:14 +00:00
|
|
|
PyObject *obj = NULL;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2009-03-29 17:44:14 +00:00
|
|
|
if (! PyArg_ParseTuple(args, "|O!", &SShape_Type, &obj) )
|
2008-07-24 08:29:48 +00:00
|
|
|
return -1;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
if( !obj ) {
|
|
|
|
|
self->ss = new SShape();
|
|
|
|
|
|
2009-03-29 17:44:14 +00:00
|
|
|
} else {
|
2008-07-24 08:29:48 +00:00
|
|
|
self->ss = new SShape(*( ((BPy_SShape *) obj)->ss ));
|
|
|
|
|
}
|
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->borrowed = 0;
|
|
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
return 0;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static void SShape___dealloc__(BPy_SShape *self)
|
2008-07-24 08:29:48 +00:00
|
|
|
{
|
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
|
|
|
if( self->ss && !self->borrowed )
|
|
|
|
|
delete self->ss;
|
2009-09-27 00:32:20 +00:00
|
|
|
Py_TYPE(self)->tp_free((PyObject*)self);
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static PyObject * SShape___repr__(BPy_SShape *self)
|
2008-07-24 08:29:48 +00:00
|
|
|
{
|
2009-09-27 00:32:20 +00:00
|
|
|
return PyUnicode_FromFormat("SShape - address: %p", self->ss );
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char SShape_AddEdge___doc__[] =
|
|
|
|
|
".. method:: AddEdge(iEdge)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Adds an FEdge to the list of FEdges.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iEdge: An FEdge object.\n"
|
|
|
|
|
" :type iEdge: :class:`FEdge`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * SShape_AddEdge( BPy_SShape *self , PyObject *args) {
|
2008-07-24 08:29:48 +00:00
|
|
|
PyObject *py_fe = 0;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2009-03-29 17:44:14 +00:00
|
|
|
if(!( PyArg_ParseTuple(args, "O!", &FEdge_Type, &py_fe) ))
|
|
|
|
|
return NULL;
|
2008-07-24 08:29:48 +00:00
|
|
|
|
|
|
|
|
self->ss->AddEdge( ((BPy_FEdge *) py_fe)->fe );
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
Py_RETURN_NONE;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char SShape_AddNewVertex___doc__[] =
|
|
|
|
|
".. method:: AddNewVertex(iv)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Adds an SVertex to the list of SVertex of this Shape. The SShape\n"
|
|
|
|
|
" attribute of the SVertex is also set to this SShape.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iv: An SVertex object.\n"
|
|
|
|
|
" :type iv: :class:`SVertex`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * SShape_AddNewVertex( BPy_SShape *self , PyObject *args) {
|
2008-07-24 08:29:48 +00:00
|
|
|
PyObject *py_sv = 0;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2009-03-29 18:46:17 +00:00
|
|
|
if(!( PyArg_ParseTuple(args, "O!", &SVertex_Type, &py_sv) ))
|
2009-03-29 17:44:14 +00:00
|
|
|
return NULL;
|
2008-07-24 08:29:48 +00:00
|
|
|
|
|
|
|
|
self->ss->AddNewVertex( ((BPy_SVertex *) py_sv)->sv );
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
Py_RETURN_NONE;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char SShape_setBBox___doc__[] =
|
|
|
|
|
".. method:: setBBox(iBBox)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Sets the bounding box of the SShape.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iBBox: The bounding box of the SShape.\n"
|
|
|
|
|
" :type iBBox: :class:`BBox`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * SShape_setBBox( BPy_SShape *self , PyObject *args) {
|
2008-07-24 08:29:48 +00:00
|
|
|
PyObject *py_bb = 0;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2009-03-29 17:44:14 +00:00
|
|
|
if(!( PyArg_ParseTuple(args, "O!", &BBox_Type, &py_bb) ))
|
|
|
|
|
return NULL;
|
2008-07-24 08:29:48 +00:00
|
|
|
|
|
|
|
|
self->ss->setBBox(*( ((BPy_BBox*) py_bb)->bb ));
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
Py_RETURN_NONE;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char SShape_ComputeBBox___doc__[] =
|
|
|
|
|
".. method:: ComputeBBox()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Compute the bbox of the SShape.\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * SShape_ComputeBBox( BPy_SShape *self ) {
|
2008-07-24 08:29:48 +00:00
|
|
|
self->ss->ComputeBBox();
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
Py_RETURN_NONE;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char SShape_bbox___doc__[] =
|
|
|
|
|
".. method:: bbox()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns the bounding box of the SShape.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :return: the bounding box of the SShape.\n"
|
|
|
|
|
" :rtype: :class:`BBox`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * SShape_bbox( BPy_SShape *self ) {
|
2008-07-24 08:29:48 +00:00
|
|
|
BBox<Vec3r> bb( self->ss->bbox() );
|
|
|
|
|
return BPy_BBox_from_BBox( bb );
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char SShape_getVertexList___doc__[] =
|
|
|
|
|
".. method:: getVertexList()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns the list of vertices of the SShape.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :return: The list of vertices objects.\n"
|
|
|
|
|
" :rtype: List of :class:`SVertex` objects\n";
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static PyObject * SShape_getVertexList( BPy_SShape *self ) {
|
2009-10-15 19:38:45 +00:00
|
|
|
PyObject *py_vertices = PyList_New(0);
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
vector< SVertex * > vertices = self->ss->getVertexList();
|
|
|
|
|
vector< SVertex * >::iterator it;
|
|
|
|
|
|
|
|
|
|
for( it = vertices.begin(); it != vertices.end(); it++ ) {
|
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
|
|
|
PyList_Append( py_vertices, BPy_SVertex_from_SVertex(*( *it )) );
|
2008-07-24 08:29:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return py_vertices;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char SShape_getEdgeList___doc__[] =
|
|
|
|
|
".. method:: getEdgeList()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns the list of edges of the SShape.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :return: The list of edges of the SShape.\n"
|
|
|
|
|
" :rtype: List of :class:`FEdge` objects\n";
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static PyObject * SShape_getEdgeList( BPy_SShape *self ) {
|
2009-10-15 19:38:45 +00:00
|
|
|
PyObject *py_edges = PyList_New(0);
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
vector< FEdge * > edges = self->ss->getEdgeList();
|
|
|
|
|
vector< FEdge * >::iterator it;
|
|
|
|
|
|
|
|
|
|
for( it = edges.begin(); it != edges.end(); it++ ) {
|
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
|
|
|
PyList_Append( py_edges, Any_BPy_FEdge_from_FEdge(*( *it )) );
|
2008-07-24 08:29:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return py_edges;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char SShape_getId___doc__[] =
|
|
|
|
|
".. method:: getId()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns the Id of the SShape.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :return: The Id of the SShape.\n"
|
|
|
|
|
" :rtype: :class:`Id`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * SShape_getId( BPy_SShape *self ) {
|
2008-07-24 08:29:48 +00:00
|
|
|
Id id( self->ss->getId() );
|
|
|
|
|
return BPy_Id_from_Id( id );
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char SShape_setId___doc__[] =
|
|
|
|
|
".. method:: setId(id)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Sets the Id of the SShape.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg id: The Id of the SShape.\n"
|
|
|
|
|
" :type id: :class:`Id`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * SShape_setId( BPy_SShape *self , PyObject *args) {
|
2008-07-24 08:29:48 +00:00
|
|
|
PyObject *py_id;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2009-03-29 17:44:14 +00:00
|
|
|
if(!( PyArg_ParseTuple(args, "O!", &Id_Type, &py_id) ))
|
|
|
|
|
return NULL;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
self->ss->setId(*( ((BPy_Id *) py_id)->id ));
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
Py_RETURN_NONE;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2010-05-23 17:11:44 +00:00
|
|
|
static char SShape_getName___doc__[] =
|
|
|
|
|
".. method:: getName()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns the name of the SShape.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :return: The name string.\n"
|
|
|
|
|
" :rtype: str\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * SShape_getName( BPy_SShape *self ) {
|
|
|
|
|
return PyUnicode_FromString( self->ss->getName().c_str() );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char SShape_setName___doc__[] =
|
|
|
|
|
".. method:: setName(name)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Sets the name of the SShape.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg name: A name string.\n"
|
|
|
|
|
" :type name: str\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * SShape_setName( BPy_SShape *self , PyObject *args) {
|
|
|
|
|
char *s;
|
|
|
|
|
|
|
|
|
|
if(!( PyArg_ParseTuple(args, "s", &s) ))
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
self->ss->setName(s);
|
|
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
// const Material & material (unsigned i) const
|
|
|
|
|
// const vector< Material > & materials () const
|
|
|
|
|
// void SetMaterials (const vector< Material > &iMaterials)
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
/*----------------------SShape instance definitions ----------------------------*/
|
|
|
|
|
static PyMethodDef BPy_SShape_methods[] = {
|
|
|
|
|
{"AddEdge", ( PyCFunction ) SShape_AddEdge, METH_VARARGS, SShape_AddEdge___doc__},
|
|
|
|
|
{"AddNewVertex", ( PyCFunction ) SShape_AddNewVertex, METH_VARARGS, SShape_AddNewVertex___doc__},
|
|
|
|
|
{"setBBox", ( PyCFunction ) SShape_setBBox, METH_VARARGS, SShape_setBBox___doc__},
|
|
|
|
|
{"ComputeBBox", ( PyCFunction ) SShape_ComputeBBox, METH_NOARGS, SShape_ComputeBBox___doc__},
|
|
|
|
|
{"bbox", ( PyCFunction ) SShape_bbox, METH_NOARGS, SShape_bbox___doc__},
|
|
|
|
|
{"getVertexList", ( PyCFunction ) SShape_getVertexList, METH_NOARGS, SShape_getVertexList___doc__},
|
|
|
|
|
{"getEdgeList", ( PyCFunction ) SShape_getEdgeList, METH_NOARGS, SShape_getEdgeList___doc__},
|
|
|
|
|
{"getId", ( PyCFunction ) SShape_getId, METH_NOARGS, SShape_getId___doc__},
|
|
|
|
|
{"setId", ( PyCFunction ) SShape_setId, METH_VARARGS, SShape_setId___doc__},
|
2010-05-23 17:11:44 +00:00
|
|
|
{"getName", ( PyCFunction ) SShape_getName, METH_NOARGS, SShape_getName___doc__},
|
|
|
|
|
{"setName", ( PyCFunction ) SShape_setName, METH_VARARGS, SShape_setName___doc__},
|
2010-04-17 23:47:47 +00:00
|
|
|
{NULL, NULL, 0, NULL}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*-----------------------BPy_SShape type definition ------------------------------*/
|
|
|
|
|
|
|
|
|
|
PyTypeObject SShape_Type = {
|
|
|
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
|
|
|
|
"SShape", /* tp_name */
|
|
|
|
|
sizeof(BPy_SShape), /* tp_basicsize */
|
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
|
(destructor)SShape___dealloc__, /* tp_dealloc */
|
|
|
|
|
0, /* tp_print */
|
|
|
|
|
0, /* tp_getattr */
|
|
|
|
|
0, /* tp_setattr */
|
|
|
|
|
0, /* tp_reserved */
|
|
|
|
|
(reprfunc)SShape___repr__, /* 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 */
|
|
|
|
|
SShape___doc__, /* tp_doc */
|
|
|
|
|
0, /* tp_traverse */
|
|
|
|
|
0, /* tp_clear */
|
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
|
0, /* tp_iter */
|
|
|
|
|
0, /* tp_iternext */
|
|
|
|
|
BPy_SShape_methods, /* tp_methods */
|
|
|
|
|
0, /* tp_members */
|
|
|
|
|
0, /* tp_getset */
|
|
|
|
|
0, /* tp_base */
|
|
|
|
|
0, /* tp_dict */
|
|
|
|
|
0, /* tp_descr_get */
|
|
|
|
|
0, /* tp_descr_set */
|
|
|
|
|
0, /* tp_dictoffset */
|
|
|
|
|
(initproc)SShape___init__, /* tp_init */
|
|
|
|
|
0, /* tp_alloc */
|
|
|
|
|
PyType_GenericNew, /* tp_new */
|
|
|
|
|
};
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-24 08:29:48 +00:00
|
|
|
#ifdef __cplusplus
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
2009-10-15 19:38:45 +00:00
|
|
|
#endif
|