Made the Freestyle Python API compatible with Python 3.
[blender.git] / source / blender / freestyle / intern / python / Interface1D / FEdge / BPy_FEdgeSharp.cpp
index 22a4dbc378e69b38b170e00e4f8394e4bfa72578..aadb322c01d7e5efd81aa150cb3698a01678b6e6 100644 (file)
@@ -41,86 +41,44 @@ static PyMethodDef BPy_FEdgeSharp_methods[] = {
 /*-----------------------BPy_FEdgeSharp type definition ------------------------------*/
 
 PyTypeObject FEdgeSharp_Type = {
-       PyObject_HEAD_INIT( NULL ) 
-       0,                                                      /* ob_size */
-       "FEdgeSharp",                           /* tp_name */
-       sizeof( BPy_FEdgeSharp ),       /* tp_basicsize */
-       0,                                                      /* tp_itemsize */
-       
-       /* methods */
-       NULL,   /* tp_dealloc */
-       NULL,                                                   /* printfunc tp_print; */
-       NULL,                                                   /* getattrfunc tp_getattr; */
-       NULL,                                                   /* setattrfunc tp_setattr; */
-       NULL,                                                                           /* tp_compare */
-       NULL,                                   /* 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; */
-       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 ***/
-       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_FEdgeSharp_methods, /* struct PyMethodDef *tp_methods; */
-       NULL,                           /* struct PyMemberDef *tp_members; */
-       NULL,                                           /* struct PyGetSetDef *tp_getset; */
-       &FEdge_Type,                            /* struct _typeobject *tp_base; */
-       NULL,                                                   /* PyObject *tp_dict; */
-       NULL,                                                   /* descrgetfunc tp_descr_get; */
-       NULL,                                                   /* descrsetfunc tp_descr_set; */
-       0,                              /* long tp_dictoffset; */
-       (initproc)FEdgeSharp___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)
+       "FEdgeSharp",                   /* tp_name */
+       sizeof(BPy_FEdgeSharp),         /* tp_basicsize */
+       0,                              /* tp_itemsize */
+       0,                              /* tp_dealloc */
+       0,                              /* tp_print */
+       0,                              /* tp_getattr */
+       0,                              /* tp_setattr */
+       0,                              /* tp_reserved */
+       0,                              /* 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 */
+       "FEdgeSharp objects",           /* tp_doc */
+       0,                              /* tp_traverse */
+       0,                              /* tp_clear */
+       0,                              /* tp_richcompare */
+       0,                              /* tp_weaklistoffset */
+       0,                              /* tp_iter */
+       0,                              /* tp_iternext */
+       BPy_FEdgeSharp_methods,         /* tp_methods */
+       0,                              /* tp_members */
+       0,                              /* tp_getset */
+       &FEdge_Type,                    /* tp_base */
+       0,                              /* tp_dict */
+       0,                              /* tp_descr_get */
+       0,                              /* tp_descr_set */
+       0,                              /* tp_dictoffset */
+       (initproc)FEdgeSharp___init__,  /* tp_init */
+       0,                              /* tp_alloc */
+       0,                              /* tp_new */
 };
 
 //------------------------INSTANCE METHODS ----------------------------------
@@ -135,21 +93,20 @@ int FEdgeSharp___init__(BPy_FEdgeSharp *self, PyObject *args, PyObject *kwds)
        if( !obj1 ){
                self->fes = new FEdgeSharp();
                
-       } else if( BPy_FEdgeSharp_Check(obj1) ) {
-               if( ((BPy_FEdgeSharp *) obj1)->fes )
-                       self->fes = new FEdgeSharp(*( ((BPy_FEdgeSharp *) obj1)->fes ));
-               else
-                       return -1;
+       } else if( !obj2 && BPy_FEdgeSharp_Check(obj1) ) {
+               self->fes = new FEdgeSharp(*( ((BPy_FEdgeSharp *) obj1)->fes ));
                
-       } else if( BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) {
+       } else if( obj2 && BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) {
                self->fes = new FEdgeSharp( ((BPy_SVertex *) obj1)->sv, ((BPy_SVertex *) obj2)->sv );
 
        } else {
+               PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
                return -1;
        }
 
        self->py_fe.fe = self->fes;
        self->py_fe.py_if1D.if1D = self->fes;
+       self->py_fe.py_if1D.borrowed = 0;
 
        return 0;
 }
@@ -166,36 +123,35 @@ PyObject * FEdgeSharp_normalB( BPy_FEdgeSharp *self ) {
 }
 
 PyObject * FEdgeSharp_aMaterialIndex( BPy_FEdgeSharp *self ) {
-       return PyInt_FromLong( self->fes->aMaterialIndex() );
+       return PyLong_FromLong( self->fes->aFrsMaterialIndex() );
 }
 
 PyObject * FEdgeSharp_bMaterialIndex( BPy_FEdgeSharp *self ) {
-       return PyInt_FromLong( self->fes->bMaterialIndex() );
+       return PyLong_FromLong( self->fes->bFrsMaterialIndex() );
 }
 
 PyObject * FEdgeSharp_aMaterial( BPy_FEdgeSharp *self ) {
-       Material m( self->fes->aMaterial() );
-       return BPy_FrsMaterial_from_Material(m);
+       FrsMaterial m( self->fes->aFrsMaterial() );
+       return BPy_FrsMaterial_from_FrsMaterial(m);
 }
 
 PyObject * FEdgeSharp_bMaterial( BPy_FEdgeSharp *self ) {
-       Material m( self->fes->aMaterial() );
-       return BPy_FrsMaterial_from_Material(m);
+       FrsMaterial m( self->fes->aFrsMaterial() );
+       return BPy_FrsMaterial_from_FrsMaterial(m);
 }
 
 PyObject * FEdgeSharp_setNormalA( BPy_FEdgeSharp *self, PyObject *args ) {
        PyObject *obj = 0;
 
-       if(!( PyArg_ParseTuple(args, "O", &obj) && PyList_Check(obj) && PyList_Size(obj) > 2 )) {
-               cout << "ERROR: FEdgeSharp_setNormalA" << endl;
-               Py_RETURN_NONE;
+       if(!( PyArg_ParseTuple(args, "O", &obj) ))
+               return NULL;
+       Vec3r *v = Vec3r_ptr_from_PyObject(obj);
+       if( !v ) {
+               PyErr_SetString(PyExc_TypeError, "argument 1 must be a 3D vector (either a list of 3 elements or Vector)");
+               return NULL;
        }
-       
-       Vec3r v(        PyFloat_AsDouble( PyList_GetItem(obj,0) ),
-                               PyFloat_AsDouble( PyList_GetItem(obj,1) ),
-                               PyFloat_AsDouble( PyList_GetItem(obj,2) ) );
-
-       self->fes->setNormalA( v );
+       self->fes->setNormalA( *v );
+       delete v;
 
        Py_RETURN_NONE;
 }
@@ -203,16 +159,15 @@ PyObject * FEdgeSharp_setNormalA( BPy_FEdgeSharp *self, PyObject *args ) {
 PyObject * FEdgeSharp_setNormalB( BPy_FEdgeSharp *self, PyObject *args ) {
        PyObject *obj = 0;
 
-       if(!( PyArg_ParseTuple(args, "O", &obj) && PyList_Check(obj) && PyList_Size(obj) > 2 )) {
-               cout << "ERROR: FEdgeSharp_setNormalB" << endl;
-               Py_RETURN_NONE;
+       if(!( PyArg_ParseTuple(args, "O", &obj) ))
+               return NULL;
+       Vec3r *v = Vec3r_ptr_from_PyObject(obj);
+       if( !v ) {
+               PyErr_SetString(PyExc_TypeError, "argument 1 must be a 3D vector (either a list of 3 elements or Vector)");
+               return NULL;
        }
-       
-       Vec3r v(        PyFloat_AsDouble( PyList_GetItem(obj,0) ),
-                               PyFloat_AsDouble( PyList_GetItem(obj,1) ),
-                               PyFloat_AsDouble( PyList_GetItem(obj,2) ) );
-
-       self->fes->setNormalB( v );
+       self->fes->setNormalB( *v );
+       delete v;
 
        Py_RETURN_NONE;
 }
@@ -220,12 +175,10 @@ PyObject * FEdgeSharp_setNormalB( BPy_FEdgeSharp *self, PyObject *args ) {
 PyObject * FEdgeSharp_setaMaterialIndex( BPy_FEdgeSharp *self, PyObject *args ) {
        unsigned int i;
 
-       if(!( PyArg_ParseTuple(args, "I", &i) )) {
-               cout << "ERROR: FEdgeSharp_setaMaterialIndex" << endl;
-               Py_RETURN_NONE;
-       }
+       if(!( PyArg_ParseTuple(args, "I", &i) ))
+               return NULL;
        
-       self->fes->setaMaterialIndex( i );
+       self->fes->setaFrsMaterialIndex( i );
 
        Py_RETURN_NONE;
 }
@@ -233,12 +186,10 @@ PyObject * FEdgeSharp_setaMaterialIndex( BPy_FEdgeSharp *self, PyObject *args )
 PyObject * FEdgeSharp_setbMaterialIndex( BPy_FEdgeSharp *self, PyObject *args ) {
        unsigned int i;
 
-       if(!( PyArg_ParseTuple(args, "I", &i) )) {
-               cout << "ERROR: FEdgeSharp_setbMaterialIndex" << endl;
-               Py_RETURN_NONE;
-       }
+       if(!( PyArg_ParseTuple(args, "I", &i) ))
+               return NULL;
        
-       self->fes->setbMaterialIndex( i );
+       self->fes->setbFrsMaterialIndex( i );
 
        Py_RETURN_NONE;
 }