History

Merge pull request #3145 from samcake/19734

19734 - Leapmotion support

Brad Hefta-Gaub committed 12 years ago

Commit d8d6d082 parents cc7da35 dd9327036 files · +2400 −-10Browse 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
@@ -72,6 +72,14 @@ void injectorFromScriptValue(const QScriptValue &object, AudioInjector* &out) { · 71 unmodified lines
7272 out = qobject_cast<AudioInjector*>(object.toQObject());
7373 }
7474
75+QScriptValue injectorToScriptValueInputController(QScriptEngine *engine, AbstractInputController* const &in) {
76+ return engine->newQObject(in);
77+}
78+
79+void injectorFromScriptValueInputController(const QScriptValue &object, AbstractInputController* &out) {
80+ out = qobject_cast<AbstractInputController*>(object.toQObject());
81+}
82+
7583 ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,
7684 AbstractControllerScriptingInterface* controllerScriptingInterface) :
7785
@@ -262,6 +270,7 @@ void ScriptEngine::init() { · 184 unmodified lines
262270 _engine.globalObject().setProperty("LocalVoxels", localVoxelsValue);
263271
264272 qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue);
273+ qScriptRegisterMetaType( &_engine, injectorToScriptValueInputController, injectorFromScriptValueInputController);
265274
266275 qScriptRegisterMetaType(&_engine, animationDetailsToScriptValue, animationDetailsFromScriptValue);
267276