AstralTransRocketries/mcedit2
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Static defs in buildBoxQuads

Browse Source
This commit is contained in:
David Vierra 2015-03-05 03:21:23 -10:00
parent ecf57c0a95
commit f4c997a6ee
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/mcedit2/rendering/blockmodels.pyx
View File

@ -299,14 +299,20 @@ cdef class BlockModels(object):
cdef short u1, v1, u2, v2 cdef short u1, v1, u2, v2
cdef unicode texture, lasttexvar cdef unicode texture, lasttexvar
cdef short i cdef short i
cdef dict info
for face, info in element["faces"].iteritems(): for face, info in element["faces"].iteritems():
assert info is not None
face = facesByCardinal[face] face = facesByCardinal[face]
texture = info["texture"] texture = info["texture"]
cullface = info.get("cullface") cullface = info.get("cullface")
cullface = facesByCardinal[cullface] if cullface is not None else -1
u1, v1, u2, v2 = info.get("uv", [0, 0, 16, 16]) uv = info.get("uv")
if uv is not None:
u1, v1, u2, v2 = uv
else:
u1, v1, u2, v2 = 0, 0, 16, 16
lasttexvar = texture lasttexvar = texture
@ -332,7 +338,7 @@ cdef class BlockModels(object):
self._textureNames.add(texture) self._textureNames.add(texture)
quads.append(FaceInfo(x1, y1, z1, x2, y2, z2, face, quads.append(FaceInfo(x1, y1, z1, x2, y2, z2, face,
texture, u1, v1, u2, v2, facesByCardinal[cullface] if cullface is not None else -1, texture, u1, v1, u2, v2, cullface,
shade, ox, oy, oz, elementMatrix, info.get("rotation", 0), shade, ox, oy, oz, elementMatrix, info.get("rotation", 0),
variantXrot, variantYrot, variantZrot, variantMatrix, tintcolor)) variantXrot, variantYrot, variantZrot, variantMatrix, tintcolor))