mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-10 23:38:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

ensured master does not care about scene orientation (to make navigation on master easier )

Browse Source
This commit is contained in:
Joakim Kilby
2015-02-19 17:34:13 +01:00
parent 9bad48ae2e
commit e35736bd4d
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main.cpp
View File

@@ -162,10 +162,18 @@ void mainPostSyncPreDrawFunc()
void mainRenderFunc()
{
//not the most efficient, but for clarity @JK
glm::mat4 userMatrix = glm::translate(glm::mat4(1.f), _sgctEngine->getUserPtr()->getPos());
glm::mat4 sceneMatrix = _sgctEngine->getModelMatrix();
glm::mat4 viewMatrix = _sgctEngine->getActiveViewMatrix() * userMatrix;
//dont shift nav-direction on master, makes it very tricky to navigate @JK
if (!_sgctEngine->isMaster()){
viewMatrix = viewMatrix * sceneMatrix;
}
glm::mat4 projectionMatrix = _sgctEngine->getActiveProjectionMatrix();
OsEng.render(projectionMatrix, viewMatrix);
OsEng.render(projectionMatrix, viewMatrix);
}
void mainPostDrawFunc()

2
src/rendering/renderengine.cpp
View File

@@ -386,7 +386,7 @@ namespace openspace {
_mainCamera->setProjectionMatrix(
projectionMatrix);
//Is this really necessary to store?
//Is this really necessary to store? @JK
_mainCamera->setViewProjectionMatrix(projectionMatrix * viewMatrix);
// render the scene starting from the root node