Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 04:03:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Slight simplification.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-06-05 15:39:43 -07:00
parent c44dba78cb
commit 887561a4e1
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libraries/metavoxels/src/Bitstream.h
View file

@ -1084,19 +1084,18 @@ public:
template<> inline void Bitstream::readRawDelta(S::N& value, const S::N& reference) { *this >> value; } template<> inline void Bitstream::readRawDelta(S::N& value, const S::N& reference) { *this >> value; }
#define IMPLEMENT_ENUM_METATYPE(S, N) \ #define IMPLEMENT_ENUM_METATYPE(S, N) \
static int S##N##MetaTypeId = registerEnumMetaType<S::N>(S::staticMetaObject.enumerator( \ static int S##N##Bits = registerEnumMetaType<S::N>(S::staticMetaObject.enumerator( \
S::staticMetaObject.indexOfEnumerator(#N))); \ S::staticMetaObject.indexOfEnumerator(#N))); \
Bitstream& operator<<(Bitstream& out, const S::N& obj) { \ Bitstream& operator<<(Bitstream& out, const S::N& obj) { \
static int bits = static_cast<const EnumTypeStreamer*>(Bitstream::getTypeStreamer(qMetaTypeId<S::N>()))->getBits(); \ return out.write(&obj, S##N##Bits); \
return out.write(&obj, bits); \
} \ } \
Bitstream& operator>>(Bitstream& in, S::N& obj) { \ Bitstream& operator>>(Bitstream& in, S::N& obj) { \
static int bits = static_cast<const EnumTypeStreamer*>(Bitstream::getTypeStreamer(qMetaTypeId<S::N>()))->getBits(); \
obj = (S::N)0; \ obj = (S::N)0; \
return in.read(&obj, bits); \ return in.read(&obj, S##N##Bits); \
} }
/// Registers a simple type and its streamer. /// Registers a simple type and its streamer.
/// \return the metatype id
template<class T> int registerSimpleMetaType() { template<class T> int registerSimpleMetaType() {
int type = qRegisterMetaType<T>(); int type = qRegisterMetaType<T>();
Bitstream::registerTypeStreamer(type, new SimpleTypeStreamer<T>()); Bitstream::registerTypeStreamer(type, new SimpleTypeStreamer<T>());
@ -1104,13 +1103,16 @@ template<class T> int registerSimpleMetaType() {
} }
/// Registers an enum type and its streamer. /// Registers an enum type and its streamer.
/// \return the number of bits required to stream the enum
template<class T> int registerEnumMetaType(const QMetaEnum& metaEnum) { template<class T> int registerEnumMetaType(const QMetaEnum& metaEnum) {
int type = qRegisterMetaType<T>(); int type = qRegisterMetaType<T>();
Bitstream::registerTypeStreamer(type, new EnumTypeStreamer(metaEnum)); EnumTypeStreamer* streamer = new EnumTypeStreamer(metaEnum);
return type; Bitstream::registerTypeStreamer(type, streamer);
return streamer->getBits();
} }
/// Registers a streamable type and its streamer. /// Registers a streamable type and its streamer.
/// \return the metatype id
template<class T> int registerStreamableMetaType() { template<class T> int registerStreamableMetaType() {
int type = qRegisterMetaType<T>(); int type = qRegisterMetaType<T>();
Bitstream::registerTypeStreamer(type, new StreamableTypeStreamer<T>()); Bitstream::registerTypeStreamer(type, new StreamableTypeStreamer<T>());
@ -1118,6 +1120,7 @@ template<class T> int registerStreamableMetaType() {
} }
/// Registers a collection type and its streamer. /// Registers a collection type and its streamer.
/// \return the metatype id
template<class T> int registerCollectionMetaType() { template<class T> int registerCollectionMetaType() {
int type = qRegisterMetaType<T>(); int type = qRegisterMetaType<T>();
Bitstream::registerTypeStreamer(type, new CollectionTypeStreamer<T>()); Bitstream::registerTypeStreamer(type, new CollectionTypeStreamer<T>());