History

Server side entity script messages

ksuprynowicz committed 2 years ago

Commit dfbc1d81 parent 274867b11 files · +252 −75Browse files

Showing the changes to libraries/script-engine/src/ScriptMessage.cpp (1 of 11 files). Show all

Unified · Split

libraries/script-engine/src/ScriptMessage.cpp+3−0
@@ -18,6 +18,7 @@ QJsonObject ScriptMessage::toJson() { · 17 unmodified lines
1818 object["message"] = _messageContent;
1919 object["lineNumber"] = _lineNumber;
2020 object["fileName"] = _fileName;
21+ object["entityID"] = _entityID.toString();
2122 object["type"] = static_cast<int>(_scriptType);
2223 object["severity"] = static_cast<int>(_severity);
2324 return object;
@@ -27,6 +28,7 @@ bool ScriptMessage::fromJson(const QJsonObject &object) { · 3 unmodified lines
2728 if (!object["message"].isString()
2829 || !object["lineNumber"].isDouble()
2930 || !object["fileName"].isString()
31+ || !object["entityID"].isString()
3032 || !object["type"].isDouble()
3133 || !object["severity"].isDouble()) {
3234 qDebug() << "ScriptMessage::fromJson failed to find required fields in JSON file";
@@ -35,6 +37,7 @@ bool ScriptMessage::fromJson(const QJsonObject &object) { · 2 unmodified lines
3537 _messageContent = object["message"].toString();
3638 _lineNumber = object["lineNumber"].toInt();
3739 _fileName = object["fileName"].toInt();
40+ _entityID = QUuid::fromString(object["entityID"].toString());
3841 _scriptType = static_cast<ScriptMessage::ScriptType>(object["type"].toInt());
3942 _severity = static_cast<ScriptMessage::Severity>(object["severity"].toInt());
4043 }