core/src/platform.cpp

@@ -21,7 +21,7 @@ std::string getProgramDataDir() {
         homedir = getpwuid(getuid())->pw_dir;
     }
 
-    return std::string(homedir) + "/.local/share/openblocks";
+    return std::string(homedir) + "/openblocks";
 }
 
 void displayErrorMessage(std::string message) {

core/src/rendering/texture.cpp

@@ -16,9 +16,8 @@ Texture::Texture(const char* texturePath, unsigned int format, bool noMipMaps) {
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
 
     // Interpolation
-    if (!noMipMaps) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    if (noMipMaps) glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
     // stbi_set_flip_vertically_on_load(true);
     int width, height, nrChannels;

core/src/rendering/texture3d.cpp

@@ -17,8 +17,8 @@ Texture3D::Texture3D(const char* texturePath, unsigned int tileWidth, unsigned i
     glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_WRAP_R, GL_REPEAT);
 
     // Interpolation
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
-    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+    glTexParameteri(GL_TEXTURE_2D_ARRAY, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
     // stbi_set_flip_vertically_on_load(true);
     int width, height, nrChannels;
@@ -32,7 +32,6 @@ Texture3D::Texture3D(const char* texturePath, unsigned int tileWidth, unsigned i
 
     glTexImage3D(GL_TEXTURE_2D_ARRAY, 0, format, tileWidth, tileHeight, /* no of layers= */ tileCount, 0, format,
                  GL_UNSIGNED_BYTE, data);
-    glGenerateMipmap(GL_TEXTURE_2D_ARRAY);
 
     stbi_image_free(data);
 }

editor/mainwindow.cpp

@@ -391,16 +391,14 @@ void MainWindow::connectActionHandlers() {
         auto model = Model::New();
         std::shared_ptr<Instance> firstParent;
         
-        bool done = false;
         std::shared_ptr<Selection> selection = gDataModel->GetService<Selection>();
         for (auto object : selection->Get()) {
             if (firstParent == nullptr && object->GetParent().has_value()) firstParent = object->GetParent().value();
             historyState.push_back(UndoStateInstanceReparented { object, object->GetParent().value(), model });
             object->SetParent(model);
-            done = true;
         }
 
-        if (!done)
+        if (model->GetChildren().size() == 0)
             return;
 
         // Technically not how it works in the actual studio, but it's not an API-breaking change
@@ -410,7 +408,6 @@ void MainWindow::connectActionHandlers() {
         model->SetParent(firstParent);
 
         historyState.push_back(UndoStateSelectionChanged { selection->Get(), { model } });
-        undoManager.PushState(historyState);
         selection->Set({ model });
         playSound("./assets/excluded/electronicpingshort.wav");
     });
@@ -419,12 +416,10 @@ void MainWindow::connectActionHandlers() {
         UndoState historyState;
         std::vector<std::shared_ptr<Instance>> newSelection;
 
-        bool done = false;
         std::shared_ptr<Selection> selection = gDataModel->GetService<Selection>();
         for (auto model : selection->Get()) {
             // Not a model, skip
             if (!model->IsA<Model>()) { newSelection.push_back(model); continue; }
-            done = true;
 
             for (auto object : model->GetChildren()) {
                 historyState.push_back(UndoStateInstanceReparented { object, object->GetParent().value(), model->GetParent().value() });
@@ -436,11 +431,7 @@ void MainWindow::connectActionHandlers() {
             model->SetParent(std::nullopt);
         }
 
-        if (!done)
-            return;
-
         historyState.push_back(UndoStateSelectionChanged { selection->Get(), newSelection });
-        undoManager.PushState(historyState);
         selection->Set(newSelection);
         playSound("./assets/excluded/electronicpingshort.wav");
     });

editor/panes/explorermodel.cpp

@@ -1,15 +1,11 @@
 #include "explorermodel.h"
 #include "common.h"
-#include "mainwindow.h"
 #include "objects/base/instance.h"
 #include "objects/base/member.h"
-#include "undohistory.h"
 #include <qicon.h>
 #include <qmimedata.h>
 #include <QWidget>
 
-#define M_mainWindow dynamic_cast<MainWindow*>(dynamic_cast<QWidget*>(dynamic_cast<QObject*>(this)->parent())->window())
-
 // https://doc.qt.io/qt-6/qtwidgets-itemviews-simpletreemodel-example.html#testing-the-model
 
 std::map<std::string, QIcon> instanceIconCache;
@@ -220,15 +216,11 @@ bool ExplorerModel::dropMimeData(const QMimeData *data, Qt::DropAction action, i
         return true;
     }
 
-    UndoState historyState;
     std::shared_ptr<Instance> parentInst = fromIndex(parent);
     for (std::shared_ptr<Instance> instance : slot->instances) {
-        historyState.push_back(UndoStateInstanceReparented { instance, instance->GetParent().value_or(nullptr), parentInst });
         instance->SetParent(parentInst);
     }
 
-    M_mainWindow->undoManager.PushState(historyState);
-
     delete slot;
     return true;
 }

editor/panes/explorerview.cpp

@@ -15,7 +15,7 @@
 
 ExplorerView::ExplorerView(QWidget* parent):
     QTreeView(parent),
-    model(ExplorerModel(std::dynamic_pointer_cast<Instance>(gDataModel), this)),
+    model(ExplorerModel(std::dynamic_pointer_cast<Instance>(gDataModel))),
     contextMenu(this) {
 
     this->setModel(&model);