Revision: 15629
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15629
Author: mxcurioni
Date: 2008-07-18 22:31:40 +0200 (Fri, 18 Jul 2008)
Log Message:
-----------
soc-2008-mxcurioni: Added IntegrationType and Nature classes, used to store
constants used throughout Freestyle
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Convert.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Convert.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Freestyle.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
Added Paths:
-----------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/IntegrationType.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/IntegrationType.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Nature.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Nature.h
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
2008-07-18 19:56:56 UTC (rev 15628)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
2008-07-18 20:31:40 UTC (rev 15629)
@@ -65,11 +65,17 @@
prefix + '/BinaryPredicate0D.cpp',
prefix + '/BinaryPredicate1D.cpp',
prefix + '/Id.cpp',
+ prefix + '/IntegrationType.cpp',
prefix + '/Interface0D.cpp',
prefix + '/Interface0D/CurvePoint.cpp',
prefix + '/Interface0D/SVertex.cpp',
prefix + '/Interface1D.cpp',
- prefix + '/Interface1D/FEdge.cpp'
+ prefix + '/Interface1D/FEdge.cpp',
+ prefix + '/Nature.cpp',
+ prefix + '/UnaryFunction0D.cpp',
+ prefix + '/UnaryFunction1D.cpp',
+ prefix + '/UnaryPredicate0D.cpp',
+ prefix + '/UnaryPredicate1D.cpp'
]
sources = system_sources + image_sources + geometry_sources +
scene_graph_sources \
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Convert.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Convert.cpp
2008-07-18 19:56:56 UTC (rev 15628)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Convert.cpp
2008-07-18 20:31:40 UTC (rev 15629)
@@ -64,9 +64,7 @@
return py_fe;
}
-
-
///////////////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Convert.h
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Convert.h
2008-07-18 19:56:56 UTC (rev 15628)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Convert.h
2008-07-18 20:31:40 UTC (rev 15629)
@@ -5,6 +5,7 @@
using namespace Geometry;
#include "Id.h"
+#include "IntegrationType.h"
#include "Interface0D.h"
#include "Interface0D/SVertex.h"
#include "Interface1D/FEdge.h"
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 19:56:56 UTC (rev 15628)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Freestyle.cpp
2008-07-18 20:31:40 UTC (rev 15629)
@@ -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 @@
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 );
Added:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/IntegrationType.cpp
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/IntegrationType.cpp
(rev 0)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/IntegrationType.cpp
2008-07-18 20:31:40 UTC (rev 15629)
@@ -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
+
Added:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/IntegrationType.h
===================================================================
---
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/IntegrationType.h
(rev 0)
+++
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/IntegrationType.h
2008-07-18 20:31:40 UTC (rev 15629)
@@ -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 */
Modified:
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/ViewVertex.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
