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

moved Mat4 definition

Browse Source
This commit is contained in:
Simon Pribylski
2023-06-03 19:40:50 +02:00
parent f2fcc348d7
commit 0365902971
9 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/render/shaders/EntityShader.h
View File

@@ -19,8 +19,8 @@ public:
void LoadShader();
void SetColorEffect(const Vec3f& color);
void SetProjectionMatrix(const maths::Mat4f& proj) const;
void SetViewMatrix(const maths::Mat4f& view) const;
void SetProjectionMatrix(const Mat4f& proj) const;
void SetViewMatrix(const Mat4f& view) const;
void SetModelPos(const Vec3f& pos) const;
};

3
include/render/shaders/ShaderProgram.h
View File

@@ -3,7 +3,6 @@
#include <string>
#include "Defines.h"
#include "render/GL.h"
#include "misc/Maths.h"
namespace td {
namespace shader {
@@ -28,7 +27,7 @@ protected:
void LoadVector(unsigned int location, const Vec2f& vector) const;
void LoadVector(unsigned int location, const Vec3f& vector) const;
void LoadBoolean(unsigned int location, bool value) const;
void LoadMat4(unsigned int location, const maths::Mat4f& mat) const;
void LoadMat4(unsigned int location, const Mat4f& mat) const;
void CleanUp() const;
private:

4
include/render/shaders/WorldShader.h
View File

@@ -14,8 +14,8 @@ public:
WorldShader();
void LoadShader();
void SetProjectionMatrix(const maths::Mat4f& proj) const;
void SetViewMatrix(const maths::Mat4f& view) const;
void SetProjectionMatrix(const Mat4f& proj) const;
void SetViewMatrix(const Mat4f& view) const;
};
} // namespace shader