History

Moved GLCanvas in DM and DM to QSharedPointers

Atlante45 committed 11 years ago

Commit e5e2eb41 parent 68430e124 files · +143 −146Browse files

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

Unified · Split

interface/src/scripting/ControllerScriptingInterface.cpp+3−3
@@ -267,9 +267,9 @@ void ControllerScriptingInterface::releaseJoystick(int joystickIndex) { · 266 unmodified lines
267 }267 }
268}268}
269 269
270glm::vec2 ControllerScriptingInterface::getViewportDimensions() const { 270glm::vec2 ControllerScriptingInterface::getViewportDimensions() const {
271 GLCanvas* widget = Application::getInstance()->getGLWidget();271 QSharedPointer<GLCanvas> glCanvas = DependencyManager::get<GLCanvas>();
272 return glm::vec2(widget->width(), widget->height()); 272 return glm::vec2(glCanvas->width(), glCanvas->height());
273}273}
274 274
275AbstractInputController* ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) {275AbstractInputController* ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) {