History

add a receiver example

Brad Hefta-Gaub committed 10 years ago

Commit 2f142eb1 parent 2d3fe492 files · +23 −4Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+1−4
@@ -367,6 +367,7 @@ void ScriptEngine::init() { · 366 unmodified lines
367 registerGlobalObject("Vec3", &_vec3Library);367 registerGlobalObject("Vec3", &_vec3Library);
368 registerGlobalObject("Uuid", &_uuidLibrary);368 registerGlobalObject("Uuid", &_uuidLibrary);
369 registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data());369 registerGlobalObject("AnimationCache", DependencyManager::get<AnimationCache>().data());
370 registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data());
370 qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue);371 qScriptRegisterMetaType(this, animVarMapToScriptValue, animVarMapFromScriptValue);
371 qScriptRegisterMetaType(this, resultHandlerToScriptValue, resultHandlerFromScriptValue);372 qScriptRegisterMetaType(this, resultHandlerToScriptValue, resultHandlerFromScriptValue);
372 373
@@ -376,10 +377,6 @@ void ScriptEngine::init() { · 3 unmodified lines
376 auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();377 auto scriptingInterface = DependencyManager::get<controller::ScriptingInterface>();
377 registerGlobalObject("Controller", scriptingInterface.data());378 registerGlobalObject("Controller", scriptingInterface.data());
378 UserInputMapper::registerControllerTypes(this);379 UserInputMapper::registerControllerTypes(this);
379
380
381 registerGlobalObject("Messages", DependencyManager::get<MessagesClient>().data());
382
383}380}
384 381
385void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {382void ScriptEngine::registerValue(const QString& valueName, QScriptValue value) {