Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2024-11-26 07:35:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Crosshair optimization:

Browse source 
-create crosshairs only once in Init() instead of created them at every cycle
-use matrix scale to apply the aspect ratio
This commit is contained in:
CapitaineSheridan 2023-04-05 15:03:32 +02:00 committed by trzy
parent 6993dfcfb0
commit 813edb8218
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Src/OSD/SDL/Crosshair.cpp
View file

@ -84,6 +84,8 @@ bool CCrosshair::Init()
m_uvCoord.emplace_back(1.0f, 1.0f); m_uvCoord.emplace_back(1.0f, 1.0f);
m_uvCoord.emplace_back(0.0f, 1.0f); m_uvCoord.emplace_back(0.0f, 1.0f);
BuildCrosshairVertices();
m_vertexShader = R"glsl( m_vertexShader = R"glsl(
#version 410 core #version 410 core
@ -149,40 +151,38 @@ bool CCrosshair::Init()
return OKAY; return OKAY;
} }
void CCrosshair::BuildCrosshairVertices(unsigned int xRes, unsigned int yRes) void CCrosshair::BuildCrosshairVertices()
{ {
float aspect = (float)xRes / (float)yRes;
m_verts.clear(); m_verts.clear();
if (!m_isBitmapCrosshair) if (!m_isBitmapCrosshair)
{ {
m_verts.emplace_back(0.0f, m_dist); // bottom triangle m_verts.emplace_back(0.0f, m_dist); // bottom triangle
m_verts.emplace_back(m_base / 2.0f, (m_dist + m_height) * aspect); m_verts.emplace_back(m_base / 2.0f, (m_dist + m_height));
m_verts.emplace_back(-m_base / 2.0f, (m_dist + m_height) * aspect); m_verts.emplace_back(-m_base / 2.0f, (m_dist + m_height));
m_verts.emplace_back(0.0f, -m_dist); // top triangle m_verts.emplace_back(0.0f, -m_dist); // top triangle
m_verts.emplace_back(-m_base / 2.0f, -(m_dist + m_height) * aspect); m_verts.emplace_back(-m_base / 2.0f, -(m_dist + m_height));
m_verts.emplace_back(m_base / 2.0f, -(m_dist + m_height) * aspect); m_verts.emplace_back(m_base / 2.0f, -(m_dist + m_height));
m_verts.emplace_back(-m_dist, 0.0f); // left triangle m_verts.emplace_back(-m_dist, 0.0f); // left triangle
m_verts.emplace_back(-m_dist - m_height, (m_base / 2.0f) * aspect); m_verts.emplace_back(-m_dist - m_height, (m_base / 2.0f));
m_verts.emplace_back(-m_dist - m_height, -(m_base / 2.0f) * aspect); m_verts.emplace_back(-m_dist - m_height, -(m_base / 2.0f));
m_verts.emplace_back(m_dist, 0.0f); // right triangle m_verts.emplace_back(m_dist, 0.0f); // right triangle
m_verts.emplace_back(m_dist + m_height, -(m_base / 2.0f) * aspect); m_verts.emplace_back(m_dist + m_height, -(m_base / 2.0f));
m_verts.emplace_back(m_dist + m_height, (m_base / 2.0f) * aspect); m_verts.emplace_back(m_dist + m_height, (m_base / 2.0f));
} }
else else
{ {
m_verts.emplace_back(-m_squareSize / 2.0f, -m_squareSize / 2.0f * aspect); m_verts.emplace_back(-m_squareSize / 2.0f, -m_squareSize / 2.0f);
m_verts.emplace_back(m_squareSize / 2.0f, -m_squareSize / 2.0f * aspect); m_verts.emplace_back(m_squareSize / 2.0f, -m_squareSize / 2.0f);
m_verts.emplace_back(m_squareSize / 2.0f, m_squareSize / 2.0f * aspect); m_verts.emplace_back(m_squareSize / 2.0f, m_squareSize / 2.0f);
m_verts.emplace_back(-m_squareSize / 2.0f, -m_squareSize / 2.0f * aspect); m_verts.emplace_back(-m_squareSize / 2.0f, -m_squareSize / 2.0f);
m_verts.emplace_back(m_squareSize / 2.0f, m_squareSize / 2.0f * aspect); m_verts.emplace_back(m_squareSize / 2.0f, m_squareSize / 2.0f);
m_verts.emplace_back(-m_squareSize / 2.0f, m_squareSize / 2.0f * aspect); m_verts.emplace_back(-m_squareSize / 2.0f, m_squareSize / 2.0f);
} }
} }
void CCrosshair::DrawCrosshair(New3D::Mat4 matrix, float x, float y, int player, unsigned int xRes, unsigned int yRes) void CCrosshair::DrawCrosshair(New3D::Mat4 matrix, float x, float y, int player, unsigned int xRes, unsigned int yRes)
{ {
BuildCrosshairVertices(xRes, yRes); float aspect = (float)xRes / (float)yRes;
float r=0.0f, g=0.0f, b=0.0f; float r=0.0f, g=0.0f, b=0.0f;
int count = (int)m_verts.size(); int count = (int)m_verts.size();
@ -210,7 +210,7 @@ void CCrosshair::DrawCrosshair(New3D::Mat4 matrix, float x, float y, int player,
break; break;
} }
matrix.Scale(m_dpiMultiplicator, m_dpiMultiplicator, 0); matrix.Scale(m_dpiMultiplicator, m_dpiMultiplicator * aspect, 0);
// update uniform memory // update uniform memory
glUniformMatrix4fv(m_shader.uniformLocMap["mvp"], 1, GL_FALSE, matrix); glUniformMatrix4fv(m_shader.uniformLocMap["mvp"], 1, GL_FALSE, matrix);
@ -228,7 +228,7 @@ void CCrosshair::DrawCrosshair(New3D::Mat4 matrix, float x, float y, int player,
m_textureCoordsCount = (int)m_uvCoord.size(); m_textureCoordsCount = (int)m_uvCoord.size();
matrix.Scale(m_dpiMultiplicator * m_scaleBitmap, m_dpiMultiplicator * m_scaleBitmap, 0); matrix.Scale(m_dpiMultiplicator * m_scaleBitmap, m_dpiMultiplicator * m_scaleBitmap * aspect, 0);
// update uniform memory // update uniform memory
glUniformMatrix4fv(m_shader.uniformLocMap["mvp"], 1, GL_FALSE, matrix); glUniformMatrix4fv(m_shader.uniformLocMap["mvp"], 1, GL_FALSE, matrix);

2
Src/OSD/SDL/Crosshair.h
View file

@ -68,7 +68,7 @@ private:
const int MaxVerts = 1024; // per draw call const int MaxVerts = 1024; // per draw call
void BuildCrosshairVertices(unsigned int xRes, unsigned int yRes); void BuildCrosshairVertices();
void DrawCrosshair(New3D::Mat4 matrix, float x, float y, int player, unsigned int xRes, unsigned int yRes); void DrawCrosshair(New3D::Mat4 matrix, float x, float y, int player, unsigned int xRes, unsigned int yRes);
void GunToViewCoords(float* x, float* y); void GunToViewCoords(float* x, float* y);