editor/CMakeLists.txt

@@ -25,10 +25,8 @@ set(PROJECT_SOURCES
         mainwindow.ui
         mainglwidget.h
         mainglwidget.cpp
-        panes/explorerview.h
+        explorermodel.h
-        panes/explorerview.cpp
+        explorermodel.cpp
-        panes/explorermodel.h
-        panes/explorermodel.cpp
         ${TS_FILES}
 )
 

editor/explorermodel.cpp

@@ -1,14 +1,13 @@
 #include "explorermodel.h"
 #include "objects/base/instance.h"
-#include "qabstractitemmodel.h"
 #include "qcontainerfwd.h"
+#include "qicon.h"
 #include "qimage.h"
 #include "qnamespace.h"
 #include "qobject.h"
 #include "qwidget.h"
 #include "common.h"
 #include <algorithm>
-#include <cstdio>
 #include <optional>
 #include "objects/base/instance.h"
 
@@ -117,14 +116,6 @@ QVariant ExplorerModel::data(const QModelIndex &index, int role) const {
     return {};
 }
 
-bool ExplorerModel::setData(const QModelIndex &index, const QVariant &value, int role) {
-    if (!index.isValid() || role != Qt::EditRole) return false;
-
-    Instance* inst = static_cast<Instance*>(index.internalPointer());
-    inst->name = value.toString().toStdString();
-    return true;
-}
-
 QVariant ExplorerModel::headerData(int section, Qt::Orientation orientation,
                                int role) const
 {
@@ -133,11 +124,8 @@ QVariant ExplorerModel::headerData(int section, Qt::Orientation orientation,
 
 Qt::ItemFlags ExplorerModel::flags(const QModelIndex &index) const
 {
-    //return index.isValid()
-    //    ? QAbstractItemModel::flags(index) : Qt::ItemFlags(Qt::NoItemFlags);
     return index.isValid()
-        ? QAbstractItemModel::flags(index) | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled
+        ? QAbstractItemModel::flags(index) : Qt::ItemFlags(Qt::NoItemFlags);
-        : Qt::NoItemFlags | Qt::ItemIsDropEnabled;
 }
 
 QImage ExplorerModel::iconOf(InstanceType* type) const {
@@ -149,55 +137,4 @@ QImage ExplorerModel::iconOf(InstanceType* type) const {
     QImage icon("assets/icons/" + QString::fromStdString(currentClass->explorerIcon));
     instanceIconCache[type->className] = icon;
     return icon;
-}
-
-bool ExplorerModel::moveRows(const QModelIndex &sourceParentIdx, int sourceRow, int count, const QModelIndex &destinationParentIdx, int destinationChild) {
-    Instance* sourceParent = sourceParentIdx.isValid() ? static_cast<Instance*>(sourceParentIdx.internalPointer()) : workspace.get();
-    Instance* destinationParent = destinationParentIdx.isValid() ? static_cast<Instance*>(destinationParentIdx.internalPointer()) : workspace.get();
-
-    printf("Moved %d from %s\n", count, sourceParent->name.c_str());
-
-    if ((sourceRow + count) >= sourceParent->GetChildren().size()) {
-        fprintf(stderr, "Attempt to move rows %d-%d from %s (%s) while it only has %zu children.\n", sourceRow, sourceRow + count, sourceParent->name.c_str(), sourceParent->GetClass()->className.c_str(), sourceParent->GetChildren().size());
-        return false;
-    }
-
-    for (int i = sourceRow; i < (sourceRow + count); i++) {
-        sourceParent->GetChildren()[i]->SetParent(destinationParent->shared_from_this());
-    }
-
-    return true;
-}
-
-bool ExplorerModel::removeRows(int row, int count, const QModelIndex& parentIdx) {
-    Instance* parent = parentIdx.isValid() ? static_cast<Instance*>(parentIdx.internalPointer()) : workspace.get();
-    
-    for (int i = row; i < (row + count); i++) {
-        //parent->GetChildren()[i]->SetParent(nullptr);
-    }
-
-    return true;
-}
-
-bool ExplorerModel::insertRows(int row, int count, const QModelIndex & parentIdx) {
-    //Instance* parent = parentIdx.isValid() ? static_cast<Instance*>(parentIdx.internalPointer()) : workspace.get();
-    //beginInsertRows(parentIdx, parent->GetChildren().size(), parent->GetChildren().size() + count);
-    //for ()
-    //endInsertRows();
-    //return true;
-    return false;
-}
-
-Qt::DropActions ExplorerModel::supportedDragActions() const {
-    return Qt::DropAction::MoveAction;
-}
-
-Qt::DropActions ExplorerModel::supportedDropActions() const {
-    return Qt::DropAction::MoveAction;
-}
-
-
-InstanceRef ExplorerModel::fromIndex(const QModelIndex index) {
-    if (!index.isValid()) return workspace;
-    return static_cast<Instance*>(index.internalPointer())->shared_from_this();
 }

editor/explorermodel.h

@@ -1,19 +1,14 @@
-#pragma once
+#ifndef EXPLORERMODEL_H
+#define EXPLORERMODEL_H
 
 #include "objects/base/instance.h"
 #include "objects/part.h"
 #include "qabstractitemmodel.h"
 #include "qevent.h"
-#include "qmenu.h"
-#include "qnamespace.h"
-#include "qtreeview.h"
 #include <QOpenGLWidget>
 #include <QWidget>
 #include <memory>
 
-// #ifndef EXPLORERMODEL_H
-// #define EXPLORERMODEL_H
-
 class ExplorerModel : public QAbstractItemModel {
     Q_OBJECT
 public:
@@ -23,7 +18,6 @@ public:
     ~ExplorerModel() override;
 
     QVariant data(const QModelIndex &index, int role) const override;
-    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
     Qt::ItemFlags flags(const QModelIndex &index) const override;
     QVariant headerData(int section, Qt::Orientation orientation,
                         int role = Qt::DisplayRole) const override;
@@ -32,16 +26,11 @@ public:
     QModelIndex parent(const QModelIndex &index) const override;
     int rowCount(const QModelIndex &parent = {}) const override;
     int columnCount(const QModelIndex &parent = {}) const override;
-    bool moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) override;
+
-    bool removeRows(int row, int count, const QModelIndex & parent = QModelIndex()) override;
-    bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()) override;
-    Qt::DropActions supportedDragActions() const override;
-    Qt::DropActions supportedDropActions() const override;
-    InstanceRef fromIndex(const QModelIndex index);
 private:
     InstanceRef rootItem;
     QModelIndex toIndex(InstanceRef item);
     QImage iconOf(InstanceType* type) const;
 };
 
-// #endif
+#endif // EXPLORERMODEL_H

editor/mainwindow.cpp

@@ -10,11 +10,14 @@
 #include <QWidget>
 #include <QTreeView>
 #include <QAbstractItemView>
+#include <memory>
 
 #include "common.h"
 #include "physics/simulation.h"
 #include "objects/part.h"
-#include "qobject.h"
+#include "explorermodel.h"
+
+#include "wayland-pointer-constraints-unstable-v1-client-protocol.h"
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
@@ -24,7 +27,8 @@ MainWindow::MainWindow(QWidget *parent)
     timer.start(33, this);
     setMouseTracking(true);
 
-    // ui->explorerView->Init(ui);
+    ui->explorerView->setModel(new ExplorerModel(std::dynamic_pointer_cast<Instance>(workspace)));
+    ui->explorerView->setRootIsDecorated(false);
 
     simulationInit();
 
@@ -40,7 +44,6 @@ MainWindow::MainWindow(QWidget *parent)
         },
         .anchored = true,
     }));
-    ui->mainWidget->lastPart->name = "Baseplate";
     syncPartPhysics(ui->mainWidget->lastPart);
 
     workspace->AddChild(ui->mainWidget->lastPart = Part::New({

editor/mainwindow.h

@@ -1,10 +1,8 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "panes/explorerview.h"
 #include "qbasictimer.h"
 #include "qcoreevent.h"
-#include "qmenu.h"
 #include <QMainWindow>
 #include <QLineEdit>
 
@@ -22,8 +20,8 @@ public:
     MainWindow(QWidget *parent = nullptr);
     ~MainWindow();
     
-    Ui::MainWindow *ui;
 private:
+    Ui::MainWindow *ui;
     QBasicTimer timer;
 
     void timerEvent(QTimerEvent*) override;

editor/mainwindow.ui

@@ -44,18 +44,6 @@
      <height>29</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuFile">
-    <property name="title">
-     <string>File</string>
-    </property>
-   </widget>
-   <widget class="QMenu" name="menuEdit">
-    <property name="title">
-     <string>Edit</string>
-    </property>
-   </widget>
-   <addaction name="menuFile"/>
-   <addaction name="menuEdit"/>
   </widget>
   <widget class="QStatusBar" name="statusbar"/>
   <widget class="QDockWidget" name="explorerWidget">
@@ -68,7 +56,7 @@
    <widget class="QWidget" name="dockWidgetContents">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
-      <widget class="ExplorerView" name="explorerView"/>
+      <widget class="QTreeView" name="explorerView"/>
      </item>
     </layout>
    </widget>
@@ -80,11 +68,6 @@
    <extends>QOpenGLWidget</extends>
    <header>mainglwidget.h</header>
   </customwidget>
-  <customwidget>
-   <class>ExplorerView</class>
-   <extends>QTreeView</extends>
-   <header>panes/explorerview.h</header>
-  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

editor/panes/explorerview.cpp

@@ -1,49 +0,0 @@
-#include "explorerview.h"
-#include "explorermodel.h"
-#include "common.h"
-#include "qaction.h"
-#include "qnamespace.h"
-
-ExplorerView::ExplorerView(QWidget* parent):
-    QTreeView(parent),
-    model(ExplorerModel(std::dynamic_pointer_cast<Instance>(workspace))) {
-
-    this->setModel(&model);
-    this->setRootIsDecorated(false);
-    this->setDragDropMode(QAbstractItemView::InternalMove);
-    this->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    this->setDragEnabled(true);
-    this->setAcceptDrops(true);
-    this->setDropIndicatorShown(true);
-    this->setContextMenuPolicy(Qt::CustomContextMenu);
-
-    connect(this, &QTreeView::customContextMenuRequested, this, [&](const QPoint& point) {
-        QModelIndex index = this->indexAt(point);
-        contextMenu.exec(this->viewport()->mapToGlobal(point));
-    });
-
-    buildContextMenu();
-}
-
-ExplorerView::~ExplorerView() {
-}
-
-void ExplorerView::keyPressEvent(QKeyEvent* event) {
-    switch (event->key()) {
-    case Qt::Key_Delete:
-        actionDelete->trigger();
-        break;
-    }
-}
-
-void ExplorerView::buildContextMenu() {
-    // This will leak memory. Anyway...
-    contextMenu.addAction(this->actionDelete = new QAction(QIcon("assets/icons/editor/delete"), "Delete"));
-
-    connect(actionDelete, &QAction::triggered, this, [&]() {
-        QModelIndexList selectedIndexes = this->selectionModel()->selectedIndexes();
-        for (QModelIndex index : selectedIndexes) {
-            model.fromIndex(index)->SetParent(std::nullopt);
-        }
-    });
-}

editor/panes/explorerview.h

@@ -1,35 +0,0 @@
-#pragma once
-
-#include "objects/base/instance.h"
-#include "objects/part.h"
-#include "qevent.h"
-#include "qmenu.h"
-#include "qnamespace.h"
-#include "qtreeview.h"
-#include <QOpenGLWidget>
-#include <QWidget>
-#include <memory>
-#include "explorermodel.h"
-
-class Ui_MainWindow;
-
-class ExplorerView : public QTreeView {
-public:
-    ExplorerView(QWidget* parent = nullptr);
-    ~ExplorerView() override;
-    void keyPressEvent(QKeyEvent* evt) override;
-private:
-    ExplorerModel model;
-    QMenu contextMenu;
-
-    // TODO: Move these to a separate top-level namespace so these can be
-    // accessed from multiple locations
-    QAction* actionDelete;
-    QAction* actionCopy;
-    QAction* actionCut;
-    QAction* actionPaste;
-    QAction* actionPasteInto;
-    QAction* actionSelectChildren;
-
-    void buildContextMenu();
-};

run.sh

@@ -1,7 +1 @@
-[ "$2" = "-debug" ] && CMAKE_OPTS=-DCMAKE_BUILD_TYPE=Debug
+cmake . && cmake --build . && ./bin/$1
-[ "$2" = "-release" ] && CMAKE_OPTS=-DCMAKE_BUILD_TYPE=Release
-[ "$2" = "-reldbg" ] && CMAKE_OPTS=-DCMAKE_BUILD_TYPE=RelWithDebInfo
-
-[ "$3" = "-gdb" ] && PRE_COMMAND="gdb -ex run "
-
-cmake $CMAKE_OPTS . && cmake --build . && $PRE_COMMAND ./bin/$1

src/objects/base/instance.cpp

@@ -42,17 +42,10 @@ void Instance::SetParent(std::optional<std::shared_ptr<Instance>> newParent) {
     // TODO: Add code for sending signals for parent updates
     // TODO: Yeahhh maybe this isn't the best way of doing this?
     if (hierarchyPostUpdateHandler.has_value()) hierarchyPostUpdateHandler.value()(this->shared_from_this(), lastParent, newParent);
-
-    this->OnParentUpdated(lastParent, newParent);
 }
 
 std::optional<std::shared_ptr<Instance>> Instance::GetParent() {
     if (!parent.has_value()) return std::nullopt;
     if (parent.value().expired()) return std::nullopt;
     return parent.value().lock();
-}
-
-
-void Instance::OnParentUpdated(std::optional<std::shared_ptr<Instance>> oldParent, std::optional<std::shared_ptr<Instance>> newParent) {
-    // Empty stub
 }

src/objects/base/instance.h

@@ -2,7 +2,6 @@
 
 #include "metadata.h"
 #include <memory>
-#include <optional>
 #include <string>
 
 // Struct describing information about an instance
@@ -24,8 +23,6 @@ private:
 protected:
     Instance(InstanceType*);
     virtual ~Instance();
-
-    virtual void OnParentUpdated(std::optional<std::shared_ptr<Instance>> oldParent, std::optional<std::shared_ptr<Instance>> newParent);
 public:
     static InstanceType* TYPE;
     std::string name;

src/objects/part.cpp

@@ -19,19 +19,4 @@ Part::Part(): Instance(&TYPE_) {
 
 Part::Part(PartConstructParams params): Instance(&TYPE_), position(params.position), rotation(params.rotation),
                                         scale(params.scale), material(params.material), anchored(params.anchored) {
-}
-
-// This feels wrong. Get access to PhysicsWorld somehow else? Part will need access to this often though, most likely...
-extern rp::PhysicsWorld* world;
-Part::~Part() {
-    world->destroyRigidBody(rigidBody);
-    Instance::~Instance();
-}
-
-
-void Part::OnParentUpdated(std::optional<std::shared_ptr<Instance>> oldParent, std::optional<std::shared_ptr<Instance>> newParent) {
-    if (this->rigidBody)
-        this->rigidBody->setIsActive(newParent.has_value());
-
-    // TODO: Sleeping bodies that touch this one also need to be updated
 }

src/objects/part.h

@@ -20,8 +20,6 @@ struct PartConstructParams {
 };
 
 class Part : public Instance {
-protected:
-    void OnParentUpdated(std::optional<std::shared_ptr<Instance>> oldParent, std::optional<std::shared_ptr<Instance>> newParent) override;
 public:
     static InstanceType* TYPE;
 
@@ -36,7 +34,6 @@ public:
     
     Part();
     Part(PartConstructParams params);
-    ~Part() override;
 
     static inline std::shared_ptr<Part> New() { return std::make_shared<Part>(); };
     static inline std::shared_ptr<Part> New(PartConstructParams params) { return std::make_shared<Part>(params); };

src/physics/simulation.cpp

@@ -5,7 +5,6 @@
 #include <reactphysics3d/collision/shapes/BoxShape.h>
 #include <reactphysics3d/collision/shapes/CollisionShape.h>
 #include <reactphysics3d/components/RigidBodyComponents.h>
-#include <reactphysics3d/engine/EventListener.h>
 #include <reactphysics3d/mathematics/Quaternion.h>
 #include <reactphysics3d/mathematics/Transform.h>
 #include <reactphysics3d/mathematics/Vector3.h>
@@ -20,15 +19,8 @@
 
 namespace rp = reactphysics3d;
 
-class PhysicsListener : public rp::EventListener {
-    void onContact(const CollisionCallback::CallbackData& /*callbackData*/) override {
-        // printf("Collision occurred!\n");
-    }
-};
-
 rp::PhysicsCommon physicsCommon;
 rp::PhysicsWorld* world;
-PhysicsListener eventListener;
 
 void simulationInit() {
     world = physicsCommon.createPhysicsWorld();
@@ -55,8 +47,6 @@ void syncPartPhysics(std::shared_ptr<Part> part) {
     if (part->rigidBody->getNbColliders() == 0)
     part->rigidBody->addCollider(shape, rp::Transform());
     part->rigidBody->setType(part->anchored ? rp::BodyType::STATIC : rp::BodyType::DYNAMIC);
-
-    world->setEventListener(&eventListener);
 }
 
 void physicsStep(float deltaTime) {