Add setScene to be used instead of setWork

* Remove setWork(Work*)
* Deprecate setWork(std::shared_ptr<Work>), i.e. non-template version

Author: jhasse

src/App.cpp

@@ -1,13 +1,13 @@
-// Copyright 2019-2024 Jan Niklas Hasse <jhasse@bixense.com>
+// Copyright 2019-2025 Jan Niklas Hasse <jhasse@bixense.com>
 // For conditions of distribution and use, see copyright notice in LICENSE.txt
 
 #include "App.hpp"
 
 #include "jngl/AppParameters.hpp"
+#include "jngl/Scene.hpp"
 #include "jngl/ShaderProgram.hpp"
 #include "jngl/screen.hpp"
 #include "jngl/window.hpp"
-#include "jngl/work.hpp"
 #include "log.hpp"
 #include "windowptr.hpp"
 
@@ -173,7 +173,7 @@ uint8_t mainLoop(AppParameters params) {
 		setScaleFactor(std::min(static_cast<double>(windowSize[0]) / params.screenSize->x,
 		                        static_cast<double>(windowSize[1]) / params.screenSize->y));
 	}
-	setWork(params.start());
+	setScene(params.start());
 	uint8_t exitcode = App::instance().mainLoop();
 	hideWindow();
 	return exitcode;

src/jngl/Fade.cpp

@@ -23,7 +23,7 @@ void Fade::step() {
 	const int maxAlpha = 255;
 	fadeCount += speed;
 	if (quit || fadeCount >= 2 * maxAlpha) { // Finished?
-		jngl::setWork(work);
+		jngl::setScene(work);
 	}
 }
 

src/jngl/Scene.hpp

@@ -12,4 +12,16 @@ namespace jngl {
 /// deprecated in the future.
 using Scene = Work;
 
+/// Sets the passed Scene to be active in the main loop
+void setScene(std::shared_ptr<Scene>);
+
+/// The same as setScene(std::shared_ptr<Scene>) but creates the Scene for you
+template <class T, class... Args>
+T& setScene(Args&&... args) {
+	auto shared = std::make_shared<T>(std::forward<Args>(args)...);
+	auto& rtn = *shared;
+	setScene(std::move(shared));
+	return rtn;
+}
+
 } // namespace jngl

src/jngl/WorkFactory.cpp

@@ -1,4 +1,4 @@
-// Copyright 2024 Jan Niklas Hasse <jhasse@bixense.com>
+// Copyright 2024-2025 Jan Niklas Hasse <jhasse@bixense.com>
 // For conditions of distribution and use, see copyright notice in LICENSE.txt
 #include "WorkFactory.hpp"
 #include <cassert>
@@ -21,7 +21,7 @@ void WorkFactory::draw() const {
 
 void WorkFactory::onLoad() {
 	work = factory();
-	jngl::setWork(work);
+	jngl::setScene(work);
 }
 
 } // namespace jngl

src/jngl/work.hpp

@@ -1,4 +1,4 @@
-// Copyright 2012-2024 Jan Niklas Hasse <jhasse@bixense.com>
+// Copyright 2012-2025 Jan Niklas Hasse <jhasse@bixense.com>
 // For conditions of distribution and use, see copyright notice in LICENSE.txt
 /// @file
 #pragma once
@@ -78,21 +78,19 @@ class Work : public Job {
 std::shared_ptr<Work> getWork();
 
 /// Sets the passed Work to be active in the main loop
+/// \deprecated Use setScene(std::shared_ptr<Scene>) instead
+[[deprecated("Use setScene(std::shared_ptr<Scene>) instead")]]
 void setWork(std::shared_ptr<Work> work);
 
 /// The same as setWork(std::shared_ptr<Work>) but creates the Work for you
 template <class T, class... Args>
 T& setWork(Args&&... args) {
 	auto shared = std::make_shared<T>(std::forward<Args>(args)...);
 	auto& rtn = *shared;
-	setWork(std::move(shared));
+	setScene(std::move(shared));
 	return rtn;
 }
 
-/// \deprecated Use setWork(std::shared_ptr<Work>) instead
-[[deprecated("Use setWork(std::shared_ptr<Work>) instead")]]
-void setWork(Work*);
-
 /// Resets the automatic frame limiter of App::mainLoop().
 ///
 /// This is useful after you have done a huge amount of work in Work::draw, e.g. after loading

src/main.cpp

@@ -7,13 +7,13 @@
 #include "ShaderCache.hpp"
 #include "jngl/Alpha.hpp"
 #include "jngl/ScaleablePixels.hpp"
+#include "jngl/Scene.hpp"
 #include "jngl/matrix.hpp"
 #include "jngl/other.hpp"
 #include "jngl/screen.hpp"
 #include "jngl/shapes.hpp"
 #include "jngl/time.hpp"
 #include "jngl/window.hpp"
-#include "jngl/work.hpp"
 #include "log.hpp"
 #include "paths.hpp"
 #include "spriteimpl.hpp"
@@ -643,6 +643,10 @@ Finally load(const std::string& filename) {
 	return loadSprite(filename);
 }
 
+void setScene(std::shared_ptr<Scene> scene) {
+	pWindow->setWork(std::move(scene));
+}
+
 void setWork(std::shared_ptr<Work> work) {
 	pWindow->setWork(std::move(work));
 }