Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Spoke a little too soon.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-06-15 16:46:43 -07:00
parent f4bd2a8beb
commit 3ec127afde
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1418,6 +1418,7 @@ public:
Bitstream& operator>>(Bitstream& in, X& obj); \
template<> void Bitstream::writeRawDelta(const X& value, const X& reference); \
template<> void Bitstream::readRawDelta(X& value, const X& reference); \
template<> QJsonValue JSONWriter::getData(const X& value); \
bool operator==(const X& first, const X& second); \
bool operator!=(const X& first, const X& second); \
static const int* _TypePtr##X = &X::Type;
@ -1427,6 +1428,7 @@ public:
Bitstream& operator>>(Bitstream& in, X& obj); \
template<> void Bitstream::writeRawDelta(const X& value, const X& reference); \
template<> void Bitstream::readRawDelta(X& value, const X& reference); \
template<> QJsonValue JSONWriter::getData(const X& value); \
bool operator==(const X& first, const X& second); \
bool operator!=(const X& first, const X& second); \
__attribute__((unused)) static const int* _TypePtr##X = &X::Type;
@ -1437,6 +1439,7 @@ public:
Bitstream& operator>>(Bitstream& in, X& obj); \
template<> void Bitstream::writeRawDelta(const X& value, const X& reference); \
template<> void Bitstream::readRawDelta(X& value, const X& reference); \
template<> QJsonValue JSONWriter::getData(const X& value); \
bool operator==(const X& first, const X& second); \
bool operator!=(const X& first, const X& second); \
static const int* _TypePtr##X = &X::Type; \
@ -1447,7 +1450,8 @@ public:
Bitstream& operator<<(Bitstream& out, const S::N& obj); \
Bitstream& operator>>(Bitstream& in, S::N& obj); \
template<> inline void Bitstream::writeRawDelta(const S::N& value, const S::N& reference) { *this << value; } \
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; } \
template<> inline QJsonValue JSONWriter::getData(const S::N& value) { return (int)value; }
#define IMPLEMENT_ENUM_METATYPE(S, N) \
static int S##N##MetaTypeId = registerEnumMetaType<S::N>(&S::staticMetaObject, #N); \

13
tools/mtc/src/main.cpp
View file

@ -217,6 +217,19 @@ void generateOutput (QTextStream& out, const QList<Streamable>& streamables) {
}
out << "}\n";
out << "template<> QJsonValue JSONWriter::getData(const " << name << "& value) {\n";
out << " QJsonArray array;\n";
foreach (const QString& base, str.clazz.bases) {
out << " foreach (const QJsonValue& element, getData(static_cast<const " << base << "&>(value)).toArray()) {\n";
out << " array.append(element);\n";
out << " }\n";
}
foreach (const Field& field, str.fields) {
out << " array.append(getData(value." << field.name << "));\n";
}
out << " return array;\n";
out << "}\n";
out << "bool operator==(const " << name << "& first, const " << name << "& second) {\n";
if (str.clazz.bases.isEmpty() && str.fields.isEmpty()) {
out << " return true";