Merge branch 'develop' into release/ips

This commit is contained in:
Alexander Bock
2016-06-16 13:51:34 +02:00
13 changed files with 123 additions and 7 deletions

View File

@@ -81,6 +81,8 @@ glm::mat4 WindowWrapper::modelMatrix() const {
}
void WindowWrapper::setNearFarClippingPlane(float near, float far) {}
void WindowWrapper::setEyeSeparationDistance(float distance) {}
glm::ivec4 WindowWrapper::viewportPixelCoordinates() const {
return glm::ivec4(