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

+ | New output texture slider

Browse Source
This commit is contained in:
TheRedShip
2025-02-24 20:37:25 +01:00
committed by tomoron
parent 62d0863ff4
commit 47c0c38662
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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/02/06 02:19:50 by tomoron ### ########.fr */
/* Updated: 2025/03/18 16:45:15 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);
}

7
srcs/class/Window.cpp
View File

@ -23,6 +23,7 @@ Window::Window(Scene *scene, int width, int height, const char *title, int sleep
_fps = 0;
_frameCount = 0;
_pixelisation = 0;
_output_texture = 0;
_renderer = new Renderer(scene, this, args);
_clusterizer = new Clusterizer(args, _renderer);
glfwSetErrorCallback(GLFWErrorCallback);
@ -208,6 +209,7 @@ void Window::imGuiRender(ShaderProgram &raytracing_program)
ImGui::Text("Fps: %d", int(_fps));
ImGui::Text("Frame: %d", _frameCount);
ImGui::Text("Objects: %lu", _scene->getObjectData().size() + _scene->getTriangleData().size());
ImGui::SliderInt("Output texture", &_output_texture, 0, 7);
ImGui::Spacing();
@ -363,6 +365,11 @@ bool &Window::getAccumulate(void)
return (accumulate);
}
int Window::getOutputTexture(void) const
{
return (_output_texture);
}
int Window::getPixelisation(void)
{
bool mouse = glfwGetMouseButton(_window, GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS;