sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core/Serializer: Add FlushBits method 

Former-commit-id: 64b8d4277001ab763dc92c0a157ebce72a8bfef8
This commit is contained in:
Lynix 2015-11-25 18:19:38 +01:00
parent bbe8a776e8
commit b5fb11b5c2
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/Serializer.hpp
View File

@ -25,6 +25,8 @@ namespace Nz
inline Endianness GetDataEndianness() const; inline Endianness GetDataEndianness() const;
inline Stream& GetStream() const; inline Stream& GetStream() const;
inline bool FlushBits();
inline void SetDataEndianness(Endianness endiannes); inline void SetDataEndianness(Endianness endiannes);
inline void SetStream(Stream& stream); inline void SetStream(Stream& stream);

20
include/Nazara/Core/Serializer.inl
View File

@ -16,14 +16,9 @@ namespace Nz
inline Serializer::~Serializer() inline Serializer::~Serializer()
{ {
if (m_serializationContext.currentBitPos != 8) if (!FlushBits())
{
m_serializationContext.currentBitPos = 8; //< To prevent Serialize to flush bits itself
if (!Serialize<UInt8>(m_serializationContext, m_serializationContext.currentByte))
NazaraWarning("Failed to flush bits at serializer destruction"); NazaraWarning("Failed to flush bits at serializer destruction");
} }
}
inline Endianness Serializer::GetDataEndianness() const inline Endianness Serializer::GetDataEndianness() const
{ {
@ -35,6 +30,19 @@ namespace Nz
return *m_serializationContext.stream; return *m_serializationContext.stream;
} }
inline bool Serializer::FlushBits()
{
if (m_serializationContext.currentBitPos != 8)
{
m_serializationContext.currentBitPos = 8; //< To prevent Serialize to flush bits itself
if (!Serialize<UInt8>(m_serializationContext, m_serializationContext.currentByte))
return false;
}
return true;
}
inline void Serializer::SetDataEndianness(Endianness endiannes) inline void Serializer::SetDataEndianness(Endianness endiannes)
{ {
m_serializationContext.endianness = endiannes; m_serializationContext.endianness = endiannes;