tom/RT_GPU
1
0
Fork 0
mirror of https://github.com/TheRedShip/RT_GPU.git synced 2025-09-27 18:48:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

~ | Better fps handling

Browse Source
This commit is contained in:
RedShip
2025-02-25 19:03:35 +01:00
committed by tomoron
parent 47c0c38662
commit 0aaf4d0492
6 changed files with 71 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
srcs/RT.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/27 14:51:49 by TheRed #+# #+# */
/* Updated: 2025/03/18 13:36:35 by tomoron ### ########.fr */
/* Updated: 2025/03/18 16:23:30 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
@ -83,6 +83,8 @@ int main(int argc, char **argv)
raytracing_program.set_float("u_time", (float)(glfwGetTime()));
raytracing_program.set_vec2("u_resolution", glm::vec2(WIDTH, HEIGHT));
window.reduceTimeFrame();
std::map<std::string, std::vector<GLuint>> object_textures;
object_textures["textures"] = scene.getTextureIDs();
object_textures["emissive_textures"] = scene.getEmissionTextureIDs();

4
srcs/class/ObjParser.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2025/01/16 15:00:33 by tomoron #+# #+# */
/* Updated: 2025/03/18 16:45:15 by tomoron ### ########.fr */
/* Updated: 2025/03/18 16:46:24 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
@ -62,7 +62,7 @@ glm::vec3 ObjParser::getNormals(std::stringstream &line)
{
glm::vec3 res;
if((!(line >> res.x) || !(line >> res.y) || (!(line >> res.z))) && !line.eof())
if((!(line >> res.x) || !(line >> res.y) || !(line >> res.z)) && !line.eof())
throw std::runtime_error("syntax error in obj file while parsing normal vertex");
return(res);
}

32
srcs/class/Window.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/13 16:16:24 by TheRed #+# #+# */
/* Updated: 2025/03/18 13:34:26 by tomoron ### ########.fr */
/* Updated: 2025/03/18 16:23:10 by tomoron ### ########.fr */
/* */
/* ************************************************************************** */
@ -377,7 +377,7 @@ int Window::getPixelisation(void)
if (mouse || movement)
{
if(_fps < 30 && _pixelisation < 16)
if(_fps > 15 && _fps < 30 && _pixelisation < 8)
_pixelisation++;
if(_fps > 60 && _pixelisation > 0)
_pixelisation--;
@ -386,3 +386,31 @@ int Window::getPixelisation(void)
_pixelisation = 0;
return (_pixelisation + 1);
}
void Window::reduceTimeFrame()
{
static bool was_moving = false;
static int previous_bounce = _scene->getCamera()->getBounce();
bool mouse = glfwGetMouseButton(_window, GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS;
bool movement = _scene->getCamera()->getVelocity() > 0.0f;
bool is_moving = mouse || movement;
bool has_moved = is_moving != was_moving;
if (has_moved && is_moving && _fps < 15)
{
previous_bounce = _scene->getCamera()->getBounce();
_scene->getCamera()->setBounce(1);
_output_texture = 7;
}
if (has_moved && !is_moving)
{
_scene->getCamera()->setBounce(previous_bounce);
_output_texture = 0;
}
was_moving = is_moving;
}