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

extract method rotateVertices

Browse Source 
xxx extract method
This commit is contained in:
David Vierra 2015-01-03 13:02:59 -10:00
parent 5e2b792591
commit c39f2c19ee
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,48 +245,47 @@ class BlockModels(object):
if variantYrot:
cullface = rotateFace(cullface, 1, variantYrot)
if rotation is not None:
origin = rotation["origin"]
axis = rotation["axis"]
angle = rotation["angle"]
rescale = rotation.get("rescale", False)
matrix = npRotate(axis, angle, rescale)
ox, oy, oz = origin
origin = ox/16., oy/16., oz/16.
xyzuvc[:, :3] -= origin
xyz = xyzuvc[:, :3].transpose()
xyzuvc[:, :3] = (matrix[:3, :3] * xyz).transpose()
xyzuvc[:, :3] += origin
rotate = variantXrot or variantYrot or variantZrot
if rotate:
matrix = numpy.matrix(numpy.identity(4))
if variantYrot:
matrix *= npRotate("y", -variantYrot)
if variantXrot:
matrix *= npRotate("x", -variantXrot)
if variantZrot:
matrix *= npRotate("z", -variantZrot)
xyzuvc[:, :3] -= 0.5, 0.5, 0.5
xyz = xyzuvc[:, :3].transpose()
xyzuvc[:, :3] = (matrix[:3, :3] * xyz).transpose()
xyzuvc[:, :3] += 0.5, 0.5, 0.5
self.rotateVertices(rotation, variantXrot, variantYrot, variantZrot, xyzuvc)
if shade:
xyzuvc.view('uint8')[:, 20:] = faceShades[face]
else:
xyzuvc.view('uint8')[:, 20:] = 0xff
cookedQuads.append((face, xyzuvc, cullface))
cookedModels[nameAndState] = cookedQuads
self.cookedModels = cookedModels
def rotateVertices(self, rotation, variantXrot, variantYrot, variantZrot, xyzuvc):
if rotation is not None:
origin = rotation["origin"]
axis = rotation["axis"]
angle = rotation["angle"]
rescale = rotation.get("rescale", False)
matrix = npRotate(axis, angle, rescale)
ox, oy, oz = origin
origin = ox / 16., oy / 16., oz / 16.
xyzuvc[:, :3] -= origin
xyz = xyzuvc[:, :3].transpose()
xyzuvc[:, :3] = (matrix[:3, :3] * xyz).transpose()
xyzuvc[:, :3] += origin
rotate = variantXrot or variantYrot or variantZrot
if rotate:
matrix = numpy.matrix(numpy.identity(4))
if variantYrot:
matrix *= npRotate("y", -variantYrot)
if variantXrot:
matrix *= npRotate("x", -variantXrot)
if variantZrot:
matrix *= npRotate("z", -variantZrot)
xyzuvc[:, :3] -= 0.5, 0.5, 0.5
xyz = xyzuvc[:, :3].transpose()
xyzuvc[:, :3] = (matrix[:3, :3] * xyz).transpose()
xyzuvc[:, :3] += 0.5, 0.5, 0.5
faceRotations = (
(
faces.FaceYIncreasing,