History

move JoystickManager to JoystickScriptingInterface, add Joystick class for SDL Joystick

Stephen Birarda committed 12 years ago

Commit 00b08061 parent 900daf413 files · +216 −218Browse files

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

Unified · Split

libraries/script-engine/src/ScriptEngine.cpp+0−10
@@ -35,7 +35,6 @@ · 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"
39#include "MenuItemProperties.h"38#include "MenuItemProperties.h"
40#include "MIDIEvent.h"39#include "MIDIEvent.h"
41#include "LocalVoxels.h"40#include "LocalVoxels.h"
@@ -81,14 +80,6 @@ void inputControllerFromScriptValue(const QScriptValue &object, AbstractInputCon · 39 unmodified lines
81 out = qobject_cast<AbstractInputController*>(object.toQObject());80 out = qobject_cast<AbstractInputController*>(object.toQObject());
82}81}
83 82
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
92ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,83ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,
93 AbstractControllerScriptingInterface* controllerScriptingInterface) :84 AbstractControllerScriptingInterface* controllerScriptingInterface) :
94 85
@@ -287,7 +278,6 @@ void ScriptEngine::init() { · 192 unmodified lines
287 278
288 qScriptRegisterMetaType(this, injectorToScriptValue, injectorFromScriptValue);279 qScriptRegisterMetaType(this, injectorToScriptValue, injectorFromScriptValue);
289 qScriptRegisterMetaType(this, inputControllerToScriptValue, inputControllerFromScriptValue);280 qScriptRegisterMetaType(this, inputControllerToScriptValue, inputControllerFromScriptValue);
290 qScriptRegisterMetaType(this, joystickToScriptValue, joystickFromScriptValue);
291 281
292 qScriptRegisterMetaType(this, animationDetailsToScriptValue, animationDetailsFromScriptValue);282 qScriptRegisterMetaType(this, animationDetailsToScriptValue, animationDetailsFromScriptValue);
293 283