Revision: 15618
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15618
Author: mxcurioni
Date: 2008-07-18 06:59:07 +0200 (Fri, 18 Jul 2008)
Log Message:
-----------
soc-2008-mxcurioni: canvas for UnaryFunction0D, UnaryFunction1D,
UnaryPredicate0D, UnaryPredicate1D.
UnaryFunction0D and UnaryFunction1D implementations are going to be really
challenging due to the changes in the infrastructure: UnaryFunction0D<T> and
UnaryFunction0D<T> are templates and must be determined for compile-time. The
easiest solution is to support each type individually; unfortunately, it
removes the benefit of using an interface. To find a middle ground, a general
unary function Python object type was created for 0D and 1D. In both cases, the
types have a void* pointer keeping the address of the current unary function
type. I am not sure yet if it will work.
Interface0DIterator being removed by a list type, the t() and u() coordinate
functions will to be transferred somehow, probably directly at the Interface0D
level.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Freestyle.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate0D.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryPredicate1D.h
Removed Paths:
-------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Freestyle.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Freestyle.cpp
2008-07-18 02:55:23 UTC (rev 15617)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Freestyle.cpp
2008-07-18 04:59:07 UTC (rev 15618)
@@ -6,8 +6,11 @@
#include "Interface0D.h"
#include "Interface0D/CurvePoint.h"
#include "Interface1D.h"
+#include "UnaryFunction0D.h"
+#include "UnaryFunction1D.h"
+#include "UnaryPredicate0D.h"
+#include "UnaryPredicate1D.h"
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -127,6 +130,10 @@
Id_Init( module );
Interface0D_Init( module );
Interface1D_Init( module );
+ UnaryFunction0D_Init( module );
+ UnaryFunction1D_Init( module );
+ UnaryPredicate0D_Init( module );
+ UnaryPredicate1D_Init( module );
return module;
}
Copied:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D.cpp
(from rev 15567,
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp)
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D.cpp
(rev 0)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D.cpp
2008-07-18 04:59:07 UTC (rev 15618)
@@ -0,0 +1,173 @@
+#include "UnaryFunction0D.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+/*--------------- 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}
+};
+
+/*-----------------------BPy_UnaryFunction0D type definition
------------------------------*/
+
+PyTypeObject UnaryFunction0D_Type = {
+ PyObject_HEAD_INIT( NULL )
+ 0, /* ob_size */
+ "UnaryFunction0D", /* tp_name */
+ sizeof( BPy_UnaryFunction0D ), /* tp_basicsize */
+ 0, /* tp_itemsize
*/
+
+ /* methods */
+ (destructor)UnaryFunction0D___dealloc__, /* tp_dealloc */
+ NULL, /* printfunc
tp_print; */
+ NULL, /* getattrfunc
tp_getattr; */
+ NULL, /* setattrfunc
tp_setattr; */
+ NULL,
/* tp_compare */
+ (reprfunc)UnaryFunction0D___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_UnaryFunction0D_methods, /* struct PyMethodDef *tp_methods; */
+ NULL, /* struct PyMemberDef *tp_members; */
+ NULL, /* struct PyGetSetDef
*tp_getset; */
+ NULL, /* struct
_typeobject *tp_base; */
+ NULL, /* PyObject
*tp_dict; */
+ NULL, /* descrgetfunc
tp_descr_get; */
+ NULL, /* descrsetfunc
tp_descr_set; */
+ 0, /* long tp_dictoffset; */
+ (initproc)UnaryFunction0D___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 UnaryFunction0D_Init( PyObject *module )
+{
+ if( module == NULL )
+ return;
+
+ if( PyType_Ready( &UnaryFunction0D_Type ) < 0 )
+ return;
+ Py_INCREF( &UnaryFunction0D_Type );
+ PyModule_AddObject(module, "UnaryFunction0D", (PyObject
*)&UnaryFunction0D_Type);
+}
+
+//------------------------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 );
+}
+
+
+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
+}
+#endif
Added:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D.h
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D.h
(rev 0)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0D.h
2008-07-18 04:59:07 UTC (rev 15618)
@@ -0,0 +1,35 @@
+#ifndef FREESTYLE_PYTHON_UNARYFUNCTION0D_H
+#define FREESTYLE_PYTHON_UNARYFUNCTION0D_H
+
+#include "../view_map/Functions0D.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#include <Python.h>
+
+extern PyTypeObject UnaryFunction0D_Type;
+
+#define BPy_UnaryFunction0D_Check(v) \
+ ((v)->ob_type == &UnaryFunction0D_Type)
+
+/*---------------------------Python BPy_UnaryFunction0D structure
definition----------*/
+typedef struct {
+ PyObject_HEAD
+ void *uf0D;
+} BPy_UnaryFunction0D;
+
+/*---------------------------Python BPy_UnaryFunction0D visible
prototypes-----------*/
+
+PyMODINIT_FUNC UnaryFunction0D_Init( PyObject *module );
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREESTYLE_PYTHON_UNARYFUNCTION0D_H */
Deleted:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
2008-07-18 02:55:23 UTC (rev 15617)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction0DVoid.cpp
2008-07-18 04:59:07 UTC (rev 15618)
@@ -1,12 +0,0 @@
- PyObject *_wrap_UnaryFunction0DVoid_getName(PyObject *self , PyObject *args) {
-}
-
-
- PyObject *_wrap_UnaryFunction0DVoid___call__(PyObject *self , PyObject *args)
{
-}
-
-
- PyObject *_wrap_disown_UnaryFunction0DVoid(PyObject *self , PyObject *args) {
-}
-
-
Copied:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D.cpp
(from rev 15567,
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1DVoid.cpp)
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D.cpp
(rev 0)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/UnaryFunction1D.cpp
2008-07-18 04:59:07 UTC (rev 15618)
@@ -0,0 +1,175 @@
+#include "UnaryFunction1D.h"
+
+#include "Convert.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+///////////////////////////////////////////////////////////////////////////////////////////
+
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
