edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

use 4*4 array instead of declearing a full matrix class

Browse source
This commit is contained in:
Jupeyy 2017-09-14 19:47:04 +02:00
parent f48e186bfd
commit f2820ea392
1 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/engine/client/backend_sdl.cpp
View file

@ -552,29 +552,15 @@ void CCommandProcessorFragment_OpenGL3_3::SetState(const CCommandBuffer::SState
} }
// screen mapping // screen mapping
//ortho matrix... we only need this projection... just made all structs here.. //orthographic projection matrix
struct vec4{
vec4() {} float m[4*4] = {
vec4(float a, float b, float c, float d) : x(a), y(b), z(c), w(d) {} 2.f/(State.m_ScreenBR.x - State.m_ScreenTL.x), 0, 0, -((State.m_ScreenBR.x + State.m_ScreenTL.x)/(State.m_ScreenBR.x - State.m_ScreenTL.x)),
vec4(vec4& v) : x(v.x), y(v.y), z(v.z), w(v.w) {} 0, (2.f/(State.m_ScreenTL.y - State.m_ScreenBR.y)), 0, -((State.m_ScreenTL.y + State.m_ScreenBR.y)/(State.m_ScreenTL.y - State.m_ScreenBR.y)),
float x; 0, 0, -(2.f/(9.f)), -((11.f)/(9.f)),
float y; 0, 0, 0, 1.0f
float z;
float w;
}; };
struct mat4{
mat4(vec4& r1, vec4& r2, vec4& r3, vec4& r4) { r[0] = r1; r[1] = r2; r[2] = r3; r[3] = r4; }
vec4 r[4];
};
vec4 r1( (2.f/(State.m_ScreenBR.x - State.m_ScreenTL.x)), 0, 0, -((State.m_ScreenBR.x + State.m_ScreenTL.x)/(State.m_ScreenBR.x - State.m_ScreenTL.x)));
vec4 r2( 0, (2.f/(State.m_ScreenTL.y - State.m_ScreenBR.y)), 0, -((State.m_ScreenTL.y + State.m_ScreenBR.y)/(State.m_ScreenTL.y - State.m_ScreenBR.y)));
vec4 r3( 0, 0, -(2.f/(9.f)), -((11.f)/(9.f)));
vec4 r4( 0, 0, 0, 1.0f);
mat4 m(r1,r2,r3,r4);
//transpose bcs of column-major order of opengl //transpose bcs of column-major order of opengl
glUniformMatrix4fv(pProgram->m_LocPos, 1, true, (float*)&m); glUniformMatrix4fv(pProgram->m_LocPos, 1, true, (float*)&m);
} }