History

initial working connection of an xbox gamepad

Stephen Birarda committed 12 years ago

Commit 900daf41 parent 473394510 files · +183 −32Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+13−3
@@ -35,6 +35,7 @@ · 34 unmodified lines
35#include "AnimationObject.h"35#include "AnimationObject.h"
36#include "ArrayBufferViewClass.h"36#include "ArrayBufferViewClass.h"
37#include "DataViewClass.h"37#include "DataViewClass.h"
38#include "JoystickInputController.h"
38#include "MenuItemProperties.h"39#include "MenuItemProperties.h"
39#include "MIDIEvent.h"40#include "MIDIEvent.h"
40#include "LocalVoxels.h"41#include "LocalVoxels.h"
@@ -72,14 +73,22 @@ void injectorFromScriptValue(const QScriptValue &object, AudioInjector* &out) { · 31 unmodified lines
72 out = qobject_cast<AudioInjector*>(object.toQObject());73 out = qobject_cast<AudioInjector*>(object.toQObject());
73}74}
74 75
75QScriptValue injectorToScriptValueInputController(QScriptEngine *engine, AbstractInputController* const &in) {76QScriptValue inputControllerToScriptValue(QScriptEngine *engine, AbstractInputController* const &in) {
76 return engine->newQObject(in);77 return engine->newQObject(in);
77}78}
78 79
79void injectorFromScriptValueInputController(const QScriptValue &object, AbstractInputController* &out) {80void inputControllerFromScriptValue(const QScriptValue &object, AbstractInputController* &out) {
80 out = qobject_cast<AbstractInputController*>(object.toQObject());81 out = qobject_cast<AbstractInputController*>(object.toQObject());
81}82}
82 83
84QScriptValue joystickToScriptValue(QScriptEngine *engine, JoystickInputController* const &in) {
85 return engine->newQObject(in);
86}
87
88void joystickFromScriptValue(const QScriptValue &object, JoystickInputController* &out) {
89 out = qobject_cast<JoystickInputController*>(object.toQObject());
90}
91
83ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,92ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,
84 AbstractControllerScriptingInterface* controllerScriptingInterface) :93 AbstractControllerScriptingInterface* controllerScriptingInterface) :
85 94
@@ -277,7 +286,8 @@ void ScriptEngine::init() { · 191 unmodified lines
277 globalObject().setProperty("LocalVoxels", localVoxelsValue);286 globalObject().setProperty("LocalVoxels", localVoxelsValue);
278 287
279 qScriptRegisterMetaType(this, injectorToScriptValue, injectorFromScriptValue);288 qScriptRegisterMetaType(this, injectorToScriptValue, injectorFromScriptValue);
280 qScriptRegisterMetaType( this, injectorToScriptValueInputController, injectorFromScriptValueInputController);289 qScriptRegisterMetaType(this, inputControllerToScriptValue, inputControllerFromScriptValue);
290 qScriptRegisterMetaType(this, joystickToScriptValue, joystickFromScriptValue);
281 291
282 qScriptRegisterMetaType(this, animationDetailsToScriptValue, animationDetailsFromScriptValue);292 qScriptRegisterMetaType(this, animationDetailsToScriptValue, animationDetailsFromScriptValue);
283 293