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

BoundingBox.intersect always returns a BoundingBox

Browse Source
This commit is contained in:
David Vierra 2015-10-14 06:02:10 -10:00
parent 169de72a74
commit 31829313ce
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mceditlib/selection/__init__.py
View File

@ -436,8 +436,9 @@ class BoundingBox(SelectionBox):
size = maximum - origin size = maximum - origin
if any(s<=0 for s in size): if any(s<=0 for s in size):
return ZeroBox return ZeroBox
#print "Intersect of {0} and {1}: {2}".format(self, box, newbox) # print "Intersect of {0} and {1}: {2}".format(self, box, newbox)
return self.__class__(origin, size) # return self.__class__(origin, size)
return BoundingBox(origin, size)
def union(self, box): def union(self, box):
""" """
@ -453,7 +454,8 @@ class BoundingBox(SelectionBox):
max(self.maxy, box.maxy), max(self.maxy, box.maxy),
max(self.maxz, box.maxz), max(self.maxz, box.maxz),
) )
return self.__class__(origin, maximum - origin) # return self.__class__(origin, maximum - origin)
return BoundingBox(origin, maximum - origin)
def expand(self, dx, dy=None, dz=None): def expand(self, dx, dy=None, dz=None):
""" """
@ -468,7 +470,8 @@ class BoundingBox(SelectionBox):
origin = self.origin - (dx, dy, dz) origin = self.origin - (dx, dy, dz)
size = self.size + (dx * 2, dy * 2, dz * 2) size = self.size + (dx * 2, dy * 2, dz * 2)
return self.__class__(origin, size) # return self.__class__(origin, size)
return BoundingBox(origin, size)
def __contains__(self, (x, y, z)): def __contains__(self, (x, y, z)):
if x < self.minx or x >= self.maxx: if x < self.minx or x >= self.maxx: