From 29cea90913a916d6020dbc13df05b32c01501b01 Mon Sep 17 00:00:00 2001 From: tomoron Date: Tue, 25 Feb 2025 01:53:08 +0100 Subject: [PATCH] server now sends jobs to client and client can send result image to server --- includes/RT.hpp | 2 +- includes/RT/Clusterizer.hpp | 3 ++- includes/RT/Renderer.hpp | 2 +- includes/RT/Scene.hpp | 2 +- includes/RT/Window.hpp | 2 +- srcs/RT.cpp | 2 +- srcs/class/Clusterizer/Clusterizer.cpp | 2 +- srcs/class/Clusterizer/client.cpp | 2 +- srcs/class/Clusterizer/imgui.cpp | 2 +- srcs/class/Clusterizer/server.cpp | 4 +--- srcs/class/Renderer/Renderer.cpp | 2 +- srcs/class/Renderer/imgui.cpp | 2 +- srcs/class/Window.cpp | 2 +- 13 files changed, 14 insertions(+), 15 deletions(-) diff --git a/includes/RT.hpp b/includes/RT.hpp index 8567742..a162f10 100644 --- a/includes/RT.hpp +++ b/includes/RT.hpp @@ -6,7 +6,7 @@ /* By: ycontre +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/27 14:52:10 by TheRed #+# #+# */ -/* Updated: 2025/03/18 16:57:24 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:02:13 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/includes/RT/Clusterizer.hpp b/includes/RT/Clusterizer.hpp index 9558191..f64cda0 100644 --- a/includes/RT/Clusterizer.hpp +++ b/includes/RT/Clusterizer.hpp @@ -6,7 +6,7 @@ /* By: tomoron +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/20 18:25:18 by tomoron #+# #+# */ -/* Updated: 2025/03/18 16:57:49 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:04:13 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -14,6 +14,7 @@ # include "RT.hpp" + typedef enum e_job_status { WAITING, diff --git a/includes/RT/Renderer.hpp b/includes/RT/Renderer.hpp index 5110cb6..88fc61d 100644 --- a/includes/RT/Renderer.hpp +++ b/includes/RT/Renderer.hpp @@ -6,7 +6,7 @@ /* By: tomoron +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/22 16:29:26 by tomoron #+# #+# */ -/* Updated: 2025/03/18 16:58:38 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:02:54 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/includes/RT/Scene.hpp b/includes/RT/Scene.hpp index df32536..32ba50d 100644 --- a/includes/RT/Scene.hpp +++ b/includes/RT/Scene.hpp @@ -6,7 +6,7 @@ /* By: ycontre +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/12/23 18:30:18 by ycontre #+# #+# */ -/* Updated: 2025/03/18 16:47:45 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:03:37 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/includes/RT/Window.hpp b/includes/RT/Window.hpp index 69e9bb9..ccaaf55 100644 --- a/includes/RT/Window.hpp +++ b/includes/RT/Window.hpp @@ -6,7 +6,7 @@ /* By: ycontre +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/13 16:15:41 by TheRed #+# #+# */ -/* Updated: 2025/03/18 16:53:03 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:04:39 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/RT.cpp b/srcs/RT.cpp index d3feec0..0ff4d42 100644 --- a/srcs/RT.cpp +++ b/srcs/RT.cpp @@ -6,7 +6,7 @@ /* By: ycontre +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/09/27 14:51:49 by TheRed #+# #+# */ -/* Updated: 2025/03/18 16:52:17 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:02:36 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/class/Clusterizer/Clusterizer.cpp b/srcs/class/Clusterizer/Clusterizer.cpp index f07ef1d..0cf90a5 100644 --- a/srcs/class/Clusterizer/Clusterizer.cpp +++ b/srcs/class/Clusterizer/Clusterizer.cpp @@ -6,7 +6,7 @@ /* By: tomoron +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/20 18:24:39 by tomoron #+# #+# */ -/* Updated: 2025/03/18 17:00:45 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:06:57 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/class/Clusterizer/client.cpp b/srcs/class/Clusterizer/client.cpp index 7829db1..33b8d45 100644 --- a/srcs/class/Clusterizer/client.cpp +++ b/srcs/class/Clusterizer/client.cpp @@ -6,7 +6,7 @@ /* By: tomoron +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/20 21:08:38 by tomoron #+# #+# */ -/* Updated: 2025/03/18 16:54:22 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:07:42 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/class/Clusterizer/imgui.cpp b/srcs/class/Clusterizer/imgui.cpp index 28c85fe..188fde4 100644 --- a/srcs/class/Clusterizer/imgui.cpp +++ b/srcs/class/Clusterizer/imgui.cpp @@ -6,7 +6,7 @@ /* By: tomoron +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/22 19:52:51 by tomoron #+# #+# */ -/* Updated: 2025/03/18 16:56:04 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:05:57 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/class/Clusterizer/server.cpp b/srcs/class/Clusterizer/server.cpp index 1ccdf72..54c92cf 100644 --- a/srcs/class/Clusterizer/server.cpp +++ b/srcs/class/Clusterizer/server.cpp @@ -6,7 +6,7 @@ /* By: tomoron +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/20 21:08:38 by tomoron #+# #+# */ -/* Updated: 2025/03/18 17:01:15 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:08:16 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ @@ -361,7 +361,5 @@ void Clusterizer::updateServer(void) } } } - if(dispatchJobs()) - didSomething = 1; } } diff --git a/srcs/class/Renderer/Renderer.cpp b/srcs/class/Renderer/Renderer.cpp index b6e31ac..a60fe60 100644 --- a/srcs/class/Renderer/Renderer.cpp +++ b/srcs/class/Renderer/Renderer.cpp @@ -6,7 +6,7 @@ /* By: ycontre +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/01/22 16:34:53 by tomoron #+# #+# */ -/* Updated: 2025/03/18 16:59:41 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:05:19 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/class/Renderer/imgui.cpp b/srcs/class/Renderer/imgui.cpp index 2f26edc..872ab2f 100644 --- a/srcs/class/Renderer/imgui.cpp +++ b/srcs/class/Renderer/imgui.cpp @@ -6,7 +6,7 @@ /* By: tomoron +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2025/02/20 15:54:35 by tomoron #+# #+# */ -/* Updated: 2025/03/18 16:59:59 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:05:36 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */ diff --git a/srcs/class/Window.cpp b/srcs/class/Window.cpp index a4f6d5d..48f4dc2 100644 --- a/srcs/class/Window.cpp +++ b/srcs/class/Window.cpp @@ -6,7 +6,7 @@ /* By: ycontre +#+ +:+ +#+ */ /* +#+#+#+#+#+ +#+ */ /* Created: 2024/10/13 16:16:24 by TheRed #+# #+# */ -/* Updated: 2025/03/18 16:58:59 by tomoron ### ########.fr */ +/* Updated: 2025/03/18 17:05:04 by tomoron ### ########.fr */ /* */ /* ************************************************************************** */