mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-18 17:59:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into release/ips

Browse Source
This commit is contained in:
Alexander Bock
2016-06-16 13:51:34 +02:00
parent 1c75e1da3a 6f05594440
commit 3fe802ae1f
13 changed files with 123 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/engine/wrapper/sgctwindowwrapper.cpp
View File

@@ -123,7 +123,11 @@ glm::mat4 SGCTWindowWrapper::modelMatrix() const {
void SGCTWindowWrapper::setNearFarClippingPlane(float nearPlane, float farPlane) {
sgct::Engine::instance()->setNearAndFarClippingPlanes(nearPlane, farPlane);
}
void SGCTWindowWrapper::setEyeSeparationDistance(float distance) {
sgct::Engine::instance()->setEyeSeparation(distance);
}
glm::ivec4 SGCTWindowWrapper::viewportPixelCoordinates() const {
int x1, xSize, y1, ySize;
sgct::Engine::instance()->getCurrentWindowPtr()->getCurrentViewportPixelCoords(x1,