Skip to content

Convert UI to Dear ImGui#883

Merged
chreden merged 132 commits intomasterfrom
issue/402
Feb 22, 2022
Merged

Convert UI to Dear ImGui#883
chreden merged 132 commits intomasterfrom
issue/402

Conversation

@chreden
Copy link
Copy Markdown
Owner

@chreden chreden commented Feb 11, 2022 •
edited
Loading

This PR removes the existing homemade trview UI system and replaces it with Dear ImGui which was added in a previous PR. Almost all functionality was retained and a few extra bits have come for free. This should hopefully make new features be made faster as there won't be as much fiddling around with the UI.

Changes:

  • Remove trview.ui, trview.ui.render, trview.ui.tests and all contained files
  • Convert all UI elements to use ImGui
  • Create something resembling a testing framework for ImGui - this lets the tests click on element and check some of their properties. This uses the ImGui testing hooks plus a couple of others that I added.
  • Convert all tests in trview.app.tests to test ImGui using the system mentioned previously.

Closes #402

chreden added 30 commits February 14, 2022 22:21
@chreden
Add ImGui to external folder
acbd90c 
Add docking branch of ImGui from commit 3e0d6ec895483e33a663d3cfc1c58f1cafbe978c
#402
@chreden
Delete unused backends
48a1180 
Keep DX11 and Win32
@chreden
Hack in a test window for ImGui
0fd792a 
#402
@chreden
Convert camera controls to imgui
368d004
@chreden
Use docking branch of imgui
25500e3
@chreden
Convert view options to imgui
26f7d9a 
#402
@chreden
Turn on setting saving for now
b744202
@chreden
Work on the items window
1d0f6cc 
Done apart from:
- selection
- filtering
- sorting
@chreden
Size stats table
09d6ed6
@chreden
Selectable trigger in items window
f249cd9 
#402
@chreden
Selected item filtering
7c9db65
@chreden
Select item in list
d68f22b 
#402
@chreden
Sorting items
cb8a16a 
#402
@chreden
Rename variable
869f809
@chreden
Fix selection and checkbox size, window closing
70e4c52 
#402
@chreden
Remove old UI from ItemsWindow
9637105 
#402
@chreden
Split into functions
986f03d 
#402
@chreden
Comment out tests
c89788c 
Also put nav selection into triggered by.
#402
@chreden
Start on triggers window
75eca89 
#402
@chreden
Functionality for triggers
2498787 
#402
@chreden
Remove old UI
f5f0731 
#402
@chreden
Convert camera position
0872cda 
#402
@chreden
Start on settings window
45c6c95 
#402
@chreden
Convert settings window
ee3a371 
#402
@chreden
Add background colour to settings window
e34a3a6 
#402
@chreden
Remove old background colour picker
82e6e23 
#402
@chreden
Fix sorting in triggers window
1d25e71 
#402
@chreden
Convert context menu
043d3b3 
#402
@chreden
Add a todo
afc95ec 
#402
@chreden
Start on the go to window
9a1f921 
Still needs placing in window centre
#402
chreden added 19 commits February 16, 2022 21:27
@chreden
Update GoToTests.cpp
f5ad6e8
@chreden
Finish go to room tests, improve testimgui
f8a4617 
Finish go to room tests
Split input into click, type, press
#402
@chreden
Restore one triggers window test
abf3dec 
#402
@chreden
Add another triggers window tests
827a22f 
#402
@chreden
A few more trigger tests
586fe15 
#402
@chreden
Triggers window tests
df81df4 
#402
@chreden
Fix console size
379559e 
#402
@chreden
Add console tests
1639fa5 
#402
@chreden
level info test and rendered text hook
da46300 
#402
@chreden
Some route window tests
501d524 
Route window tests
Also remove old hack in application di
#402
@chreden
Change input check to input instead of keyboard
c0b0bce 
#402
@chreden
A test for route window
ab3f12f 
#402
@chreden
More route window tests
636c0ea 
#402
@chreden
Update route window tests
d5eaa6e 
#402
@chreden
Command and triggered by sorting
aa87bbe 
#402
@chreden
Remove stack tool
2d86bb7 
#402
@chreden
Swap notes and rando sections
6b5c7e9 
#402
@chreden
Fix some table sizing
5383ba0 
#402
@chreden
PR changes
ec3f50b 
#402
@chreden chreden changed the title Issue/402 Convert UI to Dear ImGui Feb 21, 2022
@chreden chreden self-assigned this Feb 21, 2022
@chreden chreden requested a review from makotocchi February 21, 2022 22:53
@chreden chreden added the ui label Feb 21, 2022
@chreden chreden marked this pull request as ready for review February 21, 2022 22:58
@chreden chreden merged commit fe21a21 into master Feb 22, 2022
@chreden chreden deleted the issue/402 branch February 22, 2022 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@makotocchi makotocchi makotocchi approved these changes

Assignees

@chreden chreden

Labels

ui

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Migrate UI to a real UI framework

2 participants

@chreden @makotocchi