From 19b6489476629e22a5f723ba01477bb258fbd561 Mon Sep 17 00:00:00 2001
From: maelstrom <maelstrom@maelstrom.dev>
Date: Fri, 30 May 2025 02:15:44 +0200
Subject: [PATCH] feat(model): added model container object for parts

---
 assets/icons/model.png     | Bin 0 -> 825 bytes
 core/src/objects/meta.cpp  |   4 +++-
 core/src/objects/model.cpp |   4 ++++
 core/src/objects/model.h   |  18 +++++++++++++++++
 editor/mainwindow.cpp      |  40 +++++++++++++++++++++++++++++++++++++
 editor/mainwindow.ui       |  36 +++++++++++++++++++++++++++++++++
 6 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 assets/icons/model.png
 create mode 100644 core/src/objects/model.cpp
 create mode 100644 core/src/objects/model.h

diff --git a/assets/icons/model.png b/assets/icons/model.png
new file mode 100644
index 0000000000000000000000000000000000000000..0905f933b87ab32f21098d7db8d603209730c753
GIT binary patch
literal 825
zcmV-91IGM`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!%Sl8*R5;6}
zliyELVHn5hu6f<x&~^9DtF|_`OhtwSnj8^^@@wh=&H_=l%y23?0)JGXsHCD9N~K~Z
za~hU9UFOVOQ?a4K1uM#RbH1JPI#;XNO&8Dh?0ui_=lMSG4*>wd|HNMlZ|>D)M67h?
zOIjz3DJbk0=97q(mSBd~-ilc0Oupt^z$#N6O&at_s8u-PL@9<ril#}P(3B%tX~43%
zDta#9qg2Fxv08EB?7)$_3^9q21fTP3{N4v~4jVS=E)zhV*Op;)Rc9I;TA6uJk6qz)
zq<ualwG}w#M&Lzfuw#`HajJ+LDHj~z3IW{q7^4j#D{NyXFaZPhL^tpw7{WKV3yBI9
zv7D^Z<8zUei1|_WCHcPqnw~P&F?|=l#V%M!X+q}#X?F+GPA5_=%{Y`75%D2ad<yv8
zfzn%y+07|9rW?VGRAT350qLA}cj9Y%J5o({#7ksE$O8_z?pva4)?{;EH8=Y+1nM3+
zmOd?DY9oZ<rG9h=>M^gQuq(+UH^IB$&*DHP!HzH+vkEzC?S52tN1$mKhziPkOR=y$
zhl#aO1Xly_M?EkN>tM6E5T&Ht4dh{0oQr6Q1b3J=sM^ACOsvD=TSP81#0oTC1v|Df
zgpp-GhL(KrE_8t&(jeFR1W%(osQ12tvSpHp_}~HR_8G{VUO;FILQv(<XKCH)xVBG)
zt~n?AUwg<|<lDwDvlc^OejA?2cc|%m4MS%HMfT@JT-rJfQC;x#@tmBTTrjlh6iOGB
zuJ9>P-b)es<jNif=C<&di$~KNkT*{fF~vFJ0mQ+dFHzsBy`*<&FN$kNS#S6~JmF0|
z<Q&}R>=)ZlJM#c>{Wx-rgY3D#Ol9rJl39A<60Xo5cneo(9g5a4q>ayzV-7%Ue2}0_
z&TIets{Cl`n(nefrZ+9F8|N&Kp}^StU2b+&pVj;XvgEdBL3Wlp00000NkvXXu0mjf
DwZ3{L

literal 0
HcmV?d00001

diff --git a/core/src/objects/meta.cpp b/core/src/objects/meta.cpp
index 5bdbd1c..613ead5 100644
--- a/core/src/objects/meta.cpp
+++ b/core/src/objects/meta.cpp
@@ -5,6 +5,7 @@
 #include "objects/joint/rotatev.h"
 #include "objects/joint/weld.h"
 #include "objects/jointsservice.h"
+#include "objects/model.h"
 #include "objects/part.h"
 #include "objects/joint/snap.h"
 #include "objects/script.h"
@@ -24,7 +25,8 @@ std::map<std::string, const InstanceType*> INSTANCE_MAP = {
     { "RotateV", &RotateV::TYPE },
     { "JointInstance", &JointInstance::TYPE },
     { "Script", &Script::TYPE },
-    { "Folder", &Folder::TYPE },
+    { "Model", &Model::TYPE },
+    // { "Folder", &Folder::TYPE },
 
     // Services
 
diff --git a/core/src/objects/model.cpp b/core/src/objects/model.cpp
new file mode 100644
index 0000000..1354ad6
--- /dev/null
+++ b/core/src/objects/model.cpp
@@ -0,0 +1,4 @@
+#include "model.h"
+
+Model::Model(): Instance(&TYPE) {}
+Model::~Model() = default;
\ No newline at end of file
diff --git a/core/src/objects/model.h b/core/src/objects/model.h
new file mode 100644
index 0000000..4e9381c
--- /dev/null
+++ b/core/src/objects/model.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "objects/annotation.h"
+#include "objects/base/instance.h"
+#include <memory>
+
+// Group object for Parts
+
+class DEF_INST_(explorer_icon="model") Model : public Instance {
+    AUTOGEN_PREAMBLE
+
+public:
+    Model();
+    ~Model();
+
+    static inline std::shared_ptr<Model> New() { return std::make_shared<Model>(); };
+    static inline std::shared_ptr<Instance> Create() { return std::make_shared<Model>(); };
+};
\ No newline at end of file
diff --git a/editor/mainwindow.cpp b/editor/mainwindow.cpp
index 7d2c3c8..33514de 100644
--- a/editor/mainwindow.cpp
+++ b/editor/mainwindow.cpp
@@ -3,6 +3,7 @@
 #include "common.h"
 #include "logger.h"
 #include "objects/datamodel.h"
+#include "objects/model.h"
 #include "placedocument.h"
 #include "script/scriptdocument.h"
 #include <cstdio>
@@ -19,6 +20,7 @@
 #include <pugixml.hpp>
 #include <qtextcursor.h>
 #include <qtextedit.h>
+#include <vector>
 
 #ifdef _NDEBUG
 #define NDEBUG
@@ -364,6 +366,44 @@ void MainWindow::connectActionHandlers() {
         }
     });
 
+    connect(ui->actionGroupObjects, &QAction::triggered, this, [&]() {
+        auto model = Model::New();
+        std::shared_ptr<Instance> firstParent;
+        
+        for (auto object : getSelection()) {
+            if (firstParent == nullptr && object->GetParent().has_value()) firstParent = object->GetParent().value();
+            object->SetParent(model);
+        }
+
+        if (model->GetChildren().size() == 0)
+            return;
+
+        // Technically not how it works in the actual studio, but it's not an API-breaking change
+        // and I think this implementation is more useful so I'm sticking with it
+        if (firstParent == nullptr) firstParent = gWorkspace();
+        model->SetParent(firstParent);
+
+        setSelection({ model });
+    });
+
+    connect(ui->actionUngroupObjects, &QAction::triggered, this, [&]() {
+        std::vector<std::shared_ptr<Instance>> newSelection;
+
+        for (auto model : getSelection()) {
+            // Not a model, skip
+            if (!model->IsA<Model>()) { newSelection.push_back(model); continue; }
+
+            for (auto object : model->GetChildren()) {
+                object->SetParent(model->GetParent());
+                newSelection.push_back(object);
+            }
+
+            model->Destroy();
+        }
+
+        setSelection(newSelection);
+    });
+
     connect(ui->actionSaveModel, &QAction::triggered, this, [&]() {
         std::optional<std::string> path = openFileDialog("Openblocks Model (*.obm)", ".obm", QFileDialog::AcceptSave);
         if (!path) return;
diff --git a/editor/mainwindow.ui b/editor/mainwindow.ui
index ee3ea39..ecfa3ba 100644
--- a/editor/mainwindow.ui
+++ b/editor/mainwindow.ui
@@ -176,6 +176,8 @@
    <addaction name="actionCut"/>
    <addaction name="actionPaste"/>
    <addaction name="actionPasteInto"/>
+   <addaction name="actionGroupObjects"/>
+   <addaction name="actionUngroupObjects"/>
   </widget>
   <widget class="QToolBar" name="snappingOptions">
    <property name="windowTitle">
@@ -768,6 +770,40 @@
     <enum>QAction::MenuRole::NoRole</enum>
    </property>
   </action>
+  <action name="actionGroupObjects">
+   <property name="icon">
+    <iconset theme="object-group"/>
+   </property>
+   <property name="text">
+    <string>Group Objects</string>
+   </property>
+   <property name="toolTip">
+    <string>Group objects under a Model</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+G</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
+  <action name="actionUngroupObjects">
+   <property name="icon">
+    <iconset theme="object-ungroup"/>
+   </property>
+   <property name="text">
+    <string>Ungroup Objects</string>
+   </property>
+   <property name="toolTip">
+    <string>Ungroup objects inside selected Model</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+U</string>
+   </property>
+   <property name="menuRole">
+    <enum>QAction::MenuRole::NoRole</enum>
+   </property>
+  </action>
  </widget>
  <customwidgets>
   <customwidget>