wmpmiles/Navmesher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved fourcc_from_cstr back into esx_reader.hpp. Not entirely sure where it should live.

Browse Source
This commit is contained in:
William Miles
2022-10-27 15:47:41 +11:00
parent d01b2cfb3e
commit 8a3be3b67f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Navmesher/esx_reader.hpp
View File

@@ -160,6 +160,13 @@ private:
[[nodiscard]] Header read_header(std::istream &in); [[nodiscard]] Header read_header(std::istream &in);
// Convert a compatible C string to a FourCC (e.g. "LITR")
static consteval FourCC fourcc_from_cstr(const char(&a)[5]) noexcept
{
char temp[4] = { a[0], a[1], a[2], a[3] };
return std::bit_cast<FourCC, char[4]>(temp);
}
} }
#endif // ESX_READER_HPP #endif // ESX_READER_HPP

7
Navmesher/esx_reader_lut.cpp
View File

@@ -15,13 +15,6 @@ static constexpr std::pair<GroupType, std::string_view> group_type_name_map_buil
{GroupType::CellTemporaryChildren , "Cell Temporary Children" }, {GroupType::CellTemporaryChildren , "Cell Temporary Children" },
}; };
// Convert a compatible C string to a FourCC (e.g. "LITR")
static consteval FourCC fourcc_from_cstr(const char(&a)[5]) noexcept
{
char temp[4] = { a[0], a[1], a[2], a[3] };
return std::bit_cast<FourCC, char[4]>(temp);
}
static constexpr std::pair<RecordType, FourCC> record_type_fourcc_map_builtin[] { static constexpr std::pair<RecordType, FourCC> record_type_fourcc_map_builtin[] {
{RecordType::AACT, fourcc_from_cstr("AACT")}, {RecordType::AACT, fourcc_from_cstr("AACT")},
{RecordType::ACHR, fourcc_from_cstr("ACHR")}, {RecordType::ACHR, fourcc_from_cstr("ACHR")},