Showing the changes to interface/src/scripting/ControllerScriptingInterface.cpp (1 of 1 file). Show all
Unified · Split
| @@ -377,7 +377,7 @@ void ControllerScriptingInterface::releaseJoystick(int joystickIndex) { · 376 unmodified lines | |||
| 377 | } | 377 | } |
| 378 | 378 | ||
| 379 | glm::vec2 ControllerScriptingInterface::getViewportDimensions() const { | 379 | glm::vec2 ControllerScriptingInterface::getViewportDimensions() const { |
| 380 | return Application::getInstance()->getCanvasSize(); | 380 | return Application::getInstance()->getUiSize(); |
| 381 | } | 381 | } |
| 382 | 382 | ||
| 383 | AbstractInputController* ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) { | 383 | AbstractInputController* ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) { |
| @@ -507,4 +507,4 @@ const unsigned int INPUTCONTROLLER_KEY_DEVICE_MASK = 16; · 123 unmodified lines | |||
| 507 | 507 | ||
| 508 | InputController::Key InputController::getKey() const { | 508 | InputController::Key InputController::getKey() const { |
| 509 | return (((_deviceTrackerId & INPUTCONTROLLER_KEY_DEVICE_MASK) << INPUTCONTROLLER_KEY_DEVICE_OFFSET) | _subTrackerId); | 509 | return (((_deviceTrackerId & INPUTCONTROLLER_KEY_DEVICE_MASK) << INPUTCONTROLLER_KEY_DEVICE_OFFSET) | _subTrackerId); |
| 510 | } | 510 | } |