Add another element to the texture tuple with a mask for the lighting.

Make needed changes in textures.py.

Because some textures have garbage in the alpha channel, this new method has some problems.

src/iterate.c

@@ -421,14 +421,15 @@ chunk_render(PyObject *self, PyObject *args) {
                 /* if we found a proper texture, render it! */
                 if (t != NULL && t != Py_None)
                 {
-                    PyObject *src, *mask;
+                    PyObject *src, *mask, *mask_light;
                     src = PyTuple_GetItem(t, 0);
                     mask = PyTuple_GetItem(t, 1);
-                    
+                    mask_light = PyTuple_GetItem(t, 2);
+
                     if (mask == Py_None)
                         mask = src;
                     
-                    rendermode->draw(rm_data, &state, src, mask);
+                    rendermode->draw(rm_data, &state, src, mask, mask_light);
                 }               
             }
             

src/rendermode-cave.c

@@ -202,7 +202,7 @@ rendermode_cave_finish(void *data, RenderState *state) {
 }
 
 static void
-rendermode_cave_draw(void *data, RenderState *state, PyObject *src, PyObject *mask) {
+rendermode_cave_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObject *mask_light) {
     RenderModeCave* self;
     int z, r, g, b;
     self = (RenderModeCave *)data;
@@ -211,7 +211,7 @@ rendermode_cave_draw(void *data, RenderState *state, PyObject *src, PyObject *ma
     r = 0, g = 0, b = 0;
 
     /* draw the normal block */
-    rendermode_normal.draw(data, state, src, mask);
+    rendermode_normal.draw(data, state, src, mask, mask_light);
 
     /* get the colors and tint and tint */
     /* TODO TODO   for a nether mode there isn't tinting! */

src/rendermode-lighting.c

@@ -206,19 +206,19 @@ rendermode_lighting_occluded(void *data, RenderState *state) {
 }
 
 static void
-rendermode_lighting_draw(void *data, RenderState *state, PyObject *src, PyObject *mask) {
+rendermode_lighting_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObject *mask_light) {
     RenderModeLighting* self;
     int x, y, z;
 
     /* first, chain up */
-    rendermode_normal.draw(data, state, src, mask);
+    rendermode_normal.draw(data, state, src, mask, mask_light);
     
     self = (RenderModeLighting *)data;
     x = state->x, y = state->y, z = state->z;
     
     if (is_transparent(state->block)) {
         /* transparent: do shading on whole block */
-        do_shading_with_mask(self, state, x, y, z, mask);
+        do_shading_with_mask(self, state, x, y, z, mask_light);
     } else {
         /* opaque: do per-face shading */
         do_shading_with_mask(self, state, x, y, z+1, self->facemasks[0]);

src/rendermode-night.c

@@ -54,9 +54,9 @@ rendermode_night_occluded(void *data, RenderState *state) {
 }
 
 static void
-rendermode_night_draw(void *data, RenderState *state, PyObject *src, PyObject *mask) {
+rendermode_night_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObject *mask_light) {
     /* nothing special to do */
-    rendermode_lighting.draw(data, state, src, mask);
+    rendermode_lighting.draw(data, state, src, mask, mask_light);
 }
 
 RenderModeInterface rendermode_night = {

src/rendermode-normal.c

@@ -116,7 +116,7 @@ rendermode_normal_occluded(void *data, RenderState *state) {
 }
 
 static void
-rendermode_normal_draw(void *data, RenderState *state, PyObject *src, PyObject *mask) {
+rendermode_normal_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObject *mask_light) {
     RenderModeNormal *self = (RenderModeNormal *)data;
     
     /* first, check to see if we should use biome-compatible src, mask */

src/rendermode-overlay.c

@@ -71,7 +71,7 @@ rendermode_overlay_occluded(void *data, RenderState *state) {
 }
 
 static void
-rendermode_overlay_draw(void *data, RenderState *state, PyObject *src, PyObject *mask) {
+rendermode_overlay_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObject *mask_light) {
     RenderModeOverlay *self = (RenderModeOverlay *)data;
     unsigned char r, g, b, a;
     PyObject *top_block_py, *block_py;

src/rendermode-spawn.c

@@ -102,9 +102,9 @@ rendermode_spawn_occluded(void *data, RenderState *state) {
 }
 
 static void
-rendermode_spawn_draw(void *data, RenderState *state, PyObject *src, PyObject *mask) {
+rendermode_spawn_draw(void *data, RenderState *state, PyObject *src, PyObject *mask, PyObject *mask_light) {
     /* draw normally */
-    rendermode_overlay.draw(data, state, src, mask);
+    rendermode_overlay.draw(data, state, src, mask, mask_light);
 }
 
 RenderModeInterface rendermode_spawn = {

src/rendermodes.h

@@ -56,7 +56,7 @@ struct _RenderModeInterface {
     /* returns non-zero to skip rendering this block */
     int (*occluded)(void *, RenderState *);
     /* last two arguments are img and mask, from texture lookup */
-    void (*draw)(void *, RenderState *, PyObject *, PyObject *);
+    void (*draw)(void *, RenderState *, PyObject *, PyObject *, PyObject *);
 };
 
 /* figures out the render mode to use from the given ChunkRenderer */