Merge branch 'rewrite' into anvil

Conflicts:
	overviewer_core/src/overviewer.h
	overviewer_core/tileset.py
	overviewer_core/util.py
	overviewer_core/world.py

overviewer_core/src/primitives/clear-base.c

@@ -0,0 +1,49 @@
+/* 
+ * This file is part of the Minecraft Overviewer.
+ *
+ * Minecraft Overviewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Minecraft Overviewer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with the Overviewer.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../overviewer.h"
+
+static int
+clear_base_occluded(void *data, RenderState *state, int x, int y, int z) {
+    if ( (x != 0) && (y != 15) && (z != 127) &&
+         !render_mode_hidden(state->rendermode, x-1, y, z) &&
+         !render_mode_hidden(state->rendermode, x, y, z+1) &&
+         !render_mode_hidden(state->rendermode, x, y+1, z) &&
+         !is_transparent(getArrayByte3D(state->blocks, x-1, y, z)) &&
+         !is_transparent(getArrayByte3D(state->blocks, x, y, z+1)) &&
+         !is_transparent(getArrayByte3D(state->blocks, x, y+1, z))) {
+        return 1;
+    }
+    
+    return 0;
+}
+
+static void
+clear_base_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObject *mask_light) {
+    /* clear the draw space -- set alpha to 0 within mask */
+    tint_with_mask(state->img, 255, 255, 255, 0, mask, state->imgx, state->imgy, 0, 0);
+}
+
+RenderPrimitiveInterface primitive_clear_base = {
+    "clear-base",
+    0,
+    NULL,
+    NULL,
+    clear_base_occluded,
+    NULL,
+    clear_base_draw,
+};

overviewer_core/src/primitives/overlay-mineral.c

@@ -0,0 +1,151 @@
+/*
+ * This file is part of the Minecraft Overviewer.
+ *
+ * Minecraft Overviewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Minecraft Overviewer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with the Overviewer.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "overlay.h"
+
+typedef struct {
+    /* inherits from overlay */
+    RenderPrimitiveOverlay parent;
+    
+    void *minerals;
+} RenderPrimitiveMineral;
+
+struct MineralColor {
+    unsigned char blockid;
+    unsigned char r, g, b;
+};
+
+/* put more valuable ores first -- they take precedence */
+static struct MineralColor default_minerals[] = {
+    {48 /* Mossy Stone  */, 31, 153, 9},
+    
+    {56 /* Diamond Ore  */, 32, 230, 220},
+
+    {21 /* Lapis Lazuli */, 0, 23, 176},
+    {14 /* Gold Ore     */, 255, 234, 0},
+
+    {15 /* Iron Ore     */, 204, 204, 204},
+    {73 /* Redstone     */, 186, 0, 0},
+    {74 /* Lit Redstone */, 186, 0, 0},
+    {16 /* Coal Ore     */, 54, 54, 54},
+    
+    /* end of list marker */
+    {0, 0, 0, 0}
+};
+
+static void get_color(void *data, RenderState *state,
+                      unsigned char *r, unsigned char *g, unsigned char *b, unsigned char *a) {
+    
+    int x = state->x, z = state->z, y_max, y;
+    int max_i = -1;
+    RenderPrimitiveMineral* self = (RenderPrimitiveMineral *)data;
+    struct MineralColor *minerals = (struct MineralColor *)(self->minerals);
+    *a = 0;
+    
+    y_max = state->y + 1;
+    for (y = state->chunky * -16; y <= y_max; y++) {
+        int i, tmp;
+        unsigned short blockid = get_data(state, BLOCKS, x, y, z);
+        
+        for (i = 0; (max_i == -1 || i < max_i) && minerals[i].blockid != 0; i++) {
+            if (minerals[i].blockid == blockid) {
+                *r = minerals[i].r;
+                *g = minerals[i].g;
+                *b = minerals[i].b;
+                
+                tmp = (128 - y_max + y) * 2 - 40;
+                *a = MIN(MAX(0, tmp), 255);
+                
+                max_i = i;
+                break;
+            }
+        }
+    }
+}
+
+static int
+overlay_mineral_start(void *data, RenderState *state, PyObject *support) {
+    PyObject *opt;
+    RenderPrimitiveMineral* self;
+
+    /* first, chain up */
+    int ret = primitive_overlay.start(data, state, support);
+    if (ret != 0)
+        return ret;
+    
+    /* now do custom initializations */
+    self = (RenderPrimitiveMineral *)data;
+    
+    if (!render_mode_parse_option(support, "minerals", "O", &(opt)))
+        return 1;
+    if (opt && opt != Py_None) {
+        struct MineralColor *minerals = NULL;
+        Py_ssize_t minerals_size = 0, i;
+        /* create custom minerals */
+        
+        if (!PyList_Check(opt)) {
+            PyErr_SetString(PyExc_TypeError, "'minerals' must be a list");
+            return 1;
+        }
+        
+        minerals_size = PyList_GET_SIZE(opt);
+        minerals = self->minerals = calloc(minerals_size + 1, sizeof(struct MineralColor));
+        if (minerals == NULL) {
+            return 1;
+        }
+        
+        for (i = 0; i < minerals_size; i++) {
+            PyObject *mineral = PyList_GET_ITEM(opt, i);
+            if (!PyArg_ParseTuple(mineral, "b(bbb)", &(minerals[i].blockid), &(minerals[i].r), &(minerals[i].g), &(minerals[i].b))) {
+                free(minerals);
+                self->minerals = NULL;
+                return 1;
+            }
+        }
+    } else {
+        self->minerals = default_minerals;
+    }
+    Py_XDECREF(opt);
+    
+    /* setup custom color */
+    self->parent.get_color = get_color;
+    
+    return 0;
+}
+
+static void
+overlay_mineral_finish(void *data, RenderState *state) {
+    /* first free all *our* stuff */
+    RenderPrimitiveMineral* self = (RenderPrimitiveMineral *)data;
+    
+    if (self->minerals && self->minerals != default_minerals) {
+        free(self->minerals);
+    }
+    
+    /* now, chain up */
+    primitive_overlay.finish(data, state);
+}
+
+RenderPrimitiveInterface primitive_overlay_mineral = {
+    "overlay-mineral",
+    sizeof(RenderPrimitiveMineral),
+    overlay_mineral_start,
+    overlay_mineral_finish,
+    NULL,
+    NULL,
+    overlay_draw,
+};

overviewer_core/src/primitives/overlay-spawn.c

@@ -0,0 +1,92 @@
+/*
+ * This file is part of the Minecraft Overviewer.
+ *
+ * Minecraft Overviewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Minecraft Overviewer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with the Overviewer.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "overlay.h"
+#include <math.h>
+
+typedef struct {
+    /* inherits from overlay */
+    RenderPrimitiveOverlay parent;
+} RenderPrimitiveSpawn;
+
+static void get_color(void *data, RenderState *state,
+                      unsigned char *r, unsigned char *g, unsigned char *b, unsigned char *a) {
+    
+    RenderPrimitiveSpawn* self = (RenderPrimitiveSpawn *)data;
+    int x = state->x, y = state->y, z = state->z;
+    int y_light = y + 1;
+    unsigned char blocklight, skylight;
+    PyObject *block_py;
+    
+    /* set a nice, pretty red color */
+    *r = 229;
+    *g = 36;
+    *b = 38;
+    
+    /* default to no overlay, until told otherwise */
+    *a = 0;
+    
+    if (block_has_property(state->block, NOSPAWN)) {
+        /* nothing can spawn on this */
+        return;
+    }
+    
+    blocklight = get_data(state, BLOCKLIGHT, x, y_light, z);
+    skylight = get_data(state, SKYLIGHT, x, y_light, z);
+    
+    if (MAX(blocklight, skylight) <= 7) {
+        /* hostile mobs spawn in daylight */
+        *a = 240;
+    } else if (MAX(blocklight, skylight - 11) <= 7) {
+        /* hostile mobs spawn at night */
+        *a = 150;
+    }
+}
+
+static int
+overlay_spawn_start(void *data, RenderState *state, PyObject *support) {
+    RenderPrimitiveSpawn* self;
+
+    /* first, chain up */
+    int ret = primitive_overlay.start(data, state, support);
+    if (ret != 0)
+        return ret;
+    
+    /* now do custom initializations */
+    self = (RenderPrimitiveSpawn *)data;
+    self->parent.get_color = get_color;
+    
+    return 0;
+}
+
+static void
+overlay_spawn_finish(void *data, RenderState *state) {
+    RenderPrimitiveSpawn* self = (RenderPrimitiveSpawn *)data;
+    
+    /* chain up */
+    primitive_overlay.finish(data, state);
+}
+
+RenderPrimitiveInterface primitive_overlay_spawn = {
+    "overlay-spawn",
+    sizeof(RenderPrimitiveSpawn),
+    overlay_spawn_start,
+    overlay_spawn_finish,
+    NULL,
+    NULL,
+    overlay_draw,
+};

overviewer_core/src/primitives/overlay.c

@@ -0,0 +1,99 @@
+/* 
+ * This file is part of the Minecraft Overviewer.
+ *
+ * Minecraft Overviewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Minecraft Overviewer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with the Overviewer.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "overlay.h"
+
+static void get_color(void *data, RenderState *state,
+                      unsigned char *r, unsigned char *g, unsigned char *b, unsigned char *a) {
+    *r = 200;
+    *g = 200;
+    *b = 255;
+    *a = 155;
+}
+
+static int
+overlay_start(void *data, RenderState *state, PyObject *support) {
+    PyObject *facemasks_py;
+    RenderPrimitiveOverlay *self = (RenderPrimitiveOverlay *)data;
+    
+    self->facemask_top = PyObject_GetAttrString(support, "facemask_top");
+    self->white_color = PyObject_GetAttrString(support, "whitecolor");
+    self->get_color = get_color;
+    
+    return 0;
+}
+
+static void
+overlay_finish(void *data, RenderState *state) {
+    RenderPrimitiveOverlay *self = (RenderPrimitiveOverlay *)data;
+    
+    Py_DECREF(self->facemask_top);
+    Py_DECREF(self->white_color);
+}
+
+void
+overlay_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObject *mask_light) {
+    RenderPrimitiveOverlay *self = (RenderPrimitiveOverlay *)data;
+    unsigned char r, g, b, a;
+    unsigned short top_block;
+
+    // exactly analogous to edge-line code for these special blocks
+    int increment=0;
+    if (state->block == 44)  // half-step
+        increment=6;
+    else if (state->block == 78) // snow
+        increment=9;
+    
+    /* skip rendering the overlay if we can't see it */
+    top_block = get_data(state, BLOCKS, state->x, state->y+1, state->z);
+    if (!is_transparent(top_block)) {
+        return;
+    }
+    
+    /* check to be sure this block is solid/fluid */
+    if (block_has_property(top_block, SOLID) || block_has_property(top_block, FLUID)) {
+        
+        /* top block is fluid or solid, skip drawing */
+        return;
+    }
+    
+    /* check to be sure this block is solid/fluid */
+    if (!block_has_property(state->block, SOLID) && !block_has_property(state->block, FLUID)) {
+        
+        /* not fluid or solid, skip drawing the overlay */
+        return;
+    }
+
+    /* get our color info */
+    self->get_color(data, state, &r, &g, &b, &a);
+    
+    /* do the overlay */
+    if (a > 0) {
+        alpha_over(state->img, self->white_color, self->facemask_top, state->imgx, state->imgy + increment, 0, 0);
+        tint_with_mask(state->img, r, g, b, a, self->facemask_top, state->imgx, state->imgy + increment, 0, 0);
+    }
+}
+
+RenderPrimitiveInterface primitive_overlay = {
+    "overlay",
+    sizeof(RenderPrimitiveOverlay),
+    overlay_start,
+    overlay_finish,
+    NULL,
+    NULL,
+    overlay_draw,
+};

overviewer_core/src/primitives/overlay.h

@@ -0,0 +1,31 @@
+/* 
+ * This file is part of the Minecraft Overviewer.
+ *
+ * Minecraft Overviewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Minecraft Overviewer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with the Overviewer.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../overviewer.h"
+
+typedef struct {
+    /* top facemask and white color image, for drawing overlays */
+    PyObject *facemask_top, *white_color;
+    /* 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 *);
+} RenderPrimitiveOverlay;
+extern RenderPrimitiveInterface primitive_overlay;
+
+void overlay_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObject *mask_light);