split entity script engines into two

HifiExperiments committed 6 years ago

Commit 2a1857e1 parent c9c8e5f5 files · +176 −112Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 5 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+23−11

     return EntityTree::textSize(id, text);
 }
-void EntityScriptingInterface::setEntitiesScriptEngine(QSharedPointer<EntitiesScriptEngineProvider> engine) {
+void EntityScriptingInterface::setPersistentEntitiesScriptEngine(QSharedPointer<EntitiesScriptEngineProvider> engine) {
     std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
-    _entitiesScriptEngine = engine;
+    _persistentEntitiesScriptEngine = engine;
+}
+void EntityScriptingInterface::setNonPersistentEntitiesScriptEngine(QSharedPointer<EntitiesScriptEngineProvider> engine) {
+    std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
+    _nonPersistentEntitiesScriptEngine = engine;
 }
 void EntityScriptingInterface::callEntityMethod(const QUuid& id, const QString& method, const QStringList& params) {
     PROFILE_RANGE(script_entities, __FUNCTION__);
-    std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
+    auto entity = getEntityTree()->findEntityByEntityItemID(id);
-    if (_entitiesScriptEngine) {
+    if (entity) {
-        EntityItemID entityID{ id };
+        std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
-        _entitiesScriptEngine->callEntityScriptMethod(entityID, method, params);
+        auto& scriptEngine = (entity->isLocalEntity() || entity->isMyAvatarEntity()) ? _persistentEntitiesScriptEngine : _nonPersistentEntitiesScriptEngine;
+        if (scriptEngine) {
+            scriptEngine->callEntityScriptMethod(id, method, params);
+        }
     }
 }
             params << paramString;
         }
-        std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
+        auto entity = getEntityTree()->findEntityByEntityItemID(entityID);
-        if (_entitiesScriptEngine) {
+        if (entity) {
-            _entitiesScriptEngine->callEntityScriptMethod(entityID, method, params, senderNode->getUUID());
+            std::lock_guard<std::recursive_mutex> lock(_entitiesScriptEngineLock);
+            auto& scriptEngine = (entity->isLocalEntity() || entity->isMyAvatarEntity()) ? _persistentEntitiesScriptEngine : _nonPersistentEntitiesScriptEngine;
+            if (scriptEngine) {
+                scriptEngine->callEntityScriptMethod(entityID, method, params, senderNode->getUUID());
+            }
         }
     }
 }
         if (entitiesScriptEngine) {
             request->setFuture(entitiesScriptEngine->getLocalEntityScriptDetails(entityID));
         }
-    });
+    }, entityID);
     if (!request->isStarted()) {
         request->deleteLater();
         callScopedHandlerObject(handler, _engine->makeError("Entities Scripting Provider unavailable", "InternalError"), QScriptValue());

split entity script engines into two

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code