diff --git a/deps/ox/src/ox/mc/CMakeLists.txt b/deps/ox/src/ox/mc/CMakeLists.txt index b3fcecce..7a7c7245 100644 --- a/deps/ox/src/ox/mc/CMakeLists.txt +++ b/deps/ox/src/ox/mc/CMakeLists.txt @@ -1,6 +1,6 @@ add_library( OxMetalClaw - presencemask.cpp + presenceindicator.cpp read.cpp write.cpp ) @@ -22,7 +22,7 @@ install( FILES err.hpp mc.hpp - presencemask.hpp + presenceindicator.hpp read.hpp types.hpp write.hpp diff --git a/deps/ox/src/ox/mc/presencemask.cpp b/deps/ox/src/ox/mc/presenceindicator.cpp similarity index 75% rename from deps/ox/src/ox/mc/presencemask.cpp rename to deps/ox/src/ox/mc/presenceindicator.cpp index 30d6870c..24bb3018 100644 --- a/deps/ox/src/ox/mc/presencemask.cpp +++ b/deps/ox/src/ox/mc/presenceindicator.cpp @@ -8,16 +8,16 @@ #include #include "err.hpp" -#include "presencemask.hpp" +#include "presenceindicator.hpp" namespace ox { -FieldPresenseMask::FieldPresenseMask(uint8_t *mask, std::size_t maxLen) { +FieldPresenceIndicator::FieldPresenceIndicator(uint8_t *mask, std::size_t maxLen) { m_mask = mask; m_maskLen = maxLen; } -bool FieldPresenseMask::get(int i) const { +bool FieldPresenceIndicator::get(int i) const { if (i / 8 < m_maskLen) { return (m_mask[i / 8] >> (i % 8)) & 1; } else { @@ -25,7 +25,7 @@ bool FieldPresenseMask::get(int i) const { } } -Error FieldPresenseMask::set(int i, bool on) { +Error FieldPresenceIndicator::set(int i, bool on) { if (i / 8 < m_maskLen) { if (on) { m_mask[i / 8] |= 1 << (i % 8); diff --git a/deps/ox/src/ox/mc/presencemask.hpp b/deps/ox/src/ox/mc/presenceindicator.hpp similarity index 67% rename from deps/ox/src/ox/mc/presencemask.hpp rename to deps/ox/src/ox/mc/presenceindicator.hpp index 24a58da6..c90273b8 100644 --- a/deps/ox/src/ox/mc/presencemask.hpp +++ b/deps/ox/src/ox/mc/presenceindicator.hpp @@ -13,14 +13,14 @@ namespace ox { -class FieldPresenseMask { +class FieldPresenceIndicator { private: uint8_t *m_mask = nullptr; int m_maskLen = 0; int m_fields = 0; public: - FieldPresenseMask(uint8_t *mask, std::size_t maxLen); + FieldPresenceIndicator(uint8_t *mask, std::size_t maxLen); bool get(int i) const; @@ -36,19 +36,19 @@ class FieldPresenseMask { }; -constexpr void FieldPresenseMask::setFields(int fields) noexcept { +constexpr void FieldPresenceIndicator::setFields(int fields) noexcept { m_fields = fields; } -constexpr int FieldPresenseMask::getFields() const noexcept { +constexpr int FieldPresenceIndicator::getFields() const noexcept { return m_fields; } -constexpr void FieldPresenseMask::setMaxLen(int maxLen) noexcept { +constexpr void FieldPresenceIndicator::setMaxLen(int maxLen) noexcept { m_maskLen = maxLen; } -constexpr int FieldPresenseMask::getMaxLen() const noexcept { +constexpr int FieldPresenceIndicator::getMaxLen() const noexcept { return m_maskLen; } diff --git a/deps/ox/src/ox/mc/read.hpp b/deps/ox/src/ox/mc/read.hpp index 81328e02..e814fd6f 100644 --- a/deps/ox/src/ox/mc/read.hpp +++ b/deps/ox/src/ox/mc/read.hpp @@ -15,7 +15,7 @@ #include #include "err.hpp" -#include "presencemask.hpp" +#include "presenceindicator.hpp" #include "types.hpp" namespace ox { @@ -23,7 +23,7 @@ namespace ox { class MetalClawReader { private: - FieldPresenseMask m_fieldPresence; + FieldPresenceIndicator m_fieldPresence; int m_fields = 0; int m_field = 0; std::size_t m_buffIt = 0; diff --git a/deps/ox/src/ox/mc/write.hpp b/deps/ox/src/ox/mc/write.hpp index ca5045f8..8c201cf6 100644 --- a/deps/ox/src/ox/mc/write.hpp +++ b/deps/ox/src/ox/mc/write.hpp @@ -12,11 +12,11 @@ #include #include #include -#include #include +#include #include "err.hpp" -#include "presencemask.hpp" +#include "presenceindicator.hpp" #include "types.hpp" namespace ox { @@ -24,7 +24,7 @@ namespace ox { class MetalClawWriter { private: - FieldPresenseMask m_fieldPresence; + FieldPresenceIndicator m_fieldPresence; int m_fields = 0; int m_field = 0; std::size_t m_buffIt = 0;