History

moving EntityItemID from script-engine to shared

Heather Anderson committed 5 years ago

Commit 7964f061 parent 665ea527 files · +80 −90Browse files

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

Unified · Split

libraries/script-engine/src/ScriptManager.cpp+4−4
@@ -2340,7 +2340,7 @@ void ScriptManager::callEntityScriptMethod(const EntityItemID& entityID, const Q · 2339 unmodified lines
23402340 auto scriptEngine = engine().data();
23412341
23422342 ScriptValueList args;
2343− args << entityID.toScriptValue(scriptEngine);
2343+ args << EntityItemIDtoScriptValue(scriptEngine, entityID);
23442344 args << scriptValueFromSequence(scriptEngine, params);
23452345
23462346 ScriptValuePointer oldData = scriptEngine->globalObject()->property("Script")->property("remoteCallerID");
@@ -2383,7 +2383,7 @@ void ScriptManager::callEntityScriptMethod(const EntityItemID& entityID, const Q · 36 unmodified lines
23832383 auto scriptEngine = engine().data();
23842384
23852385 ScriptValueList args;
2386− args << entityID.toScriptValue(scriptEngine);
2386+ args << EntityItemIDtoScriptValue(scriptEngine, entityID);
23872387 args << event.toScriptValue(scriptEngine);
23882388 callWithEnvironment(entityID, details.definingSandboxURL, entityScript->property(methodName), entityScript, args);
23892389 }
@@ -2423,8 +2423,8 @@ void ScriptManager::callEntityScriptMethod(const EntityItemID& entityID, const Q · 33 unmodified lines
24232423 auto scriptEngine = engine().data();
24242424
24252425 ScriptValueList args;
2426− args << entityID.toScriptValue(scriptEngine);
2427− args << otherID.toScriptValue(scriptEngine);
2426+ args << EntityItemIDtoScriptValue(scriptEngine, entityID);
2427+ args << EntityItemIDtoScriptValue(scriptEngine, otherID);
24282428 args << collisionToScriptValue(scriptEngine, collision);
24292429 callWithEnvironment(entityID, details.definingSandboxURL, entityScript->property(methodName), entityScript, args);
24302430 }