diff -r 09aedbf5f95f -r 20dee9819b17 src/raytracermodule.cc --- a/src/raytracermodule.cc Mon Apr 21 08:47:36 2008 +0200 +++ b/src/raytracermodule.cc Mon Apr 21 09:05:09 2008 +0200 @@ -41,7 +41,7 @@ static PyObject *Light_Constructor(PyObject* self, PyObject* args, PyObject *kwd); static void Light_Destructor(PyObject* self); static PyObject *Light_Getattr(PyObject *self, char *name); -static PyObject *Light_castshadows(PyObject* self, PyObject* args); +static PyObject *Light_castShadows(PyObject* self, PyObject* args); static PyTypeObject LightType = { PyObject_HEAD_INIT(NULL) @@ -63,7 +63,7 @@ }; static PyMethodDef LightMethods[] = { - {"castshadows", (PyCFunction)Light_castshadows, METH_VARARGS, "Enable or disable shadows from this light."}, + {"castShadows", (PyCFunction)Light_castShadows, METH_VARARGS, "Enable or disable shadows from this light."}, {NULL, NULL} }; @@ -100,7 +100,7 @@ return Py_FindMethod(LightMethods, self, name); } -static PyObject *Light_castshadows(PyObject* self, PyObject* args) +static PyObject *Light_castShadows(PyObject* self, PyObject* args) { int shadows = 1; @@ -714,11 +714,11 @@ static void Raytracer_Destructor(PyObject* self); static PyObject *Raytracer_Getattr(PyObject *self, char *name); static PyObject *Raytracer_render(PyObject* self, PyObject* args); -static PyObject *Raytracer_setcamera(PyObject* self, PyObject* args); -static PyObject *Raytracer_setbgcolour(PyObject* self, PyObject* args); -static PyObject *Raytracer_addshape(PyObject* self, PyObject* args); -static PyObject *Raytracer_addlight(PyObject* self, PyObject* args); -static PyObject *Raytracer_ambientocclusion(PyObject* self, PyObject* args, PyObject *kwd); +static PyObject *Raytracer_setCamera(PyObject* self, PyObject* args); +static PyObject *Raytracer_setBgColour(PyObject* self, PyObject* args); +static PyObject *Raytracer_addShape(PyObject* self, PyObject* args); +static PyObject *Raytracer_addLight(PyObject* self, PyObject* args); +static PyObject *Raytracer_ambientOcclusion(PyObject* self, PyObject* args, PyObject *kwd); static PyTypeObject RaytracerType = { PyObject_HEAD_INIT(NULL) @@ -741,11 +741,11 @@ static PyMethodDef RaytracerMethods[] = { {"render", (PyCFunction)Raytracer_render, METH_VARARGS, "Render scene and return image data."}, - {"setcamera", (PyCFunction)Raytracer_setcamera, METH_VARARGS, "Set camera for the scene."}, - {"setbgcolour", (PyCFunction)Raytracer_setbgcolour, METH_VARARGS, "Set background colour."}, - {"addshape", (PyCFunction)Raytracer_addshape, METH_VARARGS, "Add new shape to scene."}, - {"addlight", (PyCFunction)Raytracer_addlight, METH_VARARGS, "Add new light source to scene."}, - {"ambientocclusion", (PyCFunction)Raytracer_ambientocclusion, METH_VARARGS | METH_KEYWORDS, + {"setCamera", (PyCFunction)Raytracer_setCamera, METH_VARARGS, "Set camera for the scene."}, + {"setBgColour", (PyCFunction)Raytracer_setBgColour, METH_VARARGS, "Set background colour."}, + {"addShape", (PyCFunction)Raytracer_addShape, METH_VARARGS, "Add new shape to scene."}, + {"addLight", (PyCFunction)Raytracer_addLight, METH_VARARGS, "Add new light source to scene."}, + {"ambientOcclusion", (PyCFunction)Raytracer_ambientOcclusion, METH_VARARGS | METH_KEYWORDS, "Set ambient occlusion parametrs - samples: int (0 = disable), distance: float, angle: float."}, {NULL, NULL} }; @@ -819,7 +819,7 @@ return o; } -static PyObject* Raytracer_setcamera(PyObject* self, PyObject* args) +static PyObject* Raytracer_setCamera(PyObject* self, PyObject* args) { CameraObject *cam; @@ -833,7 +833,7 @@ return Py_None; } -static PyObject* Raytracer_setbgcolour(PyObject* self, PyObject* args) +static PyObject* Raytracer_setBgColour(PyObject* self, PyObject* args) { Float r,g,b; @@ -846,7 +846,7 @@ return Py_None; } -static PyObject* Raytracer_addshape(PyObject* self, PyObject* args) +static PyObject* Raytracer_addShape(PyObject* self, PyObject* args) { PyObject *obj; @@ -862,7 +862,7 @@ return Py_None; } -static PyObject* Raytracer_addlight(PyObject* self, PyObject* args) +static PyObject* Raytracer_addLight(PyObject* self, PyObject* args) { LightObject *lightobj; @@ -875,7 +875,7 @@ return Py_None; } -static PyObject* Raytracer_ambientocclusion(PyObject* self, PyObject* args, PyObject *kwd) +static PyObject* Raytracer_ambientOcclusion(PyObject* self, PyObject* args, PyObject *kwd) { int samples = 0; Float distance = 0.0, angle = 0.0; @@ -885,7 +885,7 @@ &samples, &distance, &angle)) return NULL; - ((RaytracerObject *)self)->raytracer->ambientocclusion(samples, distance, angle); + ((RaytracerObject *)self)->raytracer->ambientOcclusion(samples, distance, angle); Py_INCREF(Py_None); return Py_None; }