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

shaders to 3d

Browse Source
This commit is contained in:
Simon Pribylski
2023-06-03 16:35:17 +02:00
parent ca268781fd
commit 4e866c1032
5 changed files with 65 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,13 +6,10 @@ namespace td {
namespace shader { namespace shader {
class EntityShader : public ShaderProgram { class EntityShader : public ShaderProgram {
private: private:
unsigned int m_LocationCam = 0; unsigned int m_LocationProjectionMatrix = 0;
unsigned int m_LocationZoom = 0; unsigned int m_LocationViewMatrix = 0;
unsigned int m_LocationAspectRatio = 0; unsigned int m_LocationPosition = 0;
unsigned int m_LocationTranslation = 0;
unsigned int m_LocationViewtype = 0;
unsigned int m_LocationColorEffect = 0; unsigned int m_LocationColorEffect = 0;
protected: protected:
virtual void GetAllUniformLocation(); virtual void GetAllUniformLocation();
@@ -20,12 +17,11 @@ public:
EntityShader(); EntityShader();
void LoadShader(); void LoadShader();
void SetCamPos(const Vec2f& camPos);
void SetZoom(float zoom);
void SetAspectRatio(float aspectRatio);
void SetModelPos(const Vec2f& modelPos);
void SetIsometricView(float isometric);
void SetColorEffect(const Vec3f& color); void SetColorEffect(const Vec3f& color);
void SetProjectionMatrix(const maths::Mat4f& proj) const;
void SetViewMatrix(const maths::Mat4f& view) const;
void SetModelPos(const Vec2f& pos) const;
}; };
} // namespace shader } // namespace shader

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

@@ -7,16 +7,15 @@ namespace shader {
class WorldShader : public ShaderProgram { class WorldShader : public ShaderProgram {
private: private:
unsigned int m_LocationCam = 0, m_LocationZoom = 0, m_LocationAspectRatio = 0, m_LocationViewtype = 0; unsigned int m_LocationProjection = 0, m_LocationView = 0;
protected: protected:
void GetAllUniformLocation(); void GetAllUniformLocation();
public: public:
WorldShader(); WorldShader();
void LoadShader(); void LoadShader();
void SetCamPos(const Vec2f& camPos);
void SetZoom(float zoom); void SetProjectionMatrix(const maths::Mat4f& proj) const;
void SetAspectRatio(float aspectRatio); void SetViewMatrix(const maths::Mat4f& view) const;
void SetIsometricView(float isometric);
}; };
} // namespace shader } // namespace shader

20
src/render/Renderer.cpp
View File

@@ -23,11 +23,11 @@ Renderer::~Renderer() {
} }
void Renderer::UpdateIsometricView() { void Renderer::UpdateIsometricView() {
float isometricEased = utils::EaseInOutExpo(m_IsometricShade); //float isometricEased = utils::EaseInOutExpo(m_IsometricShade);
m_WorldShader->Start(); m_WorldShader->Start();
m_WorldShader->SetIsometricView(isometricEased); //m_WorldShader->SetIsometricView(isometricEased);
m_EntityShader->Start(); m_EntityShader->Start();
m_EntityShader->SetIsometricView(isometricEased); //m_EntityShader->SetIsometricView(isometricEased);
} }
void Renderer::InitShaders() { void Renderer::InitShaders() {
@@ -69,7 +69,7 @@ void Renderer::RenderVAO(const GL::VertexArray& vao) {
void Renderer::RenderModel(const Model& model) { void Renderer::RenderModel(const Model& model) {
m_EntityShader->Start(); m_EntityShader->Start();
m_EntityShader->SetModelPos(model.positon); //m_EntityShader->SetModelPos(model.positon);
m_EntityShader->SetColorEffect(model.color); m_EntityShader->SetColorEffect(model.color);
model.vao->Bind(); model.vao->Bind();
glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(model.vao->GetVertexCount())); glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(model.vao->GetVertexCount()));
@@ -100,17 +100,17 @@ void Renderer::Prepare() {
void Renderer::Resize(int width, int height) { void Renderer::Resize(int width, int height) {
m_WorldShader->Start(); m_WorldShader->Start();
m_WorldShader->SetAspectRatio(static_cast<float>(width) / height); //m_WorldShader->SetAspectRatio(static_cast<float>(width) / height);
m_EntityShader->Start(); m_EntityShader->Start();
m_EntityShader->SetAspectRatio(static_cast<float>(width) / height); //m_EntityShader->SetAspectRatio(static_cast<float>(width) / height);
glViewport(0, 0, width, height); glViewport(0, 0, width, height);
} }
void Renderer::SetZoom(float zoom) { void Renderer::SetZoom(float zoom) {
m_WorldShader->Start(); m_WorldShader->Start();
m_WorldShader->SetZoom(zoom); //m_WorldShader->SetZoom(zoom);
m_EntityShader->Start(); m_EntityShader->Start();
m_EntityShader->SetZoom(zoom); //m_EntityShader->SetZoom(zoom);
} }
void Renderer::SetCamMovement(const Vec2f& mov) { void Renderer::SetCamMovement(const Vec2f& mov) {
@@ -122,9 +122,9 @@ void Renderer::SetCamMovement(const Vec2f& mov) {
void Renderer::SetCamPos(const Vec2f& newPos) { void Renderer::SetCamPos(const Vec2f& newPos) {
m_CamPos = newPos; m_CamPos = newPos;
m_WorldShader->Start(); m_WorldShader->Start();
m_WorldShader->SetCamPos(newPos); //m_WorldShader->SetCamPos(newPos);
m_EntityShader->Start(); m_EntityShader->Start();
m_EntityShader->SetCamPos(newPos); //m_EntityShader->SetCamPos(newPos);
} }
void Renderer::SetIsometricView(bool isometric) { void Renderer::SetIsometricView(bool isometric) {

67
src/render/shaders/EntityShader.cpp
View File

@@ -9,24 +9,18 @@ R"(#version 300 es
precision mediump float; precision mediump float;
layout(location = 0) in vec2 position; layout(location = 0) in vec3 position;
layout(location = 1) in int color; layout(location = 1) in int color;
uniform vec2 camPos; uniform mat4 viewMatrix;
uniform float zoom; uniform mat4 projectionMatrix;
uniform float aspectRatio; uniform vec3 modelPosition;
uniform vec2 translation;
uniform float isometricView;
flat out int pass_color; flat out int pass_color;
void main(void){ void main(void){
float modelX = position.x + translation.x;
float modelY = position.y + translation.y;
float x = (modelX - camPos.x - (modelY - camPos.y) * isometricView) / aspectRatio * zoom;
float y = ((0.5 * (modelX - camPos.x) + 0.5 * (modelY - camPos.y)) * isometricView + (modelY - camPos.y) * (1.0 - isometricView)) * zoom;
pass_color = color; pass_color = color;
gl_Position = vec4(x, -y, 0.0, 1.0); gl_Position = projectionMatrix * viewMatrix * vec4(position + modelPosition, 1.0);
} }
)"; )";
@@ -56,24 +50,18 @@ void main(void){
static const char vertexSource[] = R"( static const char vertexSource[] = R"(
#version 330 #version 330
layout(location = 0) in vec2 position; layout(location = 0) in vec3 position;
layout(location = 1) in int color; layout(location = 1) in int color;
uniform vec2 camPos; uniform mat4 viewMatrix;
uniform float zoom; uniform mat4 projectionMatrix;
uniform float aspectRatio; uniform vec3 modelPosition;
uniform vec2 translation;
uniform float isometricView;
flat out int pass_color; flat out int pass_color;
void main(void){ void main(void){
float modelX = position.x + translation.x;
float modelY = position.y + translation.y;
float x = (modelX - camPos.x - (modelY - camPos.y) * isometricView) / aspectRatio * zoom;
float y = ((0.5 * (modelX - camPos.x) + 0.5 * (modelY - camPos.y)) * isometricView + (modelY - camPos.y) * (1.0 - isometricView)) * zoom;
pass_color = color; pass_color = color;
gl_Position = vec4(x, -y, 0.0, 1.0); gl_Position = projectionMatrix * viewMatrix * vec4(position + modelPosition, 1.0);
} }
)"; )";
@@ -106,32 +94,27 @@ void EntityShader::LoadShader() {
} }
void EntityShader::GetAllUniformLocation() { void EntityShader::GetAllUniformLocation() {
m_LocationAspectRatio = static_cast<unsigned int>(GetUniformLocation("aspectRatio"));
m_LocationZoom = static_cast<unsigned int>(GetUniformLocation("zoom"));
m_LocationCam = static_cast<unsigned int>(GetUniformLocation("camPos"));
m_LocationTranslation = static_cast<unsigned int>(GetUniformLocation("translation"));
m_LocationViewtype = static_cast<unsigned int>(GetUniformLocation("isometricView"));
m_LocationColorEffect = static_cast<unsigned int>(GetUniformLocation("ColorEffect")); m_LocationColorEffect = static_cast<unsigned int>(GetUniformLocation("ColorEffect"));
m_LocationViewMatrix = static_cast<unsigned int>(GetUniformLocation("viewMatrix"));
m_LocationPosition = static_cast<unsigned int>(GetUniformLocation("modelPosition"));
m_LocationProjectionMatrix = static_cast<unsigned int>(GetUniformLocation("projectionMatrix"));
} }
void EntityShader::SetCamPos(const Vec2f& camPos) {
LoadVector(m_LocationCam, camPos);
}
void EntityShader::SetZoom(float zoom) {
LoadFloat(m_LocationZoom, zoom);
}
void EntityShader::SetAspectRatio(float aspectRatio) {
LoadFloat(m_LocationAspectRatio, aspectRatio);
}
void EntityShader::SetModelPos(const Vec2f& modelPos) {
LoadVector(m_LocationTranslation, modelPos);
}
void EntityShader::SetIsometricView(float isometric) {
LoadFloat(m_LocationViewtype, isometric);
}
void EntityShader::SetColorEffect(const Vec3f& color) { void EntityShader::SetColorEffect(const Vec3f& color) {
LoadVector(m_LocationColorEffect, color); LoadVector(m_LocationColorEffect, color);
} }
void EntityShader::SetProjectionMatrix(const maths::Mat4f& proj) const {
LoadMat4(m_LocationProjectionMatrix, proj);
}
void EntityShader::SetViewMatrix(const maths::Mat4f& view) const {
LoadMat4(m_LocationViewMatrix, view);
}
void EntityShader::SetModelPos(const Vec2f& pos) const {
LoadVector(m_LocationPosition, pos);
}
} // namespace shader } // namespace shader
} // namespace td } // namespace td

51
src/render/shaders/WorldShader.cpp
View File

@@ -3,27 +3,25 @@
namespace td { namespace td {
namespace shader { namespace shader {
// TODO: GLES Shaders
#ifdef __ANDROID__ #ifdef __ANDROID__
static const char vertexSource[] = static const char vertexSource[] =
R"(#version 300 es R"(#version 300 es
precision mediump float; precision mediump float;
layout(location = 0) in vec2 position; layout(location = 0) in vec3 position;
layout(location = 1) in int color; layout(location = 1) in int color;
uniform vec2 camPos; uniform mat4 viewMatrix;
uniform float zoom; uniform mat4 projectionMatrix;
uniform float aspectRatio;
uniform float isometricView;
flat out int pass_color; flat out int pass_color;
void main(void){ void main(void){
float x = (position.x - camPos.x - (position.y - camPos.y) * isometricView) / aspectRatio * zoom; pass_color = color;
float y = ((0.5 * (position.x - camPos.x) + 0.5 * (position.y - camPos.y)) * isometricView + (position.y - camPos.y) * (1.0 - isometricView)) * zoom; gl_Position = projectionMatrix * viewMatrix * vec4(position, 1.0);
pass_color = color;
gl_Position = vec4(x, -y, 0.0, 1.0);
} }
)"; )";
@@ -50,21 +48,17 @@ void main(void){
static const char vertexSource[] = R"( static const char vertexSource[] = R"(
#version 330 #version 330
layout(location = 0) in vec2 position; layout(location = 0) in vec3 position;
layout(location = 1) in int color; layout(location = 1) in int color;
uniform vec2 camPos; uniform mat4 viewMatrix;
uniform float zoom; uniform mat4 projectionMatrix;
uniform float aspectRatio;
uniform float isometricView;
flat out int pass_color; flat out int pass_color;
void main(void){ void main(void){
float x = (position.x - camPos.x - (position.y - camPos.y) * isometricView) / aspectRatio * zoom; pass_color = color;
float y = ((0.5 * (position.x - camPos.x) + 0.5 * (position.y - camPos.y)) * isometricView + (position.y - camPos.y) * (1.0 - isometricView)) * zoom; gl_Position = projectionMatrix * viewMatrix * vec4(position, 1.0);
pass_color = color;
gl_Position = vec4(x, -y, 0.0, 1.0);
} }
)"; )";
@@ -94,23 +88,16 @@ void WorldShader::LoadShader() {
} }
void WorldShader::GetAllUniformLocation() { void WorldShader::GetAllUniformLocation() {
m_LocationAspectRatio = static_cast<unsigned int>(GetUniformLocation("aspectRatio")); m_LocationProjection = static_cast<unsigned int>(GetUniformLocation("projectionMatrix"));
m_LocationZoom = static_cast<unsigned int>(GetUniformLocation("zoom")); m_LocationView = static_cast<unsigned int>(GetUniformLocation("viewMatrix"));
m_LocationCam = static_cast<unsigned int>(GetUniformLocation("camPos"));
m_LocationViewtype = static_cast<unsigned int>(GetUniformLocation("isometricView"));
} }
void WorldShader::SetCamPos(const Vec2f& camPos) { void WorldShader::SetProjectionMatrix(const maths::Mat4f& proj) const {
LoadVector(m_LocationCam, camPos); LoadMat4(m_LocationProjection, proj);
} }
void WorldShader::SetZoom(float zoom) {
LoadFloat(m_LocationZoom, zoom); void WorldShader::SetViewMatrix(const maths::Mat4f& view) const {
} LoadMat4(m_LocationView, view);
void WorldShader::SetAspectRatio(float aspectRatio) {
LoadFloat(m_LocationAspectRatio, aspectRatio);
}
void WorldShader::SetIsometricView(float isometric) {
LoadFloat(m_LocationViewtype, isometric);
} }
} // namespace shader } // namespace shader