griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

soc-2008-mxcurioni: cleaned up the Convert header file to prevent cyclic or header positioning problems and adapted classes accordingly

Browse Source
This commit is contained in:
Maxime Curioni
2008-07-24 20:39:13 +00:00
parent a0359c3750
commit 2860bc5d5b
9 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/freestyle/intern/python/BPy_Convert.cpp
View File

@@ -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

29
source/blender/freestyle/intern/python/BPy_Convert.h
View File

@@ -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" {

2
source/blender/freestyle/intern/python/BPy_SShape.cpp
View File

@@ -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"

1
source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
View File

@@ -1,6 +1,7 @@
#include "BPy_CurvePoint.h"
#include "../BPy_Convert.h"
#include "../Interface0D/BPy_SVertex.h"
#ifdef __cplusplus
extern "C" {

1
source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
View File

@@ -2,6 +2,7 @@
#include "../BPy_Convert.h"
#include "../BPy_Id.h"
#include "../Interface1D/BPy_FEdge.h"
#ifdef __cplusplus
extern "C" {

20
source/blender/freestyle/intern/python/Interface0D/BPy_ViewVertex.cpp
View File

@@ -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

1
source/blender/freestyle/intern/python/Interface0D/CurvePoint/BPy_StrokeVertex.cpp
View File

@@ -2,6 +2,7 @@
#include "../../BPy_Convert.h"
#include "../../BPy_StrokeAttribute.h"
#include "../../Interface0D/BPy_SVertex.h"
#ifdef __cplusplus
extern "C" {

2
source/blender/freestyle/intern/python/Interface1D/BPy_FEdge.cpp
View File

@@ -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" {

4
source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
View File

@@ -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