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

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.

Browse Source 
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.
This commit is contained in:
Maxime Curioni
2008-07-15 05:33:12 +00:00
parent 96e52b09da
commit cc1a6b398d
9 changed files with 311 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/freestyle/intern/python/BinaryPredicate0D.cpp
View File

@@ -10,7 +10,7 @@ extern "C" {
///////////////////////////////////////////////////////////////////////////////////////////
/*--------------- Python API function prototypes for BinaryPredicate0D instance -----------*/
static PyObject * BinaryPredicate0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds);
static int BinaryPredicate0D___init__(BPy_BinaryPredicate0D *self, PyObject *args, PyObject *kwds);
static void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0D *self);
static PyObject * BinaryPredicate0D___repr__(BPy_BinaryPredicate0D *self);
@@ -59,7 +59,7 @@ PyTypeObject BinaryPredicate0D_Type = {
NULL, /* PyBufferProcs *tp_as_buffer; */
/*** Flags to define presence of optional/expanded features ***/
Py_TPFLAGS_DEFAULT, /* long tp_flags; */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* long tp_flags; */
NULL, /* char *tp_doc; Documentation string */
/*** Assigned meaning in release 2.0 ***/
@@ -90,9 +90,9 @@ PyTypeObject BinaryPredicate0D_Type = {
NULL, /* descrgetfunc tp_descr_get; */
NULL, /* descrsetfunc tp_descr_set; */
0, /* long tp_dictoffset; */
NULL, /* initproc tp_init; */
(initproc)BinaryPredicate0D___init__, /* initproc tp_init; */
NULL, /* allocfunc tp_alloc; */
(newfunc)BinaryPredicate0D___new__, /* newfunc tp_new; */
PyType_GenericNew, /* newfunc tp_new; */
/* Low-level free-memory routine */
NULL, /* freefunc tp_free; */
@@ -124,16 +124,10 @@ PyMODINIT_FUNC BinaryPredicate0D_Init( PyObject *module )
//------------------------INSTANCE METHODS ----------------------------------
PyObject * BinaryPredicate0D___new__(PyTypeObject *type, PyObject *args, PyObject *kwds)
int BinaryPredicate0D___init__(BPy_BinaryPredicate0D *self, PyObject *args, PyObject *kwds)
{
BPy_BinaryPredicate0D *self;
self = (BPy_BinaryPredicate0D *)type->tp_alloc(type, 0);
if (self != NULL) {
self->bp0D = new BinaryPredicate0D();
}
return (PyObject *)self;
self->bp0D = new BinaryPredicate0D();
return 0;
}
void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0D* self)
@@ -142,6 +136,7 @@ void BinaryPredicate0D___dealloc__(BPy_BinaryPredicate0D* self)
self->ob_type->tp_free((PyObject*)self);
}
PyObject * BinaryPredicate0D___repr__(BPy_BinaryPredicate0D* self)
{
return PyString_FromFormat("type: %s - address: %p", self->bp0D->getName().c_str(), self->bp0D );