mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-29 07:30:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'plutoViz' of openspace.itn.liu.se:/openspace into plutoViz

Browse Source
This commit is contained in:
Alexander Bock
2015-02-19 16:24:01 +01:00
parent f00158969c 4487bc3500
commit 9bad48ae2e
7 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/engine/openspaceengine.cpp
View File

@@ -568,8 +568,8 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
}
}
void OpenSpaceEngine::render() {
_renderEngine->render();
void OpenSpaceEngine::render(const glm::mat4 &projectionMatrix, const glm::mat4 &viewMatrix) {
_renderEngine->render(projectionMatrix, viewMatrix);
if (sgct::Engine::instance()->isMaster()) {
// If currently writing a command, render it to screen
@@ -577,7 +577,7 @@ void OpenSpaceEngine::render() {
if (sgct::Engine::instance()->isMaster() && !w->isUsingFisheyeRendering() && _console->isVisible()) {
_console->render();
}
if (_gui->isEnabled())
_gui->endFrame();
}