Fix serious building issues due to merging without passing CI 😅

CMakeLists.txt

@@ -1,6 +1,9 @@
 cmake_minimum_required(VERSION 3.14)
 project(RadialGM)
 
+# Uncomment to give priority to the local CMake modules
+# set(CMAKE_PREFIX_PATH "/usr/local/lib")
+
 include(CMakeDependentOption)
 
 option(RGM_BUILD_EMAKE "Build Emake and the compiler." ON)
@@ -40,7 +43,10 @@ set(CMAKE_AUTORCC ON)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/Dialogs")
+set(CMAKE_AUTOUIC_SEARCH_PATHS "${CMAKE_CURRENT_SOURCE_DIR}/" "${CMAKE_CURRENT_SOURCE_DIR}/Dialogs" "${CMAKE_CURRENT_SOURCE_DIR}/Editors")
+
+# Uncomment to be able to use local grpc_cpp_plugin
+# set(GRPC_EXE "/usr/local/bin/grpc_cpp_plugin")
 
 # Include ENIGMA things
 set(ENIGMA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Submodules/enigma-dev)
@@ -83,10 +89,10 @@ set(RGM_SOURCES
   Editors/TimelineEditor.cpp
   main.cpp
   Plugins/RGMPlugin.cpp
-  Plugins/ServerPlugin.cpp
   Dialogs/EventArgumentsDialog.cpp
   Dialogs/TimelineChangeMoment.cpp
   Dialogs/PreferencesDialog.cpp
+  Dialogs/KeyBindingPreferences.cpp
   Utils/ProtoManip.cpp
   Utils/FieldPath.cpp
   MainWindow.cpp
@@ -139,13 +145,13 @@ set(RGM_HEADERS
   Editors/FontEditor.h
   Editors/SpriteEditor.h
   Editors/BackgroundEditor.h
-  Plugins/ServerPlugin.h
   Plugins/RGMPlugin.h
   MainWindow.h
   Dialogs/EventArgumentsDialog.h
   Dialogs/PreferencesDialog.h
   Dialogs/PreferencesKeys.h
   Dialogs/TimelineChangeMoment.h
+  Dialogs/KeyBindingPreferences.h
   Utils/SafeCasts.h
   Utils/ProtoManip.h
   Utils/FieldPath.h
@@ -196,8 +202,8 @@ else()
     set(EDITOR_SOURCES Widgets/CodeWidgetScintilla.cpp)
 endif()
 
- set(RGM_SOURCES ${RGM_SOURCES} Plugins/ServerPlugin.cpp)
- set(RGM_HEADERS ${RGM_HEADERS} Plugins/ServerPlugin.h)
+set(RGM_SOURCES ${RGM_SOURCES} Plugins/ServerPlugin.cpp)
+set(RGM_HEADERS ${RGM_HEADERS} Plugins/ServerPlugin.h)
 
 # Tell CMake to create the RadialGM executable
 add_executable(${EXE} WIN32 ${RGM_UI} ${RGM_HEADERS} ${RGM_SOURCES} ${EDITOR_SOURCES} ${RGM_RC})
@@ -244,14 +250,13 @@ include_directories(${EXE} PRIVATE ${RAPIDJSON_INCLUDE_DIRS})
 find_package(yaml-cpp CONFIG REQUIRED)
 target_link_libraries(${EXE} PRIVATE yaml-cpp)
 
- #Find gRPC
- find_package(gRPC CONFIG REQUIRED)
- target_link_libraries(${EXE} PRIVATE gRPC::gpr gRPC::grpc gRPC::grpc++)
+# Find gRPC
+find_package(gRPC CONFIG REQUIRED)
+target_link_libraries(${EXE} PRIVATE gRPC::gpr gRPC::grpc gRPC::grpc++)
 
 # Find Protobuf
-include(FindProtobuf)
-include_directories(${Protobuf_INCLUDE_DIRS})
-target_link_libraries(${EXE} PRIVATE ${Protobuf_LIBRARIES})
+find_package(Protobuf CONFIG REQUIRED)
+target_link_libraries(${EXE} PRIVATE protobuf::libprotobuf)
 
 # Find OpenSSL
 find_package(OpenSSL REQUIRED)
@@ -310,6 +315,9 @@ if (RGM_BUILD_EMAKE)
   add_dependencies(${EXE} ${CLI_TARGET})
 endif()
 
+# Copy ENIGMA's source files
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/Submodules/enigma-dev/ENIGMAsystem DESTINATION ${CMAKE_BINARY_DIR}/Submodules/enigma-dev)
+
 install(TARGETS ${EXE} RUNTIME DESTINATION .)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${EXE}.dir/Debug/${EXE}.pdb" DESTINATION . OPTIONAL)
 

Dialogs/keybindingpreferences.cpp → Dialogs/KeyBindingPreferences.cpp

@@ -1,4 +1,4 @@
-#include "KeybindingPreferences.h"
+#include "KeyBindingPreferences.h"
 
 #include "ui_MainWindow.h"
 #include "ui_SpriteEditor.h"

Dialogs/PreferencesDialog.cpp

@@ -2,7 +2,7 @@
 #include "ui_PreferencesDialog.h"
 
 #include "PreferencesKeys.h"
-#include "KeybindingPreferences.h"
+#include "KeyBindingPreferences.h"
 #include "main.h"
 #include "Components/Logger.h"
 

Editors/RoomEditor.cpp

@@ -90,15 +90,15 @@ RoomEditor::RoomEditor(MessageModel* model, QWidget* parent) : BaseEditor(model,
   _ui->objectSelectButton->setMenu(objMenu);
   _ui->objectSelectButton->setPopupMode(QToolButton::MenuButtonPopup);
 
-  auto objects = treeProxy
-      ->match(treeProxy->index(0, 0), TreeModel::UserRoles::TypeCaseRole,
-              TypeCase::kObject, 1, Qt::MatchRecursive);
-  if (!objects.empty()) {
-    QModelIndex firstObjIdx = objects.first();
-    QString firstObj = firstObjIdx.data(Qt::DisplayRole).toString();
-    _ui->objectSelectButton->setIcon(firstObjIdx.data(Qt::DecorationRole).value<QIcon>());
-    _ui->currentObject->setText(firstObj);
-  }
+  // auto objects = treeProxy
+  //     ->match(treeProxy->index(0, 0), TreeModel::UserRoles::TypeCaseRole,
+  //             TypeCase::kObject, 1, Qt::MatchRecursive);
+  // if (!objects.empty()) {
+  //   QModelIndex firstObjIdx = objects.first();
+  //   QString firstObj = firstObjIdx.data(Qt::DisplayRole).toString();
+  //   _ui->objectSelectButton->setIcon(firstObjIdx.data(Qt::DecorationRole).value<QIcon>());
+  //   _ui->currentObject->setText(firstObj);
+  // }
 
   connect(objMenu, &QMenuView::triggered, [=](const QModelIndex &index) {
     _ui->currentObject->setText(treeProxy->data(index, Qt::DisplayRole).toString());
@@ -116,9 +116,10 @@ RoomEditor::RoomEditor(MessageModel* model, QWidget* parent) : BaseEditor(model,
 
   // This updates all the model views in the event of a sprite is changed
   connect(MainWindow::resourceMap, &ResourceModelMap::DataChanged, this, [this]() {
-    _ui->instancesListView->reset();
-    _ui->tilesListView->reset();
-    _ui->layersPropertiesView->reset();
+    // _ui->entitiesListView->reset();
+    _ui->elementsListView->reset();
+    _ui->layersListView->reset();
+    _ui->propertiesView->reset();
   });
 
   RoomEditor::RebindSubModels();
@@ -133,35 +134,35 @@ void RoomEditor::RebindSubModels() {
   RepeatedMessageModel* im = _roomModel->GetSubModel<RepeatedMessageModel*>(Room::kInstancesFieldNumber);
   RepeatedSortFilterProxyModel* imp = new RepeatedSortFilterProxyModel(this);
   imp->SetSourceModel(im);
-  _ui->instancesListView->setModel(imp);
+  // _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))
-      _ui->instancesListView->hideColumn(c);
-    else
-      _ui->instancesListView->resizeColumnToContents(c);
-  }
+  // 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))
+  //     _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(Room::Instance::kNameFieldNumber),
+  //                                                im->FieldToColumn(Room::Instance::kObjectTypeFieldNumber));
 
   RepeatedMessageModel* tm = _roomModel->GetSubModel<RepeatedMessageModel*>(Room::kTilesFieldNumber);
   RepeatedSortFilterProxyModel* tmp = new RepeatedSortFilterProxyModel(this);
   tmp->SetSourceModel(tm);
-  _ui->tilesListView->setModel(tmp);
+  _ui->layersListView->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))
-      _ui->tilesListView->hideColumn(c);
+      _ui->layersListView->hideColumn(c);
     else
-      _ui->tilesListView->resizeColumnToContents(c);
+      _ui->layersListView->resizeColumnToContents(c);
   }
 
-  _ui->tilesListView->header()->swapSections(tm->FieldToColumn(Room::Tile::kNameFieldNumber),
+  _ui->layersListView->header()->swapSections(tm->FieldToColumn(Room::Tile::kNameFieldNumber),
                                              tm->FieldToColumn(Room::Tile::kBackgroundNameFieldNumber));
 
   RepeatedMessageModel* vm = _roomModel->GetSubModel<RepeatedMessageModel*>(Room::kViewsFieldNumber);
@@ -170,19 +171,19 @@ void RoomEditor::RebindSubModels() {
   connect(_ui->elementsListView->selectionModel(), &QItemSelectionModel::selectionChanged,
           [=](const QItemSelection& selected, const QItemSelection& /*deselected*/) {
             if (selected.empty()) return;
-            _ui->tilesListView->clearSelection();
+            _ui->layersListView->clearSelection();
             auto selectedIndex = selected.indexes().first();
             auto currentInstanceModel = imp->GetSubModel(selectedIndex.row());
-            _ui->layersPropertiesView->setModel(currentInstanceModel);
+            _ui->propertiesView->setModel(currentInstanceModel);
           });
 
-  connect(_ui->tilesListView->selectionModel(), &QItemSelectionModel::selectionChanged,
+  connect(_ui->layersListView->selectionModel(), &QItemSelectionModel::selectionChanged,
           [=](const QItemSelection& selected, const QItemSelection& /*deselected*/) {
             if (selected.empty()) return;
-            _ui->instancesListView->clearSelection();
+            // _ui->instancesListView->clearSelection();
             auto selectedIndex = selected.indexes().first();
             auto currentInstanceModel = tmp->GetSubModel(selectedIndex.row());
-            _ui->layersPropertiesView->setModel(currentInstanceModel);
+            _ui->propertiesView->setModel(currentInstanceModel);
           });
 
   BaseEditor::RebindSubModels();
@@ -201,7 +202,7 @@ void RoomEditor::MousePressed(Qt::MouseButton button) {
   if (button == Qt::MouseButton::LeftButton) {
     auto index = layerElements->rowCount();
     layerElements->insertRow(index);
-    layerElements->SetData(_ui->currentObject->text(), index, Room::Instance::kObjectTypeFieldNumber);
+    // layerElements->SetData(_ui->currentObject->text(), index, Room::Instance::kObjectTypeFieldNumber);
   }
 }
 
@@ -218,3 +219,7 @@ void RoomEditor::on_actionZoom_triggered() { _ui->roomPreviewBackground->ResetZo
 void RoomEditor::on_actionShowHideGrid_triggered() {
   _ui->roomPreviewBackground->SetGridVisible(_ui->actionShowHideGrid->isChecked());
 }
+
+void RoomEditor::updateCursorPositionLabel(const QPoint& pos) {
+
+}

Editors/RoomEditor.h

@@ -21,6 +21,12 @@ class RoomEditor : public BaseEditor {
 
   void setZoom(qreal zoom);
 
+  void MouseMoved(int x, int y);
+
+  void MousePressed(Qt::MouseButton button);
+
+  void MouseReleased(Qt::MouseButton button);
+
  public slots:
   void RebindSubModels() override;
 

MainWindow.cpp

@@ -35,8 +35,9 @@
 
 #undef GetMessage
 
-QList<QString> MainWindow::EnigmaSearchPaths = {QDir::currentPath(), "./enigma-dev", "../enigma-dev",
-                                                "../RadialGM/Submodules/enigma-dev", "/opt/enigma-dev/", "/usr/lib/enigma-dev"};
+QList<QString> MainWindow::EnigmaSearchPaths = {"/opt/enigma-dev/", "/usr/lib/enigma-dev",
+                                                QDir::currentPath() + "/Submodules/enigma-dev/CommandLine/emake", 
+                                                QDir::currentPath() + "/../Submodules/enigma-dev/"};
 QFileInfo MainWindow::EnigmaRoot = MainWindow::getEnigmaRoot();
 QList<buffers::SystemType> MainWindow::systemCache;
 MainWindow *MainWindow::_instance = nullptr;