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.

Sign up for GitHub

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

Unlimited map memory #47253

Merged
merged 26 commits into from
Jul 9, 2021
Merged

Unlimited map memory #47253

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
6212398
Encapsulate map::drawsq() arguments and clarify their meaning
olanti-p Nov 27, 2020
e8246ac
Split map memory into submap-sized chunks
olanti-p Nov 27, 2020
4702785
Optimize map memory access
olanti-p Nov 27, 2020
3e2c7d2
Save/load memorized submaps; migrate old mm file
olanti-p Nov 28, 2020
126e690
Remove leftovers from map memory limit
olanti-p Nov 27, 2020
0812916
Some map memory cleanup
olanti-p Nov 28, 2020
b8a0661
Don't save empty mm submaps
olanti-p Nov 28, 2020
8f16ab2
Deallocate far-away mm submaps on save; report save failure
olanti-p Nov 28, 2020
7f10ccb
Rework tests for map memory
olanti-p Nov 28, 2020
88d99e5
Don't re-allocate region if old region contains required submaps
olanti-p Nov 28, 2020
ae99411
Remove map_memory.h from avatar.h
olanti-p Nov 28, 2020
1b215c2
Rename memorized_submap -> mm_submap
olanti-p Dec 3, 2020
925e94e
Rename mm_submap::clean -> mm_submap::empty, add comments.
olanti-p Dec 3, 2020
c22ac53
Improve drawsq_params interface
olanti-p Dec 3, 2020
c4c46ff
Remove map_memory.h from lru_cache.cpp
olanti-p Dec 3, 2020
c079162
Add function for rectangle overlapping
olanti-p Dec 3, 2020
9cdd446
Save mm_submaps in regions
olanti-p Dec 3, 2020
670a5c7
Fix save/load not using avatar's global pos, improve docs.
olanti-p Dec 3, 2020
261c594
When saving, compress mm_submaps using RLE
olanti-p Dec 3, 2020
1de9048
Simplify map rendering in ascii mode
olanti-p Dec 4, 2020
632076d
Memorize off-screen tiles in ascii mode
olanti-p Dec 5, 2020
7525076
Fix copypasted code
olanti-p Dec 5, 2020
59593a9
Fix tile memory saving code, minor cleanup.
olanti-p Dec 6, 2020
b29f5a1
Add debug logging for tile memory operations
olanti-p Dec 6, 2020
b8fe4ba
Fix broken saving for tile memory submaps with z != 0
olanti-p Dec 7, 2020
89a1240
Lazy allocation for tile memory submaps
olanti-p Jan 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add function for rectangle overlapping
  • Loading branch information
@olanti-p @kevingranade
olanti-p authored and kevingranade committed Jul 8, 2021
commit c079162f4279822dfa752c6e3007c87075dd448e
14 changes: 14 additions & 0 deletions src/cuboid_rectangle.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,13 @@ struct half_open_rectangle : rectangle<Point> {
return Traits::x( p ) >= Traits::x( p_min ) && Traits::x( p ) < Traits::x( p_max ) &&
Traits::y( p ) >= Traits::y( p_min ) && Traits::y( p ) < Traits::y( p_max );
}
constexpr bool overlaps( const rectangle<Point> &r ) const {
using Traits = point_traits<Point>;
return !( Traits::x( r.p_min ) >= Traits::x( p_max ) ||
Traits::y( r.p_min ) >= Traits::y( p_max ) ||
Traits::x( p_min ) >= Traits::x( r.p_max ) ||
Traits::y( p_min ) >= Traits::y( r.p_max ) );
}
};

template<typename Point, decltype( std::declval<rectangle<Point>>(), int() ) = 0>
Expand All @@ -47,6 +54,13 @@ struct inclusive_rectangle : rectangle<Point> {
return Traits::x( p ) >= Traits::x( p_min ) && Traits::x( p ) <= Traits::x( p_max ) &&
Traits::y( p ) >= Traits::y( p_min ) && Traits::y( p ) <= Traits::y( p_max );
}
constexpr bool overlaps( const rectangle<Point> &r ) const {
using Traits = point_traits<Point>;
return !( Traits::x( r.p_min ) > Traits::x( p_max ) ||
Traits::y( r.p_min ) > Traits::y( p_max ) ||
Traits::x( p_min ) > Traits::x( r.p_max ) ||
Traits::y( p_min ) > Traits::y( r.p_max ) );
}
};

// Clamp p to the rectangle r.
Expand Down
1 change: 1 addition & 0 deletions src/point.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ struct tripoint {
friend inline constexpr bool operator!=( const tripoint &a, const tripoint &b ) {
return !( a == b );
}

friend inline bool operator<( const tripoint &a, const tripoint &b ) {
if( a.x != b.x ) {
return a.x < b.x;
Expand Down
72 changes: 72 additions & 0 deletions tests/point_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,78 @@ TEST_CASE( "rectangle_containment_raw", "[point]" )
CHECK( !r2.contains( point( 0, 3 ) ) );
}

TEST_CASE( "rectangle_overlapping_inclusive", "[point]" )
{
inclusive_rectangle<point> r1( point( 0, 0 ), point( 2,
2 ) ); // NOLINT(cata-use-named-point-constants)
inclusive_rectangle<point> r2( point( 2, 2 ), point( 3, 3 ) );
inclusive_rectangle<point> r3( point( 0, 0 ), point( 2,
1 ) ); // NOLINT(cata-use-named-point-constants)
inclusive_rectangle<point> r4( point( -2, -4 ), point( 4, -1 ) );
inclusive_rectangle<point> r5( point( -1, -3 ), point( 0, -2 ) );

CHECK( r1.overlaps( r1 ) );
CHECK( r1.overlaps( r2 ) );
CHECK( r1.overlaps( r3 ) );
CHECK( !r1.overlaps( r4 ) );
CHECK( !r1.overlaps( r5 ) );

CHECK( r2.overlaps( r1 ) );
CHECK( r2.overlaps( r2 ) );
CHECK( !r2.overlaps( r3 ) );
CHECK( !r2.overlaps( r4 ) );
CHECK( !r2.overlaps( r5 ) );

CHECK( r3.overlaps( r1 ) );
CHECK( !r3.overlaps( r2 ) );
CHECK( r3.overlaps( r3 ) );
CHECK( !r3.overlaps( r4 ) );
CHECK( !r3.overlaps( r5 ) );

CHECK( !r4.overlaps( r1 ) );
CHECK( !r4.overlaps( r2 ) );
CHECK( !r4.overlaps( r3 ) );
CHECK( r4.overlaps( r4 ) );
CHECK( r4.overlaps( r5 ) );
CHECK( r5.overlaps( r4 ) );
}

TEST_CASE( "rectangle_overlapping_half_open", "[point]" )
{
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)
Comment on lines +67 to +71
Copy link
Contributor

Choose a reason for hiding this comment

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

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).

half_open_rectangle<point> r4( point( -2, -4 ), point( 4, -1 ) );
half_open_rectangle<point> r5( point( -1, -3 ), point( 0, -2 ) );

CHECK( r1.overlaps( r1 ) );
CHECK( !r1.overlaps( r2 ) );
CHECK( r1.overlaps( r3 ) );
CHECK( !r1.overlaps( r4 ) );
CHECK( !r1.overlaps( r5 ) );

CHECK( !r2.overlaps( r1 ) );
CHECK( r2.overlaps( r2 ) );
CHECK( !r2.overlaps( r3 ) );
CHECK( !r2.overlaps( r4 ) );
CHECK( !r2.overlaps( r5 ) );

CHECK( r3.overlaps( r1 ) );
CHECK( !r3.overlaps( r2 ) );
CHECK( r3.overlaps( r3 ) );
CHECK( !r3.overlaps( r4 ) );
CHECK( !r3.overlaps( r5 ) );

CHECK( !r4.overlaps( r1 ) );
CHECK( !r4.overlaps( r2 ) );
CHECK( !r4.overlaps( r3 ) );
CHECK( r4.overlaps( r4 ) );
CHECK( r4.overlaps( r5 ) );
CHECK( r5.overlaps( r4 ) );
}

TEST_CASE( "rectangle_containment_coord", "[point]" )
{
// NOLINTNEXTLINE(cata-use-named-point-constants)
Expand Down