Page MenuHomeWildfire Games

Fix 1 general and 3 OSX-specific issues in Atlas
Needs ReviewPublic

Authored by wraitii on Jun 5 2020, 2:41 PM.
This revision needs review, but there are no reviewers specified.

Details

Reviewers
None
Trac Tickets
#2427
#2846
Summary

This fixes a few issues with Atlas that prevent it from working on Catalina:

  • Remove the 'osxguiapplication' override. This fixes the editor starting up in the background and not accepting input.
  • To prevent an issue with sdl/wxwidgets conflict when running from inside the game, actually boot a new instance (see #2427)
  • Fix an assertion error because we try to use SDL subsystems that aren't initialised.

General issue:

  • Fix key events not being correctly sent to the game since we upgraded to SDL2 and use SDL_TEXTINPUT for text (see #2846)

The last remaining thing is the retina-size issue, which is fixable (see wik's post) but needs work.


D2752 is not technically a prerequisite, but you can't test on catalina without it.


This is cleanup work form issues reported by user wik on the forum, see:
https://wildfiregames.com/forum/index.php?/topic/28242-trunk23678-atlas-and-actor-editor-ignores-input-from-the-keyboard-on-osx/
https://wildfiregames.com/forum/index.php?/topic/28183-trunk23664-cant-open-atlas-editor-on-osx-catalina-10154/

Test Plan

Compile under various platforms, open as a standalone and from in-game.

Event Timeline

wraitii created this revision.Jun 5 2020, 2:41 PM
Owners added a subscriber: Restricted Owners Package.Jun 5 2020, 2:41 PM
Stan added a subscriber: Stan.Jun 5 2020, 2:44 PM
Stan added inline comments.
source/lib/sysdep/os/osx/osx_atlas.mm
32

This would be a regression... How hard is it to fix it?

Vulcan added a comment.Jun 5 2020, 2:49 PM

Successful build - Chance fights ever on the side of the prudent.

Linter detected issues:
Executing section Source...

source/tools/atlas/AtlasUI/Misc/DLLInterface.cpp
|   1| /*·Copyright·(C)·2017·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2017"

source/tools/atlas/AtlasUI/Misc/KeyMap.cpp
|   1| /*·Copyright·(C)·2013·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2013"

source/main.cpp
|   0| }
|    | [NORMAL] CPPCheckBear (toomanyconfigs):
|    | Too many #ifdef configurations - cppcheck only checks 12 configurations. Use --force to check all configurations. For more details, use --enable=information.

source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"

source/tools/atlas/GameInterface/Handlers/MiscHandlers.cpp
| 211| ····ev.ev.type·=·SDL_TEXTINPUT;
|    | [MAJOR] CPPCheckBear (syntaxError):
|    | Unmatched '}'. Configuration: 'MESSAGESSETUP_NOTFIRST'.

source/tools/atlas/AtlasUI/ScenarioEditor/ScenarioEditor.cpp
|   1| /*·Copyright·(C)·2019·Wildfire·Games.
|    | [NORMAL] LicenseYearBear:
|    | License should have "2020" year instead of "2019"
Executing section JS...
Executing section cli...

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/2321/display/redirect

yevgenko added inline comments.Jun 6 2020, 8:54 AM
source/main.cpp
658

It looks like this line uses spaces for indentation, while the line above uses tabs.

source/ps/GameSetup/HWDetect.cpp
386

a bit of indentation issue you probably know about :)

source/tools/atlas/AtlasUI/Misc/KeyMap.cpp
81

a bit of indentation issue (spaces vs tabs) you probably know about :)

wraitii added inline comments.Jun 6 2020, 9:27 AM
source/lib/sysdep/os/osx/osx_atlas.mm
32

Hardly a regression when the current status is "doesn't start" :P

it's not too hard to fix I think, just haven't bothered for the first diff.

Stan added inline comments.Jun 6 2020, 10:16 AM
source/lib/sysdep/os/osx/osx_atlas.mm
32

Well it used to start on other Mac and I believe the release didn't have the issue? :P