LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

fixed smooth lighting errors on chunk boundaries

Browse Source
This commit is contained in:
Aaron Griffith
2011-10-17 10:09:59 -04:00
parent 2705a1efe8
commit 0fa734d0c5
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
overviewer_core/src/rendermode-lighting.c
View File

@@ -164,7 +164,7 @@ get_lighting_color(RenderModeLighting *self, RenderState *state,
unsigned char block, skylevel, blocklevel; unsigned char block, skylevel, blocklevel;
/* find out what chunk we're in, and translate accordingly */ /* find out what chunk we're in, and translate accordingly */
if (x >= 0 && y < 16) { if (x >= 0 && x < 16 && y >= 0 && y < 16) {
blocks = state->blocks; blocks = state->blocks;
skylight = self->skylight; skylight = self->skylight;
blocklight = self->blocklight; blocklight = self->blocklight;
@@ -178,6 +178,16 @@ get_lighting_color(RenderModeLighting *self, RenderState *state,
blocks = state->right_blocks; blocks = state->right_blocks;
skylight = self->right_skylight; skylight = self->right_skylight;
blocklight = self->right_blocklight; blocklight = self->right_blocklight;
} else if (y < 0) {
local_y += 16;
blocks = state->up_left_blocks;
skylight = self->up_left_skylight;
blocklight = self->up_left_blocklight;
} else if (x >= 16) {
local_x -= 16;
blocks = state->up_right_blocks;
skylight = self->up_right_skylight;
blocklight = self->up_right_blocklight;
} }
/* make sure we have correctly-ranged coordinates */ /* make sure we have correctly-ranged coordinates */
@@ -325,6 +335,10 @@ rendermode_lighting_start(void *data, RenderState *state, PyObject *options) {
self->left_blocklight = PyObject_GetAttrString(state->self, "left_blocklight"); self->left_blocklight = PyObject_GetAttrString(state->self, "left_blocklight");
self->right_skylight = PyObject_GetAttrString(state->self, "right_skylight"); self->right_skylight = PyObject_GetAttrString(state->self, "right_skylight");
self->right_blocklight = PyObject_GetAttrString(state->self, "right_blocklight"); self->right_blocklight = PyObject_GetAttrString(state->self, "right_blocklight");
self->up_left_skylight = PyObject_GetAttrString(state->self, "up_left_skylight");
self->up_left_blocklight = PyObject_GetAttrString(state->self, "up_left_blocklight");
self->up_right_skylight = PyObject_GetAttrString(state->self, "up_right_skylight");
self->up_right_blocklight = PyObject_GetAttrString(state->self, "up_right_blocklight");
self->calculate_light_color = calculate_light_color; self->calculate_light_color = calculate_light_color;
@@ -356,6 +370,10 @@ rendermode_lighting_finish(void *data, RenderState *state) {
Py_DECREF(self->left_blocklight); Py_DECREF(self->left_blocklight);
Py_DECREF(self->right_skylight); Py_DECREF(self->right_skylight);
Py_DECREF(self->right_blocklight); Py_DECREF(self->right_blocklight);
Py_DECREF(self->up_left_skylight);
Py_DECREF(self->up_left_blocklight);
Py_DECREF(self->up_right_skylight);
Py_DECREF(self->up_right_blocklight);
/* now chain up */ /* now chain up */
rendermode_normal.finish(data, state); rendermode_normal.finish(data, state);

2
overviewer_core/src/rendermodes.h
View File

@@ -165,6 +165,8 @@ typedef struct {
PyObject *skylight, *blocklight; PyObject *skylight, *blocklight;
PyObject *left_skylight, *left_blocklight; PyObject *left_skylight, *left_blocklight;
PyObject *right_skylight, *right_blocklight; PyObject *right_skylight, *right_blocklight;
PyObject *up_left_skylight, *up_left_blocklight;
PyObject *up_right_skylight, *up_right_blocklight;
/* light color image, loaded if color_light is True */ /* light color image, loaded if color_light is True */
PyObject *lightcolor; PyObject *lightcolor;