History

switch to QRect instead of vec4

Brad Hefta-Gaub committed 10 years ago

Commit 8f3d4811 parent 6b5fd1e12 files · +39 −37Browse files

Showing the changes to interface/src/scripting/ControllerScriptingInterface.cpp (1 of 12 files). Show all

Unified · Split

interface/src/scripting/ControllerScriptingInterface.cpp+1−1
@@ -82,7 +82,7 @@ glm::vec2 ControllerScriptingInterface::getViewportDimensions() const { · 81 unmodified lines
82 82
83QVariant ControllerScriptingInterface::getRecommendedOverlayRect() const {83QVariant ControllerScriptingInterface::getRecommendedOverlayRect() const {
84 auto rect = qApp->getRecommendedOverlayRect();84 auto rect = qApp->getRecommendedOverlayRect();
85 return vec4toVariant(vec4(rect.x, rect.y, rect.z, rect.w));85 return qRectToVariant(rect);
86}86}
87 87
88controller::InputController* ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) {88controller::InputController* ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) {