2008-07-23 07:56:08 +00:00
# include "BPy_Interface1D.h"
2008-07-12 04:02:08 +00:00
2008-07-23 07:56:08 +00:00
# include "BPy_Convert.h"
2008-08-01 02:15:25 +00:00
# include "Interface1D/BPy_FrsCurve.h"
2008-07-26 02:33:21 +00:00
# include "Interface1D/Curve/BPy_Chain.h"
2008-07-23 07:56:08 +00:00
# include "Interface1D/BPy_FEdge.h"
2008-07-26 02:33:21 +00:00
# include "Interface1D/FEdge/BPy_FEdgeSharp.h"
# include "Interface1D/FEdge/BPy_FEdgeSmooth.h"
2008-07-23 07:56:08 +00:00
# include "Interface1D/BPy_Stroke.h"
2008-07-24 08:29:48 +00:00
# include "Interface1D/BPy_ViewEdge.h"
2008-07-26 02:33:21 +00:00
2008-07-23 07:56:08 +00:00
# include "BPy_MediumType.h"
2008-07-12 04:02:08 +00:00
# ifdef __cplusplus
extern " C " {
# endif
///////////////////////////////////////////////////////////////////////////////////////////
2008-07-15 01:07:19 +00:00
/*--------------- Python API function prototypes for Interface1D instance -----------*/
soc-2008-mxcurioni: reimplemented the initialization/allocation for base classes. The Python object type tp_new slot is now set to PyType_GenericNew, instead of the former custom functions. As a note, by default, Python does not set this slot: it is therefore mandatory for the base classes. For children classes, only __init__ is needed.
To make our base classes subclasses, the Py_TPFLAGS_BASETYPE flag was added to the object type tp_flags slot.
Finally, I began to implement CurvePoint, descendant of Interface0D. This commit allowed me to verify that my SWIG replacement method works: interfaces are well taken into account by children. For a test, use the following code:
================================
import Blender
from Blender import Freestyle
from Blender.Freestyle import *
print Interface0D()
print CurvePoint()
================================
The __repr__ method is only implemented in Interface0D:
PyObject * Interface0D___repr__(BPy_Interface0D* self)
{
return PyString_FromFormat("type: %s - address: %p", self->if0D->getExactTypeName().c_str(), self->if0D );}
and the result is of the form:
type: Interface0D - address: 0x18e5ccc0
type: CurvePoint - address: 0x18e473f0
As you can see, the correct getExactTypeName of the class is called.
2008-07-15 05:33:12 +00:00
static int Interface1D___init__ ( BPy_Interface1D * self , PyObject * args , PyObject * kwds ) ;
2008-07-15 01:07:19 +00:00
static void Interface1D___dealloc__ ( BPy_Interface1D * self ) ;
static PyObject * Interface1D___repr__ ( BPy_Interface1D * self ) ;
static PyObject * Interface1D_getExactTypeName ( BPy_Interface1D * self ) ;
static PyObject * Interface1D_getVertices ( BPy_Interface1D * self ) ;
static PyObject * Interface1D_getPoints ( BPy_Interface1D * self ) ;
static PyObject * Interface1D_getLength2D ( BPy_Interface1D * self ) ;
static PyObject * Interface1D_getId ( BPy_Interface1D * self ) ;
static PyObject * Interface1D_getNature ( BPy_Interface1D * self ) ;
static PyObject * Interface1D_getTimeStamp ( BPy_Interface1D * self ) ;
static PyObject * Interface1D_setTimeStamp ( BPy_Interface1D * self , PyObject * args ) ;
2008-08-01 21:55:58 +00:00
static PyObject * Interface1D_verticesBegin ( BPy_Interface1D * self ) ;
static PyObject * Interface1D_verticesEnd ( BPy_Interface1D * self ) ;
static PyObject * Interface1D_pointsBegin ( BPy_Interface1D * self , PyObject * args ) ;
static PyObject * Interface1D_pointsEnd ( BPy_Interface1D * self , PyObject * args ) ;
2008-07-15 01:07:19 +00:00
/*----------------------Interface1D instance definitions ----------------------------*/
static PyMethodDef BPy_Interface1D_methods [ ] = {
2009-09-27 00:32:20 +00:00
{ " getExactTypeName " , ( PyCFunction ) Interface1D_getExactTypeName , METH_NOARGS , " () Returns the string of the name of the interface. " } ,
2008-07-15 01:07:19 +00:00
{ " getVertices " , ( PyCFunction ) Interface1D_getVertices , METH_NOARGS , " Returns the vertices " } ,
{ " getPoints " , ( PyCFunction ) Interface1D_getPoints , METH_NOARGS , " Returns the points. The difference with getVertices() is that here we can iterate over points of the 1D element at any given sampling. At each call, a virtual point is created. " } ,
{ " getLength2D " , ( PyCFunction ) Interface1D_getLength2D , METH_NOARGS , " Returns the 2D length of the 1D element " } ,
{ " getId " , ( PyCFunction ) Interface1D_getId , METH_NOARGS , " Returns the Id of the 1D element " } ,
{ " getNature " , ( PyCFunction ) Interface1D_getNature , METH_NOARGS , " Returns the nature of the 1D element " } ,
{ " getTimeStamp " , ( PyCFunction ) Interface1D_getTimeStamp , METH_NOARGS , " Returns the time stamp of the 1D element. Mainly used for selection " } ,
{ " setTimeStamp " , ( PyCFunction ) Interface1D_setTimeStamp , METH_VARARGS , " Sets the time stamp for the 1D element " } ,
2008-08-01 21:55:58 +00:00
{ " verticesBegin " , ( PyCFunction ) Interface1D_verticesBegin , METH_NOARGS , " " } ,
{ " verticesEnd " , ( PyCFunction ) Interface1D_verticesEnd , METH_NOARGS , " " } ,
{ " pointsBegin " , ( PyCFunction ) Interface1D_pointsBegin , METH_VARARGS , " " } ,
{ " pointsEnd " , ( PyCFunction ) Interface1D_pointsEnd , METH_VARARGS , " " } ,
2008-07-12 04:02:08 +00:00
{ NULL , NULL , 0 , NULL }
} ;
2008-07-15 01:07:19 +00:00
/*-----------------------BPy_Interface1D type definition ------------------------------*/
2008-07-12 04:02:08 +00:00
PyTypeObject Interface1D_Type = {
2009-09-27 00:32:20 +00:00
PyVarObject_HEAD_INIT ( NULL , 0 )
" Interface1D " , /* tp_name */
sizeof ( BPy_Interface1D ) , /* tp_basicsize */
0 , /* tp_itemsize */
( destructor ) Interface1D___dealloc__ , /* tp_dealloc */
0 , /* tp_print */
0 , /* tp_getattr */
0 , /* tp_setattr */
0 , /* tp_reserved */
( reprfunc ) Interface1D___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 */
" Interface1D objects " , /* tp_doc */
0 , /* tp_traverse */
0 , /* tp_clear */
0 , /* tp_richcompare */
0 , /* tp_weaklistoffset */
0 , /* tp_iter */
0 , /* tp_iternext */
BPy_Interface1D_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 ) Interface1D___init__ , /* tp_init */
0 , /* tp_alloc */
PyType_GenericNew , /* tp_new */
2008-07-12 04:02:08 +00:00
} ;
//-------------------MODULE INITIALIZATION--------------------------------
2009-09-27 00:32:20 +00:00
int Interface1D_Init ( PyObject * module )
2008-07-12 04:02:08 +00:00
{
2008-07-15 01:07:19 +00:00
if ( module = = NULL )
2009-09-27 00:32:20 +00:00
return - 1 ;
2008-07-15 01:07:19 +00:00
2008-07-12 04:02:08 +00:00
if ( PyType_Ready ( & Interface1D_Type ) < 0 )
2009-09-27 00:32:20 +00:00
return - 1 ;
2008-07-15 01:07:19 +00:00
Py_INCREF ( & Interface1D_Type ) ;
PyModule_AddObject ( module , " Interface1D " , ( PyObject * ) & Interface1D_Type ) ;
2008-07-18 02:55:23 +00:00
2008-08-01 02:15:25 +00:00
if ( PyType_Ready ( & FrsCurve_Type ) < 0 )
2009-09-27 00:32:20 +00:00
return - 1 ;
2008-08-01 02:15:25 +00:00
Py_INCREF ( & FrsCurve_Type ) ;
PyModule_AddObject ( module , " FrsCurve " , ( PyObject * ) & FrsCurve_Type ) ;
2008-07-26 02:33:21 +00:00
if ( PyType_Ready ( & Chain_Type ) < 0 )
2009-09-27 00:32:20 +00:00
return - 1 ;
2008-07-26 02:33:21 +00:00
Py_INCREF ( & Chain_Type ) ;
PyModule_AddObject ( module , " Chain " , ( PyObject * ) & Chain_Type ) ;
2008-07-25 02:18:02 +00:00
2008-07-18 02:55:23 +00:00
if ( PyType_Ready ( & FEdge_Type ) < 0 )
2009-09-27 00:32:20 +00:00
return - 1 ;
2008-07-18 02:55:23 +00:00
Py_INCREF ( & FEdge_Type ) ;
PyModule_AddObject ( module , " FEdge " , ( PyObject * ) & FEdge_Type ) ;
2008-07-23 05:54:34 +00:00
2008-07-26 02:33:21 +00:00
if ( PyType_Ready ( & FEdgeSharp_Type ) < 0 )
2009-09-27 00:32:20 +00:00
return - 1 ;
2008-07-26 02:33:21 +00:00
Py_INCREF ( & FEdgeSharp_Type ) ;
PyModule_AddObject ( module , " FEdgeSharp " , ( PyObject * ) & FEdgeSharp_Type ) ;
if ( PyType_Ready ( & FEdgeSmooth_Type ) < 0 )
2009-09-27 00:32:20 +00:00
return - 1 ;
2008-07-26 02:33:21 +00:00
Py_INCREF ( & FEdgeSmooth_Type ) ;
PyModule_AddObject ( module , " FEdgeSmooth " , ( PyObject * ) & FEdgeSmooth_Type ) ;
2008-07-23 05:54:34 +00:00
if ( PyType_Ready ( & Stroke_Type ) < 0 )
2009-09-27 00:32:20 +00:00
return - 1 ;
2008-07-23 05:54:34 +00:00
Py_INCREF ( & Stroke_Type ) ;
PyModule_AddObject ( module , " Stroke " , ( PyObject * ) & Stroke_Type ) ;
2009-09-27 00:32:20 +00:00
PyDict_SetItemString ( Stroke_Type . tp_dict , " DRY_MEDIUM " , BPy_MediumType_DRY_MEDIUM ) ;
PyDict_SetItemString ( Stroke_Type . tp_dict , " HUMID_MEDIUM " , BPy_MediumType_HUMID_MEDIUM ) ;
PyDict_SetItemString ( Stroke_Type . tp_dict , " OPAQUE_MEDIUM " , BPy_MediumType_OPAQUE_MEDIUM ) ;
2008-07-23 05:54:34 +00:00
2008-07-24 08:29:48 +00:00
if ( PyType_Ready ( & ViewEdge_Type ) < 0 )
2009-09-27 00:32:20 +00:00
return - 1 ;
2008-07-24 08:29:48 +00:00
Py_INCREF ( & ViewEdge_Type ) ;
PyModule_AddObject ( module , " ViewEdge " , ( PyObject * ) & ViewEdge_Type ) ;
2009-09-27 00:32:20 +00:00
return 0 ;
2008-07-09 08:24:13 +00:00
}
2008-07-12 04:02:08 +00:00
//------------------------INSTANCE METHODS ----------------------------------
2008-07-09 08:24:13 +00:00
soc-2008-mxcurioni: reimplemented the initialization/allocation for base classes. The Python object type tp_new slot is now set to PyType_GenericNew, instead of the former custom functions. As a note, by default, Python does not set this slot: it is therefore mandatory for the base classes. For children classes, only __init__ is needed.
To make our base classes subclasses, the Py_TPFLAGS_BASETYPE flag was added to the object type tp_flags slot.
Finally, I began to implement CurvePoint, descendant of Interface0D. This commit allowed me to verify that my SWIG replacement method works: interfaces are well taken into account by children. For a test, use the following code:
================================
import Blender
from Blender import Freestyle
from Blender.Freestyle import *
print Interface0D()
print CurvePoint()
================================
The __repr__ method is only implemented in Interface0D:
PyObject * Interface0D___repr__(BPy_Interface0D* self)
{
return PyString_FromFormat("type: %s - address: %p", self->if0D->getExactTypeName().c_str(), self->if0D );}
and the result is of the form:
type: Interface0D - address: 0x18e5ccc0
type: CurvePoint - address: 0x18e473f0
As you can see, the correct getExactTypeName of the class is called.
2008-07-15 05:33:12 +00:00
int Interface1D___init__ ( BPy_Interface1D * self , PyObject * args , PyObject * kwds )
2008-07-15 01:07:19 +00:00
{
2009-08-03 15:19:51 +00:00
if ( ! PyArg_ParseTuple ( args , " " ) )
return - 1 ;
soc-2008-mxcurioni: reimplemented the initialization/allocation for base classes. The Python object type tp_new slot is now set to PyType_GenericNew, instead of the former custom functions. As a note, by default, Python does not set this slot: it is therefore mandatory for the base classes. For children classes, only __init__ is needed.
To make our base classes subclasses, the Py_TPFLAGS_BASETYPE flag was added to the object type tp_flags slot.
Finally, I began to implement CurvePoint, descendant of Interface0D. This commit allowed me to verify that my SWIG replacement method works: interfaces are well taken into account by children. For a test, use the following code:
================================
import Blender
from Blender import Freestyle
from Blender.Freestyle import *
print Interface0D()
print CurvePoint()
================================
The __repr__ method is only implemented in Interface0D:
PyObject * Interface0D___repr__(BPy_Interface0D* self)
{
return PyString_FromFormat("type: %s - address: %p", self->if0D->getExactTypeName().c_str(), self->if0D );}
and the result is of the form:
type: Interface0D - address: 0x18e5ccc0
type: CurvePoint - address: 0x18e473f0
As you can see, the correct getExactTypeName of the class is called.
2008-07-15 05:33:12 +00:00
self - > if1D = new Interface1D ( ) ;
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 ;
soc-2008-mxcurioni: reimplemented the initialization/allocation for base classes. The Python object type tp_new slot is now set to PyType_GenericNew, instead of the former custom functions. As a note, by default, Python does not set this slot: it is therefore mandatory for the base classes. For children classes, only __init__ is needed.
To make our base classes subclasses, the Py_TPFLAGS_BASETYPE flag was added to the object type tp_flags slot.
Finally, I began to implement CurvePoint, descendant of Interface0D. This commit allowed me to verify that my SWIG replacement method works: interfaces are well taken into account by children. For a test, use the following code:
================================
import Blender
from Blender import Freestyle
from Blender.Freestyle import *
print Interface0D()
print CurvePoint()
================================
The __repr__ method is only implemented in Interface0D:
PyObject * Interface0D___repr__(BPy_Interface0D* self)
{
return PyString_FromFormat("type: %s - address: %p", self->if0D->getExactTypeName().c_str(), self->if0D );}
and the result is of the form:
type: Interface0D - address: 0x18e5ccc0
type: CurvePoint - address: 0x18e473f0
As you can see, the correct getExactTypeName of the class is called.
2008-07-15 05:33:12 +00:00
return 0 ;
2008-07-15 01:07:19 +00:00
}
void Interface1D___dealloc__ ( BPy_Interface1D * self )
{
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 - > if1D & & ! self - > borrowed )
2008-08-02 07:39:49 +00:00
delete self - > if1D ;
2009-09-27 00:32:20 +00:00
Py_TYPE ( self ) - > tp_free ( ( PyObject * ) self ) ;
2008-07-15 01:07:19 +00:00
}
PyObject * Interface1D___repr__ ( BPy_Interface1D * self )
{
2009-09-27 00:32:20 +00:00
return PyUnicode_FromFormat ( " type: %s - address: %p " , self - > if1D - > getExactTypeName ( ) . c_str ( ) , self - > if1D ) ;
2008-07-15 01:07:19 +00:00
}
2008-07-09 08:24:13 +00:00
2008-07-12 04:02:08 +00:00
PyObject * Interface1D_getExactTypeName ( BPy_Interface1D * self ) {
2009-09-27 00:32:20 +00:00
return PyUnicode_FromFormat ( self - > if1D - > getExactTypeName ( ) . c_str ( ) ) ;
2008-07-09 08:24:13 +00:00
}
2008-07-12 04:02:08 +00:00
PyObject * Interface1D_getVertices ( BPy_Interface1D * self ) {
2008-07-15 01:07:19 +00:00
return PyList_New ( 0 ) ;
2008-07-09 08:24:13 +00:00
}
2008-07-12 04:02:08 +00:00
PyObject * Interface1D_getPoints ( BPy_Interface1D * self ) {
2008-07-15 01:07:19 +00:00
return PyList_New ( 0 ) ;
2008-07-09 08:24:13 +00:00
}
2008-07-12 04:02:08 +00:00
PyObject * Interface1D_getLength2D ( BPy_Interface1D * self ) {
return PyFloat_FromDouble ( ( double ) self - > if1D - > getLength2D ( ) ) ;
2008-07-09 08:24:13 +00:00
}
2008-07-12 04:02:08 +00:00
PyObject * Interface1D_getId ( BPy_Interface1D * self ) {
2008-07-18 02:55:23 +00:00
Id id ( self - > if1D - > getId ( ) ) ;
return BPy_Id_from_Id ( id ) ;
2008-07-09 08:24:13 +00:00
}
2008-07-12 04:02:08 +00:00
PyObject * Interface1D_getNature ( BPy_Interface1D * self ) {
2008-07-20 05:01:29 +00:00
return BPy_Nature_from_Nature ( self - > if1D - > getNature ( ) ) ;
2008-07-09 08:24:13 +00:00
}
2008-07-12 04:02:08 +00:00
PyObject * Interface1D_getTimeStamp ( BPy_Interface1D * self ) {
2009-09-27 00:32:20 +00:00
return PyLong_FromLong ( self - > if1D - > getTimeStamp ( ) ) ;
2008-07-09 08:24:13 +00:00
}
2008-07-12 04:02:08 +00:00
PyObject * Interface1D_setTimeStamp ( BPy_Interface1D * self , PyObject * args ) {
2008-07-15 01:07:19 +00:00
int timestamp = 0 ;
2009-03-29 17:44:14 +00:00
if ( ! PyArg_ParseTuple ( args , " i " , & timestamp ) )
return NULL ;
2008-07-12 04:02:08 +00:00
self - > if1D - > setTimeStamp ( timestamp ) ;
Py_RETURN_NONE ;
2008-07-09 08:24:13 +00:00
}
2008-08-01 21:55:58 +00:00
PyObject * Interface1D_verticesBegin ( BPy_Interface1D * self ) {
Interface0DIterator if0D_it ( self - > if1D - > verticesBegin ( ) ) ;
2009-07-31 22:13:48 +00:00
return BPy_Interface0DIterator_from_Interface0DIterator ( if0D_it , 0 ) ;
2008-08-01 21:55:58 +00:00
}
PyObject * Interface1D_verticesEnd ( BPy_Interface1D * self ) {
Interface0DIterator if0D_it ( self - > if1D - > verticesEnd ( ) ) ;
2009-07-31 22:13:48 +00:00
return BPy_Interface0DIterator_from_Interface0DIterator ( if0D_it , 1 ) ;
2008-08-01 21:55:58 +00:00
}
PyObject * Interface1D_pointsBegin ( BPy_Interface1D * self , PyObject * args ) {
float f = 0 ;
2009-03-29 17:44:14 +00:00
if ( ! ( PyArg_ParseTuple ( args , " |f " , & f ) ) )
return NULL ;
2008-08-01 21:55:58 +00:00
Interface0DIterator if0D_it ( self - > if1D - > pointsBegin ( f ) ) ;
2009-07-31 22:13:48 +00:00
return BPy_Interface0DIterator_from_Interface0DIterator ( if0D_it , 0 ) ;
2008-08-01 21:55:58 +00:00
}
PyObject * Interface1D_pointsEnd ( BPy_Interface1D * self , PyObject * args ) {
float f = 0 ;
2009-03-29 17:44:14 +00:00
if ( ! ( PyArg_ParseTuple ( args , " |f " , & f ) ) )
return NULL ;
2008-08-01 21:55:58 +00:00
Interface0DIterator if0D_it ( self - > if1D - > pointsEnd ( f ) ) ;
2009-07-31 22:13:48 +00:00
return BPy_Interface0DIterator_from_Interface0DIterator ( if0D_it , 1 ) ;
2008-08-01 21:55:58 +00:00
}
2008-07-12 04:02:08 +00:00
///////////////////////////////////////////////////////////////////////////////////////////
2008-07-09 08:24:13 +00:00
2008-07-12 04:02:08 +00:00
# ifdef __cplusplus
2008-07-09 08:24:13 +00:00
}
2008-07-12 04:02:08 +00:00
# endif
2008-07-09 08:24:13 +00:00