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

More work on delta streaming.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-03-21 14:49:40 -07:00
parent 924e5517f4
commit 1b980eebf2
4 changed files with 145 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/interface_en.ts
View file

@ -113,18 +113,18 @@
<context>
<name>Menu</name>
<message>
<location filename="src/Menu.cpp" line="439"/>
<location filename="src/Menu.cpp" line="438"/>
<source>Open .ini config file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Menu.cpp" line="441"/>
<location filename="src/Menu.cpp" line="453"/>
<location filename="src/Menu.cpp" line="440"/>
<location filename="src/Menu.cpp" line="452"/>
<source>Text files (*.ini)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="src/Menu.cpp" line="451"/>
<location filename="src/Menu.cpp" line="450"/>
<source>Save .ini config file</source>
<translation type="unfinished"></translation>
</message>

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

@ -903,7 +903,29 @@ void TypeReader::readDelta(Bitstream& in, QVariant& object, const QVariant& refe
object = reference;
int size, referenceSize;
in >> size >> referenceSize;
if (_streamer) {
if (size < referenceSize) {
_streamer->prune(object, size);
}
for (int i = 0; i < size; i++) {
if (i < referenceSize) {
QVariant value;
_valueReader->readDelta(in, value, _streamer->getValue(reference, i));
_streamer->setValue(object, i, value);
} else {
_streamer->insert(object, _valueReader->read(in));
}
}
} else {
for (int i = 0; i < size; i++) {
if (i < referenceSize) {
QVariant value;
_valueReader->readDelta(in, value, QVariant());
} else {
_valueReader->read(in);
}
}
}
break;
}
case SET_TYPE: {
@ -933,7 +955,13 @@ void TypeReader::readDelta(Bitstream& in, QVariant& object, const QVariant& refe
in >> modified;
for (int i = 0; i < modified; i++) {
QVariant key = _keyReader->read(in);
QVariant value;
if (_streamer) {
_valueReader->readDelta(in, value, _streamer->getValue(reference, key));
_streamer->insert(object, key, value);
} else {
_valueReader->readDelta(in, value, QVariant());
}
}
int removed;
in >> removed;
@ -966,12 +994,18 @@ FieldReader::FieldReader(const TypeReader& reader, int index) :
void FieldReader::read(Bitstream& in, const TypeStreamer* streamer, QVariant& object) const {
QVariant value = _reader.read(in);
if (_index != -1 && streamer) {
streamer->setField(_index, object, value);
streamer->setField(object, _index, value);
}
}
void FieldReader::readDelta(Bitstream& in, const TypeStreamer* streamer, QVariant& object, const QVariant& reference) const {
// TODO: field delta
QVariant value;
if (_index != -1 && streamer) {
_reader.readDelta(in, value, streamer->getField(reference, _index));
streamer->setField(object, _index, value);
} else {
_reader.readDelta(in, value, QVariant());
}
}
ObjectReader::ObjectReader(const QByteArray& className, const QMetaObject* metaObject,
@ -1024,10 +1058,14 @@ int TypeStreamer::getFieldIndex(const QByteArray& name) const {
return -1;
}
void TypeStreamer::setField(int index, QVariant& object, const QVariant& value) const {
void TypeStreamer::setField(QVariant& object, int index, const QVariant& value) const {
// nothing by default
}
QVariant TypeStreamer::getField(const QVariant& object, int index) const {
return QVariant();
}
TypeReader::Type TypeStreamer::getReaderType() const {
return TypeReader::SIMPLE_TYPE;
}
@ -1051,3 +1089,19 @@ void TypeStreamer::insert(QVariant& object, const QVariant& key, const QVariant&
bool TypeStreamer::remove(QVariant& object, const QVariant& key) const {
return false;
}
QVariant TypeStreamer::getValue(const QVariant& object, const QVariant& key) const {
return QVariant();
}
void TypeStreamer::prune(QVariant& object, int size) const {
// nothing by default
}
QVariant TypeStreamer::getValue(const QVariant& object, int index) const {
return QVariant();
}
void TypeStreamer::setValue(QVariant& object, int index, const QVariant& value) const {
// nothing by default
}

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

@ -271,14 +271,17 @@ public:
template<class T> void writeDelta(const T& value, const T& reference);
template<class T> void readDelta(T& value, const T& reference);
template<class T> void writeDelta(const QList<T>& value, const QList<T>& reference);
template<class T> void readDelta(QList<T>& value, const QList<T>& reference);
template<class T> void writeRawDelta(const T& value, const T& reference);
template<class T> void readRawDelta(T& value, const T& reference);
template<class T> void writeDelta(const QSet<T>& value, const QSet<T>& reference);
template<class T> void readDelta(QSet<T>& value, const QSet<T>& reference);
template<class T> void writeRawDelta(const QList<T>& value, const QList<T>& reference);
template<class T> void readRawDelta(QList<T>& value, const QList<T>& reference);
template<class K, class V> void writeDelta(const QHash<K, V>& value, const QHash<K, V>& reference);
template<class K, class V> void readDelta(QHash<K, V>& value, const QHash<K, V>& reference);
template<class T> void writeRawDelta(const QSet<T>& value, const QSet<T>& reference);
template<class T> void readRawDelta(QSet<T>& value, const QSet<T>& reference);
template<class K, class V> void writeRawDelta(const QHash<K, V>& value, const QHash<K, V>& reference);
template<class K, class V> void readRawDelta(QHash<K, V>& value, const QHash<K, V>& reference);
Bitstream& operator<<(bool value);
Bitstream& operator>>(bool& value);
@ -395,7 +398,7 @@ template<class T> inline void Bitstream::writeDelta(const T& value, const T& ref
*this << false;
} else {
*this << true;
*this << value;
writeRawDelta(value, reference);
}
}
@ -403,18 +406,29 @@ template<class T> inline void Bitstream::readDelta(T& value, const T& reference)
bool changed;
*this >> changed;
if (changed) {
*this >> value;
readRawDelta(value, reference);
} else {
value = reference;
}
}
template<class T> inline void Bitstream::writeDelta(const QList<T>& value, const QList<T>& reference) {
if (value == reference) {
*this << false;
return;
}
*this << true;
template<> inline void Bitstream::writeDelta(const bool& value, const bool& reference) {
*this << value;
}
template<> inline void Bitstream::readDelta(bool& value, const bool& reference) {
*this >> value;
}
template<class T> inline void Bitstream::writeRawDelta(const T& value, const T& reference) {
*this << value;
}
template<class T> inline void Bitstream::readRawDelta(T& value, const T& reference) {
*this >> value;
}
template<class T> inline void Bitstream::writeRawDelta(const QList<T>& value, const QList<T>& reference) {
*this << value.size();
*this << reference.size();
for (int i = 0; i < value.size(); i++) {
@ -426,13 +440,8 @@ template<class T> inline void Bitstream::writeDelta(const QList<T>& value, const
}
}
template<class T> inline void Bitstream::readDelta(QList<T>& value, const QList<T>& reference) {
template<class T> inline void Bitstream::readRawDelta(QList<T>& value, const QList<T>& reference) {
value = reference;
bool changed;
*this >> changed;
if (!changed) {
return;
}
int size, referenceSize;
*this >> size >> referenceSize;
if (size < value.size()) {
@ -449,12 +458,7 @@ template<class T> inline void Bitstream::readDelta(QList<T>& value, const QList<
}
}
template<class T> inline void Bitstream::writeDelta(const QSet<T>& value, const QSet<T>& reference) {
if (value == reference) {
*this << false;
return;
}
*this << true;
template<class T> inline void Bitstream::writeRawDelta(const QSet<T>& value, const QSet<T>& reference) {
int addedOrRemoved = 0;
foreach (const T& element, value) {
if (!reference.contains(element)) {
@ -479,13 +483,8 @@ template<class T> inline void Bitstream::writeDelta(const QSet<T>& value, const
}
}
template<class T> inline void Bitstream::readDelta(QSet<T>& value, const QSet<T>& reference) {
template<class T> inline void Bitstream::readRawDelta(QSet<T>& value, const QSet<T>& reference) {
value = reference;
bool changed;
*this >> changed;
if (!changed) {
return;
}
int addedOrRemoved;
*this >> addedOrRemoved;
for (int i = 0; i < addedOrRemoved; i++) {
@ -497,12 +496,7 @@ template<class T> inline void Bitstream::readDelta(QSet<T>& value, const QSet<T>
}
}
template<class K, class V> inline void Bitstream::writeDelta(const QHash<K, V>& value, const QHash<K, V>& reference) {
if (value == reference) {
*this << false;
return;
}
*this << true;
template<class K, class V> inline void Bitstream::writeRawDelta(const QHash<K, V>& value, const QHash<K, V>& reference) {
int added = 0;
int modified = 0;
for (typename QHash<K, V>::const_iterator it = value.constBegin(); it != value.constEnd(); it++) {
@ -542,13 +536,8 @@ template<class K, class V> inline void Bitstream::writeDelta(const QHash<K, V>&
}
}
template<class K, class V> inline void Bitstream::readDelta(QHash<K, V>& value, const QHash<K, V>& reference) {
template<class K, class V> inline void Bitstream::readRawDelta(QHash<K, V>& value, const QHash<K, V>& reference) {
value = reference;
bool changed;
*this >> changed;
if (!changed) {
return;
}
int added;
*this >> added;
for (int i = 0; i < added; i++) {
@ -774,7 +763,8 @@ public:
virtual const QVector<MetaField>& getMetaFields() const;
virtual int getFieldIndex(const QByteArray& name) const;
virtual void setField(int index, QVariant& object, const QVariant& value) const;
virtual void setField(QVariant& object, int index, const QVariant& value) const;
virtual QVariant getField(const QVariant& object, int index) const;
virtual TypeReader::Type getReaderType() const;
@ -784,6 +774,12 @@ public:
virtual void insert(QVariant& object, const QVariant& value) const;
virtual void insert(QVariant& object, const QVariant& key, const QVariant& value) const;
virtual bool remove(QVariant& object, const QVariant& key) const;
virtual QVariant getValue(const QVariant& object, const QVariant& key) const;
virtual void prune(QVariant& object, int size) const;
virtual QVariant getValue(const QVariant& object, int index) const;
virtual void setValue(QVariant& object, int index, const QVariant& value) const;
private:
@ -809,8 +805,10 @@ public:
virtual TypeReader::Type getReaderType() const { return TypeReader::STREAMABLE_TYPE; }
virtual const QVector<MetaField>& getMetaFields() const { return T::getMetaFields(); }
virtual int getFieldIndex(const QByteArray& name) const { return T::getFieldIndex(name); }
virtual void setField(int index, QVariant& object, const QVariant& value) const {
virtual void setField(QVariant& object, int index, const QVariant& value) const {
static_cast<T*>(object.data())->setField(index, value); }
virtual QVariant getField(const QVariant& object, int index) const {
return static_cast<const T*>(object.constData())->getField(index); }
};
/// Base template for collection streamers.
@ -825,6 +823,12 @@ public:
virtual const TypeStreamer* getValueStreamer() const { return Bitstream::getTypeStreamer(qMetaTypeId<T>()); }
virtual void insert(QVariant& object, const QVariant& value) const {
static_cast<QList<T>*>(object.data())->append(value.value<T>()); }
virtual void prune(QVariant& object, int size) const {
QList<T>* list = static_cast<QList<T>*>(object.data()); list->erase(list->begin() + size, list->end()); }
virtual QVariant getValue(const QVariant& object, int index) const {
return QVariant::fromValue(static_cast<const QList<T>*>(object.constData()).at(index)); }
virtual void setValue(QVariant& object, int index, const QVariant& value) const {
static_cast<QList<T>*>(object.data())->replace(index, value.value<T>()); }
};
/// A streamer for set types.
@ -850,6 +854,8 @@ public:
static_cast<QHash<K, V>*>(object.data())->insert(key.value<K>(), value.value<V>()); }
virtual bool remove(QVariant& object, const QVariant& key) const {
return static_cast<QHash<K, V>*>(object.data())->remove(key.value<K>()); }
virtual QVariant getValue(const QVariant& object, const QVariant& key) const {
return QVariant::fromValue(static_cast<const QHash<K, V>*>(object.constData())->value(key.value<K>())); }
};
/// Macro for registering simple type streamers.
@ -866,8 +872,8 @@ public:
#define DECLARE_STREAMABLE_METATYPE(X) Q_DECLARE_METATYPE(X) \
Bitstream& operator<<(Bitstream& out, const X& obj); \
Bitstream& operator>>(Bitstream& in, X& obj); \
template<> void Bitstream::writeDelta(const X& value, const X& reference); \
template<> void Bitstream::readDelta(X& value, const X& reference); \
template<> void Bitstream::writeRawDelta(const X& value, const X& reference); \
template<> void Bitstream::readRawDelta(X& value, const X& reference); \
bool operator==(const X& first, const X& second); \
bool operator!=(const X& first, const X& second); \
static const int* _TypePtr##X = &X::Type;
@ -875,8 +881,8 @@ public:
#define DECLARE_STREAMABLE_METATYPE(X) Q_DECLARE_METATYPE(X) \
Bitstream& operator<<(Bitstream& out, const X& obj); \
Bitstream& operator>>(Bitstream& in, X& obj); \
template<> void Bitstream::writeDelta(const X& value, const X& reference); \
template<> void Bitstream::readDelta(X& value, const X& reference); \
template<> void Bitstream::writeRawDelta(const X& value, const X& reference); \
template<> void Bitstream::readRawDelta(X& value, const X& reference); \
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;
@ -885,8 +891,8 @@ public:
#define DECLARE_STREAMABLE_METATYPE(X) Q_DECLARE_METATYPE(X) \
Bitstream& operator<<(Bitstream& out, const X& obj); \
Bitstream& operator>>(Bitstream& in, X& obj); \
template<> void Bitstream::writeDelta(const X& value, const X& reference); \
template<> void Bitstream::readDelta(X& value, const X& reference); \
template<> void Bitstream::writeRawDelta(const X& value, const X& reference); \
template<> void Bitstream::readRawDelta(X& value, const X& reference); \
bool operator==(const X& first, const X& second); \
bool operator!=(const X& first, const X& second); \
static const int* _TypePtr##X = &X::Type; \
@ -906,6 +912,7 @@ template<class T> int registerStreamableMetaType() {
static const QVector<MetaField>& getMetaFields(); \
static int getFieldIndex(const QByteArray& name); \
void setField(int index, const QVariant& value); \
QVariant getField(int index) const; \
private: \
static QHash<QByteArray, int> createFieldIndices();

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

@ -152,6 +152,25 @@ void generateOutput (QTextStream& out, const QList<Streamable>& streamables) {
out << " }\n";
out << "}\n";
out << "QVariant " << name << "::getField(int index) const {\n";
if (!str.clazz.bases.isEmpty()) {
out << " int nextIndex;\n";
}
foreach (const QString& base, str.clazz.bases) {
out << " if ((nextIndex = index - " << base << "::getMetaFields().size()) < 0) {\n";
out << " return " << base << "::getField(index);\n";
out << " }\n";
out << " index = nextIndex;\n";
}
out << " switch (index) {\n";
for (int i = 0; i < str.fields.size(); i++) {
out << " case " << i << ":\n";
out << " return QVariant::fromValue(this->" << str.fields.at(i).name << ");\n";
}
out << " }\n";
out << " return QVariant();\n";
out << "}\n";
out << "Bitstream& operator<<(Bitstream& out, const " << name << "& obj) {\n";
foreach (const QString& base, str.clazz.bases) {
out << " out << static_cast<const " << base << "&>(obj);\n";
@ -172,14 +191,9 @@ void generateOutput (QTextStream& out, const QList<Streamable>& streamables) {
out << " return in;\n";
out << "}\n";
out << "template<> void Bitstream::writeDelta(const " << name << "& value, const " << name << "& reference) {\n";
out << " if (value == reference) {\n";
out << " *this << false;\n";
out << " return;\n";
out << " }\n";
out << " *this << true;\n";
out << "template<> void Bitstream::writeRawDelta(const " << name << "& value, const " << name << "& reference) {\n";
foreach (const QString& base, str.clazz.bases) {
out << " writeDelta(static_cast<const " << base << "&>(value), static_cast<const " <<
out << " writeRawDelta(static_cast<const " << base << "&>(value), static_cast<const " <<
base << "&>(reference));\n";
}
foreach (const Field& field, str.fields) {
@ -187,15 +201,9 @@ void generateOutput (QTextStream& out, const QList<Streamable>& streamables) {
}
out << "}\n";
out << "template<> void Bitstream::readDelta(" << name << "& value, const " << name << "& reference) {\n";
out << " bool changed;\n";
out << " *this >> changed;\n";
out << " if (!changed) {\n";
out << " value = reference;\n";
out << " return;\n";
out << " }\n";
out << "template<> void Bitstream::readRawDelta(" << name << "& value, const " << name << "& reference) {\n";
foreach (const QString& base, str.clazz.bases) {
out << " readDelta(static_cast<" << base << "&>(value), static_cast<const " <<
out << " readRawDelta(static_cast<" << base << "&>(value), static_cast<const " <<
base << "&>(reference));\n";
}
foreach (const Field& field, str.fields) {