[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15742] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/python: soc-2008-mxcurioni: cleaned up the Convert header file to prevent cyclic or header positioning problems and adapted classes accordingly
Maxime Curioni
maxime.curioni at gmail.com
Thu Jul 24 22:39:14 CEST 2008
Revision: 15742
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15742
Author: mxcurioni
Date: 2008-07-24 22:39:13 +0200 (Thu, 24 Jul 2008)
Log Message:
-----------
soc-2008-mxcurioni: cleaned up the Convert header file to prevent cyclic or header positioning problems and adapted classes accordingly
Modified Paths:
--------------
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_SShape.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp 2008-07-24 20:03:25 UTC (rev 15741)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.cpp 2008-07-24 20:39:13 UTC (rev 15742)
@@ -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
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h 2008-07-24 20:03:25 UTC (rev 15741)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_Convert.h 2008-07-24 20:39:13 UTC (rev 15742)
@@ -4,21 +4,24 @@
#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" {
#endif
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_SShape.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_SShape.cpp 2008-07-24 20:03:25 UTC (rev 15741)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/BPy_SShape.cpp 2008-07-24 20:39:13 UTC (rev 15742)
@@ -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"
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp 2008-07-24 20:03:25 UTC (rev 15741)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp 2008-07-24 20:39:13 UTC (rev 15742)
@@ -1,6 +1,7 @@
#include "BPy_CurvePoint.h"
#include "../BPy_Convert.h"
+#include "../Interface0D/BPy_SVertex.h"
#ifdef __cplusplus
extern "C" {
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp 2008-07-24 20:03:25 UTC (rev 15741)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp 2008-07-24 20:39:13 UTC (rev 15742)
@@ -2,6 +2,7 @@
#include "../BPy_Convert.h"
#include "../BPy_Id.h"
+#include "../Interface1D/BPy_FEdge.h"
#ifdef __cplusplus
extern "C" {
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp 2008-07-24 20:03:25 UTC (rev 15741)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp 2008-07-24 20:39:13 UTC (rev 15742)
@@ -1,6 +1,7 @@
#include "BPy_ViewVertex.h"
#include "../BPy_Convert.h"
+#include "../BPy_Nature.h"
#ifdef __cplusplus
extern "C" {
@@ -115,17 +116,8 @@
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,8 +132,11 @@
Py_RETURN_NONE;
}
+//PyObject * ViewVertex_edgesBegin( BPy_ViewVertex *self ) {
+ // orientedViewEdgeIterator ove( self->vv->edgesBegin() )
+ // return BPy_orientedViewEdgeIterator_from_orientedViewEdgeIterator( ove );
+//}
-
///////////////////////////////////////////////////////////////////////////////////////////
#ifdef __cplusplus
@@ -149,9 +144,8 @@
#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
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp 2008-07-24 20:03:25 UTC (rev 15741)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp 2008-07-24 20:39:13 UTC (rev 15742)
@@ -2,6 +2,7 @@
#include "../../BPy_Convert.h"
#include "../../BPy_StrokeAttribute.h"
+#include "../../Interface0D/BPy_SVertex.h"
#ifdef __cplusplus
extern "C" {
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp 2008-07-24 20:03:25 UTC (rev 15741)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp 2008-07-24 20:39:13 UTC (rev 15742)
@@ -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" {
Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp 2008-07-24 20:03:25 UTC (rev 15741)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp 2008-07-24 20:39:13 UTC (rev 15742)
@@ -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
More information about the Bf-blender-cvs
mailing list