LogalDeveloper/Minecraft-Overviewer
Archived
0
Fork 0
Code Activity

Improving the function generate pseudo_ancildata. (first part)

Browse Source
This commit is contained in:
Alejandro Aguilera
2011-01-12 23:42:43 +01:00
parent 850f4fcf7d
commit 5bf705dfe9
1 changed files with 57 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
chunk.py
View File

@@ -365,9 +365,22 @@ class ChunkRenderer(object):
return self._up_left_blocks return self._up_left_blocks
up_left_blocks = property(_load_up_left_blocks) up_left_blocks = property(_load_up_left_blocks)
def generate_pseudo_ancildata(self,x,y,z,blockid): def generate_pseudo_ancildata(self,x,y,z,blockid, north_position = ll ):
""" Generates a pseudo ancillary data for blocks that depend of """ Generates a pseudo ancillary data for blocks that depend of
what are surrounded and don't have ancillary data""" what are surrounded and don't have ancillary data
This uses a binary number of 4 digits to encode the info.
The encode is:
Bit: 1 2 3 4
Side: x y -x -y
Values: bit = 0 -> The corresponding side block is not blockid
bit = 1 -> The corresponding side block is not blockid
Example: if the bit1 is 1 that means that there is a block with
blockid in the side of the +x direction.
Once generate the pseudo_ancildata
"""
blocks = self.blocks blocks = self.blocks
up_left_blocks = self.up_left_blocks up_left_blocks = self.up_left_blocks
@@ -375,129 +388,50 @@ class ChunkRenderer(object):
left_blocks = self.left_blocks left_blocks = self.left_blocks
right_blocks = self.right_blocks right_blocks = self.right_blocks
if ( # The block is surrounded by 0 blocks with same blockid pseudo_data = 0
(up_right_blocks[0,y,z] != blockid if x == 15 else blocks[x+1,y,z] != blockid) and
(left_blocks[15,y,z] != blockid if x == 0 else blocks[x - 1,y,z] != blockid) and
(right_blocks[x,0,z] != blockid if y == 15 else blocks[x,y + 1,z] != blockid) and
(up_left_blocks[x,15,z] != blockid if y == 0 else blocks[x,y - 1,z] != blockid)
): return 1
# Now 3 in line, they should be more common: # check if we are in the border of a chunk and the chunk
# is in the border of the map
elif ( # The block is surrounded by 2 blocks with same blockid, along x axis if up_right_blocks[0,0,0] == None and x == 15 or
(up_right_blocks[0,y,z] == blockid if x == 15 else blocks[x+1,y,z] == blockid) and right_blocks[0,0,0] == None and y == 15 or
(left_blocks[15,y,z] == blockid if x == 0 else blocks[x - 1,y,z] == blockid) and left_blocks[0,0,0] == None and x == 0 or
(right_blocks[x,0,z] != blockid if y == 15 else blocks[x,y + 1,z] != blockid) and up_left_blocks[0,0,0] == None and y == 0:
(up_left_blocks[x,15,z] != blockid if y == 0 else blocks[x,y - 1,z] != blockid) return None
): return 2
elif ( # The block is surrounded by 2 blocks with same blockid, along y axis if up_right_blocks[0,y,z] == blockid if x == 15 else blocks[x+1,y,z] == blockid:
(up_right_blocks[0,y,z] != blockid if x == 15 else blocks[x+1,y,z] != blockid) and pseudo_data |= 0b1000
(left_blocks[15,y,z] != blockid if x == 0 else blocks[x - 1,y,z] != blockid) and
(right_blocks[x,0,z] == blockid if y == 15 else blocks[x,y + 1,z] == blockid) and
(up_left_blocks[x,15,z] == blockid if y == 0 else blocks[x,y - 1,z] == blockid)
): return 3
# Now 3 in corner: if right_blocks[x,0,z] == blockid if y == 15 else blocks[x,y + 1,z] == blockid:
pseudo_data |= 0b0100
elif ( # The block is surrounded by 2 blocks with same blockid, in a -y to x corner if left_blocks[15,y,z] == blockid if x == 0 else blocks[x - 1,y,z] == blockid:
(up_right_blocks[0,y,z] == blockid if x == 15 else blocks[x+1,y,z] == blockid) and pseudo_data |= 0b0010
(left_blocks[15,y,z] != blockid if x == 0 else blocks[x - 1,y,z] != blockid) and
(right_blocks[x,0,z] != blockid if y == 15 else blocks[x,y + 1,z] != blockid) and
(up_left_blocks[x,15,z] == blockid if y == 0 else blocks[x,y - 1,z] == blockid)
): return 4
elif ( # The block is surrounded by 2 blocks with same blockid, in a -y to -x corner if up_left_blocks[x,15,z] == blockid if y == 0 else blocks[x,y - 1,z] == blockid:
(up_right_blocks[0,y,z] != blockid if x == 15 else blocks[x+1,y,z] != blockid) and pseudo_data |= 0b0001
(left_blocks[15,y,z] == blockid if x == 0 else blocks[x - 1,y,z] == blockid) and
(right_blocks[x,0,z] != blockid if y == 15 else blocks[x,y + 1,z] != blockid) and
(up_left_blocks[x,15,z] == blockid if y == 0 else blocks[x,y - 1,z] == blockid)
): return 5
elif ( # The block is surrounded by 2 blocks with same blockid, in a y to -x corner if north_position == ll:
(up_right_blocks[0,y,z] != blockid if x == 15 else blocks[x+1,y,z] != blockid) and return pseudo_data
(left_blocks[15,y,z] == blockid if x == 0 else blocks[x - 1,y,z] == blockid) and
(right_blocks[x,0,z] == blockid if y == 15 else blocks[x,y + 1,z] == blockid) and
(up_left_blocks[x,15,z] != blockid if y == 0 else blocks[x,y - 1,z] != blockid)
): return 6
elif ( # The block is surrounded by 2 blocks with same blockid, in a y to x corner elif north_position == ul:
(up_right_blocks[0,y,z] == blockid if x == 15 else blocks[x+1,y,z] == blockid) and pseudo_data *= 2
(left_blocks[15,y,z] != blockid if x == 0 else blocks[x - 1,y,z] != blockid) and if pseudo_data > 15:
(right_blocks[x,0,z] == blockid if y == 15 else blocks[x,y + 1,z] == blockid) and pseudo_data -= 15
(up_left_blocks[x,15,z] != blockid if y == 0 else blocks[x,y - 1,z] != blockid) pseudo_data +=1
): return 7 return pseudo_data
# Now 1 in dead end: elif north_position == ul:
pseudo_data *= 2
if pseudo_data > 15:
pseudo_data -= 15
pseudo_data +=1
elif ( # The block is surrounded by 1 blocks with same blockid, in +x elif north_position == ul:
(up_right_blocks[0,y,z] == blockid if x == 15 else blocks[x+1,y,z] == blockid) and pseudo_data *= 2
(left_blocks[15,y,z] != blockid if x == 0 else blocks[x - 1,y,z] != blockid) and if pseudo_data > 15:
(right_blocks[x,0,z] != blockid if y == 15 else blocks[x,y + 1,z] != blockid) and pseudo_data -= 15
(up_left_blocks[x,15,z] != blockid if y == 0 else blocks[x,y - 1,z] != blockid) pseudo_data +=1
): return 8
elif ( # The block is surrounded by 1 blocks with same blockid, in -y
(up_right_blocks[0,y,z] != blockid if x == 15 else blocks[x+1,y,z] != blockid) and
(left_blocks[15,y,z] != blockid if x == 0 else blocks[x - 1,y,z] != blockid) and
(right_blocks[x,0,z] != blockid if y == 15 else blocks[x,y + 1,z] != blockid) and
(up_left_blocks[x,15,z] == blockid if y == 0 else blocks[x,y - 1,z] == blockid)
): return 9
elif ( # The block is surrounded by 1 blocks with same blockid, in -x
(up_right_blocks[0,y,z] != blockid if x == 15 else blocks[x+1,y,z] != blockid) and
(left_blocks[15,y,z] == blockid if x == 0 else blocks[x - 1,y,z] == blockid) and
(right_blocks[x,0,z] != blockid if y == 15 else blocks[x,y + 1,z] != blockid) and
(up_left_blocks[x,15,z] != blockid if y == 0 else blocks[x,y - 1,z] != blockid)
): return 10
elif ( # The block is surrounded by 1 blocks with same blockid, in +y
(up_right_blocks[0,y,z] != blockid if x == 15 else blocks[x+1,y,z] != blockid) and
(left_blocks[15,y,z] != blockid if x == 0 else blocks[x - 1,y,z] != blockid) and
(right_blocks[x,0,z] == blockid if y == 15 else blocks[x,y + 1,z] == blockid) and
(up_left_blocks[x,15,z] != blockid if y == 0 else blocks[x,y - 1,z] != blockid)
): return 11
# Now surrounded by 3 identical blocks:
elif ( # The block is surrounded by 3 blocks with same blockid, in postiions -x, -y, +x
(up_right_blocks[0,y,z] == blockid if x == 15 else blocks[x+1,y,z] == blockid) and
(left_blocks[15,y,z] == blockid if x == 0 else blocks[x - 1,y,z] == blockid) and
(right_blocks[x,0,z] != blockid if y == 15 else blocks[x,y + 1,z] != blockid) and
(up_left_blocks[x,15,z] == blockid if y == 0 else blocks[x,y - 1,z] == blockid)
): return 12
elif ( # The block is surrounded by 3 blocks with same blockid, in postiions +y, -y, -x
(up_right_blocks[0,y,z] != blockid if x == 15 else blocks[x+1,y,z] != blockid) and
(left_blocks[15,y,z] == blockid if x == 0 else blocks[x - 1,y,z] == blockid) and
(right_blocks[x,0,z] == blockid if y == 15 else blocks[x,y + 1,z] == blockid) and
(up_left_blocks[x,15,z] == blockid if y == 0 else blocks[x,y - 1,z] == blockid)
): return 13
elif ( # The block is surrounded by 3 blocks with same blockid, in postiions -x, +y, +x
(up_right_blocks[0,y,z] == blockid if x == 15 else blocks[x+1,y,z] == blockid) and
(left_blocks[15,y,z] == blockid if x == 0 else blocks[x - 1,y,z] == blockid) and
(right_blocks[x,0,z] == blockid if y == 15 else blocks[x,y + 1,z] == blockid) and
(up_left_blocks[x,15,z] != blockid if y == 0 else blocks[x,y - 1,z] != blockid)
): return 14
elif ( # The block is surrounded by 3 blocks with same blockid, in postiions +y, -y, +x
(up_right_blocks[0,y,z] == blockid if x == 15 else blocks[x+1,y,z] == blockid) and
(left_blocks[15,y,z] != blockid if x == 0 else blocks[x - 1,y,z] != blockid) and
(right_blocks[x,0,z] == blockid if y == 15 else blocks[x,y + 1,z] == blockid) and
(up_left_blocks[x,15,z] == blockid if y == 0 else blocks[x,y - 1,z] == blockid)
): return 15
# Block completely sourrounded by 4 blocks:
elif ( # The block is surrounded completely
(up_right_blocks[0,y,z] == blockid if x == 15 else blocks[x+1,y,z] == blockid) and
(left_blocks[15,y,z] == blockid if x == 0 else blocks[x - 1,y,z] == blockid) and
(right_blocks[x,0,z] == blockid if y == 15 else blocks[x,y + 1,z] == blockid) and
(up_left_blocks[x,15,z] == blockid if y == 0 else blocks[x,y - 1,z] == blockid)
): return 16
else: return None
def _hash_blockarray(self): def _hash_blockarray(self):
"""Finds a hash of the block array""" """Finds a hash of the block array"""