Another step in the Big Bpy Cleanup.

- move static declarations and data definitions out of headers.
  the BGL module still need cleaning.

- move declarations out of modules.h and into appropriate .h files.
  modules.h still exists as a container for the few modules that
  need to #include almost everything.

- all files now have a $Id tag and have been formatted by indent

there are no changes to executable code.

pre-commit versions are tagged with bpy-cleanup-pre-20041007
for the sake of paranoia.

1 files changed, 145 insertions, 1 deletions

diff --git a/source/blender/python/api2_2x/World.c b/source/blender/python/api2_2x/World.c
index 4f1c20d851d..89af766c354 100644
--- a/source/blender/python/api2_2x/World.c
+++ b/source/blender/python/api2_2x/World.c
@@ -36,7 +36,7 @@
  * \brief Blender.World Module and World Data PyObject implementation.
  *
  * Note: Parameters between "<" and ">" are optional.  But if one of them is
- * given, all preceding ones must be given, too.	Of course, this only relates
+ * given, all preceding ones must be given, too.  Of course, this only relates
  * to the Python functions and methods described here and only inside Python
  * code. [ This will go to another file later, probably the main exppython
  * doc file].  XXX Better: put optional args with their default value:
@@ -49,7 +49,52 @@
 #include <BKE_library.h>
 #include <BLI_blenlib.h>
 
+#include <DNA_scene_types.h>  /* for G.scene */
+
 #include "World.h"
+#include "Ipo.h"
+
+#include "constant.h"
+#include "gen_utils.h"
+
+
+/*****************************************************************************/
+/* Python BPy_World methods declarations:                                   */
+/*****************************************************************************/
+static PyObject *World_getRange( BPy_World * self );
+static PyObject *World_setRange( BPy_World * self, PyObject * args );
+static PyObject *World_getIpo( BPy_World * self );
+static PyObject *World_setIpo( BPy_World * self, PyObject * args );
+static PyObject *World_clearIpo( BPy_World * self );
+static PyObject *World_getName( BPy_World * self );
+static PyObject *World_setName( BPy_World * self, PyObject * args );
+static PyObject *World_getSkytype( BPy_World * self );
+static PyObject *World_setSkytype( 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_getMist( BPy_World * self );
+static PyObject *World_setMist( BPy_World * self, PyObject * args );
+static PyObject *World_getScriptLinks( BPy_World * self, PyObject * args );
+static PyObject *World_addScriptLink( BPy_World * self, PyObject * args );
+static PyObject *World_clearScriptLinks( BPy_World * self );
+static PyObject *World_makeActive( BPy_World * self );
+
+
+/*****************************************************************************/
+/* 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 );
+static PyObject *M_World_GetActive( PyObject * self );
 
 
 /*****************************************************************************/
@@ -62,6 +107,105 @@ static int World_Compare( BPy_World * a, BPy_World * b );
 static PyObject *World_GetAttr( BPy_World * self, char *name );
 static PyObject *World_Repr( BPy_World * self );
 
+
+
+/*****************************************************************************/
+/* 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.";
+static char M_World_GetActive_doc[] = "() - returns the current world, or \
+None if the Scene has no world";
+
+
+
+/*****************************************************************************/
+/* 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},
+	{"GetActive", ( PyCFunction ) M_World_GetActive, METH_NOARGS,
+	 M_World_GetActive_doc},
+	{"get", M_World_Get, METH_VARARGS, M_World_Get_doc},
+	{NULL, NULL, 0, NULL}
+};
+
+
+
+/*****************************************************************************/
+/* Python BPy_World methods table:                                          */
+/*****************************************************************************/
+static PyMethodDef BPy_World_methods[] = {
+	{"getRange", ( PyCFunction ) World_getRange, METH_NOARGS,
+	 "() - Return World Range"},
+	{"setRange", ( PyCFunction ) World_setRange, METH_VARARGS,
+	 "() - Change this World's range"},
+	{"getIpo", ( PyCFunction ) World_getIpo, METH_NOARGS,
+	 "() - Return World Ipo"},
+	{"setIpo", ( PyCFunction ) World_setIpo, METH_VARARGS,
+	 "() - Change this World's ipo"},
+	{"clearIpo", ( PyCFunction ) World_clearIpo, METH_VARARGS,
+	 "() - Unlink Ipo from this World"},
+	{"getName", ( PyCFunction ) World_getName, METH_NOARGS,
+	 "() - Return World Data name"},
+	{"setName", ( PyCFunction ) World_setName, METH_VARARGS,
+	 "() - Return World Data name"},
+	{"getSkytype", ( PyCFunction ) World_getSkytype, METH_NOARGS,
+	 "() - Return World Data skytype"},
+	{"setSkytype", ( PyCFunction ) World_setSkytype, METH_VARARGS,
+	 "() - Return World Data skytype"},
+	{"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"},
+	{"getMist", ( PyCFunction ) World_getMist, METH_NOARGS,
+	 "() - Return World Data mist"},
+	{"setMist", ( PyCFunction ) World_setMist, METH_VARARGS,
+	 "() - Return World Data mist"},
+	{"getScriptLinks", ( PyCFunction ) World_getScriptLinks, METH_VARARGS,
+	 "(eventname) - Get a list of this world's scriptlinks (Text names) "
+	 "of the given type\n"
+	 "(eventname) - string: FrameChanged or Redraw."},
+	{"addScriptLink", ( PyCFunction ) World_addScriptLink, METH_VARARGS,
+	 "(text, evt) - Add a new world scriptlink.\n"
+	 "(text) - string: an existing Blender Text name;\n"
+	 "(evt) string: FrameChanged or Redraw."},
+	{"clearScriptLinks", ( PyCFunction ) World_clearScriptLinks,
+	 METH_NOARGS,
+	 "() - Delete all scriptlinks from this world :)."},
+	{"makeActive", ( PyCFunction ) World_makeActive, METH_NOARGS,
+	 "() - Makes this world the active world for the current scene."},
+	{NULL, NULL, 0, NULL}
+};
+
+
 /*****************************************************************************/
 /* Python World_Type structure definition:			          */
 /*****************************************************************************/