LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Use the list of transparent_blocks from chunk.py.

Browse Source 
This fix is part 2 (of 2) of the graphical rendering glitch fix.
This commit is contained in:
Andrew Chin
2011-03-19 00:38:30 -04:00
parent 28b750b694
commit 1ac922983f
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/iterate.c
View File

@@ -22,9 +22,12 @@
/* macro for getting blockID from a chunk of memory */ /* macro for getting blockID from a chunk of memory */
#define getBlock(blockThing, x,y,z) (*(unsigned char *)(PyArray_GETPTR3(blockThing, (x), (y), (z)))) #define getBlock(blockThing, x,y,z) (*(unsigned char *)(PyArray_GETPTR3(blockThing, (x), (y), (z))))
static inline int isTransparent(unsigned char b) { static inline int isTransparent(PyObject* tup, unsigned char b) {
/* TODO expand this to include all transparent blocks */ PyObject *block = PyInt_FromLong(b);
return b == 0 || b == 8 || b == 9 || b == 18; int ret = PySequence_Contains(tup, block);
Py_DECREF(block);
return ret;
} }
/* helper to handle alpha_over calls involving a texture tuple */ /* helper to handle alpha_over calls involving a texture tuple */
@@ -56,7 +59,7 @@ chunk_render(PyObject *self, PyObject *args) {
PyObject *blocks_py; PyObject *blocks_py;
PyObject *textures, *blockmap, *special_blocks, *specialblockmap; PyObject *textures, *blockmap, *special_blocks, *specialblockmap, *chunk_mod;
int imgx, imgy; int imgx, imgy;
int x, y, z; int x, y, z;
@@ -83,17 +86,25 @@ chunk_render(PyObject *self, PyObject *args) {
/* /*
PyObject *left_blocks = PyObject_GetAttrString(chunk, "left_blocks"); PyObject *left_blocks = PyObject_GetAttrString(chunk, "left_blocks");
PyObject *right_blocks = PyObject_GetAttrString(chunk, "right_blocks"); PyObject *right_blocks = PyObject_GetAttrString(chunk, "right_blocks");
PyObject *transparent_blocks = PyObject_GetAttrString(chunk, "transparent_blocks");
*/ */
textures = PyImport_ImportModule("textures"); textures = PyImport_ImportModule("textures");
chunk_mod = PyImport_ImportModule("chunk");
/* TODO can these be global static? these don't change during program execution */ /* TODO can these be global static? these don't change during program execution */
blockmap = PyObject_GetAttrString(textures, "blockmap"); blockmap = PyObject_GetAttrString(textures, "blockmap");
special_blocks = PyObject_GetAttrString(textures, "special_blocks"); special_blocks = PyObject_GetAttrString(textures, "special_blocks");
specialblockmap = PyObject_GetAttrString(textures, "specialblockmap"); specialblockmap = PyObject_GetAttrString(textures, "specialblockmap");
PyObject *transparent_blocks = PyObject_GetAttrString(chunk_mod, "transparent_blocks");
if (transparent_blocks == NULL) {
PyErr_SetString(PyExc_ValueError,
"transparent_blocks is NULL");
return NULL;
}
Py_DECREF(textures); Py_DECREF(textures);
Py_DECREF(chunk_mod);
for (x = 15; x > -1; x--) { for (x = 15; x > -1; x--) {
for (y = 0; y < 16; y++) { for (y = 0; y < 16; y++) {
@@ -126,9 +137,9 @@ chunk_render(PyObject *self, PyObject *args) {
if ( (x != 0) && (y != 15) && (z != 127) && if ( (x != 0) && (y != 15) && (z != 127) &&
!isTransparent(getBlock(blocks_py, x-1, y, z)) && !isTransparent(transparent_blocks, getBlock(blocks_py, x-1, y, z)) &&
!isTransparent(getBlock(blocks_py, x, y, z+1)) && !isTransparent(transparent_blocks, getBlock(blocks_py, x, y, z+1)) &&
!isTransparent(getBlock(blocks_py, x, y+1, z))) { !isTransparent(transparent_blocks, getBlock(blocks_py, x, y+1, z))) {
continue; continue;
} }