soc-2008-mxcurioni: Made crucial corrections to stabilize the system. Most of the original styles are supported: stroke attributes are correctly taken into account, Python shaders are supported. Added SamplingShader.

1 files changed, 166 insertions, 12 deletions

diff --git a/source/blender/freestyle/intern/python/Director.cpp b/source/blender/freestyle/intern/python/Director.cpp
index b3188554c09..153ea79eabf 100644
--- a/source/blender/freestyle/intern/python/Director.cpp
+++ b/source/blender/freestyle/intern/python/Director.cpp
@@ -13,6 +13,11 @@
 #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"
@@ -28,6 +33,15 @@
 #include "UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h"
 #include "UnaryFunction0D/BPy_UnaryFunction0DViewShape.h"
 
+#include "UnaryFunction1D/BPy_UnaryFunction1DDouble.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DFloat.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DVec2f.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DVec3f.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h"
+
+
 //   BinaryPredicate0D: __call__
 bool Director_BPy_BinaryPredicate0D___call__( PyObject *obj, Interface0D& i1, Interface0D& i2) {
 	PyObject *result = PyObject_CallMethod( obj, "__call__", "OO", BPy_Interface0D_from_Interface0D(i1), BPy_Interface0D_from_Interface0D(i2) );
@@ -62,7 +76,7 @@ bool Director_BPy_UnaryPredicate1D___call__( PyObject *obj, Interface1D& if1D) {
 
 //   StrokeShader: shade
 void Director_BPy_StrokeShader_shade( PyObject *obj, Stroke& s) {
-	PyObject_CallMethod( obj, "shade", "O", BPy_Stroke_from_Stroke(s) );
+	PyObject_CallMethod( obj, "shade", "O", BPy_Stroke_from_Stroke_ptr(&s) );
 }
 
 //   ChainingIterator: init, traverse
@@ -89,7 +103,6 @@ void Director_BPy_UnaryFunction0D___call__( void *uf0D, PyObject *obj, Interface
 		((UnaryFunction0D<Nature::EdgeNature> *) uf0D)->result = EdgeNature_from_BPy_Nature(result);
 	
 	} else if ( BPy_UnaryFunction0DFloat_Check(obj) ) {
-
 		((UnaryFunction0D<float> *) uf0D)->result = PyFloat_AsDouble(result);
 	
 	} else if ( BPy_UnaryFunction0DId_Check(obj) ) {
@@ -129,20 +142,45 @@ void Director_BPy_UnaryFunction0D___call__( void *uf0D, PyObject *obj, Interface
 
 void Director_BPy_UnaryFunction1D___call__( void *uf1D, PyObject *obj, Interface1D& if1D) {
 
-// BPy_UnaryFunction1DDouble
-// BPy_UnaryFunction1DEdgeNature
-// BPy_UnaryFunction1DFloat
-// BPy_UnaryFunction1DUnsigned
-// BPy_UnaryFunction1DVec2f
-// BPy_UnaryFunction1DVec3f
-// BPy_UnaryFunction1DVectorViewShape
-// BPy_UnaryFunction1DVoid
+	PyObject *result = PyObject_CallMethod( obj, "__call__", "O", BPy_Interface1D_from_Interface1D(if1D) );
+	
+	if( BPy_UnaryFunction1DDouble_Check(obj) ) {	
+		((UnaryFunction1D<double> *) uf1D)->result = PyFloat_AsDouble(result);
 
+	} else if ( BPy_UnaryFunction1DEdgeNature_Check(obj) ) {
+		((UnaryFunction1D<Nature::EdgeNature> *) uf1D)->result = EdgeNature_from_BPy_Nature(result);
+	
+	} else if ( BPy_UnaryFunction1DFloat_Check(obj) ) {
+		((UnaryFunction1D<float> *) uf1D)->result = PyFloat_AsDouble(result);
+	
+	} else if ( BPy_UnaryFunction1DUnsigned_Check(obj) ) {
+		((UnaryFunction1D<unsigned> *) uf1D)->result = PyInt_AsLong(result);
+	
+	} else if ( BPy_UnaryFunction1DVec2f_Check(obj) ) {
+		Vec2f *v = Vec2f_ptr_from_Vector( result );
+		((UnaryFunction1D<Vec2f> *) uf1D)->result = *v;
+		delete v; 
+	
+	} else if ( BPy_UnaryFunction1DVec3f_Check(obj) ) {
+		Vec3f *v = Vec3f_ptr_from_Vector( result );
+		((UnaryFunction1D<Vec3f> *) uf1D)->result = *v;
+		delete v;
+	
+	} else if ( BPy_UnaryFunction1DVectorViewShape_Check(obj) ) {
+		vector<ViewShape*> vec;
+		for( int i = 1; i < PyList_Size(result); i++) {
+			ViewShape *b = ( (BPy_ViewShape *) PyList_GetItem(result, i) )->vs;
+			vec.push_back( b );
+		}
+			
+		((UnaryFunction1D< vector<ViewShape*> > *) uf1D)->result = vec;
+	
+	} 
 
 }
 
 
-// BPy_Iterator: increment, decrement, isBegin, isEnd
+//	Iterator: increment, decrement, isBegin, isEnd
 void Director_BPy_Iterator_increment( PyObject *obj ) {
 	PyObject_CallMethod( obj, "increment", "", 0 );
 }
@@ -163,7 +201,106 @@ bool Director_BPy_Iterator_isEnd( PyObject *obj ) {
 	return bool_from_PyBool(result);
 }
 
-// BPy_Interface1D: verticesBegin, verticesEnd, pointsBegin, pointsEnd
+//	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 );
+
+	return PyFloat_AsDouble(result);
+}
+
+double Director_BPy_Interface0D_getY( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "getY", "", 0 );
+
+	return PyFloat_AsDouble(result);
+}
+
+double Director_BPy_Interface0D_getZ( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "getZ", "", 0 );
+
+	return PyFloat_AsDouble(result);
+}
+
+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);
+	delete v_ref;
+
+	return v;
+}
+
+double Director_BPy_Interface0D_getProjectedX( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "getProjectedX", "", 0 );
+
+	return PyFloat_AsDouble(result);
+}
+
+double Director_BPy_Interface0D_getProjectedY( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "getProjectedY", "", 0 );
+
+	return PyFloat_AsDouble(result);
+}
+
+double Director_BPy_Interface0D_getProjectedZ( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "getProjectedZ", "", 0 );
+
+	return PyFloat_AsDouble(result);
+}
+
+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);
+	delete v_ref;
+
+	return v;
+}
+
+FEdge * Director_BPy_Interface0D_getFEdge( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "getFEdge", "", 0 );
+
+	return ((BPy_FEdge *) result)->fe;
+}
+
+Id Director_BPy_Interface0D_getId( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "getId", "", 0 );
+
+	return *( ((BPy_Id *) result)->id );
+}
+
+Nature::EdgeNature Director_BPy_Interface0D_getNature( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "getNature", "", 0 );
+
+	return EdgeNature_from_BPy_Nature(result);
+}
+
+SVertex * Director_BPy_Interface0D_castToSVertex( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "castToSVertex", "", 0 );
+
+	return ((BPy_SVertex *) result)->sv;
+}
+
+ViewVertex * Director_BPy_Interface0D_castToViewVertex( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "castToViewVertex", "", 0 );
+
+	return ((BPy_ViewVertex *) result)->vv;
+}
+
+NonTVertex * Director_BPy_Interface0D_castToNonTVertex( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "castToNonTVertex", "", 0 );
+
+	return ((BPy_NonTVertex *) result)->ntv;
+}
+
+TVertex * Director_BPy_Interface0D_castToTVertex( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "castToTVertex", "", 0 );
+
+	return ((BPy_TVertex *) result)->tv;
+}
+
+//	Interface1D: verticesBegin, verticesEnd, pointsBegin, pointsEnd
 Interface0DIterator Director_BPy_Interface1D_verticesBegin( PyObject *obj ){
 	PyObject *result = PyObject_CallMethod( obj, "verticesBegin", "", 0 );
 
@@ -188,3 +325,20 @@ Interface0DIterator Director_BPy_Interface1D_pointsEnd( PyObject *obj ){
 	return *( ((BPy_Interface0DIterator *) result)->if0D_it );
 }
 
+double Director_BPy_Interface1D_getLength2D( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "getLength2D", "", 0 );
+
+	return PyFloat_AsDouble(result);
+}
+
+Id Director_BPy_Interface1D_getId( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "getId", "", 0 );
+
+	return *( ((BPy_Id *) result)->id );
+}
+
+Nature::EdgeNature Director_BPy_Interface1D_getNature( PyObject *obj ) {
+	PyObject *result = PyObject_CallMethod( obj, "getNature", "", 0 );
+
+	return EdgeNature_from_BPy_Nature( result );
+}
\ No newline at end of file