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
72 out = qobject_cast<AudioInjector*>(object.toQObject());72 out = qobject_cast<AudioInjector*>(object.toQObject());
73}73}
74 74
75QScriptValue injectorToScriptValueInputController(QScriptEngine *engine, AbstractInputController* const &in) {
76 return engine->newQObject(in);
77}
78
79void injectorFromScriptValueInputController(const QScriptValue &object, AbstractInputController* &out) {
80 out = qobject_cast<AbstractInputController*>(object.toQObject());
81}
82
75ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,83ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,
76 AbstractControllerScriptingInterface* controllerScriptingInterface) :84 AbstractControllerScriptingInterface* controllerScriptingInterface) :
77 85
@@ -262,6 +270,7 @@ void ScriptEngine::init() { · 184 unmodified lines
262 _engine.globalObject().setProperty("LocalVoxels", localVoxelsValue);270 _engine.globalObject().setProperty("LocalVoxels", localVoxelsValue);
263 271
264 qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue);272 qScriptRegisterMetaType(&_engine, injectorToScriptValue, injectorFromScriptValue);
273 qScriptRegisterMetaType( &_engine, injectorToScriptValueInputController, injectorFromScriptValueInputController);
265 274
266 qScriptRegisterMetaType(&_engine, animationDetailsToScriptValue, animationDetailsFromScriptValue);275 qScriptRegisterMetaType(&_engine, animationDetailsToScriptValue, animationDetailsFromScriptValue);
267 276