diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-08-02 20:23:18 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2009-08-02 20:23:18 +0400 |
commit | acf97994bc9b5a9be1fc6cdd3907eaa198719b11 (patch) | |
tree | feda501e6f4429e7eb2515bfeafdc4475e66b2b6 /source/blender/freestyle/intern/python/Director.cpp | |
parent | 6d1ad351f3d619eb8c6b509292c3517c93afd51b (diff) |
SWIG/directors dependency removal (cont'd)
* Added to python/BPy_Convert.{cpp,h} 4 utility converters below for
better introspection-based automatic type conversion.
PyObject * Any_BPy_Interface0D_from_Interface0D( Interface0D& if0D );
PyObject * Any_BPy_Interface1D_from_Interface1D( Interface1D& if1D );
PyObject * Any_BPy_FEdge_from_FEdge( FEdge& fe );
PyObject * Any_BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );
There are 4 corresponding converters without the "Any_" prefix. All
calls of them in the code base were replaced with these new converters
so that the introspection-based automatic conversion would take place
universally.
* python/BPy_Convert.{cpp,h}: Those C++ to Python converters having
had a "_ptr" suffix were renamed to a name without the suffix, and
their arguments were changed so as to take a reference (e.g.,
ViewVertex&) instead of a pointer (e.g., ViewVertex *). The changed
converters and their new function prototypes are listed below. These
converters now return a Python wrapper object that retains the passed
reference, instead of retaining a newly created C++ object by the
converters.
// Interface0D converters
PyObject * BPy_Interface0D_from_Interface0D( Interface0D& if0D );
PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp );
PyObject * BPy_StrokeVertex_from_StrokeVertex( StrokeVertex& sv );
PyObject * BPy_SVertex_from_SVertex( SVertex& sv );
PyObject * BPy_ViewVertex_from_ViewVertex( ViewVertex& vv );
PyObject * BPy_TVertex_from_TVertex( TVertex& tv );
PyObject * BPy_NonTVertex_from_NonTVertex( NonTVertex& ntv );
// Interface1D converters
PyObject * BPy_Interface1D_from_Interface1D( Interface1D& if1D );
PyObject * BPy_Chain_from_Chain( Chain& c );
PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
PyObject * BPy_FEdgeSharp_from_FEdgeSharp( FEdgeSharp& fes );
PyObject * BPy_FEdgeSmooth_from_FEdgeSmooth( FEdgeSmooth& fes );
PyObject * BPy_Stroke_from_Stroke( Stroke& s );
PyObject * BPy_ViewEdge_from_ViewEdge( ViewEdge& ve );
PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve );
// some other converters
PyObject * BPy_ViewShape_from_ViewShape( ViewShape& vs );
PyObject * BPy_SShape_from_SShape( SShape& ss );
PyObject * BPy_FrsMaterial_from_FrsMaterial( FrsMaterial& m );
PyObject * BPy_StrokeAttribute_from_StrokeAttribute( StrokeAttribute& sa );
* Added a "borrowed" flag to the definitions of Python types being
used to wrap C++ components of Freestyle's internal data structures.
The flag indicates whether or not a Python wrapper object has a
reference to a C++ object that comprises the internal data structures.
The deallocation routines of the Python types check this flag and
release a wrapped C++ object only when it is not part of the internal
data structures. The following files were modified:
python/BPy_FrsMaterial.{cpp,h}
python/BPy_Interface0D.{cpp,h}
python/BPy_Interface1D.{cpp,h}
python/BPy_SShape.{cpp,h}
python/BPy_StrokeAttribute.{cpp,h}
python/BPy_ViewShape.{cpp,h}
python/Interface0D/BPy_CurvePoint.cpp
python/Interface0D/BPy_SVertex.cpp
python/Interface0D/BPy_ViewVertex.cpp
python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
python/Interface0D/ViewVertex/BPy_TVertex.cpp
python/Interface1D/BPy_FEdge.cpp
python/Interface1D/BPy_FrsCurve.cpp
python/Interface1D/BPy_Stroke.cpp
python/Interface1D/BPy_ViewEdge.cpp
python/Interface1D/Curve/BPy_Chain.cpp
python/Interface1D/FEdge/BPy_FEdgeSharp.cpp
python/Interface1D/FEdge/BPy_FEdgeSmooth.cpp
* view_map/Interface[01]D.h, python/BPy_Interface[01]D.cpp: Removed
from the Interface0D and Interface1D C++ classes a back pointer to a
Python wrapper object and all "director" calls. These classes (and
their subclasses) are used to build Freestyle's main data structures
(such as a view map and strokes) and their class hierarchy is static.
Python wrappers of these C++ classes are only used to access the data
structures from the Python layer, and not intended to extend the data
structures by subclassing the Python wrappers. Without the necessity
of subclassing in the Python layer, the back pointer to a wrapping
Python object and "director" calls would be useless (actually they
were not used at all), so they were all removed.
* python/Director.{cpp,h}: Removed the definitions of directors that
were no longer used.
* stroke/Stroke.{cpp,h}: Removed an (unused) back pointer to a Python
wrapper object.
* python/BPy_ViewMap.cpp: Fixed a possible null pointer reference.
* python/Interface1D/BPy_FEdge.cpp: Fixed parameter checking in
FEdge___init__().
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; -} |