Revision: 15806
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15806
Author: mxcurioni
Date: 2008-07-27 15:40:33 +0200 (Sun, 27 Jul 2008)
Log Message:
-----------
soc-2008-mxcurioni: implemented and integrated all 21 original stroke shaders.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/swig/ModuleWrapper.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/python/Freestyle.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_BezierCurveShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_CalligraphicShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorNoiseShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ColorVariationPatternShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantColorShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstantThicknessShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_GuidingLinesShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingColorShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_IncreasingThicknessShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_PolygonalizationShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_SamplingShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_SpatialNoiseShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_StrokeTextureShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_TextureAssignerShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessNoiseShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_ThicknessVariationPatternShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_TipRemoverShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_fstreamShader.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_streamShader.h
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
2008-07-27 12:48:46 UTC (rev 15805)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
2008-07-27 13:40:33 UTC (rev 15806)
@@ -100,6 +100,27 @@
prefix + '/BPy_SShape.cpp',
prefix + '/BPy_StrokeAttribute.cpp',
prefix + '/BPy_StrokeShader.cpp',
+ prefix +
'/StrokeShader/BPy_BackboneStretcherShader.cpp',
+ prefix +
'/StrokeShader/BPy_BezierCurveShader.cpp',
+ prefix +
'/StrokeShader/BPy_CalligraphicShader.cpp',
+ prefix +
'/StrokeShader/BPy_ColorNoiseShader.cpp',
+ prefix +
'/StrokeShader/BPy_ColorVariationPatternShader.cpp',
+ prefix +
'/StrokeShader/BPy_ConstantColorShader.cpp',
+ prefix +
'/StrokeShader/BPy_ConstantThicknessShader.cpp',
+ prefix +
'/StrokeShader/BPy_ConstrainedIncreasingThicknessShader.cpp',
+ prefix +
'/StrokeShader/BPy_fstreamShader.cpp',
+ prefix +
'/StrokeShader/BPy_GuidingLinesShader.cpp',
+ prefix +
'/StrokeShader/BPy_IncreasingColorShader.cpp',
+ prefix +
'/StrokeShader/BPy_IncreasingThicknessShader.cpp',
+ prefix +
'/StrokeShader/BPy_PolygonalizationShader.cpp',
+ prefix +
'/StrokeShader/BPy_SamplingShader.cpp',
+ prefix +
'/StrokeShader/BPy_SpatialNoiseShader.cpp',
+ prefix +
'/StrokeShader/BPy_streamShader.cpp',
+ prefix +
'/StrokeShader/BPy_StrokeTextureShader.cpp',
+ prefix +
'/StrokeShader/BPy_TextureAssignerShader.cpp',
+ prefix +
'/StrokeShader/BPy_ThicknessNoiseShader.cpp',
+ prefix +
'/StrokeShader/BPy_ThicknessVariationPatternShader.cpp',
+ prefix +
'/StrokeShader/BPy_TipRemoverShader.cpp',
prefix + '/BPy_UnaryFunction0D.cpp',
prefix +
'/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp',
prefix +
'/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.cpp',
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
2008-07-27 12:48:46 UTC (rev 15805)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
2008-07-27 13:40:33 UTC (rev 15806)
@@ -204,6 +204,9 @@
return static_cast<IntegrationType>( PyInt_AsLong(obj) );
}
+Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj ) {
+ return static_cast<Stroke::MediumType>( PyInt_AsLong(obj) );
+}
///////////////////////////////////////////////////////////////////////////////////////////
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h
2008-07-27 12:48:46 UTC (rev 15805)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h
2008-07-27 13:40:33 UTC (rev 15806)
@@ -59,6 +59,7 @@
PyObject * Vector_from_Vec3r( Vec3r& v );
IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj );
+Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj );
PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb );
PyObject * BPy_FEdge_from_FEdge( FEdge& fe );
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
2008-07-27 12:48:46 UTC (rev 15805)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.cpp
2008-07-27 13:40:33 UTC (rev 15806)
@@ -3,6 +3,28 @@
#include "BPy_Convert.h"
#include "Interface1D/BPy_Stroke.h"
+#include "StrokeShader/BPy_BackboneStretcherShader.h"
+#include "StrokeShader/BPy_BezierCurveShader.h"
+#include "StrokeShader/BPy_CalligraphicShader.h"
+#include "StrokeShader/BPy_ColorNoiseShader.h"
+#include "StrokeShader/BPy_ColorVariationPatternShader.h"
+#include "StrokeShader/BPy_ConstantColorShader.h"
+#include "StrokeShader/BPy_ConstantThicknessShader.h"
+#include "StrokeShader/BPy_ConstrainedIncreasingThicknessShader.h"
+#include "StrokeShader/BPy_fstreamShader.h"
+#include "StrokeShader/BPy_GuidingLinesShader.h"
+#include "StrokeShader/BPy_IncreasingColorShader.h"
+#include "StrokeShader/BPy_IncreasingThicknessShader.h"
+#include "StrokeShader/BPy_PolygonalizationShader.h"
+#include "StrokeShader/BPy_SamplingShader.h"
+#include "StrokeShader/BPy_SpatialNoiseShader.h"
+#include "StrokeShader/BPy_streamShader.h"
+#include "StrokeShader/BPy_StrokeTextureShader.h"
+#include "StrokeShader/BPy_TextureAssignerShader.h"
+#include "StrokeShader/BPy_ThicknessNoiseShader.h"
+#include "StrokeShader/BPy_ThicknessVariationPatternShader.h"
+#include "StrokeShader/BPy_TipRemoverShader.h"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -117,9 +139,114 @@
if( PyType_Ready( &StrokeShader_Type ) < 0 )
return;
-
Py_INCREF( &StrokeShader_Type );
PyModule_AddObject(module, "StrokeShader", (PyObject
*)&StrokeShader_Type);
+
+ if( PyType_Ready( &BackboneStretcherShader_Type ) < 0 )
+ return;
+ Py_INCREF( &BackboneStretcherShader_Type );
+ PyModule_AddObject(module, "BackboneStretcherShader", (PyObject
*)&BackboneStretcherShader_Type);
+
+ if( PyType_Ready( &BezierCurveShader_Type ) < 0 )
+ return;
+ Py_INCREF( &BezierCurveShader_Type );
+ PyModule_AddObject(module, "BezierCurveShader", (PyObject
*)&BezierCurveShader_Type);
+
+ if( PyType_Ready( &CalligraphicShader_Type ) < 0 )
+ return;
+ Py_INCREF( &CalligraphicShader_Type );
+ PyModule_AddObject(module, "CalligraphicShader", (PyObject
*)&CalligraphicShader_Type);
+
+ if( PyType_Ready( &ColorNoiseShader_Type ) < 0 )
+ return;
+ Py_INCREF( &ColorNoiseShader_Type );
+ PyModule_AddObject(module, "ColorNoiseShader", (PyObject
*)&ColorNoiseShader_Type);
+
+ if( PyType_Ready( &ColorVariationPatternShader_Type ) < 0 )
+ return;
+ Py_INCREF( &ColorVariationPatternShader_Type );
+ PyModule_AddObject(module, "ColorVariationPatternShader", (PyObject
*)&ColorVariationPatternShader_Type);
+
+ if( PyType_Ready( &ConstantColorShader_Type ) < 0 )
+ return;
+ Py_INCREF( &ConstantColorShader_Type );
+ PyModule_AddObject(module, "ConstantColorShader", (PyObject
*)&ConstantColorShader_Type);
+
+ if( PyType_Ready( &ConstantThicknessShader_Type ) < 0 )
+ return;
+ Py_INCREF( &ConstantThicknessShader_Type );
+ PyModule_AddObject(module, "ConstantThicknessShader", (PyObject
*)&ConstantThicknessShader_Type);
+
+ if( PyType_Ready( &ConstrainedIncreasingThicknessShader_Type ) < 0 )
+ return;
+ Py_INCREF( &ConstrainedIncreasingThicknessShader_Type );
+ PyModule_AddObject(module, "ConstrainedIncreasingThicknessShader",
(PyObject *)&ConstrainedIncreasingThicknessShader_Type);
+
+ if( PyType_Ready( &fstreamShader_Type ) < 0 )
+ return;
+ Py_INCREF( &fstreamShader_Type );
+ PyModule_AddObject(module, "fstreamShader", (PyObject
*)&fstreamShader_Type);
+
+ if( PyType_Ready( &GuidingLinesShader_Type ) < 0 )
+ return;
+ Py_INCREF( &GuidingLinesShader_Type );
+ PyModule_AddObject(module, "GuidingLinesShader", (PyObject
*)&GuidingLinesShader_Type);
+
+ if( PyType_Ready( &IncreasingColorShader_Type ) < 0 )
+ return;
+ Py_INCREF( &IncreasingColorShader_Type );
+ PyModule_AddObject(module, "IncreasingColorShader", (PyObject
*)&IncreasingColorShader_Type);
+
+ if( PyType_Ready( &IncreasingThicknessShader_Type ) < 0 )
+ return;
+ Py_INCREF( &IncreasingThicknessShader_Type );
+ PyModule_AddObject(module, "IncreasingThicknessShader", (PyObject
*)&IncreasingThicknessShader_Type);
+
+ if( PyType_Ready( &PolygonalizationShader_Type ) < 0 )
+ return;
+ Py_INCREF( &PolygonalizationShader_Type );
+ PyModule_AddObject(module, "PolygonalizationShader", (PyObject
*)&PolygonalizationShader_Type);
+
+ if( PyType_Ready( &SamplingShader_Type ) < 0 )
+ return;
+ Py_INCREF( &SamplingShader_Type );
+ PyModule_AddObject(module, "SamplingShader", (PyObject
*)&SamplingShader_Type);
+
+ if( PyType_Ready( &SpatialNoiseShader_Type ) < 0 )
+ return;
+ Py_INCREF( &SpatialNoiseShader_Type );
+ PyModule_AddObject(module, "SpatialNoiseShader", (PyObject
*)&SpatialNoiseShader_Type);
+
+ if( PyType_Ready( &streamShader_Type ) < 0 )
+ return;
+ Py_INCREF( &streamShader_Type );
+ PyModule_AddObject(module, "streamShader", (PyObject
*)&streamShader_Type);
+
+ if( PyType_Ready( &StrokeTextureShader_Type ) < 0 )
+ return;
+ Py_INCREF( &StrokeTextureShader_Type );
+ PyModule_AddObject(module, "StrokeTextureShader", (PyObject
*)&StrokeTextureShader_Type);
+
+ if( PyType_Ready( &TextureAssignerShader_Type ) < 0 )
+ return;
+ Py_INCREF( &TextureAssignerShader_Type );
+ PyModule_AddObject(module, "TextureAssignerShader", (PyObject
*)&TextureAssignerShader_Type);
+
+ if( PyType_Ready( &ThicknessNoiseShader_Type ) < 0 )
+ return;
+ Py_INCREF( &ThicknessNoiseShader_Type );
+ PyModule_AddObject(module, "ThicknessNoiseShader", (PyObject
*)&ThicknessNoiseShader_Type);
+
+ if( PyType_Ready( &ThicknessVariationPatternShader_Type ) < 0 )
+ return;
+ Py_INCREF( &ThicknessVariationPatternShader_Type );
+ PyModule_AddObject(module, "ThicknessVariationPatternShader", (PyObject
*)&ThicknessVariationPatternShader_Type);
+
+ if( PyType_Ready( &TipRemoverShader_Type ) < 0 )
+ return;
+ Py_INCREF( &TipRemoverShader_Type );
+ PyModule_AddObject(module, "TipRemoverShader", (PyObject
*)&TipRemoverShader_Type);
+
}
//------------------------INSTANCE METHODS ----------------------------------
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
2008-07-27 12:48:46 UTC (rev 15805)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/StrokeShader/BPy_BackboneStretcherShader.cpp
2008-07-27 13:40:33 UTC (rev 15806)
@@ -1,8 +1,119 @@
- PyObject *_wrap_BackboneStretcherShader_shade(PyObject *self , PyObject
*args) {
-}
+#include "BPy_BackboneStretcherShader.h"
+#include "../../stroke/BasicStrokeShaders.h"
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
