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 = {
|
2009-09-27 00:32:20 +00:00
|
|
|
PyVarObject_HEAD_INIT(NULL, 0)
|
|
|
|
|
"Id", /* tp_name */
|
|
|
|
|
sizeof(BPy_Id), /* tp_basicsize */
|
|
|
|
|
0, /* tp_itemsize */
|
|
|
|
|
(destructor)Id___dealloc__, /* tp_dealloc */
|
|
|
|
|
0, /* tp_print */
|
|
|
|
|
0, /* tp_getattr */
|
|
|
|
|
0, /* tp_setattr */
|
|
|
|
|
0, /* tp_reserved */
|
|
|
|
|
(reprfunc)Id___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 */
|
|
|
|
|
"Id objects", /* tp_doc */
|
|
|
|
|
0, /* tp_traverse */
|
|
|
|
|
0, /* tp_clear */
|
|
|
|
|
(richcmpfunc)Id_RichCompare, /* tp_richcompare */
|
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
|
0, /* tp_iter */
|
|
|
|
|
0, /* tp_iternext */
|
|
|
|
|
BPy_Id_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)Id___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 Id_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( &Id_Type ) < 0 )
|
2009-09-27 00:32:20 +00:00
|
|
|
return -1;
|
2008-07-15 01:07:19 +00:00
|
|
|
|
|
|
|
|
Py_INCREF( &Id_Type );
|
|
|
|
|
PyModule_AddObject(module, "Id", (PyObject *)&Id_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
|
|
|
|
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;
|
2009-09-27 00:32:20 +00:00
|
|
|
Py_TYPE(self)->tp_free((PyObject*)self);
|
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-15 01:07:19 +00:00
|
|
|
PyObject * Id___repr__(BPy_Id* self)
|
|
|
|
|
{
|
2009-09-27 00:32:20 +00:00
|
|
|
return PyUnicode_FromFormat("[ first: %i, second: %i ](BPy_Id)", self->id->getFirst(), self->id->getSecond() );
|
2008-07-15 01:07:19 +00:00
|
|
|
}
|
|
|
|
|
|
2008-07-12 04:02:08 +00:00
|
|
|
PyObject *Id_getFirst( BPy_Id *self ) {
|
2009-09-27 00:32:20 +00:00
|
|
|
return PyLong_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) {
|
2009-09-27 00:32:20 +00:00
|
|
|
return PyLong_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
|
|
|
|
|
}
|
2009-10-15 19:38:45 +00:00
|
|
|
#endif
|