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

remove glm dependency

Browse Source
This commit is contained in:
Simon Pribylski
2022-10-13 12:24:15 +02:00
parent bba9ef8219
commit 6e0923ac75
20 changed files with 110 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,10 +19,10 @@ public:
EntityShader();
void LoadShader();
void SetCamPos(const glm::vec2& camPos);
void SetCamPos(const Vec2f& camPos);
void SetZoom(float zoom);
void SetAspectRatio(float aspectRatio);
void SetModelPos(const glm::vec2& modelPos);
void SetModelPos(const Vec2f& modelPos);
void SetIsometricView(float isometric);
};

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

@@ -1,7 +1,7 @@
#pragma once
#include <string>
#include <glm/glm.hpp>
#include "Defines.h"
#include "render/GL.h"
namespace td {
@@ -24,11 +24,9 @@ protected:
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 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 LoadMatrix(unsigned int location, const glm::mat4& matrix) const;
void CleanUp() const;
private:

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

@@ -13,7 +13,7 @@ protected:
public:
WorldShader();
void LoadShader();
void SetCamPos(const glm::vec2& camPos);
void SetCamPos(const Vec2f& camPos);
void SetZoom(float zoom);
void SetAspectRatio(float aspectRatio);
void SetIsometricView(float isometric);