Revision: 15862
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15862
Author: mxcurioni
Date: 2008-07-29 13:19:30 +0200 (Tue, 29 Jul 2008)
Log Message:
-----------
soc-2008-mxcurioni: corrected problems in API with UnaryFunction1DVoid
subclasses and Curvature2DAngleF1D. Understood that Curve and Noise classes
cannot be defined in Freestyle's API because they are already given by
Blender's API. Will rename to FrsCurve and FrsNoise and change the
corresponding style modules.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/freestyle_init.py
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
2008-07-29 10:45:06 UTC (rev 15861)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction1D.cpp
2008-07-29 11:19:30 UTC (rev 15862)
@@ -7,8 +7,8 @@
#include "UnaryFunction1D/BPy_UnaryFunction1DVec2f.h"
#include "UnaryFunction1D/BPy_UnaryFunction1DVec3f.h"
#include "UnaryFunction1D/BPy_UnaryFunction1DVectorViewShape.h"
+#include "UnaryFunction1D/BPy_UnaryFunction1DVoid.h"
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -127,6 +127,7 @@
UnaryFunction1DVec2f_Init( module );
UnaryFunction1DVec3f_Init( module );
UnaryFunction1DVectorViewShape_Init( module );
+ UnaryFunction1DVoid_Init( module );
}
//------------------------INSTANCE METHODS ----------------------------------
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
2008-07-29 10:45:06 UTC (rev 15861)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D/BPy_UnaryFunction1DDouble.cpp
2008-07-29 11:19:30 UTC (rev 15862)
@@ -147,6 +147,11 @@
Py_INCREF( &DensityF1D_Type );
PyModule_AddObject(module, "DensityF1D", (PyObject *)&DensityF1D_Type);
+ if( PyType_Ready( &Curvature2DAngleF1D_Type ) < 0 )
+ return;
+ Py_INCREF( &Curvature2DAngleF1D_Type );
+ PyModule_AddObject(module, "Curvature2DAngleF1D", (PyObject
*)&Curvature2DAngleF1D_Type);
+
if( PyType_Ready( &GetCompleteViewMapDensityF1D_Type ) < 0 )
return;
Py_INCREF( &GetCompleteViewMapDensityF1D_Type );
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/freestyle_init.py
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/freestyle_init.py
2008-07-29 10:45:06 UTC (rev 15861)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/style_modules_blender/freestyle_init.py
2008-07-29 11:19:30 UTC (rev 15862)
@@ -246,8 +246,8 @@
class
UnaryFunction1DVectorViewShape(Blender.Freestyle.UnaryFunction1DVectorViewShape):
pass
-# class UnaryFunction1DVoid(Blender.Freestyle.UnaryFunction1DVoid):
-# pass
+class UnaryFunction1DVoid(Blender.Freestyle.UnaryFunction1DVoid):
+ pass
class FalseUP0D(Blender.Freestyle.FalseUP0D):
def __call__(*args): return Blender.Freestyle.FalseUP0D.__call__(*args)
@@ -378,8 +378,8 @@
class GetShapeF0D(Blender.Freestyle.GetShapeF0D):
def __call__(*args): return
Blender.Freestyle.GetShapeF0D.__call__(*args)
-# class Curvature2DAngleF1D(Blender.Freestyle.Curvature2DAngleF1D):
-# def __call__(*args): return
Blender.Freestyle.Curvature2DAngleF1D.__call__(*args)
+class Curvature2DAngleF1D(Blender.Freestyle.Curvature2DAngleF1D):
+ def __call__(*args): return
Blender.Freestyle.Curvature2DAngleF1D.__call__(*args)
class DensityF1D(Blender.Freestyle.DensityF1D):
def __call__(*args): return Blender.Freestyle.DensityF1D.__call__(*args)
@@ -444,12 +444,12 @@
class GetShapeF1D(Blender.Freestyle.GetShapeF1D):
def __call__(*args): return
Blender.Freestyle.GetShapeF1D.__call__(*args)
-# class ChainingTimeStampF1D(Blender.Freestyle.ChainingTimeStampF1D):
-# def __call__(*args): return
Blender.Freestyle.ChainingTimeStampF1D.__call__(*args)
+class ChainingTimeStampF1D(Blender.Freestyle.ChainingTimeStampF1D):
+ def __call__(*args): return
Blender.Freestyle.ChainingTimeStampF1D.__call__(*args)
-# class
IncrementChainingTimeStampF1D(Blender.Freestyle.IncrementChainingTimeStampF1D):
-# def __call__(*args): return
Blender.Freestyle.IncrementChainingTimeStampF1D.__call__(*args)
+class
IncrementChainingTimeStampF1D(Blender.Freestyle.IncrementChainingTimeStampF1D):
+ def __call__(*args): return
Blender.Freestyle.IncrementChainingTimeStampF1D.__call__(*args)
-# class TimeStampF1D(Blender.Freestyle.TimeStampF1D):
-# def __call__(*args): return
Blender.Freestyle.TimeStampF1D.__call__(*args)
+class TimeStampF1D(Blender.Freestyle.TimeStampF1D):
+ def __call__(*args): return
Blender.Freestyle.TimeStampF1D.__call__(*args)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
