8 Commits

Author SHA1 Message Date
Sem van der Hoeven
75c745427c [ADD] deque method 2021-06-04 10:22:35 +02:00
Sem van der Hoeven
6f546fdd8b [EDIT] caffemodel in gitignore 2021-06-02 10:54:10 +02:00
Sem van der Hoeven
e166c1f988 [EDIT] small fix 2021-06-02 10:51:59 +02:00
Sem van der Hoeven
ad35e14bfc [ADD] (test) trees at every chunk 2021-06-02 09:37:13 +02:00
Sem van der Hoeven
f69e104a8d [ADD] comments 2021-06-01 14:24:16 +02:00
Sem van der Hoeven
8d52703297 [ADD] added deque support for light loading 2021-06-01 14:06:28 +02:00
Sem van der Hoeven
658b809ef2 [ADD] automatic loading of models 2021-06-01 13:57:45 +02:00
Menno
ef466c9d95 Merge branch 'feature/timer' into develop 2021-06-01 11:41:43 +02:00
4 changed files with 100 additions and 20 deletions

2
.gitignore vendored
View File

@@ -428,4 +428,6 @@ FodyWeavers.xsd
**/docs/* **/docs/*
**/doc/* **/doc/*
**/pose_iter_160000.caffemodel
# End of https://www.toptal.com/developers/gitignore/api/c++,visualstudio,visualstudiocode,opencv # End of https://www.toptal.com/developers/gitignore/api/c++,visualstudio,visualstudiocode,opencv

View File

@@ -10,46 +10,80 @@
#include "../renderEngine/renderer.h" #include "../renderEngine/renderer.h"
#include "../shaders/entity_shader.h" #include "../shaders/entity_shader.h"
#include "../toolbox/toolbox.h" #include "../toolbox/toolbox.h"
#include <deque>
#define MAX_MODEL_DEQUE_SIZE 6 // max amount of models to load at the same time
#define UPCOMING_MODEL_AMOUNT 4 // how much models should be loaded in front of us
namespace scene namespace scene
{ {
std::vector<entities::Entity> entities; std::deque<entities::Entity> house_models;
std::vector<entities::Light> lights; std::deque<entities::Light> lights;
std::deque<entities::Entity> trees;
models::RawModel raw_model; models::RawModel raw_model;
models::ModelTexture texture; models::ModelTexture texture;
shaders::EntityShader *shader; shaders::EntityShader* shader;
shaders::GuiShader *gui_shader; shaders::GuiShader* gui_shader;
entities::Camera camera(glm::vec3(0, 0, 0), glm::vec3(0, 0, 0)); entities::Camera camera(glm::vec3(0, 0, 0), glm::vec3(0, 0, 0));
std::vector<gui::GuiTexture*> guis; std::vector<gui::GuiTexture*> guis;
models::TexturedModel model;
models::TexturedModel tree;
In_Game_Scene::In_Game_Scene() In_Game_Scene::In_Game_Scene()
{ {
shader = new shaders::EntityShader; shader = new shaders::EntityShader;
shader->Init(); shader->Init();
render_engine::renderer::Init(*shader); render_engine::renderer::Init(*shader);
gui_shader = new shaders::GuiShader(); gui_shader = new shaders::GuiShader();
gui_shader->Init(); gui_shader->Init();
} }
/**
* @brief loads a new chunk in front of the camera, and deletes the chunk behind the camera.
*
* @param model_pos the amount of models the camera has passed already. This is the rounded result of (z position of camera) / (size of model)
*
*/
void load_chunk(int model_pos)
{
std::cout << "loading model chunk" << std::endl;
if (house_models.size() >= MAX_MODEL_DEQUE_SIZE)
{
house_models.pop_back();
trees.pop_back();
}
int z_offset = model_pos * (model.raw_model.model_size.x * 20); // how much "in the distance" we should load the model
house_models.push_front(entities::Entity(model, glm::vec3(0, -50, -50 - z_offset), glm::vec3(0, 90, 0), 20));
trees.push_front(entities::Entity(tree, glm::vec3(0, 0, -50 - z_offset), glm::vec3(0, 90, 0), 3));
}
scene::Scenes scene::In_Game_Scene::start(GLFWwindow* window) scene::Scenes scene::In_Game_Scene::start(GLFWwindow* window)
{ {
raw_model = render_engine::LoadObjModel("res/House.obj"); raw_model = render_engine::LoadObjModel("res/House.obj");
texture = { render_engine::loader::LoadTexture("res/Texture.png") }; texture = { render_engine::loader::LoadTexture("res/Texture.png") };
texture.shine_damper = 10; texture.shine_damper = 10;
texture.reflectivity = 0; texture.reflectivity = 0;
models::TexturedModel model = { raw_model, texture }; model = { raw_model, texture };
models::RawModel raw_tree_model = render_engine::LoadObjModel("res/Tree.obj");
models::ModelTexture tree_texture = { render_engine::loader::LoadTexture("res/TreeTexture.png") };
tree = { raw_tree_model, tree_texture };
int z = 0;
for (int i = 0; i < 5; ++i) // load the first few house models
for (int i = 0; i <= UPCOMING_MODEL_AMOUNT; i++)
{ {
entities.push_back(entities::Entity(model, glm::vec3(0, -50, -50 - z), glm::vec3(0, 90, 0), 20)); load_chunk(i);
z += (raw_model.model_size.x * 20);
} }
lights.push_back(entities::Light(glm::vec3(0, 1000, -7000), glm::vec3(5, 5, 5))); lights.push_back(entities::Light(glm::vec3(0, 1000, -7000), glm::vec3(5, 5, 5))); // sun
lights.push_back(entities::Light(glm::vec3(0, 0, -30), glm::vec3(2, 0, 2), glm::vec3(0.0001f, 0.0001f, 0.0001f))); lights.push_back(entities::Light(glm::vec3(0, 0, -30), glm::vec3(2, 0, 2), glm::vec3(0.0001f, 0.0001f, 0.0001f)));
lights.push_back(entities::Light(glm::vec3(0, 0, -200), glm::vec3(0, 2, 0), glm::vec3(0.0001f, 0.0001f, 0.0001f))); lights.push_back(entities::Light(glm::vec3(0, 0, -200), glm::vec3(0, 2, 0), glm::vec3(0.0001f, 0.0001f, 0.0001f)));
@@ -58,11 +92,11 @@ namespace scene
button.SetHoverTexture(render_engine::loader::LoadTexture("res/Texture.png")); button.SetHoverTexture(render_engine::loader::LoadTexture("res/Texture.png"));
button.SetClickedTexture(render_engine::loader::LoadTexture("res/Mayo.png")); button.SetClickedTexture(render_engine::loader::LoadTexture("res/Mayo.png"));
button.SetOnClickAction([]() button.SetOnClickAction([]()
{ {
std::cout << "I got clicked on!" << std::endl; std::cout << "I got clicked on!" << std::endl;
}); });
guis.push_back(&button); guis.push_back(&button);
while (return_value == scene::Scenes::INGAME) while (return_value == scene::Scenes::INGAME)
{ {
@@ -86,13 +120,17 @@ namespace scene
shader->Start(); shader->Start();
shader->LoadSkyColor(render_engine::renderer::SKY_COLOR); shader->LoadSkyColor(render_engine::renderer::SKY_COLOR);
shader->LoadLights(lights); shader->LoadLightsDeque(lights);
shader->LoadViewMatrix(camera); shader->LoadViewMatrix(camera);
// Renders each entity in the entities list for (entities::Entity& model_entity : house_models)
for (entities::Entity& entity : entities)
{ {
render_engine::renderer::Render(entity, *shader); render_engine::renderer::Render(model_entity, *shader);
}
for (entities::Entity& tree_entity : trees)
{
render_engine::renderer::Render(tree_entity, *shader);
} }
// Render GUI items // Render GUI items
@@ -105,6 +143,18 @@ namespace scene
void scene::In_Game_Scene::update(GLFWwindow* window) void scene::In_Game_Scene::update(GLFWwindow* window)
{ {
camera.Move(window); camera.Move(window);
// calculate where the next house model should be loaded
static int last_model_pos = 0;
int model_pos = -round(camera.GetPosition().z / (model.raw_model.model_size.x * 20)); // how much models we have passed, minus because we are moving in the negative z axis
// if we have passed a model, load a new one and delete the one behind us
if (last_model_pos != model_pos)
{
load_chunk(model_pos + UPCOMING_MODEL_AMOUNT);
}
// remember the position at which the new model was added
last_model_pos = model_pos;
} }
void scene::In_Game_Scene::onKey(GLFWwindow* window, int key, int scancode, int action, int mods) void scene::In_Game_Scene::onKey(GLFWwindow* window, int key, int scancode, int action, int mods)

View File

@@ -1,5 +1,6 @@
#include "entity_shader.h" #include "entity_shader.h"
#include "../toolbox/toolbox.h" #include "../toolbox/toolbox.h"
#include <deque>
namespace shaders namespace shaders
{ {
@@ -160,6 +161,25 @@ namespace shaders
} }
} }
void EntityShader::LoadLightsDeque(std::deque<entities::Light>& lights) const
{
for (int i = 0; i < MAX_LIGHTS; ++i)
{
if (i < lights.size())
{
LoadVector(location_light_position[i], lights[i].GetPosition());
LoadVector(location_light_color[i], lights[i].GetColor());
LoadVector(location_light_attenuation[i], lights[i].GetAttenuation());
}
else
{
LoadVector(location_light_position[i], glm::vec3(0, 0, 0));
LoadVector(location_light_color[i], glm::vec3(0, 0, 0));
LoadVector(location_light_attenuation[i], glm::vec3(1, 0, 0));
}
}
}
void EntityShader::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);

View File

@@ -2,6 +2,7 @@
#include <glm/gtc/matrix_transform.hpp> #include <glm/gtc/matrix_transform.hpp>
#include <vector> #include <vector>
#include <deque>
#include "shader_program.h" #include "shader_program.h"
#include "../entities/camera.h" #include "../entities/camera.h"
#include "../entities/light.h" #include "../entities/light.h"
@@ -58,6 +59,13 @@ namespace shaders
*/ */
void LoadLights(std::vector<entities::Light>& lights) const; void LoadLights(std::vector<entities::Light>& lights) const;
/**
* @brief loads some lights contained in a deque.
*
* @param lights the deque containing the lights to load
*/
void LoadLightsDeque(std::deque<entities::Light>& lights) const;
/* /*
* @brief: A method to load the the shine variables from a model into the shader * @brief: A method to load the the shine variables from a model into the shader
* *