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
|
|
|
|
|
|
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
//-------------------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
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static char Id___doc__[] =
|
|
|
|
|
".. method:: __init__()\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Default constructor.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__(iBrother)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Copy constructor.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iBrother: An Id object.\n"
|
|
|
|
|
" :type iBrother: :class:`Id`\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__(iFirst)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Builds an Id from an integer. The second number is set to 0.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iFirst: The first Id number.\n"
|
|
|
|
|
" :type iFirst: int\n"
|
|
|
|
|
"\n"
|
|
|
|
|
".. method:: __init__(iFirst, iSecond)\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" Builds the Id from the two numbers.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
" :arg iFirst: The first Id number.\n"
|
|
|
|
|
" :type iFirst: int\n"
|
|
|
|
|
" :arg iSecond: The second Id number.\n"
|
|
|
|
|
" :type iSecond: int\n";
|
|
|
|
|
|
|
|
|
|
static int Id___init__(BPy_Id *self, PyObject *args, PyObject *kwds)
|
2008-07-15 01:07:19 +00:00
|
|
|
{
|
|
|
|
|
int first = 0, second = 0;
|
2012-12-08 22:24:41 +00:00
|
|
|
static const char *kwlist[] = {"first", "second", NULL};
|
2008-07-15 01:07:19 +00:00
|
|
|
|
2012-12-08 22:24:41 +00:00
|
|
|
if (! PyArg_ParseTupleAndKeywords(args, kwds, "|ii", (char**)kwlist, &first, &second) )
|
2008-07-15 01:07:19 +00:00
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static void Id___dealloc__(BPy_Id* 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
|
|
|
{
|
|
|
|
|
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
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static PyObject * Id___repr__(BPy_Id* self)
|
2008-07-15 01:07:19 +00:00
|
|
|
{
|
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
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
static PyObject * Id_RichCompare(BPy_Id *o1, BPy_Id *o2, int opid) {
|
2008-07-17 06:35:30 +00:00
|
|
|
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
|
|
|
}
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
/*----------------------Id instance definitions ----------------------------*/
|
|
|
|
|
static PyMethodDef BPy_Id_methods[] = {
|
|
|
|
|
{NULL, NULL, 0, NULL}
|
|
|
|
|
};
|
|
|
|
|
|
Freestyle Python API improvements - part 3.
Major API updates were made to address code review comments.
This revision mostly focuses on Python wrappers of C++ 0D and 1D elements (i.e.,
Interface0D and Interface1D, as well as their subclasses).
* Most getter/setter methods were reimplemented as attributes using PyGetSetDef.
Vector attributes are now implemented based on mathutils callbacks. Boolean
attributes now only accept boolean values.
* The __getitem__ method was removed and the Sequence protocol was used instead.
* The naming of methods and attributes was fixed to follow the naming conventions
of the Blender Python API (i.e., lower case + underscores for methods and attributes,
and CamelCase for classes). Some naming inconsistency within the Freestyle Python
API was also addressed.
* The Freestyle API had a number of method names including prefix/suffix "A" and
"B", and their meanings were inconsistent (i.e., referring to different things
depending on the classes). The names with these two letters were replaced with
more straightforward names. Also some attribute names were changed so as to indicate
the type of the value (e.g., FEdge.next_fedge instead of FEdge.next_edge) in line
with other names explicitly indicating what the value is (e.g., SVertex.viewvertex).
* In addition, some code clean-up was done in both C++ and Python.
Notes:
In summary, the following irregular naming changes were made through this revision
(those resulting from regular changes of naming conventions are not listed):
- CurvePoint: {A,B} --> {first,second}_svertex
- FEdge: vertex{A,B} --> {first,second}_svertex
- FEdge: {next,previous}Edge --> {next,previous}_fedge
- FEdgeSharp: normal{A,B} --> normal_{right,left}
- FEdgeSharp: {a,b}FaceMark --> face_mark_{right,left}
- FEdgeSharp: {a,b}Material --> material_{right,left}
- FEdgeSharp: {a,b}MaterialIndex --> material_index_{right,left}
- FrsCurve: empty --> is_empty
- FrsCurve: nSegments --> segments_size
- TVertex: mate() --> get_mate()
- ViewEdge: fedge{A,B} --> {first,last}_fedge
- ViewEdge: setaShape, aShape --> occlude
- ViewEdge: {A,B} --> {first,last}_viewvertex
- ViewMap: getScene3dBBox --> scene_bbox
2013-02-14 23:48:34 +00:00
|
|
|
/*----------------------Id get/setters ----------------------------*/
|
|
|
|
|
|
|
|
|
|
PyDoc_STRVAR(Id_first_doc,
|
|
|
|
|
"The first number constituting the Id.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
":type: int"
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
static PyObject *Id_first_get(BPy_Id *self, void *UNUSED(closure))
|
|
|
|
|
{
|
|
|
|
|
return PyLong_FromLong(self->id->getFirst());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int Id_first_set(BPy_Id *self, PyObject *value, void *UNUSED(closure))
|
|
|
|
|
{
|
|
|
|
|
int scalar;
|
|
|
|
|
if ((scalar = PyLong_AsLong(value)) == -1 && PyErr_Occurred()) {
|
|
|
|
|
PyErr_SetString(PyExc_TypeError, "value must be an integer");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
self->id->setFirst(scalar);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
PyDoc_STRVAR(Id_second_doc,
|
|
|
|
|
"The second number constituting the Id.\n"
|
|
|
|
|
"\n"
|
|
|
|
|
":type: int"
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
static PyObject *Id_second_get(BPy_Id *self, void *UNUSED(closure))
|
|
|
|
|
{
|
|
|
|
|
return PyLong_FromLong(self->id->getSecond());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int Id_second_set(BPy_Id *self, PyObject *value, void *UNUSED(closure))
|
|
|
|
|
{
|
|
|
|
|
int scalar;
|
|
|
|
|
if ((scalar = PyLong_AsLong(value)) == -1 && PyErr_Occurred()) {
|
|
|
|
|
PyErr_SetString(PyExc_TypeError, "value must be an integer");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
self->id->setSecond(scalar);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static PyGetSetDef BPy_Id_getseters[] = {
|
|
|
|
|
{(char *)"first", (getter)Id_first_get, (setter)Id_first_set, (char *)Id_first_doc, NULL},
|
|
|
|
|
{(char *)"second", (getter)Id_second_get, (setter)Id_second_set, (char *)Id_second_doc, NULL},
|
|
|
|
|
{NULL, NULL, NULL, NULL, NULL} /* Sentinel */
|
|
|
|
|
};
|
|
|
|
|
|
2010-04-17 23:47:47 +00:00
|
|
|
/*-----------------------BPy_Id type definition ------------------------------*/
|
|
|
|
|
|
|
|
|
|
PyTypeObject Id_Type = {
|
|
|
|
|
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___doc__, /* 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 */
|
Freestyle Python API improvements - part 3.
Major API updates were made to address code review comments.
This revision mostly focuses on Python wrappers of C++ 0D and 1D elements (i.e.,
Interface0D and Interface1D, as well as their subclasses).
* Most getter/setter methods were reimplemented as attributes using PyGetSetDef.
Vector attributes are now implemented based on mathutils callbacks. Boolean
attributes now only accept boolean values.
* The __getitem__ method was removed and the Sequence protocol was used instead.
* The naming of methods and attributes was fixed to follow the naming conventions
of the Blender Python API (i.e., lower case + underscores for methods and attributes,
and CamelCase for classes). Some naming inconsistency within the Freestyle Python
API was also addressed.
* The Freestyle API had a number of method names including prefix/suffix "A" and
"B", and their meanings were inconsistent (i.e., referring to different things
depending on the classes). The names with these two letters were replaced with
more straightforward names. Also some attribute names were changed so as to indicate
the type of the value (e.g., FEdge.next_fedge instead of FEdge.next_edge) in line
with other names explicitly indicating what the value is (e.g., SVertex.viewvertex).
* In addition, some code clean-up was done in both C++ and Python.
Notes:
In summary, the following irregular naming changes were made through this revision
(those resulting from regular changes of naming conventions are not listed):
- CurvePoint: {A,B} --> {first,second}_svertex
- FEdge: vertex{A,B} --> {first,second}_svertex
- FEdge: {next,previous}Edge --> {next,previous}_fedge
- FEdgeSharp: normal{A,B} --> normal_{right,left}
- FEdgeSharp: {a,b}FaceMark --> face_mark_{right,left}
- FEdgeSharp: {a,b}Material --> material_{right,left}
- FEdgeSharp: {a,b}MaterialIndex --> material_index_{right,left}
- FrsCurve: empty --> is_empty
- FrsCurve: nSegments --> segments_size
- TVertex: mate() --> get_mate()
- ViewEdge: fedge{A,B} --> {first,last}_fedge
- ViewEdge: setaShape, aShape --> occlude
- ViewEdge: {A,B} --> {first,last}_viewvertex
- ViewMap: getScene3dBBox --> scene_bbox
2013-02-14 23:48:34 +00:00
|
|
|
BPy_Id_getseters, /* tp_getset */
|
2010-04-17 23:47:47 +00:00
|
|
|
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-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
|