[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15859] branches/soc-2008-mxcurioni/source /blender/freestyle: soc-2008-mxcurioni: finished porting the Freestyle API.

Maxime Curioni maxime.curioni at gmail.com
Tue Jul 29 07:45:22 CEST 2008


Revision: 15859
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15859
Author:   mxcurioni
Date:     2008-07-29 07:45:16 +0200 (Tue, 29 Jul 2008)

Log Message:
-----------
soc-2008-mxcurioni: finished porting the Freestyle API. All of the original classes, except EdgeModifier and TimestampModifier (which aren't even ported via SWIG), are available under the Blender.Freestyle module. Testing of the porting will now begin to make sure the SWIG-less system works as the original.

Quite a few modifications were made to finish the API:
- Freestyle's SConscript was modified to catch all files within the intern/python directory, allowing integration of future shaders implemented in C++.
- the Operators class was ported, with a special care of making its methods static (using the METH_STATIC flag in the tp_methods method definitions)
- all of the type-checking functions [ BPy_[class name]_Check(obj) ] were changed to allow subclasses to be seen as that type too: instead on looking at the ob_type value, the PyObject_IsInstance function is used.
- all of the iterators can now retrieve the object pointed to by the operator, using the getObject() method. A directedViewEdge pair is returned as a list of the two elements in the pair.
- all of the style modules were copied to a style_modules_blender/ folder and were modified to use Freestyle as a Blender's submodule. IntegrationType and MediumType was also integrated (for example, changing MEAN to IntegrationType.MEAN).

Testing now begins. If everything works correctly, I'll move on to lib3ds removal right away.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BBox.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BinaryPredicate1D.h
    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_Freestyle.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Freestyle.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_FrsMaterial.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Id.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_IntegrationType.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Iterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Iterator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_MediumType.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Nature.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Noise.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Operators.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_SShape.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeAttribute.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_StrokeShader.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryPredicate0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryPredicate1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_ViewMap.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_ViewShape.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_FalseBP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_Length2DBP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_SameShapeIdBP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_TrueBP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BinaryPredicate1D/BPy_ViewMapGradientNormBP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Curve.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_ViewEdge.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/Curve/BPy_Chain.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSharp.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/FEdge/BPy_FEdgeSmooth.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_AdjacencyIterator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainPredicateIterator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainSilhouetteIterator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ChainingIterator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_CurvePointIterator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_Interface0DIterator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_SVertexIterator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_StrokeVertexIterator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_ViewEdgeIterator.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Iterator/BPy_orientedViewEdgeIterator.h
    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
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DFloat.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DId.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DMaterial.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec2f.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVec3f.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DViewShape.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_Curvature2DAngleF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DFloat.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec2f.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVec3f.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DVoid.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_FalseUP0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate0D/BPy_TrueUP0D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ContourUP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_DensityLowerThanUP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToChainingTimeStampUP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_EqualToTimeStampUP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ExternalContourUP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_FalseUP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_QuantitativeInvisibilityUP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_ShapeUP1D.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D/BPy_TrueUP1D.h

Added Paths:
-----------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Operators.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/ChainingIterators.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/Functions0D.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/Functions1D.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/PredicatesB1D.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/PredicatesU0D.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/PredicatesU1D.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/anisotropic_diffusion.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/apriori_and_causal_density.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/apriori_density.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/backbone_stretcher.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/blueprint_circles.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/blueprint_ellipses.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/blueprint_squares.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/cartoon.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/contour.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/curvature2d.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/external_contour.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/external_contour_sketchy.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/external_contour_smooth.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/extra-lines.sml
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/haloing.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/ignore_small_occlusions.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/invisible_lines.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/japanese_bigbrush.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/logical_operators.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/long_anisotropically_dense.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/multiple_parameterization.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/nature.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/near_lines.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/occluded_by_specific_object.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/polygonalize.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/qi0.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/qi0_not_external_contour.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/qi1.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/qi2.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/sequentialsplit_sketchy.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/shaders.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/sketchy_multiple_parameterization.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/sketchy_topology_broken.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/sketchy_topology_preserved.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/split_at_highest_2d_curvatures.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/split_at_tvertices.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/stroke_texture.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/suggestive.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/thickness_fof_depth_discontinuity.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/tipremover.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/tvertex_remover.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/uniformpruning_zsort.py
    branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/vector.py

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript	2008-07-28 22:56:30 UTC (rev 15858)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript	2008-07-29 05:45:16 UTC (rev 15859)
@@ -9,7 +9,7 @@
 incs += '../blenkernel ../blenlib ../imbuf ../makesdna ../python '
 incs += '../render/extern/include ../render/intern/include ../include ../src'
 incs += ' #/extern/freestyle/lib3ds' 
-incs += ' ' + env['BF_PYTHON_INC']
+incs += ' ' + env['BF_PYTHON_INC']	
 incs += ' ' + env['BF_LIB3DS_INC']
 incs += ' ' + env['BF_PNG_INC']
 
@@ -58,145 +58,10 @@
 
 #	Python
 prefix = 'intern/python'
-# python_sources = env.Glob(prefix + '/*.cpp')
-python_sources = [
-					prefix + '/BPy_Freestyle.cpp',
-					prefix + '/BPy_Convert.cpp',
-					prefix + '/BPy_BBox.cpp',
-					prefix + '/BPy_BinaryPredicate0D.cpp',
-					prefix + '/BPy_BinaryPredicate1D.cpp',
-					prefix + '/BPy_FrsMaterial.cpp',
-					prefix + '/BPy_Id.cpp',
-					prefix + '/BPy_IntegrationType.cpp',
-					prefix + '/BPy_Interface0D.cpp',
-						prefix + '/Interface0D/BPy_CurvePoint.cpp',
-						prefix + '/Interface0D/CurvePoint/BPy_StrokeVertex.cpp',
-						prefix + '/Interface0D/BPy_SVertex.cpp',
-						prefix + '/Interface0D/BPy_ViewVertex.cpp',
-						prefix + '/Interface0D/ViewVertex/BPy_NonTVertex.cpp',
-						prefix + '/Interface0D/ViewVertex/BPy_TVertex.cpp',
-					prefix + '/BPy_Interface1D.cpp',
-						prefix + '/Interface1D/BPy_Curve.cpp',
-						prefix + '/Interface1D/Curve/BPy_Chain.cpp',
-						prefix + '/Interface1D/BPy_FEdge.cpp',
-						prefix + '/Interface1D/FEdge/BPy_FEdgeSharp.cpp',
-						prefix + '/Interface1D/FEdge/BPy_FEdgeSmooth.cpp',
-						prefix + '/Interface1D/BPy_Stroke.cpp',
-						prefix + '/Interface1D/BPy_ViewEdge.cpp',
-					prefix + '/BPy_Iterator.cpp',
-						prefix + '/Iterator/BPy_AdjacencyIterator.cpp',
-						prefix + '/Iterator/BPy_Interface0DIterator.cpp',
-						prefix + '/Iterator/BPy_CurvePointIterator.cpp',
-						prefix + '/Iterator/BPy_StrokeVertexIterator.cpp',
-						prefix + '/Iterator/BPy_SVertexIterator.cpp',
-						prefix + '/Iterator/BPy_orientedViewEdgeIterator.cpp',
-						prefix + '/Iterator/BPy_ViewEdgeIterator.cpp',
-						prefix + '/Iterator/BPy_ChainingIterator.cpp',
-						prefix + '/Iterator/BPy_ChainPredicateIterator.cpp',
-						prefix + '/Iterator/BPy_ChainSilhouetteIterator.cpp',
-					prefix + '/BPy_MediumType.cpp',
-					prefix + '/BPy_Nature.cpp',
-					prefix + '/BPy_Noise.cpp',
-					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',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedXF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedYF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetProjectedZF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetXF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetYF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_GetZF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_double/BPy_ZDiscontinuityF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DEdgeNature.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_Nature_EdgeNature/BPy_CurveNatureF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DFloat.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_GetCurvilinearAbscissaF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_GetParameterF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_GetViewMapGradientNormF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadCompleteViewMapPixelF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadMapPixelF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_float/BPy_ReadSteerableViewMapPixelF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DId.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_Id/BPy_ShapeIdF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DMaterial.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_Material/BPy_MaterialF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DUnsigned.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_unsigned_int/BPy_QuantitativeInvisibilityF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DVec2f.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_Normal2DF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_Vec2f/BPy_VertexOrientation2DF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DVec3f.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_Vec3f/BPy_VertexOrientation3DF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DVectorViewShape.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_vector_ViewShape/BPy_GetOccludersF0D.cpp',
-						prefix + '/UnaryFunction0D/BPy_UnaryFunction0DViewShape.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetOccludeeF0D.cpp',
-							prefix + '/UnaryFunction0D/UnaryFunction0D_ViewShape/BPy_GetShapeF0D.cpp',
-					prefix + '/BPy_UnaryFunction1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_Curvature2DAngleF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_DensityF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetCompleteViewMapDensityF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetDirectionalViewMapDensityF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedXF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedYF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetProjectedZF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetSteerableViewMapDensityF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetViewMapGradientNormF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetXF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetYF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_GetZF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_LocalAverageDepthF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_double/BPy_ZDiscontinuityF1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DEdgeNature.cpp',
-									prefix + '/UnaryFunction1D/UnaryFunction1D_Nature_EdgeNature/BPy_CurveNatureF1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DFloat.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DUnsigned.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_unsigned_int/BPy_QuantitativeInvisibilityF1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DVec2f.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Normal2DF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_Vec2f/BPy_Orientation2DF1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DVec3f.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_Vec3f/BPy_Orientation3DF1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludeeF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetOccludersF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_vector_ViewShape/BPy_GetShapeF1D.cpp',
-							prefix + '/UnaryFunction1D/BPy_UnaryFunction1DVoid.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_void/BPy_ChainingTimeStampF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_void/BPy_IncrementChainingTimeStampF1D.cpp',
-								prefix + '/UnaryFunction1D/UnaryFunction1D_void/BPy_TimeStampF1D.cpp',
-					prefix + '/BPy_UnaryPredicate0D.cpp',
-					prefix + '/BPy_UnaryPredicate1D.cpp',
-					prefix + '/BPy_ViewMap.cpp',
-					prefix + '/BPy_ViewShape.cpp'
-				]
+python_sources =  env.Glob(prefix + '/*.cpp') \
+				+ env.Glob(prefix + '/*/*.cpp') \
+				+ env.Glob(prefix + '/*/*/*.cpp') \
+				+ env.Glob(prefix + '/*/*/*/*.cpp')
 
 sources = 	system_sources + image_sources + geometry_sources + scene_graph_sources \
 		  +	winged_edge_sources + view_map_sources + stroke_sources + rendering_sources \

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_BBox.h

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list