Add jngl::removeJob(Job*)

src/jngl/job.cpp

@@ -1,4 +1,4 @@
-// Copyright 2012-2023 Jan Niklas Hasse <[email protected]>
+// Copyright 2012-2024 Jan Niklas Hasse <[email protected]>
 // For conditions of distribution and use, see copyright notice in LICENSE.txt
 
 #include "job.hpp"
@@ -13,6 +13,10 @@ void addJob(std::shared_ptr<Job> job) {
 	return pWindow->addJob(std::move(job));
 }
 
+void removeJob(Job* job) {
+	pWindow->removeJob(job);
+}
+
 std::shared_ptr<Job> getJob(const std::function<bool(Job&)>& predicate) {
 	return pWindow->getJob(predicate);
 }

src/jngl/job.hpp

@@ -55,6 +55,11 @@ void addJob(Args&&... args) {
 	addJob(std::make_shared<T>(std::forward<Args>(args)...));
 }
 
+/// Removes the passed Job after all Jobs have been stepped
+///
+/// If the Job isn't found, nothing happens.
+void removeJob(Job*);
+
 /// Returns the first Job for which \a predicate returned true
 std::shared_ptr<Job> getJob(const std::function<bool(Job&)>& predicate);
 

src/window.cpp

@@ -354,12 +354,20 @@ void Window::stepIfNeeded() {
 #ifdef JNGL_PERFORMANCE_OVERLAY
 		auto start = std::chrono::steady_clock::now();
 #endif
-		if (currentWork_) {
-			currentWork_->step();
-		}
 		for (auto& job : jobs) {
 			job->step();
 		}
+		for (auto job : jobsToRemove) {
+			const auto it = std::find_if(jobs.begin(), jobs.end(),
+			                             [job](const auto& p) { return p.get() == job; });
+			if (it != jobs.end()) {
+				jobs.erase(it);
+			}
+		}
+		jobsToRemove.clear();
+		if (currentWork_) {
+			currentWork_->step();
+		}
 #ifdef JNGL_PERFORMANCE_OVERLAY
 		lastStepDuration = static_cast<double>(
 			std::chrono::duration_cast<std::chrono::microseconds>(
@@ -447,6 +455,10 @@ void Window::addJob(std::shared_ptr<Job> job) {
 	jobs.emplace_back(std::move(job));
 }
 
+void Window::removeJob(Job* job) {
+	jobsToRemove.emplace_back(job);
+}
+
 std::shared_ptr<Job> Window::getJob(const std::function<bool(Job&)>& predicate) const {
 	for (const auto& job : jobs) {
 		if (predicate(*job)) {

src/window.hpp

@@ -97,6 +97,7 @@ class Window {
 	void draw() const;
 	std::shared_ptr<Work> getWork();
 	void addJob(std::shared_ptr<Job>);
+	void removeJob(Job*);
 	std::shared_ptr<Job> getJob(const std::function<bool(Job&)>& predicate) const;
 	void resetFrameLimiter();
 	unsigned int getStepsPerSecond() const;
@@ -164,6 +165,7 @@ class Window {
 	bool changeWork = false;
 	std::shared_ptr<Work> newWork_;
 	std::vector<std::shared_ptr<Job>> jobs;
+	std::vector<Job*> jobsToRemove;
 	unsigned int stepsPerFrame;
 	double sleepPerFrame = 0; // in seconds
 	double sleepCorrectionFactor;