* removed some debugging prints. Accidentally committed them last time.
* nicely format the matrix object when printing.
This commit is contained in:
@@ -701,17 +701,8 @@ static PyObject *Object_getInverseMatrix (BPy_Object *self)
|
|||||||
Object * ob;
|
Object * ob;
|
||||||
|
|
||||||
ob = self->object;
|
ob = self->object;
|
||||||
printf ("----Before inverse----\n");
|
|
||||||
printf ("%f, %f, %f, %f\n", ob->obmat[0][0], ob->obmat[0][1], ob->obmat[0][2], ob->obmat[0][3]);
|
|
||||||
printf ("%f, %f, %f, %f\n", ob->obmat[1][0], ob->obmat[1][1], ob->obmat[1][2], ob->obmat[1][3]);
|
|
||||||
printf ("%f, %f, %f, %f\n", ob->obmat[2][0], ob->obmat[2][1], ob->obmat[2][2], ob->obmat[2][3]);
|
|
||||||
printf ("%f, %f, %f, %f\n", ob->obmat[3][0], ob->obmat[3][1], ob->obmat[3][2], ob->obmat[3][3]);
|
|
||||||
Mat4Invert (inverse, self->object->obmat);
|
Mat4Invert (inverse, self->object->obmat);
|
||||||
printf ("-----After inverse-----\n");
|
|
||||||
printf ("%f, %f, %f, %f\n", inverse[0][0], inverse[0][1], inverse[0][2], inverse[0][3]);
|
|
||||||
printf ("%f, %f, %f, %f\n", inverse[1][0], inverse[1][1], inverse[1][2], inverse[1][3]);
|
|
||||||
printf ("%f, %f, %f, %f\n", inverse[2][0], inverse[2][1], inverse[2][2], inverse[2][3]);
|
|
||||||
printf ("%f, %f, %f, %f\n", inverse[3][0], inverse[3][1], inverse[3][2], inverse[3][3]);
|
|
||||||
|
|
||||||
return (newMatrixObject (inverse));
|
return (newMatrixObject (inverse));
|
||||||
}
|
}
|
||||||
|
@@ -191,30 +191,25 @@ int EXPP_check_sequence_consistency(PyObject *seq, PyTypeObject *against)
|
|||||||
|
|
||||||
PyObject *EXPP_tuple_repr(PyObject *self, int size)
|
PyObject *EXPP_tuple_repr(PyObject *self, int size)
|
||||||
{
|
{
|
||||||
PyObject *repr, *comma, *item;
|
PyObject *repr, *item;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
/*@ note: a value must be built because the list is decrefed!
|
/*@ note: a value must be built because the list is decrefed!
|
||||||
* otherwise we have nirvana pointers inside python.. */
|
* otherwise we have nirvana pointers inside python.. */
|
||||||
|
|
||||||
repr = PyString_FromString("(");
|
repr = PyString_FromString("");
|
||||||
if (!repr) return 0;
|
if (!repr) return 0;
|
||||||
|
|
||||||
item = PySequence_GetItem(self, 0);
|
item = PySequence_GetItem(self, 0);
|
||||||
PyString_ConcatAndDel(&repr, PyObject_Repr(item));
|
PyString_ConcatAndDel(&repr, PyObject_Repr(item));
|
||||||
Py_DECREF(item);
|
Py_DECREF(item);
|
||||||
|
|
||||||
comma = PyString_FromString(", ");
|
|
||||||
|
|
||||||
for (i = 1; i < size; i++) {
|
for (i = 1; i < size; i++) {
|
||||||
PyString_Concat(&repr, comma);
|
|
||||||
item = PySequence_GetItem(self, i);
|
item = PySequence_GetItem(self, i);
|
||||||
PyString_ConcatAndDel(&repr, PyObject_Repr(item));
|
PyString_ConcatAndDel(&repr, PyObject_Repr(item));
|
||||||
Py_DECREF(item);
|
Py_DECREF(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
PyString_ConcatAndDel(&repr, PyString_FromString(")"));
|
|
||||||
Py_DECREF(comma);
|
|
||||||
|
|
||||||
return repr;
|
return repr;
|
||||||
|
|
||||||
|
@@ -146,7 +146,12 @@ static int Vector_ass_slice(VectorObject *self, int begin, int end, PyObject *se
|
|||||||
|
|
||||||
static PyObject *Vector_repr (VectorObject *self)
|
static PyObject *Vector_repr (VectorObject *self)
|
||||||
{
|
{
|
||||||
return EXPP_tuple_repr((PyObject *) self, self->size);
|
char buffer[100];
|
||||||
|
|
||||||
|
sprintf (buffer, "[%.3f, %.3f, %.3f, %.3f]\n",
|
||||||
|
self->vec[0], self->vec[1], self->vec[2], self->vec[3]);
|
||||||
|
|
||||||
|
return PyString_FromString (buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
static PySequenceMethods Vector_SeqMethods =
|
static PySequenceMethods Vector_SeqMethods =
|
||||||
|
Reference in New Issue
Block a user