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

Made the Freestyle Python API compatible with Python 3.

Browse Source
This commit is contained in:
Tamito Kajiyama
2009-09-27 00:32:20 +00:00
parent 1ed4d4cbfb
commit 069d21dddf
205 changed files with 6786 additions and 13168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

163
source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
View File

@@ -38,8 +38,8 @@ static PyObject * UnaryFunction1DDouble_getIntegrationType(BPy_UnaryFunction1DDo
/*----------------------UnaryFunction1DDouble instance definitions ----------------------------*/
static PyMethodDef BPy_UnaryFunction1DDouble_methods[] = {
{"getName", ( PyCFunction ) UnaryFunction1DDouble_getName, METH_NOARGS, "（ ）Returns the string of the name of the unary 1D function."},
{"setIntegrationType", ( PyCFunction ) UnaryFunction1DDouble_setIntegrationType, METH_VARARGS, "（IntegrationType i ）Sets the integration method" },
{"getName", ( PyCFunction ) UnaryFunction1DDouble_getName, METH_NOARGS, "() Returns the string of the name of the unary 1D function."},
{"setIntegrationType", ( PyCFunction ) UnaryFunction1DDouble_setIntegrationType, METH_VARARGS, "(IntegrationType i) Sets the integration method" },
{"getIntegrationType", ( PyCFunction ) UnaryFunction1DDouble_getIntegrationType, METH_NOARGS, "() Returns the integration method." },
{NULL, NULL, 0, NULL}
};
@@ -47,170 +47,129 @@ static PyMethodDef BPy_UnaryFunction1DDouble_methods[] = {
/*-----------------------BPy_UnaryFunction1DDouble type definition ------------------------------*/
PyTypeObject UnaryFunction1DDouble_Type = {
PyObject_HEAD_INIT( NULL )
0, /* ob_size */
"UnaryFunction1DDouble", /* tp_name */
sizeof( BPy_UnaryFunction1DDouble ), /* tp_basicsize */
0, /* tp_itemsize */
/* methods */
(destructor)UnaryFunction1DDouble___dealloc__, /* tp_dealloc */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
NULL, /* tp_compare */
(reprfunc)UnaryFunction1DDouble___repr__, /* tp_repr */
/* 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; */
(ternaryfunc)UnaryFunction1DDouble___call__, /* 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 ***/
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* long tp_flags; */
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 ***/
NULL, /* richcmpfunc tp_richcompare; */
/*** 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 ***/
BPy_UnaryFunction1DDouble_methods, /* struct PyMethodDef *tp_methods; */
NULL, /* struct PyMemberDef *tp_members; */
NULL, /* struct PyGetSetDef *tp_getset; */
&UnaryFunction1D_Type, /* struct _typeobject *tp_base; */
NULL, /* PyObject *tp_dict; */
NULL, /* descrgetfunc tp_descr_get; */
NULL, /* descrsetfunc tp_descr_set; */
0, /* long tp_dictoffset; */
(initproc)UnaryFunction1DDouble___init__, /* initproc tp_init; */
NULL, /* allocfunc tp_alloc; */
NULL, /* newfunc tp_new; */
/* 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
PyObject_HEAD_INIT(NULL)
"UnaryFunction1DDouble", /* tp_name */
sizeof(BPy_UnaryFunction1DDouble), /* tp_basicsize */
0, /* tp_itemsize */
(destructor)UnaryFunction1DDouble___dealloc__, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_reserved */
(reprfunc)UnaryFunction1DDouble___repr__, /* tp_repr */
0, /* tp_as_number */
0, /* tp_as_sequence */
0, /* tp_as_mapping */
0, /* tp_hash */
(ternaryfunc)UnaryFunction1DDouble___call__, /* tp_call */
0, /* tp_str */
0, /* tp_getattro */
0, /* tp_setattro */
0, /* tp_as_buffer */
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
"UnaryFunction1DDouble objects", /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
BPy_UnaryFunction1DDouble_methods, /* tp_methods */
0, /* tp_members */
0, /* tp_getset */
&UnaryFunction1D_Type, /* tp_base */
0, /* tp_dict */
0, /* tp_descr_get */
0, /* tp_descr_set */
0, /* tp_dictoffset */
(initproc)UnaryFunction1DDouble___init__, /* tp_init */
0, /* tp_alloc */
0, /* tp_new */
};
//-------------------MODULE INITIALIZATION--------------------------------
PyMODINIT_FUNC UnaryFunction1DDouble_Init( PyObject *module ) {
int UnaryFunction1DDouble_Init( PyObject *module ) {
if( module == NULL )
return;
return -1;
if( PyType_Ready( &UnaryFunction1DDouble_Type ) < 0 )
return;
return -1;
Py_INCREF( &UnaryFunction1DDouble_Type );
PyModule_AddObject(module, "UnaryFunction1DDouble", (PyObject *)&UnaryFunction1DDouble_Type);
if( PyType_Ready( &DensityF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &DensityF1D_Type );
PyModule_AddObject(module, "DensityF1D", (PyObject *)&DensityF1D_Type);
if( PyType_Ready( &Curvature2DAngleF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &Curvature2DAngleF1D_Type );
PyModule_AddObject(module, "Curvature2DAngleF1D", (PyObject *)&Curvature2DAngleF1D_Type);
if( PyType_Ready( &GetCompleteViewMapDensityF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &GetCompleteViewMapDensityF1D_Type );
PyModule_AddObject(module, "GetCompleteViewMapDensityF1D", (PyObject *)&GetCompleteViewMapDensityF1D_Type);
if( PyType_Ready( &GetDirectionalViewMapDensityF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &GetDirectionalViewMapDensityF1D_Type );
PyModule_AddObject(module, "GetDirectionalViewMapDensityF1D", (PyObject *)&GetDirectionalViewMapDensityF1D_Type);
if( PyType_Ready( &GetProjectedXF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &GetProjectedXF1D_Type );
PyModule_AddObject(module, "GetProjectedXF1D", (PyObject *)&GetProjectedXF1D_Type);
if( PyType_Ready( &GetProjectedYF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &GetProjectedYF1D_Type );
PyModule_AddObject(module, "GetProjectedYF1D", (PyObject *)&GetProjectedYF1D_Type);
if( PyType_Ready( &GetProjectedZF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &GetProjectedZF1D_Type );
PyModule_AddObject(module, "GetProjectedZF1D", (PyObject *)&GetProjectedZF1D_Type);
if( PyType_Ready( &GetSteerableViewMapDensityF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &GetSteerableViewMapDensityF1D_Type );
PyModule_AddObject(module, "GetSteerableViewMapDensityF1D", (PyObject *)&GetSteerableViewMapDensityF1D_Type);
if( PyType_Ready( &GetViewMapGradientNormF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &GetViewMapGradientNormF1D_Type );
PyModule_AddObject(module, "GetViewMapGradientNormF1D", (PyObject *)&GetViewMapGradientNormF1D_Type);
if( PyType_Ready( &GetXF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &GetXF1D_Type );
PyModule_AddObject(module, "GetXF1D", (PyObject *)&GetXF1D_Type);
if( PyType_Ready( &GetYF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &GetYF1D_Type );
PyModule_AddObject(module, "GetYF1D", (PyObject *)&GetYF1D_Type);
if( PyType_Ready( &GetZF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &GetZF1D_Type );
PyModule_AddObject(module, "GetZF1D", (PyObject *)&GetZF1D_Type);
if( PyType_Ready( &LocalAverageDepthF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &LocalAverageDepthF1D_Type );
PyModule_AddObject(module, "LocalAverageDepthF1D", (PyObject *)&LocalAverageDepthF1D_Type);
if( PyType_Ready( &ZDiscontinuityF1D_Type ) < 0 )
return;
return -1;
Py_INCREF( &ZDiscontinuityF1D_Type );
PyModule_AddObject(module, "ZDiscontinuityF1D", (PyObject *)&ZDiscontinuityF1D_Type);
return 0;
}
//------------------------INSTANCE METHODS ----------------------------------
@@ -243,12 +202,12 @@ void UnaryFunction1DDouble___dealloc__(BPy_UnaryFunction1DDouble* self)
PyObject * UnaryFunction1DDouble___repr__(BPy_UnaryFunction1DDouble* self)
{
return PyString_FromFormat("type: %s - address: %p", self->uf1D_double->getName().c_str(), self->uf1D_double );
return PyUnicode_FromFormat("type: %s - address: %p", self->uf1D_double->getName().c_str(), self->uf1D_double );
}
PyObject * UnaryFunction1DDouble_getName( BPy_UnaryFunction1DDouble *self )
{
return PyString_FromString( self->uf1D_double->getName().c_str() );
return PyUnicode_FromFormat( self->uf1D_double->getName().c_str() );
}
PyObject * UnaryFunction1DDouble___call__( BPy_UnaryFunction1DDouble *self, PyObject *args, PyObject *kwds)