diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2016-02-21 01:22:29 +0300 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2016-02-21 01:22:29 +0300 |
commit | 12bb5bdabf51eca1cc8fd236df2c4606b5e963aa (patch) | |
tree | b866a273482f473e88c9589dd4b8e5257d0abae6 /source/gameengine/Ketsji/KX_Dome.cpp | |
parent | e1963ddc30476e4f9a833b0ab1f90ef6ce895d9b (diff) | |
parent | 4e95807db3e17c647001ba4112371217d0d2506b (diff) |
Merge remote-tracking branch 'origin/master' into decklink
Conflicts:
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
Diffstat (limited to 'source/gameengine/Ketsji/KX_Dome.cpp')
-rw-r--r-- | source/gameengine/Ketsji/KX_Dome.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/source/gameengine/Ketsji/KX_Dome.cpp b/source/gameengine/Ketsji/KX_Dome.cpp index 8d078eb46b3..d08372e47d4 100644 --- a/source/gameengine/Ketsji/KX_Dome.cpp +++ b/source/gameengine/Ketsji/KX_Dome.cpp @@ -1450,22 +1450,21 @@ void KX_Dome::CalculateFrustum(KX_Camera *cam) gluPerspective(90.0f,1.0f,cam->GetCameraNear(),cam->GetCameraFar()); #endif - RAS_FrameFrustum m_frustrum; //90 deg. Frustum + RAS_FrameFrustum m_frustum; //90 deg. Frustum - m_frustrum.camnear = cam->GetCameraNear(); - m_frustrum.camfar = cam->GetCameraFar(); + m_frustum.camnear = cam->GetCameraNear(); + m_frustum.camfar = cam->GetCameraFar(); -// float top = tan(90.0f*MT_PI/360.0f) * m_frustrum.camnear; - float top = m_frustrum.camnear; // for deg = 90deg, tan = 1 +// float top = tan(90.0f*MT_PI/360.0f) * m_frustum.camnear; + float top = m_frustum.camnear; // for deg = 90deg, tan = 1 - m_frustrum.x1 = -top; - m_frustrum.x2 = top; - m_frustrum.y1 = -top; - m_frustrum.y2 = top; + m_frustum.x1 = -top; + m_frustum.x2 = top; + m_frustum.y1 = -top; + m_frustum.y2 = top; m_projmat = m_rasterizer->GetFrustumMatrix( - m_frustrum.x1, m_frustrum.x2, m_frustrum.y1, m_frustrum.y2, m_frustrum.camnear, m_frustrum.camfar); - + m_frustum.x1, m_frustum.x2, m_frustum.y1, m_frustum.y2, m_frustum.camnear, m_frustum.camfar); } void KX_Dome::CalculateCameraOrientation() |