Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:41:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow streaming uints.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-03-12 13:03:59 -07:00
parent f088912ecf
commit 6fb313cc43
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/metavoxels/src/AttributeRegistry.h
View file

@ -265,7 +265,7 @@ template<class T, int bits> inline bool SimpleInlineAttribute<T, bits>::merge(vo
/// Provides appropriate averaging for RGBA values. /// Provides appropriate averaging for RGBA values.
class QRgbAttribute : public InlineAttribute<QRgb> { class QRgbAttribute : public InlineAttribute<QRgb> {
Q_OBJECT Q_OBJECT
Q_PROPERTY(unsigned int defaultValue MEMBER _defaultValue) Q_PROPERTY(uint defaultValue MEMBER _defaultValue)
public: public:

12
libraries/metavoxels/src/Bitstream.cpp
View file

@ -23,6 +23,7 @@
REGISTER_SIMPLE_TYPE_STREAMER(bool) REGISTER_SIMPLE_TYPE_STREAMER(bool)
REGISTER_SIMPLE_TYPE_STREAMER(int) REGISTER_SIMPLE_TYPE_STREAMER(int)
REGISTER_SIMPLE_TYPE_STREAMER(uint)
REGISTER_SIMPLE_TYPE_STREAMER(float) REGISTER_SIMPLE_TYPE_STREAMER(float)
REGISTER_SIMPLE_TYPE_STREAMER(QByteArray) REGISTER_SIMPLE_TYPE_STREAMER(QByteArray)
REGISTER_SIMPLE_TYPE_STREAMER(QColor) REGISTER_SIMPLE_TYPE_STREAMER(QColor)
@ -238,6 +239,17 @@ Bitstream& Bitstream::operator>>(int& value) {
return *this; return *this;
} }
Bitstream& Bitstream::operator<<(uint value) {
return write(&value, 32);
}
Bitstream& Bitstream::operator>>(uint& value) {
quint32 sizedValue;
read(&sizedValue, 32);
value = sizedValue;
return *this;
}
Bitstream& Bitstream::operator<<(float value) { Bitstream& Bitstream::operator<<(float value) {
return write(&value, 32); return write(&value, 32);
} }

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

@ -254,6 +254,9 @@ public:
Bitstream& operator<<(int value); Bitstream& operator<<(int value);
Bitstream& operator>>(int& value); Bitstream& operator>>(int& value);
Bitstream& operator<<(uint value);
Bitstream& operator>>(uint& value);
Bitstream& operator<<(float value); Bitstream& operator<<(float value);
Bitstream& operator>>(float& value); Bitstream& operator>>(float& value);