search

enigma-dev / RadialGM

A native IDE for ENIGMA written in C++ using the Qt Framework.
GNU General Public License v3.0
46 stars 22 forks source link

GSoC project: Tiled compatibility support RGM #228

Open KartikShrivastava opened 2 years ago

KartikShrivastava commented 2 years ago

In A Nutshell - This project implements two importers: .tmx/.tsx file importers in RadialGM and .egm file importer in Tiled

My GSoC project spans into three PRs in three different projects of two separate organizations. The two organizations involved are Enigma-dev and Tiled. fundies and Josh are my mentors from Enigma-dev and bjorn is my mentor from Tiled.

Requirement: You have to use Arch linux OS specifically, as Enigma-dev's RadialGM only compiles in Arch linux at the time of writing these steps. Compiling RadialGM can be tough, so feel free to ping in enigma-dev discord server.

Steps to test the project:

  1. Compile Enigma-dev's RadialGM project and Tiled projects. (Note that Enigma-dev's enigma-dev project is a submodule of RadialGM so it gets included with RadialGM)
  2. Open terminal and change directory to RadialGM, checkout to PR #228
  3. Change directory to RadialGM/Submodules/enigma-dev, checkout to PR #2302
  4. Setup a system environment variable named ENIGMA_PATH and set its value to RadialGM/Submodules/enigma-dev. This path will be used by Tiled editor's "enigma" plugin.
  5. Change directory to Tiled, checkout to PR #3435
  6. Compile RadialGM and Tiled projects separately
  7. Run RadialGM project to open RadialGM editor, test the TMX importer by importing some .tmx file
  8. Run Tiled project to open Tiled editor, enable "enigma" plugin by checking it in Edit-Preferences-Plugins tab and finally test the EGM importer by importing some .egm file

Short demo video of the final outcome: https://www.youtube.com/watch?v=ZUJd5VhqQo8 Weekly project work logs: https://kartikshrivastava.github.io/

bjorn commented 2 years ago

@KartikShrivastava I'm not sure what you did but the last three commits here look very broken. In 93cda62dcb0d3c1eafcdc439e0ab15ac19ece124 you deleted MainWindow.cpp, in f2d2300cb23a69981f87f964054193519967582d you seem to have added the version from master and in 37f26d8bc28ced1522ea575d1d1f1c1c782b4456 you re-applied the remaining part of 6d903c361882bcc83b4c0ceab1d85c6b08d3747f but without the fix that followed in 4022009785a1ccc91fa7aa4a3db5e26714c8d497.

I would suggest you reset your branch back to 4022009785a1ccc91fa7aa4a3db5e26714c8d497 and then either rebase it on / merge it with master.

KartikShrivastava commented 2 years ago

Oh yup @bjorn actually that was a disaster. I was trying to pull with rebase the co-authored commits to my local branch and there occured merge conflicts which spoiled the commits history and on top of that same thing happened again when I tried to pull with rebase the changes of master in my local branch. Now I lost co-authored commits and commit history looks ugly. I guess my git workflow was terrible.

bjorn commented 2 years ago

@KartikShrivastava Indeed. If you need any help fixing this up, just ping me on Discord.