Showing the changes to interface/src/Application.cpp (1 of 13 files). Show all
Unified · Split
| @@ -82,6 +82,7 @@ · 81 unmodified lines | |||
| 82 | #include "scripting/AccountScriptingInterface.h" | 82 | #include "scripting/AccountScriptingInterface.h" |
| 83 | #include "scripting/AudioDeviceScriptingInterface.h" | 83 | #include "scripting/AudioDeviceScriptingInterface.h" |
| 84 | #include "scripting/ClipboardScriptingInterface.h" | 84 | #include "scripting/ClipboardScriptingInterface.h" |
| 85 | #include "scripting/JoystickScriptingInterface.h" | ||
| 85 | #include "scripting/GlobalServicesScriptingInterface.h" | 86 | #include "scripting/GlobalServicesScriptingInterface.h" |
| 86 | #include "scripting/LocationScriptingInterface.h" | 87 | #include "scripting/LocationScriptingInterface.h" |
| 87 | #include "scripting/MenuScriptingInterface.h" | 88 | #include "scripting/MenuScriptingInterface.h" |
| @@ -2155,7 +2156,7 @@ void Application::update(float deltaTime) { · 2067 unmodified lines | |||
| 2155 | updateFaceshift(); | 2156 | updateFaceshift(); |
| 2156 | updateVisage(); | 2157 | updateVisage(); |
| 2157 | _sixenseManager.update(deltaTime); | 2158 | _sixenseManager.update(deltaTime); |
| 2158 | _joystickManager.update(); | 2159 | JoystickScriptingInterface::getInstance().update(); |
| 2159 | _prioVR.update(deltaTime); | 2160 | _prioVR.update(deltaTime); |
| 2160 | 2161 | ||
| 2161 | } | 2162 | } |
| @@ -3847,6 +3848,8 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser · 1685 unmodified lines | |||
| 3847 | scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance()); | 3848 | scriptEngine->registerGlobalObject("GlobalServices", GlobalServicesScriptingInterface::getInstance()); |
| 3848 | 3849 | ||
| 3849 | scriptEngine->registerGlobalObject("AvatarManager", &_avatarManager); | 3850 | scriptEngine->registerGlobalObject("AvatarManager", &_avatarManager); |
| 3851 | |||
| 3852 | scriptEngine->registerGlobalObject("Joysticks", &JoystickScriptingInterface::getInstance()); | ||
| 3850 | 3853 | ||
| 3851 | #ifdef HAVE_RTMIDI | 3854 | #ifdef HAVE_RTMIDI |
| 3852 | scriptEngine->registerGlobalObject("MIDI", &MIDIManager::getInstance()); | 3855 | scriptEngine->registerGlobalObject("MIDI", &MIDIManager::getInstance()); |