libAthena
/
athena
mirror of https://github.com/libAthena/athena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #68 from lioncash/endian 

General: Make Endian an enum class
This commit is contained in:
Phillip Stephens 2019-09-26 06:53:06 -07:00 committed by GitHub
parent c28f77f75e 776cb1d04f
commit 2ab6a6d75d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/athena/Global.hpp
View File

@ -125,7 +125,7 @@ enum class Level { Message, Warning, Error, Fatal };
} }
enum class SeekOrigin { Begin, Current, End }; enum class SeekOrigin { Begin, Current, End };
enum Endian { Little, Big }; enum class Endian { Little, Big };
namespace io { namespace io {
template <Endian DNAE> template <Endian DNAE>

4
include/athena/IStream.hpp
View File

@ -23,9 +23,9 @@ protected:
void setError() { m_hasError = true; } void setError() { m_hasError = true; }
bool m_hasError = false; bool m_hasError = false;
#if __BYTE_ORDER == __BIG_ENDIAN #if __BYTE_ORDER == __BIG_ENDIAN
Endian m_endian = Big; Endian m_endian = Endian::Big;
#else #else
Endian m_endian = Little; Endian m_endian = Endian::Little;
#endif #endif
}; };
} // namespace athena::io } // namespace athena::io

22
include/athena/IStreamReader.hpp
View File

@ -143,7 +143,7 @@ public:
atInt16 readInt16() { atInt16 readInt16() {
atInt16 val = 0; atInt16 val = 0;
readUBytesToBuf(&val, 2); readUBytesToBuf(&val, 2);
return m_endian == Big ? utility::BigInt16(val) : utility::LittleInt16(val); return m_endian == Endian::Big ? utility::BigInt16(val) : utility::LittleInt16(val);
} }
template <class T> template <class T>
atInt16 readVal(std::enable_if_t<std::is_same_v<T, atInt16>>* = nullptr) { atInt16 readVal(std::enable_if_t<std::is_same_v<T, atInt16>>* = nullptr) {
@ -229,7 +229,7 @@ public:
atInt32 readInt32() { atInt32 readInt32() {
atInt32 val = 0; atInt32 val = 0;
readUBytesToBuf(&val, 4); readUBytesToBuf(&val, 4);
return m_endian == Big ? utility::BigInt32(val) : utility::LittleInt32(val); return m_endian == Endian::Big ? utility::BigInt32(val) : utility::LittleInt32(val);
} }
template <class T> template <class T>
atInt32 readVal(std::enable_if_t<std::is_same_v<T, atInt32>>* = nullptr) { atInt32 readVal(std::enable_if_t<std::is_same_v<T, atInt32>>* = nullptr) {
@ -315,7 +315,7 @@ public:
atInt64 readInt64() { atInt64 readInt64() {
atInt64 val = 0; atInt64 val = 0;
readUBytesToBuf(&val, 8); readUBytesToBuf(&val, 8);
return m_endian == Big ? utility::BigInt64(val) : utility::LittleInt64(val); return m_endian == Endian::Big ? utility::BigInt64(val) : utility::LittleInt64(val);
} }
template <class T> template <class T>
atInt64 readVal(std::enable_if_t<std::is_same_v<T, atInt64>>* = nullptr) { atInt64 readVal(std::enable_if_t<std::is_same_v<T, atInt64>>* = nullptr) {
@ -401,7 +401,7 @@ public:
float readFloat() { float readFloat() {
float val = 0.f; float val = 0.f;
readUBytesToBuf(&val, 4); readUBytesToBuf(&val, 4);
return m_endian == Big ? utility::BigFloat(val) : utility::LittleFloat(val); return m_endian == Endian::Big ? utility::BigFloat(val) : utility::LittleFloat(val);
} }
template <class T> template <class T>
float readVal(std::enable_if_t<std::is_same_v<T, float>>* = nullptr) { float readVal(std::enable_if_t<std::is_same_v<T, float>>* = nullptr) {
@ -446,7 +446,7 @@ public:
double readDouble() { double readDouble() {
double val = 0.0; double val = 0.0;
readUBytesToBuf(&val, 8); readUBytesToBuf(&val, 8);
return m_endian == Big ? utility::BigDouble(val) : utility::LittleDouble(val); return m_endian == Endian::Big ? utility::BigDouble(val) : utility::LittleDouble(val);
} }
template <class T> template <class T>
double readVal(std::enable_if_t<std::is_same_v<T, double>>* = nullptr) { double readVal(std::enable_if_t<std::is_same_v<T, double>>* = nullptr) {
@ -513,7 +513,7 @@ public:
atVec2f readVec2f() { atVec2f readVec2f() {
simd_floats val = {}; simd_floats val = {};
readUBytesToBuf(val.data(), 8); readUBytesToBuf(val.data(), 8);
if (m_endian == Big) { if (m_endian == Endian::Big) {
val[0] = utility::BigFloat(val[0]); val[0] = utility::BigFloat(val[0]);
val[1] = utility::BigFloat(val[1]); val[1] = utility::BigFloat(val[1]);
} else { } else {
@ -581,7 +581,7 @@ public:
atVec3f readVec3f() { atVec3f readVec3f() {
simd_floats val = {}; simd_floats val = {};
readUBytesToBuf(val.data(), 12); readUBytesToBuf(val.data(), 12);
if (m_endian == Big) { if (m_endian == Endian::Big) {
val[0] = utility::BigFloat(val[0]); val[0] = utility::BigFloat(val[0]);
val[1] = utility::BigFloat(val[1]); val[1] = utility::BigFloat(val[1]);
val[2] = utility::BigFloat(val[2]); val[2] = utility::BigFloat(val[2]);
@ -650,7 +650,7 @@ public:
atVec4f readVec4f() { atVec4f readVec4f() {
simd_floats val = {}; simd_floats val = {};
readUBytesToBuf(val.data(), 16); readUBytesToBuf(val.data(), 16);
if (m_endian == Big) { if (m_endian == Endian::Big) {
val[0] = utility::BigFloat(val[0]); val[0] = utility::BigFloat(val[0]);
val[1] = utility::BigFloat(val[1]); val[1] = utility::BigFloat(val[1]);
val[2] = utility::BigFloat(val[2]); val[2] = utility::BigFloat(val[2]);
@ -720,7 +720,7 @@ public:
atVec2d readVec2d() { atVec2d readVec2d() {
simd_doubles val = {}; simd_doubles val = {};
readUBytesToBuf(val.data(), 16); readUBytesToBuf(val.data(), 16);
if (m_endian == Big) { if (m_endian == Endian::Big) {
val[0] = utility::BigDouble(val[0]); val[0] = utility::BigDouble(val[0]);
val[1] = utility::BigDouble(val[1]); val[1] = utility::BigDouble(val[1]);
} else { } else {
@ -788,7 +788,7 @@ public:
atVec3d readVec3d() { atVec3d readVec3d() {
simd_doubles val = {}; simd_doubles val = {};
readUBytesToBuf(val.data(), 24); readUBytesToBuf(val.data(), 24);
if (m_endian == Big) { if (m_endian == Endian::Big) {
val[0] = utility::BigDouble(val[0]); val[0] = utility::BigDouble(val[0]);
val[1] = utility::BigDouble(val[1]); val[1] = utility::BigDouble(val[1]);
val[2] = utility::BigDouble(val[2]); val[2] = utility::BigDouble(val[2]);
@ -857,7 +857,7 @@ public:
atVec4d readVec4d() { atVec4d readVec4d() {
simd_doubles val = {}; simd_doubles val = {};
readUBytesToBuf(val.data(), 32); readUBytesToBuf(val.data(), 32);
if (m_endian == Big) { if (m_endian == Endian::Big) {
val[0] = utility::BigDouble(val[0]); val[0] = utility::BigDouble(val[0]);
val[1] = utility::BigDouble(val[1]); val[1] = utility::BigDouble(val[1]);
val[2] = utility::BigDouble(val[2]); val[2] = utility::BigDouble(val[2]);

37
include/athena/IStreamWriter.hpp
View File

@ -91,10 +91,11 @@ public:
* @param val The value to write to the buffer * @param val The value to write to the buffer
*/ */
void writeInt16(atInt16 val) { void writeInt16(atInt16 val) {
if (m_endian == Big) if (m_endian == Endian::Big) {
utility::BigInt16(val); utility::BigInt16(val);
else } else {
utility::LittleInt16(val); utility::LittleInt16(val);
}
writeUBytes((atUint8*)&val, 2); writeUBytes((atUint8*)&val, 2);
} }
void writeVal(atInt16 val) { writeInt16(val); } void writeVal(atInt16 val) { writeInt16(val); }
@ -151,10 +152,11 @@ public:
* @param val The value to write to the buffer * @param val The value to write to the buffer
*/ */
void writeInt32(atInt32 val) { void writeInt32(atInt32 val) {
if (m_endian == Big) if (m_endian == Endian::Big) {
utility::BigInt32(val); utility::BigInt32(val);
else } else {
utility::LittleInt32(val); utility::LittleInt32(val);
}
writeUBytes((atUint8*)&val, 4); writeUBytes((atUint8*)&val, 4);
} }
void writeVal(atInt32 val) { writeInt32(val); } void writeVal(atInt32 val) { writeInt32(val); }
@ -211,10 +213,11 @@ public:
* @param val The value to write to the buffer * @param val The value to write to the buffer
*/ */
void writeInt64(atInt64 val) { void writeInt64(atInt64 val) {
if (m_endian == Big) if (m_endian == Endian::Big) {
utility::BigInt64(val); utility::BigInt64(val);
else } else {
utility::LittleInt64(val); utility::LittleInt64(val);
}
writeUBytes((atUint8*)&val, 8); writeUBytes((atUint8*)&val, 8);
} }
void writeVal(atInt64 val) { writeInt64(val); } void writeVal(atInt64 val) { writeInt64(val); }
@ -271,10 +274,11 @@ public:
* @param val The value to write to the buffer * @param val The value to write to the buffer
*/ */
void writeFloat(float val) { void writeFloat(float val) {
if (m_endian == Big) if (m_endian == Endian::Big) {
val = utility::BigFloat(val); val = utility::BigFloat(val);
else } else {
val = utility::LittleFloat(val); val = utility::LittleFloat(val);
}
writeUBytes((atUint8*)&val, 4); writeUBytes((atUint8*)&val, 4);
} }
void writeVal(float val) { writeFloat(val); } void writeVal(float val) { writeFloat(val); }
@ -307,10 +311,11 @@ public:
* @param val The value to write to the buffer * @param val The value to write to the buffer
*/ */
void writeDouble(double val) { void writeDouble(double val) {
if (m_endian == Big) if (m_endian == Endian::Big) {
utility::BigDouble(val); utility::BigDouble(val);
else } else {
utility::LittleDouble(val); utility::LittleDouble(val);
}
writeUBytes((atUint8*)&val, 8); writeUBytes((atUint8*)&val, 8);
} }
void writeVal(double val) { writeDouble(val); } void writeVal(double val) { writeDouble(val); }
@ -354,7 +359,7 @@ public:
*/ */
void writeVec2f(const atVec2f& vec) { void writeVec2f(const atVec2f& vec) {
simd_floats tmp(vec.simd); simd_floats tmp(vec.simd);
if (m_endian == Big) { if (m_endian == Endian::Big) {
tmp[0] = utility::BigFloat(tmp[0]); tmp[0] = utility::BigFloat(tmp[0]);
tmp[1] = utility::BigFloat(tmp[1]); tmp[1] = utility::BigFloat(tmp[1]);
} else { } else {
@ -398,7 +403,7 @@ public:
*/ */
void writeVec3f(const atVec3f& vec) { void writeVec3f(const atVec3f& vec) {
simd_floats tmp(vec.simd); simd_floats tmp(vec.simd);
if (m_endian == Big) { if (m_endian == Endian::Big) {
tmp[0] = utility::BigFloat(tmp[0]); tmp[0] = utility::BigFloat(tmp[0]);
tmp[1] = utility::BigFloat(tmp[1]); tmp[1] = utility::BigFloat(tmp[1]);
tmp[2] = utility::BigFloat(tmp[2]); tmp[2] = utility::BigFloat(tmp[2]);
@ -446,7 +451,7 @@ public:
*/ */
void writeVec4f(const atVec4f& vec) { void writeVec4f(const atVec4f& vec) {
simd_floats tmp(vec.simd); simd_floats tmp(vec.simd);
if (m_endian == Big) { if (m_endian == Endian::Big) {
tmp[0] = utility::BigFloat(tmp[0]); tmp[0] = utility::BigFloat(tmp[0]);
tmp[1] = utility::BigFloat(tmp[1]); tmp[1] = utility::BigFloat(tmp[1]);
tmp[2] = utility::BigFloat(tmp[2]); tmp[2] = utility::BigFloat(tmp[2]);
@ -498,7 +503,7 @@ public:
*/ */
void writeVec2d(const atVec2d& vec) { void writeVec2d(const atVec2d& vec) {
simd_doubles tmp(vec.simd); simd_doubles tmp(vec.simd);
if (m_endian == Big) { if (m_endian == Endian::Big) {
tmp[0] = utility::BigDouble(tmp[0]); tmp[0] = utility::BigDouble(tmp[0]);
tmp[1] = utility::BigDouble(tmp[1]); tmp[1] = utility::BigDouble(tmp[1]);
} else { } else {
@ -542,7 +547,7 @@ public:
*/ */
void writeVec3d(const atVec3d& vec) { void writeVec3d(const atVec3d& vec) {
simd_doubles tmp(vec.simd); simd_doubles tmp(vec.simd);
if (m_endian == Big) { if (m_endian == Endian::Big) {
tmp[0] = utility::BigDouble(tmp[0]); tmp[0] = utility::BigDouble(tmp[0]);
tmp[1] = utility::BigDouble(tmp[1]); tmp[1] = utility::BigDouble(tmp[1]);
tmp[2] = utility::BigDouble(tmp[2]); tmp[2] = utility::BigDouble(tmp[2]);
@ -590,7 +595,7 @@ public:
*/ */
void writeVec4d(const atVec4d& vec) { void writeVec4d(const atVec4d& vec) {
simd_doubles tmp(vec.simd); simd_doubles tmp(vec.simd);
if (m_endian == Big) { if (m_endian == Endian::Big) {
tmp[0] = utility::BigDouble(tmp[0]); tmp[0] = utility::BigDouble(tmp[0]);
tmp[1] = utility::BigDouble(tmp[1]); tmp[1] = utility::BigDouble(tmp[1]);
tmp[2] = utility::BigDouble(tmp[2]); tmp[2] = utility::BigDouble(tmp[2]);