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
2340	auto scriptEngine = engine().data();	2340	auto scriptEngine = engine().data();
2341		2341
2342	ScriptValueList args;	2342	ScriptValueList args;
2343	args << entityID.toScriptValue(scriptEngine);	2343	args << EntityItemIDtoScriptValue(scriptEngine, entityID);
2344	args << scriptValueFromSequence(scriptEngine, params);	2344	args << scriptValueFromSequence(scriptEngine, params);
2345		2345
2346	ScriptValuePointer oldData = scriptEngine->globalObject()->property("Script")->property("remoteCallerID");	2346	ScriptValuePointer oldData = scriptEngine->globalObject()->property("Script")->property("remoteCallerID");
@@ -2383,7 +2383,7 @@ void ScriptManager::callEntityScriptMethod(const EntityItemID& entityID, const Q · 36 unmodified lines
2383	auto scriptEngine = engine().data();	2383	auto scriptEngine = engine().data();
2384		2384
2385	ScriptValueList args;	2385	ScriptValueList args;
2386	args << entityID.toScriptValue(scriptEngine);	2386	args << EntityItemIDtoScriptValue(scriptEngine, entityID);
2387	args << event.toScriptValue(scriptEngine);	2387	args << event.toScriptValue(scriptEngine);
2388	callWithEnvironment(entityID, details.definingSandboxURL, entityScript->property(methodName), entityScript, args);	2388	callWithEnvironment(entityID, details.definingSandboxURL, entityScript->property(methodName), entityScript, args);
2389	}	2389	}
@@ -2423,8 +2423,8 @@ void ScriptManager::callEntityScriptMethod(const EntityItemID& entityID, const Q · 33 unmodified lines
2423	auto scriptEngine = engine().data();	2423	auto scriptEngine = engine().data();
2424		2424
2425	ScriptValueList args;	2425	ScriptValueList args;
2426	args << entityID.toScriptValue(scriptEngine);	2426	args << EntityItemIDtoScriptValue(scriptEngine, entityID);
2427	args << otherID.toScriptValue(scriptEngine);	2427	args << EntityItemIDtoScriptValue(scriptEngine, otherID);
2428	args << collisionToScriptValue(scriptEngine, collision);	2428	args << collisionToScriptValue(scriptEngine, collision);
2429	callWithEnvironment(entityID, details.definingSandboxURL, entityScript->property(methodName), entityScript, args);	2429	callWithEnvironment(entityID, details.definingSandboxURL, entityScript->property(methodName), entityScript, args);
2430	}	2430	}