2008-07-23 07:56:08 +00:00
|
|
|
#include "BPy_CurvePoint.h"
|
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
|
|
|
|
2008-07-23 07:56:08 +00:00
|
|
|
#include "../BPy_Convert.h"
|
2008-07-24 20:39:13 +00:00
|
|
|
#include "../Interface0D/BPy_SVertex.h"
|
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
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
extern "C" {
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
//------------------------INSTANCE METHODS ----------------------------------
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char CurvePoint___doc__[] =
|
|
|
|
|
"Class to represent a point of a curve. A CurvePoint can be any point\n"
|
|
|
|
|
"of a 1D curve (it doesn't have to be a vertex of the curve). Any\n"
|
|
|
|
|
":class:`Interface1D` is built upon ViewEdges, themselves built upon\n"
|
|
|
|
|
"FEdges. Therefore, a curve is basically a polyline made of a list of\n"
|
|
|
|
|
":class:`SVertex` objects. Thus, a CurvePoint is built by linearly\n"
|
|
|
|
|
"interpolating two :class:`SVertex` instances. CurvePoint can be used\n"
|
|
|
|
|
"as virtual points while querying 0D information along a curve at a\n"
|
|
|
|
|
"given resolution.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Defult constructor.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__(iBrother)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Copy constructor.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iBrother: A CurvePoint object.\n"
|
|
|
|
|
" :type iBrother: :class:`CurvePoint`\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__(iA, iB, t2d)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Builds a CurvePoint from two SVertex and an interpolation parameter.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iA: The first SVertex.\n"
|
|
|
|
|
" :type iA: :class:`SVertex`\n"
|
|
|
|
|
" :arg iB: The second SVertex.\n"
|
|
|
|
|
" :type iB: :class:`SVertex`\n"
|
|
|
|
|
" :arg t2d: A 2D interpolation parameter used to linearly interpolate\n"
|
|
|
|
|
" iA and iB.\n"
|
|
|
|
|
" :type t2d: float\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__(iA, iB, t2d)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Builds a CurvePoint from two CurvePoint and an interpolation\n"
|
|
|
|
|
" parameter.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iA: The first CurvePoint.\n"
|
|
|
|
|
" :type iA: :class:`CurvePoint`\n"
|
|
|
|
|
" :arg iB: The second CurvePoint.\n"
|
|
|
|
|
" :type iB: :class:`CurvePoint`\n"
|
|
|
|
|
" :arg t2d: The 2D interpolation parameter used to linearly\n"
|
|
|
|
|
" interpolate iA and iB.\n"
|
|
|
|
|
" :type t2d: float\n";
|
|
|
|
|
|
|
|
|
|
static int CurvePoint___init__(BPy_CurvePoint *self, PyObject *args, PyObject *kwds)
|
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
|
|
|
{
|
|
|
|
|
|
2008-07-17 06:35:30 +00:00
|
|
|
PyObject *obj1 = 0, *obj2 = 0 , *obj3 = 0;
|
|
|
|
|
|
2009-08-02 18:25:26 +00:00
|
|
|
if (! PyArg_ParseTuple(args, "|OOO!", &obj1, &obj2, &PyFloat_Type, &obj3) )
|
2008-07-17 06:35:30 +00:00
|
|
|
return -1;
|
|
|
|
|
|
2009-08-02 18:25:26 +00:00
|
|
|
if( !obj1 ){
|
2008-07-17 06:35:30 +00:00
|
|
|
self->cp = new CurvePoint();
|
2009-08-02 18:25:26 +00:00
|
|
|
|
|
|
|
|
} else if( !obj2 && BPy_CurvePoint_Check(obj1) ) {
|
|
|
|
|
self->cp = new CurvePoint( *(((BPy_CurvePoint *) obj1)->cp) );
|
|
|
|
|
|
|
|
|
|
} else if( obj3 && BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) {
|
|
|
|
|
self->cp = new CurvePoint( ((BPy_SVertex *) obj1)->sv,
|
|
|
|
|
((BPy_SVertex *) obj2)->sv,
|
|
|
|
|
PyFloat_AsDouble( obj3 ) );
|
|
|
|
|
|
|
|
|
|
} else if( obj3 && BPy_CurvePoint_Check(obj1) && BPy_CurvePoint_Check(obj2) ) {
|
|
|
|
|
CurvePoint *cp1 = ((BPy_CurvePoint *) obj1)->cp;
|
|
|
|
|
CurvePoint *cp2 = ((BPy_CurvePoint *) obj2)->cp;
|
|
|
|
|
if( !cp1 || cp1->A() == 0 || cp1->B() == 0 ) {
|
|
|
|
|
PyErr_SetString(PyExc_TypeError, "argument 1 is an invalid CurvePoint object");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
if( !cp2 || cp2->A() == 0 || cp2->B() == 0 ) {
|
|
|
|
|
PyErr_SetString(PyExc_TypeError, "argument 2 is an invalid CurvePoint object");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
self->cp = new CurvePoint( cp1, cp2, PyFloat_AsDouble( obj3 ) );
|
|
|
|
|
|
2008-07-17 06:35:30 +00:00
|
|
|
} else {
|
2009-03-29 17:44:14 +00:00
|
|
|
PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
|
2008-07-17 06:35:30 +00:00
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
self->py_if0D.if0D = self->cp;
|
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-17 06:35:30 +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
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char CurvePoint_A___doc__[] =
|
|
|
|
|
".. method:: A()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns the first SVertex upon which the CurvePoint is built.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :return: The first SVertex.\n"
|
|
|
|
|
" :rtype: :class:`SVertex`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * CurvePoint_A( BPy_CurvePoint *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
|
|
|
SVertex *A = self->cp->A();
|
|
|
|
|
if( A )
|
|
|
|
|
return BPy_SVertex_from_SVertex( *A );
|
2008-07-17 06:35:30 +00:00
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char CurvePoint_B___doc__[] =
|
|
|
|
|
".. method:: B()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns the second SVertex upon which the CurvePoint is built.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :return: The second SVertex.\n"
|
|
|
|
|
" :rtype: :class:`SVertex`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * CurvePoint_B( BPy_CurvePoint *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
|
|
|
SVertex *B = self->cp->B();
|
|
|
|
|
if( B )
|
|
|
|
|
return BPy_SVertex_from_SVertex( *B );
|
2008-07-17 06:35:30 +00:00
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char CurvePoint_t2d___doc__[] =
|
|
|
|
|
".. method:: t2d()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns the 2D interpolation parameter.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :return: The 2D interpolation parameter.\n"
|
|
|
|
|
" :rtype: float\n";
|
|
|
|
|
|
|
|
|
|
static PyObject * CurvePoint_t2d( BPy_CurvePoint *self ) {
|
2008-07-17 06:35:30 +00:00
|
|
|
return PyFloat_FromDouble( self->cp->t2d() );
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char CurvePoint_setA___doc__[] =
|
|
|
|
|
".. method:: setA(iA)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Sets the first SVertex upon which to build the CurvePoint.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iA: The first SVertex.\n"
|
|
|
|
|
" :type iA: :class:`SVertex`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject *CurvePoint_setA( BPy_CurvePoint *self , PyObject *args) {
|
2008-07-17 06:35:30 +00:00
|
|
|
PyObject *py_sv;
|
|
|
|
|
|
2009-03-29 17:44:14 +00:00
|
|
|
if(!( PyArg_ParseTuple(args, "O!", &SVertex_Type, &py_sv) ))
|
|
|
|
|
return NULL;
|
2008-07-17 06:35:30 +00:00
|
|
|
|
2008-07-21 21:24:37 +00:00
|
|
|
self->cp->setA( ((BPy_SVertex *) py_sv)->sv );
|
2008-07-17 06:35:30 +00:00
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
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
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char CurvePoint_setB___doc__[] =
|
|
|
|
|
".. method:: setB(iB)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Sets the first SVertex upon which to build the CurvePoint.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iB: The second SVertex.\n"
|
|
|
|
|
" :type iB: :class:`SVertex`\n";
|
|
|
|
|
|
|
|
|
|
static PyObject *CurvePoint_setB( BPy_CurvePoint *self , PyObject *args) {
|
2008-07-17 06:35:30 +00:00
|
|
|
PyObject *py_sv;
|
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
|
|
|
|
2009-03-29 17:44:14 +00:00
|
|
|
if(!( PyArg_ParseTuple(args, "O!", &SVertex_Type, &py_sv) ))
|
|
|
|
|
return NULL;
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-21 21:24:37 +00:00
|
|
|
self->cp->setB( ((BPy_SVertex *) py_sv)->sv );
|
2008-07-09 08:24:13 +00:00
|
|
|
|
2008-07-17 06:35:30 +00:00
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char CurvePoint_setT2d___doc__[] =
|
|
|
|
|
".. method:: setT2d(t)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Sets the 2D interpolation parameter to use.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg t: The 2D interpolation parameter.\n"
|
|
|
|
|
" :type t: float\n";
|
|
|
|
|
|
|
|
|
|
static PyObject *CurvePoint_setT2d( BPy_CurvePoint *self , PyObject *args) {
|
2008-07-17 06:35:30 +00:00
|
|
|
float t;
|
|
|
|
|
|
2009-03-29 17:44:14 +00:00
|
|
|
if(!( PyArg_ParseTuple(args, "f", &t) ))
|
|
|
|
|
return NULL;
|
2008-07-17 06:35:30 +00:00
|
|
|
|
2008-07-21 21:24:37 +00:00
|
|
|
self->cp->setT2d( t );
|
2008-07-17 06:35:30 +00:00
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char CurvePoint_curvatureFredo___doc__[] =
|
|
|
|
|
".. method:: curvatureFredo()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Returns the angle in radians.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :return: The angle in radians.\n"
|
|
|
|
|
" :rtype: float\n";
|
|
|
|
|
|
|
|
|
|
static PyObject *CurvePoint_curvatureFredo( BPy_CurvePoint *self , PyObject *args) {
|
2008-07-17 06:35:30 +00:00
|
|
|
return PyFloat_FromDouble( self->cp->curvatureFredo() );
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
///bool operator== (const CurvePoint &b)
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
/*----------------------CurvePoint instance definitions ----------------------------*/
|
|
|
|
|
static PyMethodDef BPy_CurvePoint_methods[] = {
|
|
|
|
|
{"A", ( PyCFunction ) CurvePoint_A, METH_NOARGS, CurvePoint_A___doc__},
|
|
|
|
|
{"B", ( PyCFunction ) CurvePoint_B, METH_NOARGS, CurvePoint_B___doc__},
|
|
|
|
|
{"t2d", ( PyCFunction ) CurvePoint_t2d, METH_NOARGS, CurvePoint_t2d___doc__},
|
|
|
|
|
{"setA", ( PyCFunction ) CurvePoint_setA, METH_VARARGS, CurvePoint_setA___doc__},
|
|
|
|
|
{"setB", ( PyCFunction ) CurvePoint_setB, METH_VARARGS, CurvePoint_setB___doc__},
|
|
|
|
|
{"setT2d", ( PyCFunction ) CurvePoint_setT2d, METH_VARARGS, CurvePoint_setT2d___doc__},
|
|
|
|
|
{"curvatureFredo", ( PyCFunction ) CurvePoint_curvatureFredo, METH_NOARGS, CurvePoint_curvatureFredo___doc__},
|
|
|
|
|
{NULL, NULL, 0, NULL}
|
|
|
|
|
};
|
2008-07-17 06:35:30 +00:00
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
/*-----------------------BPy_CurvePoint type definition ------------------------------*/
|
|
|
|
|
PyTypeObject CurvePoint_Type = {
|
|
|
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
|
|
|
|
"CurvePoint", /* tp_name */
|
|
|
|
|
sizeof(BPy_CurvePoint), /* 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 */
|
|
|
|
|
CurvePoint___doc__, /* tp_doc */
|
|
|
|
|
0, /* tp_traverse */
|
|
|
|
|
0, /* tp_clear */
|
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
|
0, /* tp_iter */
|
|
|
|
|
0, /* tp_iternext */
|
|
|
|
|
BPy_CurvePoint_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)CurvePoint___init__, /* tp_init */
|
|
|
|
|
0, /* tp_alloc */
|
|
|
|
|
0, /* tp_new */
|
|
|
|
|
};
|
2008-07-17 06:35:30 +00:00
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
}
|
|
|
|
|
#endif
|