Persson-dev/Tower-Defense2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix warnings + cland-tidy

Browse Source
This commit is contained in:
Simon Pribylski
2025-07-23 19:18:25 +02:00
parent 705671148b
commit 9477099cfc
13 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/td/render/loader/WorldLoader.cpp
View File

@@ -11,7 +11,7 @@ namespace render {
namespace WorldLoader {
const static int POSITION_VERTEX_SIZE = 3;
const static int TEXTURE_VERTEX_SIZE = 2;
// const static int TEXTURE_VERTEX_SIZE = 2;
GL::VertexArray LoadWorldModel(const td::game::World* world) {
std::vector<float> positions;
@@ -173,7 +173,7 @@ GL::VertexArray LoadTileSelectModel() {
return tileSelectVao;
}
RenderData LoadTowerModel(game::TowerPtr tower) {
RenderData LoadTowerModel(const game::TowerPtr& tower) {
RenderData renderData;
float towerX, towerDX;

2
src/td/render/renderer/EntityRenderer.cpp
View File

@@ -6,7 +6,7 @@ namespace td {
namespace render {
EntityRenderer::EntityRenderer(Camera& a_Camera, const game::World& a_World) : Renderer(a_Camera), m_World(a_World) {
m_EntityVao = std::make_unique<GL::VertexArray>(std::move(WorldLoader::LoadMobModel()));
m_EntityVao = std::make_unique<GL::VertexArray>(WorldLoader::LoadMobModel());
m_Shader->Start();
m_Shader->SetColorEffect({1, 0, 1});
}

2
src/td/render/shader/ShaderProgram.cpp
View File

@@ -109,7 +109,7 @@ unsigned int ShaderProgram::LoadShader(const std::string& source, GLenum type) {
glCompileShader(shaderID);
GLint compilesuccessful;
glGetShaderiv(shaderID, GL_COMPILE_STATUS, &compilesuccessful);
if (compilesuccessful == false) {
if (!compilesuccessful) {
GLsizei size;
glGetShaderiv(shaderID, GL_INFO_LOG_LENGTH, &size);
std::vector<char> shaderError(static_cast<std::size_t>(size));