derek/fall-fever
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement basic sRGB. Include frambuffers and postprocessing.

Browse Source
This commit is contained in:
4VRDriver
2020-09-20 16:45:41 +02:00
parent a5818dfd04
commit d641944119
15 changed files with 172 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/Controller.cpp
View File

@@ -31,7 +31,6 @@ Controller::Controller() {
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
glfwWindowHint(GLFW_SAMPLES, 4);
#ifndef _DEBUG
glfwWindowHint(GLFW_MAXIMIZED, GL_TRUE);
@@ -69,23 +68,25 @@ Controller::~Controller() {
delete gameWindow;
delete gameEventHandler;
delete camera;
delete pp_framebuffer;
glfwTerminate();
}
void Controller::run() {
glClearColor(0.15f, 0.15f, 0.15f, 1.0f);
glClearColor(0.0015f, 0.0015f, 0.0015f, 1.0f);
ShaderProgram shaderProgram("res/shaders/basic.vert", "res/shaders/basic.frag");
ShaderProgram lightProgram("res/shaders/light.vert", "res/shaders/light.frag");
ShaderProgram skyboxProgram("res/shaders/skybox.vert", "res/shaders/skybox.frag");
ShaderProgram postProcessingProgram("res/shaders/postprocessing.vert", "res/shaders/postprocessing.frag");
//Model model_backpack("res/models/backpack.ffo");
Model model_backpack("res/models/backpack.ffo");
//Model model_plant("res/models/plant.ffo");
//Model model_container("res/models/container.ffo");
Model model_cube("res/models/cube.ffo");
Model model_dragon("res/models/dragon.ffo");
Model model_ground("res/models/ground.ffo");
Model model_ground("res/models/wood_floor.ffo");
//Model model_moon("res/models/moon.ffo");
//Model model_hut("res/models/hut.ffo");
//Model model_sphere("res/models/sphere.ffo");
@@ -96,7 +97,7 @@ void Controller::run() {
//Entity hut(&model_hut, &shaderProgram);
//Entity moon(&model_moon, &shaderProgram);
//Entity plant(&model_plant, &shaderProgram);
Entity dragon(&model_dragon, &shaderProgram);
Entity dragon(&model_backpack, &shaderProgram);
Entity ground(&model_ground, &shaderProgram);
Entity lightSource(&model_cube, &lightProgram);
@@ -114,6 +115,8 @@ void Controller::run() {
camera->translate(glm::vec3(0.0f, 1.5f, 5.0f));
pp_framebuffer = new Framebuffer(INIT_WINDOW_WIDTH, INIT_WINDOW_HEIGHT);
// This is the game loop
while(!glfwWindowShouldClose(gameWindow->getGLFWwindow())) {
// Timing
@@ -123,29 +126,44 @@ void Controller::run() {
// ...
static bool rotateLightSource = 0;
if(rotateLightSource) {
float radius = 4.0;
float radius = 25.0;
glm::vec3 newPos = glm::vec3(-cos(glfwGetTime()*0.5), 0.5f, sin(glfwGetTime()*0.5)) * radius;
world.getEntities()->operator[](1).setPosition(newPos);
}
static glm::vec3 lightColor = glm::vec3(1.f);
world.updatePointLight(0, true, world.getEntities()->operator[](1).getPosition(), lightColor);
world.updateDirectionalLight(true, glm::vec3(1.0f), lightColor);
world.updateDirectionalLight(true, glm::vec3(-0.2f, -1.0f, -0.3f), lightColor * 0.001f);
lightProgram.bind();
lightProgram.setUniform("v_lightColor", lightColor);
lightProgram.unbind();
// Render and buffer swap
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
pp_framebuffer->bind();
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
camera->lookForward();
camera->updateVPM();
skybox.draw(camera->getView(), camera->getProj());
world.draw(camera->getViewProj(), camera->getPosition());
pp_framebuffer->unbind();
postProcessingProgram.bind();
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_2D, pp_framebuffer->getTextureId());
GLint location = glGetUniformLocation(postProcessingProgram.getShaderProgramId(), "u_texture");
glUniform1i(location, 0);
GLuint temp_vao;
glGenVertexArrays(1, &temp_vao);
glBindVertexArray(temp_vao);
glDrawArrays(GL_TRIANGLES, 0, 3);
glBindVertexArray(0);
postProcessingProgram.unbind();
#ifdef _DEBUG
renderImGui(world.getEntities(), &lightColor, &rotateLightSource);
renderImGui(world.getEntities(), &world.getPointLights()[0], &lightColor, &rotateLightSource);
#endif
glfwSwapBuffers(gameWindow->getGLFWwindow());
@@ -196,10 +214,13 @@ void Controller::error_callback(int error, const char* description) {
void Controller::updateWindowSize() {
camera->updateAspectRatio(gameWindow->getWindowAspectRatio());
gameEventHandler->setFirstMouseInput(1);
delete pp_framebuffer;
pp_framebuffer = new Framebuffer(gameWindow->getWindowWidth(), gameWindow->getWindowHeight());
}
#ifdef _DEBUG
void Controller::renderImGui(std::vector<Entity> *entites, glm::vec3 *lightColor, bool *rotateLightSource) {
void Controller::renderImGui(std::vector<Entity> *entites, PointLight *pointLight, glm::vec3 *lightColor, bool *rotateLightSource) {
ImGui_ImplOpenGL3_NewFrame();
ImGui_ImplGlfw_NewFrame();
ImGui::NewFrame();
@@ -210,18 +231,27 @@ void Controller::renderImGui(std::vector<Entity> *entites, glm::vec3 *lightColor
ImGui::Text("Dragon");
static float rotation = 0.0;
ImGui::SliderFloat("Rotation", &rotation, 0, 2 * M_PI);
static float translation[] = {0.0f, 0.0f};
ImGui::SliderFloat2("Position", translation, -4.0, 4.0);
static float translation[] = {0.0f, 0.0f, 0.0f};
ImGui::SliderFloat3("Position", translation, -4.0, 4.0);
static float scale = 0.2f;
ImGui::SliderFloat("Scale", &scale, 0.02, 2.0);
entites->operator[](0).setPosition(glm::vec3(translation[0], 0.0f, translation[1]));
entites->operator[](0).setPosition(glm::vec3(translation[0], translation[1], translation[2]));
entites->operator[](0).setRotation(glm::vec3(0.f,1.0f,0.f), rotation);
entites->operator[](0).setScale(scale);
// color picker
ImGui::Text("Light Source");
ImGui::Text("\nLight Source");
ImGui::Text("Attenuation");
static float K_c = 1.0f, K_l = 0.09f, K_q = 0.062f;
ImGui::SliderFloat("Constant Term", &K_c, 0, 1.0f*5);
ImGui::SliderFloat("Linear Term", &K_l, 0, 0.09f*5);
ImGui::SliderFloat("Quadratic Term", &K_q, 0, 0.032f*10);
pointLight->setParameters(K_c, K_l, K_q);
static float color[4] = {1.0f, 1.0f, 1.0f, 1.0f};
ImGui::Text("Color");
ImGui::ColorEdit3("Color", color);
lightColor->x = color[0];
lightColor->y = color[1];