Revision: 15767
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15767
Author: mxcurioni
Date: 2008-07-25 23:56:06 +0200 (Fri, 25 Jul 2008)
Log Message:
-----------
soc-2008-mxcurioni: added (but did not test) NonTVertex and TVertex classes.
All Interface0D structures have been implemented
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMap.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_TVertex.h
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
2008-07-25 21:14:23 UTC (rev 15766)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
2008-07-25 21:56:06 UTC (rev 15767)
@@ -72,6 +72,8 @@
prefix +
'/Interface0D/CurvePoint/BPy_StrokeVertex.cpp',
prefix +
'/Interface0D/BPy_SVertex.cpp',
prefix +
'/Interface0D/BPy_ViewVertex.cpp',
+ prefix +
'/Interface0D/ViewVertex/BPy_NonTVertex.cpp',
+ prefix +
'/Interface0D/ViewVertex/BPy_TVertex.cpp',
prefix + '/BPy_Interface1D.cpp',
prefix +
'/Interface1D/BPy_Curve.cpp',
prefix +
'/Interface1D/BPy_FEdge.cpp',
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
2008-07-25 21:14:23 UTC (rev 15766)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Interface0D.cpp
2008-07-25 21:56:06 UTC (rev 15767)
@@ -5,6 +5,8 @@
#include "Interface0D/CurvePoint/BPy_StrokeVertex.h"
#include "Interface0D/BPy_SVertex.h"
#include "Interface0D/BPy_ViewVertex.h"
+#include "Interface0D/ViewVertex/BPy_NonTVertex.h"
+#include "Interface0D/ViewVertex/BPy_TVertex.h"
#include "Interface1D/BPy_FEdge.h"
#include "BPy_Nature.h"
@@ -164,6 +166,16 @@
return;
Py_INCREF( &StrokeVertex_Type );
PyModule_AddObject(module, "StrokeVertex", (PyObject
*)&StrokeVertex_Type);
+
+ if( PyType_Ready( &NonTVertex_Type ) < 0 )
+ return;
+ Py_INCREF( &NonTVertex_Type );
+ PyModule_AddObject(module, "NonTVertex", (PyObject *)&NonTVertex_Type);
+
+ if( PyType_Ready( &TVertex_Type ) < 0 )
+ return;
+ Py_INCREF( &TVertex_Type );
+ PyModule_AddObject(module, "TVertex", (PyObject *)&TVertex_Type);
}
//------------------------INSTANCE METHODS ----------------------------------
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
2008-07-25 21:14:23 UTC (rev 15766)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex/BPy_NonTVertex.cpp
2008-07-25 21:56:06 UTC (rev 15767)
@@ -1,132 +1,192 @@
- PyObject *_wrap_NonTVertex_getExactTypeName(PyObject *self , PyObject *args) {
-}
+#include "BPy_NonTVertex.h"
+#include "../../BPy_Convert.h"
+#include "../BPy_SVertex.h"
- PyObject *_wrap_NonTVertex_getX(PyObject *self , PyObject *args) {
-}
+#ifdef __cplusplus
+extern "C" {
+#endif
+///////////////////////////////////////////////////////////////////////////////////////////
- PyObject *_wrap_NonTVertex_getY(PyObject *self , PyObject *args) {
-}
+/*--------------- Python API function prototypes for NonTVertex___init__
instance -----------*/
+static int NonTVertex___init__(BPy_NonTVertex *self, PyObject *args, PyObject
*kwds);
+static PyObject * NonTVertex_castToSVertex( BPy_NonTVertex *self );
+static PyObject * NonTVertex_castToViewVertex( BPy_NonTVertex *self );
+static PyObject * NonTVertex_castToNonTVertex( BPy_NonTVertex *self );
+static PyObject * NonTVertex_svertex( BPy_NonTVertex *self );
+static PyObject * NonTVertex_setSVertex( BPy_NonTVertex *self, PyObject *args);
- PyObject *_wrap_NonTVertex_getZ(PyObject *self , PyObject *args) {
-}
+/*----------------------NonTVertex instance definitions
----------------------------*/
+static PyMethodDef BPy_NonTVertex_methods[] = {
+// {"__copy__", ( PyCFunction ) NonTVertex___copy__, METH_NOARGS, "（
）Cloning method."},
+ {"castToSVertex", ( PyCFunction ) NonTVertex_castToSVertex,
METH_NOARGS, "（ ）Cast the Interface0D in SVertex if it can be. "},
+ {"castToViewVertex", ( PyCFunction ) NonTVertex_castToViewVertex,
METH_NOARGS, "（ ）Cast the Interface0D in ViewVertex if it can be. "},
+ {"castToNonTVertex", ( PyCFunction ) NonTVertex_castToNonTVertex,
METH_NOARGS, "（ ）Cast the Interface0D in NonTVertex if it can be. "},
+ {"svertex", ( PyCFunction ) NonTVertex_svertex, METH_NOARGS, "（
）Returns the SVertex on top of which this NonTVertex is built. "},
+ {"setSVertex", ( PyCFunction ) NonTVertex_setSVertex, METH_VARARGS,
"（SVertex sv ）Sets the SVertex on top of which this NonTVertex is built. "},
+ {NULL, NULL, 0, NULL}
+};
+/*-----------------------BPy_NonTVertex type definition
------------------------------*/
- PyObject *_wrap_NonTVertex_getPoint3D(PyObject *self , PyObject *args) {
-}
+PyTypeObject NonTVertex_Type = {
+ PyObject_HEAD_INIT( NULL )
+ 0, /* ob_size */
+ "NonTVertex", /* tp_name */
+ sizeof( BPy_NonTVertex ), /* 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 */
- PyObject *_wrap_NonTVertex_getProjectedX(PyObject *self , PyObject *args) {
-}
+ NULL, /* PyNumberMethods *tp_as_number; */
+ NULL, /* PySequenceMethods *tp_as_sequence; */
+ NULL, /* PyMappingMethods *tp_as_mapping; */
+ /* More standard operations (here for binary compatibility) */
- PyObject *_wrap_NonTVertex_getProjectedY(PyObject *self , PyObject *args) {
-}
+ 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; */
- PyObject *_wrap_NonTVertex_getProjectedZ(PyObject *self , PyObject *args) {
-}
+ /*** 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; */
- PyObject *_wrap_NonTVertex_getPoint2D(PyObject *self , PyObject *args) {
-}
+ /* delete references to contained objects */
+ NULL, /* inquiry tp_clear; */
+ /*** Assigned meaning in release 2.1 ***/
+ /*** rich comparisons ***/
+ NULL, /* richcmpfunc tp_richcompare; */
- PyObject *_wrap_NonTVertex_getId(PyObject *self , PyObject *args) {
-}
+ /*** weak reference enabler ***/
+ 0, /* long tp_weaklistoffset; */
+ /*** Added in release 2.2 ***/
+ /* Iterators */
+ NULL, /* getiterfunc tp_iter; */
+ NULL, /* iternextfunc tp_iternext; */
- PyObject *_wrap_NonTVertex_castToSVertex(PyObject *self , PyObject *args) {
-}
+ /*** Attribute descriptor and subclassing stuff ***/
+ BPy_NonTVertex_methods, /* struct PyMethodDef *tp_methods; */
+ NULL, /* struct PyMemberDef *tp_members; */
+ NULL, /* struct PyGetSetDef
*tp_getset; */
+ &ViewVertex_Type, /* struct _typeobject
*tp_base; */
+ NULL, /* PyObject
*tp_dict; */
+ NULL, /* descrgetfunc
tp_descr_get; */
+ NULL, /* descrsetfunc
tp_descr_set; */
+ 0, /* long tp_dictoffset; */
+ (initproc)NonTVertex___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
+};
- PyObject *_wrap_NonTVertex_castToViewVertex(PyObject *self , PyObject *args) {
-}
+//------------------------INSTANCE METHODS ----------------------------------
- PyObject *_wrap_NonTVertex_castToNonTVertex(PyObject *self , PyObject *args) {
-}
+int NonTVertex___init__(BPy_NonTVertex *self, PyObject *args, PyObject *kwds)
+{
+ PyObject *obj = 0;
- PyObject *_wrap_new_NonTVertex__SWIG_0(PyObject *self , PyObject *args) {
-}
+ if (! PyArg_ParseTuple(args, "|O", &obj) )
+ return -1;
+ if( !obj ){
+ self->ntv = new NonTVertex();
- PyObject *_wrap_new_NonTVertex__SWIG_1(PyObject *self , PyObject *args) {
-}
+ } else if( BPy_SVertex_Check(obj) && ((BPy_SVertex *) obj)->sv ) {
+ self->ntv = new NonTVertex( ((BPy_SVertex *) obj)->sv );
+ } else {
+ return -1;
+ }
- PyObject *_wrap_new_NonTVertex(PyObject *self, PyObject *args) {
-}
+ self->py_vv.vv = self->ntv;
+ self->py_vv.py_if0D.if0D = self->ntv;
-
- PyObject *_wrap_delete_NonTVertex(PyObject *self , PyObject *args) {
+ return 0;
}
+PyObject * NonTVertex_castToSVertex( BPy_NonTVertex *self ) {
+ PyObject *py_sv = SVertex_Type.tp_new( &SVertex_Type, 0, 0 );
+ ((BPy_SVertex *) py_sv)->sv = self->ntv->castToSVertex();
- PyObject *_wrap_NonTVertex_svertex(PyObject *self , PyObject *args) {
+ return py_sv;
}
+PyObject * NonTVertex_castToViewVertex( BPy_NonTVertex *self ) {
+ PyObject *py_vv = ViewVertex_Type.tp_new( &ViewVertex_Type, 0, 0 );
+ ((BPy_ViewVertex *) py_vv)->vv = self->ntv->castToViewVertex();
- PyObject *_wrap_NonTVertex_viewedges(PyObject *self , PyObject *args) {
+ return py_vv;
}
+PyObject * NonTVertex_castToNonTVertex( BPy_NonTVertex *self ) {
+ PyObject *py_ntv = NonTVertex_Type.tp_new( &NonTVertex_Type, 0, 0 );
+ ((BPy_NonTVertex *) py_ntv)->ntv = self->ntv->castToNonTVertex();
- PyObject *_wrap_NonTVertex_SetSVertex(PyObject *self , PyObject *args) {
+ return py_ntv;
}
+PyObject * NonTVertex_svertex( BPy_NonTVertex *self ) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
