Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 13 files). Show all
Unified · Split
| @@ -35,7 +35,6 @@ · 34 unmodified lines | ||
| 35 | 35 | #include "AnimationObject.h" |
| 36 | 36 | #include "ArrayBufferViewClass.h" |
| 37 | 37 | #include "DataViewClass.h" |
| 38 | −#include "JoystickInputController.h" | |
| 39 | 38 | #include "MenuItemProperties.h" |
| 40 | 39 | #include "MIDIEvent.h" |
| 41 | 40 | #include "LocalVoxels.h" |
| @@ -81,14 +80,6 @@ void inputControllerFromScriptValue(const QScriptValue &object, AbstractInputCon · 39 unmodified lines | ||
| 81 | 80 | out = qobject_cast<AbstractInputController*>(object.toQObject()); |
| 82 | 81 | } |
| 83 | 82 | |
| 84 | −QScriptValue joystickToScriptValue(QScriptEngine *engine, JoystickInputController* const &in) { | |
| 85 | − return engine->newQObject(in); | |
| 86 | −} | |
| 87 | − | |
| 88 | −void joystickFromScriptValue(const QScriptValue &object, JoystickInputController* &out) { | |
| 89 | − out = qobject_cast<JoystickInputController*>(object.toQObject()); | |
| 90 | −} | |
| 91 | − | |
| 92 | 83 | ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString, |
| 93 | 84 | AbstractControllerScriptingInterface* controllerScriptingInterface) : |
| 94 | 85 | |
| @@ -287,7 +278,6 @@ void ScriptEngine::init() { · 192 unmodified lines | ||
| 287 | 278 | |
| 288 | 279 | qScriptRegisterMetaType(this, injectorToScriptValue, injectorFromScriptValue); |
| 289 | 280 | qScriptRegisterMetaType(this, inputControllerToScriptValue, inputControllerFromScriptValue); |
| 290 | − qScriptRegisterMetaType(this, joystickToScriptValue, joystickFromScriptValue); | |
| 291 | 281 | |
| 292 | 282 | qScriptRegisterMetaType(this, animationDetailsToScriptValue, animationDetailsFromScriptValue); |
| 293 | 283 | |