Merge pull request #4252 from thoys/20224

CR for Job #20224 - Make virtualKeyboard.js go to locations and support gamepads

Andrew Meadows committed 11 years ago

Commit d896f3a2 parents ac93f86 062c2cb11 files · +749 −259Browse files

Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all

Unified · Split

 #include "scripting/AccountScriptingInterface.h"
 #include "scripting/AudioDeviceScriptingInterface.h"
 #include "scripting/ClipboardScriptingInterface.h"
+#include "scripting/HMDScriptingInterface.h"
 #include "scripting/JoystickScriptingInterface.h"
 #include "scripting/GlobalServicesScriptingInterface.h"
 #include "scripting/LocationScriptingInterface.h"
     scriptEngine->registerGlobalObject("UndoStack", &_undoStackScriptingInterface);
+    QScriptValue hmdInterface = scriptEngine->registerGlobalObject("HMD", &HMDScriptingInterface::getInstance());
+    scriptEngine->registerFunction(hmdInterface, "getHUDLookAtPosition2D", HMDScriptingInterface::getHUDLookAtPosition2D, 0);
+    scriptEngine->registerFunction(hmdInterface, "getHUDLookAtPosition3D", HMDScriptingInterface::getHUDLookAtPosition3D, 0);
 #ifdef HAVE_RTMIDI
     scriptEngine->registerGlobalObject("MIDI", &MIDIManager::getInstance());
 #endif

Keyboard shortcuts