Showing the changes to libraries/script-engine/src/ScriptManagerScriptingInterface.cpp (1 of 7 files). Show all
Unified · Split
| @@ -91,16 +91,37 @@ void ScriptManagerScriptingInterface::stopProfilingAndSave() { · 90 unmodified lines | ||
| 91 | 91 | } |
| 92 | 92 | |
| 93 | 93 | void ScriptManagerScriptingInterface::requestServerEntityScriptMessages() { |
| 94 | − if (_manager->isEntityServerScript() || _manager->isEntityServerScript() || _manager->isClientScript()) { | |
| 94 | + if (_manager->isEntityServerScript() || _manager->isEntityServerScript()) { | |
| 95 | + _manager->engine()->raiseException("Uuid needs to be specified when requestServerEntityScriptMessages is invoked from entity script"); | |
| 96 | + } else { | |
| 95 | 97 | auto scriptEngines = DependencyManager::get<ScriptEngines>().data(); |
| 96 | − //TODO; | |
| 98 | + scriptEngines->requestServerEntityScriptMessages(_manager); | |
| 99 | + } | |
| 100 | +} | |
| 101 | + | |
| 102 | +void ScriptManagerScriptingInterface::requestServerEntityScriptMessages(const QUuid& entityID) { | |
| 103 | + if (_manager->isEntityServerScript() || _manager->isEntityServerScript()) { | |
| 104 | + auto scriptEngines = DependencyManager::get<ScriptEngines>().data(); | |
| 105 | + scriptEngines->requestServerEntityScriptMessages(_manager, entityID); | |
| 106 | + } else { | |
| 107 | + _manager->engine()->raiseException("Uuid must not be specified when requestServerEntityScriptMessages is invoked from entity script"); | |
| 97 | 108 | } |
| 98 | 109 | } |
| 99 | 110 | |
| 100 | 111 | void ScriptManagerScriptingInterface::removeServerEntityScriptMessagesRequest() { |
| 101 | − if (_manager->isEntityServerScript() || _manager->isEntityServerScript() || _manager->isClientScript()) { | |
| 112 | + if (_manager->isEntityServerScript() || _manager->isEntityServerScript()) { | |
| 113 | + _manager->engine()->raiseException("Uuid needs to be specified when removeServerEntityScriptMessagesRequest is invoked from entity script"); | |
| 114 | + } else { | |
| 102 | 115 | auto scriptEngines = DependencyManager::get<ScriptEngines>().data(); |
| 103 | − //TODO; | |
| 116 | + scriptEngines->removeServerEntityScriptMessagesRequest(_manager); | |
| 104 | 117 | } |
| 105 | 118 | } |
| 106 | 119 | |
| 120 | +void ScriptManagerScriptingInterface::removeServerEntityScriptMessagesRequest(const QUuid& entityID) { | |
| 121 | + if (_manager->isEntityServerScript() || _manager->isEntityServerScript()) { | |
| 122 | + auto scriptEngines = DependencyManager::get<ScriptEngines>().data(); | |
| 123 | + scriptEngines->removeServerEntityScriptMessagesRequest(_manager, entityID); | |
| 124 | + } else { | |
| 125 | + _manager->engine()->raiseException("Uuid must not be specified when removeServerEntityScriptMessagesRequest is invoked from entity script"); | |
| 126 | + } | |
| 127 | +} | |