Add "Hollow" option to brush tool

src/mcedit2/editortools/brush/__init__.py

@@ -23,6 +23,7 @@ from mcedit2.util.showprogress import showProgress
 from mcedit2.util.worldloader import WorldLoader
 from mceditlib.geometry import Vector
 from mceditlib.selection import UnionBox
+from mceditlib.selection.hollow import HollowSelection
 from mceditlib.util import exhaust
 
 log = logging.getLogger(__name__)
@@ -74,7 +75,18 @@ class BrushCommand(SimplePerformCommand):
             selections = [self.brushShape.createShapedSelection(self.brushMode.brushBoxForPoint(point, self.options),
                                                                 self.editorSession.currentDimension)
                           for point in self.points]
+
+            if len(selections) > 1:
                 selection = UnionBox(*selections)
+            elif len(selections) == 0:
+                yield 0
+                return
+            else:
+                selection = selections[0]
+
+            if self.hollow:
+                selection = HollowSelection(selection)
+
             for i in self.brushMode.applyToSelection(self, selection):
                 yield i
         except NotImplementedError:
@@ -209,7 +221,8 @@ class BrushTool(EditorTool):
     def options(self):
         options = {'brushSize': self.brushSize,
                    'brushShape': self.brushShape,
-                   'brushMode': self.brushMode}
+                   'brushMode': self.brushMode,
+                   'brushHollow': self.brushHollow}
         options.update(self.brushMode.getOptions())
         return options
 
@@ -225,6 +238,10 @@ class BrushTool(EditorTool):
     def brushShape(self):
         return self.toolWidget.brushShapeInput.currentShape
 
+    @property
+    def brushHollow(self):
+        return self.toolWidget.hollowCheckBox.isChecked()
+
     def updateCursor(self):
         log.info("Updating brush cursor")
         if self.cursorWorldScene:

src/mcedit2/editortools/brush/shapes.py

@@ -114,6 +114,10 @@ class Round(BrushShape):
         radius = shape / 2.0
         offset = radius - 0.5
 
+        if 0 in radius:
+            log.warn("Zero volume shape: %s", shape)
+            return None
+
         blockPositions -= offset[:, None, None, None]
 
         blockPositions *= blockPositions
@@ -132,22 +136,9 @@ class Square(BrushShape):
         super(Square, self).__init__()
         self.displayName = self.tr("Square")
 
-        self.optionsWidget = QtGui.QWidget()
-        self.hollowCheckbox = QtGui.QCheckBox()
-        self.optionsWidget.setLayout(Column(self.hollowCheckbox))
-        self.hollowCheckbox.toggled.connect(self.hollowChanged)
-
-    def hollowChanged(self):
-        # can't connect toggled to optionsChanged directly because toggled emits with the
-        # new check state as an arg, but optionsChanged takes no args.
-        self.optionsChanged.emit()
-
     def createShapedSelection(self, box, dimension):
         return BoundingBox(box.origin, box.size)
 
-    def getOptionsWidget(self):
-        return self.optionsWidget
-
 
 class Diamond(BrushShape):
     ID = "Diamond"

src/mcedit2/ui/editortools/brush.ui

@@ -13,7 +13,7 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,1">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0" colspan="2">
@@ -32,14 +32,14 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="0">
+     <item row="2" column="0">
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Width:</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="1">
+     <item row="2" column="1">
       <widget class="SpinSlider" name="xSpinSlider" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -49,14 +49,14 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="0">
+     <item row="3" column="0">
       <widget class="QLabel" name="label_3">
        <property name="text">
         <string>Height:</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1">
+     <item row="3" column="1">
       <widget class="SpinSlider" name="ySpinSlider" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -66,14 +66,14 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="0">
+     <item row="4" column="0">
       <widget class="QLabel" name="label_4">
        <property name="text">
         <string>Length:</string>
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
+     <item row="4" column="1">
       <widget class="SpinSlider" name="zSpinSlider" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -83,14 +83,14 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="0">
+     <item row="5" column="0">
       <widget class="QLabel" name="label_7">
        <property name="text">
         <string>Hover:</string>
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
+     <item row="5" column="1">
       <widget class="SpinSlider" name="hoverSpinSlider" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -100,14 +100,14 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="0">
+     <item row="6" column="0">
       <widget class="QLabel" name="label_5">
        <property name="text">
         <string>Mode:</string>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
+     <item row="6" column="1">
       <widget class="BrushModeWidget" name="brushModeInput" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -117,6 +117,30 @@
        </property>
       </widget>
      </item>
+     <item row="1" column="0" colspan="2">
+      <layout class="QHBoxLayout" name="horizontalLayout_4">
+       <item>
+        <widget class="QCheckBox" name="hollowCheckBox">
+         <property name="text">
+          <string>Hollow</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
     </layout>
    </item>
    <item>

src/mceditlib/selection/hollow.py

@@ -0,0 +1,51 @@
+"""
+    hollow
+"""
+from __future__ import absolute_import, division, print_function, unicode_literals
+import logging
+
+import numpy
+
+from mceditlib.selection import SelectionBox
+
+log = logging.getLogger(__name__)
+
+
+class HollowSelection(SelectionBox):
+    def __init__(self, base):
+        super(HollowSelection, self).__init__()
+
+        self.base = base
+        self.mincx = base.mincx
+        self.mincy = base.mincy
+        self.mincz = base.mincz
+        self.maxcx = base.maxcx
+        self.maxcy = base.maxcy
+        self.maxcz = base.maxcz
+
+    def box_mask(self, box):
+
+        bigBox = box.expand(1)
+
+        mask = self.base.box_mask(bigBox)
+
+        # Find exposed faces
+
+        exposedY = mask[:-1] != mask[1:]
+        exposedZ = mask[:, :-1] != mask[:, 1:]
+        exposedX = mask[:, :, :-1] != mask[:, :, 1:]
+
+        # Any block with exposed faces is rendered
+
+        exposed = exposedY[:-1, 1:-1, 1:-1]
+        exposed |= exposedY[1:, 1:-1, 1:-1]
+        exposed |= exposedZ[1:-1, :-1, 1:-1]
+        exposed |= exposedZ[1:-1, 1:, 1:-1]
+        exposed |= exposedX[1:-1, 1:-1, :-1]
+        exposed |= exposedX[1:-1, 1:-1, 1:]
+
+        mask = mask[1:-1,1:-1,1:-1]
+        result = mask & exposed
+        log.info("%d blocks in mask, %d present after hollow", mask.sum(), result.sum())
+
+        return result