From 2066dbcec78903535384c5ef3dc47a48d312ab86 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Wed, 4 Jun 2014 15:16:51 -0700 Subject: [PATCH] cleanup --- libraries/shared/src/PropertyFlags.h | 95 +--------------------------- tests/octree/src/OctreeTests.cpp | 5 -- 2 files changed, 1 insertion(+), 99 deletions(-) diff --git a/libraries/shared/src/PropertyFlags.h b/libraries/shared/src/PropertyFlags.h index d19f52a846..b9253379c6 100644 --- a/libraries/shared/src/PropertyFlags.h +++ b/libraries/shared/src/PropertyFlags.h @@ -10,7 +10,7 @@ // // // TODO: -// * iterator to enumerate the set values? +// * consider adding iterator to enumerate the properties that have been set? #ifndef hifi_PropertyFlags_h #define hifi_PropertyFlags_h @@ -143,7 +143,6 @@ template inline bool PropertyFlags::getHasProperty(Enum fla const int BITS_PER_BYTE = 8; template inline QByteArray PropertyFlags::encode() { - const bool debug = false; QByteArray output; if (_maxFlag < _minFlag) { @@ -151,77 +150,31 @@ template inline QByteArray PropertyFlags::encode() { return output; // no flags... nothing to encode } - outputBufferBits((const unsigned char*)output.constData(), output.size()); - - if (debug) qDebug() << "PropertyFlags::encode()"; - // we should size the array to the correct size. int lengthInBytes = (_maxFlag / (BITS_PER_BYTE - 1)) + 1; - if (debug) qDebug() << " lengthInBytes=" << lengthInBytes; - output.fill(0, lengthInBytes); - if (debug) outputBufferBits((const unsigned char*)output.constData(), output.size()); - // next pack the number of header bits in, the first N-1 to be set to 1, the last to be set to 0 for(int i = 0; i < lengthInBytes; i++) { int outputIndex = i; - if (debug) qDebug() << "outputIndex:" << outputIndex; int bitValue = (i < (lengthInBytes - 1) ? 1 : 0); - - if (debug) qDebug() << " length code bit["<< outputIndex << "]=" << bitValue; - char original = output.at(outputIndex / BITS_PER_BYTE); int shiftBy = BITS_PER_BYTE - ((outputIndex % BITS_PER_BYTE) + 1); char thisBit = ( bitValue << shiftBy); - - if (debug) { - qDebug() << "bitValue:" << bitValue; - qDebug() << "shiftBy:" << shiftBy; - qDebug() << "original:"; - outputBits(original); - - qDebug() << "thisBit:"; - outputBits(thisBit); - } - output[i / BITS_PER_BYTE] = (original | thisBit); } - if (debug) outputBufferBits((const unsigned char*)output.constData(), output.size()); - // finally pack the the actual bits from the bit array for(int i = lengthInBytes; i < (lengthInBytes + _maxFlag + 1); i++) { int flagIndex = i - lengthInBytes; int outputIndex = i; - if (debug) qDebug() << "flagIndex:" << flagIndex; - if (debug) qDebug() << "outputIndex:" << outputIndex; - - int bitValue = ( _flags[flagIndex] ? 1 : 0); - - if (debug) qDebug() << " encode bit["< inline void PropertyFlags::shinkIfNeeded() { } } -/*** - -BitArr.resize(8*byteArr.count()); -for(int i=0; i -class QFlags -{ - typedef void **Zero; - int i; -public: - typedef Enum enum_type; - Q_DECL_CONSTEXPR inline QFlags(const QFlags &f) : i(f.i) {} - Q_DECL_CONSTEXPR inline QFlags(Enum f) : i(f) {} - Q_DECL_CONSTEXPR inline QFlags(Zero = 0) : i(0) {} - inline QFlags(QFlag f) : i(f) {} - - inline QFlags &operator=(const QFlags &f) { i = f.i; return *this; } - inline QFlags &operator&=(int mask) { i &= mask; return *this; } - inline QFlags &operator&=(uint mask) { i &= mask; return *this; } - inline QFlags &operator|=(QFlags f) { i |= f.i; return *this; } - inline QFlags &operator|=(Enum f) { i |= f; return *this; } - inline QFlags &operator^=(QFlags f) { i ^= f.i; return *this; } - inline QFlags &operator^=(Enum f) { i ^= f; return *this; } - - Q_DECL_CONSTEXPR inline operator int() const { return i; } - - Q_DECL_CONSTEXPR inline QFlags operator|(QFlags f) const { return QFlags(Enum(i | f.i)); } - Q_DECL_CONSTEXPR inline QFlags operator|(Enum f) const { return QFlags(Enum(i | f)); } - Q_DECL_CONSTEXPR inline QFlags operator^(QFlags f) const { return QFlags(Enum(i ^ f.i)); } - Q_DECL_CONSTEXPR inline QFlags operator^(Enum f) const { return QFlags(Enum(i ^ f)); } - Q_DECL_CONSTEXPR inline QFlags operator&(int mask) const { return QFlags(Enum(i & mask)); } - Q_DECL_CONSTEXPR inline QFlags operator&(uint mask) const { return QFlags(Enum(i & mask)); } - Q_DECL_CONSTEXPR inline QFlags operator&(Enum f) const { return QFlags(Enum(i & f)); } - Q_DECL_CONSTEXPR inline QFlags operator~() const { return QFlags(Enum(~i)); } - - Q_DECL_CONSTEXPR inline bool operator!() const { return !i; } - - inline bool testFlag(Enum f) const { return (i & f) == f && (f != 0 || i == int(f) ); } -}; - -***/ - #endif // hifi_PropertyFlags_h diff --git a/tests/octree/src/OctreeTests.cpp b/tests/octree/src/OctreeTests.cpp index d15b77a53a..436973ba52 100644 --- a/tests/octree/src/OctreeTests.cpp +++ b/tests/octree/src/OctreeTests.cpp @@ -352,13 +352,8 @@ void OctreeTests::propertyFlagsTests() { qDebug() << "propsB... encoded="; outputBufferBits((const unsigned char*)encoded.constData(), encoded.size()); - qDebug() << "propsB..."; - propsB.debugDumpBits(); - qDebug() << "ParticlePropertyFlags propsC = ~propsB;"; ParticlePropertyFlags propsC = ~propsB; - qDebug() << "propsC..."; - propsC.debugDumpBits(); qDebug() << "propsC.getHasProperty(PARTICLE_PROP_VISIBLE)" << (propsC.getHasProperty(PARTICLE_PROP_VISIBLE)) << "{ expect false }";