Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GSoC project: Tiled compatibility support RGM #228

Open
wants to merge 13 commits into
base: master
Choose a base branch
from

Conversation

KartikShrivastava
Copy link
Contributor

@KartikShrivastava KartikShrivastava commented Jun 5, 2022

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/

MainWindow.cpp Outdated Show resolved Hide resolved
MainWindow.cpp Outdated Show resolved Hide resolved
@bjorn
Copy link

bjorn commented Jun 20, 2022

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

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

@KartikShrivastava
Copy link
Contributor Author

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
Copy link

bjorn commented Jun 20, 2022

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

@KartikShrivastava KartikShrivastava changed the title WIP: Tiled compatibility support RGM GSoC project: Tiled compatibility support RGM Sep 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants