From 2860bc5d5b1b2495c52a64eb7b30490e24ca4a41 Mon Sep 17 00:00:00 2001 From: Maxime Curioni Date: Thu, 24 Jul 2008 20:39:13 +0000 Subject: soc-2008-mxcurioni: cleaned up the Convert header file to prevent cyclic or header positioning problems and adapted classes accordingly --- .../freestyle/intern/python/BPy_Convert.cpp | 14 +++++++++++ .../blender/freestyle/intern/python/BPy_Convert.h | 29 ++++++++++++---------- .../blender/freestyle/intern/python/BPy_SShape.cpp | 2 ++ .../intern/python/Interface0D/BPy_CurvePoint.cpp | 1 + .../intern/python/Interface0D/BPy_SVertex.cpp | 1 + .../intern/python/Interface0D/BPy_ViewVertex.cpp | 20 ++++++--------- .../Interface0D/CurvePoint/BPy_StrokeVertex.cpp | 1 + .../intern/python/Interface1D/BPy_FEdge.cpp | 2 ++ .../intern/python/Interface1D/BPy_Stroke.cpp | 4 +++ 9 files changed, 48 insertions(+), 26 deletions(-) (limited to 'source/blender/freestyle/intern/python') diff --git a/source/blender/freestyle/intern/python/BPy_Convert.cpp b/source/blender/freestyle/intern/python/BPy_Convert.cpp index c052acb446f..9bc937b15d9 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.cpp +++ b/source/blender/freestyle/intern/python/BPy_Convert.cpp @@ -1,5 +1,19 @@ #include "BPy_Convert.h" +#include "BPy_BBox.h" +#include "BPy_Id.h" +#include "BPy_IntegrationType.h" +#include "BPy_Interface0D.h" +#include "Interface0D/CurvePoint/BPy_StrokeVertex.h" +#include "Interface0D/BPy_SVertex.h" +#include "Interface0D/BPy_ViewVertex.h" +#include "Interface1D/BPy_FEdge.h" +#include "Interface1D/BPy_ViewEdge.h" +#include "BPy_SShape.h" +#include "BPy_Nature.h" +#include "BPy_MediumType.h" +#include "BPy_StrokeAttribute.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/python/BPy_Convert.h b/source/blender/freestyle/intern/python/BPy_Convert.h index 6bf05dc8047..db0b5e589d2 100644 --- a/source/blender/freestyle/intern/python/BPy_Convert.h +++ b/source/blender/freestyle/intern/python/BPy_Convert.h @@ -4,20 +4,23 @@ #include "../geometry/Geom.h" using namespace Geometry; +// BBox +#include "../geometry/BBox.h" -#include "BPy_BBox.h" -#include "BPy_Id.h" -#include "BPy_IntegrationType.h" -#include "BPy_Interface0D.h" -#include "Interface0D/CurvePoint/BPy_StrokeVertex.h" -#include "Interface0D/BPy_SVertex.h" -#include "Interface0D/BPy_ViewVertex.h" -#include "Interface1D/BPy_FEdge.h" -#include "Interface1D/BPy_ViewEdge.h" -#include "BPy_SShape.h" -#include "BPy_Nature.h" -#include "BPy_MediumType.h" -#include "BPy_StrokeAttribute.h" +// FEdge, FEdgeSharp, FEdgeSmooth, SShape, SVertex, FEdgeInternal::SVertexIterator +#include "../view_map/Silhouette.h" + +// Id +#include "../system/Id.h" + +// Interface0D, Interface0DIteratorNested, Interface0DIterator +#include "../view_map/Interface0D.h" + +// Stroke, StrokeAttribute, StrokeVertex +#include "../stroke/Stroke.h" + +// NonTVertex, TVertex, ViewEdge, ViewMap, ViewShape, ViewVertex +#include "../view_map/ViewMap.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/BPy_SShape.cpp b/source/blender/freestyle/intern/python/BPy_SShape.cpp index 62c554aab51..ab8a39d6193 100644 --- a/source/blender/freestyle/intern/python/BPy_SShape.cpp +++ b/source/blender/freestyle/intern/python/BPy_SShape.cpp @@ -1,6 +1,8 @@ #include "BPy_SShape.h" #include "BPy_Convert.h" +#include "BPy_BBox.h" +#include "BPy_Id.h" #include "Interface0D/BPy_SVertex.h" #include "Interface1D/BPy_FEdge.h" diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp index 6765bc84baa..7fce126d309 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp @@ -1,6 +1,7 @@ #include "BPy_CurvePoint.h" #include "../BPy_Convert.h" +#include "../Interface0D/BPy_SVertex.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp index bbfff34cb20..233ee3f10b5 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp @@ -2,6 +2,7 @@ #include "../BPy_Convert.h" #include "../BPy_Id.h" +#include "../Interface1D/BPy_FEdge.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp index 7e6ef8590fd..2c68dc0e2e3 100644 --- a/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp @@ -1,6 +1,7 @@ #include "BPy_ViewVertex.h" #include "../BPy_Convert.h" +#include "../BPy_Nature.h" #ifdef __cplusplus extern "C" { @@ -115,16 +116,7 @@ int ViewVertex___init__(BPy_ViewVertex *self ) 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.if->sv; -// -// return (PyObject *) py_svertex; -// } + PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args ) { PyObject *py_n; @@ -140,7 +132,10 @@ PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args ) { Py_RETURN_NONE; } - +//PyObject * ViewVertex_edgesBegin( BPy_ViewVertex *self ) { + // orientedViewEdgeIterator ove( self->vv->edgesBegin() ) + // return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ove ); +//} /////////////////////////////////////////////////////////////////////////////////////////// @@ -149,9 +144,8 @@ PyObject * ViewVertex_setNature( BPy_ViewVertex *self, PyObject *args ) { #endif -// virtual string getExactTypeName () 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/CurvePoint/BPy_StrokeVertex.cpp b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp index 2039b165457..3616e69447f 100644 --- a/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp +++ b/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp @@ -2,6 +2,7 @@ #include "../../BPy_Convert.h" #include "../../BPy_StrokeAttribute.h" +#include "../../Interface0D/BPy_SVertex.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp index 56dc76f0acd..bee852a96cb 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp @@ -1,7 +1,9 @@ #include "BPy_FEdge.h" #include "../BPy_Convert.h" +#include "../BPy_Id.h" #include "../Interface0D/BPy_SVertex.h" +#include "../BPy_Nature.h" #ifdef __cplusplus extern "C" { diff --git a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp index 7574c8d7fc1..6e5be90bc82 100644 --- a/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp +++ b/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp @@ -1,7 +1,11 @@ #include "BPy_Stroke.h" #include "../BPy_Convert.h" +#include "../BPy_Id.h" #include "../Interface0D/BPy_SVertex.h" +#include "../Interface0D/CurvePoint/BPy_StrokeVertex.h" +#include "../BPy_MediumType.h" + #include "../../stroke/StrokeIterators.h" #ifdef __cplusplus -- cgit v1.2.3