end of cleanup ; naming conventions, balance between c and h files

1 files changed, 127 insertions, 8 deletions

diff --git a/source/blender/python/api2_2x/World.h b/source/blender/python/api2_2x/World.h
index a9d2df41fb3..6063e0a27ad 100644
--- a/source/blender/python/api2_2x/World.h
+++ b/source/blender/python/api2_2x/World.h
@@ -34,23 +34,142 @@
 
 #include <Python.h>
 
-#include <DNA_world_types.h>
 
 #include "constant.h"
 #include "gen_utils.h"
+#include "bpy_types.h"
 
-/* The World PyType Object defined in World.c */
-extern PyTypeObject World_Type;
+
+/*****************************************************************************/
+/* Python API function prototypes for the World module.                     */
+/*****************************************************************************/
+static PyObject *M_World_New (PyObject *self, PyObject *args,
+                               PyObject *keywords);
+static PyObject *M_World_Get (PyObject *self, PyObject *args);
+
+
+/*****************************************************************************/
+/* The following string definitions are used for documentation strings.      */
+/* In Python these will be written to the console when doing a               */
+/* Blender.World.__doc__                                                     */
+/*****************************************************************************/
+static char M_World_doc[] = 
+"The Blender World module\n\n\
+This module provides access to **World Data** objects in Blender\n\n";
+
+static char M_World_New_doc[] ="() - return a new World object";
+
+static char M_World_Get_doc[] ="(name) - return the world with the name 'name', \
+returns None if not found.\n If 'name' is not specified, \
+it returns a list of all worlds in the\ncurrent scene.";
+
+
+
+/*****************************************************************************/
+/* Python method structure definition for Blender.World module:              */
+/*****************************************************************************/
+struct PyMethodDef M_World_methods[] = {
+  {"New",(PyCFunction)M_World_New, METH_VARARGS|METH_KEYWORDS,M_World_New_doc},
+  {"Get",         M_World_Get,         METH_VARARGS, M_World_Get_doc},
+  {"get",         M_World_Get,         METH_VARARGS, M_World_Get_doc},
+  {NULL, NULL, 0, NULL}
+};
 
 
 /*****************************************************************************/
-/* Python C_World structure definition:                                   */
+/* Python BPy_World methods declarations:                                   */
 /*****************************************************************************/
-typedef struct {
-  PyObject_HEAD
-  World *world;
+static PyObject *World_getName(BPy_World *self);
+static PyObject *World_setName(BPy_World *self, PyObject *args);
+static PyObject *World_getColormodel(BPy_World *self);
+static PyObject *World_setColormodel(BPy_World *self, PyObject *args );
+static PyObject *World_getFastcol(BPy_World *self);
+static PyObject *World_setFastcol(BPy_World *self, PyObject *args );
+static PyObject *World_getSkytype(BPy_World *self);
+static PyObject *World_setSkytype(BPy_World *self, PyObject *args );
+static PyObject *World_getMode(BPy_World *self);
+static PyObject *World_setMode(BPy_World *self, PyObject *args );
+static PyObject *World_getTotex(BPy_World *self);
+static PyObject *World_setTotex(BPy_World *self, PyObject *args );
+static PyObject *World_getTexact(BPy_World *self);
+static PyObject *World_setTexact(BPy_World *self, PyObject *args );
+static PyObject *World_getMistype(BPy_World *self);
+static PyObject *World_setMistype(BPy_World *self, PyObject *args );
+static PyObject *World_getHor(BPy_World *self);
+static PyObject *World_setHor(BPy_World *self, PyObject *args );
+static PyObject *World_getZen(BPy_World *self);
+static PyObject *World_setZen(BPy_World *self, PyObject *args );
+static PyObject *World_getAmb(BPy_World *self);
+static PyObject *World_setAmb(BPy_World *self, PyObject *args );
+static PyObject *World_getStar(BPy_World *self);
+static PyObject *World_setStar(BPy_World *self, PyObject *args );
+static PyObject *World_getDof(BPy_World *self);
+static PyObject *World_setDof(BPy_World *self, PyObject *args );
+static PyObject *World_getMist(BPy_World *self);
+static PyObject *World_setMist(BPy_World *self, PyObject *args );
 
-} C_World;
+/*****************************************************************************/
+/* Python BPy_World methods table:                                          */
+/*****************************************************************************/
+static PyMethodDef BPy_World_methods[] = {
+  {"getName", (PyCFunction)World_getName, METH_NOARGS,
+      "() - Return World Data name"},
+  {"setName", (PyCFunction)World_setName, METH_VARARGS,
+      "() - Return World Data name"},
+  {"getColormodel", (PyCFunction)World_getColormodel, METH_NOARGS,
+      "() - Return World Data colormodel"},
+  {"setColormodel", (PyCFunction)World_setColormodel, METH_VARARGS,
+      "() - Return World Data colormodel"},
+  {"getFastcol", (PyCFunction)World_getFastcol, METH_NOARGS,
+      "() - Return World Data fastcol"},
+  {"setFastcol", (PyCFunction)World_setFastcol, METH_VARARGS,
+      "() - Return World Data fastcol"},
+  {"getSkytype", (PyCFunction)World_getSkytype, METH_NOARGS,
+      "() - Return World Data skytype"},
+  {"setSkytype", (PyCFunction)World_setSkytype, METH_VARARGS,
+      "() - Return World Data skytype"},
+  {"getMode", (PyCFunction)World_getMode, METH_NOARGS,
+      "() - Return World Data mode"},
+  {"setMode", (PyCFunction)World_setMode, METH_VARARGS,
+      "() - Return World Data mode"},
+  {"getTotex", (PyCFunction)World_getTotex, METH_NOARGS,
+      "() - Return World Data totex"},
+  {"setTotex", (PyCFunction)World_setTotex, METH_VARARGS,
+      "() - Return World Data totex"},
+  {"getTexact", (PyCFunction)World_getTexact, METH_NOARGS,
+      "() - Return World Data texact"},
+  {"setTexact", (PyCFunction)World_setTexact, METH_VARARGS,
+      "() - Return World Data texact"},
+  {"getMistype", (PyCFunction)World_getMistype, METH_NOARGS,
+      "() - Return World Data mistype"},
+  {"setMistype", (PyCFunction)World_setMistype, METH_VARARGS,
+      "() - Return World Data mistype"},
+  {"getHor", (PyCFunction)World_getHor, METH_NOARGS,
+      "() - Return World Data hor"},
+  {"setHor", (PyCFunction)World_setHor, METH_VARARGS,
+      "() - Return World Data hor"},
+  {"getZen", (PyCFunction)World_getZen, METH_NOARGS,
+      "() - Return World Data zen"},
+  {"setZen", (PyCFunction)World_setZen, METH_VARARGS,
+      "() - Return World Data zen"},
+  {"getAmb", (PyCFunction)World_getAmb, METH_NOARGS,
+      "() - Return World Data amb"},
+  {"setAmb", (PyCFunction)World_setAmb, METH_VARARGS,
+      "() - Return World Data amb"},
+  {"getStar", (PyCFunction)World_getStar, METH_NOARGS,
+      "() - Return World Data star"},
+  {"setStar", (PyCFunction)World_setStar, METH_VARARGS,
+      "() - Return World Data star"},
+  {"getDof", (PyCFunction)World_getDof, METH_NOARGS,
+      "() - Return World Data dof"},
+  {"setDof", (PyCFunction)World_setDof, METH_VARARGS,
+      "() - Return World Data dof"},
+  {"getMist", (PyCFunction)World_getMist, METH_NOARGS,
+      "() - Return World Data mist"},
+  {"setMist", (PyCFunction)World_setMist, METH_VARARGS,
+      "() - Return World Data mist"},
+  {0}
+};
 
 /*****************************************************************************/
 /* Python World_Type helper functions needed by Blender (the Init function) */