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.
This commit is contained in:
Maxime Curioni
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject Curvature2DAngleF1D_Type;
|
||||
|
||||
#define BPy_Curvature2DAngleF1D_Check(v) (( (PyObject *) v)->ob_type == &Curvature2DAngleF1D_Type)
|
||||
#define BPy_Curvature2DAngleF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &Curvature2DAngleF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_Curvature2DAngleF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject DensityF1D_Type;
|
||||
|
||||
#define BPy_DensityF1D_Check(v) (( (PyObject *) v)->ob_type == &DensityF1D_Type)
|
||||
#define BPy_DensityF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &DensityF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_DensityF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject GetCompleteViewMapDensityF1D_Type;
|
||||
|
||||
#define BPy_GetCompleteViewMapDensityF1D_Check(v) (( (PyObject *) v)->ob_type == &GetCompleteViewMapDensityF1D_Type)
|
||||
#define BPy_GetCompleteViewMapDensityF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetCompleteViewMapDensityF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_GetCompleteViewMapDensityF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject GetDirectionalViewMapDensityF1D_Type;
|
||||
|
||||
#define BPy_GetDirectionalViewMapDensityF1D_Check(v) (( (PyObject *) v)->ob_type == &GetDirectionalViewMapDensityF1D_Type)
|
||||
#define BPy_GetDirectionalViewMapDensityF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetDirectionalViewMapDensityF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_GetDirectionalViewMapDensityF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject GetProjectedXF1D_Type;
|
||||
|
||||
#define BPy_GetProjectedXF1D_Check(v) (( (PyObject *) v)->ob_type == &GetProjectedXF1D_Type)
|
||||
#define BPy_GetProjectedXF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedXF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_GetProjectedXF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject GetProjectedYF1D_Type;
|
||||
|
||||
#define BPy_GetProjectedYF1D_Check(v) (( (PyObject *) v)->ob_type == &GetProjectedYF1D_Type)
|
||||
#define BPy_GetProjectedYF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedYF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_GetProjectedYF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject GetProjectedZF1D_Type;
|
||||
|
||||
#define BPy_GetProjectedZF1D_Check(v) (( (PyObject *) v)->ob_type == &GetProjectedZF1D_Type)
|
||||
#define BPy_GetProjectedZF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetProjectedZF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_GetProjectedZF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
@@ -13,8 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject GetSteerableViewMapDensityF1D_Type;
|
||||
|
||||
#define BPy_GetSteerableViewMapDensityF1D_Check(v) (( (PyObject *) v)->ob_type == &GetSteerableViewMapDensityF1D_Type)
|
||||
|
||||
#define BPy_GetSteerableViewMapDensityF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetSteerableViewMapDensityF1D_Type) )
|
||||
/*---------------------------Python BPy_GetSteerableViewMapDensityF1D structure definition----------*/
|
||||
typedef struct {
|
||||
BPy_UnaryFunction1DDouble py_uf1D_double;
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject GetViewMapGradientNormF1D_Type;
|
||||
|
||||
#define BPy_GetViewMapGradientNormF1D_Check(v) (( (PyObject *) v)->ob_type == &GetViewMapGradientNormF1D_Type)
|
||||
#define BPy_GetViewMapGradientNormF1D_Check(v) ( ((PyObject *) v)->ob_type == PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetViewMapGradientNormF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_GetViewMapGradientNormF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject GetXF1D_Type;
|
||||
|
||||
#define BPy_GetXF1D_Check(v) (( (PyObject *) v)->ob_type == &GetXF1D_Type)
|
||||
#define BPy_GetXF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetXF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_GetXF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject GetYF1D_Type;
|
||||
|
||||
#define BPy_GetYF1D_Check(v) (( (PyObject *) v)->ob_type == &GetYF1D_Type)
|
||||
#define BPy_GetYF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetYF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_GetYF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject GetZF1D_Type;
|
||||
|
||||
#define BPy_GetZF1D_Check(v) (( (PyObject *) v)->ob_type == &GetZF1D_Type)
|
||||
#define BPy_GetZF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &GetZF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_GetZF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject LocalAverageDepthF1D_Type;
|
||||
|
||||
#define BPy_LocalAverageDepthF1D_Check(v) (( (PyObject *) v)->ob_type == &LocalAverageDepthF1D_Type)
|
||||
#define BPy_LocalAverageDepthF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &LocalAverageDepthF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_LocalAverageDepthF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
@@ -13,7 +13,7 @@ extern "C" {
|
||||
|
||||
extern PyTypeObject ZDiscontinuityF1D_Type;
|
||||
|
||||
#define BPy_ZDiscontinuityF1D_Check(v) (( (PyObject *) v)->ob_type == &ZDiscontinuityF1D_Type)
|
||||
#define BPy_ZDiscontinuityF1D_Check(v) ( PyObject_IsInstance( (PyObject *) v, (PyObject *) &ZDiscontinuityF1D_Type) )
|
||||
|
||||
/*---------------------------Python BPy_ZDiscontinuityF1D structure definition----------*/
|
||||
typedef struct {
|
||||
|
||||
Reference in New Issue
Block a user