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

Fix and re-enable 3D map memory #66505

Merged
merged 6 commits into from
Jun 29, 2023
Merged

Fix and re-enable 3D map memory #66505

merged 6 commits into from
Jun 29, 2023

Conversation

Rewryte
Copy link
Contributor

@Rewryte Rewryte commented Jun 28, 2023

Summary

Bugfixes "Fix and re-enable 3D map memory"

Purpose of change

Map memory always had buggy interactions with 3D vision since #65738. Cross z-level map memory was disabled in #66383 due to memory tiles being drawn on the wrong z-levels being more prominent on isometric tilesets.

Describe the solution

Map memory itself is stored in 3D, but the caching and retrieval of submaps are performed on a single z-level. The relevant code was revised and cross z-level map memory is re-enabled.

Describe alternatives you've considered

Testing

Builds ok
Map memory now works as expected
Memory tiles are drawn on the correct z-level on isometric tilesets
Tested on various tilesets and 3D settings
Chiquita Waters _2023-06-28T11-40-44

Additional context

additional safeguards prevent segmentation fault when switching from legacy to 3d draw mode
@github-actions github-actions bot added [C++] Changes (can be) made in C++. Previously named `Code` <Bugfix> This is a fix for a bug (or closes open issue) astyled astyled PR, label is assigned by github actions json-styled JSON lint passed, label assigned by github actions labels Jun 28, 2023
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Jun 28, 2023
@Rewryte Rewryte marked this pull request as ready for review June 28, 2023 12:13
@bombasticSlacks
Copy link
Contributor

LGTM but gonna let a few of the usual suspects put eyes on it before merging 😄

@dseguin dseguin merged commit d678fe6 into CleverRaven:master Jun 29, 2023
26 checks passed
@Rewryte Rewryte deleted the 3d_memory branch July 18, 2023 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants