mirror of
https://github.com/TheRedShip/RT_GPU.git
synced 2025-09-27 18:48:36 +02:00
merge dynamic_pixelisation with main
This commit is contained in:
@ -6,7 +6,7 @@
|
||||
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
|
||||
/* +#+#+#+#+#+ +#+ */
|
||||
/* Created: 2024/09/27 14:51:49 by TheRed #+# #+# */
|
||||
/* Updated: 2025/01/10 19:12:40 by ycontre ### ########.fr */
|
||||
/* Updated: 2025/01/11 16:14:24 by tomoron ### ########.fr */
|
||||
/* */
|
||||
/* ************************************************************************** */
|
||||
|
||||
@ -79,7 +79,7 @@ int main(int argc, char **argv)
|
||||
|
||||
shader.set_int("u_frameCount", window.getFrameCount());
|
||||
shader.set_int("u_objectsNum", object_data.size());
|
||||
shader.set_int("u_pixelisation", window.isPixelated() * window.getPixelisationAmount() + 1);
|
||||
shader.set_int("u_pixelisation", window.getPixelisation());
|
||||
shader.set_float("u_time", (float)(glfwGetTime()));
|
||||
shader.set_vec2("u_resolution", glm::vec2(WIDTH, HEIGHT));
|
||||
|
||||
@ -97,7 +97,6 @@ int main(int argc, char **argv)
|
||||
|
||||
ImGui::Begin("Settings");
|
||||
ImGui::Text("Fps: %d", int(window.getFps()));
|
||||
ImGui::SliderInt("Pixelisation", &window.getPixelisationAmount(), 0, 30);
|
||||
ImGui::Checkbox("Accumulate", &window.getAccumulate());
|
||||
ImGui::End();
|
||||
|
||||
|
Reference in New Issue
Block a user