diff options
author | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-19 00:31:40 +0400 |
---|---|---|
committer | Maxime Curioni <maxime.curioni@gmail.com> | 2008-07-19 00:31:40 +0400 |
commit | 16d7d12123d25a353043cefe2c9e4664476224d7 (patch) | |
tree | 9ad3dd87414b797ea2ced88c60d41ba92dd14b4f /source/blender/freestyle/intern | |
parent | 21674d2db2dbc932fa87699768c1ebb2f61bc941 (diff) |
soc-2008-mxcurioni: Added IntegrationType and Nature classes, used to store constants used throughout Freestyle
Diffstat (limited to 'source/blender/freestyle/intern')
9 files changed, 559 insertions, 78 deletions
diff --git a/source/blender/freestyle/intern/python/Convert.cpp b/source/blender/freestyle/intern/python/Convert.cpp index 47ad6f3c0ad..42250fbe97b 100644 --- a/source/blender/freestyle/intern/python/Convert.cpp +++ b/source/blender/freestyle/intern/python/Convert.cpp @@ -64,8 +64,6 @@ PyObject *BPy_FEdge_from_FEdge( FEdge& fe ) { return py_fe; } - - /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/source/blender/freestyle/intern/python/Convert.h b/source/blender/freestyle/intern/python/Convert.h index edd62b1f24a..ce38f8cbc22 100644 --- a/source/blender/freestyle/intern/python/Convert.h +++ b/source/blender/freestyle/intern/python/Convert.h @@ -5,6 +5,7 @@ using namespace Geometry; #include "Id.h" +#include "IntegrationType.h" #include "Interface0D.h" #include "Interface0D/SVertex.h" #include "Interface1D/FEdge.h" diff --git a/source/blender/freestyle/intern/python/Freestyle.cpp b/source/blender/freestyle/intern/python/Freestyle.cpp index 809568abe2c..5f98f0f2a89 100644 --- a/source/blender/freestyle/intern/python/Freestyle.cpp +++ b/source/blender/freestyle/intern/python/Freestyle.cpp @@ -3,9 +3,11 @@ #include "BinaryPredicate0D.h" #include "BinaryPredicate1D.h" #include "Id.h" +#include "IntegrationType.h" #include "Interface0D.h" #include "Interface0D/CurvePoint.h" #include "Interface1D.h" +#include "Nature.h" #include "UnaryFunction0D.h" #include "UnaryFunction1D.h" #include "UnaryPredicate0D.h" @@ -128,8 +130,10 @@ PyObject *Freestyle_Init( void ) BinaryPredicate0D_Init( module ); BinaryPredicate1D_Init( module ); Id_Init( module ); + IntegrationType_Init( module ); Interface0D_Init( module ); Interface1D_Init( module ); + Nature_Init( module ); UnaryFunction0D_Init( module ); UnaryFunction1D_Init( module ); UnaryPredicate0D_Init( module ); diff --git a/source/blender/freestyle/intern/python/IntegrationType.cpp b/source/blender/freestyle/intern/python/IntegrationType.cpp new file mode 100644 index 00000000000..ff6bd3d4794 --- /dev/null +++ b/source/blender/freestyle/intern/python/IntegrationType.cpp @@ -0,0 +1,153 @@ +#include "IntegrationType.h" + +#include "Convert.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/////////////////////////////////////////////////////////////////////////////////////////// + +/*--------------- Python API function prototypes for IntegrationType instance -----------*/ +static int IntegrationType___init__(BPy_IntegrationType *self, PyObject *args, PyObject *kwds); + +/*----------------------IntegrationType instance definitions ----------------------------*/ +static PyMethodDef BPy_IntegrationType_methods[] = { + {NULL, NULL, 0, NULL} +}; + +/*-----------------------BPy_IntegrationType type definition ------------------------------*/ + +PyTypeObject IntegrationType_Type = { + PyObject_HEAD_INIT( NULL ) + 0, /* ob_size */ + "IntegrationType", /* tp_name */ + sizeof( BPy_IntegrationType ), /* tp_basicsize */ + 0, /* tp_itemsize */ + + /* methods */ + NULL, /* tp_dealloc */ + NULL, /* printfunc tp_print; */ + NULL, /* getattrfunc tp_getattr; */ + NULL, /* setattrfunc tp_setattr; */ + NULL, /* tp_compare */ + NULL, /* tp_repr */ + + /* Method suites for standard classes */ + + NULL, /* PyNumberMethods *tp_as_number; */ + NULL, /* PySequenceMethods *tp_as_sequence; */ + NULL, /* PyMappingMethods *tp_as_mapping; */ + + /* More standard operations (here for binary compatibility) */ + + NULL, /* hashfunc tp_hash; */ + NULL, /* ternaryfunc tp_call; */ + NULL, /* reprfunc tp_str; */ + NULL, /* getattrofunc tp_getattro; */ + NULL, /* setattrofunc tp_setattro; */ + + /* Functions to access object as input/output buffer */ + NULL, /* PyBufferProcs *tp_as_buffer; */ + + /*** Flags to define presence of optional/expanded features ***/ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* long tp_flags; */ + + NULL, /* char *tp_doc; Documentation string */ + /*** Assigned meaning in release 2.0 ***/ + /* call function for all accessible objects */ + NULL, /* traverseproc tp_traverse; */ + + /* delete references to contained objects */ + NULL, /* inquiry tp_clear; */ + + /*** Assigned meaning in release 2.1 ***/ + /*** rich comparisons ***/ + NULL, /* richcmpfunc tp_richcompare; */ + + /*** weak reference enabler ***/ + 0, /* long tp_weaklistoffset; */ + + /*** Added in release 2.2 ***/ + /* Iterators */ + NULL, /* getiterfunc tp_iter; */ + NULL, /* iternextfunc tp_iternext; */ + + /*** Attribute descriptor and subclassing stuff ***/ + BPy_IntegrationType_methods, /* struct PyMethodDef *tp_methods; */ + NULL, /* struct PyMemberDef *tp_members; */ + NULL, /* struct PyGetSetDef *tp_getset; */ + &PyInt_Type, /* struct _typeobject *tp_base; */ + NULL, /* PyObject *tp_dict; */ + NULL, /* descrgetfunc tp_descr_get; */ + NULL, /* descrsetfunc tp_descr_set; */ + 0, /* long tp_dictoffset; */ + (initproc)IntegrationType___init__, /* initproc tp_init; */ + NULL, /* allocfunc tp_alloc; */ + PyType_GenericNew, /* newfunc tp_new; */ + + /* Low-level free-memory routine */ + NULL, /* freefunc tp_free; */ + + /* For PyObject_IS_GC */ + NULL, /* inquiry tp_is_gc; */ + NULL, /* PyObject *tp_bases; */ + + /* method resolution order */ + NULL, /* PyObject *tp_mro; */ + NULL, /* PyObject *tp_cache; */ + NULL, /* PyObject *tp_subclasses; */ + NULL, /* PyObject *tp_weaklist; */ + NULL +}; + +//-------------------MODULE INITIALIZATION-------------------------------- +PyMODINIT_FUNC IntegrationType_Init( PyObject *module ) +{ + PyObject *tmp; + + if( module == NULL ) + return; + + if( PyType_Ready( &IntegrationType_Type ) < 0 ) + return; + Py_INCREF( &IntegrationType_Type ); + PyModule_AddObject(module, "IntegrationType", (PyObject *)&IntegrationType_Type); + + tmp = PyInt_FromLong( MEAN ); + PyDict_SetItemString( IntegrationType_Type.tp_dict, "MEAN", tmp); + Py_DECREF(tmp); + + tmp = PyInt_FromLong( MIN ); + PyDict_SetItemString( IntegrationType_Type.tp_dict, "MIN", tmp); + Py_DECREF(tmp); + + tmp = PyInt_FromLong( MAX ); + PyDict_SetItemString( IntegrationType_Type.tp_dict, "MAX", tmp); + Py_DECREF(tmp); + + tmp = PyInt_FromLong( FIRST ); + PyDict_SetItemString( IntegrationType_Type.tp_dict, "FIRST", tmp); + Py_DECREF(tmp); + + tmp = PyInt_FromLong( LAST ); + PyDict_SetItemString( IntegrationType_Type.tp_dict, "LAST", tmp); + Py_DECREF(tmp); + + +} + +int IntegrationType___init__(BPy_IntegrationType *self, PyObject *args, PyObject *kwds) +{ + if (PyInt_Type.tp_init((PyObject *)self, args, kwds) < 0) + return -1; + + return 0; +} + +/////////////////////////////////////////////////////////////////////////////////////////// + +#ifdef __cplusplus +} +#endif + diff --git a/source/blender/freestyle/intern/python/IntegrationType.h b/source/blender/freestyle/intern/python/IntegrationType.h new file mode 100644 index 00000000000..2ac81fdddfb --- /dev/null +++ b/source/blender/freestyle/intern/python/IntegrationType.h @@ -0,0 +1,34 @@ +#ifndef FREESTYLE_PYTHON_INTEGRATIONTYPE_H +#define FREESTYLE_PYTHON_INTEGRATIONTYPE_H + +#include "../view_map/Interface1D.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/////////////////////////////////////////////////////////////////////////////////////////// + +#include <Python.h> + +extern PyTypeObject IntegrationType_Type; + +#define BPy_IntegrationType_Check(v) \ + ((v)->ob_type == &IntegrationType_Type) + +/*---------------------------Python BPy_IntegrationType structure definition----------*/ +typedef struct { + PyIntObject i; +} BPy_IntegrationType; + +/*---------------------------Python BPy_IntegrationType visible prototypes-----------*/ + +PyMODINIT_FUNC IntegrationType_Init( PyObject *module ); + +/////////////////////////////////////////////////////////////////////////////////////////// + +#ifdef __cplusplus +} +#endif + +#endif /* FREESTYLE_PYTHON_INTEGRATIONTYPE_H */ diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp index 293f42949e3..66583d21605 100644 --- a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp @@ -1,76 +1,151 @@ - PyObject *_wrap_ViewVertex_getExactTypeName(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_userdata_set(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_userdata_get(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_delete_ViewVertex(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_getNature(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_setNature(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_Replace(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_edges_begin__SWIG_0(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_edges_begin__SWIG_1(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_edges_begin(PyObject *self, PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_edges_end__SWIG_0(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_edges_end__SWIG_1(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_edges_end(PyObject *self, PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_edges_iterator__SWIG_0(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_edges_iterator__SWIG_1(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_edges_iterator(PyObject *self, PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_edgesBegin(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_edgesEnd(PyObject *self , PyObject *args) { -} - - - PyObject *_wrap_ViewVertex_edgesIterator(PyObject *self , PyObject *args) { -} - - +#include "SVertex.h" + +#include "../Convert.h" +#include "../Id.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/////////////////////////////////////////////////////////////////////////////////////////// + +/*--------------- Python API function prototypes for ViewVertex instance -----------*/ +static int ViewVertex___init__(BPy_ViewVertex *self); +//static PyObject * ViewVertex___copy__( BPy_ViewVertex *self ); + + +/*----------------------ViewVertex instance definitions ----------------------------*/ +static PyMethodDef BPy_ViewVertex_methods[] = { +// {"__copy__", ( PyCFunction ) ViewVertex___copy__, METH_NOARGS, "( )Cloning method."}, + {NULL, NULL, 0, NULL} +}; + +/*-----------------------BPy_ViewVertex type definition ------------------------------*/ + +PyTypeObject ViewVertex_Type = { + PyObject_HEAD_INIT( NULL ) + 0, /* ob_size */ + "ViewVertex", /* tp_name */ + sizeof( BPy_ViewVertex ), /* tp_basicsize */ + 0, /* tp_itemsize */ + + /* methods */ + NULL, /* tp_dealloc */ + NULL, /* printfunc tp_print; */ + NULL, /* getattrfunc tp_getattr; */ + NULL, /* setattrfunc tp_setattr; */ + NULL, /* tp_compare */ + NULL, /* tp_repr */ + + /* Method suites for standard classes */ + + NULL, /* PyNumberMethods *tp_as_number; */ + NULL, /* PySequenceMethods *tp_as_sequence; */ + NULL, /* PyMappingMethods *tp_as_mapping; */ + + /* More standard operations (here for binary compatibility) */ + + NULL, /* hashfunc tp_hash; */ + NULL, /* ternaryfunc tp_call; */ + NULL, /* reprfunc tp_str; */ + NULL, /* getattrofunc tp_getattro; */ + NULL, /* setattrofunc tp_setattro; */ + + /* Functions to access object as input/output buffer */ + NULL, /* PyBufferProcs *tp_as_buffer; */ + + /*** Flags to define presence of optional/expanded features ***/ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* long tp_flags; */ + + NULL, /* char *tp_doc; Documentation string */ + /*** Assigned meaning in release 2.0 ***/ + /* call function for all accessible objects */ + NULL, /* traverseproc tp_traverse; */ + + /* delete references to contained objects */ + NULL, /* inquiry tp_clear; */ + + /*** Assigned meaning in release 2.1 ***/ + /*** rich comparisons ***/ + NULL, /* richcmpfunc tp_richcompare; */ + + /*** weak reference enabler ***/ + 0, /* long tp_weaklistoffset; */ + + /*** Added in release 2.2 ***/ + /* Iterators */ + NULL, /* getiterfunc tp_iter; */ + NULL, /* iternextfunc tp_iternext; */ + + /*** Attribute descriptor and subclassing stuff ***/ + BPy_ViewVertex_methods, /* struct PyMethodDef *tp_methods; */ + NULL, /* struct PyMemberDef *tp_members; */ + NULL, /* struct PyGetSetDef *tp_getset; */ + &Interface0D_Type, /* struct _typeobject *tp_base; */ + NULL, /* PyObject *tp_dict; */ + NULL, /* descrgetfunc tp_descr_get; */ + NULL, /* descrsetfunc tp_descr_set; */ + 0, /* long tp_dictoffset; */ + (initproc)ViewVertex___init__, /* initproc tp_init; */ + NULL, /* allocfunc tp_alloc; */ + NULL, /* newfunc tp_new; */ + + /* Low-level free-memory routine */ + NULL, /* freefunc tp_free; */ + + /* For PyObject_IS_GC */ + NULL, /* inquiry tp_is_gc; */ + NULL, /* PyObject *tp_bases; */ + + /* method resolution order */ + NULL, /* PyObject *tp_mro; */ + NULL, /* PyObject *tp_cache; */ + NULL, /* PyObject *tp_subclasses; */ + NULL, /* PyObject *tp_weaklist; */ + NULL +}; + +//-------------------MODULE INITIALIZATION-------------------------------- + + +//------------------------INSTANCE METHODS ---------------------------------- + +int ViewVertex___init__(BPy_ViewVertex *self ) +{ + PyObject *py_point = 0; + BPy_Id *py_id = 0; + + self->vv = new ViewVertex(); + self->py_if0D.if0D = self->vv; + + return 0; +} + +// PyObject * ViewVertex___copy__( BPy_ViewVertex *self ) { +// BPy_ViewVertex *py_vv; +// +// py_vv = (BPy_ViewVertex *) ViewVertex_Type.tp_new( &ViewVertex_Type, 0, 0 ); +// +// py_vv->vv = self->vv->duplicate(); +// py_svertex->py_if0D.if0D = py_svertex->sv; +// +// return (PyObject *) py_svertex; +// } + + +/////////////////////////////////////////////////////////////////////////////////////////// + +#ifdef __cplusplus +} +#endif + + +// virtual string getExactTypeName () const +// ViewVertex () +// virtual ~ViewVertex () +// virtual Nature::VertexNature getNature () const +// void setNature (Nature::VertexNature iNature) +// virtual ViewVertexInternal::orientedViewEdgeIterator edgesBegin ()=0 +// virtual ViewVertexInternal::orientedViewEdgeIterator edgesEnd ()=0 +// virtual ViewVertexInternal::orientedViewEdgeIterator edgesIterator (ViewEdge *iEdge)=0 +// diff --git a/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h new file mode 100644 index 00000000000..b869df377fc --- /dev/null +++ b/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h @@ -0,0 +1,33 @@ +#ifndef FREESTYLE_PYTHON_VIEWVERTEX_H +#define FREESTYLE_PYTHON_VIEWVERTEX_H + +#include "../../view_map/ViewMap.h" +#include "../Interface0D.h" + + +#ifdef __cplusplus +extern "C" { +#endif + +/////////////////////////////////////////////////////////////////////////////////////////// + +#include <Python.h> + +extern PyTypeObject ViewVertex_Type; + +#define BPy_ViewVertex_Check(v) \ + ((v)->ob_type == &ViewVertex_Type) + +/*---------------------------Python BPy_ViewVertex structure definition----------*/ +typedef struct { + BPy_Interface0D py_if0D; + ViewVertex *vv; +} BPy_ViewVertex; + +/////////////////////////////////////////////////////////////////////////////////////////// + +#ifdef __cplusplus +} +#endif + +#endif /* FREESTYLE_PYTHON_VIEWVERTEX_H */ diff --git a/source/blender/freestyle/intern/python/Nature.cpp b/source/blender/freestyle/intern/python/Nature.cpp new file mode 100644 index 00000000000..fb4ba6bae37 --- /dev/null +++ b/source/blender/freestyle/intern/python/Nature.cpp @@ -0,0 +1,149 @@ +#include "Nature.h" + +#include "Convert.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/////////////////////////////////////////////////////////////////////////////////////////// + +/*--------------- Python API function prototypes for Nature instance -----------*/ +static int Nature___init__(BPy_Nature *self, PyObject *args, PyObject *kwds); + +/*----------------------Nature instance definitions ----------------------------*/ +static PyMethodDef BPy_Nature_methods[] = { + {NULL, NULL, 0, NULL} +}; + +/*-----------------------BPy_Nature type definition ------------------------------*/ + +PyTypeObject Nature_Type = { + PyObject_HEAD_INIT( NULL ) + 0, /* ob_size */ + "Nature", /* tp_name */ + sizeof( BPy_Nature ), /* tp_basicsize */ + 0, /* tp_itemsize */ + + /* methods */ + NULL, /* tp_dealloc */ + NULL, /* printfunc tp_print; */ + NULL, /* getattrfunc tp_getattr; */ + NULL, /* setattrfunc tp_setattr; */ + NULL, /* tp_compare */ + NULL, /* tp_repr */ + + /* Method suites for standard classes */ + + NULL, /* PyNumberMethods *tp_as_number; */ + NULL, /* PySequenceMethods *tp_as_sequence; */ + NULL, /* PyMappingMethods *tp_as_mapping; */ + + /* More standard operations (here for binary compatibility) */ + + NULL, /* hashfunc tp_hash; */ + NULL, /* ternaryfunc tp_call; */ + NULL, /* reprfunc tp_str; */ + NULL, /* getattrofunc tp_getattro; */ + NULL, /* setattrofunc tp_setattro; */ + + /* Functions to access object as input/output buffer */ + NULL, /* PyBufferProcs *tp_as_buffer; */ + + /*** Flags to define presence of optional/expanded features ***/ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* long tp_flags; */ + + NULL, /* char *tp_doc; Documentation string */ + /*** Assigned meaning in release 2.0 ***/ + /* call function for all accessible objects */ + NULL, /* traverseproc tp_traverse; */ + + /* delete references to contained objects */ + NULL, /* inquiry tp_clear; */ + + /*** Assigned meaning in release 2.1 ***/ + /*** rich comparisons ***/ + NULL, /* richcmpfunc tp_richcompare; */ + + /*** weak reference enabler ***/ + 0, /* long tp_weaklistoffset; */ + + /*** Added in release 2.2 ***/ + /* Iterators */ + NULL, /* getiterfunc tp_iter; */ + NULL, /* iternextfunc tp_iternext; */ + + /*** Attribute descriptor and subclassing stuff ***/ + BPy_Nature_methods, /* struct PyMethodDef *tp_methods; */ + NULL, /* struct PyMemberDef *tp_members; */ + NULL, /* struct PyGetSetDef *tp_getset; */ + &PyInt_Type, /* struct _typeobject *tp_base; */ + NULL, /* PyObject *tp_dict; */ + NULL, /* descrgetfunc tp_descr_get; */ + NULL, /* descrsetfunc tp_descr_set; */ + 0, /* long tp_dictoffset; */ + (initproc)Nature___init__, /* initproc tp_init; */ + NULL, /* allocfunc tp_alloc; */ + PyType_GenericNew, /* newfunc tp_new; */ + + /* Low-level free-memory routine */ + NULL, /* freefunc tp_free; */ + + /* For PyObject_IS_GC */ + NULL, /* inquiry tp_is_gc; */ + NULL, /* PyObject *tp_bases; */ + + /* method resolution order */ + NULL, /* PyObject *tp_mro; */ + NULL, /* PyObject *tp_cache; */ + NULL, /* PyObject *tp_subclasses; */ + NULL, /* PyObject *tp_weaklist; */ + NULL +}; + +//-------------------MODULE INITIALIZATION-------------------------------- +PyMODINIT_FUNC Nature_Init( PyObject *module ) +{ + PyObject *tmp; + + if( module == NULL ) + return; + + if( PyType_Ready( &Nature_Type ) < 0 ) + return; + Py_INCREF( &Nature_Type ); + PyModule_AddObject(module, "Nature", (PyObject *)&Nature_Type); + + // VertexNature + tmp = PyInt_FromLong( Nature::POINT ); PyDict_SetItemString( Nature_Type.tp_dict, "POINT", tmp); Py_DECREF(tmp); + tmp = PyInt_FromLong( Nature::S_VERTEX ); PyDict_SetItemString( Nature_Type.tp_dict, "S_VERTEX", tmp); Py_DECREF(tmp); + tmp = PyInt_FromLong( Nature::VIEW_VERTEX ); PyDict_SetItemString( Nature_Type.tp_dict, "VIEW_VERTEX", tmp); Py_DECREF(tmp); + tmp = PyInt_FromLong( Nature::NON_T_VERTEX ); PyDict_SetItemString( Nature_Type.tp_dict, "NON_T_VERTEX", tmp); Py_DECREF(tmp); + tmp = PyInt_FromLong( Nature::T_VERTEX ); PyDict_SetItemString( Nature_Type.tp_dict, "T_VERTEX", tmp); Py_DECREF(tmp); + tmp = PyInt_FromLong( Nature::CUSP ); PyDict_SetItemString( Nature_Type.tp_dict, "CUSP", tmp); Py_DECREF(tmp); + + // EdgeNature + tmp = PyInt_FromLong( Nature::NO_FEATURE ); PyDict_SetItemString( Nature_Type.tp_dict, "NO_FEATURE", tmp); Py_DECREF(tmp); + tmp = PyInt_FromLong( Nature::SILHOUETTE ); PyDict_SetItemString( Nature_Type.tp_dict, "SILHOUETTE", tmp); Py_DECREF(tmp); + tmp = PyInt_FromLong( Nature::BORDER ); PyDict_SetItemString( Nature_Type.tp_dict, "BORDER", tmp); Py_DECREF(tmp); + tmp = PyInt_FromLong( Nature::CREASE ); PyDict_SetItemString( Nature_Type.tp_dict, "CREASE", tmp); Py_DECREF(tmp); + tmp = PyInt_FromLong( Nature::RIDGE ); PyDict_SetItemString( Nature_Type.tp_dict, "RIDGE", tmp); Py_DECREF(tmp); + tmp = PyInt_FromLong( Nature::VALLEY ); PyDict_SetItemString( Nature_Type.tp_dict, "VALLEY", tmp); Py_DECREF(tmp); + tmp = PyInt_FromLong( Nature::SUGGESTIVE_CONTOUR ); PyDict_SetItemString( Nature_Type.tp_dict, "SUGGESTIVE_CONTOUR", tmp); Py_DECREF(tmp); + +} + +int Nature___init__(BPy_Nature *self, PyObject *args, PyObject *kwds) +{ + if (PyInt_Type.tp_init((PyObject *)self, args, kwds) < 0) + return -1; + + return 0; +} + +/////////////////////////////////////////////////////////////////////////////////////////// + +#ifdef __cplusplus +} +#endif + diff --git a/source/blender/freestyle/intern/python/Nature.h b/source/blender/freestyle/intern/python/Nature.h new file mode 100644 index 00000000000..d0bc4de6fc0 --- /dev/null +++ b/source/blender/freestyle/intern/python/Nature.h @@ -0,0 +1,34 @@ +#ifndef FREESTYLE_PYTHON_NATURE_H +#define FREESTYLE_PYTHON_NATURE_H + +#include "../winged_edge/Nature.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/////////////////////////////////////////////////////////////////////////////////////////// + +#include <Python.h> + +extern PyTypeObject Nature_Type; + +#define BPy_Nature_Check(v) \ + ((v)->ob_type == &Nature_Type) + +/*---------------------------Python BPy_Nature structure definition----------*/ +typedef struct { + PyIntObject i; +} BPy_Nature; + +/*---------------------------Python BPy_Nature visible prototypes-----------*/ + +PyMODINIT_FUNC Nature_Init( PyObject *module ); + +/////////////////////////////////////////////////////////////////////////////////////////// + +#ifdef __cplusplus +} +#endif + +#endif /* FREESTYLE_PYTHON_NATURE_H */ |