Revision: 15795
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15795
Author: mxcurioni
Date: 2008-07-27 05:40:37 +0200 (Sun, 27 Jul 2008)
Log Message:
-----------
soc-2008-mxcurioni: implemented and tested unary predicates. The good news is
that My approach seems to works (even though it is not fully testable as it
needs Freestyle to be running). I will now port the 80 predicate subclasses
left.
In this commit, UnaryPredicate0DDouble and its subclasses DensityF0D and
LocalAverageDepthF0D are implemented and integrated in the API.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_DensityF0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/UnaryFunction0D_double/BPy_LocalAverageDepthF0D.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.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_LocalAverageDepthF0D.h
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
2008-07-27 03:15:17 UTC (rev 15794)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.cpp
2008-07-27 03:40:37 UTC (rev 15795)
@@ -1,6 +1,6 @@
#include "BPy_UnaryFunction0D.h"
-#include "BPy_Convert.h"
+#include "UnaryFunction0D/BPy_UnaryFunction0DDouble.h"
#ifdef __cplusplus
extern "C" {
@@ -9,17 +9,11 @@
///////////////////////////////////////////////////////////////////////////////////////////
/*--------------- Python API function prototypes for UnaryFunction0D instance
-----------*/
-static int UnaryFunction0D___init__(BPy_UnaryFunction0D *self, PyObject *args,
PyObject *kwds);
static void UnaryFunction0D___dealloc__(BPy_UnaryFunction0D *self);
static PyObject * UnaryFunction0D___repr__(BPy_UnaryFunction0D *self);
-static PyObject * UnaryFunction0D_getName( BPy_UnaryFunction0D *self, PyObject
*args);
-static PyObject * UnaryFunction0D___call__( BPy_UnaryFunction0D *self,
PyObject *args);
-
/*----------------------UnaryFunction0D instance definitions
----------------------------*/
static PyMethodDef BPy_UnaryFunction0D_methods[] = {
- {"getName", ( PyCFunction ) UnaryFunction0D_getName, METH_NOARGS, ""},
- {"__call__", ( PyCFunction ) UnaryFunction0D___call__, METH_VARARGS, ""
},
{NULL, NULL, 0, NULL}
};
@@ -89,7 +83,7 @@
NULL, /* descrgetfunc
tp_descr_get; */
NULL, /* descrsetfunc
tp_descr_set; */
0, /* long tp_dictoffset; */
- (initproc)UnaryFunction0D___init__, /* initproc tp_init; */
+ NULL, /* initproc tp_init; */
NULL, /* allocfunc
tp_alloc; */
PyType_GenericNew, /* newfunc tp_new; */
@@ -118,54 +112,23 @@
return;
Py_INCREF( &UnaryFunction0D_Type );
PyModule_AddObject(module, "UnaryFunction0D", (PyObject
*)&UnaryFunction0D_Type);
+
+ UnaryFunction0DDouble_Init( module );
}
//------------------------INSTANCE METHODS ----------------------------------
-int UnaryFunction0D___init__(BPy_UnaryFunction0D *self, PyObject *args,
PyObject *kwds)
-{
- return 0;
-}
-
void UnaryFunction0D___dealloc__(BPy_UnaryFunction0D* self)
{
- //delete self->uf0D;
self->ob_type->tp_free((PyObject*)self);
}
PyObject * UnaryFunction0D___repr__(BPy_UnaryFunction0D* self)
{
- return PyString_FromFormat("type: %s - address: %p",
((UnaryFunction0D<void> *) self->uf0D)->getName().c_str(), self->uf0D );
+ return PyString_FromString("UnaryFunction0D");
}
-
-PyObject * UnaryFunction0D_getName( BPy_UnaryFunction0D *self, PyObject *args)
-{
- return PyString_FromString( ((UnaryFunction0D<void> *)
self->uf0D)->getName().c_str() );
-}
-
-PyObject * UnaryFunction0D___call__( BPy_UnaryFunction0D *self, PyObject *args)
-{
- PyObject *l;
-
- if( !PyArg_ParseTuple(args, "O", &l) ) {
- cout << "ERROR: UnaryFunction0D___call__ " << endl;
- return NULL;
- }
-
- // pb: operator() is called on Interface0DIterator while we have a list
- // solutions:
- // 1)reconvert back to iterator ?
- // 2) adapt interface0d to have t(), u() functions
-
- // b = self->bp0D->operator()( *(obj1->uf0D) );
- // return PyBool_from_bool( b );
-
- Py_RETURN_NONE;
-}
-
-
///////////////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
2008-07-27 03:15:17 UTC (rev 15794)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_UnaryFunction0D.h
2008-07-27 03:40:37 UTC (rev 15795)
@@ -18,7 +18,6 @@
/*---------------------------Python BPy_UnaryFunction0D structure
definition----------*/
typedef struct {
PyObject_HEAD
- void *uf0D;
} BPy_UnaryFunction0D;
/*---------------------------Python BPy_UnaryFunction0D visible
prototypes-----------*/
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
2008-07-27 03:15:17 UTC (rev 15794)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D/BPy_UnaryFunction0DDouble.cpp
2008-07-27 03:40:37 UTC (rev 15795)
@@ -1,12 +1,182 @@
- PyObject *_wrap_UnaryFunction0DDouble_getName(PyObject *self , PyObject
*args) {
+#include "BPy_UnaryFunction0DDouble.h"
+
+#include "../BPy_Convert.h"
+#include "../Iterator/BPy_Interface0DIterator.h"
+
+#include "UnaryFunction0D_double/BPy_DensityF0D.h"
+#include "UnaryFunction0D_double/BPy_LocalAverageDepthF0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*--------------- Python API function prototypes for UnaryFunction0DDouble
instance -----------*/
+static int UnaryFunction0DDouble___init__(BPy_UnaryFunction0DDouble* self);
+static void UnaryFunction0DDouble___dealloc__(BPy_UnaryFunction0DDouble* self);
+static PyObject * UnaryFunction0DDouble___repr__(BPy_UnaryFunction0DDouble*
self);
+
+static PyObject * UnaryFunction0DDouble_getName( BPy_UnaryFunction0DDouble
*self);
+static PyObject * UnaryFunction0DDouble___call__( BPy_UnaryFunction0DDouble
*self, PyObject *args);
+
+/*----------------------UnaryFunction0DDouble instance definitions
----------------------------*/
+static PyMethodDef BPy_UnaryFunction0DDouble_methods[] = {
+ {"getName", ( PyCFunction ) UnaryFunction0DDouble_getName, METH_NOARGS,
"（ ）Returns the string of the name of the unary 0D function."},
+ {"__call__", ( PyCFunction ) UnaryFunction0DDouble___call__,
METH_VARARGS, "（Interface0DIterator it ）Executes the operator () on the
iterator it pointing onto the point at which we wish to evaluate the function."
},
+ {NULL, NULL, 0, NULL}
+};
+
+/*-----------------------BPy_UnaryFunction0DDouble type definition
------------------------------*/
+
+PyTypeObject UnaryFunction0DDouble_Type = {
+ PyObject_HEAD_INIT( NULL )
+ 0, /* ob_size */
+ "UnaryFunction0DDouble", /* tp_name */
+ sizeof( BPy_UnaryFunction0DDouble ), /* tp_basicsize */
+ 0, /* tp_itemsize
*/
+
+ /* methods */
+ (destructor)UnaryFunction0DDouble___dealloc__, /* tp_dealloc */
+ NULL, /* printfunc
tp_print; */
+ NULL, /* getattrfunc
tp_getattr; */
+ NULL, /* setattrfunc
tp_setattr; */
+ NULL,
/* tp_compare */
+ (reprfunc)UnaryFunction0DDouble___repr__,
/* 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_UnaryFunction0DDouble_methods, /* struct PyMethodDef
*tp_methods; */
+ NULL, /* struct PyMemberDef *tp_members; */
+ NULL, /* struct PyGetSetDef
*tp_getset; */
+ &UnaryFunction0D_Type,
/* struct _typeobject *tp_base; */
+ NULL, /* PyObject
*tp_dict; */
+ NULL, /* descrgetfunc
tp_descr_get; */
+ NULL, /* descrsetfunc
tp_descr_set; */
+ 0, /* long tp_dictoffset; */
+ (initproc)UnaryFunction0DDouble___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--------------------------------
+
+PyMODINIT_FUNC UnaryFunction0DDouble_Init( PyObject *module ) {
+
+ if( module == NULL )
+ return;
+
+ if( PyType_Ready( &UnaryFunction0DDouble_Type ) < 0 )
+ return;
+ Py_INCREF( &UnaryFunction0DDouble_Type );
+ PyModule_AddObject(module, "UnaryFunction0DDouble", (PyObject
*)&UnaryFunction0DDouble_Type);
+
+ if( PyType_Ready( &DensityF0D_Type ) < 0 )
+ return;
+ Py_INCREF( &DensityF0D_Type );
+ PyModule_AddObject(module, "DensityF0D", (PyObject *)&DensityF0D_Type);
+
+ if( PyType_Ready( &LocalAverageDepthF0D_Type ) < 0 )
+ return;
+ Py_INCREF( &LocalAverageDepthF0D_Type );
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
