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

curve2tree - animation settings - speed and magnitude

Browse Source 
Python api - texture.evaluate can now accept tuples of numbers as well as vectors
This commit is contained in:
Campbell Barton
2007-11-09 10:29:19 +00:00
parent 95661081f9
commit ddf2336084
3 changed files with 76 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/python/api2_2x/Texture.c
View File

@@ -504,7 +504,7 @@ static int Texture_setNoiseBasis2( BPy_Texture *self, PyObject *args,
static PyObject *Texture_getColorband( BPy_Texture * self);
int Texture_setColorband( BPy_Texture * self, PyObject * value);
static PyObject *Texture_evaluate( BPy_Texture *self, VectorObject *vec_in );
static PyObject *Texture_evaluate( BPy_Texture *self, PyObject *value );
static PyObject *Texture_copy( BPy_Texture *self );
/*****************************************************************************/
@@ -2472,19 +2472,34 @@ int Texture_setColorband( BPy_Texture * self, PyObject * value)
return EXPP_Colorband_fromPyList( &self->texture->coba, value );
}
static PyObject *Texture_evaluate( BPy_Texture * self, VectorObject * vec_in )
static PyObject *Texture_evaluate( BPy_Texture * self, PyObject * value )
{
TexResult texres= {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};
float vec[4];
/* int rgbnor; dont use now */
if(!VectorObject_Check(vec_in) || vec_in->size < 3)
return EXPP_ReturnPyObjError(PyExc_TypeError,
"expects a 3D vector object");
/* rgbnor = .. we don't need this now */
multitex_ext(self->texture, vec_in->vec, NULL, NULL, 1, &texres);
if (VectorObject_Check(value)) {
if(((VectorObject *)value)->size < 3)
return EXPP_ReturnPyObjError(PyExc_TypeError,
"expects a 3D vector object or a tuple of 3 numbers");
/* rgbnor = .. we don't need this now */
multitex_ext(self->texture, ((VectorObject *)value)->vec, NULL, NULL, 1, &texres);
} else {
float vec_in[3];
if (!PyTuple_Check(value) || PyTuple_Size(value) < 3)
return EXPP_ReturnPyObjError(PyExc_TypeError,
"expects a 3D vector object or a tuple of 3 numbers");
vec_in[0] = PyFloat_AsDouble(PyTuple_GET_ITEM(value, 0));
vec_in[1] = PyFloat_AsDouble(PyTuple_GET_ITEM(value, 1));
vec_in[2] = PyFloat_AsDouble(PyTuple_GET_ITEM(value, 2));
if (PyErr_Occurred())
return EXPP_ReturnPyObjError(PyExc_TypeError,
"expects a 3D vector object or a tuple of 3 numbers");
multitex_ext(self->texture, vec_in, NULL, NULL, 1, &texres);
}
vec[0] = texres.tr;
vec[1] = texres.tg;
vec[2] = texres.tb;

2
source/blender/python/api2_2x/doc/Texture.py
View File

@@ -480,7 +480,7 @@ class Texture:
The return value is a 4D vector where (x,y,z,w) are (red, green, blue, intensity)
For greyscale textures, often intensity only will be used.
@type coord: vector
@type coord: vector or tuple of 3 numbers
"""
import id_generics