Revert "ToolBar buttons to add and remove objects. (#18)"
This reverts commit ed604eb655.
This commit is contained in:
@@ -48,16 +48,6 @@ MainWindow::MainWindow(QWidget * parent) : QMainWindow(parent)
|
||||
&Qtk::ToolBox::updateFocus);
|
||||
}
|
||||
|
||||
connect(ui_->actionDelete_Object,
|
||||
&QAction::triggered,
|
||||
this,
|
||||
&MainWindow::deleteObject);
|
||||
|
||||
connect(ui_->actionLoad_Model,
|
||||
&QAction::triggered,
|
||||
this,
|
||||
&MainWindow::loadObject);
|
||||
|
||||
// TODO: Fix / use MainWindow in Qt Designer to add these dock widgets.
|
||||
// For now we will add them manually, but we should be able to do this in the
|
||||
// designer. At the moment if you edit the UI in designer the dock widget
|
||||
@@ -114,26 +104,6 @@ void MainWindow::refreshScene(const QString & sceneName)
|
||||
ui_->qtk__TreeView->updateView(getQtkWidget()->getScene());
|
||||
}
|
||||
|
||||
void MainWindow::deleteObject()
|
||||
{
|
||||
if (auto object = ui_->qtk__ToolBox->getObjectFocus(); object != Q_NULLPTR) {
|
||||
auto scene = getQtkWidget()->getScene();
|
||||
switch (object->getType()) {
|
||||
case Qtk::Object::Type::QTK_MESH:
|
||||
scene->removeObject(dynamic_cast<Qtk::MeshRenderer *>(object));
|
||||
ui_->qtk__ToolBox->clearFocus();
|
||||
break;
|
||||
case Qtk::Object::Type::QTK_MODEL:
|
||||
scene->removeObject(dynamic_cast<Qtk::Model *>(object));
|
||||
ui_->qtk__ToolBox->clearFocus();
|
||||
break;
|
||||
default:
|
||||
qDebug() << "Failed to delete model with invalid type";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void MainWindow::setScene(Qtk::Scene * scene)
|
||||
{
|
||||
connect(scene,
|
||||
|
||||
@@ -11,8 +11,8 @@
|
||||
|
||||
#include <unordered_map>
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <QMainWindow>
|
||||
#include <QPlainTextEdit>
|
||||
|
||||
#include "designer-plugins/debugconsole.h"
|
||||
|
||||
@@ -144,23 +144,6 @@ class MainWindow : public QMainWindow
|
||||
*/
|
||||
void refreshScene(const QString & sceneName);
|
||||
|
||||
|
||||
/**
|
||||
* Opens a QFileDialog for selecting an object file to load into the scene.
|
||||
*/
|
||||
void loadObject()
|
||||
{
|
||||
const QUrl file = QFileDialog::getOpenFileName(
|
||||
this, tr("Load Model"), QDir::homePath(), tr("Object Files (*.obj)"));
|
||||
getQtkWidget()->getScene()->loadModel(file.fileName().replace(".obj", ""),
|
||||
file.toString());
|
||||
}
|
||||
|
||||
/**
|
||||
* Deletes the currently selected object from the scene.
|
||||
*/
|
||||
void deleteObject();
|
||||
|
||||
private:
|
||||
/***************************************************************************
|
||||
* Private Members
|
||||
|
||||
@@ -223,7 +223,7 @@
|
||||
</action>
|
||||
<action name="actionLoad_Model">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
@@ -238,7 +238,7 @@
|
||||
</action>
|
||||
<action name="actionDelete_Object">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset>
|
||||
|
||||
Reference in New Issue
Block a user