Added simple "erase heightfield" tool.

interface/src/ui/MetavoxelEditor.cpp

@@ -26,6 +26,7 @@
 #include <QPushButton>
 #include <QRunnable>
 #include <QScrollArea>
+#include <QSpinBox>
 #include <QThreadPool>
 #include <QVBoxLayout>
 
@@ -116,6 +117,7 @@ MetavoxelEditor::MetavoxelEditor() :
     addTool(new ClearSpannersTool(this));
     addTool(new SetSpannerTool(this));
     addTool(new ImportHeightfieldTool(this));
+    addTool(new EraseHeightfieldTool(this));
     
     updateAttributes();
     
@@ -895,40 +897,68 @@ void SetSpannerTool::applyEdit(const AttributePointer& attribute, const SharedOb
         spannerData->getVoxelizationGranularity(), directionImages));
 }
 
-ImportHeightfieldTool::ImportHeightfieldTool(MetavoxelEditor* editor) :
-    MetavoxelTool(editor, "Import Heightfield", false) {
+HeightfieldTool::HeightfieldTool(MetavoxelEditor* editor, const QString& name) :
+    MetavoxelTool(editor, name, false) {
     
     QWidget* widget = new QWidget();
-    QFormLayout* form = new QFormLayout();
-    widget->setLayout(form);
+    widget->setLayout(_form = new QFormLayout());
     layout()->addWidget(widget);
     
-    form->addRow("Translation:", _translation = new Vec3Editor(widget));
-    form->addRow("Scale:", _scale = new QDoubleSpinBox());
+    _form->addRow("Translation:", _translation = new Vec3Editor(widget));
+    _form->addRow("Scale:", _scale = new QDoubleSpinBox());
     _scale->setMinimum(-FLT_MAX);
     _scale->setMaximum(FLT_MAX);
     _scale->setPrefix("2^");
     _scale->setValue(3.0);
-    form->addRow("Height:", _height = new QPushButton());
-    connect(_height, &QAbstractButton::clicked, this, &ImportHeightfieldTool::selectHeightFile);
-    form->addRow("Color:", _color = new QPushButton());
-    connect(_color, &QAbstractButton::clicked, this, &ImportHeightfieldTool::selectColorFile);
     
     QPushButton* applyButton = new QPushButton("Apply");
     layout()->addWidget(applyButton);
-    connect(applyButton, &QAbstractButton::clicked, this, &ImportHeightfieldTool::apply);
+    connect(applyButton, &QAbstractButton::clicked, this, &HeightfieldTool::apply);
 }
 
-bool ImportHeightfieldTool::appliesTo(const AttributePointer& attribute) const {
+bool HeightfieldTool::appliesTo(const AttributePointer& attribute) const {
     return attribute->inherits("HeightfieldAttribute");
 }
 
-void ImportHeightfieldTool::render() {
+void HeightfieldTool::render() {
     float scale = pow(2.0, _scale->value());
     _translation->setSingleStep(scale);
     glm::vec3 quantizedTranslation = scale * glm::floor(_translation->getValue() / scale);
     _translation->setValue(quantizedTranslation);
-    _preview.render(quantizedTranslation, scale);
+}
+
+ImportHeightfieldTool::ImportHeightfieldTool(MetavoxelEditor* editor) :
+    HeightfieldTool(editor, "Import Heightfield") {
+    
+    _form->addRow("Height:", _height = new QPushButton());
+    connect(_height, &QAbstractButton::clicked, this, &ImportHeightfieldTool::selectHeightFile);
+    _form->addRow("Color:", _color = new QPushButton());
+    connect(_color, &QAbstractButton::clicked, this, &ImportHeightfieldTool::selectColorFile);
+}
+
+void ImportHeightfieldTool::render() {
+    HeightfieldTool::render();
+    _preview.render(_translation->getValue(), _translation->getSingleStep());
+}
+
+void ImportHeightfieldTool::apply() {
+    float scale = _translation->getSingleStep();
+    foreach (const BufferDataPointer& bufferData, _preview.getBuffers()) {
+        HeightfieldBuffer* buffer = static_cast<HeightfieldBuffer*>(bufferData.data());
+        MetavoxelData data;
+        data.setSize(scale);
+        HeightfieldDataPointer heightPointer(new HeightfieldData(buffer->getHeight()));
+        data.setRoot(AttributeRegistry::getInstance()->getHeightfieldAttribute(), new MetavoxelNode(AttributeValue(
+            AttributeRegistry::getInstance()->getHeightfieldAttribute(), encodeInline(heightPointer))));
+        if (!buffer->getColor().isEmpty()) {
+            HeightfieldDataPointer colorPointer(new HeightfieldData(buffer->getColor()));
+            data.setRoot(AttributeRegistry::getInstance()->getHeightfieldColorAttribute(), new MetavoxelNode(AttributeValue(
+                AttributeRegistry::getInstance()->getHeightfieldColorAttribute(), encodeInline(colorPointer))));
+        }
+        MetavoxelEditMessage message = { QVariant::fromValue(SetDataEdit(
+            _translation->getValue() + buffer->getTranslation() * scale, data)) };
+        Application::getInstance()->getMetavoxels()->applyEdit(message, true);
+    }
 }
 
 void ImportHeightfieldTool::selectHeightFile() {
@@ -959,26 +989,6 @@ void ImportHeightfieldTool::selectColorFile() {
     updatePreview();
 }
 
-void ImportHeightfieldTool::apply() {
-    float scale = pow(2.0, _scale->value());
-    foreach (const BufferDataPointer& bufferData, _preview.getBuffers()) {
-        HeightfieldBuffer* buffer = static_cast<HeightfieldBuffer*>(bufferData.data());
-        MetavoxelData data;
-        data.setSize(scale);
-        HeightfieldDataPointer heightPointer(new HeightfieldData(buffer->getHeight()));
-        data.setRoot(AttributeRegistry::getInstance()->getHeightfieldAttribute(), new MetavoxelNode(AttributeValue(
-            AttributeRegistry::getInstance()->getHeightfieldAttribute(), encodeInline(heightPointer))));
-        if (!buffer->getColor().isEmpty()) {
-            HeightfieldDataPointer colorPointer(new HeightfieldData(buffer->getColor()));
-            data.setRoot(AttributeRegistry::getInstance()->getHeightfieldColorAttribute(), new MetavoxelNode(AttributeValue(
-                AttributeRegistry::getInstance()->getHeightfieldColorAttribute(), encodeInline(colorPointer))));
-        }
-        MetavoxelEditMessage message = { QVariant::fromValue(SetDataEdit(
-            _translation->getValue() + buffer->getTranslation() * scale, data)) };
-        Application::getInstance()->getMetavoxels()->applyEdit(message, true);
-    }
-}
-
 const int BLOCK_SIZE = 32;
 const int BLOCK_ADVANCEMENT = BLOCK_SIZE - 1;
 
@@ -1018,3 +1028,49 @@ void ImportHeightfieldTool::updatePreview() {
     }
     _preview.setBuffers(buffers);
 }
+
+EraseHeightfieldTool::EraseHeightfieldTool(MetavoxelEditor* editor) :
+    HeightfieldTool(editor, "Erase Heightfield") {
+    
+    _form->addRow("Width:", _width = new QSpinBox());
+    _width->setMinimum(1);
+    _width->setMaximum(INT_MAX);
+    _form->addRow("Length:", _length = new QSpinBox());
+    _length->setMinimum(1);
+    _length->setMaximum(INT_MAX);
+}
+
+void EraseHeightfieldTool::render() {
+    HeightfieldTool::render();
+    
+    glColor3f(1.0f, 0.0f, 0.0f);
+    glLineWidth(4.0f);
+    
+    glPushMatrix();
+    glm::vec3 translation = _translation->getValue();
+    glTranslatef(translation.x, translation.y, translation.z);
+    float scale = _translation->getSingleStep();
+    glScalef(scale * _width->value(), scale, scale * _length->value());
+    glTranslatef(0.5f, 0.5f, 0.5f);
+    
+    glutWireCube(1.0);
+    
+    glPopMatrix();
+    
+    glLineWidth(1.0f);
+}
+
+void EraseHeightfieldTool::apply() {
+    // clear the heightfield
+    float scale = _translation->getSingleStep();
+    BoxSetEdit edit(Box(_translation->getValue(), _translation->getValue() +
+        glm::vec3(_width->value() * scale, scale, _length->value() * scale)), scale,
+        OwnedAttributeValue(AttributeRegistry::getInstance()->getHeightfieldAttribute()));
+    MetavoxelEditMessage message = { QVariant::fromValue(edit) };
+    Application::getInstance()->getMetavoxels()->applyEdit(message, true);
+    
+    // and the color
+    edit.value = OwnedAttributeValue(AttributeRegistry::getInstance()->getHeightfieldColorAttribute());
+    message.edit = QVariant::fromValue(edit);
+    Application::getInstance()->getMetavoxels()->applyEdit(message, true);
+}

interface/src/ui/MetavoxelEditor.h

@@ -24,6 +24,7 @@ class QGroupBox;
 class QListWidget;
 class QPushButton;
 class QScrollArea;
+class QSpinBox;
 
 class MetavoxelTool;
 class Vec3Editor;
@@ -225,30 +226,52 @@ protected:
     virtual void applyEdit(const AttributePointer& attribute, const SharedObjectPointer& spanner);
 };
 
+/// Base class for heightfield tools.
+class HeightfieldTool : public MetavoxelTool {
+    Q_OBJECT
+
+public:
+    
+    HeightfieldTool(MetavoxelEditor* editor, const QString& name);
+    
+    virtual bool appliesTo(const AttributePointer& attribute) const;
+
+    virtual void render();
+    
+protected slots:
+
+    virtual void apply() = 0;
+
+protected:
+    
+    QFormLayout* _form;
+    Vec3Editor* _translation;
+    QDoubleSpinBox* _scale;
+};
+
 /// Allows importing a heightfield.
-class ImportHeightfieldTool : public MetavoxelTool {
+class ImportHeightfieldTool : public HeightfieldTool {
     Q_OBJECT
 
 public:
     
     ImportHeightfieldTool(MetavoxelEditor* editor);
     
-    virtual bool appliesTo(const AttributePointer& attribute) const;
-    
     virtual void render();
 
+protected:
+
+    virtual void apply();
+
 private slots:
 
     void selectHeightFile();
     void selectColorFile();
-    void apply();
 
 private:
 
     void updatePreview();
     
-    Vec3Editor* _translation;
-    QDoubleSpinBox* _scale;
     QPushButton* _height;
     QPushButton* _color;
     
@@ -258,4 +281,24 @@ private:
     HeightfieldPreview _preview;
 };
 
+// Allows clearing heighfield blocks.
+class EraseHeightfieldTool : public HeightfieldTool {
+    Q_OBJECT
+
+public:
+    
+    EraseHeightfieldTool(MetavoxelEditor* editor);
+    
+    virtual void render();
+    
+protected:
+    
+    virtual void apply();
+
+private:
+    
+    QSpinBox* _width;
+    QSpinBox* _length;
+};
+
 #endif // hifi_MetavoxelEditor_h

libraries/metavoxels/src/MetavoxelUtil.cpp

@@ -537,6 +537,10 @@ void BaseVec3Editor::setSingleStep(double singleStep) {
     _z->setSingleStep(singleStep);
 }
 
+double BaseVec3Editor::getSingleStep() const {
+    return _x->singleStep();
+}
+
 QDoubleSpinBox* BaseVec3Editor::createComponentBox() {
     QDoubleSpinBox* box = new QDoubleSpinBox();
     box->setMinimum(-FLT_MAX);

libraries/metavoxels/src/MetavoxelUtil.h

@@ -191,6 +191,7 @@ public:
     BaseVec3Editor(QWidget* parent);
 
     void setSingleStep(double singleStep);
+    double getSingleStep() const;
 
 protected slots: