diff options
Diffstat (limited to 'source/blender/freestyle/intern/python/Director.cpp')
-rw-r--r-- | source/blender/freestyle/intern/python/Director.cpp | 209 |
1 files changed, 7 insertions, 202 deletions
diff --git a/source/blender/freestyle/intern/python/Director.cpp b/source/blender/freestyle/intern/python/Director.cpp index 45eb9d861e2..cc2b00bdc69 100644 --- a/source/blender/freestyle/intern/python/Director.cpp +++ b/source/blender/freestyle/intern/python/Director.cpp @@ -13,11 +13,6 @@ #include "BPy_StrokeShader.h" #include "Iterator/BPy_ChainingIterator.h" #include "Iterator/BPy_Interface0DIterator.h" -#include "Interface0D/BPy_SVertex.h" -#include "Interface0D/BPy_ViewVertex.h" -#include "Interface0D/ViewVertex/BPy_NonTVertex.h" -#include "Interface0D/ViewVertex/BPy_TVertex.h" -#include "Interface1D/BPy_FEdge.h" #include "Interface1D/BPy_Stroke.h" #include "Interface1D/BPy_ViewEdge.h" #include "BPy_ViewShape.h" @@ -48,8 +43,8 @@ int Director_BPy_BinaryPredicate0D___call__( BinaryPredicate0D *bp0D, Interface0 PyErr_SetString(PyExc_RuntimeError, "Reference to Python object (py_bp0D) not initialized"); return -1; } - PyObject *arg1 = BPy_Interface0D_from_Interface0D(i1); - PyObject *arg2 = BPy_Interface0D_from_Interface0D(i2); + PyObject *arg1 = Any_BPy_Interface0D_from_Interface0D(i1); + PyObject *arg2 = Any_BPy_Interface0D_from_Interface0D(i2); if (!arg1 || !arg2) { Py_XDECREF(arg1); Py_XDECREF(arg2); @@ -75,8 +70,8 @@ int Director_BPy_BinaryPredicate1D___call__( BinaryPredicate1D *bp1D, Interface1 PyErr_SetString(PyExc_RuntimeError, "Reference to Python object (py_bp1D) not initialized"); return -1; } - PyObject *arg1 = BPy_Interface1D_from_Interface1D(i1); - PyObject *arg2 = BPy_Interface1D_from_Interface1D(i2); + PyObject *arg1 = Any_BPy_Interface1D_from_Interface1D(i1); + PyObject *arg2 = Any_BPy_Interface1D_from_Interface1D(i2); if (!arg1 || !arg2) { Py_XDECREF(arg1); Py_XDECREF(arg2); @@ -124,7 +119,7 @@ int Director_BPy_UnaryPredicate1D___call__( UnaryPredicate1D *up1D, Interface1D& PyErr_SetString(PyExc_RuntimeError, "Reference to Python object (py_up1D) not initialized"); return -1; } - PyObject *arg = BPy_Interface1D_from_Interface1D(if1D); + PyObject *arg = Any_BPy_Interface1D_from_Interface1D(if1D); if (!arg) return -1; PyObject *result = PyObject_CallMethod( up1D->py_up1D, "__call__", "O", arg ); @@ -146,7 +141,7 @@ int Director_BPy_StrokeShader_shade( StrokeShader *ss, Stroke& s ) { PyErr_SetString(PyExc_RuntimeError, "Reference to Python object (py_ss) not initialized"); return -1; } - PyObject *arg = BPy_Stroke_from_Stroke_ptr(&s); + PyObject *arg = BPy_Stroke_from_Stroke(s); if (!arg) return -1; PyObject *result = PyObject_CallMethod( ss->py_ss, "shade", "O", arg ); @@ -263,7 +258,7 @@ int Director_BPy_UnaryFunction1D___call__( void *uf1D, PyObject *obj, Interface1 PyErr_SetString(PyExc_RuntimeError, "Reference to Python object (py_uf1D) not initialized"); return -1; } - PyObject *arg = BPy_Interface1D_from_Interface1D(if1D); + PyObject *arg = Any_BPy_Interface1D_from_Interface1D(if1D); if (!arg) return -1; PyObject *result = PyObject_CallMethod( obj, "__call__", "O", arg ); @@ -307,193 +302,3 @@ int Director_BPy_UnaryFunction1D___call__( void *uf1D, PyObject *obj, Interface1 Py_DECREF(result); return 0; } - - -// Iterator: increment, decrement, isBegin, isEnd -void Director_BPy_Iterator_increment( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "increment", "", 0 ); - Py_DECREF(result); -} - -void Director_BPy_Iterator_decrement( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "decrement", "", 0 ); - Py_DECREF(result); -} - -bool Director_BPy_Iterator_isBegin( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "isBegin", "", 0 ); - bool ret = bool_from_PyBool(result); - Py_DECREF(result); - return ret; -} - -bool Director_BPy_Iterator_isEnd( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "isEnd", "", 0 ); - bool ret = bool_from_PyBool(result); - Py_DECREF(result); - return ret; -} - -// Interface0D: getX, getY, getZ, getPoint3D, getProjectedX, getProjectedY, getProjectedZ, getPoint2D, getFEdge, getId, getNature, castToSVertex, castToViewVertex, castToNonTVertex, castToTVertex -double Director_BPy_Interface0D_getX( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getX", "", 0 ); - double ret = PyFloat_AsDouble(result); - Py_DECREF(result); - return ret; -} - -double Director_BPy_Interface0D_getY( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getY", "", 0 ); - double ret = PyFloat_AsDouble(result); - Py_DECREF(result); - return ret; -} - -double Director_BPy_Interface0D_getZ( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getZ", "", 0 ); - double ret = PyFloat_AsDouble(result); - Py_DECREF(result); - return ret; -} - -Geometry::Vec3f Director_BPy_Interface0D_getPoint3D( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getPoint3D", "", 0 ); - - Geometry::Vec3f *v_ref = Vec3f_ptr_from_Vector( result ); - Geometry::Vec3f v(*v_ref); - Py_DECREF(result); - delete v_ref; - - return v; -} - -double Director_BPy_Interface0D_getProjectedX( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getProjectedX", "", 0 ); - double ret = PyFloat_AsDouble(result); - Py_DECREF(result); - return ret; -} - -double Director_BPy_Interface0D_getProjectedY( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getProjectedY", "", 0 ); - double ret = PyFloat_AsDouble(result); - Py_DECREF(result); - return ret; -} - -double Director_BPy_Interface0D_getProjectedZ( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getProjectedZ", "", 0 ); - double ret = PyFloat_AsDouble(result); - Py_DECREF(result); - return ret; -} - -Geometry::Vec2f Director_BPy_Interface0D_getPoint2D( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getPoint2D", "", 0 ); - - Geometry::Vec2f *v_ref = Vec2f_ptr_from_Vector( result ); - Geometry::Vec2f v(*v_ref); - Py_DECREF(result); - delete v_ref; - - return v; -} - -FEdge * Director_BPy_Interface0D_getFEdge( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getFEdge", "", 0 ); - FEdge *ret = ((BPy_FEdge *) result)->fe; - Py_DECREF(result); - return ret; -} - -Id Director_BPy_Interface0D_getId( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getId", "", 0 ); - Id ret = *( ((BPy_Id *) result)->id ); - Py_DECREF(result); - return ret; -} - -Nature::EdgeNature Director_BPy_Interface0D_getNature( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getNature", "", 0 ); - Nature::EdgeNature ret = EdgeNature_from_BPy_Nature(result); - Py_DECREF(result); - return ret; -} - -SVertex * Director_BPy_Interface0D_castToSVertex( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "castToSVertex", "", 0 ); - SVertex *ret = ((BPy_SVertex *) result)->sv; - Py_DECREF(result); - return ret; -} - -ViewVertex * Director_BPy_Interface0D_castToViewVertex( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "castToViewVertex", "", 0 ); - ViewVertex *ret = ((BPy_ViewVertex *) result)->vv; - Py_DECREF(result); - return ret; -} - -NonTVertex * Director_BPy_Interface0D_castToNonTVertex( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "castToNonTVertex", "", 0 ); - NonTVertex *ret = ((BPy_NonTVertex *) result)->ntv; - Py_DECREF(result); - return ret; -} - -TVertex * Director_BPy_Interface0D_castToTVertex( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "castToTVertex", "", 0 ); - TVertex *ret = ((BPy_TVertex *) result)->tv; - Py_DECREF(result); - return ret; -} - -// Interface1D: verticesBegin, verticesEnd, pointsBegin, pointsEnd -Interface0DIterator Director_BPy_Interface1D_verticesBegin( PyObject *obj ){ - PyObject *result = PyObject_CallMethod( obj, "verticesBegin", "", 0 ); - Interface0DIterator ret = *( ((BPy_Interface0DIterator *) result)->if0D_it ); - Py_DECREF(result); - return ret; -} - -Interface0DIterator Director_BPy_Interface1D_verticesEnd( PyObject *obj ){ - PyObject *result = PyObject_CallMethod( obj, "verticesEnd", "", 0 ); - Interface0DIterator ret = *( ((BPy_Interface0DIterator *) result)->if0D_it ); - Py_DECREF(result); - return ret; -} - -Interface0DIterator Director_BPy_Interface1D_pointsBegin( PyObject *obj ){ - PyObject *result = PyObject_CallMethod( obj, "pointsBegin", "", 0 ); - Interface0DIterator ret = *( ((BPy_Interface0DIterator *) result)->if0D_it ); - Py_DECREF(result); - return ret; -} - -Interface0DIterator Director_BPy_Interface1D_pointsEnd( PyObject *obj ){ - PyObject *result = PyObject_CallMethod( obj, "pointsEnd", "", 0 ); - Interface0DIterator ret = *( ((BPy_Interface0DIterator *) result)->if0D_it ); - Py_DECREF(result); - return ret; -} - -double Director_BPy_Interface1D_getLength2D( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getLength2D", "", 0 ); - double ret = PyFloat_AsDouble(result); - Py_DECREF(result); - return ret; -} - -Id Director_BPy_Interface1D_getId( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getId", "", 0 ); - Id ret = *( ((BPy_Id *) result)->id ); - Py_DECREF(result); - return ret; -} - -Nature::EdgeNature Director_BPy_Interface1D_getNature( PyObject *obj ) { - PyObject *result = PyObject_CallMethod( obj, "getNature", "", 0 ); - Nature::EdgeNature ret = EdgeNature_from_BPy_Nature(result); - Py_DECREF(result); - return ret; -} |