sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

3rd attempt to commit, metaball fixes and small vector optimization

Browse Source
This commit is contained in:
Campbell Barton 2006-09-30 14:14:49 +00:00
parent 8e7b403924
commit 32b1e2383b
11 changed files with 53 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/python/api2_2x/BGL.c
View File

@ -246,7 +246,7 @@ static PyObject *Buffer_item(PyObject *self, int i)
case GL_BYTE: return Py_BuildValue("b", buf->buf.asbyte[i]); case GL_BYTE: return Py_BuildValue("b", buf->buf.asbyte[i]);
case GL_SHORT: return Py_BuildValue("h", buf->buf.asshort[i]); case GL_SHORT: return Py_BuildValue("h", buf->buf.asshort[i]);
case GL_INT: return Py_BuildValue("i", buf->buf.asint[i]); case GL_INT: return Py_BuildValue("i", buf->buf.asint[i]);
case GL_FLOAT: return Py_BuildValue("f", buf->buf.asfloat[i]); case GL_FLOAT: return PyFloat_FromDouble(buf->buf.asfloat[i]);
case GL_DOUBLE: return Py_BuildValue("d", buf->buf.asdouble[i]); case GL_DOUBLE: return Py_BuildValue("d", buf->buf.asdouble[i]);
} }
} else { } else {

2
source/blender/python/api2_2x/Bone.c
View File

@ -1122,7 +1122,7 @@ static int Bone_setMatrix(BPy_Bone *self, PyObject *value, void *closure)
//------------------------Bone.length (get) //------------------------Bone.length (get)
static PyObject *Bone_getLength(BPy_Bone *self, void *closure) static PyObject *Bone_getLength(BPy_Bone *self, void *closure)
{ {
return Py_BuildValue("f", self->bone->length); return PyFloat_FromDouble(self->bone->length);
} }
//------------------------Bone.length (set) //------------------------Bone.length (set)
static int Bone_setLength(BPy_Bone *self, PyObject *value, void *closure) static int Bone_setLength(BPy_Bone *self, PyObject *value, void *closure)

8
source/blender/python/api2_2x/Draw.c
View File

@ -384,11 +384,11 @@ static PyObject *Button_getattr( PyObject * self, char *name )
if( strcmp( name, "val" ) == 0 ) { if( strcmp( name, "val" ) == 0 ) {
if( but->type == BINT_TYPE ) if( but->type == BINT_TYPE )
return Py_BuildValue( "i", but->val.asint ); return PyInt_FromLong( but->val.asint );
else if( but->type == BFLOAT_TYPE ) else if( but->type == BFLOAT_TYPE )
return Py_BuildValue( "f", but->val.asfloat ); return PyFloat_FromDouble( but->val.asfloat );
else if( but->type == BSTRING_TYPE ) else if( but->type == BSTRING_TYPE )
return Py_BuildValue( "s", but->val.asstr ); return PyString_FromString( but->val.asstr );
else if( but->type == BVECTOR_TYPE ) else if( but->type == BVECTOR_TYPE )
return Py_BuildValue( "fff", but->val.asvec[0], but->val.asvec[1], but->val.asvec[2] ); return Py_BuildValue( "fff", but->val.asvec[0], but->val.asvec[1], but->val.asvec[2] );
} }
@ -1391,7 +1391,7 @@ static PyObject *Method_PupStrInput( PyObject * self, PyObject * args )
return Py_None; return Py_None;
} }
ret = Py_BuildValue( "s", tmp ); ret = PyString_FromString( tmp );
if( ret ) if( ret )
return ret; return ret;

32
source/blender/python/api2_2x/Lattice.c
View File

@ -592,7 +592,7 @@ static PyObject *Lattice_getMode( BPy_Lattice * self )
return EXPP_ReturnPyObjError( PyExc_TypeError, return EXPP_ReturnPyObjError( PyExc_TypeError,
"bad mode type..." ); "bad mode type..." );
return Py_BuildValue( "s", type ); return PyString_FromString( type );
} }
static PyObject *Lattice_setPoint( BPy_Lattice * self, PyObject * args ) static PyObject *Lattice_setPoint( BPy_Lattice * self, PyObject * args )
@ -822,51 +822,51 @@ static PyObject *Lattice_getAttr( BPy_Lattice * self, char *name )
if( strcmp( name, "name" ) == 0 ) if( strcmp( name, "name" ) == 0 )
attr = PyString_FromString( self->Lattice->id.name + 2 ); attr = PyString_FromString( self->Lattice->id.name + 2 );
else if( strcmp( name, "width" ) == 0 ) else if( strcmp( name, "width" ) == 0 )
attr = Py_BuildValue( "i", self->Lattice->pntsu ); attr = PyInt_FromLong( self->Lattice->pntsu );
else if( strcmp( name, "height" ) == 0 ) else if( strcmp( name, "height" ) == 0 )
attr = Py_BuildValue( "i", self->Lattice->pntsv ); attr = PyInt_FromLong( self->Lattice->pntsv );
else if( strcmp( name, "depth" ) == 0 ) else if( strcmp( name, "depth" ) == 0 )
attr = Py_BuildValue( "i", self->Lattice->pntsw ); attr = PyInt_FromLong( self->Lattice->pntsw );
else if( strcmp( name, "widthType" ) == 0 ) { else if( strcmp( name, "widthType" ) == 0 ) {
if( self->Lattice->typeu == 0 ) if( self->Lattice->typeu == 0 )
attr = Py_BuildValue( "s", "Linear" ); attr = PyString_FromString( "Linear" );
else if( self->Lattice->typeu == 1 ) else if( self->Lattice->typeu == 1 )
attr = Py_BuildValue( "s", "Cardinal" ); attr = PyString_FromString( "Cardinal" );
else if( self->Lattice->typeu == 2 ) else if( self->Lattice->typeu == 2 )
attr = Py_BuildValue( "s", "Bspline" ); attr = PyString_FromString( "Bspline" );
else else
return EXPP_ReturnPyObjError( PyExc_ValueError, return EXPP_ReturnPyObjError( PyExc_ValueError,
"bad widthType..." ); "bad widthType..." );
} else if( strcmp( name, "heightType" ) == 0 ) { } else if( strcmp( name, "heightType" ) == 0 ) {
if( self->Lattice->typev == 0 ) if( self->Lattice->typev == 0 )
attr = Py_BuildValue( "s", "Linear" ); attr = PyString_FromString( "Linear" );
else if( self->Lattice->typev == 1 ) else if( self->Lattice->typev == 1 )
attr = Py_BuildValue( "s", "Cardinal" ); attr = PyString_FromString( "Cardinal" );
else if( self->Lattice->typev == 2 ) else if( self->Lattice->typev == 2 )
attr = Py_BuildValue( "s", "Bspline" ); attr = PyString_FromString( "Bspline" );
else else
return EXPP_ReturnPyObjError( PyExc_ValueError, return EXPP_ReturnPyObjError( PyExc_ValueError,
"bad widthType..." ); "bad widthType..." );
} else if( strcmp( name, "depthType" ) == 0 ) { } else if( strcmp( name, "depthType" ) == 0 ) {
if( self->Lattice->typew == 0 ) if( self->Lattice->typew == 0 )
attr = Py_BuildValue( "s", "Linear" ); attr = PyString_FromString( "Linear" );
else if( self->Lattice->typew == 1 ) else if( self->Lattice->typew == 1 )
attr = Py_BuildValue( "s", "Cardinal" ); attr = PyString_FromString( "Cardinal" );
else if( self->Lattice->typew == 2 ) else if( self->Lattice->typew == 2 )
attr = Py_BuildValue( "s", "Bspline" ); attr = PyString_FromString( "Bspline" );
else else
return EXPP_ReturnPyObjError( PyExc_ValueError, return EXPP_ReturnPyObjError( PyExc_ValueError,
"bad widthType..." ); "bad widthType..." );
} else if( strcmp( name, "mode" ) == 0 ) { } else if( strcmp( name, "mode" ) == 0 ) {
if( self->Lattice->flag == 1 ) if( self->Lattice->flag == 1 )
attr = Py_BuildValue( "s", "Grid" ); attr = PyString_FromString( "Grid" );
else if( self->Lattice->flag == 3 ) else if( self->Lattice->flag == 3 )
attr = Py_BuildValue( "s", "Outside" ); attr = PyString_FromString( "Outside" );
else else
return EXPP_ReturnPyObjError( PyExc_ValueError, return EXPP_ReturnPyObjError( PyExc_ValueError,
"bad mode..." ); "bad mode..." );
} else if( strcmp( name, "latSize" ) == 0 ) { } else if( strcmp( name, "latSize" ) == 0 ) {
attr = Py_BuildValue( "i", self->Lattice->pntsu * attr = PyInt_FromLong( self->Lattice->pntsu *
self->Lattice->pntsv * self->Lattice->pntsv *
self->Lattice->pntsw ); self->Lattice->pntsw );
} else if( strcmp( name, "users" ) == 0 ) { } else if( strcmp( name, "users" ) == 0 ) {

19
source/blender/python/api2_2x/Metaball.c
View File

@ -37,6 +37,7 @@
#include "BKE_mball.h" #include "BKE_mball.h"
#include "BKE_library.h" #include "BKE_library.h"
#include "BLI_blenlib.h" #include "BLI_blenlib.h"
#include "BLI_arithb.h" /* for quat normal */
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "Mathutils.h" #include "Mathutils.h"
#include "Material.h" #include "Material.h"
@ -727,6 +728,21 @@ static PyObject *Metaball_copy( BPy_Metaball * self )
} }
/* These are needed by Object.c */
PyObject *Metaball_CreatePyObject( MetaBall * mball)
{
BPy_Metaball *py_mball= PyObject_NEW( BPy_Metaball, &Metaball_Type );
if( !py_mball )
return EXPP_ReturnPyObjError( PyExc_MemoryError,
"couldn't create BPy_Metaball object" );
py_mball->metaball= mball;
return ( PyObject * ) py_mball;
}
static PyObject *MetaElemSeq_CreatePyObject(BPy_Metaball *self, MetaElem *iter) static PyObject *MetaElemSeq_CreatePyObject(BPy_Metaball *self, MetaElem *iter)
{ {
BPy_MetaElemSeq *seq = PyObject_NEW( BPy_MetaElemSeq, &MetaElemSeq_Type); BPy_MetaElemSeq *seq = PyObject_NEW( BPy_MetaElemSeq, &MetaElemSeq_Type);
@ -877,6 +893,9 @@ static int Metaelem_setQuat( BPy_Metaelem * self, QuaternionObject * value )
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
self->metaelem->quat[i]= value->quat[i]; self->metaelem->quat[i]= value->quat[i];
/* need to normalize or metaball drawing can go into an infinate loop */
NormalQuat(self->metaelem->quat);
return 0; return 0;
} }

2
source/blender/python/api2_2x/Metaball.h
View File

@ -75,7 +75,7 @@ typedef struct {
*/ */
PyObject *Metaball_Init( void ); PyObject *Metaball_Init( void );
PyObject *Metaball_CreatePyObject( MetaBall * metaball ); PyObject *Metaball_CreatePyObject( MetaBall * mball );
MetaBall *Metaball_FromPyObject( PyObject * py_obj ); MetaBall *Metaball_FromPyObject( PyObject * py_obj );
int Metaball_CheckPyObject( PyObject * py_obj ); int Metaball_CheckPyObject( PyObject * py_obj );

3
source/blender/python/api2_2x/Object.c
View File

@ -4409,6 +4409,9 @@ static PyObject *get_obj_data( BPy_Object *self, int mesh )
else /* else get as Mesh */ else /* else get as Mesh */
data_object = Mesh_CreatePyObject( object->data, object ); data_object = Mesh_CreatePyObject( object->data, object );
break; break;
case OB_MBALL:
data_object = Metaball_CreatePyObject( object->data );
break;
case ID_OB: case ID_OB:
data_object = Object_CreatePyObject( object->data ); data_object = Object_CreatePyObject( object->data );
break; break;

2
source/blender/python/api2_2x/euler.c
View File

@ -315,7 +315,7 @@ static PyObject *Euler_item(EulerObject * self, int i)
return EXPP_ReturnPyObjError(PyExc_IndexError, return EXPP_ReturnPyObjError(PyExc_IndexError,
"euler[attribute]: array index out of range\n"); "euler[attribute]: array index out of range\n");
return Py_BuildValue("f", self->eul[i]); return PyFloat_FromDouble(self->eul[i]);
} }
//----------------------------object[]------------------------- //----------------------------object[]-------------------------

10
source/blender/python/api2_2x/logic.c
View File

@ -542,15 +542,15 @@ static PyObject *Property_getType( BPy_Property * self )
type = self->type; type = self->type;
if( type == PROP_BOOL ) if( type == PROP_BOOL )
attr = Py_BuildValue( "s", "BOOL" ); attr = PyString_FromString( "BOOL" );
else if( type == PROP_INT ) else if( type == PROP_INT )
attr = Py_BuildValue( "s", "INT" ); attr = PyString_FromString( "INT" );
else if( type == PROP_FLOAT ) else if( type == PROP_FLOAT )
attr = Py_BuildValue( "s", "FLOAT" ); attr = PyString_FromString( "FLOAT" );
else if( type == PROP_STRING ) else if( type == PROP_STRING )
attr = Py_BuildValue( "s", "STRING" ); attr = PyString_FromString( "STRING" );
else if( type == PROP_TIME ) else if( type == PROP_TIME )
attr = Py_BuildValue( "s", "TIME" ); attr = PyString_FromString( "TIME" );
return attr; return attr;
} }

3
source/blender/python/api2_2x/quat.c
View File

@ -318,8 +318,7 @@ static PyObject *Quaternion_item(QuaternionObject * self, int i)
if(i < 0 || i >= 4) if(i < 0 || i >= 4)
return EXPP_ReturnPyObjError(PyExc_IndexError, return EXPP_ReturnPyObjError(PyExc_IndexError,
"quaternion[attribute]: array index out of range\n"); "quaternion[attribute]: array index out of range\n");
return PyFloat_FromDouble(self->quat[i]);
return Py_BuildValue("f", self->quat[i]);
} }
//----------------------------object[]------------------------- //----------------------------object[]-------------------------

2
source/blender/python/api2_2x/vector.c
View File

@ -418,7 +418,7 @@ static PyObject *Vector_item(VectorObject * self, int i)
return EXPP_ReturnPyObjError(PyExc_IndexError, return EXPP_ReturnPyObjError(PyExc_IndexError,
"vector[index]: out of range\n"); "vector[index]: out of range\n");
return Py_BuildValue("f", self->vec[i]); return PyFloat_FromDouble(self->vec[i]);
} }
/*----------------------------object[]------------------------- /*----------------------------object[]-------------------------