Commit 610aead
Implement dynamic UI aspect ratio scaling, VERT+ and controller icons (#145)
* Dynamic UI aspect ratio and controller icons support (WIP)
Lots of stuff here, just pushing everything to keep my changes focused. Will take a cautionary glance at everything before a PR is considered. Unfinished work ahead!!
* Apply config controller icons first before auto
* CsdManager: use Sonicteam::System::Singleton
* Implement pillarboxing on loading screens and CSD repeat modifiers
* Fix macOS build
* Align main menu plates to bottom
* Apply scaling to main HUD and radar
* Fix main menu seams and boss name alignment
* Clean-up, added CSD alignment for multiplayer HUDs
* Fix radar and controller icons, aligned main menu titlebar effect
* Truncate XNCPs with language names to redirect CSD modifiers
* Results CSD adjustments
* Check suffix against XNCP name case insensitive
* Remove battle_result language suffix
* Fix Audio/Theatre Room "pod" box fill
* Implement ultrawide main menu chevron animation (WIP)
TODO:
- Make the last two foreground arrows on the left slightly more opaque and fade out later.
- Make the background arrows fade out first before the foreground starts fading.
* Added ultrawide-only CSD modifier
* Improve ultrawide chevron offset and alpha motion
* Improve text scaling
Co-Authored-By: Skyth (Asilkan) <[email protected]>
* Improve narrow UI scaling
* Fixed button prompts with short strings not changing platform
* Fixed 2P UI element not extending properly at ultrawide
* Align CRI technology logos to the bottom right corner
* Fix chevron animation offset with centred UI Alignment Mode
* Remove result debug key
* Scale town NPC balloon icons
* Clean-up
* API: radar research
* API: TextBook research
* Align mission timer to the top of the screen
* Move Unicode string functions to Marathon.inl
* Implement text entity modifiers
Co-Authored-By: Skyth (Asilkan) <[email protected]>
* Fix message window vertical alignment
* Support letterboxing in ImGui black bar
* Remove main menu vertical alignments
This will only scale the main menu instead, allowing narrow aspect ratios to look a bit more proper. Needs work to extend the metal plates past 16:9.
* Remove mission timer alignment for centred mode at narrow aspect ratios
* Align talk window to bottom and fix loading screen scaling
* Implement VERT+
* Fix NPC balloon icon scale at narrow aspect ratios
* Align NPC dialogue window text to bottom
* API: mapped cameras in GameImp
* Scale main menu borders for narrow aspect ratios
* Fix multiplayer main menu text lingering at ultrawide
* Fix multiplayer gauge and itembox alignment
* Draw letter/pillarbox for credits
* API: remove self include from FrameObserver
* API: fix camera mappings in GameImp
* API: rename field in HudTextParts
* Copy font picture on resource load
* Only store font picture texture dimensions
* Fix overlapping vertices
* Only extend metal borders at aspect ratios narrower than 4:3
---------
Co-authored-by: Skyth (Asilkan) <[email protected]>1 parent b3fe6a3 commit 610aead
File tree
106 files changed
+4055
-712
lines changed- MarathonRecompLib/config
- MarathonRecomp
- api
- CSD
- Manager
- Platform
- Sonicteam
- Camera
- Player
- State
- SoX
- Engine
- Graphics
- Math
- Scenery
- stdx
- patches
- ui
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
106 files changed
+4055
-712
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
| 143 | + | |
| 144 | + | |
143 | 145 | | |
144 | 146 | | |
145 | 147 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | | - | |
29 | 19 | | |
30 | 20 | | |
31 | | - | |
32 | | - | |
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | 18 | | |
21 | 19 | | |
22 | | - | |
23 | | - | |
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
5 | | - | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | | - | |
| 9 | + | |
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
14 | 19 | | |
15 | 20 | | |
16 | 21 | | |
17 | 22 | | |
18 | 23 | | |
19 | 24 | | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | | - | |
26 | | - | |
27 | | - | |
28 | 25 | | |
29 | 26 | | |
30 | | - | |
31 | | - | |
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
| 3 | + | |
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | | - | |
| 12 | + | |
| 13 | + | |
14 | 14 | | |
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
25 | 21 | | |
26 | 22 | | |
27 | | - | |
28 | | - | |
This file was deleted.
0 commit comments