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

BIG REFACTOR Part 2

Browse Source
This commit is contained in:
Simon Pribylski
2022-02-16 18:34:49 +01:00
parent bdebabb79e
commit 97a33e5517
11 changed files with 98 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/render/loader/GLLoader.h
View File

@@ -17,8 +17,9 @@
namespace GL {
struct VertexAttribPointer {
unsigned int m_Index, m_Size;
int m_Offset;
unsigned int m_Index;
unsigned int m_Size;
unsigned int m_Offset;
};
class VertexBuffer {

4
include/render/loader/TextureLoader.h
View File

@@ -9,7 +9,9 @@
#define RENDER_LOADER_TEXTURELOADER_H_
namespace TextureLoader {
const unsigned int loadGLTexture(const char* fileName);
unsigned int loadGLTexture(const char* fileName);
}

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

@@ -23,22 +23,24 @@ public:
protected:
virtual void getAllUniformLocation() = 0;
int getUniformLocation(const std::string& uniformName)const;
void loadFloat(const int location, const float value)const;
void loadInt(const int& location, const int& value)const;
void loadVector(const int& location, const glm::vec2& vector)const;
void loadVector(const int& location, const glm::vec3& vector)const;
void loadVector(const int& location, const glm::vec4& vector)const;
void loadBoolean(const int& location, const bool& value)const;
void loadMatrix(const int& location, const glm::mat4& matrix);
int getUniformLocation(const std::string& uniformName) const;
void loadFloat(unsigned int location, float value) const;
void loadInt(unsigned int location, int value) const;
void loadVector(unsigned int location, const glm::vec2& vector) const;
void loadVector(unsigned int location, const glm::vec3& vector) const;
void loadVector(unsigned int location, const glm::vec4& vector) const;
void loadBoolean(unsigned int location, bool value) const;
void loadMatrix(unsigned int location, const glm::mat4& matrix) const;
void cleanUp() const;
private:
unsigned int programID;
unsigned int vertexShaderID;
unsigned int fragmentShaderID;
int loadShaderFromFile(const std::string& file, GLenum type);
int loadShader(const std::string& source, GLenum type);
unsigned int m_ProgramID;
unsigned int m_VertexShaderID;
unsigned int m_FragmentShaderID;
unsigned int loadShaderFromFile(const std::string& file, GLenum type);
unsigned int loadShader(const std::string& source, GLenum type);
};
#endif /* RENDER_SHADERS_SHADERPROGRAM_H_ */