diff options
author | Willian Padovani Germano <wpgermano@gmail.com> | 2003-06-24 11:21:17 +0400 |
---|---|---|
committer | Willian Padovani Germano <wpgermano@gmail.com> | 2003-06-24 11:21:17 +0400 |
commit | 06ee04fb05ff58e6e0a781b64100825ba7358f19 (patch) | |
tree | c90b1415ebb106090c6f94b4ee782146245bc67d /source/blender/python/api2_2x/Material.c | |
parent | a0ea4df1ba0367657ba4e093ca0d1288d6258ba4 (diff) |
* Added more doc files for epydoc and a test for the camera module.
* Moved public declarations in camera and lamp to a new file: bpy_types.h.
* Fixed minor bugs in material, rgbTuple and Lamp + other minor changes.
* Made part of the changes to conform to decided naming conventions.
Diffstat (limited to 'source/blender/python/api2_2x/Material.c')
-rw-r--r-- | source/blender/python/api2_2x/Material.c | 642 |
1 files changed, 303 insertions, 339 deletions
diff --git a/source/blender/python/api2_2x/Material.c b/source/blender/python/api2_2x/Material.c index 456dc2c9b69..9d9a2cfe25c 100644 --- a/source/blender/python/api2_2x/Material.c +++ b/source/blender/python/api2_2x/Material.c @@ -42,7 +42,7 @@ #include "Material.h" /*****************************************************************************/ -/* Python C_Material defaults: */ +/* Python BPy_Material defaults: */ /*****************************************************************************/ #define EXPP_MAT_MODE_TRACEABLE MA_TRACEBLE #define EXPP_MAT_MODE_SHADOW MA_SHADOW @@ -73,16 +73,14 @@ #define EXPP_MAT_ALPHA_MAX 1.0 #define EXPP_MAT_AMB_MIN 0.0 #define EXPP_MAT_AMB_MAX 1.0 -#define EXPP_MAT_ANG_MIN 0.0 /* XXX Confirm these two */ -#define EXPP_MAT_ANG_MAX 1.0 #define EXPP_MAT_COL_MIN 0.0 /* min/max for all ... */ #define EXPP_MAT_COL_MAX 1.0 /* ... color triplets */ #define EXPP_MAT_EMIT_MIN 0.0 #define EXPP_MAT_EMIT_MAX 1.0 #define EXPP_MAT_REF_MIN 0.0 #define EXPP_MAT_REF_MAX 1.0 -#define EXPP_MAT_SPEC_MIN 0.0 -#define EXPP_MAT_SPEC_MAX 2.0 +#define EXPP_MAT_SPEBPy_MIN 0.0 +#define EXPP_MAT_SPEBPy_MAX 2.0 #define EXPP_MAT_SPECTRA_MIN 0.0 #define EXPP_MAT_SPECTRA_MAX 1.0 #define EXPP_MAT_ZOFFS_MIN 0.0 @@ -149,7 +147,7 @@ static PyObject *M_Material_New(PyObject *self, PyObject *args, PyObject *keywor { char *name = "Mat"; static char *kwlist[] = {"name", NULL}; - C_Material *pymat; /* for Material Data object wrapper in Python */ + BPy_Material *pymat; /* for Material Data object wrapper in Python */ Material *blmat; /* for actual Material Data we create in Blender */ char buf[21]; @@ -163,7 +161,7 @@ static PyObject *M_Material_New(PyObject *self, PyObject *args, PyObject *keywor blmat = add_material(name); /* first create the Material Data in Blender */ if (blmat) /* now create the wrapper obj in Python */ - pymat = (C_Material *)Material_CreatePyObject (blmat); + pymat = (BPy_Material *)Material_CreatePyObject (blmat); else return (EXPP_ReturnPyObjError (PyExc_RuntimeError, "couldn't create Material Data in Blender")); @@ -180,7 +178,7 @@ static PyObject *M_Material_New(PyObject *self, PyObject *args, PyObject *keywor /* Python equivalent: Blender.Material.Get */ /* Description: Receives a string and returns the material whose */ /* name matches the string. If no argument is */ -/* passed in, a list of all materials in the */ +/* passed in, a list with all materials in the */ /* current scene is returned. */ /*****************************************************************************/ static PyObject *M_Material_Get(PyObject *self, PyObject *args) @@ -188,20 +186,20 @@ static PyObject *M_Material_Get(PyObject *self, PyObject *args) char *name = NULL; Material *mat_iter; - if (!PyArg_ParseTuple(args, "|s", &name)) + if (!PyArg_ParseTuple(args, "|s", &name)) return (EXPP_ReturnPyObjError (PyExc_TypeError, "expected string argument (or nothing)")); mat_iter = G.main->mat.first; - if (name) { /* (name) - Search material by name */ + if (name) { /* (name) - Search material by name */ - C_Material *wanted_mat = NULL; + BPy_Material *wanted_mat = NULL; while ((mat_iter) && (wanted_mat == NULL)) { if (strcmp (name, mat_iter->id.name+2) == 0) - wanted_mat = (C_Material *)Material_CreatePyObject (mat_iter); + wanted_mat = (BPy_Material *)Material_CreatePyObject (mat_iter); mat_iter = mat_iter->id.next; } @@ -214,39 +212,39 @@ static PyObject *M_Material_Get(PyObject *self, PyObject *args) } return (PyObject *)wanted_mat; - } + } - else { /* () - return a list of all materials in the scene */ + else { /* () - return a list with all materials in the scene */ int index = 0; - PyObject *matlist, *pystr; + PyObject *matlist, *pyobj; matlist = PyList_New (BLI_countlist (&(G.main->mat))); - if (matlist == NULL) + if (!matlist) return (PythonReturnErrorObject (PyExc_MemoryError, "couldn't create PyList")); - while (mat_iter) { - pystr = PyString_FromString (mat_iter->id.name+2); + while (mat_iter) { + pyobj = Material_CreatePyObject (mat_iter); - if (!pystr) - return (PythonReturnErrorObject (PyExc_MemoryError, - "couldn't create PyString")); + if (!pyobj) + return (PythonReturnErrorObject (PyExc_MemoryError, + "couldn't create PyObject")); - PyList_SET_ITEM (matlist, index, pystr); + PyList_SET_ITEM (matlist, index, pyobj); mat_iter = mat_iter->id.next; index++; - } + } - return (matlist); - } + return matlist; + } } /*****************************************************************************/ -/* Function: M_Material_Init */ +/* Function: Material_Init */ /*****************************************************************************/ -PyObject *M_Material_Init (void) +PyObject *Material_Init (void) { PyObject *submodule; @@ -263,65 +261,63 @@ PyObject *M_Material_Init (void) /***************************/ /*****************************************************************************/ -/* Python C_Material methods declarations: */ +/* Python BPy_Material methods declarations: */ /*****************************************************************************/ -static PyObject *Material_getName(C_Material *self); -static PyObject *Material_getMode(C_Material *self); -static PyObject *Material_getRGBCol(C_Material *self); -static PyObject *Material_getAmbCol(C_Material *self); -static PyObject *Material_getSpecCol(C_Material *self); -static PyObject *Material_getMirCol(C_Material *self); -static PyObject *Material_getAmb(C_Material *self); -static PyObject *Material_getAng(C_Material *self); -static PyObject *Material_getEmit(C_Material *self); -static PyObject *Material_getAlpha(C_Material *self); -static PyObject *Material_getRef(C_Material *self); -static PyObject *Material_getSpec(C_Material *self); -static PyObject *Material_getSpecTransp(C_Material *self); -static PyObject *Material_getAdd(C_Material *self); -static PyObject *Material_getZOffset(C_Material *self); -static PyObject *Material_getHaloSize(C_Material *self); -static PyObject *Material_getFlareSize(C_Material *self); -static PyObject *Material_getFlareBoost(C_Material *self); -static PyObject *Material_getSubSize(C_Material *self); -static PyObject *Material_getHardness(C_Material *self); -static PyObject *Material_getNFlares(C_Material *self); -static PyObject *Material_getNStars(C_Material *self); -static PyObject *Material_getNLines(C_Material *self); -static PyObject *Material_getNRings(C_Material *self); -static PyObject *Material_setName(C_Material *self, PyObject *args); -static PyObject *Material_setMode(C_Material *self, PyObject *args); -static PyObject *Material_setIntMode(C_Material *self, PyObject *args); -static PyObject *Material_setRGBCol(C_Material *self, PyObject *args); -static PyObject *Material_setAmbCol(C_Material *self, PyObject *args); -static PyObject *Material_setSpecCol(C_Material *self, PyObject *args); -static PyObject *Material_setMirCol(C_Material *self, PyObject *args); -static PyObject *Material_setAmb(C_Material *self, PyObject *args); -static PyObject *Material_setEmit(C_Material *self, PyObject *args); -static PyObject *Material_setAng(C_Material *self, PyObject *args); -static PyObject *Material_setAlpha(C_Material *self, PyObject *args); -static PyObject *Material_setRef(C_Material *self, PyObject *args); -static PyObject *Material_setSpec(C_Material *self, PyObject *args); -static PyObject *Material_setSpecTransp(C_Material *self, PyObject *args); -static PyObject *Material_setAdd(C_Material *self, PyObject *args); -static PyObject *Material_setZOffset(C_Material *self, PyObject *args); -static PyObject *Material_setHaloSize(C_Material *self, PyObject *args); -static PyObject *Material_setFlareSize(C_Material *self, PyObject *args); -static PyObject *Material_setFlareBoost(C_Material *self, PyObject *args); -static PyObject *Material_setSubSize(C_Material *self, PyObject *args); -static PyObject *Material_setHardness(C_Material *self, PyObject *args); -static PyObject *Material_setNFlares(C_Material *self, PyObject *args); -static PyObject *Material_setNStars(C_Material *self, PyObject *args); -static PyObject *Material_setNLines(C_Material *self, PyObject *args); -static PyObject *Material_setNRings(C_Material *self, PyObject *args); - -static PyObject *Material_setColorComponent(C_Material *self, char *key, - PyObject *args); +static PyObject *Material_getName(BPy_Material *self); +static PyObject *Material_getMode(BPy_Material *self); +static PyObject *Material_getRGBCol(BPy_Material *self); +static PyObject *Material_getAmbCol(BPy_Material *self); +static PyObject *Material_getSpecCol(BPy_Material *self); +static PyObject *Material_getMirCol(BPy_Material *self); +static PyObject *Material_getAmb(BPy_Material *self); +static PyObject *Material_getEmit(BPy_Material *self); +static PyObject *Material_getAlpha(BPy_Material *self); +static PyObject *Material_getRef(BPy_Material *self); +static PyObject *Material_getSpec(BPy_Material *self); +static PyObject *Material_getSpecTransp(BPy_Material *self); +static PyObject *Material_getAdd(BPy_Material *self); +static PyObject *Material_getZOffset(BPy_Material *self); +static PyObject *Material_getHaloSize(BPy_Material *self); +static PyObject *Material_getFlareSize(BPy_Material *self); +static PyObject *Material_getFlareBoost(BPy_Material *self); +static PyObject *Material_getSubSize(BPy_Material *self); +static PyObject *Material_getHardness(BPy_Material *self); +static PyObject *Material_getNFlares(BPy_Material *self); +static PyObject *Material_getNStars(BPy_Material *self); +static PyObject *Material_getNLines(BPy_Material *self); +static PyObject *Material_getNRings(BPy_Material *self); +static PyObject *Material_setName(BPy_Material *self, PyObject *args); +static PyObject *Material_setMode(BPy_Material *self, PyObject *args); +static PyObject *Material_setIntMode(BPy_Material *self, PyObject *args); +static PyObject *Material_setRGBCol(BPy_Material *self, PyObject *args); +static PyObject *Material_setAmbCol(BPy_Material *self, PyObject *args); +static PyObject *Material_setSpecCol(BPy_Material *self, PyObject *args); +static PyObject *Material_setMirCol(BPy_Material *self, PyObject *args); +static PyObject *Material_setAmb(BPy_Material *self, PyObject *args); +static PyObject *Material_setEmit(BPy_Material *self, PyObject *args); +static PyObject *Material_setAlpha(BPy_Material *self, PyObject *args); +static PyObject *Material_setRef(BPy_Material *self, PyObject *args); +static PyObject *Material_setSpec(BPy_Material *self, PyObject *args); +static PyObject *Material_setSpecTransp(BPy_Material *self, PyObject *args); +static PyObject *Material_setAdd(BPy_Material *self, PyObject *args); +static PyObject *Material_setZOffset(BPy_Material *self, PyObject *args); +static PyObject *Material_setHaloSize(BPy_Material *self, PyObject *args); +static PyObject *Material_setFlareSize(BPy_Material *self, PyObject *args); +static PyObject *Material_setFlareBoost(BPy_Material *self, PyObject *args); +static PyObject *Material_setSubSize(BPy_Material *self, PyObject *args); +static PyObject *Material_setHardness(BPy_Material *self, PyObject *args); +static PyObject *Material_setNFlares(BPy_Material *self, PyObject *args); +static PyObject *Material_setNStars(BPy_Material *self, PyObject *args); +static PyObject *Material_setNLines(BPy_Material *self, PyObject *args); +static PyObject *Material_setNRings(BPy_Material *self, PyObject *args); + +static PyObject *Material_setColorComponent(BPy_Material *self, char *key, + PyObject *args); /*****************************************************************************/ -/* Python C_Material methods table: */ +/* Python BPy_Material methods table: */ /*****************************************************************************/ -static PyMethodDef C_Material_methods[] = { +static PyMethodDef BPy_Material_methods[] = { /* name, method, flags, doc */ {"getName", (PyCFunction)Material_getName, METH_NOARGS, "() - Return Material Data name"}, @@ -337,8 +333,6 @@ static PyMethodDef C_Material_methods[] = { "() - Return Material's mirror color"}, {"getAmb", (PyCFunction)Material_getAmb, METH_NOARGS, "() - Return Material's ambient color blend factor"}, - {"getAng", (PyCFunction)Material_getAng, METH_NOARGS, - "() - Return Material's ????"}, {"getEmit", (PyCFunction)Material_getEmit, METH_NOARGS, "() - Return Material's emitting light intensity"}, {"getAlpha", (PyCFunction)Material_getAlpha, METH_NOARGS, @@ -375,19 +369,17 @@ static PyMethodDef C_Material_methods[] = { "(s) - Change Material Data name"}, {"setMode", (PyCFunction)Material_setMode, METH_VARARGS, "([s[,s]]) - Set Material mode flag(s)"}, - {"setRGBCol", (PyCFunction)Material_setMode, METH_VARARGS, + {"setRGBCol", (PyCFunction)Material_setRGBCol, METH_VARARGS, "([s[,s]]) - Set Material's rgb color triplet"}, - {"setAmbCol", (PyCFunction)Material_setMode, METH_VARARGS, + {"setAmbCol", (PyCFunction)Material_setAmbCol, METH_VARARGS, "([s[,s]]) - Set Material's ambient color"}, - {"setSpecCol", (PyCFunction)Material_setMode, METH_VARARGS, + {"setSpecCol", (PyCFunction)Material_setSpecCol, METH_VARARGS, "([s[,s]]) - Set Material's specular color"}, - {"setMirCol", (PyCFunction)Material_setMode, METH_VARARGS, + {"setMirCol", (PyCFunction)Material_setMirCol, METH_VARARGS, "([s[,s]]) - Set Material's mirror color"}, {"setAmb", (PyCFunction)Material_setAmb, METH_VARARGS, "(f) - Set how much the Material's color is affected" - " by \nthe global ambient colors - [0.0, 1.0]"}, - {"setAng", (PyCFunction)Material_setAng, METH_VARARGS, - "(f) - Set Material's ?????"}, + " by \nthe global ambient colors - [0.0, 1.0]"}, {"setEmit", (PyCFunction)Material_setEmit, METH_VARARGS, "(f) - Set Material's emitting light intensity - [0.0, 1.0]"}, {"setAlpha", (PyCFunction)Material_setAlpha, METH_VARARGS, @@ -410,14 +402,14 @@ static PyMethodDef C_Material_methods[] = { "(f) - Set Material's flare boost - [0.1, 10.0]"}, {"setSubSize", (PyCFunction)Material_setSubSize, METH_VARARGS, "(f) - Set Material's dimension of subflare," - " dots and circles - [0.1, 25.0]"}, - {"setHardness", (PyCFunction)Material_setFlareBoost, METH_VARARGS, + " dots and circles - [0.1, 25.0]"}, + {"setHardness", (PyCFunction)Material_setHardness, METH_VARARGS, "(f) - Set Material's hardness - [1, 255 (127 if halo mode is ON)]"}, - {"setNFlares", (PyCFunction)Material_setFlareBoost, METH_VARARGS, + {"setNFlares", (PyCFunction)Material_setNFlares, METH_VARARGS, "(f) - Set Material's number of flares in halo - [1, 32]"}, - {"setNStars", (PyCFunction)Material_setFlareBoost, METH_VARARGS, + {"setNStars", (PyCFunction)Material_setNStars, METH_VARARGS, "(f) - Set Material's number of stars in halo - [3, 50]"}, - {"setNLines", (PyCFunction)Material_setFlareBoost, METH_VARARGS, + {"setNLines", (PyCFunction)Material_setNLines, METH_VARARGS, "(f) - Set Material's number of lines in halo - [0, 250]"}, {"setNRings", (PyCFunction)Material_setNRings, METH_VARARGS, "(f) - Set Material's number of rings in halo - [0, 24]"}, @@ -427,11 +419,11 @@ static PyMethodDef C_Material_methods[] = { /*****************************************************************************/ /* Python Material_Type callback function prototypes: */ /*****************************************************************************/ -static void Material_Dealloc (C_Material *self); -static int Material_Print (C_Material *self, FILE *fp, int flags); -static int Material_SetAttr (C_Material *self, char *name, PyObject *v); -static PyObject *Material_GetAttr (C_Material *self, char *name); -static PyObject *Material_Repr (C_Material *self); +static void Material_Dealloc (BPy_Material *self); +static int Material_Print (BPy_Material *self, FILE *fp, int flags); +static int Material_SetAttr (BPy_Material *self, char *name, PyObject *v); +static PyObject *Material_GetAttr (BPy_Material *self, char *name); +static PyObject *Material_Repr (BPy_Material *self); /*****************************************************************************/ /* Python Material_Type structure definition: */ @@ -440,8 +432,8 @@ PyTypeObject Material_Type = { PyObject_HEAD_INIT(NULL) 0, /* ob_size */ - "Material", /* tp_name */ - sizeof (C_Material), /* tp_basicsize */ + "Blender Material", /* tp_name */ + sizeof (BPy_Material), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ (destructor)Material_Dealloc, /* tp_dealloc */ @@ -457,64 +449,64 @@ PyTypeObject Material_Type = 0,0,0,0,0,0, 0, /* tp_doc */ 0,0,0,0,0,0, - C_Material_methods, /* tp_methods */ + BPy_Material_methods, /* tp_methods */ 0, /* tp_members */ }; /*****************************************************************************/ /* Function: Material_Dealloc */ -/* Description: This is a callback function for the C_Material type. It is */ +/* Description: This is a callback function for the BPy_Material type. It is */ /* the destructor function. */ /*****************************************************************************/ -static void Material_Dealloc (C_Material *self) +static void Material_Dealloc (BPy_Material *self) { - Py_DECREF (self->rgb); - Py_DECREF (self->amb); - Py_DECREF (self->spec); - Py_DECREF (self->mir); + Py_DECREF (self->col); + Py_DECREF (self->amb); + Py_DECREF (self->spec); + Py_DECREF (self->mir); PyObject_DEL (self); } /*****************************************************************************/ /* Function: Material_CreatePyObject */ -/* Description: This function will create a new C_Material from an existing */ +/* Description: This function will create a new BPy_Material from an existing*/ /* Blender material structure. */ /*****************************************************************************/ PyObject *Material_CreatePyObject (Material *mat) { - C_Material *pymat; - float *rgb[3], *amb[3], *spec[3], *mir[3]; + BPy_Material *pymat; + float *col[3], *amb[3], *spec[3], *mir[3]; - pymat = (C_Material *)PyObject_NEW (C_Material, &Material_Type); + pymat = (BPy_Material *)PyObject_NEW (BPy_Material, &Material_Type); - if (!pymat) - return EXPP_ReturnPyObjError (PyExc_MemoryError, - "couldn't create C_Material object"); + if (!pymat) + return EXPP_ReturnPyObjError (PyExc_MemoryError, + "couldn't create BPy_Material object"); - pymat->material = mat; + pymat->material = mat; - rgb[0] = &mat->r; - rgb[1] = &mat->g; - rgb[2] = &mat->b; + col[0] = &mat->r; + col[1] = &mat->g; + col[2] = &mat->b; - amb[0] = &mat->ambr; - amb[1] = &mat->ambg; - amb[2] = &mat->ambb; + amb[0] = &mat->ambr; + amb[1] = &mat->ambg; + amb[2] = &mat->ambb; - spec[0] = &mat->specr; - spec[1] = &mat->specg; - spec[2] = &mat->specb; + spec[0] = &mat->specr; + spec[1] = &mat->specg; + spec[2] = &mat->specb; - mir[0] = &mat->mirr; - mir[1] = &mat->mirg; - mir[2] = &mat->mirb; + mir[0] = &mat->mirr; + mir[1] = &mat->mirg; + mir[2] = &mat->mirb; - pymat->rgb = (C_rgbTuple *)rgbTuple_New(rgb); - pymat->amb = (C_rgbTuple *)rgbTuple_New(amb); - pymat->spec = (C_rgbTuple *)rgbTuple_New(spec); - pymat->mir = (C_rgbTuple *)rgbTuple_New(mir); + pymat->col = (BPy_rgbTuple *)rgbTuple_New(col); + pymat->amb = (BPy_rgbTuple *)rgbTuple_New(amb); + pymat->spec = (BPy_rgbTuple *)rgbTuple_New(spec); + pymat->mir = (BPy_rgbTuple *)rgbTuple_New(mir); - return (PyObject *)pymat; + return (PyObject *)pymat; } /*****************************************************************************/ @@ -528,9 +520,9 @@ int Material_CheckPyObject (PyObject *pyobj) } /*****************************************************************************/ -/* Python C_Material methods: */ +/* Python BPy_Material methods: */ /*****************************************************************************/ -static PyObject *Material_getName(C_Material *self) +static PyObject *Material_getName(BPy_Material *self) { PyObject *attr = PyString_FromString(self->material->id.name+2); @@ -540,7 +532,7 @@ static PyObject *Material_getName(C_Material *self) "couldn't get Material.name attribute")); } -static PyObject *Material_getMode(C_Material *self) +static PyObject *Material_getMode(BPy_Material *self) { PyObject *attr = PyInt_FromLong((long)self->material->mode); @@ -550,27 +542,27 @@ static PyObject *Material_getMode(C_Material *self) "couldn't get Material.Mode attribute"); } -static PyObject *Material_getRGBCol(C_Material *self) +static PyObject *Material_getRGBCol(BPy_Material *self) { - return rgbTuple_getCol(self->rgb); + return rgbTuple_getCol(self->col); } -static PyObject *Material_getAmbCol(C_Material *self) +static PyObject *Material_getAmbCol(BPy_Material *self) { - return rgbTuple_getCol(self->amb); + return rgbTuple_getCol(self->amb); } -static PyObject *Material_getSpecCol(C_Material *self) +static PyObject *Material_getSpecCol(BPy_Material *self) { - return rgbTuple_getCol(self->spec); + return rgbTuple_getCol(self->spec); } -static PyObject *Material_getMirCol(C_Material *self) +static PyObject *Material_getMirCol(BPy_Material *self) { - return rgbTuple_getCol(self->mir); + return rgbTuple_getCol(self->mir); } -static PyObject *Material_getAmb(C_Material *self) +static PyObject *Material_getAmb(BPy_Material *self) { PyObject *attr = PyFloat_FromDouble((double)self->material->amb); @@ -580,7 +572,7 @@ static PyObject *Material_getAmb(C_Material *self) "couldn't get Material.amb attribute"); } -static PyObject *Material_getEmit(C_Material *self) +static PyObject *Material_getEmit(BPy_Material *self) { PyObject *attr = PyFloat_FromDouble((double)self->material->emit); @@ -590,17 +582,7 @@ static PyObject *Material_getEmit(C_Material *self) "couldn't get Material.emit attribute"); } -static PyObject *Material_getAng(C_Material *self) -{ - PyObject *attr = PyFloat_FromDouble((double)self->material->ang); - - if (attr) return attr; - - return EXPP_ReturnPyObjError (PyExc_RuntimeError, - "couldn't get Material.ang attribute"); -} - -static PyObject *Material_getAlpha(C_Material *self) +static PyObject *Material_getAlpha(BPy_Material *self) { PyObject *attr = PyFloat_FromDouble((double)self->material->alpha); @@ -610,7 +592,7 @@ static PyObject *Material_getAlpha(C_Material *self) "couldn't get Material.alpha attribute"); } -static PyObject *Material_getRef(C_Material *self) +static PyObject *Material_getRef(BPy_Material *self) { PyObject *attr = PyFloat_FromDouble((double)self->material->ref); @@ -620,7 +602,7 @@ static PyObject *Material_getRef(C_Material *self) "couldn't get Material.ref attribute"); } -static PyObject *Material_getSpec(C_Material *self) +static PyObject *Material_getSpec(BPy_Material *self) { PyObject *attr = PyFloat_FromDouble((double)self->material->spec); @@ -630,7 +612,7 @@ static PyObject *Material_getSpec(C_Material *self) "couldn't get Material.spec attribute"); } -static PyObject *Material_getSpecTransp(C_Material *self) +static PyObject *Material_getSpecTransp(BPy_Material *self) { PyObject *attr = PyFloat_FromDouble((double)self->material->spectra); @@ -640,7 +622,7 @@ static PyObject *Material_getSpecTransp(C_Material *self) "couldn't get Material.specTransp attribute"); } -static PyObject *Material_getAdd(C_Material *self) +static PyObject *Material_getAdd(BPy_Material *self) { PyObject *attr = PyFloat_FromDouble((double)self->material->add); @@ -650,7 +632,7 @@ static PyObject *Material_getAdd(C_Material *self) "couldn't get Material.add attribute"); } -static PyObject *Material_getZOffset(C_Material *self) +static PyObject *Material_getZOffset(BPy_Material *self) { PyObject *attr = PyFloat_FromDouble((double)self->material->zoffs); @@ -660,7 +642,7 @@ static PyObject *Material_getZOffset(C_Material *self) "couldn't get Material.zOffset attribute"); } -static PyObject *Material_getHaloSize(C_Material *self) +static PyObject *Material_getHaloSize(BPy_Material *self) { PyObject *attr = PyFloat_FromDouble((double)self->material->hasize); @@ -670,7 +652,7 @@ static PyObject *Material_getHaloSize(C_Material *self) "couldn't get Material.haloSize attribute"); } -static PyObject *Material_getFlareSize(C_Material *self) +static PyObject *Material_getFlareSize(BPy_Material *self) { PyObject *attr = PyFloat_FromDouble((double)self->material->flaresize); @@ -680,7 +662,7 @@ static PyObject *Material_getFlareSize(C_Material *self) "couldn't get Material.flareSize attribute"); } -static PyObject *Material_getFlareBoost(C_Material *self) +static PyObject *Material_getFlareBoost(BPy_Material *self) { PyObject *attr = PyFloat_FromDouble((double)self->material->flareboost); @@ -690,7 +672,7 @@ static PyObject *Material_getFlareBoost(C_Material *self) "couldn't get Material.flareBoost attribute"); } -static PyObject *Material_getSubSize(C_Material *self) +static PyObject *Material_getSubSize(BPy_Material *self) { PyObject *attr = PyFloat_FromDouble((double)self->material->subsize); @@ -700,7 +682,7 @@ static PyObject *Material_getSubSize(C_Material *self) "couldn't get Material.subSize attribute"); } -static PyObject *Material_getHardness(C_Material *self) +static PyObject *Material_getHardness(BPy_Material *self) { PyObject *attr = PyInt_FromLong((long)self->material->har); @@ -710,7 +692,7 @@ static PyObject *Material_getHardness(C_Material *self) "couldn't get Material.hard attribute"); } -static PyObject *Material_getNFlares(C_Material *self) +static PyObject *Material_getNFlares(BPy_Material *self) { PyObject *attr = PyInt_FromLong((long)self->material->flarec); @@ -720,7 +702,7 @@ static PyObject *Material_getNFlares(C_Material *self) "couldn't get Material.nFlares attribute"); } -static PyObject *Material_getNStars(C_Material *self) +static PyObject *Material_getNStars(BPy_Material *self) { PyObject *attr = PyInt_FromLong((long)self->material->starc); @@ -730,7 +712,7 @@ static PyObject *Material_getNStars(C_Material *self) "couldn't get Material.nStars attribute"); } -static PyObject *Material_getNLines(C_Material *self) +static PyObject *Material_getNLines(BPy_Material *self) { PyObject *attr = PyInt_FromLong((long)self->material->linec); @@ -740,7 +722,7 @@ static PyObject *Material_getNLines(C_Material *self) "couldn't get Material.nLines attribute"); } -static PyObject *Material_getNRings(C_Material *self) +static PyObject *Material_getNRings(BPy_Material *self) { PyObject *attr = PyInt_FromLong((long)self->material->ringc); @@ -750,7 +732,7 @@ static PyObject *Material_getNRings(C_Material *self) "couldn't get Material.nRings attribute"); } -static PyObject *Material_setName(C_Material *self, PyObject *args) +static PyObject *Material_setName(BPy_Material *self, PyObject *args) { char *name; char buf[21]; @@ -771,21 +753,21 @@ static PyObject *Material_setName(C_Material *self, PyObject *args) * vcolPaint, halo, ztransp, zinvert, haloRings, env, haloLines, * onlyShadow, xalpha, star, faceTexture, haloTex, haloPuno, noMist, * haloShade, haloFlare */ -static PyObject *Material_setMode(C_Material *self, PyObject *args) +static PyObject *Material_setMode(BPy_Material *self, PyObject *args) { int i, flag = 0; char *m[21] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, NULL, NULL}; + NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL}; if (!PyArg_ParseTuple(args, "|sssssssssssssssssssss", - &m[0], &m[1], &m[2], &m[3], &m[4], &m[5], &m[6], - &m[7], &m[8], &m[9], &m[10], &m[11], &m[12], &m[13], - &m[14], &m[15], &m[16], &m[17], &m[18], &m[19], &m[20])) - { + &m[0], &m[1], &m[2], &m[3], &m[4], &m[5], &m[6], + &m[7], &m[8], &m[9], &m[10], &m[11], &m[12], &m[13], + &m[14], &m[15], &m[16], &m[17], &m[18], &m[19], &m[20])) + { return (EXPP_ReturnPyObjError (PyExc_AttributeError, "expected from none to 21 string argument(s)")); - } + } for (i = 0; i < 21; i++) { if (m[i] == NULL) break; @@ -844,7 +826,7 @@ static PyObject *Material_setMode(C_Material *self, PyObject *args) /* Another helper function, for the same reason. * (See comment before Material_setIntType above). */ -static PyObject *Material_setIntMode(C_Material *self, PyObject *args) +static PyObject *Material_setIntMode(BPy_Material *self, PyObject *args) { int value; @@ -858,28 +840,28 @@ static PyObject *Material_setIntMode(C_Material *self, PyObject *args) return Py_None; } -static PyObject *Material_setRGBCol (C_Material *self, PyObject *args) +static PyObject *Material_setRGBCol (BPy_Material *self, PyObject *args) { - return rgbTuple_setCol(self->rgb, args); + return rgbTuple_setCol(self->col, args); } -static PyObject *Material_setAmbCol (C_Material *self, PyObject *args) +static PyObject *Material_setAmbCol (BPy_Material *self, PyObject *args) { - return rgbTuple_setCol(self->amb, args); + return rgbTuple_setCol(self->amb, args); } -static PyObject *Material_setSpecCol (C_Material *self, PyObject *args) +static PyObject *Material_setSpecCol (BPy_Material *self, PyObject *args) { - return rgbTuple_setCol(self->spec, args); + return rgbTuple_setCol(self->spec, args); } -static PyObject *Material_setMirCol (C_Material *self, PyObject *args) +static PyObject *Material_setMirCol (BPy_Material *self, PyObject *args) { - return rgbTuple_setCol(self->mir, args); + return rgbTuple_setCol(self->mir, args); } -static PyObject *Material_setColorComponent(C_Material *self, char *key, - PyObject *args) +static PyObject *Material_setColorComponent(BPy_Material *self, char *key, + PyObject *args) { /* for compatibility with old bpython */ float value; @@ -888,7 +870,7 @@ static PyObject *Material_setColorComponent(C_Material *self, char *key, "expected float argument in [0.0, 1.0]")); value = EXPP_ClampFloat (value, EXPP_MAT_COL_MIN, - EXPP_MAT_COL_MAX); + EXPP_MAT_COL_MAX); if (!strcmp(key, "R")) self->material->r = value; @@ -897,10 +879,10 @@ static PyObject *Material_setColorComponent(C_Material *self, char *key, else if (!strcmp(key, "B")) self->material->b = value; - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setAmb(C_Material *self, PyObject *args) +static PyObject *Material_setAmb(BPy_Material *self, PyObject *args) { float value; @@ -909,12 +891,12 @@ static PyObject *Material_setAmb(C_Material *self, PyObject *args) "expected float argument in [0.0, 1.0]")); self->material->amb = EXPP_ClampFloat (value, EXPP_MAT_AMB_MIN, - EXPP_MAT_AMB_MAX); + EXPP_MAT_AMB_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setEmit(C_Material *self, PyObject *args) +static PyObject *Material_setEmit(BPy_Material *self, PyObject *args) { float value; @@ -923,26 +905,12 @@ static PyObject *Material_setEmit(C_Material *self, PyObject *args) "expected float argument in [0.0, 1.0]")); self->material->emit = EXPP_ClampFloat (value, EXPP_MAT_EMIT_MIN, - EXPP_MAT_EMIT_MAX); - - return EXPP_incr_ret (Py_None); -} + EXPP_MAT_EMIT_MAX); -static PyObject *Material_setAng(C_Material *self, PyObject *args) -{ - float value; - - if (!PyArg_ParseTuple(args, "f", &value)) - return (EXPP_ReturnPyObjError (PyExc_TypeError, - "expected float argument in [0.0, 1.0]")); - - self->material->ang = EXPP_ClampFloat (value, EXPP_MAT_ANG_MIN, - EXPP_MAT_ANG_MAX); - - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setSpecTransp(C_Material *self, PyObject *args) +static PyObject *Material_setSpecTransp(BPy_Material *self, PyObject *args) { float value; @@ -951,12 +919,12 @@ static PyObject *Material_setSpecTransp(C_Material *self, PyObject *args) "expected float argument in [0.0, 1.0]")); self->material->spectra = EXPP_ClampFloat (value, EXPP_MAT_SPECTRA_MIN, - EXPP_MAT_SPECTRA_MAX); + EXPP_MAT_SPECTRA_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setAlpha(C_Material *self, PyObject *args) +static PyObject *Material_setAlpha(BPy_Material *self, PyObject *args) { float value; @@ -965,12 +933,12 @@ static PyObject *Material_setAlpha(C_Material *self, PyObject *args) "expected float argument in [0.0, 1.0]")); self->material->alpha = EXPP_ClampFloat (value, EXPP_MAT_ALPHA_MIN, - EXPP_MAT_ALPHA_MAX); + EXPP_MAT_ALPHA_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setRef(C_Material *self, PyObject *args) +static PyObject *Material_setRef(BPy_Material *self, PyObject *args) { float value; @@ -979,12 +947,12 @@ static PyObject *Material_setRef(C_Material *self, PyObject *args) "expected float argument in [0.0, 1.0]")); self->material->ref = EXPP_ClampFloat (value, EXPP_MAT_REF_MIN, - EXPP_MAT_REF_MAX); + EXPP_MAT_REF_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setSpec(C_Material *self, PyObject *args) +static PyObject *Material_setSpec(BPy_Material *self, PyObject *args) { float value; @@ -992,13 +960,13 @@ static PyObject *Material_setSpec(C_Material *self, PyObject *args) return (EXPP_ReturnPyObjError (PyExc_TypeError, "expected float argument in [0.0, 1.0]")); - self->material->spec = EXPP_ClampFloat (value, EXPP_MAT_SPEC_MIN, - EXPP_MAT_SPEC_MAX); + self->material->spec = EXPP_ClampFloat (value, EXPP_MAT_SPEBPy_MIN, + EXPP_MAT_SPEBPy_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setZOffset(C_Material *self, PyObject *args) +static PyObject *Material_setZOffset(BPy_Material *self, PyObject *args) { float value; @@ -1007,12 +975,12 @@ static PyObject *Material_setZOffset(C_Material *self, PyObject *args) "expected float argument in [0.0, 10.0]")); self->material->zoffs = EXPP_ClampFloat (value, EXPP_MAT_ZOFFS_MIN, - EXPP_MAT_ZOFFS_MAX); + EXPP_MAT_ZOFFS_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setAdd(C_Material *self, PyObject *args) +static PyObject *Material_setAdd(BPy_Material *self, PyObject *args) { float value; @@ -1021,144 +989,144 @@ static PyObject *Material_setAdd(C_Material *self, PyObject *args) "expected float argument in [0.0, 1.0]")); self->material->add = EXPP_ClampFloat (value, EXPP_MAT_ADD_MIN, - EXPP_MAT_ADD_MAX); + EXPP_MAT_ADD_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setHaloSize(C_Material *self, PyObject *args) +static PyObject *Material_setHaloSize(BPy_Material *self, PyObject *args) { - float value; + float value; if (!PyArg_ParseTuple(args, "f", &value)) return (EXPP_ReturnPyObjError (PyExc_TypeError, "expected float argument in [0.0, 100.0]")); self->material->hasize = EXPP_ClampFloat (value, EXPP_MAT_HALOSIZE_MIN, - EXPP_MAT_HALOSIZE_MAX); + EXPP_MAT_HALOSIZE_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setFlareSize(C_Material *self, PyObject *args) +static PyObject *Material_setFlareSize(BPy_Material *self, PyObject *args) { - float value; + float value; if (!PyArg_ParseTuple(args, "f", &value)) return (EXPP_ReturnPyObjError (PyExc_TypeError, "expected float argument in [0.1, 25.0]")); self->material->flaresize = EXPP_ClampFloat (value, EXPP_MAT_FLARESIZE_MIN, - EXPP_MAT_FLARESIZE_MAX); + EXPP_MAT_FLARESIZE_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setFlareBoost(C_Material *self, PyObject *args) +static PyObject *Material_setFlareBoost(BPy_Material *self, PyObject *args) { - float value; + float value; if (!PyArg_ParseTuple(args, "f", &value)) return (EXPP_ReturnPyObjError (PyExc_TypeError, "expected float argument in [0.1, 10.0]")); self->material->flareboost = EXPP_ClampFloat(value, EXPP_MAT_FLAREBOOST_MIN, - EXPP_MAT_FLAREBOOST_MAX); + EXPP_MAT_FLAREBOOST_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setSubSize(C_Material *self, PyObject *args) +static PyObject *Material_setSubSize(BPy_Material *self, PyObject *args) { - float value; + float value; if (!PyArg_ParseTuple(args, "f", &value)) return (EXPP_ReturnPyObjError (PyExc_TypeError, "expected float argument in [0.1, 25.0]")); self->material->subsize = EXPP_ClampFloat (value, EXPP_MAT_SUBSIZE_MIN, - EXPP_MAT_SUBSIZE_MAX); + EXPP_MAT_SUBSIZE_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setHardness(C_Material *self, PyObject *args) +static PyObject *Material_setHardness(BPy_Material *self, PyObject *args) { - short value; + short value; - if (!PyArg_ParseTuple(args, "h", &value)) + if (!PyArg_ParseTuple(args, "h", &value)) return (EXPP_ReturnPyObjError (PyExc_TypeError, "expected int argument in [1, 255]")); self->material->har = EXPP_ClampInt (value, EXPP_MAT_HARD_MIN, - EXPP_MAT_HARD_MAX); + EXPP_MAT_HARD_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setNFlares(C_Material *self, PyObject *args) +static PyObject *Material_setNFlares(BPy_Material *self, PyObject *args) { - short value; + short value; - if (!PyArg_ParseTuple(args, "h", &value)) + if (!PyArg_ParseTuple(args, "h", &value)) return (EXPP_ReturnPyObjError (PyExc_TypeError, "expected int argument in [1, 32]")); self->material->flarec = EXPP_ClampInt (value, EXPP_MAT_NFLARES_MIN, - EXPP_MAT_NFLARES_MAX); + EXPP_MAT_NFLARES_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setNStars(C_Material *self, PyObject *args) +static PyObject *Material_setNStars(BPy_Material *self, PyObject *args) { - short value; + short value; - if (!PyArg_ParseTuple(args, "h", &value)) + if (!PyArg_ParseTuple(args, "h", &value)) return (EXPP_ReturnPyObjError (PyExc_TypeError, "expected int argument in [3, 50]")); self->material->starc = EXPP_ClampInt (value, EXPP_MAT_NSTARS_MIN, - EXPP_MAT_NSTARS_MAX); + EXPP_MAT_NSTARS_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setNLines(C_Material *self, PyObject *args) +static PyObject *Material_setNLines(BPy_Material *self, PyObject *args) { - short value; + short value; - if (!PyArg_ParseTuple(args, "h", &value)) + if (!PyArg_ParseTuple(args, "h", &value)) return (EXPP_ReturnPyObjError (PyExc_TypeError, "expected int argument in [0, 250]")); self->material->linec = EXPP_ClampInt (value, EXPP_MAT_NLINES_MIN, - EXPP_MAT_NLINES_MAX); + EXPP_MAT_NLINES_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } -static PyObject *Material_setNRings(C_Material *self, PyObject *args) +static PyObject *Material_setNRings(BPy_Material *self, PyObject *args) { - short value; + short value; - if (!PyArg_ParseTuple(args, "h", &value)) + if (!PyArg_ParseTuple(args, "h", &value)) return (EXPP_ReturnPyObjError (PyExc_TypeError, "expected int argument in [0, 24]")); self->material->ringc = EXPP_ClampInt (value, EXPP_MAT_NRINGS_MIN, - EXPP_MAT_NRINGS_MAX); + EXPP_MAT_NRINGS_MAX); - return EXPP_incr_ret (Py_None); + return EXPP_incr_ret (Py_None); } /*****************************************************************************/ /* Function: Material_GetAttr */ -/* Description: This is a callback function for the C_Material type. It is */ -/* the function that accesses C_Material "member variables" and */ -/* methods. */ +/* Description: This is a callback function for the BPy_Material type. It is */ +/* the function that accesses BPy_Material "member variables" */ +/* and methods. */ /*****************************************************************************/ -static PyObject *Material_GetAttr (C_Material *self, char *name) +static PyObject *Material_GetAttr (BPy_Material *self, char *name) { PyObject *attr = Py_None; @@ -1182,8 +1150,6 @@ static PyObject *Material_GetAttr (C_Material *self, char *name) attr = PyFloat_FromDouble((double)self->material->b); else if (strcmp(name, "amb") == 0) attr = PyFloat_FromDouble((double)self->material->amb); - else if (strcmp(name, "ang") == 0) - attr = PyFloat_FromDouble((double)self->material->ang); else if (strcmp(name, "emit") == 0) attr = PyFloat_FromDouble((double)self->material->emit); else if (strcmp(name, "alpha") == 0) @@ -1218,13 +1184,13 @@ static PyObject *Material_GetAttr (C_Material *self, char *name) attr = PyInt_FromLong((long)self->material->ringc); else if (strcmp(name, "__members__") == 0) { - attr = /* 27 items */ - Py_BuildValue("[s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s]", + attr = /* 26 items */ + Py_BuildValue("[s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s,s]", "name", "mode", "rgbCol", "ambCol", "specCol", "mirCol", - "R", "G", "B", "alpha", "amb", "ang", "emit", "ref", - "spec", "specTransp", "add", "zOffset", "haloSize", - "flareSize", "flareBoost", "subSize", "hard", "nFlares", - "nStars", "nLines", "nRings"); + "R", "G", "B", "alpha", "amb", "emit", "ref", + "spec", "specTransp", "add", "zOffset", "haloSize", + "flareSize", "flareBoost", "subSize", "hard", "nFlares", + "nStars", "nLines", "nRings"); } if (!attr) @@ -1234,16 +1200,16 @@ static PyObject *Material_GetAttr (C_Material *self, char *name) if (attr != Py_None) return attr; /* member attribute found, return it */ /* not an attribute, search the methods table */ - return Py_FindMethod(C_Material_methods, (PyObject *)self, name); + return Py_FindMethod(BPy_Material_methods, (PyObject *)self, name); } /****************************************************************************/ /* Function: Material_SetAttr */ -/* Description: This is a callback function for the C_Material type. */ +/* Description: This is a callback function for the BPy_Material type. */ /* It is the function that sets Material attributes (member */ /* variables). */ /****************************************************************************/ -static int Material_SetAttr (C_Material *self, char *name, PyObject *value) +static int Material_SetAttr (BPy_Material *self, char *name, PyObject *value) { PyObject *valtuple; PyObject *error = NULL; @@ -1261,7 +1227,7 @@ static int Material_SetAttr (C_Material *self, char *name, PyObject *value) return EXPP_ReturnIntError(PyExc_MemoryError, "MaterialSetAttr: couldn't create PyTuple"); -/* Now we just compare "name" with all possible C_Material member variables */ +/* Now we just compare "name" with all possible BPy_Material member variables */ if (strcmp (name, "name") == 0) error = Material_setName (self, valtuple); else if (strcmp (name, "mode") == 0) @@ -1282,8 +1248,6 @@ static int Material_SetAttr (C_Material *self, char *name, PyObject *value) error = Material_setColorComponent (self, "B", valtuple); else if (strcmp (name, "amb") == 0) error = Material_setAmb (self, valtuple); - else if (strcmp (name, "ang") == 0) - error = Material_setAng (self, valtuple); else if (strcmp (name, "emit") == 0) error = Material_setEmit (self, valtuple); else if (strcmp (name, "alpha") == 0) @@ -1336,10 +1300,10 @@ static int Material_SetAttr (C_Material *self, char *name, PyObject *value) /*****************************************************************************/ /* Function: Material_Print */ -/* Description: This is a callback function for the C_Material type. It */ +/* Description: This is a callback function for the BPy_Material type. It */ /* builds a meaninful string to 'print' material objects. */ /*****************************************************************************/ -static int Material_Print(C_Material *self, FILE *fp, int flags) +static int Material_Print(BPy_Material *self, FILE *fp, int flags) { fprintf(fp, "[Material \"%s\"]", self->material->id.name+2); return 0; @@ -1347,17 +1311,17 @@ static int Material_Print(C_Material *self, FILE *fp, int flags) /*****************************************************************************/ /* Function: Material_Repr */ -/* Description: This is a callback function for the C_Material type. It */ +/* Description: This is a callback function for the BPy_Material type. It */ /* builds a meaninful string to represent material objects. */ /*****************************************************************************/ -static PyObject *Material_Repr (C_Material *self) +static PyObject *Material_Repr (BPy_Material *self) { - char buf[40]; + char buf[40]; - PyOS_snprintf(buf, sizeof(buf), "[Material \"%s\"]", - self->material->id.name+2); + PyOS_snprintf(buf, sizeof(buf), "[Material \"%s\"]", + self->material->id.name+2); - return PyString_FromString(buf); + return PyString_FromString(buf); } @@ -1366,63 +1330,63 @@ static PyObject *Material_Repr (C_Material *self) /*****************************************************************************/ PyObject *EXPP_PyList_fromMaterialList (Material **matlist, int len) { - PyObject *list; - int i; + PyObject *list; + int i; - list = PyList_New(0); - if (!matlist) return list; + list = PyList_New(0); + if (!matlist) return list; - for (i = 0; i < len; i++) { - Material *mat = matlist[i]; - PyObject *ob; + for (i = 0; i < len; i++) { + Material *mat = matlist[i]; + PyObject *ob; - if (mat) { - ob = Material_CreatePyObject (mat); - PyList_Append (list, ob); - Py_DECREF (ob); /* because Append increfs */ - } - } + if (mat) { + ob = Material_CreatePyObject (mat); + PyList_Append (list, ob); + Py_DECREF (ob); /* because Append increfs */ + } + } - return list; + return list; } Material **EXPP_newMaterialList_fromPyList (PyObject *list) { - int i, len; - C_Material *pymat = 0; - Material *mat; - Material **matlist; + int i, len; + BPy_Material *pymat = 0; + Material *mat; + Material **matlist; - len = PySequence_Length (list); - if (len > 16) len = 16; + len = PySequence_Length (list); + if (len > 16) len = 16; - matlist = EXPP_newMaterialList (len); + matlist = EXPP_newMaterialList (len); - for (i= 0; i < len; i++) { + for (i= 0; i < len; i++) { - pymat = (C_Material *)PySequence_GetItem (list, i); + pymat = (BPy_Material *)PySequence_GetItem (list, i); - if (Material_CheckPyObject ((PyObject *)pymat)) { - mat = pymat->material; - matlist[i] = mat; - } + if (Material_CheckPyObject ((PyObject *)pymat)) { + mat = pymat->material; + matlist[i] = mat; + } - else { /* error; illegal type in material list */ - Py_DECREF(pymat); - MEM_freeN(matlist); - return NULL; - } + else { /* error; illegal type in material list */ + Py_DECREF(pymat); + MEM_freeN(matlist); + return NULL; + } - Py_DECREF(pymat); - } + Py_DECREF(pymat); + } - return matlist; + return matlist; } Material **EXPP_newMaterialList(int len) { - Material **matlist = - (Material **)MEM_mallocN(len * sizeof(Material *), "MaterialList"); + Material **matlist = + (Material **)MEM_mallocN(len * sizeof(Material *), "MaterialList"); - return matlist; + return matlist; } |