mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-15 18:19:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor abuffer and add msaa support. volumes temporarily disabled.

Browse Source
This commit is contained in:
Emil Axelsson
2016-02-02 11:30:27 +01:00
parent 4f7ab5321f
commit d4ff8119d1
79 changed files with 2354 additions and 3106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/util/camera.cpp
View File

@@ -38,6 +38,7 @@ Camera::Camera()
, _modelMatrix()
, _viewMatrix()
, _projectionMatrix()
, _dirtyViewProjectionMatrix(true)
, _viewDirection(0,0,-1)
, _cameraDirection(0.f, 0.f, 0.f)
, _focusPosition()
@@ -85,6 +86,7 @@ const glm::mat4& Camera::modelMatrix() const{
void Camera::setViewMatrix(glm::mat4 viewMatrix){
std::lock_guard<std::mutex> _lock(_mutex);
_viewMatrix = std::move(viewMatrix);
_dirtyViewProjectionMatrix = true;
}
const glm::mat4& Camera::viewMatrix() const{
@@ -94,20 +96,19 @@ const glm::mat4& Camera::viewMatrix() const{
void Camera::setProjectionMatrix(glm::mat4 projectionMatrix){
std::lock_guard<std::mutex> _lock(_mutex);
_projectionMatrix = std::move(projectionMatrix);
_dirtyViewProjectionMatrix = true;
}
const glm::mat4& Camera::projectionMatrix() const{
return _projectionMatrix;
}
void Camera::setViewProjectionMatrix(glm::mat4 viewProjectionMatrix)
{
std::lock_guard<std::mutex> _lock(_mutex);
_viewProjectionMatrix = std::move(viewProjectionMatrix);
}
const glm::mat4& Camera::viewProjectionMatrix() const
{
const glm::mat4& Camera::viewProjectionMatrix() const {
if (_dirtyViewProjectionMatrix) {
std::lock_guard<std::mutex> _lock(_mutex);
_viewProjectionMatrix = _projectionMatrix * _viewMatrix;
_dirtyViewProjectionMatrix = false;
}
return _viewProjectionMatrix;
}