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

Use Huffman's version of getEntityScriptDetails

Browse source
This commit is contained in:
Atlante45 2017-01-19 15:49:40 -08:00
parent 20a82df9a0
commit 3203e8c7c2
4 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assignment-client/src/scripts/EntityScriptServer.cpp
View file

@ -281,8 +281,9 @@ void EntityScriptServer::entityServerScriptChanging(const EntityItemID& entityID
}
void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, const bool reload) {
if (_entityViewer.getTree() && !_shuttingDown && _entitiesScriptEngine) {
auto details = _entitiesScriptEngine->getEntityScriptDetails(entityID);
EntityScriptDetails details;
if (_entityViewer.getTree() && !_shuttingDown && _entitiesScriptEngine &&
_entitiesScriptEngine->getEntityScriptDetails(entityID, details)) {
EntityItemPointer entity = _entityViewer.getTree()->findEntityByEntityItemID(entityID);
if (entity && (details.scriptText != entity->getServerScripts() || reload)) {

2
libraries/networking/src/EntityScriptClient.h
View file

@ -73,4 +73,4 @@ private:
void forceFailureOfPendingRequests(SharedNodePointer node);
};
#endif
#endif

7
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -1587,13 +1587,6 @@ void ScriptEngine::unloadAllEntityScripts() {
#endif // DEBUG_ENGINE_STATE
}
EntityScriptDetails ScriptEngine::getEntityScriptDetails(const EntityItemID& entityID) const {
if (_entityScripts.contains(entityID)) {
return _entityScripts[entityID];
}
return EntityScriptDetails();
}
void ScriptEngine::refreshFileScript(const EntityItemID& entityID) {
if (!_entityScripts.contains(entityID)) {
return;

1
libraries/script-engine/src/ScriptEngine.h
View file

@ -149,7 +149,6 @@ public:
const QStringList& params = QStringList()) override;
Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const PointerEvent& event);
Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const EntityItemID& otherID, const Collision& collision);
Q_INVOKABLE EntityScriptDetails getEntityScriptDetails(const EntityItemID& entityID) const;
Q_INVOKABLE void requestGarbageCollection() { collectGarbage(); }