History

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

interface/src/Application.cpp+5−0
@@ -111,6 +111,7 @@ · 110 unmodified lines
111111 #include "scripting/AccountScriptingInterface.h"
112112 #include "scripting/AudioDeviceScriptingInterface.h"
113113 #include "scripting/ClipboardScriptingInterface.h"
114+#include "scripting/HMDScriptingInterface.h"
114115 #include "scripting/JoystickScriptingInterface.h"
115116 #include "scripting/GlobalServicesScriptingInterface.h"
116117 #include "scripting/LocationScriptingInterface.h"
@@ -3492,6 +3493,10 @@ void Application::registerScriptEngineWithApplicationServices(ScriptEngine* scri · 3375 unmodified lines
34923493
34933494 scriptEngine->registerGlobalObject("UndoStack", &_undoStackScriptingInterface);
34943495
3496+ QScriptValue hmdInterface = scriptEngine->registerGlobalObject("HMD", &HMDScriptingInterface::getInstance());
3497+ scriptEngine->registerFunction(hmdInterface, "getHUDLookAtPosition2D", HMDScriptingInterface::getHUDLookAtPosition2D, 0);
3498+ scriptEngine->registerFunction(hmdInterface, "getHUDLookAtPosition3D", HMDScriptingInterface::getHUDLookAtPosition3D, 0);
3499+
34953500 #ifdef HAVE_RTMIDI
34963501 scriptEngine->registerGlobalObject("MIDI", &MIDIManager::getInstance());
34973502 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t