Feature/flying fixes (#924)

* Removing various warnings
 * Fix the rendering of the touchbar on Mac
 * More warnings
 * Add ghoul deinitialize
 * Update SGCT repository
This commit is contained in:
Alexander Bock
2019-07-04 09:28:42 +02:00
committed by GitHub
parent 6c98adec31
commit e9fdd31c56
20 changed files with 110 additions and 168 deletions

View File

@@ -289,7 +289,7 @@ void DashboardItemFramerate::render(glm::vec2& penPosition) {
);
int nLines = output.empty() ? 0 :
(std::count(output.begin(), output.end(), '\n') + 1);
static_cast<int>((std::count(output.begin(), output.end(), '\n') + 1));
penPosition.y -= _font->height() * static_cast<float>(nLines);