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

BrushCommand uses UnionBox instead of reduce to combine selections

Browse Source
This commit is contained in:
David Vierra 2016-01-31 20:02:48 -10:00
parent 2c7045d6fc
commit 76090f6d36
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mcedit2/editortools/brush/__init__.py
View File

@ -22,6 +22,7 @@ from mcedit2.util import bresenham
from mcedit2.util.showprogress import showProgress from mcedit2.util.showprogress import showProgress
from mcedit2.util.worldloader import WorldLoader from mcedit2.util.worldloader import WorldLoader
from mceditlib.geometry import Vector from mceditlib.geometry import Vector
from mceditlib.selection import UnionBox
from mceditlib.util import exhaust from mceditlib.util import exhaust
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -69,12 +70,11 @@ class BrushCommand(SimplePerformCommand):
exhaust(self._perform()) exhaust(self._perform())
def _perform(self): def _perform(self):
yield 0, len(self.points), "Applying {0} brush...".format(self.brushMode.name)
try: try:
selections = [self.brushShape.createShapedSelection(self.brushMode.brushBoxForPoint(point, self.options), selections = [self.brushShape.createShapedSelection(self.brushMode.brushBoxForPoint(point, self.options),
self.editorSession.currentDimension) self.editorSession.currentDimension)
for point in self.points] for point in self.points]
selection = reduce(lambda a, b: a | b, selections) selection = UnionBox(*selections)
for i in self.brushMode.applyToSelection(self, selection): for i in self.brushMode.applyToSelection(self, selection):
yield i yield i
except NotImplementedError: except NotImplementedError: