gptbot/0ad
1
0
Fork 0
forked from mirrors/0ad
Code Pull Requests Activity

Adds a perspective matrix, refracts a matrix projection setup to prepare for an isometric view.

Browse Source 
Reviewed By: wraitii
Differential Revision: https://code.wildfiregames.com/D971
This was SVN commit r20377.
This commit is contained in:
vladislavbelov
2017-10-29 23:41:59 +00:00
parent cd1b40f295
commit 38d09ce35c
3 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/Camera.cpp
+8 -16
View File
@@ -54,27 +54,19 @@ void CCamera::SetProjection(float nearp, float farp, float fov)
m_FarPlane = farp;
m_FOV = fov;
float aspect = (float)m_ViewPort.m_Width/(float)m_ViewPort.m_Height;
float f = 1.0f/tanf(m_FOV/2);
m_ProjMat.SetZero ();
m_ProjMat._11 = f/aspect;
m_ProjMat._22 = f;
m_ProjMat._33 = -(m_FarPlane+m_NearPlane)/(m_NearPlane-m_FarPlane);
m_ProjMat._34 = 2*m_FarPlane*m_NearPlane/(m_NearPlane-m_FarPlane);
m_ProjMat._43 = 1.0f;
const float aspect = static_cast<float>(m_ViewPort.m_Width) / static_cast<float>(m_ViewPort.m_Height);
m_ProjMat.SetPerspective(m_FOV, aspect, m_NearPlane, m_FarPlane);
}
void CCamera::SetProjectionTile(int tiles, int tile_x, int tile_y)
{
const float aspect = static_cast<float>(m_ViewPort.m_Width) / static_cast<float>(m_ViewPort.m_Height);
const float f = 1.f / tanf(m_FOV / 2.f);
float aspect = (float)m_ViewPort.m_Width/(float)m_ViewPort.m_Height;
float f = 1.0f/tanf(m_FOV/2);
m_ProjMat._11 = tiles*f/aspect;
m_ProjMat._22 = tiles*f;
m_ProjMat._13 = -(1-tiles + 2*tile_x);
m_ProjMat._23 = -(1-tiles + 2*tile_y);
m_ProjMat._11 = tiles * f / aspect;
m_ProjMat._22 = tiles * f;
m_ProjMat._13 = -(1 - tiles + 2 * tile_x);
m_ProjMat._23 = -(1 - tiles + 2 * tile_y);
}
//Updates the frustum planes. Should be called