Preview, current size is bit smaller:
Icon for civil centre:
Currently icons are drawn on top of the minimap, so they're not clipped by minimap bounds.
Details
Details
- Reviewers
- None
- Group Reviewers
Restricted Owners Package (Owns No Changed Paths) - Commits
- rP26592: Adds icons to minimap.
- Trac Tickets
- #6151
- Apply the patch and compile the game (add the icon to session/icons/minimap/)
- Test that minimap icons work
- Test that the option disables minimap icons
- Check how icons look like on the map border
Diff Detail
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/6823/display/redirect
Comment Actions
Build failure - The Moirai have given mortals hearts that can endure.
Link to build: https://jenkins.wildfiregames.com/job/macos-differential/5731/display/redirect
Comment Actions
Apply the patch and compile the game (add the icon to session/icons/minimap/)... ✓ Test that minimap icons work... ✓
Test that the option disables minimap icons... ✓
 |  |
Check how icons look like on the map border... ✓ Test that icons change color when a building is captured... ✓ Test ARB icons... ✓ Test Limits ... ?
| binaries/data/mods/public/gui/options/options.json | ||
|---|---|---|
| 614 ↗ | (On Diff #19773) | |
| source/graphics/MiniMapTexture.cpp | ||
| 61 ↗ | (On Diff #19773) | Is there a special reason for this limit to be 64 eg could it be 128 instead? 16 cc + 8 wonders + 8 relics + 32 mines = 64 |
| 519 ↗ | (On Diff #19773) | Not sure if intended, but it will spam a lot. Also overloading the number won't actually print 126 /64 but just 64  |
| source/simulation2/components/CCmpMinimap.cpp | ||
| 133 ↗ | (On Diff #19773) | Path hardcoding sounds sane, I looked around and the session icons are rare anyway. |
| source/simulation2/components/ICmpMinimap.h | ||
| 51 ↗ | (On Diff #19773) | |
| 55–58 ↗ | (On Diff #19773) | Why not CStr / VFSPath? |
Comment Actions
Apply the patch and compile the game (add the icon to session/icons/minimap/)
ok
Test that minimap icons work
yes
Test that the option disables minimap icons
You mean the Defuaut.cfg set to false, yes this works
Maybe a bit of text can be added to the Default.cfg
Check how icons look like on the map border
So beautiful. You rock!
Comment Actions
I mean regular options.
Maybe a bit of text can be added to the Default.cfg
Maybe, though I'm not sure what to add exactly. Maybe duplicate options.json tooltips.
| source/graphics/MiniMapTexture.cpp | ||
|---|---|---|
| 61 ↗ | (On Diff #19773) | Currently I have in mind only CCs. So it was 8 players * 8 CC per player. I'd like to have it as small as possible until we have a lazy update mechanism. Because currently I fetch icons even if simulation state wasn't changed. |
| 519 ↗ | (On Diff #19773) | It tries to overflow, but I don't allow to have more than the limit. The repeating message is to not forget about error for users :) |
| source/simulation2/components/ICmpMinimap.h | ||
| 55–58 ↗ | (On Diff #19773) | We use std::string and std::wstring as return types. I'm not sure about VfsPath or CStrW, haven't seen them as return types. |
| source/graphics/MiniMapTexture.cpp | ||
|---|---|---|
| 61 ↗ | (On Diff #19773) | Yeah I'd like to bump it just a little for mods/ campaigns. |
| 519 ↗ | (On Diff #19773) | It makes the game a bit laggy, can it be moved out of the loop? |
| source/simulation2/components/ICmpMinimap.h | ||
| 55–58 ↗ | (On Diff #19773) | Weird I was sure we used it for other interfaces (didn't check) |