From 1bf306d4d93cc21c220a3f31835023e49e84dd2d Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Sun, 22 May 2011 14:22:07 -0600 Subject: Add cameras, objects, and spheres to Python module. --- libdimension-python/Color.c | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) (limited to 'libdimension-python/Color.c') diff --git a/libdimension-python/Color.c b/libdimension-python/Color.c index c147603..529aab2 100644 --- a/libdimension-python/Color.c +++ b/libdimension-python/Color.c @@ -18,37 +18,21 @@ * . * *************************************************************************/ -#include "Color.h" +#include "dimension-python.h" -bool -dmnsn_py_Color_args(dmnsn_color *c, PyObject *args, PyObject *kwds) +static int +dmnsn_py_Color_init(dmnsn_py_Color *self, PyObject *args, PyObject *kwds) { - c->trans = 0.0; - c->filter = 0.0; + self->c.trans = 0.0; + self->c.filter = 0.0; static char *kwlist[] = { "red", "green", "blue", "trans", "filter", NULL }; - if (PyArg_ParseTupleAndKeywords(args, kwds, "ddd|dd", kwlist, - &c->R, &c->G, &c->B, &c->trans, &c->filter)) { - return true; - } else { - if (kwds) - return false; - - PyErr_Clear(); - - dmnsn_py_Color *col; - if (!PyArg_ParseTuple(args, "O!", &dmnsn_py_ColorType, &col)) - return false; + if (!PyArg_ParseTupleAndKeywords(args, kwds, "ddd|dd", kwlist, + &self->c.R, &self->c.G, &self->c.B, + &self->c.trans, &self->c.filter)) + return -1; - *c = col->c; - return true; - } -} - -static int -dmnsn_py_Color_init(dmnsn_py_Color *self, PyObject *args, PyObject *kwds) -{ - return dmnsn_py_Color_args(&self->c, args, kwds) ? 0 : -1; + return 0; } static PyObject * -- cgit v1.2.3