archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

soc-2008-mxcurioni: made considerable changes to support cross-language polymorphism for UnaryFunction0D, Interface0D, Interface1D. Add to change UnaryFunction1D<void> to static UnaryFunction1D_void. Resolved namespace collision on the Image class (changed to FrsImage). There is greater support for style modules but somehow, some do not show anything yet (japanese_bigbrush being an example).

Browse Source
This commit is contained in:
Maxime Curioni
2008-08-01 21:55:58 +00:00
parent c324f0cbc7
commit 7565990db2
32 changed files with 379 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,6 +23,9 @@ using namespace Geometry;
// Material
#include "../scene_graph/Material.h"
// Nature::VertexNature, Nature::EdgeNature
#include "../winged_edge/Nature.h"
// Stroke, StrokeAttribute, StrokeVertex
#include "../stroke/Stroke.h"
@@ -58,16 +61,15 @@ extern "C" {
#include "api2_2x/vector.h"
#include "api2_2x/gen_utils.h"
PyObject * PyBool_from_bool( bool b );
bool bool_from_PyBool( PyObject *b );
//==============================
// C++ => Python
//==============================
PyObject * PyBool_from_bool( bool b );
PyObject * Vector_from_Vec2f( Vec2f& v );
PyObject * Vector_from_Vec3f( Vec3f& v );
PyObject * Vector_from_Vec3r( Vec3r& v );
IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj );
Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj );
PyObject * BPy_BBox_from_BBox( BBox< Vec3r > &bb );
PyObject * BPy_CurvePoint_from_CurvePoint( CurvePoint& cp );
PyObject * BPy_directedViewEdge_from_directedViewEdge( ViewVertex::directedViewEdge& dve );
@@ -99,8 +101,19 @@ PyObject * BPy_ChainingIterator_from_ChainingIterator( ChainingIterator& c_it );
PyObject * BPy_ChainPredicateIterator_from_ChainPredicateIterator( ChainPredicateIterator& cp_it );
PyObject * BPy_ChainSilhouetteIterator_from_ChainSilhouetteIterator( ChainSilhouetteIterator& cs_it );
//==============================
// Python => C++
//==============================
bool bool_from_PyBool( PyObject *b );
IntegrationType IntegrationType_from_BPy_IntegrationType( PyObject* obj );
Stroke::MediumType MediumType_from_BPy_MediumType( PyObject* obj );
Nature::EdgeNature EdgeNature_from_BPy_Nature( PyObject* obj );
Vec2f * Vec2f_ptr_from_Vector( PyObject* obj );
Vec3f * Vec3f_ptr_from_Vector( PyObject* obj );
Vec3r * Vec3r_ptr_from_Vector( PyObject* obj );
///////////////////////////////////////////////////////////////////////////////////////////