Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-10 04:28:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix writeSubclassData in octree data

Browse source
This commit is contained in:
Ryan Huffman 2018-02-26 17:06:25 -08:00
parent ec210e1750
commit 8a8830bbd4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/octree/src/OctreeDataUtils.cpp
View file

@ -115,13 +115,13 @@ void OctreeUtils::RawOctreeData::resetIdAndVersion() {
qDebug() << "Reset octree data to: " << id << version;
}
void OctreeUtils::RawEntityData::readSubclassData(QJsonObject root) {
void OctreeUtils::RawEntityData::readSubclassData(const QJsonObject& root) {
if (root.contains("Entities")) {
entityData = root["Entities"].toArray();
}
}
void OctreeUtils::RawEntityData::writeSubclassData(QJsonObject root) const {
void OctreeUtils::RawEntityData::writeSubclassData(QJsonObject& root) const {
root["Entities"] = entityData;
}

8
libraries/octree/src/OctreeDataUtils.h
View file

@ -32,8 +32,8 @@ public:
virtual PacketType dataPacketType() const;
virtual void readSubclassData(QJsonObject root) { }
virtual void writeSubclassData(QJsonObject root) const { }
virtual void readSubclassData(const QJsonObject& root) { }
virtual void writeSubclassData(QJsonObject& root) const { }
void resetIdAndVersion();
QByteArray toByteArray();
@ -46,8 +46,8 @@ public:
class RawEntityData : public RawOctreeData {
PacketType dataPacketType() const override;
void readSubclassData(QJsonObject root) override;
void writeSubclassData(QJsonObject root) const override;
void readSubclassData(const QJsonObject& root) override;
void writeSubclassData(QJsonObject& root) const override;
QJsonArray entityData;
};