mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: make a numer of Slope related functions constexpr

pull/10596/head
Rubidium 2023-02-25 23:58:46 +01:00 committed by rubidium42
parent 9d2a0f3d0b
commit 41ef7c88af
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/bitmath_func.hpp
View File

@ -29,7 +29,7 @@
* @return The selected bits, aligned to a LSB. * @return The selected bits, aligned to a LSB.
*/ */
template <typename T> template <typename T>
debug_inline static uint GB(const T x, const uint8 s, const uint8 n) debug_inline constexpr static uint GB(const T x, const uint8 s, const uint8 n)
{ {
return (x >> s) & (((T)1U << n) - 1); return (x >> s) & (((T)1U << n) - 1);
} }

16
src/slope_func.h
View File

@ -21,7 +21,7 @@
* @param corner A #Corner. * @param corner A #Corner.
* @return true iff corner is in a valid range. * @return true iff corner is in a valid range.
*/ */
static inline bool IsValidCorner(Corner corner) static constexpr inline bool IsValidCorner(Corner corner)
{ {
return IsInsideMM(corner, 0, CORNER_END); return IsInsideMM(corner, 0, CORNER_END);
} }
@ -33,7 +33,7 @@ static inline bool IsValidCorner(Corner corner)
* @param s The given #Slope. * @param s The given #Slope.
* @return True if the slope is steep, else false. * @return True if the slope is steep, else false.
*/ */
static inline bool IsSteepSlope(Slope s) static constexpr inline bool IsSteepSlope(Slope s)
{ {
return (s & SLOPE_STEEP) != 0; return (s & SLOPE_STEEP) != 0;
} }
@ -44,7 +44,7 @@ static inline bool IsSteepSlope(Slope s)
* @param s The given #Slope. * @param s The given #Slope.
* @return True if the slope is non-continuous, else false. * @return True if the slope is non-continuous, else false.
*/ */
static inline bool IsHalftileSlope(Slope s) static constexpr inline bool IsHalftileSlope(Slope s)
{ {
return (s & SLOPE_HALFTILE) != 0; return (s & SLOPE_HALFTILE) != 0;
} }
@ -57,7 +57,7 @@ static inline bool IsHalftileSlope(Slope s)
* @param s A #Slope. * @param s A #Slope.
* @return The slope s without its halftile slope. * @return The slope s without its halftile slope.
*/ */
static inline Slope RemoveHalftileSlope(Slope s) static constexpr inline Slope RemoveHalftileSlope(Slope s)
{ {
return s & ~SLOPE_HALFTILE_MASK; return s & ~SLOPE_HALFTILE_MASK;
} }
@ -145,7 +145,7 @@ static inline Corner GetHighestSlopeCorner(Slope s)
* @param s The #Slope. * @param s The #Slope.
* @return The corner of the leveled halftile. * @return The corner of the leveled halftile.
*/ */
static inline Corner GetHalftileSlopeCorner(Slope s) static constexpr inline Corner GetHalftileSlopeCorner(Slope s)
{ {
assert(IsHalftileSlope(s)); assert(IsHalftileSlope(s));
return (Corner)((s >> 6) & 3); return (Corner)((s >> 6) & 3);
@ -157,7 +157,7 @@ static inline Corner GetHalftileSlopeCorner(Slope s)
* @param s The #Slope. * @param s The #Slope.
* @return Relative height of highest corner. * @return Relative height of highest corner.
*/ */
static inline int GetSlopeMaxZ(Slope s) static constexpr inline int GetSlopeMaxZ(Slope s)
{ {
if (s == SLOPE_FLAT) return 0; if (s == SLOPE_FLAT) return 0;
if (IsSteepSlope(s)) return 2; if (IsSteepSlope(s)) return 2;
@ -170,7 +170,7 @@ static inline int GetSlopeMaxZ(Slope s)
* @param s The #Slope. * @param s The #Slope.
* @return Relative height of highest corner. * @return Relative height of highest corner.
*/ */
static inline int GetSlopeMaxPixelZ(Slope s) static constexpr inline int GetSlopeMaxPixelZ(Slope s)
{ {
return GetSlopeMaxZ(s) * TILE_HEIGHT; return GetSlopeMaxZ(s) * TILE_HEIGHT;
} }
@ -271,7 +271,7 @@ static inline Slope InclinedSlope(DiagDirection dir)
* @param corner The #Corner of the halftile. * @param corner The #Corner of the halftile.
* @return The #Slope s with the halftile slope added. * @return The #Slope s with the halftile slope added.
*/ */
static inline Slope HalftileSlope(Slope s, Corner corner) static constexpr inline Slope HalftileSlope(Slope s, Corner corner)
{ {
assert(IsValidCorner(corner)); assert(IsValidCorner(corner));
return (Slope)(s | SLOPE_HALFTILE | (corner << 6)); return (Slope)(s | SLOPE_HALFTILE | (corner << 6));