| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | #include "BPy_FEdgeSmooth.h"
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #include "../../BPy_Convert.h"
 | 
					
						
							|  |  |  | #include "../../Interface0D/BPy_SVertex.h"
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | #ifdef __cplusplus
 | 
					
						
							|  |  |  | extern "C" { | 
					
						
							|  |  |  | #endif
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | ///////////////////////////////////////////////////////////////////////////////////////////
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | //------------------------INSTANCE METHODS ----------------------------------
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-04-17 23:47:47 +00:00
										 |  |  | static char FEdgeSmooth___doc__[] = | 
					
						
							|  |  |  | "Class defining a smooth edge.  This kind of edge typically runs across\n" | 
					
						
							|  |  |  | "a face of the input mesh.  It can be a silhouette, a ridge or valley,\n" | 
					
						
							|  |  |  | "a suggestive contour.\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | ".. method:: __init__()\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   Default constructor.\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | ".. method:: __init__(iBrother)\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   Copy constructor.\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   :arg iBrother: An FEdgeSmooth object.\n" | 
					
						
							|  |  |  | "   :type iBrother: :class:`FEdgeSmooth`\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | ".. method:: __init__(vA, vB)\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   Builds an FEdgeSmooth going from vA to vB.\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   :arg vA: The first SVertex object.\n" | 
					
						
							|  |  |  | "   :type vA: :class:`SVertex`\n" | 
					
						
							|  |  |  | "   :arg vB: The second SVertex object.\n" | 
					
						
							|  |  |  | "   :type vB: :class:`SVertex`\n"; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static int FEdgeSmooth___init__(BPy_FEdgeSmooth *self, PyObject *args, PyObject *kwds) | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | { | 
					
						
							|  |  |  | 	PyObject *obj1 = 0, *obj2 = 0; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     if (! PyArg_ParseTuple(args, "|OO", &obj1, &obj2) ) | 
					
						
							|  |  |  |         return -1; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	if( !obj1 ){ | 
					
						
							|  |  |  | 		self->fes = new FEdgeSmooth(); | 
					
						
							|  |  |  | 		 | 
					
						
							| 
									
										
										
										
											2009-08-03 15:19:51 +00:00
										 |  |  | 	} else if( !obj2 && BPy_FEdgeSmooth_Check(obj1) ) { | 
					
						
							| 
									
										
										
										
											2009-03-31 22:45:11 +00:00
										 |  |  | 		self->fes = new FEdgeSmooth(*( ((BPy_FEdgeSmooth *) obj1)->fes )); | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | 		 | 
					
						
							| 
									
										
										
										
											2009-08-03 15:19:51 +00:00
										 |  |  | 	} else if( obj2 && BPy_SVertex_Check(obj1) && BPy_SVertex_Check(obj2) ) { | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | 		self->fes = new FEdgeSmooth( ((BPy_SVertex *) obj1)->sv, ((BPy_SVertex *) obj2)->sv ); | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	} else { | 
					
						
							| 
									
										
										
										
											2009-03-31 22:45:11 +00:00
										 |  |  | 		PyErr_SetString(PyExc_TypeError, "invalid argument(s)"); | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | 		return -1; | 
					
						
							|  |  |  | 	} | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 	self->py_fe.fe = self->fes; | 
					
						
							|  |  |  | 	self->py_fe.py_if1D.if1D = self->fes; | 
					
						
							| 
									
										
											  
											
												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__().
											
										 
											2009-08-02 16:23:18 +00:00
										 |  |  | 	self->py_fe.py_if1D.borrowed = 0; | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | 	return 0; | 
					
						
							| 
									
										
										
										
											2008-07-09 08:24:13 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-04-17 23:47:47 +00:00
										 |  |  | static char FEdgeSmooth_normal___doc__[] = | 
					
						
							|  |  |  | ".. method:: normal()\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   Returns the normal to the Face it is running accross.\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   :return: The normal to the Face it is running accross.\n" | 
					
						
							| 
									
										
										
										
											2010-04-18 02:03:19 +00:00
										 |  |  | "   :rtype: :class:`mathutils.Vector`\n"; | 
					
						
							| 
									
										
										
										
											2010-04-17 23:47:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | static PyObject * FEdgeSmooth_normal( BPy_FEdgeSmooth *self ) { | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | 	Vec3r v( self->fes->normal() ); | 
					
						
							|  |  |  | 	return Vector_from_Vec3r( v ); | 
					
						
							| 
									
										
										
										
											2008-07-09 08:24:13 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-04-17 23:47:47 +00:00
										 |  |  | static char FEdgeSmooth_materialIndex___doc__[] = | 
					
						
							|  |  |  | ".. method:: materialIndex()\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   Returns the index of the material of the face it is running accross.\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   :return: The index of the material of the face it is running accross.\n" | 
					
						
							|  |  |  | "   :rtype: int\n"; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static PyObject * FEdgeSmooth_materialIndex( BPy_FEdgeSmooth *self ) { | 
					
						
							| 
									
										
										
										
											2009-09-27 00:32:20 +00:00
										 |  |  | 	return PyLong_FromLong( self->fes->frs_materialIndex() ); | 
					
						
							| 
									
										
										
										
											2008-07-09 08:24:13 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-04-17 23:47:47 +00:00
										 |  |  | static char FEdgeSmooth_material___doc__[] = | 
					
						
							|  |  |  | ".. method:: material()\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   Returns the material of the face it is running accross.\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   :return: The material of the face it is running accross.\n" | 
					
						
							|  |  |  | "   :rtype: :class:`Material`\n"; | 
					
						
							| 
									
										
										
										
											2008-07-09 08:24:13 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-04-17 23:47:47 +00:00
										 |  |  | static PyObject * FEdgeSmooth_material( BPy_FEdgeSmooth *self ) { | 
					
						
							| 
									
										
										
										
											2008-08-07 15:04:25 +00:00
										 |  |  | 	FrsMaterial m( self->fes->frs_material() ); | 
					
						
							|  |  |  | 	return BPy_FrsMaterial_from_FrsMaterial(m); | 
					
						
							| 
									
										
										
										
											2008-07-09 08:24:13 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-04-17 23:47:47 +00:00
										 |  |  | static char FEdgeSmooth_setNormal___doc__[] = | 
					
						
							|  |  |  | ".. method:: setNormal(iNormal)\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   Sets the normal to the Face it is running accross.\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   :arg iNormal: A three-dimensional vector.\n" | 
					
						
							| 
									
										
										
										
											2010-04-18 02:03:19 +00:00
										 |  |  | "   :type iNormal: :class:`mathutils.Vector`, list or tuple of 3 real numbers\n"; | 
					
						
							| 
									
										
										
										
											2010-04-17 23:47:47 +00:00
										 |  |  | 
 | 
					
						
							|  |  |  | static PyObject * FEdgeSmooth_setNormal( BPy_FEdgeSmooth *self, PyObject *args ) { | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | 	PyObject *obj = 0; | 
					
						
							| 
									
										
										
										
											2008-07-09 08:24:13 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-07-25 11:27:18 +00:00
										 |  |  | 	if(!( PyArg_ParseTuple(args, "O", &obj) )) | 
					
						
							| 
									
										
										
										
											2009-03-31 22:45:11 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2009-07-25 11:27:18 +00:00
										 |  |  | 	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)"); | 
					
						
							| 
									
										
										
										
											2009-03-31 22:45:11 +00:00
										 |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | 	} | 
					
						
							| 
									
										
										
										
											2009-07-25 11:27:18 +00:00
										 |  |  | 	self->fes->setNormal( *v ); | 
					
						
							|  |  |  | 	delete v; | 
					
						
							| 
									
										
										
										
											2008-07-09 08:24:13 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | 	Py_RETURN_NONE; | 
					
						
							| 
									
										
										
										
											2008-07-09 08:24:13 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-04-17 23:47:47 +00:00
										 |  |  | static char FEdgeSmooth_setMaterialIndex___doc__[] = | 
					
						
							|  |  |  | ".. method:: setMaterialIndex(i)\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   Sets the index of the material of the face it is running accross.\n" | 
					
						
							|  |  |  | "\n" | 
					
						
							|  |  |  | "   :arg i: The index of the material of the face it is running accross.\n" | 
					
						
							|  |  |  | "   :type i: int\n"; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | static PyObject * FEdgeSmooth_setMaterialIndex( BPy_FEdgeSmooth *self, PyObject *args ) { | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | 	unsigned int i; | 
					
						
							| 
									
										
										
										
											2008-07-09 08:24:13 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2009-03-31 22:45:11 +00:00
										 |  |  | 	if(!( PyArg_ParseTuple(args, "I", &i) )) | 
					
						
							|  |  |  | 		return NULL; | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | 	 | 
					
						
							| 
									
										
										
										
											2008-08-07 15:04:25 +00:00
										 |  |  | 	self->fes->setFrsMaterialIndex( i ); | 
					
						
							| 
									
										
										
										
											2008-07-09 08:24:13 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | 	Py_RETURN_NONE; | 
					
						
							| 
									
										
										
										
											2008-07-09 08:24:13 +00:00
										 |  |  | } | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2010-04-17 23:47:47 +00:00
										 |  |  | /*----------------------FEdgeSmooth instance definitions ----------------------------*/ | 
					
						
							|  |  |  | static PyMethodDef BPy_FEdgeSmooth_methods[] = {	 | 
					
						
							|  |  |  | 	{"normal", ( PyCFunction ) FEdgeSmooth_normal, METH_NOARGS, FEdgeSmooth_normal___doc__}, | 
					
						
							|  |  |  | 	{"materialIndex", ( PyCFunction ) FEdgeSmooth_materialIndex, METH_NOARGS, FEdgeSmooth_materialIndex___doc__}, | 
					
						
							|  |  |  | 	{"material", ( PyCFunction ) FEdgeSmooth_material, METH_NOARGS, FEdgeSmooth_material___doc__}, | 
					
						
							|  |  |  | 	{"setNormal", ( PyCFunction ) FEdgeSmooth_setNormal, METH_VARARGS, FEdgeSmooth_setNormal___doc__}, | 
					
						
							|  |  |  | 	{"setMaterialIndex", ( PyCFunction ) FEdgeSmooth_setMaterialIndex, METH_VARARGS, FEdgeSmooth_setMaterialIndex___doc__}, | 
					
						
							|  |  |  | 	{NULL, NULL, 0, NULL} | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | /*-----------------------BPy_FEdgeSmooth type definition ------------------------------*/ | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | PyTypeObject FEdgeSmooth_Type = { | 
					
						
							|  |  |  | 	PyVarObject_HEAD_INIT(NULL, 0) | 
					
						
							|  |  |  | 	"FEdgeSmooth",                  /* tp_name */ | 
					
						
							|  |  |  | 	sizeof(BPy_FEdgeSmooth),        /* 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 */ | 
					
						
							|  |  |  | 	FEdgeSmooth___doc__,            /* tp_doc */ | 
					
						
							|  |  |  | 	0,                              /* tp_traverse */ | 
					
						
							|  |  |  | 	0,                              /* tp_clear */ | 
					
						
							|  |  |  | 	0,                              /* tp_richcompare */ | 
					
						
							|  |  |  | 	0,                              /* tp_weaklistoffset */ | 
					
						
							|  |  |  | 	0,                              /* tp_iter */ | 
					
						
							|  |  |  | 	0,                              /* tp_iternext */ | 
					
						
							|  |  |  | 	BPy_FEdgeSmooth_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)FEdgeSmooth___init__, /* tp_init */ | 
					
						
							|  |  |  | 	0,                              /* tp_alloc */ | 
					
						
							|  |  |  | 	0,                              /* tp_new */ | 
					
						
							|  |  |  | }; | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | ///////////////////////////////////////////////////////////////////////////////////////////
 | 
					
						
							| 
									
										
										
										
											2008-07-09 08:24:13 +00:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2008-07-26 02:33:21 +00:00
										 |  |  | #ifdef __cplusplus
 | 
					
						
							|  |  |  | } | 
					
						
							|  |  |  | #endif
 |