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

Build system cleanup + dataloading scaffolding + JSON dataloading removed #151

Merged
merged 5 commits into from
Sep 14, 2023

Conversation

Hop311
Copy link
Contributor

@Hop311 Hop311 commented Aug 25, 2023

  • Moved openvic-dataloader submodule to openvic-simulation.
  • Modified SConstruct to build openvic-simulation as a library using its own SConstruct, similar to what openvic-simulation does to openvic-dataloader and openvic-dataloader does to lexy.
  • Moved extension sources into openvic-extension subdir.
  • Removed JSON based "custom mode" loading (compatibility mode is the current focus).
  • Added Logger::warning (alongside Logger::info and Logger::error).
  • Moved "hardcoded defines" (mapmodes, building types) to simulation submodule.
  • Added religion mapmode.
  • Added prototype gdscript-level AssetManager which queries the C++ layer to lookup asset-paths and then loads and caches them, making them available to UI nodes.
  • Added methods to pass a list of root directories to the C++ layer, those being the base install directory + an ordered list of mod directories. Currently this has no UI, the base directory must be passed as a command line argument after --compatibility-mode or edited in GameStart.gd, and any mod directories also need to be edited in GameStart.gd.

Requirement commented:

  • MAP-34
  • UI-24, UI-124, UI-125, UI-127, UI-563
  • UIFUN-142

@Hop311 Hop311 marked this pull request as draft August 25, 2023 23:11
@Spartan322 Spartan322 added enhancement New feature or request requirement filesystem Requirement FS requirement simulation Requirement SIM build Issue is relevant to the build system labels Sep 8, 2023
@Hop311 Hop311 force-pushed the dataloading branch 2 times, most recently from 9154d66 to 7cdb280 Compare September 9, 2023 21:53
@Hop311 Hop311 marked this pull request as ready for review September 9, 2023 22:32
BrickPi
BrickPi previously approved these changes Sep 13, 2023
Copy link
Contributor

@BrickPi BrickPi left a comment

Choose a reason for hiding this comment

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

works as expected, tested on Win64; code lgtm.

@Hop311 Hop311 merged commit 9de41a0 into master Sep 14, 2023
16 checks passed
@Hop311 Hop311 deleted the dataloading branch September 14, 2023 19:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Issue is relevant to the build system enhancement New feature or request requirement filesystem Requirement FS requirement simulation Requirement SIM
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants