sem/SDBA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[EDIT] renaming the static_shader

Browse Source
This commit is contained in:
Menno
2021-05-21 08:43:32 +02:00
parent 9e9d50da9e
commit e2f6bd720d
10 changed files with 149 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/entities/Camera.h
View File

@@ -5,6 +5,10 @@
namespace entities namespace entities
{ {
/*
* This class represents the viewport of the game. The whole game is seen through this class
*/
class Camera class Camera
{ {
private: private:

6
src/main.cpp
View File

@@ -11,7 +11,7 @@
#include "renderEngine/loader.h" #include "renderEngine/loader.h"
#include "renderEngine/obj_loader.h" #include "renderEngine/obj_loader.h"
#include "renderEngine/renderer.h" #include "renderEngine/renderer.h"
#include "shaders/static_shader.h" #include "shaders/entity_shader.h"
#include "toolbox/toolbox.h" #include "toolbox/toolbox.h"
#pragma comment(lib, "glfw3.lib") #pragma comment(lib, "glfw3.lib")
@@ -46,7 +46,7 @@ int main(void)
}); });
models::RawModel raw_model = LoadObjModel("res/Tree.obj"); models::RawModel raw_model = render_engine::LoadObjModel("res/Tree.obj");
models::ModelTexture texture = { render_engine::loader::LoadTexture("res/TreeTexture.png") }; models::ModelTexture texture = { render_engine::loader::LoadTexture("res/TreeTexture.png") };
texture.shine_damper = 10; texture.shine_damper = 10;
texture.reflectivity = 1; texture.reflectivity = 1;
@@ -55,7 +55,7 @@ int main(void)
entities::Light light(glm::vec3(0, 0, -30), glm::vec3(1, 1, 1)); entities::Light light(glm::vec3(0, 0, -30), glm::vec3(1, 1, 1));
shaders::StaticShader shader; shaders::EntityShader shader;
shader.Init(); shader.Init();
render_engine::renderer::Init(shader); render_engine::renderer::Init(shader);

4
src/renderEngine/Renderer.cpp
View File

@@ -15,7 +15,7 @@ namespace render_engine
/* /*
This function will load the projectionMatrix into the shader This function will load the projectionMatrix into the shader
*/ */
void Init(shaders::StaticShader& shader) void Init(shaders::EntityShader& shader)
{ {
// Faces which are not facing the camera are not rendered // Faces which are not facing the camera are not rendered
glEnable(GL_CULL_FACE); glEnable(GL_CULL_FACE);
@@ -43,7 +43,7 @@ namespace render_engine
/* /*
This function will Render a Model on the screen. This function will Render a Model on the screen.
*/ */
void Render(entities::Entity& entity, shaders::StaticShader& shader) void Render(entities::Entity& entity, shaders::EntityShader& shader)
{ {
const models::TexturedModel model = entity.GetModel(); const models::TexturedModel model = entity.GetModel();
const models::RawModel raw_model = model.raw_model; const models::RawModel raw_model = model.raw_model;

6
src/renderEngine/Renderer.h
View File

@@ -1,7 +1,7 @@
#pragma once #pragma once
#include "../entities/entity.h" #include "../entities/entity.h"
#include "../shaders/static_shader.h" #include "../shaders/entity_shader.h"
namespace render_engine namespace render_engine
{ {
@@ -10,7 +10,7 @@ namespace render_engine
/* /*
Call this function when starting the program Call this function when starting the program
*/ */
void Init(shaders::StaticShader& shader); void Init(shaders::EntityShader& shader);
/* /*
Call this function before rendering. Call this function before rendering.
@@ -20,6 +20,6 @@ namespace render_engine
/* /*
Call this function when wanting to Render a mesh to the screen. Call this function when wanting to Render a mesh to the screen.
*/ */
void Render(entities::Entity& entity, shaders::StaticShader& shader); void Render(entities::Entity& entity, shaders::EntityShader& shader);
} }
} }

6
src/renderEngine/obj_loader.cpp
View File

@@ -6,6 +6,8 @@
#include "loader.h" #include "loader.h"
#include "obj_loader.h" #include "obj_loader.h"
namespace render_engine
{
static void Split(const std::string& s, char delim, std::vector<std::string>& elems) static void Split(const std::string& s, char delim, std::vector<std::string>& elems)
{ {
std::stringstream ss; std::stringstream ss;
@@ -109,7 +111,8 @@ models::RawModel LoadObjModel(std::string file_name)
break; break;
} }
} }
} catch (const std::exception& e) }
catch (const std::exception& e)
{ {
// Always go in here // Always go in here
} }
@@ -127,3 +130,4 @@ models::RawModel LoadObjModel(std::string file_name)
return render_engine::loader::LoadToVAO(vertex_array, texture_array, normal_array, indices); return render_engine::loader::LoadToVAO(vertex_array, texture_array, normal_array, indices);
} }
}

6
src/renderEngine/obj_loader.h
View File

@@ -3,4 +3,10 @@
#include <string> #include <string>
#include "../models/model.h" #include "../models/model.h"
namespace render_engine
{
/*
* This function retrieves an .obj file, loads it into the VBO and returns a RawModel
*/
models::RawModel LoadObjModel(std::string file_name); models::RawModel LoadObjModel(std::string file_name);
}

18
src/shaders/static_shader.cpp → src/shaders/entity_shader.cpp
View File

@@ -1,4 +1,4 @@
#include "static_shader.h" #include "entity_shader.h"
#include "../toolbox/toolbox.h" #include "../toolbox/toolbox.h"
namespace shaders namespace shaders
@@ -90,39 +90,39 @@ namespace shaders
)"; )";
StaticShader::StaticShader(): ShaderProgram(vertex_shader, fragment_shader) EntityShader::EntityShader(): ShaderProgram(vertex_shader, fragment_shader)
{ {
} }
void StaticShader::LoadModelMatrix(const glm::mat4& matrix) const void EntityShader::LoadModelMatrix(const glm::mat4& matrix) const
{ {
LoadMatrix(location_model_matrix, matrix); LoadMatrix(location_model_matrix, matrix);
} }
void StaticShader::LoadProjectionMatrix(const glm::mat4& projection) const void EntityShader::LoadProjectionMatrix(const glm::mat4& projection) const
{ {
LoadMatrix(location_projection_matrix, projection); LoadMatrix(location_projection_matrix, projection);
} }
void StaticShader::LoadViewMatrix(entities::Camera& camera) const void EntityShader::LoadViewMatrix(entities::Camera& camera) const
{ {
const glm::mat4 view_matrix = toolbox::CreateViewMatrix(camera); const glm::mat4 view_matrix = toolbox::CreateViewMatrix(camera);
LoadMatrix(location_view_matrix, view_matrix); LoadMatrix(location_view_matrix, view_matrix);
} }
void StaticShader::LoadLight(entities::Light& light) const void EntityShader::LoadLight(entities::Light& light) const
{ {
LoadVector(location_light_position, light.GetPosition()); LoadVector(location_light_position, light.GetPosition());
LoadVector(location_light_color, light.GetColor()); LoadVector(location_light_color, light.GetColor());
} }
void StaticShader::LoadShineVariables(float shine_damper, float reflectivity) const void EntityShader::LoadShineVariables(float shine_damper, float reflectivity) const
{ {
LoadFloat(location_shine_damper, shine_damper); LoadFloat(location_shine_damper, shine_damper);
LoadFloat(location_reflectivity, reflectivity); LoadFloat(location_reflectivity, reflectivity);
} }
void StaticShader::SetAttributes() const void EntityShader::SetAttributes() const
{ {
// Load the position VBO and textureCoords VBO from the VAO into the shader "in" variables // Load the position VBO and textureCoords VBO from the VAO into the shader "in" variables
SetAttribute(0, "position"); SetAttribute(0, "position");
@@ -130,7 +130,7 @@ namespace shaders
SetAttribute(2, "normal"); SetAttribute(2, "normal");
} }
void StaticShader::GetAllUniformLocations() void EntityShader::GetAllUniformLocations()
{ {
// Get the locations from the uniform variables from the shaders // Get the locations from the uniform variables from the shaders
location_model_matrix = GetUniformLocation("model_matrix"); location_model_matrix = GetUniformLocation("model_matrix");

6
src/shaders/static_shader.h → src/shaders/entity_shader.h
View File

@@ -6,12 +6,12 @@
#include "../entities/light.h" #include "../entities/light.h"
/* /*
This class does represents the shaders for the models. This class handles the shaders for the entities.
*/ */
namespace shaders namespace shaders
{ {
class StaticShader : public ShaderProgram class EntityShader : public ShaderProgram
{ {
private: private:
GLuint location_model_matrix; GLuint location_model_matrix;
@@ -23,7 +23,7 @@ namespace shaders
GLuint location_reflectivity; GLuint location_reflectivity;
public: public:
StaticShader(); EntityShader();
void LoadModelMatrix(const glm::mat4& matrix) const; void LoadModelMatrix(const glm::mat4& matrix) const;
void LoadProjectionMatrix(const glm::mat4& projection) const; void LoadProjectionMatrix(const glm::mat4& projection) const;

4
wk2_fps.vcxproj
View File

@@ -26,7 +26,7 @@
<ClCompile Include="src\renderEngine\obj_loader.cpp" /> <ClCompile Include="src\renderEngine\obj_loader.cpp" />
<ClCompile Include="src\renderEngine\renderer.cpp" /> <ClCompile Include="src\renderEngine\renderer.cpp" />
<ClCompile Include="src\shaders\shader_program.cpp" /> <ClCompile Include="src\shaders\shader_program.cpp" />
<ClCompile Include="src\shaders\static_shader.cpp" /> <ClCompile Include="src\shaders\entity_shader.cpp" />
<ClCompile Include="src\toolbox\toolbox.cpp" /> <ClCompile Include="src\toolbox\toolbox.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@@ -38,7 +38,7 @@
<ClInclude Include="src\renderEngine\obj_loader.h" /> <ClInclude Include="src\renderEngine\obj_loader.h" />
<ClInclude Include="src\renderEngine\renderer.h" /> <ClInclude Include="src\renderEngine\renderer.h" />
<ClInclude Include="src\shaders\shader_program.h" /> <ClInclude Include="src\shaders\shader_program.h" />
<ClInclude Include="src\shaders\static_shader.h" /> <ClInclude Include="src\shaders\entity_shader.h" />
<ClInclude Include="src\stb_image.h" /> <ClInclude Include="src\stb_image.h" />
<ClInclude Include="src\toolbox\toolbox.h" /> <ClInclude Include="src\toolbox\toolbox.h" />
</ItemGroup> </ItemGroup>

12
wk2_fps.vcxproj.filters
View File

@@ -33,15 +33,15 @@
<ClCompile Include="src\shaders\shader_program.cpp"> <ClCompile Include="src\shaders\shader_program.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\shaders\static_shader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="src\renderEngine\obj_loader.cpp"> <ClCompile Include="src\renderEngine\obj_loader.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\toolbox\toolbox.cpp"> <ClCompile Include="src\toolbox\toolbox.cpp">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\shaders\entity_shader.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\entities\Camera.h"> <ClInclude Include="src\entities\Camera.h">
@@ -65,9 +65,6 @@
<ClInclude Include="src\shaders\shader_program.h"> <ClInclude Include="src\shaders\shader_program.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\shaders\static_shader.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\renderEngine\obj_loader.h"> <ClInclude Include="src\renderEngine\obj_loader.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
@@ -77,5 +74,8 @@
<ClInclude Include="src\entities\light.h"> <ClInclude Include="src\entities\light.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\shaders\entity_shader.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
</Project> </Project>