Ensure R6 compliance

Chapter 8. Geometry
Chapter 9. Text rendering and display

Author: hatcat

N3888_RefImpl/src/xgeometry.h

@@ -9,48 +9,44 @@ namespace std::experimental::io2d {
 			float _Width = 0.0F;
 			float _Height = 0.0F;
 		public:
-            constexpr bounding_box() noexcept;
-            constexpr bounding_box(float x, float y, float width, float height) noexcept;
-            constexpr bounding_box(const point_2d& tl, const point_2d& br) noexcept;
+			constexpr bounding_box() noexcept;
+			constexpr bounding_box(float x, float y, float width, float height) noexcept;
+			constexpr bounding_box(point_2d tl, point_2d br) noexcept;
 
-            constexpr void x(float value) noexcept;
-            constexpr void y(float value) noexcept;
-            constexpr void width(float value) noexcept;
-            constexpr void height(float value) noexcept;
-            constexpr void top_left(const point_2d& value) noexcept;
-            constexpr void bottom_right(const point_2d& value) noexcept;
+			constexpr void x(float val) noexcept;
+			constexpr void y(float val) noexcept;
+			constexpr void width(float val) noexcept;
+			constexpr void height(float val) noexcept;
+			constexpr void top_left(point_2d val) noexcept;
+			constexpr void bottom_right(point_2d val) noexcept;
 
 			constexpr float x() const noexcept;
 			constexpr float y() const noexcept;
 			constexpr float width() const noexcept;
 			constexpr float height() const noexcept;
-			constexpr float left() const noexcept;
-			constexpr float right() const noexcept;
-			constexpr float top() const noexcept;
-			constexpr float bottom() const noexcept;
 			constexpr point_2d top_left() const noexcept;
 			constexpr point_2d bottom_right() const noexcept;
 
 			friend constexpr bool operator==(const bounding_box& lhs, const bounding_box& rhs) noexcept;
 		};
 
-        constexpr bool operator==(const bounding_box& lhs, const bounding_box& rhs) noexcept;
-        constexpr bool operator!=(const bounding_box& lhs, const bounding_box& rhs) noexcept;
-        
-        class circle {
+		constexpr bool operator==(const bounding_box& lhs, const bounding_box& rhs) noexcept;
+		constexpr bool operator!=(const bounding_box& lhs, const bounding_box& rhs) noexcept;
+
+		class circle {
 			point_2d _Center;
 			float _Radius;
 		public:
-            constexpr circle() noexcept;
-            constexpr circle(const point_2d& ctr, float r) noexcept;
+			constexpr circle() noexcept;
+			constexpr circle(point_2d ctr, float rad) noexcept;
 
-            constexpr void center(const point_2d& ctr) noexcept;
-            constexpr void radius(float r) noexcept;
+			constexpr void center(point_2d ctr) noexcept;
+			constexpr void radius(float r) noexcept;
 
-            constexpr point_2d center() const noexcept;
-            constexpr float radius() const noexcept;
+			constexpr point_2d center() const noexcept;
+			constexpr float radius() const noexcept;
 
-            constexpr bool operator==(const circle& rhs) noexcept;
+			constexpr bool operator==(const circle& rhs) noexcept;
             constexpr bool operator!=(const circle& rhs) noexcept;
 		};
 

N3888_RefImpl/src/xio2d_impl.h

@@ -534,7 +534,7 @@ namespace std::experimental::io2d {
             , _Width(width)
             , _Height(height) {
         }
-        inline constexpr bounding_box::bounding_box(const point_2d& tl, const point_2d& br) noexcept
+        inline constexpr bounding_box::bounding_box(point_2d tl, point_2d br) noexcept
             : _X(tl.x)
             , _Y(tl.y)
             , _Width(::std::max(0.0F, br.x - tl.x))
@@ -553,11 +553,11 @@ namespace std::experimental::io2d {
         inline constexpr void bounding_box::height(float value) noexcept {
             _Height = value;
         }
-        inline constexpr void bounding_box::top_left(const point_2d& value) noexcept {
+        inline constexpr void bounding_box::top_left(point_2d value) noexcept {
             _X = value.x;
             _Y = value.y;
         }
-        inline constexpr void bounding_box::bottom_right(const point_2d& value) noexcept {
+        inline constexpr void bounding_box::bottom_right(point_2d value) noexcept {
             _Width = max(0.0F, value.x - _X);
             _Height = max(0.0F, value.y - _Y);
         }
@@ -578,22 +578,6 @@ namespace std::experimental::io2d {
             return _Height;
         }
 
-        inline constexpr float bounding_box::left() const noexcept {
-            return _X;
-        }
-
-        inline constexpr float bounding_box::right() const noexcept {
-            return _X + _Width;
-        }
-
-        inline constexpr float bounding_box::top() const noexcept {
-            return _Y;
-        }
-
-        inline constexpr float bounding_box::bottom() const noexcept {
-            return _Y + _Height;
-        }
-
         inline constexpr point_2d bounding_box::top_left() const noexcept {
             return{ _X, _Y };
         }
@@ -614,11 +598,11 @@ namespace std::experimental::io2d {
         inline constexpr circle::circle() noexcept
             : _Center()
             , _Radius() {}
-        inline constexpr circle::circle(const point_2d& ctr, float r) noexcept
+        inline constexpr circle::circle(point_2d ctr, float r) noexcept
             : _Center(ctr)
             , _Radius(r) {}
 
-        inline constexpr void circle::center(const point_2d& ctr) noexcept {
+        inline constexpr void circle::center(point_2d ctr) noexcept {
             _Center = ctr;
         }
         inline constexpr void circle::radius(float r) noexcept {