2008-07-23 07:56:08 +00:00
|
|
|
#include "BPy_Id.h"
|
2008-07-12 04:02:08 +00:00
|
|
|
|
2008-07-23 07:56:08 +00:00
|
|
|
#include "BPy_Convert.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 Id instance -----------*/
|
|
|
|
|
static int Id___init__(BPy_Id *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
|
|
|
static void Id___dealloc__(BPy_Id *self);
|
2008-07-15 01:07:19 +00:00
|
|
|
static PyObject * Id___repr__(BPy_Id* self);
|
2008-07-17 06:35:30 +00:00
|
|
|
static PyObject * Id_RichCompare(BPy_Id *o1, BPy_Id *o2, int opid);
|
2008-07-15 01:07:19 +00:00
|
|
|
|
|
|
|
|
static PyObject * Id_getFirst( BPy_Id *self );
|
|
|
|
|
static PyObject * Id_getSecond( BPy_Id *self);
|
|
|
|
|
static PyObject * Id_setFirst( BPy_Id *self , PyObject *args);
|
|
|
|
|
static PyObject * Id_setSecond( BPy_Id *self , PyObject *args);
|
|
|
|
|
|
|
|
|
|
/*----------------------Id instance definitions ----------------------------*/
|
|
|
|
|
static PyMethodDef BPy_Id_methods[] = {
|
|
|
|
|
{"getFirst", ( PyCFunction ) Id_getFirst, METH_NOARGS, "Returns the first Id number"},
|
|
|
|
|
{"getSecond", ( PyCFunction ) Id_getSecond, METH_NOARGS, "Returns the second Id number" },
|
|
|
|
|
{"setFirst", ( PyCFunction ) Id_setFirst, METH_VARARGS, "Sets the first number constituing the Id" },
|
|
|
|
|
{"setSecond", ( PyCFunction ) Id_setSecond, METH_VARARGS, "Sets the second number constituing the Id" },
|
2008-07-12 04:02:08 +00:00
|
|
|
{NULL, NULL, 0, NULL}
|
|
|
|
|
};
|
|
|
|
|
|
2008-07-15 01:07:19 +00:00
|
|
|
/*-----------------------BPy_Id type definition ------------------------------*/
|
2008-07-12 04:02:08 +00:00
|
|
|
|
|
|
|
|
PyTypeObject Id_Type = {
|
|
|
|
|
PyObject_HEAD_INIT( NULL )
|
|
|
|
|
0, /* ob_size */
|
2008-07-15 01:07:19 +00:00
|
|
|
"Id", /* tp_name */
|
|
|
|
|
sizeof( BPy_Id ), /* tp_basicsize */
|
2008-07-12 04:02:08 +00:00
|
|
|
0, /* tp_itemsize */
|
|
|
|
|
|
|
|
|
|
/* methods */
|
2008-07-15 01:07:19 +00:00
|
|
|
(destructor)Id___dealloc__, /* tp_dealloc */
|
2008-07-12 04:02:08 +00:00
|
|
|
NULL, /* printfunc tp_print; */
|
|
|
|
|
NULL, /* getattrfunc tp_getattr; */
|
|
|
|
|
NULL, /* setattrfunc tp_setattr; */
|
|
|
|
|
NULL, /* tp_compare */
|
2008-07-15 01:07:19 +00:00
|
|
|
(reprfunc)Id___repr__, /* tp_repr */
|
2008-07-12 04:02:08 +00:00
|
|
|
|
|
|
|
|
/* Method suites for standard classes */
|
|
|
|
|
|
|
|
|
|
NULL, /* PyNumberMethods *tp_as_number; */
|
|
|
|
|
NULL, /* PySequenceMethods *tp_as_sequence; */
|
|
|
|
|
NULL, /* PyMappingMethods *tp_as_mapping; */
|
|
|
|
|
|
|
|
|
|
/* More standard operations (here for binary compatibility) */
|
|
|
|
|
|
|
|
|
|
NULL, /* hashfunc tp_hash; */
|
|
|
|
|
NULL, /* ternaryfunc tp_call; */
|
|
|
|
|
NULL, /* reprfunc tp_str; */
|
|
|
|
|
NULL, /* getattrofunc tp_getattro; */
|
|
|
|
|
NULL, /* setattrofunc tp_setattro; */
|
|
|
|
|
|
|
|
|
|
/* Functions to access object as input/output buffer */
|
|
|
|
|
NULL, /* PyBufferProcs *tp_as_buffer; */
|
|
|
|
|
|
|
|
|
|
/*** Flags to define presence of optional/expanded features ***/
|
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
|
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* long tp_flags; */
|
2008-07-12 04:02:08 +00:00
|
|
|
|
|
|
|
|
NULL, /* char *tp_doc; Documentation string */
|
|
|
|
|
/*** Assigned meaning in release 2.0 ***/
|
|
|
|
|
/* call function for all accessible objects */
|
|
|
|
|
NULL, /* traverseproc tp_traverse; */
|
|
|
|
|
|
|
|
|
|
/* delete references to contained objects */
|
|
|
|
|
NULL, /* inquiry tp_clear; */
|
|
|
|
|
|
|
|
|
|
/*** Assigned meaning in release 2.1 ***/
|
|
|
|
|
/*** rich comparisons ***/
|
2008-07-17 06:35:30 +00:00
|
|
|
(richcmpfunc)Id_RichCompare, /* richcmpfunc tp_richcompare; */
|
2008-07-12 04:02:08 +00:00
|
|
|
|
|
|
|
|
/*** weak reference enabler ***/
|
|
|
|
|
0, /* long tp_weaklistoffset; */
|
|
|
|
|
|
|
|
|
|
/*** Added in release 2.2 ***/
|
|
|
|
|
/* Iterators */
|
|
|
|
|
NULL, /* getiterfunc tp_iter; */
|
|
|
|
|
NULL, /* iternextfunc tp_iternext; */
|
|
|
|
|
|
|
|
|
|
/*** Attribute descriptor and subclassing stuff ***/
|
2008-07-15 01:07:19 +00:00
|
|
|
BPy_Id_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; */
|
|
|
|
|
(initproc)Id___init__, /* initproc tp_init; */
|
|
|
|
|
NULL, /* allocfunc tp_alloc; */
|
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
|
|
|
PyType_GenericNew, /* newfunc tp_new; */
|
2008-07-12 04:02:08 +00:00
|
|
|
|
|
|
|
|
/* Low-level free-memory routine */
|
|
|
|
|
NULL, /* freefunc tp_free; */
|
|
|
|
|
|
|
|
|
|
/* For PyObject_IS_GC */
|
|
|
|
|
NULL, /* inquiry tp_is_gc; */
|
|
|
|
|
NULL, /* PyObject *tp_bases; */
|
|
|
|
|
|
|
|
|
|
/* method resolution order */
|
|
|
|
|
NULL, /* PyObject *tp_mro; */
|
|
|
|
|
NULL, /* PyObject *tp_cache; */
|
|
|
|
|
NULL, /* PyObject *tp_subclasses; */
|
|
|
|
|
NULL, /* PyObject *tp_weaklist; */
|
|
|
|
|
NULL
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
//-------------------MODULE INITIALIZATION--------------------------------
|
2008-07-15 01:07:19 +00:00
|
|
|
PyMODINIT_FUNC Id_Init( PyObject *module )
|
2008-07-12 04:02:08 +00:00
|
|
|
{
|
2008-07-15 01:07:19 +00:00
|
|
|
if( module == NULL )
|
|
|
|
|
return;
|
|
|
|
|
|
2008-07-12 04:02:08 +00:00
|
|
|
if( PyType_Ready( &Id_Type ) < 0 )
|
2008-07-15 01:07:19 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
Py_INCREF( &Id_Type );
|
|
|
|
|
PyModule_AddObject(module, "Id", (PyObject *)&Id_Type);
|
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
|
|
|
|
2008-07-15 01:07:19 +00:00
|
|
|
int Id___init__(BPy_Id *self, PyObject *args, PyObject *kwds)
|
|
|
|
|
{
|
|
|
|
|
int first = 0, second = 0;
|
|
|
|
|
static char *kwlist[] = {"first", "second", NULL};
|
|
|
|
|
|
|
|
|
|
if (! PyArg_ParseTupleAndKeywords(args, kwds, "|ii", kwlist, &first, &second) )
|
|
|
|
|
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->id = new Id( first, second );
|
2008-07-15 01:07:19 +00:00
|
|
|
|
|
|
|
|
return 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
|
|
|
void Id___dealloc__(BPy_Id* self)
|
|
|
|
|
{
|
|
|
|
|
delete self->id;
|
|
|
|
|
self->ob_type->tp_free((PyObject*)self);
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-15 01:07:19 +00:00
|
|
|
PyObject * Id___repr__(BPy_Id* self)
|
|
|
|
|
{
|
|
|
|
|
return PyString_FromFormat("[ first: %i, second: %i ](BPy_Id)", self->id->getFirst(), self->id->getSecond() );
|
|
|
|
|
}
|
|
|
|
|
|
2008-07-12 04:02:08 +00:00
|
|
|
PyObject *Id_getFirst( BPy_Id *self ) {
|
|
|
|
|
return PyInt_FromLong( self->id->getFirst() );
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-12 04:02:08 +00:00
|
|
|
PyObject *Id_getSecond( BPy_Id *self) {
|
|
|
|
|
return PyInt_FromLong( self->id->getSecond() );
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-12 04:02:08 +00:00
|
|
|
PyObject *Id_setFirst( BPy_Id *self , PyObject *args) {
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
2009-03-29 21:50:10 +00:00
|
|
|
if( !PyArg_ParseTuple(args, "i", &i) )
|
|
|
|
|
return NULL;
|
2008-07-12 04:02:08 +00:00
|
|
|
|
|
|
|
|
self->id->setFirst( i );
|
|
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-12 04:02:08 +00:00
|
|
|
PyObject *Id_setSecond( BPy_Id *self , PyObject *args) {
|
|
|
|
|
unsigned int i;
|
|
|
|
|
|
2009-03-29 21:50:10 +00:00
|
|
|
if( !PyArg_ParseTuple(args, "i", &i) )
|
|
|
|
|
return NULL;
|
2008-07-12 04:02:08 +00:00
|
|
|
|
|
|
|
|
self->id->setSecond( i );
|
|
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
2008-07-17 06:35:30 +00:00
|
|
|
PyObject * Id_RichCompare(BPy_Id *o1, BPy_Id *o2, int opid) {
|
|
|
|
|
switch(opid){
|
|
|
|
|
case Py_LT:
|
|
|
|
|
return PyBool_from_bool( o1->id->operator<(*(o2->id)) );
|
|
|
|
|
break;
|
|
|
|
|
case Py_LE:
|
|
|
|
|
return PyBool_from_bool( o1->id->operator<(*(o2->id)) || o1->id->operator<(*(o2->id)) );
|
|
|
|
|
break;
|
|
|
|
|
case Py_EQ:
|
|
|
|
|
return PyBool_from_bool( o1->id->operator==(*(o2->id)) );
|
|
|
|
|
break;
|
|
|
|
|
case Py_NE:
|
|
|
|
|
return PyBool_from_bool( o1->id->operator!=(*(o2->id)) );
|
|
|
|
|
break;
|
|
|
|
|
case Py_GT:
|
|
|
|
|
return PyBool_from_bool(!( o1->id->operator<(*(o2->id)) || o1->id->operator<(*(o2->id)) ));
|
|
|
|
|
break;
|
|
|
|
|
case Py_GE:
|
|
|
|
|
return PyBool_from_bool(!( o1->id->operator<(*(o2->id)) ));
|
|
|
|
|
break;
|
2008-07-15 01:07:19 +00:00
|
|
|
}
|
|
|
|
|
|
2008-07-17 06:35:30 +00:00
|
|
|
Py_RETURN_NONE;
|
2008-07-09 08:24:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2008-07-12 04:02:08 +00:00
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
|
}
|
|
|
|
|
#endif
|