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
6767 out = qobject_cast<AudioInjector*>(object.toQObject());
6868 }
6969
70+QScriptValue injectorToScriptValue_InputController(QScriptEngine *engine, AbstractInputController* const &in) {
71+ return engine->newQObject(in);
72+}
73+
74+void injectorFromScriptValue_InputController(const QScriptValue &object, AbstractInputController* &out) {
75+ out = qobject_cast<AbstractInputController*>(object.toQObject());
76+}
77+
7078 ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,
7179 AbstractControllerScriptingInterface* controllerScriptingInterface) :
7280
@@ -253,6 +261,7 @@ void ScriptEngine::init() { · 180 unmodified lines
253261 _engine.globalObject().setProperty("LocalVoxels", localVoxelsValue);
254262
255263 qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue);
264+ qScriptRegisterMetaType( &_engine, injectorToScriptValue_InputController, injectorFromScriptValue_InputController);
256265
257266 registerGlobalObject("Script", this);
258267 registerGlobalObject("Audio", &_audioScriptingInterface);