Merge branch 'master' into py-package

Conflicts:
	overviewer_core/data/config.js
	overviewer_core/data/web_assets/functions.js
	overviewer_core/data/web_assets/style.css
	setup.py
	web_assets/overviewer.css
	web_assets/style.css

overviewer_core/src/rendermodes.h

@@ -38,12 +38,15 @@
 #include <Python.h>
 
 /* rendermode interface */
-typedef struct {
+typedef struct _RenderModeInterface RenderModeInterface;
+struct _RenderModeInterface {
     /* the name of this mode */
     const char* name;
     /* the short description of this render mode */
     const char* description;
     
+    /* the rendermode this is derived from, or NULL */
+    RenderModeInterface *parent;
     /* the size of the local storage for this rendermode */
     unsigned int data_size;
     
@@ -54,13 +57,16 @@ typedef struct {
     int (*occluded)(void *, RenderState *);
     /* last two arguments are img and mask, from texture lookup */
     void (*draw)(void *, RenderState *, PyObject *, PyObject *);
-} RenderModeInterface;
+};
 
 /* figures out the render mode to use from the given ChunkRenderer */
 RenderModeInterface *get_render_mode(RenderState *state);
 /* python bindings */
 PyObject *get_render_modes(PyObject *self, PyObject *args);
 PyObject *get_render_mode_info(PyObject *self, PyObject *args);
+PyObject *get_render_mode_parent(PyObject *self, PyObject *args);
+PyObject *get_render_mode_inheritance(PyObject *self, PyObject *args);
+PyObject *get_render_mode_children(PyObject *self, PyObject *args);
 
 /* individual rendermode interface declarations follow */
 
@@ -79,6 +85,20 @@ typedef struct {
 } RenderModeNormal;
 extern RenderModeInterface rendermode_normal;
 
+/* OVERLAY */
+typedef struct {
+    /* top facemask and white color image, for drawing overlays */
+    PyObject *facemask_top, *white_color;
+    /* only show overlay on top of solid or fluid blocks */
+    PyObject *solid_blocks, *fluid_blocks;
+    /* can be overridden in derived classes to control
+       overlay alpha and color
+       last four vars are r, g, b, a out */
+    void (*get_color)(void *, RenderState *,
+                      unsigned char *, unsigned char *, unsigned char *, unsigned char *);
+} RenderModeOverlay;
+extern RenderModeInterface rendermode_overlay;
+
 /* LIGHTING */
 typedef struct {
     /* inherits from normal render mode */
@@ -109,14 +129,31 @@ extern RenderModeInterface rendermode_night;
 
 /* SPAWN */
 typedef struct {
-    /* inherits from night */
-    RenderModeNight parent;
+    /* inherits from overlay */
+    RenderModeOverlay parent;
     
     /* used to figure out which blocks are spawnable */
-    PyObject *solid_blocks, *nospawn_blocks, *fluid_blocks;
-    /* replacement for black_color */
-    PyObject *red_color;
+    PyObject *nospawn_blocks;
+    PyObject *skylight, *blocklight;
 } RenderModeSpawn;
 extern RenderModeInterface rendermode_spawn;
 
+/* CAVE */
+typedef struct {
+    /* render blocks with lighting mode */
+    RenderModeNormal parent;
+
+    /* data used to know where the surface is */
+    PyObject *skylight;
+    PyObject *left_skylight;
+    PyObject *right_skylight;
+    PyObject *up_left_skylight;
+    PyObject *up_right_skylight;
+
+    /* colors used for tinting */
+    PyObject *depth_colors;
+    
+} RenderModeCave;
+extern RenderModeInterface rendermode_cave;
+
 #endif /* __RENDERMODES_H_INCLUDED__ */