Skip to content

Add diff window to compare levels#1335

Merged
chreden merged 6 commits intomasterfrom
issue/634-2
Feb 9, 2025
Merged

Add diff window to compare levels#1335
chreden merged 6 commits intomasterfrom
issue/634-2

Conversation

@chreden
Copy link
Owner

@chreden chreden commented Jan 6, 2025

Add a diff window to allow comparing levels to other levels.
Compare level is owned by the diff window and various aspects are shown to the user.
Clicking on each side of the diff will switch the level in the viewer to that level.
Closes #634

@chreden chreden changed the title diff Add diff window to compare levels Feb 2, 2025
@chreden chreden added this to the Next milestone Feb 2, 2025
@chreden chreden self-assigned this Feb 2, 2025
Add a diff window to compare the opened level to another level.
Shows significant changes between levels.
Closes #634
Add some progress info when loading diff parts
Disable the menu bar when loading because of a hanging issue
@chreden chreden marked this pull request as ready for review February 8, 2025 20:30
@chreden chreden requested review from lahm86 and makotocchi February 8, 2025 20:32
@lahm86
Copy link
Collaborator

lahm86 commented Feb 9, 2025

Looks really great, this will be such a useful tool.

Found a few issues:


I get an error following these steps

  • Open (TombATI) LEVEL5.PHD
  • Click on trigger in room 72 in view
  • Open Triggers window

image

I went to look specifically at this trigger as I know there is a duplicate entry in the action list, which was fixed in TR1R. This doesn't show in the diff for these levels (not sure if you want to target that kind of change at this stage). It doesn't error when doing the same steps in TR1R so I assume it's related to the duplicate.


When switching levels from the diff, is it intended that only the 3D view should update and not property windows? For example, if you have the Triggers window open here in OG Lost Valley and diff with TR1R, clicking on the TR1R sector does change the view, but the Trigger list continues to show the OG one. Similar for Rooms,

image


If you open a diff (e.g. OG/TR1R Lost Valley), select a change to switch the view to the diff level by selecting a B change, and then close the diff window, the 3D view unloads (shows just the background colour). You can get it back to normal by going into the Rooms window and picking something, or otherwise reloading.


Sorting the columns in the diff window doesn't seem to have an effect. Appreciate that's perhaps a future improvement, but I'm not sure if disabling the sort order arrows on the column headers is feasible in the meantime to avoid confusion.

Diff window owns the level so when it closes the level closes.
Restore the original level if the level is currently open in the viewer.
@chreden chreden merged commit 9718859 into master Feb 9, 2025
1 check passed
@chreden chreden deleted the issue/634-2 branch February 9, 2025 13:30
chreden added a commit that referenced this pull request Feb 27, 2025
Add more visible explanation for what trigger triggerers do to the items and triggers windows.
Add buttons on each side of the links.
Closes #1335
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Visual diff between different level versions

2 participants