LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

changed lighting rendermode to use new state variables

Browse Source
This commit is contained in:
Aaron Griffith
2011-03-24 19:44:21 -04:00
parent 2d64d2d84d
commit d84af9fa4b
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rendermode-lighting.c
View File

@@ -55,12 +55,12 @@ get_lighting_coefficient(RenderModeLighting *self, RenderState *state,
blocklight = self->blocklight; blocklight = self->blocklight;
} else if (x < 0) { } else if (x < 0) {
local_x += 16; local_x += 16;
blocks = self->left_blocks; blocks = state->left_blocks;
skylight = self->left_skylight; skylight = self->left_skylight;
blocklight = self->left_blocklight; blocklight = self->left_blocklight;
} else if (y >= 16) { } else if (y >= 16) {
local_y -= 16; local_y -= 16;
blocks = self->right_blocks; blocks = state->right_blocks;
skylight = self->right_skylight; skylight = self->right_skylight;
blocklight = self->right_blocklight; blocklight = self->right_blocklight;
} }
@@ -176,12 +176,8 @@ rendermode_lighting_start(void *data, RenderState *state) {
self->skylight = PyObject_GetAttrString(state->self, "skylight"); self->skylight = PyObject_GetAttrString(state->self, "skylight");
self->blocklight = PyObject_GetAttrString(state->self, "blocklight"); self->blocklight = PyObject_GetAttrString(state->self, "blocklight");
self->left_blocks = PyObject_GetAttrString(state->self, "left_blocks");
self->left_skylight = PyObject_GetAttrString(state->self, "left_skylight"); self->left_skylight = PyObject_GetAttrString(state->self, "left_skylight");
self->left_blocklight = PyObject_GetAttrString(state->self, "left_blocklight"); self->left_blocklight = PyObject_GetAttrString(state->self, "left_blocklight");
self->right_blocks = PyObject_GetAttrString(state->self, "right_blocks");
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");
@@ -199,12 +195,8 @@ rendermode_lighting_finish(void *data, RenderState *state) {
Py_DECREF(self->skylight); Py_DECREF(self->skylight);
Py_DECREF(self->blocklight); Py_DECREF(self->blocklight);
Py_DECREF(self->left_blocks);
Py_DECREF(self->left_skylight); Py_DECREF(self->left_skylight);
Py_DECREF(self->left_blocklight); Py_DECREF(self->left_blocklight);
Py_DECREF(self->right_blocks);
Py_DECREF(self->right_skylight); Py_DECREF(self->right_skylight);
Py_DECREF(self->right_blocklight); Py_DECREF(self->right_blocklight);

6
src/rendermodes.h
View File

@@ -72,10 +72,10 @@ typedef struct {
PyObject *black_color, *facemasks_py; PyObject *black_color, *facemasks_py;
PyObject *facemasks[3]; PyObject *facemasks[3];
/* extra block data, loaded off the chunk class */ /* extra data, loaded off the chunk class */
PyObject *skylight, *blocklight; PyObject *skylight, *blocklight;
PyObject *left_blocks, *left_skylight, *left_blocklight; PyObject *left_skylight, *left_blocklight;
PyObject *right_blocks, *right_skylight, *right_blocklight; PyObject *right_skylight, *right_blocklight;
/* can be overridden in derived rendermodes to control lighting /* can be overridden in derived rendermodes to control lighting
arguments are skylight, blocklight */ arguments are skylight, blocklight */