Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

For 0.9.x - MacPorts support, plus destructor crash fixes; lin_time and vs_config refactors; and more #851

Merged
merged 45 commits into from
May 5, 2024

Conversation

stephengtuggy
Copy link
Contributor

@stephengtuggy stephengtuggy commented Apr 29, 2024

Code Changes:

Closes #533

Known Issues:
Update 2: graphics now showing up on all three platforms -- macOS, Windows, and Linux -- and performance is much better than it was a day or so ago. Loading assets on startup may take somewhat longer now, but other than that, I am not aware of any new issues with this code.

Purpose:

  • What is this pull request trying to do? Update the code itself as needed, and provide a bootstrap script using MacPorts, such that others can build and run Vega Strike on macOS. Especially macOS X and 11.
  • What release is this for? 0.9.x
  • Is there a project or milestone we should apply this to? 0.9.x

…wner.h, vega_collection_utils.cpp, and vega_collection_utils.h. In CMakeLists.txt, change C++ standard to C++14. (Hurray!)
…ly on macOS! Yay! Also, replaced the functionality of the winsys_enable_key_repeat function, which used SDL constructs that are deprecated in SDL2. Finally, moved the definition of remove_all_references_to into the header file (vega_collection_utils.h), rendering vega_collection_utils.cpp obsolete.
…rying to get something to show up besides a blank window. Also, added functionality to quit the game when the SDL_QUIT event is triggered, i.e. (on macOS) by trying to close the window, or by choosing Quit from the Application menu.
@stephengtuggy stephengtuggy added this to the 0.9.x milestone Apr 29, 2024
@stephengtuggy stephengtuggy self-assigned this Apr 29, 2024
@stephengtuggy stephengtuggy linked an issue Apr 29, 2024 that may be closed by this pull request
@stephengtuggy stephengtuggy changed the title 0.9.x MacPorts For 0.9.x - MacPorts support, plus destructor crash fixes Apr 29, 2024
…ncorporate changes from PR vegastrike#821 ; fix macOS detection ("Darwin")
@stephengtuggy stephengtuggy marked this pull request as ready for review May 1, 2024 06:56
@stephengtuggy stephengtuggy changed the title For 0.9.x - MacPorts support, plus destructor crash fixes For 0.9.x - MacPorts support, plus destructor crash fixes; lin_time and vs_config refactors; and more May 1, 2024
Copy link
Member

@BenjamenMeyer BenjamenMeyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally looks good. A few discussion points though

engine/src/vega_collection_utils.cpp Outdated Show resolved Hide resolved
script/bootstrap-on-macOS-using-MacPorts.sh Outdated Show resolved Hide resolved
script/build Outdated Show resolved Hide resolved
@stephengtuggy
Copy link
Contributor Author

Okay, there is one bug that I have been running into with this code. When I load a saved game from the Main Menu, and then jump through a warp point, the game crashes within a minute or so after the jump. The crash occurs in operator = for Mesh. It's trying to copy the field values from a nonexistent orig instance (bad pointer in the calling code -- very low address value, close to zero).

We will need to take a look at this, but hopefully it can wait until another PR to be fixed.

@stephengtuggy stephengtuggy linked an issue May 3, 2024 that may be closed by this pull request
@stephengtuggy stephengtuggy mentioned this pull request May 3, 2024
…lic links to GL/ to be added by the bootstrap scripts. Also add 4 more configures preset to CMakePresets.json (MacPorts versions of the existing macOS presets).
@stephengtuggy stephengtuggy merged commit cdb2325 into vegastrike:0.9.x May 5, 2024
30 checks passed
@stephengtuggy stephengtuggy deleted the 0.9.x_MacPorts branch May 5, 2024 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment