Unlimited map memory #47253

kevingranade · 2021-02-05T23:26:47Z

Summary

Features "Make map memory unlimited"

Purpose of change

The current map memory feature utilizes a lru cache to globally store the most recently seen X tiles or symbols of map data. While helpful, this is considered by many to be very limiting.
Closes #49696

Describe the solution

Changes backported from BrightNights PRs cataclysmbnteam/Cataclysm-BN#247 cataclysmbnteam/Cataclysm-BN#252 and cataclysmbnteam/Cataclysm-BN#310

Perform streaming serialization/deserialization of map memory to disk just like with map data so that the amount of memorised map is essentially unlimited.

Testing

Navigate around world, visually checking consistency of map memory.

ToxiClay · 2021-02-05T23:32:44Z

Obsoletes #47079. Thanks so much!

kevingranade · 2021-02-05T23:35:57Z

Not totally obsoleted, this doesn't actually touch the traits that try to manipulate map memory capacity, but it does remove the code that makes them do anything.

ToxiClay · 2021-02-05T23:40:05Z

True. I'll just pull those changes into a separate PR.

jbytheway

Are you planning to merge this before release? It seems like a pretty big feature.

src/game_constants.h

jbytheway · 2021-02-06T01:23:38Z

tests/point_test.cpp

+    half_open_rectangle<point> r1( point( 0, 0 ), point( 2,
+                                   2 ) ); // NOLINT(cata-use-named-point-constants)
+    half_open_rectangle<point> r2( point( 2, 2 ), point( 3, 3 ) );
+    half_open_rectangle<point> r3( point( 0, 0 ), point( 2,
+                                   1 ) ); // NOLINT(cata-use-named-point-constants)


I feel like these are cases where you could happily use point_zero. But if you really don't want to, then I think these NOLINT comments won't work when on the next line like this (maybe they do; looks like the error hasn't occurred yet).

lgtm-com · 2021-02-06T03:44:38Z

This pull request introduces 1 alert when merging 50f1746 into b4ab3df - view on LGTM.com

new alerts:

1 for Multiplication result converted to larger type

kevingranade · 2021-02-06T08:38:10Z

Yea as sad as it is not to put this in right away, it needs to wait for release.

lgtm-com · 2021-02-06T12:11:50Z

This pull request introduces 1 alert when merging 5c936e6 into 0c1ca59 - view on LGTM.com

new alerts:

1 for Multiplication result converted to larger type

src/map_memory.cpp

Note: this naive implementation significantly lowers FPS

Move memorized submaps that would be affected during drawing into a 2d array.

Collect map::draw code in one place, simplify indexing/bound checks. Remove the "batch drawing" optimization: it doesn't help with drawing, but harms code clarity. Instead, convert all relevant draw methods to use 'wputch' and rely on caller to position the cursor properly.

kevingranade · 2021-07-08T21:46:33Z

Rebased and hypothetically ready to go!

I-am-Erk · 2021-07-09T03:08:22Z

So, in the spirit of cavalierly merging things I don't understand and that could possibly entirely break the game, since we're just a few days into a new experimental, let's see if this weird "Calvin Grenade" character actually does test things.

This reverts commit 789c7a4.

* Encapsulate map::drawsq() arguments and clarify their meaning * Split map memory into submap-sized chunks Note: this naive implementation significantly lowers FPS * Optimize map memory access Move memorized submaps that would be affected during drawing into a 2d array. * Save/load memorized submaps; migrate old mm file * Remove leftovers from map memory limit * Some map memory cleanup * Don't save empty mm submaps * Deallocate far-away mm submaps on save; report save failure * Rework tests for map memory * Don't re-allocate region if old region contains required submaps * Remove map_memory.h from avatar.h * Rename memorized_submap -> mm_submap * Rename mm_submap::clean -> mm_submap::empty, add comments. * Improve drawsq_params interface * Remove map_memory.h from lru_cache.cpp * Add function for rectangle overlapping * Save mm_submaps in regions * Fix save/load not using avatar's global pos, improve docs. * When saving, compress mm_submaps using RLE * Simplify map rendering in ascii mode Collect map::draw code in one place, simplify indexing/bound checks. Remove the "batch drawing" optimization: it doesn't help with drawing, but harms code clarity. Instead, convert all relevant draw methods to use 'wputch' and rely on caller to position the cursor properly. * Memorize off-screen tiles in ascii mode * Fix copypasted code * Fix tile memory saving code, minor cleanup. * Add debug logging for tile memory operations * Fix broken saving for tile memory submaps with z != 0 * Lazy allocation for tile memory submaps Co-authored-by: olanti-p <olanti-p@yandex.ru>

KorGgenT added Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style Mechanics: Map Memory Performance issues, weird behavior, improvements to map memory feature labels Feb 5, 2021

ToxiClay mentioned this pull request Feb 5, 2021

Backport PR #97 from Bright Nights - user-configurable map tile memory #47079

Closed

kevingranade force-pushed the unlimited-map-memory branch 2 times, most recently from e7616f6 to 50f1746 Compare February 6, 2021 00:34

jbytheway reviewed Feb 6, 2021

View reviewed changes

kevingranade marked this pull request as draft February 6, 2021 07:02

kevingranade added the 0.F Feature Freeze label Feb 6, 2021

kevingranade force-pushed the unlimited-map-memory branch from 50f1746 to 5c936e6 Compare February 6, 2021 08:38

kevingranade mentioned this pull request Feb 6, 2021

Fix grabbed furniture/vehicle destruction feature and tests for same #47259

Merged

BrettDong reviewed Feb 6, 2021

View reviewed changes

src/map_memory.cpp Outdated Show resolved Hide resolved

actual-nh mentioned this pull request Jul 8, 2021

"Good Memory" and "Forgetful" traits are crippled by an optionality of Skill Rust #49696

Closed

olanti-p added 2 commits July 8, 2021 13:44

Encapsulate map::drawsq() arguments and clarify their meaning

6212398

Split map memory into submap-sized chunks

e8246ac

Note: this naive implementation significantly lowers FPS

kevingranade force-pushed the unlimited-map-memory branch from 5c936e6 to 2bf8f19 Compare July 8, 2021 21:19

olanti-p added 9 commits July 8, 2021 14:24

Optimize map memory access

4702785

Move memorized submaps that would be affected during drawing into a 2d array.

Save/load memorized submaps; migrate old mm file

3e2c7d2

Remove leftovers from map memory limit

126e690

Some map memory cleanup

0812916

Don't save empty mm submaps

b8a0661

Deallocate far-away mm submaps on save; report save failure

8f16ab2

Rework tests for map memory

7f10ccb

Don't re-allocate region if old region contains required submaps

88d99e5

Remove map_memory.h from avatar.h

ae99411

olanti-p added 2 commits July 8, 2021 14:24

Remove map_memory.h from lru_cache.cpp

c4c46ff

Add function for rectangle overlapping

c079162

kevingranade force-pushed the unlimited-map-memory branch from 2bf8f19 to d08b44d Compare July 8, 2021 21:29

olanti-p added 10 commits July 8, 2021 14:45

Save mm_submaps in regions

9cdd446

Fix save/load not using avatar's global pos, improve docs.

670a5c7

When saving, compress mm_submaps using RLE

261c594

Memorize off-screen tiles in ascii mode

632076d

Fix copypasted code

7525076

Fix tile memory saving code, minor cleanup.

59593a9

Add debug logging for tile memory operations

b29f5a1

Fix broken saving for tile memory submaps with z != 0

b8fe4ba

Lazy allocation for tile memory submaps

89a1240

kevingranade force-pushed the unlimited-map-memory branch from d08b44d to 89a1240 Compare July 8, 2021 21:46

kevingranade marked this pull request as ready for review July 8, 2021 21:46

I-am-Erk merged commit 789c7a4 into CleverRaven:master Jul 9, 2021

kevingranade deleted the unlimited-map-memory branch July 9, 2021 07:31

actual-nh mentioned this pull request Jul 9, 2021

Unhardcode bio_memory, add several enchantments #47656

Merged

eltank mentioned this pull request Jul 11, 2021

Autodrive v2 #49772

Merged

11 tasks

anothersimulacrum added a commit to anothersimulacrum/Cataclysm-DDA that referenced this pull request Jul 27, 2021

Revert "Unlimited map memory (CleverRaven#47253)"

0b1f07b

This reverts commit 789c7a4.

anothersimulacrum added a commit to anothersimulacrum/Cataclysm-DDA that referenced this pull request Jul 27, 2021

Revert "Unlimited map memory (CleverRaven#47253)"

8037fc0

This reverts commit 789c7a4.

BrettDong added a commit that referenced this pull request Nov 26, 2021

Backporting #47253 Unlimited map memory

0ff1468

BrettDong added a commit that referenced this pull request Nov 27, 2021

Fix compile error from backporting #47253 Unlimited map memory

819c247

ZhilkinSerg pushed a commit that referenced this pull request Nov 27, 2021

Backporting #47253 Unlimited map memory

f1cfff8

ZhilkinSerg pushed a commit that referenced this pull request Nov 27, 2021

Fix compile error from backporting #47253 Unlimited map memory

ac38b1e

Brambor mentioned this pull request Mar 30, 2024

Item Snapshot #72697

Open

28 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unlimited map memory #47253

Unlimited map memory #47253

kevingranade commented Feb 5, 2021 •

edited

Loading

ToxiClay commented Feb 5, 2021

kevingranade commented Feb 5, 2021

ToxiClay commented Feb 5, 2021

jbytheway left a comment

jbytheway Feb 6, 2021

lgtm-com bot commented Feb 6, 2021

kevingranade commented Feb 6, 2021

lgtm-com bot commented Feb 6, 2021

kevingranade commented Jul 8, 2021

I-am-Erk commented Jul 9, 2021

Unlimited map memory #47253

Unlimited map memory #47253

Conversation

kevingranade commented Feb 5, 2021 • edited Loading

Summary

Purpose of change

Describe the solution

Testing

ToxiClay commented Feb 5, 2021

kevingranade commented Feb 5, 2021

ToxiClay commented Feb 5, 2021

jbytheway left a comment

Choose a reason for hiding this comment

jbytheway Feb 6, 2021

Choose a reason for hiding this comment

lgtm-com bot commented Feb 6, 2021

kevingranade commented Feb 6, 2021

lgtm-com bot commented Feb 6, 2021

kevingranade commented Jul 8, 2021

I-am-Erk commented Jul 9, 2021

kevingranade commented Feb 5, 2021 •

edited

Loading