archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

soc-2008-mxcurioni: Reimplemented the Freestyle Python API's files to be correctly used as classes and not submodules. Added and integrated object lifecycle functions (__new__, __alloc__, __repr__) for the previous classes: BinaryPredicate0D, BinaryPredicate1D, Id, Interface0D, Interface1D. All of these classes were tested within Blender's Python interpreter with simple test cases and their getter/setters were corrected.

Browse Source 
Interface0DIterator was modified to allow BPy_Interface1D to be instantiated: verticesBegin(), verticesEnd(), pointsBegin(float) and pointsEnd(float) are not pure virtual functions anymore. If they are called directly from  BPy_Interface1D (instead of its subclasses), an error message is displayed.
This commit is contained in:
Maxime Curioni
2008-07-15 01:07:19 +00:00
parent 8398730043
commit 96e52b09da
14 changed files with 454 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
source/blender/freestyle/intern/python/Interface0D.cpp
View File

@@ -8,18 +8,42 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
/*--------------- Python API function prototypes for Interface0D instance -----------*/
static PyObject * Interface0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
static void Interface0D___dealloc__(BPy_Interface0D *self);
static PyObject * Interface0D___repr__(BPy_Interface0D *self);
/*-----------------------Python API function prototypes for the Interface0D module--*/
//static PyObject *Freestyle_testOutput( BPy_Freestyle * self );
/*-----------------------Interface0D module doc strings-----------------------------*/
static char M_Interface0D_doc[] = "The Blender.Freestyle.Interface0D submodule";
/*----------------------Interface0D module method def----------------------------*/
struct PyMethodDef M_Interface0D_methods[] = {
// {"testOutput", ( PyCFunction ) Freestyle_testOutput, METH_NOARGS, "() - Return Curve Data name"},
static PyObject *Interface0D_getExactTypeName( BPy_Interface0D *self );
static PyObject *Interface0D_getX( BPy_Interface0D *self );
static PyObject *Interface0D_getY( BPy_Interface0D *self );
static PyObject *Interface0D_getZ( BPy_Interface0D *self );
static PyObject *Interface0D_getPoint3D( BPy_Interface0D *self );
static PyObject *Interface0D_getProjectedX( BPy_Interface0D *self );
static PyObject *Interface0D_getProjectedY( BPy_Interface0D *self );
static PyObject *Interface0D_getProjectedZ( BPy_Interface0D *self );
static PyObject *Interface0D_getPoint2D( BPy_Interface0D *self );
static PyObject *Interface0D_getFEdge( BPy_Interface0D *self );
static PyObject *Interface0D_getId( BPy_Interface0D *self );
static PyObject *Interface0D_getNature( BPy_Interface0D *self );
/*----------------------Interface0D instance definitions ----------------------------*/
static PyMethodDef BPy_Interface0D_methods[] = {
{"getExactTypeName", ( PyCFunction ) Interface0D_getExactTypeName, METH_NOARGS, "（ ）Returns the string of the name of the interface."},
{"getX", ( PyCFunction ) Interface0D_getX, METH_NOARGS, "（ ）Returns the 3D x coordinate of the point. "},
{"getY", ( PyCFunction ) Interface0D_getY, METH_NOARGS, "（ ）Returns the 3D y coordinate of the point. "},
{"getZ", ( PyCFunction ) Interface0D_getZ, METH_NOARGS, "（ ）Returns the 3D z coordinate of the point. "},
{"getPoint3D", ( PyCFunction ) Interface0D_getPoint3D, METH_NOARGS, "() Returns the 3D point."},
{"getProjectedX", ( PyCFunction ) Interface0D_getProjectedX, METH_NOARGS, "() Returns the 2D x coordinate of the point."},
{"getProjectedY", ( PyCFunction ) Interface0D_getProjectedY, METH_NOARGS, "() Returns the 2D y coordinate of the point."},
{"getProjectedZ", ( PyCFunction ) Interface0D_getProjectedZ, METH_NOARGS, "() Returns the 2D z coordinate of the point."},
{"getPoint2D", ( PyCFunction ) Interface0D_getPoint2D, METH_NOARGS, "() Returns the 2D point."},
{"getFEdge", ( PyCFunction ) Interface0D_getFEdge, METH_NOARGS, "() Returns the FEdge that lies between this Interface0D and the Interface0D given as argument."},
{"getId", ( PyCFunction ) Interface0D_getId, METH_NOARGS, "() Returns the Id of the point."},
{"getNature", ( PyCFunction ) Interface0D_getNature, METH_NOARGS, "() Returns the nature of the point."},
{NULL, NULL, 0, NULL}
};
/*-----------------------BPy_Freestyle method def------------------------------*/
/*-----------------------BPy_Interface0D type definition ------------------------------*/
PyTypeObject Interface0D_Type = {
PyObject_HEAD_INIT( NULL )
@@ -29,12 +53,12 @@ PyTypeObject Interface0D_Type = {
0, /* tp_itemsize */
/* methods */
NULL, /* tp_dealloc */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
NULL, /* tp_compare */
NULL, /* tp_repr */
(destructor)Interface0D___dealloc__, /* tp_dealloc */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
NULL, /* tp_compare */
(reprfunc)Interface0D___repr__, /* tp_repr */
/* Method suites for standard classes */
@@ -77,17 +101,17 @@ PyTypeObject Interface0D_Type = {
NULL, /* iternextfunc tp_iternext; */
/*** Attribute descriptor and subclassing stuff ***/
NULL, /* struct PyMethodDef *tp_methods; */
NULL, /* struct PyMemberDef *tp_members; */
NULL, /* struct PyGetSetDef *tp_getset; */
NULL, /* struct _typeobject *tp_base; */
NULL, /* PyObject *tp_dict; */
NULL, /* descrgetfunc tp_descr_get; */
NULL, /* descrsetfunc tp_descr_set; */
0, /* long tp_dictoffset; */
NULL, /* initproc tp_init; */
NULL, /* allocfunc tp_alloc; */
NULL, /* newfunc tp_new; */
BPy_Interface0D_methods, /* struct PyMethodDef *tp_methods; */
NULL, /* struct PyMemberDef *tp_members; */
NULL, /* struct PyGetSetDef *tp_getset; */
NULL, /* struct _typeobject *tp_base; */
NULL, /* PyObject *tp_dict; */
NULL, /* descrgetfunc tp_descr_get; */
NULL, /* descrsetfunc tp_descr_set; */
0, /* long tp_dictoffset; */
NULL, /* initproc tp_init; */
NULL, /* allocfunc tp_alloc; */
(newfunc)Interface0D___new__, /* newfunc tp_new; */
/* Low-level free-memory routine */
NULL, /* freefunc tp_free; */
@@ -105,20 +129,43 @@ PyTypeObject Interface0D_Type = {
};
//-------------------MODULE INITIALIZATION--------------------------------
PyObject *Interface0D_Init( void )
PyMODINIT_FUNC Interface0D_Init( PyObject *module )
{
PyObject *submodule;
if( module == NULL )
return;
if( PyType_Ready( &Interface0D_Type ) < 0 )
return NULL;
submodule = Py_InitModule3( "Blender.Freestyle.Interface0D", M_Interface0D_methods, M_Interface0D_doc );
return submodule;
return;
Py_INCREF( &Interface0D_Type );
PyModule_AddObject(module, "Interface0D", (PyObject *)&Interface0D_Type);
}
//------------------------INSTANCE METHODS ----------------------------------
PyObject * Interface0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
{
BPy_Interface0D *self;
self = (BPy_Interface0D *)type->tp_alloc(type, 0);
if (self != NULL) {
self->if0D = new Interface0D();
}
return (PyObject *)self;
}
void Interface0D___dealloc__(BPy_Interface0D* self)
{
delete self->if0D;
self->ob_type->tp_free((PyObject*)self);
}
PyObject * Interface0D___repr__(BPy_Interface0D* self)
{
return PyString_FromFormat("type: %s - address: %p", self->if0D->getExactTypeName().c_str(), self->if0D );
}
PyObject *Interface0D_getExactTypeName( BPy_Interface0D *self ) {
return PyString_FromString( self->if0D->getExactTypeName().c_str() );
}
@@ -170,7 +217,7 @@ PyObject *Interface0D_getFEdge( BPy_Interface0D *self ) {
PyObject *Interface0D_getId( BPy_Interface0D *self ) {
// Id
return BPy_Id_from_Id( self->if0D->getId() );
}