From fe5b6a556c23159a42eaaa90609cbf0e9a0e1128 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Mon, 27 Jul 2009 19:34:52 +0000 Subject: * Fixed compiler errors in UnaryFunction0DVectorViewShape::__call__() and UnaryFunction1DVectorViewShape::__call__(). * Added a Python wrapper of ViewEdge::qi(). --- source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp | 6 ++++++ .../python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp | 2 +- .../python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'source/blender/freestyle/intern/python') diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp index 8ac65edde89..28280a0723f 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.cpp @@ -40,6 +40,7 @@ static PyObject * ViewEdge_verticesBegin( BPy_ViewEdge *self ); static PyObject * ViewEdge_verticesEnd( BPy_ViewEdge *self ); static PyObject * ViewEdge_pointsBegin( BPy_ViewEdge *self, PyObject *args ); static PyObject * ViewEdge_pointsEnd( BPy_ViewEdge *self, PyObject *args ); +static PyObject * ViewEdge_qi( BPy_ViewEdge *self ); /*----------------------ViewEdge instance definitions ----------------------------*/ @@ -67,6 +68,7 @@ static PyMethodDef BPy_ViewEdge_methods[] = { {"verticesEnd", ( PyCFunction ) ViewEdge_verticesEnd, METH_NOARGS, "() Returns an Interface0DIterator to iterate over the SVertex constituing the embedding of this ViewEdge. The returned Interface0DIterator points after the last SVertex of the ViewEdge."}, {"pointsBegin", ( PyCFunction ) ViewEdge_pointsBegin, METH_VARARGS, "(float t=0) Returns an Interface0DIterator to iterate over the points of this ViewEdge at a given resolution t. The returned Interface0DIterator points on the first Point of the ViewEdge."}, {"pointsEnd", ( PyCFunction ) ViewEdge_pointsEnd, METH_VARARGS, "(float t=0) Returns an Interface0DIterator to iterate over the points of this ViewEdge at a given resolution t. The returned Interface0DIterator points after the last Point of the ViewEdge."}, + {"qi", ( PyCFunction ) ViewEdge_qi, METH_NOARGS, "() Returns the quantitative invisibility of the ViewEdge."}, {NULL, NULL, 0, NULL} }; @@ -372,6 +374,10 @@ PyObject * ViewEdge_pointsEnd( BPy_ViewEdge *self, PyObject *args ) { return BPy_Interface0DIterator_from_Interface0DIterator( if0D_it ); } +PyObject * ViewEdge_qi( BPy_ViewEdge *self ) { + return PyInt_FromLong( self->ve->qi() ); +} + /////////////////////////////////////////////////////////////////////////////////////////// #ifdef __cplusplus diff --git a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp index de77cdd686b..24715a4cbfa 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp @@ -167,7 +167,7 @@ PyObject * UnaryFunction0DVectorViewShape___call__( BPy_UnaryFunction0DVectorVie if(!PyArg_ParseTuple(args, "O!", &Interface0DIterator_Type, &obj)) return NULL; - if( typeid(*(self->uf0D_vectorviewshape)) == typeid(UnaryFunction0D>) ) { + if( typeid(*(self->uf0D_vectorviewshape)) == typeid(UnaryFunction0D< std::vector >) ) { PyErr_SetString(PyExc_TypeError, "__call__ method must be overloaded"); return NULL; } diff --git a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp index 5b86ea1f4ca..e227f9159c4 100644 --- a/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp +++ b/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp @@ -198,7 +198,7 @@ PyObject * UnaryFunction1DVectorViewShape___call__( BPy_UnaryFunction1DVectorVie if( !PyArg_ParseTuple(args, "O!", &Interface1D_Type, &obj) ) return NULL; - if( typeid(*(self->uf1D_vectorviewshape)) == typeid(UnaryFunction1D>) ) { + if( typeid(*(self->uf1D_vectorviewshape)) == typeid(UnaryFunction1D< std::vector >) ) { PyErr_SetString(PyExc_TypeError, "__call__ method must be overloaded"); return NULL; } -- cgit v1.2.3