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

manual merge trunk -r 23037

Browse Source 
strangely vector.c was skipped in last merge from trunk.

-----------------------------------
Mathutils fix: Vector.reflect
* correct function for reflection and moving it to arithb.c
This commit is contained in:
Dalai Felinto
2009-09-08 03:25:00 +00:00
parent 6808e15c8d 7064f6c5d8
commit f7deb2046e
1 changed files with 5 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/blender/python/generic/vector.c
View File

@@ -354,18 +354,12 @@ static PyObject *Vector_ToTrackQuat( VectorObject * self, PyObject * args )
/*----------------------------Vector.reflect(mirror) ---------------------- /*----------------------------Vector.reflect(mirror) ----------------------
return a reflected vector on the mirror normal return a reflected vector on the mirror normal
((2 * DotVecs(vec, mirror)) * mirror) - vec vec - ((2 * DotVecs(vec, mirror)) * mirror)
using arithb.c would be nice here */ */
static PyObject *Vector_Reflect( VectorObject * self, VectorObject * value ) static PyObject *Vector_Reflect( VectorObject * self, VectorObject * value )
{ {
float mirror[3]; float mirror[3], vec[3];
float vec[3]; float reflect[3] = {0.0f, 0.0f, 0.0f};
float reflect[4] = {0.0f, 0.0f, 0.0f, 0.0f};
float dot2;
/* for normalizing */
int i;
float norm = 0.0f;
if (!VectorObject_Check(value)) { if (!VectorObject_Check(value)) {
PyErr_SetString( PyExc_TypeError, "vec.reflect(value): expected a vector argument" ); PyErr_SetString( PyExc_TypeError, "vec.reflect(value): expected a vector argument" );
@@ -380,26 +374,12 @@ static PyObject *Vector_Reflect( VectorObject * self, VectorObject * value )
if (value->size > 2) mirror[2] = value->vec[2]; if (value->size > 2) mirror[2] = value->vec[2];
else mirror[2] = 0.0; else mirror[2] = 0.0;
/* normalize, whos idea was it not to use arithb.c? :-/ */
for(i = 0; i < 3; i++) {
norm += mirror[i] * mirror[i];
}
norm = (float) sqrt(norm);
for(i = 0; i < 3; i++) {
mirror[i] /= norm;
}
/* done */
vec[0] = self->vec[0]; vec[0] = self->vec[0];
vec[1] = self->vec[1]; vec[1] = self->vec[1];
if (self->size > 2) vec[2] = self->vec[2]; if (self->size > 2) vec[2] = self->vec[2];
else vec[2] = 0.0; else vec[2] = 0.0;
dot2 = 2 * vec[0]*mirror[0]+vec[1]*mirror[1]+vec[2]*mirror[2]; VecReflect(reflect, vec, mirror);
reflect[0] = (dot2 * mirror[0]) - vec[0];
reflect[1] = (dot2 * mirror[1]) - vec[1];
reflect[2] = (dot2 * mirror[2]) - vec[2];
return newVectorObject(reflect, self->size, Py_NEW, NULL); return newVectorObject(reflect, self->size, Py_NEW, NULL);
} }