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

pep8 compliance: E225 missing whitespace around operator

Browse Source
This commit is contained in:
David Sowder 2012-02-19 17:23:42 -06:00
parent 450d7c4188
commit 499e6e726f
1 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
renderer.py
View File

@ -257,42 +257,42 @@ def makeVertexTemplates(xmin=0, ymin=0, zmin=0, xmax=1, ymax=1, zmax=1):
return array([ return array([
# FaceXIncreasing: # FaceXIncreasing:
[[xmax, ymin, zmax, (zmin*16), 16-(ymin*16), 0x0b], [[xmax, ymin, zmax, (zmin * 16), 16 - (ymin * 16), 0x0b],
[xmax, ymin, zmin, (zmax*16), 16-(ymin*16), 0x0b], [xmax, ymin, zmin, (zmax * 16), 16 - (ymin * 16), 0x0b],
[xmax, ymax, zmin, (zmax*16), 16-(ymax*16), 0x0b], [xmax, ymax, zmin, (zmax * 16), 16 - (ymax * 16), 0x0b],
[xmax, ymax, zmax, (zmin*16), 16-(ymax*16), 0x0b], [xmax, ymax, zmax, (zmin * 16), 16 - (ymax * 16), 0x0b],
], ],
# FaceXDecreasing: # FaceXDecreasing:
[[xmin, ymin, zmin, (zmin*16), 16-(ymin*16), 0x0b], [[xmin, ymin, zmin, (zmin * 16), 16 - (ymin * 16), 0x0b],
[xmin, ymin, zmax, (zmax*16), 16-(ymin*16), 0x0b], [xmin, ymin, zmax, (zmax * 16), 16 - (ymin * 16), 0x0b],
[xmin, ymax, zmax, (zmax*16), 16-(ymax*16), 0x0b], [xmin, ymax, zmax, (zmax * 16), 16 - (ymax * 16), 0x0b],
[xmin, ymax, zmin, (zmin*16), 16-(ymax*16), 0x0b]], [xmin, ymax, zmin, (zmin * 16), 16 - (ymax * 16), 0x0b]],
# FaceYIncreasing: # FaceYIncreasing:
[[xmin, ymax, zmin, xmin*16, 16-(zmax*16), 0x11], # ne [[xmin, ymax, zmin, xmin * 16, 16 - (zmax * 16), 0x11], # ne
[xmin, ymax, zmax, xmin*16, 16-(zmin*16), 0x11], # nw [xmin, ymax, zmax, xmin * 16, 16 - (zmin * 16), 0x11], # nw
[xmax, ymax, zmax, xmax*16, 16-(zmin*16), 0x11], # sw [xmax, ymax, zmax, xmax * 16, 16 - (zmin * 16), 0x11], # sw
[xmax, ymax, zmin, xmax*16, 16-(zmax*16), 0x11]], # se [xmax, ymax, zmin, xmax * 16, 16 - (zmax * 16), 0x11]], # se
# FaceYDecreasing: # FaceYDecreasing:
[[xmin, ymin, zmin, xmin*16, 16-(zmax*16), 0x08], [[xmin, ymin, zmin, xmin * 16, 16 - (zmax * 16), 0x08],
[xmax, ymin, zmin, xmax*16, 16-(zmax*16), 0x08], [xmax, ymin, zmin, xmax * 16, 16 - (zmax * 16), 0x08],
[xmax, ymin, zmax, xmax*16, 16-(zmin*16), 0x08], [xmax, ymin, zmax, xmax * 16, 16 - (zmin * 16), 0x08],
[xmin, ymin, zmax, xmin*16, 16-(zmin*16), 0x08]], [xmin, ymin, zmax, xmin * 16, 16 - (zmin * 16), 0x08]],
# FaceZIncreasing: # FaceZIncreasing:
[[xmin, ymin, zmax, xmin*16, 16-(ymin*16), 0x0d], [[xmin, ymin, zmax, xmin * 16, 16 - (ymin * 16), 0x0d],
[xmax, ymin, zmax, xmax*16, 16-(ymin*16), 0x0d], [xmax, ymin, zmax, xmax * 16, 16 - (ymin * 16), 0x0d],
[xmax, ymax, zmax, xmax*16, 16-(ymax*16), 0x0d], [xmax, ymax, zmax, xmax * 16, 16 - (ymax * 16), 0x0d],
[xmin, ymax, zmax, xmin*16, 16-(ymax*16), 0x0d]], [xmin, ymax, zmax, xmin * 16, 16 - (ymax * 16), 0x0d]],
# FaceZDecreasing: # FaceZDecreasing:
[[xmax, ymin, zmin, xmin*16, 16-(ymin*16), 0x0d], [[xmax, ymin, zmin, xmin * 16, 16 - (ymin * 16), 0x0d],
[xmin, ymin, zmin, xmax*16, 16-(ymin*16), 0x0d], [xmin, ymin, zmin, xmax * 16, 16 - (ymin * 16), 0x0d],
[xmin, ymax, zmin, xmax*16, 16-(ymax*16), 0x0d], [xmin, ymax, zmin, xmax * 16, 16 - (ymax * 16), 0x0d],
[xmax, ymax, zmin, xmin*16, 16-(ymax*16), 0x0d], [xmax, ymax, zmin, xmin * 16, 16 - (ymax * 16), 0x0d],
], ],
]) ])
@ -301,7 +301,7 @@ elementByteLength = 24
def createPrecomputedVertices(): def createPrecomputedVertices():
height=16 height = 16
precomputedVertices = [zeros(shape=(16, 16, height, 4, 6), # x,y,z,s,t,rg, ba precomputedVertices = [zeros(shape=(16, 16, height, 4, 6), # x,y,z,s,t,rg, ba
dtype='float32') for d in faceVertexTemplates] dtype='float32') for d in faceVertexTemplates]
@ -334,7 +334,7 @@ class ChunkCalculator (object):
self.makeRenderstates(level.materials) self.makeRenderstates(level.materials)
# del xArray, zArray, yArray # del xArray, zArray, yArray
self.nullVertices = zeros((0,)*len(self.precomputedVertices[0].shape), dtype=self.precomputedVertices[0].dtype) self.nullVertices = zeros((0,) * len(self.precomputedVertices[0].shape), dtype = self.precomputedVertices[0].dtype)
from leveleditor import Settings from leveleditor import Settings
Settings.fastLeaves.addObserver(self) Settings.fastLeaves.addObserver(self)
@ -678,8 +678,8 @@ class ChunkCalculator (object):
asx = asz = slice(0, 18) asx = asz = slice(0, 18)
for y in range(0, chunk.world.Height, 16): for y in range(0, chunk.world.Height, 16):
sy = slice(y, y+16) sy = slice(y, y + 16)
asy = slice(y, y+18) asy = slice(y, y + 18)
for _i in self.computeCubeGeometry( for _i in self.computeCubeGeometry(
y, y,
@ -758,7 +758,7 @@ class BlockRenderer(object):
a.view('uint8')[_RGBA][..., 3] = alpha a.view('uint8')[_RGBA][..., 3] = alpha
def bufferSize(self): def bufferSize(self):
return sum(a.size for a in self.vertexArrays)* 4 return sum(a.size for a in self.vertexArrays) * 4
def getMaterialIndices(self, blockMaterials): def getMaterialIndices(self, blockMaterials):
return blockMaterials == self.materialIndex return blockMaterials == self.materialIndex
@ -1761,7 +1761,7 @@ class FeatureBlockRenderer(BlockRenderer):
self.vertexArrays = [vertexArray] self.vertexArrays = [vertexArray]
fenceTemplates = makeVertexTemplates(3/8., 0, 3/8., 5/8., 1, 5/8.) fenceTemplates = makeVertexTemplates(3 / 8., 0, 3 / 8., 5 / 8., 1, 5 / 8.)
def fenceVertices(self, facingBlockIndices, blocks, blockMaterials, blockData, areaBlockLights, texMap): def fenceVertices(self, facingBlockIndices, blocks, blockMaterials, blockData, areaBlockLights, texMap):
fenceMask = blocks == alphaMaterials.Fence.ID fenceMask = blocks == alphaMaterials.Fence.ID
@ -1837,7 +1837,7 @@ class StairBlockRenderer(BlockRenderer):
vertexArray.view('uint8')[_RGB] *= 0xf vertexArray.view('uint8')[_RGB] *= 0xf
vertexArray.view('uint8')[_A] = 0xff vertexArray.view('uint8')[_A] = 0xff
vertexArray.shape = (len(x)*6, 4, 6) vertexArray.shape = (len(x) * 6, 4, 6)
yield yield
arrays.append(vertexArray) arrays.append(vertexArray)
self.vertexArrays = arrays self.vertexArrays = arrays
@ -2668,7 +2668,7 @@ class MCRenderer(object):
cr = self.getChunkRenderer(c) cr = self.getChunkRenderer(c)
if self.viewingFrustum: if self.viewingFrustum:
# if not self.viewingFrustum.visible(array([[c[0] * 16 + 8, 64, c[1] * 16 + 8, 1.0]]), 64).any(): # if not self.viewingFrustum.visible(array([[c[0] * 16 + 8, 64, c[1] * 16 + 8, 1.0]]), 64).any():
if not self.viewingFrustum.visible1([c[0] * 16 + 8, self.level.Height/2, c[1] * 16 + 8, 1.0], self.level.Height/2): if not self.viewingFrustum.visible1([c[0] * 16 + 8, self.level.Height / 2, c[1] * 16 + 8, 1.0], self.level.Height / 2):
raise StopIteration raise StopIteration
yield yield