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

* Better support for vector-like objects in method arguments.

Browse Source 
Now the following methods in the Freestyle Python API accept
not only Blender.Mathutils.Vector instances but also lists and
tuples having an appropriate number of elements.

  FrsNoise::turbulence2()
  FrsNoise::turbulence3()
  FrsNoise::smoothNoise2()
  FrsNoise::smoothNoise3()
  SVertex::__init__()
  SVertex::setPoint3D()
  SVertex::setPoint2D()
  SVertex::AddNormal()
  FEdgeSharp::setNormalA()
  FEdgeSharp::setNormalB()
  FEdgeSmooth::setNormal()
  CalligraphicShader::__init__()
  StrokeAttribute::setAttributeVec2f()
  StrokeAttribute::setAttributeVec3f()
  StrokeAttribute::setColor()
  StrokeVertex::setPoint()

* Added the following converters for the sake of the improvements
mentioned above.

  Vec2f_ptr_from_PyObject()
  Vec3f_ptr_from_PyObject()
  Vec3r_ptr_from_PyObject()
  Vec2f_ptr_from_PyList()
  Vec3f_ptr_from_PyList()
  Vec3r_ptr_from_PyList()
  Vec2f_ptr_from_PyTuple()
  Vec3f_ptr_from_PyTuple()
  Vec3r_ptr_from_PyTuple()

Those converters with the suffixes _PyList and _PyTuple accept
only lists and tuples having an appropriate number of elements,
respectively, while those with the suffix _PyObject accept lists,
tuples, or Blender.Mathutils.Vector instances.

* Fixed a null pointer reference in Interface0D___dealloc__().

* Corrected the names of 3 methods in the FEdgeSmooth class.
This commit is contained in:
Tamito Kajiyama
2009-07-25 11:27:18 +00:00
parent d7bce7e109
commit fec3ddabb1
10 changed files with 218 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -130,20 +130,26 @@ int SVertex___init__(BPy_SVertex *self, PyObject *args, PyObject *kwds)
{
PyObject *py_point = 0;
BPy_Id *py_id = 0;
if (! PyArg_ParseTuple(args, "|OO", &py_point, &py_id) )
if (! PyArg_ParseTuple(args, "|OO!", &py_point, &Id_Type, &py_id) )
return -1;
if( py_point && py_id && PyList_Check(py_point) && PyList_Size(py_point) == 3 ) {
Vec3r v( PyFloat_AsDouble( PyList_GetItem(py_point, 0) ),
PyFloat_AsDouble( PyList_GetItem(py_point, 1) ),
PyFloat_AsDouble( PyList_GetItem(py_point, 2) ) );
self->sv = new SVertex( v, *(py_id->id) );
} else {
if( py_point && py_id ) {
Vec3r *v = Vec3r_ptr_from_PyObject(py_point);
if( !v ) {
PyErr_SetString(PyExc_TypeError, "argument 1 must be a 3D vector (either a list of 3 elements or Vector)");
return -1;
}
self->sv = new SVertex( *v, *(py_id->id) );
delete v;
} else if( !py_point && !py_id ) {
self->sv = new SVertex();
} else {
PyErr_SetString(PyExc_TypeError, "invalid argument(s)");
return -1;
}
self->py_if0D.if0D = self->sv;
return 0;
@@ -193,19 +199,15 @@ PyObject * SVertex_viewvertex( BPy_SVertex *self ) {
PyObject *SVertex_setPoint3D( BPy_SVertex *self , PyObject *args) {
PyObject *py_point;
if(!( PyArg_ParseTuple(args, "O!", &PyList_Type, &py_point) ))
if(!( PyArg_ParseTuple(args, "O", &py_point) ))
return NULL;
if( PyList_Size(py_point) != 3 ) {
stringstream msg("SVertex::setPoint3D() accepts a list of 3 elements (");
msg << PyList_Size(py_point) << " found)";
PyErr_SetString(PyExc_TypeError, msg.str().c_str());
Vec3r *v = Vec3r_ptr_from_PyObject(py_point);
if( !v ) {
PyErr_SetString(PyExc_TypeError, "argument 1 must be a 3D vector (either a list of 3 elements or Vector)");
return NULL;
}
Vec3r v( PyFloat_AsDouble( PyList_GetItem(py_point, 0) ),
PyFloat_AsDouble( PyList_GetItem(py_point, 1) ),
PyFloat_AsDouble( PyList_GetItem(py_point, 2) ) );
self->sv->setPoint3D( v );
self->sv->setPoint3D( *v );
delete v;
Py_RETURN_NONE;
}
@@ -213,19 +215,15 @@ PyObject *SVertex_setPoint3D( BPy_SVertex *self , PyObject *args) {
PyObject *SVertex_setPoint2D( BPy_SVertex *self , PyObject *args) {
PyObject *py_point;
if(!( PyArg_ParseTuple(args, "O!", &PyList_Type, &py_point) ))
if(!( PyArg_ParseTuple(args, "O", &py_point) ))
return NULL;
if( PyList_Size(py_point) != 3 ) {
stringstream msg("SVertex::setPoint2D() accepts a list of 3 elements (");
msg << PyList_Size(py_point) << " found)";
PyErr_SetString(PyExc_TypeError, msg.str().c_str());
Vec3r *v = Vec3r_ptr_from_PyObject(py_point);
if( !v ) {
PyErr_SetString(PyExc_TypeError, "argument 1 must be a 3D vector (either a list of 3 elements or Vector)");
return NULL;
}
Vec3r v( PyFloat_AsDouble( PyList_GetItem(py_point, 0) ),
PyFloat_AsDouble( PyList_GetItem(py_point, 1) ),
PyFloat_AsDouble( PyList_GetItem(py_point, 2) ) );
self->sv->setPoint2D( v );
self->sv->setPoint2D( *v );
delete v;
Py_RETURN_NONE;
}
@@ -233,19 +231,15 @@ PyObject *SVertex_setPoint2D( BPy_SVertex *self , PyObject *args) {
PyObject *SVertex_AddNormal( BPy_SVertex *self , PyObject *args) {
PyObject *py_normal;
if(!( PyArg_ParseTuple(args, "O!", &PyList_Type, &py_normal) ))
if(!( PyArg_ParseTuple(args, "O", &py_normal) ))
return NULL;
if( PyList_Size(py_normal) != 3 ) {
stringstream msg("SVertex::AddNormal() accepts a list of 3 elements (");
msg << PyList_Size(py_normal) << " found)";
PyErr_SetString(PyExc_TypeError, msg.str().c_str());
Vec3r *n = Vec3r_ptr_from_PyObject(py_normal);
if( !n ) {
PyErr_SetString(PyExc_TypeError, "argument 1 must be a 3D vector (either a list of 3 elements or Vector)");
return NULL;
}
Vec3r n( PyFloat_AsDouble( PyList_GetItem(py_normal, 0) ),
PyFloat_AsDouble( PyList_GetItem(py_normal, 1) ),
PyFloat_AsDouble( PyList_GetItem(py_normal, 2) ) );
self->sv->AddNormal( n );
self->sv->AddNormal( *n );
delete n;
Py_RETURN_NONE;
}