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

merge dynamic_pixelisation with main

Browse Source
This commit is contained in:
tomoron
2025-01-11 16:17:11 +01:00
parent 8691f1b8ac e0b057a189
commit 3f7eb5e05a
5 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
RT
View File

Binary file not shown.

10
includes/RT/Window.hpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */ /* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/13 16:15:41 by TheRed #+# #+# */ /* Created: 2024/10/13 16:15:41 by TheRed #+# #+# */
/* Updated: 2024/12/23 18:35:35 by ycontre ### ########.fr */ /* Updated: 2025/01/11 16:14:11 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -37,8 +37,7 @@ class Window
float getFps(void) const; float getFps(void) const;
int getFrameCount(void) const; int getFrameCount(void) const;
int &getPixelisationAmount(void); int getPixelisation(void);
int isPixelated(void);
bool &getAccumulate(void); bool &getAccumulate(void);
@ -49,10 +48,9 @@ class Window
float _fps; float _fps;
float _delta; float _delta;
int _frameCount; int _frameCount;
int _pixelisation;
bool accumulate = true; bool accumulate = true;
int pixelisation_amount = 5;
}; };
#endif #endif

5
shell.nix Normal file
View File

@ -0,0 +1,5 @@
{ pkgs ? import <nixpkgs> {} }:
pkgs.mkShell {
nativeBuildInputs = with pkgs; [ libGL xorg.libX11 libGLU glfw];
}

5
srcs/RT.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */ /* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/09/27 14:51:49 by TheRed #+# #+# */ /* 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_frameCount", window.getFrameCount());
shader.set_int("u_objectsNum", object_data.size()); 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_float("u_time", (float)(glfwGetTime()));
shader.set_vec2("u_resolution", glm::vec2(WIDTH, HEIGHT)); shader.set_vec2("u_resolution", glm::vec2(WIDTH, HEIGHT));
@ -97,7 +97,6 @@ int main(int argc, char **argv)
ImGui::Begin("Settings"); ImGui::Begin("Settings");
ImGui::Text("Fps: %d", int(window.getFps())); ImGui::Text("Fps: %d", int(window.getFps()));
ImGui::SliderInt("Pixelisation", &window.getPixelisationAmount(), 0, 30);
ImGui::Checkbox("Accumulate", &window.getAccumulate()); ImGui::Checkbox("Accumulate", &window.getAccumulate());
ImGui::End(); ImGui::End();

24
srcs/class/Window.cpp
View File

@ -6,7 +6,7 @@
/* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */ /* By: ycontre <ycontre@student.42.fr> +#+ +:+ +#+ */
/* +#+#+#+#+#+ +#+ */ /* +#+#+#+#+#+ +#+ */
/* Created: 2024/10/13 16:16:24 by TheRed #+# #+# */ /* Created: 2024/10/13 16:16:24 by TheRed #+# #+# */
/* Updated: 2025/01/09 16:34:48 by tomoron ### ########.fr */ /* Updated: 2025/01/11 16:13:40 by tomoron ### ########.fr */
/* */ /* */
/* ************************************************************************** */ /* ************************************************************************** */
@ -16,6 +16,7 @@ Window::Window(Scene *scene, int width, int height, const char *title, int sleep
{ {
_scene = scene; _scene = scene;
_frameCount = 0; _frameCount = 0;
_pixelisation = 0;
if (!glfwInit()) if (!glfwInit())
{ {
@ -54,7 +55,6 @@ Window::~Window(void)
void Window::process_input() void Window::process_input()
{ {
bool forward = glfwGetKey(_window, GLFW_KEY_W) == GLFW_PRESS; bool forward = glfwGetKey(_window, GLFW_KEY_W) == GLFW_PRESS;
bool backward = glfwGetKey(_window, GLFW_KEY_S) == GLFW_PRESS; bool backward = glfwGetKey(_window, GLFW_KEY_S) == GLFW_PRESS;
bool left = glfwGetKey(_window, GLFW_KEY_A) == GLFW_PRESS; bool left = glfwGetKey(_window, GLFW_KEY_A) == GLFW_PRESS;
@ -166,22 +166,24 @@ int Window::getFrameCount(void) const
return (_frameCount); return (_frameCount);
} }
int &Window::getPixelisationAmount(void)
{
return (pixelisation_amount);
}
bool &Window::getAccumulate(void) bool &Window::getAccumulate(void)
{ {
return (accumulate); return (accumulate);
} }
int Window::isPixelated(void) int Window::getPixelisation(void)
{ {
bool mouse = glfwGetMouseButton(_window, GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS; bool mouse = glfwGetMouseButton(_window, GLFW_MOUSE_BUTTON_RIGHT) == GLFW_PRESS;
bool movement = _scene->getCamera()->getVelocity() > 0.0f; bool movement = _scene->getCamera()->getVelocity() > 0.0f;
if (mouse || movement) if (mouse || movement)
return (1); {
return (0); if(_fps < 60 && _pixelisation < 16)
} _pixelisation++;
if(_fps > 90 && _pixelisation > 0)
_pixelisation--;
}
else if(_pixelisation)
_pixelisation = 0;
return (_pixelisation + 1);
}