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__().

1 files changed, 0 insertions, 47 deletions

diff --git a/source/blender/freestyle/intern/python/Director.h b/source/blender/freestyle/intern/python/Director.h
index ccce8280cb4..667d4a65942 100644
--- a/source/blender/freestyle/intern/python/Director.h
+++ b/source/blender/freestyle/intern/python/Director.h
@@ -1,28 +1,17 @@
 #ifndef  FREESTYLE_PYTHON_DIRECTOR
 # define FREESTYLE_PYTHON_DIRECTOR
 
-#include "../geometry/Geom.h"
-#include "../winged_edge/Nature.h"
-
 class UnaryPredicate0D;
 class UnaryPredicate1D;
 class BinaryPredicate0D;
 class BinaryPredicate1D;
 class ChainingIterator;
 class AdjacencyIterator;
-class FEdge;
-class Id;
 class Interface0D;
 class Interface1D;
 class Interface0DIterator;
-class NonTVertex;
 class Stroke;
 class StrokeShader;
-class SVertex;
-class TVertex;
-class ViewEdge;
-class ViewVertex;
-
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,32 +29,6 @@ int Director_BPy_BinaryPredicate0D___call__( BinaryPredicate0D *bp0D, Interface0
 //   BinaryPredicate1D: __call__
 int Director_BPy_BinaryPredicate1D___call__( BinaryPredicate1D *bp1D, Interface1D& i1, Interface1D& i2 );
 
-//	Interface0D: getX, getY, getZ, getPoint3D, getProjectedX, getProjectedY, getProjectedZ, getPoint2D, getFEdge, getId, getNature, castToSVertex, castToViewVertex, castToNonTVertex, castToTVertex
-double Director_BPy_Interface0D_getX( PyObject *obj );
-double Director_BPy_Interface0D_getY( PyObject *obj );
-double Director_BPy_Interface0D_getZ( PyObject *obj );
-Geometry::Vec3f Director_BPy_Interface0D_getPoint3D( PyObject *obj );
-double Director_BPy_Interface0D_getProjectedX( PyObject *obj );
-double Director_BPy_Interface0D_getProjectedY( PyObject *obj );
-double Director_BPy_Interface0D_getProjectedZ( PyObject *obj );
-Geometry::Vec2f Director_BPy_Interface0D_getPoint2D( PyObject *obj );
-FEdge * Director_BPy_Interface0D_getFEdge( PyObject *obj );
-Id Director_BPy_Interface0D_getId( PyObject *obj );
-Nature::EdgeNature Director_BPy_Interface0D_getNature( PyObject *obj );
-SVertex * Director_BPy_Interface0D_castToSVertex( PyObject *obj );
-ViewVertex * Director_BPy_Interface0D_castToViewVertex( PyObject *obj );
-NonTVertex * Director_BPy_Interface0D_castToNonTVertex( PyObject *obj );
-TVertex * Director_BPy_Interface0D_castToTVertex( PyObject *obj );
-
-//	Interface1D: verticesBegin, verticesEnd, pointsBegin, pointsEnd, getLength2D, getId, getNature
-Interface0DIterator Director_BPy_Interface1D_verticesBegin( PyObject *obj );
-Interface0DIterator Director_BPy_Interface1D_verticesEnd( PyObject *obj );
-Interface0DIterator Director_BPy_Interface1D_pointsBegin( PyObject *obj );
-Interface0DIterator Director_BPy_Interface1D_pointsEnd( PyObject *obj );
-double Director_BPy_Interface1D_getLength2D( PyObject *obj );
-Id Director_BPy_Interface1D_getId( PyObject *obj );
-Nature::EdgeNature Director_BPy_Interface1D_getNature( PyObject *obj );
-
 //	UnaryFunction{0D,1D}: __call__
 int Director_BPy_UnaryFunction0D___call__( void *uf0D, PyObject *obj, Interface0DIterator& if0D_it);
 int Director_BPy_UnaryFunction1D___call__( void *uf1D, PyObject *obj, Interface1D& if1D);
@@ -79,18 +42,8 @@ int Director_BPy_UnaryPredicate1D___call__( UnaryPredicate1D *up1D, Interface1D&
 //   StrokeShader: shade
 int Director_BPy_StrokeShader_shade( StrokeShader *ss, Stroke& s );
 
-//	Iterator: increment, decrement, isBegin, isEnd
-void Director_BPy_Iterator_increment( PyObject *obj );
-void Director_BPy_Iterator_decrement( PyObject *obj );
-bool Director_BPy_Iterator_isBegin( PyObject *obj );
-bool Director_BPy_Iterator_isEnd( PyObject *obj );
-
 //   ChainingIterator: init, traverse
 int Director_BPy_ChainingIterator_init( ChainingIterator *c_it );
 int Director_BPy_ChainingIterator_traverse( ChainingIterator *c_it, AdjacencyIterator& a_it );
 
-
-
-
-
 #endif // FREESTYLE_PYTHON_DIRECTOR