Make coord_point into coord_point_ob and parent class of coord_point_ib

CleverRaven · Aug 1, 2024 · 57ca0ab · 57ca0ab
1 parent 0b942b3
commit 57ca0ab
Show file tree

Hide file tree

Showing 8 changed files with 412 additions and 246 deletions.
diff --git a/src/cata_inline.h b/src/cata_inline.h
@@ -0,0 +1,13 @@
+#pragma once
+#ifndef CATA_SRC_CATA_INLINE_H
+#define CATA_SRC_CATA_INLINE_H
+
+#ifndef CATA_FORCEINLINE
+#ifdef _MSC_VER
+#define CATA_FORCEINLINE __forceinline
+#else
+#define CATA_FORCEINLINE inline __attribute__((always_inline))
+#endif
+#endif
+
+#endif
diff --git a/src/coordinates.h b/src/coordinates.h
diff --git a/src/coords_fwd.h b/src/coords_fwd.h
@@ -2,6 +2,8 @@
 #ifndef CATA_SRC_COORDS_FWD_H
 #define CATA_SRC_COORDS_FWD_H
 
+#include <type_traits>
+
 struct point;
 struct tripoint;
 
@@ -32,8 +34,15 @@ constexpr scale omt = scale::overmap_terrain;
 constexpr scale seg = scale::segment;
 constexpr scale om = scale::overmap;
 
+template<typename Point, origin Origin, scale Scale>
+class coord_point_ob;
+
+template<typename Point, origin Origin, scale Scale>
+class coord_point_ib;
+
 template<typename Point, origin Origin, scale Scale, bool InBounds = false>
-class coord_point;
+using coord_point =
+    std::conditional_t<InBounds, coord_point_ib<Point, Origin, Scale>, coord_point_ob<Point, Origin, Scale>>;
 
 } // namespace coords
 
@@ -76,7 +85,7 @@ using point_abs_om = coords::coord_point<point, coords::origin::abs, coords::om>
 using tripoint_rel_ms = coords::coord_point<tripoint, coords::origin::relative, coords::ms>;
 using tripoint_abs_ms = coords::coord_point<tripoint, coords::origin::abs, coords::ms>;
 using tripoint_sm_ms = coords::coord_point<tripoint, coords::origin::submap, coords::ms>;
-using tripoint_sm_ms_ib = coords::coord_point<tripoint, coords::origin::submap, coords::ms, true>;
+using tripoint_sm_ms_ib = coords::coord_point_ib<tripoint, coords::origin::submap, coords::ms>;
 using tripoint_omt_ms = coords::coord_point<tripoint, coords::origin::overmap_terrain, coords::ms>;
 using tripoint_bub_ms = coords::coord_point<tripoint, coords::origin::reality_bubble, coords::ms>;
 using tripoint_bub_ms_ib =

diff --git a/src/map.cpp b/src/map.cpp
@@ -1805,7 +1805,7 @@ furn_id map::furn( const tripoint &p ) const
     return furn( tripoint_bub_ms( p ) );
 }
 
-furn_id map::furn( const tripoint_bub_ms &p ) const
+furn_id map::furn( const tripoint_bub_ms p ) const
 {
     if( !inbounds( p ) ) {
         return furn_str_id::NULL_ID();
@@ -2000,7 +2000,7 @@ std::string map::furnname( const tripoint_bub_ms &p )
  * retained for high performance comparisons, save/load, and gradual transition
  * to string terrain.id
  */
-ter_id map::ter( const tripoint &p ) const
+ter_id map::ter( const tripoint p ) const
 {
     if( !inbounds( p ) ) {
         return ter_str_id::NULL_ID().id();

diff --git a/src/map.h b/src/map.h
@@ -965,7 +965,7 @@ class map
         }
         // TODO: fix point types (remove the first overload)
         furn_id furn( const tripoint &p ) const;
-        furn_id furn( const tripoint_bub_ms &p ) const;
+        furn_id furn( const tripoint_bub_ms p ) const;
         // TODO: Get rid of untyped overload.
         furn_id furn( const point_bub_ms &p ) const {
             return furn( tripoint_bub_ms( p, abs_sub.z() ) );
@@ -1010,7 +1010,7 @@ class map
 
         // Terrain
         // TODO: fix point types (remove the first overload)
-        ter_id ter( const tripoint &p ) const;
+        ter_id ter( const tripoint p ) const;
         ter_id ter( const tripoint_bub_ms &p ) const;
         // TODO: Get rid of untyped overload.
         ter_id ter( const point &p ) const {
@@ -2399,11 +2399,9 @@ class map
             offset_p.y = p.y % SEEY;
             return unsafe_get_submap_at( p );
         }
-        submap *unsafe_get_submap_at( const tripoint_bub_ms &p, point_sm_ms &offset_p ) {
+        submap *unsafe_get_submap_at( const tripoint_bub_ms p, point_sm_ms &offset_p ) {
             tripoint_bub_sm sm;
-            point_sm_ms_ib l;
-            std::tie( sm, l ) = project_remain<coords::sm>( p );
-            offset_p = point_sm_ms( l );
+            std::tie( sm, offset_p ) = project_remain<coords::sm>( p );
             return unsafe_get_submap_at( p );
         }
         // TODO: fix point types (remove the first overload)
@@ -2413,11 +2411,9 @@ class map
             return unsafe_get_submap_at( p );
         }
         const submap *unsafe_get_submap_at(
-            const tripoint_bub_ms &p, point_sm_ms &offset_p ) const {
+            const tripoint_bub_ms p, point_sm_ms &offset_p ) const {
             tripoint_bub_sm sm;
-            point_sm_ms_ib l;
-            std::tie( sm, l ) = project_remain<coords::sm>( p );
-            offset_p = point_sm_ms( l );
+            std::tie( sm, offset_p ) = project_remain<coords::sm>( p );
             return unsafe_get_submap_at( p );
         }
         // TODO: Get rid of untyped overload

diff --git a/src/mdarray.h b/src/mdarray.h
@@ -16,14 +16,14 @@ namespace cata
 template<typename Point>
 struct mdarray_default_size_impl;
 
-template<typename Point, coords::scale Scale, bool InBounds>
-struct mdarray_default_size_impl<coords::coord_point<Point, coords::origin::reality_bubble, Scale, InBounds>> {
+template<template<class, coords::origin, coords::scale> class coord_point, typename Point, coords::scale Scale>
+struct mdarray_default_size_impl<coord_point<Point, coords::origin::reality_bubble, Scale>> {
     static constexpr size_t value = MAPSIZE_X / map_squares_per( Scale );
     static_assert( MAPSIZE_X % map_squares_per( Scale ) == 0, "Scale must be smaller than map" );
 };
 
-template<typename Point, coords::origin Origin, coords::scale Scale, bool InBounds>
-struct mdarray_default_size_impl<coords::coord_point<Point, Origin, Scale, InBounds>> {
+template<template<class, coords::origin, coords::scale> class coord_point, typename Point, coords::origin Origin, coords::scale Scale>
+struct mdarray_default_size_impl<coord_point<Point, Origin, Scale>> {
     static constexpr coords::scale outer_scale = coords::scale_from_origin( Origin );
     static constexpr size_t value = map_squares_per( outer_scale ) / map_squares_per( Scale );
     static_assert( value > 0, "Scale must be smaller origin" );

diff --git a/src/omdata.h b/src/omdata.h
@@ -77,7 +77,7 @@ std::string name( type dir );
 point rotate( const point &p, type dir );
 tripoint rotate( const tripoint &p, type dir );
 template<typename Point, coords::scale Scale>
-auto rotate( const coords::coord_point<Point, coords::origin::relative, Scale> &p, type dir )
+auto rotate( const coords::coord_point_ob<Point, coords::origin::relative, Scale> &p, type dir )
 -> coords::coord_point<Point, coords::origin::relative, Scale>
 {
     return coords::coord_point<Point, coords::origin::relative, Scale> { rotate( p.raw(), dir ) };

diff --git a/tests/coordinate_test.cpp b/tests/coordinate_test.cpp
@@ -18,11 +18,18 @@ static_assert( tripoint_abs_omt::dimension == 3 );
 
 // Out of bounds coords can be implicitly constructed from inbounds ones. This is used
 // to ensure a return type is NOT an inbounds one, before it can be converted.
-template <typename Point, coords::origin Origin, coords::scale Scale, bool InBounds>
-coords::coord_point<Point, Origin, Scale, InBounds> assert_not_ib( const
-        coords::coord_point<Point, Origin, Scale, InBounds> &p )
+template <typename Point, coords::origin Origin, coords::scale Scale>
+coords::coord_point<Point, Origin, Scale, true> assert_not_ib( const
+        coords::coord_point_ib<Point, Origin, Scale> &p )
+{
+    static_assert( false, "Coordinate is not permitted to be inbounds" );
+    return p;
+}
+
+template <typename Point, coords::origin Origin, coords::scale Scale>
+coords::coord_point<Point, Origin, Scale, false> assert_not_ib( const
+        coords::coord_point_ob<Point, Origin, Scale> &p )
 {
-    static_assert( !InBounds );
     return p;
 }