History

Merge remote-tracking branch 'origin/LeapMotion' into 19734

samcake committed 12 years ago

Commit a8b875d2 parents c7b1b50 3ce455a36 files · +8213 −-9Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+9−0
@@ -67,6 +67,14 @@ void injectorFromScriptValue(const QScriptValue &object, AudioInjector* &out) { · 66 unmodified lines
67 out = qobject_cast<AudioInjector*>(object.toQObject());67 out = qobject_cast<AudioInjector*>(object.toQObject());
68}68}
69 69
70QScriptValue injectorToScriptValue_InputController(QScriptEngine *engine, AbstractInputController* const &in) {
71 return engine->newQObject(in);
72}
73
74void injectorFromScriptValue_InputController(const QScriptValue &object, AbstractInputController* &out) {
75 out = qobject_cast<AbstractInputController*>(object.toQObject());
76}
77
70ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,78ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,
71 AbstractControllerScriptingInterface* controllerScriptingInterface) :79 AbstractControllerScriptingInterface* controllerScriptingInterface) :
72 80
@@ -253,6 +261,7 @@ void ScriptEngine::init() { · 180 unmodified lines
253 _engine.globalObject().setProperty("LocalVoxels", localVoxelsValue);261 _engine.globalObject().setProperty("LocalVoxels", localVoxelsValue);
254 262
255 qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue);263 qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue);
264 qScriptRegisterMetaType( &_engine, injectorToScriptValue_InputController, injectorFromScriptValue_InputController);
256 265
257 registerGlobalObject("Script", this);266 registerGlobalObject("Script", this);
258 registerGlobalObject("Audio", &_audioScriptingInterface);267 registerGlobalObject("Audio", &_audioScriptingInterface);