GSoC project: Tiled compatibility support RGM

Editors/BaseEditor.h

@@ -12,7 +12,7 @@ static const QHash<int, int> ResTypeFields = {
     {TypeCase::kSound, TreeNode::kSoundFieldNumber},       {TypeCase::kBackground, TreeNode::kBackgroundFieldNumber},
     {TypeCase::kPath, TreeNode::kPathFieldNumber},         {TypeCase::kFont, TreeNode::kFontFieldNumber},
     {TypeCase::kScript, TreeNode::kScriptFieldNumber},     {TypeCase::kTimeline, TreeNode::kTimelineFieldNumber},
-    {TypeCase::kObject, TreeNode::kObjectFieldNumber},     {TypeCase::kRoom, TreeNode::kRoomFieldNumber},
+    {TypeCase::kObject, TreeNode::kObjectFieldNumber},     {TypeCase::kEgmRoom, TreeNode::kEgmRoomFieldNumber},
     {TypeCase::kSettings, TreeNode::kSettingsFieldNumber}, {TypeCase::kShader, TreeNode::kShaderFieldNumber}};
 
 class BaseEditor : public QWidget {

Editors/PathEditor.cpp

@@ -36,7 +36,7 @@ PathEditor::PathEditor(MessageModel* model, QWidget* parent) : BaseEditor(model,
 
   _ui->mainToolBar->addSeparator();
 
-  ResourceSelector* roomButton(new ResourceSelector(this, TreeNode::TypeCase::kRoom));
+  ResourceSelector* roomButton(new ResourceSelector(this, TreeNode::TypeCase::kEgmRoom));
   roomButton->setPopupMode(QToolButton::MenuButtonPopup);
   roomButton->setIcon(ArtManager::GetIcon(":/resources/room.png"));
   _ui->mainToolBar->addWidget(roomButton);
@@ -108,8 +108,8 @@ void PathEditor::RebindSubModels() {
 
   QString roomName = _pathModel->Data(FieldPath::Of<Path>(Path::kBackgroundRoomNameFieldNumber)).toString();
   if (roomName != "") {
-    _ui->roomView->SetResourceModel(MainWindow::resourceMap->GetResourceByName(TypeCase::kRoom, roomName)
-                                        ->GetSubModel<MessageModel*>(TreeNode::kRoomFieldNumber));
+    _ui->roomView->SetResourceModel(MainWindow::resourceMap->GetResourceByName(TypeCase::kEgmRoom, roomName)
+                                        ->GetSubModel<MessageModel*>(TreeNode::kEgmRoomFieldNumber));
   }
   _roomLineEdit->setText(roomName);
 
@@ -152,8 +152,8 @@ void PathEditor::SetSnapToGrid(bool snap) { this->_snapToGrid = snap; }
 
 void PathEditor::RoomMenuItemSelected(QAction* action) {
   _roomLineEdit->setText(action->text());
-  _ui->roomView->SetResourceModel(MainWindow::resourceMap->GetResourceByName(TypeCase::kRoom, action->text())
-                                      ->GetSubModel<MessageModel*>(TreeNode::kRoomFieldNumber));
+  _ui->roomView->SetResourceModel(MainWindow::resourceMap->GetResourceByName(TypeCase::kEgmRoom, action->text())
+                                      ->GetSubModel<MessageModel*>(TreeNode::kEgmRoomFieldNumber));
   _ui->pathPreviewBackground->SetZoom(1);
   _pathModel->SetData(FieldPath::Of<Path>(Path::kBackgroundRoomNameFieldNumber), action->text());
 }

Editors/RoomEditor.cpp

@@ -10,15 +10,15 @@
 #include "Models/TreeSortFilterProxyModel.h"
 #include "Models/RepeatedSortFilterProxyModel.h"
 
-#include "Room.pb.h"
+#include "EGMRoom.pb.h"
 
 #include <QGraphicsPixmapItem>
 #include <QGraphicsScene>
 #include <QMouseEvent>
 
 #include <algorithm>
 
-using View = buffers::resources::Room::View;
+using View = buffers::resources::EGMRoom::View;
 
 RoomEditor::RoomEditor(MessageModel* model, QWidget* parent) : BaseEditor(model, parent), _ui(new Ui::RoomEditor) {
   _ui->setupUi(this);
@@ -29,15 +29,15 @@ RoomEditor::RoomEditor(MessageModel* model, QWidget* parent) : BaseEditor(model,
   _nodeMapper->addMapping(_ui->roomName, TreeNode::kNameFieldNumber);
   _nodeMapper->toFirst();
 
-  _resMapper->addMapping(_ui->speedSpinBox, Room::kSpeedFieldNumber);
-  _resMapper->addMapping(_ui->widthSpinBox, Room::kWidthFieldNumber);
-  _resMapper->addMapping(_ui->heightSpinBox, Room::kHeightFieldNumber);
-  _resMapper->addMapping(_ui->clearCheckBox, Room::kClearDisplayBufferFieldNumber);
-  _resMapper->addMapping(_ui->persistentCheckBox, Room::kPersistentFieldNumber);
-  _resMapper->addMapping(_ui->captionLineEdit, Room::kCaptionFieldNumber);
+  _resMapper->addMapping(_ui->speedSpinBox, EGMRoom::kSpeedFieldNumber);
+  _resMapper->addMapping(_ui->widthSpinBox, EGMRoom::kWidthFieldNumber);
+  _resMapper->addMapping(_ui->heightSpinBox, EGMRoom::kHeightFieldNumber);
+  _resMapper->addMapping(_ui->clearCheckBox, EGMRoom::kClearDisplayBufferFieldNumber);
+  _resMapper->addMapping(_ui->persistentCheckBox, EGMRoom::kPersistentFieldNumber);
+  _resMapper->addMapping(_ui->captionLineEdit, EGMRoom::kCaptionFieldNumber);
 
-  _resMapper->addMapping(_ui->enableViewsCheckBox, Room::kEnableViewsFieldNumber);
-  _resMapper->addMapping(_ui->clearViewportCheckBox, Room::kClearViewBackgroundFieldNumber);
+  _resMapper->addMapping(_ui->enableViewsCheckBox, EGMRoom::kEnableViewsFieldNumber);
+  _resMapper->addMapping(_ui->clearViewportCheckBox, EGMRoom::kClearViewBackgroundFieldNumber);
   _resMapper->toFirst();
 
   _viewMapper = new ImmediateDataWidgetMapper(this);
@@ -94,44 +94,44 @@ RoomEditor::RoomEditor(MessageModel* model, QWidget* parent) : BaseEditor(model,
 RoomEditor::~RoomEditor() { delete _ui; }
 
 void RoomEditor::RebindSubModels() {
-  _roomModel = _model->GetSubModel<MessageModel*>(TreeNode::kRoomFieldNumber);
+  _roomModel = _model->GetSubModel<MessageModel*>(TreeNode::kEgmRoomFieldNumber);
   _ui->roomView->SetResourceModel(_roomModel);
 
-  RepeatedMessageModel* im = _roomModel->GetSubModel<RepeatedMessageModel*>(Room::kInstancesFieldNumber);
+  RepeatedMessageModel* im = _roomModel->GetSubModel<RepeatedMessageModel*>(EGMRoom::kInstancesFieldNumber);
   RepeatedSortFilterProxyModel* imp = new RepeatedSortFilterProxyModel(this);
   imp->SetSourceModel(im);
   _ui->instancesListView->setModel(imp);
 
   for (int c = 0; c < im->columnCount(); ++c) {
-    if (c != im->FieldToColumn(Room::Instance::kNameFieldNumber) &&
-        c != im->FieldToColumn(Room::Instance::kObjectTypeFieldNumber) &&
-        c != im->FieldToColumn(Room::Instance::kIdFieldNumber))
+    if (c != im->FieldToColumn(EGMRoom::Instance::kNameFieldNumber) &&
+        c != im->FieldToColumn(EGMRoom::Instance::kObjectTypeFieldNumber) &&
+        c != im->FieldToColumn(EGMRoom::Instance::kIdFieldNumber))
       _ui->instancesListView->hideColumn(c);
     else
       _ui->instancesListView->resizeColumnToContents(c);
   }
 
-  _ui->instancesListView->header()->swapSections(im->FieldToColumn(Room::Instance::kNameFieldNumber),
-                                                 im->FieldToColumn(Room::Instance::kObjectTypeFieldNumber));
+  _ui->instancesListView->header()->swapSections(im->FieldToColumn(EGMRoom::Instance::kNameFieldNumber),
+                                                 im->FieldToColumn(EGMRoom::Instance::kObjectTypeFieldNumber));
 
-  RepeatedMessageModel* tm = _roomModel->GetSubModel<RepeatedMessageModel*>(Room::kTilesFieldNumber);
+  RepeatedMessageModel* tm = _roomModel->GetSubModel<RepeatedMessageModel*>(EGMRoom::kTilesFieldNumber);
   RepeatedSortFilterProxyModel* tmp = new RepeatedSortFilterProxyModel(this);
   tmp->SetSourceModel(tm);
   _ui->tilesListView->setModel(tmp);
 
   for (int c = 0; c < tm->columnCount(); ++c) {
-    if (c != tm->FieldToColumn(Room::Tile::kBackgroundNameFieldNumber) &&
-        c != tm->FieldToColumn(Room::Tile::kIdFieldNumber) && c != tm->FieldToColumn(Room::Tile::kDepthFieldNumber) &&
-        c != tm->FieldToColumn(Room::Tile::kNameFieldNumber))
+    if (c != tm->FieldToColumn(EGMRoom::Tile::kBackgroundNameFieldNumber) &&
+        c != tm->FieldToColumn(EGMRoom::Tile::kIdFieldNumber) && c != tm->FieldToColumn(EGMRoom::Tile::kDepthFieldNumber) &&
+        c != tm->FieldToColumn(EGMRoom::Tile::kNameFieldNumber))
       _ui->tilesListView->hideColumn(c);
     else
       _ui->tilesListView->resizeColumnToContents(c);
   }
 
-  _ui->tilesListView->header()->swapSections(tm->FieldToColumn(Room::Tile::kNameFieldNumber),
-                                             tm->FieldToColumn(Room::Tile::kBackgroundNameFieldNumber));
+  _ui->tilesListView->header()->swapSections(tm->FieldToColumn(EGMRoom::Tile::kNameFieldNumber),
+                                             tm->FieldToColumn(EGMRoom::Tile::kBackgroundNameFieldNumber));
 
-  RepeatedMessageModel* vm = _roomModel->GetSubModel<RepeatedMessageModel*>(Room::kViewsFieldNumber);
+  RepeatedMessageModel* vm = _roomModel->GetSubModel<RepeatedMessageModel*>(EGMRoom::kViewsFieldNumber);
   _viewMapper->setModel(vm);
 
   connect(_ui->instancesListView->selectionModel(), &QItemSelectionModel::selectionChanged,

MainWindow.cpp

@@ -282,7 +282,7 @@ void MainWindow::updateWindowMenu() {
 void MainWindow::openFile(QString fName) {
   QFileInfo fileInfo(fName);
 
-  std::unique_ptr<buffers::Project> loadedProject = egm::LoadProject(fName.toStdString());
+  std::unique_ptr<buffers::Project> loadedProject = egm::LoadProject(fName.toStdString(), true);
 
   if (!loadedProject) {
     QMessageBox::warning(this, tr("Failed To Open Project"), tr("There was a problem loading the project: ") + fName,
@@ -373,7 +373,7 @@ void MainWindow::openProject(std::unique_ptr<buffers::Project> openedProject) {
   treeConf.UseEditorLauncher<buffers::resources::Shader>(Launch<ShaderEditor>(this));
   treeConf.UseEditorLauncher<buffers::resources::Timeline>(Launch<TimelineEditor>(this));
   treeConf.UseEditorLauncher<buffers::resources::Object>(Launch<ObjectEditor>(this));
-  treeConf.UseEditorLauncher<buffers::resources::Room>(Launch<RoomEditor>(this));
+  treeConf.UseEditorLauncher<buffers::resources::EGMRoom>(Launch<RoomEditor>(this));
   treeConf.UseEditorLauncher<buffers::resources::Settings>(Launch<SettingsEditor>(this));
 
   ProtoModel::DisplayConfig msgConf;
@@ -388,7 +388,7 @@ void MainWindow::openProject(std::unique_ptr<buffers::Project> openedProject) {
   msgConf.SetDefaultIcon<buffers::resources::Font>("font");
   msgConf.SetDefaultIcon<buffers::resources::Timeline>("timeline");
   msgConf.SetDefaultIcon<buffers::resources::Object>("object");
-  msgConf.SetDefaultIcon<buffers::resources::Room>("room");
+  msgConf.SetDefaultIcon<buffers::resources::EGMRoom>("egmroom");
   msgConf.SetDefaultIcon<buffers::resources::Settings>("settings");
 
   ConfigureIconFields(&msgConf, TreeNode::GetDescriptor());
@@ -462,9 +462,11 @@ void MainWindow::on_actionNew_triggered() { openNewProject(); }
 void MainWindow::on_actionOpen_triggered() {
   const QString &fileName = QFileDialog::getOpenFileName(
       this, tr("Open Project"), "",
-      tr("All supported formats (*.egm *.yyp *.project.gmx *.gm81 *.gmk *.gm6 *.gmd);;GameMaker: Studio 2 Projects "
+      tr("All supported formats (*.egm *.yyp *.project.gmx *.gm81 *.gmk *.gm6 *.gmd *.tsx *.tmx);;GameMaker: Studio 2 Projects "
          "(*.yyp);;GameMaker: Studio Projects (*.project.gmx);;Classic "
-         "GameMaker Files (*.gm81 *.gmk *.gm6 *.gmd);;All Files (*)"));
+         "GameMaker Files (*.gm81 *.gmk *.gm6 *.gmd);;"
+         "Tiled Tilesets (*.tsx);;Tiled Maps (*.tmx);;All Files (*)"));
+
   if (!fileName.isEmpty()) openFile(fileName);
 }
 
@@ -492,6 +494,75 @@ void MainWindow::on_actionSave_triggered() {
   egm::WriteProject(_project.get(), fileName.toStdString());
 }
 
+int MainWindow::findRoom(buffers::TreeNode *root, buffers::resources::EGMRoom *&room) {
+  if(root->type_case() == TypeCase::kEgmRoom) {
+      room = root->mutable_egm_room();
+      return 0;
+  }
+
+  for (int i=0; i < root->folder().children_size(); ++i) {
+    int res = findRoom(root->mutable_folder()->mutable_children(i), room);
+    if (res) return res;
+  }
+
+  return 0;
+}
+
+void MainWindow::on_actionMerge_triggered() {
+  buffers::resources::EGMRoom *existingRoom = NULL;
+
+  findRoom(_project->mutable_game()->mutable_root(), existingRoom);
+
+  // check if there is an existing project
+  if(!existingRoom) {
+    std::cout << "Load the project first" << std::endl;
+  }
+  // pass the existing project to MergeProject method with fileName and current project as arguments
+  else {
+    std::cout << "Merging projects" << std::endl;
+
+    const QString &fName = QFileDialog::getOpenFileName(
+        this, tr("Select TMX project to merge"), "",
+        tr("Tiled Maps (*.tmx)"));
+
+    if (!fName.isEmpty()) {
+      std::unique_ptr<buffers::Project> loadedProject = egm::LoadProject(fName.toStdString(), true);
+
+      if (!loadedProject) {
+        QMessageBox::warning(this, tr("Failed To Open Project"), tr("There was a problem loading the project: ") + fName,
+                             QMessageBox::Ok);
+        return;
+      }
+
+      buffers::resources::EGMRoom *loadedRoom = NULL;
+      findRoom(loadedProject->mutable_game()->mutable_root(), loadedRoom);
+
+      if(loadedRoom) {
+        existingRoom->set_orientation(loadedRoom->orientation());
+        existingRoom->set_renderorder(loadedRoom->renderorder());
+        existingRoom->set_width(loadedRoom->width());
+        existingRoom->set_height(loadedRoom->height());
+        existingRoom->set_tilewidth(loadedRoom->tilewidth());
+        existingRoom->set_tileheight(loadedRoom->tileheight());
+        existingRoom->set_infinite(loadedRoom->infinite());
+        existingRoom->set_parallaxoriginx(loadedRoom->parallaxoriginx());
+        existingRoom->set_parallaxoriginy(loadedRoom->parallaxoriginy());
+        existingRoom->set_nextlayerid(loadedRoom->nextlayerid());
+        existingRoom->set_nextobjectid(loadedRoom->nextobjectid());
+        existingRoom->set_firstgid(loadedRoom->firstgid());
+        existingRoom->set_hexsidelength(loadedRoom->has_hexsidelength());
+        existingRoom->set_staggeraxis(loadedRoom->staggeraxis());
+        existingRoom->set_staggerindex(loadedRoom->staggerindex());
+        existingRoom->set_color(loadedRoom->color());
+        existingRoom->mutable_objectgroups()->CopyFrom(loadedRoom->objectgroups());
+        existingRoom->mutable_tilelayers()->CopyFrom(loadedRoom->tilelayers());
+      }
+      else
+        std::cout << "Fatal error, couldnt find loaded room" << std::endl;
+    }
+  }
+}
+
 void MainWindow::on_actionPreferences_triggered() {
   PreferencesDialog preferencesDialog(this);
   preferencesDialog.exec();
@@ -645,7 +716,7 @@ void MainWindow::on_actionCreateTimeline_triggered() { CreateResource(TypeCase::
 
 void MainWindow::on_actionCreateObject_triggered() { CreateResource(TypeCase::kObject); }
 
-void MainWindow::on_actionCreateRoom_triggered() { CreateResource(TypeCase::kRoom); }
+void MainWindow::on_actionCreateRoom_triggered() { CreateResource(TypeCase::kEgmRoom); }
 
 void MainWindow::on_actionCreateSettings_triggered() { CreateResource(TypeCase::kSettings); }
 

MainWindow.h

@@ -62,6 +62,7 @@ class MainWindow : public QMainWindow {
   void on_actionOpen_triggered();
   void on_actionClearRecentMenu_triggered();
   void on_actionSave_triggered();
+  void on_actionMerge_triggered();
   void on_actionPreferences_triggered();
   void on_actionExit_triggered();
 
@@ -127,6 +128,7 @@ class MainWindow : public QMainWindow {
   void writeSettings();
   void setTabbedMode(bool enabled);
   static QFileInfo getEnigmaRoot();
+  int findRoom(buffers::TreeNode *root, buffers::resources::EGMRoom *&room);
 };
 
 #endif  // MAINWINDOW_H

MainWindow.ui

@@ -100,7 +100,7 @@
      <x>0</x>
      <y>0</y>
      <width>1200</width>
-     <height>31</height>
+     <height>23</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -122,6 +122,7 @@
     <addaction name="actionSave"/>
     <addaction name="actionSaveAll"/>
     <addaction name="separator"/>
+    <addaction name="actionMerge"/>
     <addaction name="actionPreferences"/>
     <addaction name="separator"/>
     <addaction name="actionExit"/>
@@ -295,9 +296,6 @@
    <property name="floating">
     <bool>false</bool>
    </property>
-   <property name="features">
-    <set>QDockWidget::AllDockWidgetFeatures</set>
-   </property>
    <property name="allowedAreas">
     <set>Qt::AllDockWidgetAreas</set>
    </property>
@@ -981,6 +979,11 @@
     <string>Ctrl+Shift+G</string>
    </property>
   </action>
+  <action name="actionMerge">
+   <property name="text">
+    <string>Merge</string>
+   </property>
+  </action>
   <actiongroup name="configActionGroup">
    <action name="actionConfiguration0">
     <property name="checkable">

Models/ProtoModel.h

@@ -22,7 +22,7 @@ using Background = buffers::resources::Background;
 using Font = buffers::resources::Font;
 using Object = buffers::resources::Object;
 using Path = buffers::resources::Path;
-using Room = buffers::resources::Room;
+using EGMRoom = buffers::resources::EGMRoom;
 using Sound = buffers::resources::Sound;
 using Sprite = buffers::resources::Sprite;
 using Timeline = buffers::resources::Timeline;