History

switch GLCanvas back to being owned by Application

ZappoMan committed 11 years ago

Commit a89691f1 parent e66f12f17 files · +93 −87Browse files

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

Unified · Split

interface/src/scripting/ControllerScriptingInterface.cpp+2−1
@@ -15,6 +15,7 @@ · 14 unmodified lines
15#include <HandData.h>15#include <HandData.h>
16#include <HFBackEvent.h>16#include <HFBackEvent.h>
17 17
18#include "Application.h"
18#include "devices/MotionTracker.h"19#include "devices/MotionTracker.h"
19#include "devices/SixenseManager.h"20#include "devices/SixenseManager.h"
20#include "ControllerScriptingInterface.h"21#include "ControllerScriptingInterface.h"
@@ -285,7 +286,7 @@ void ControllerScriptingInterface::releaseJoystick(int joystickIndex) { · 264 unmodified lines
285}286}
286 287
287glm::vec2 ControllerScriptingInterface::getViewportDimensions() const {288glm::vec2 ControllerScriptingInterface::getViewportDimensions() const {
288 auto glCanvas = DependencyManager::get<GLCanvas>();289 auto glCanvas = Application::getInstance()->getGLWidget();
289 return glm::vec2(glCanvas->width(), glCanvas->height());290 return glm::vec2(glCanvas->width(), glCanvas->height());
290}291}
291 292