Handle irrlicht device destruction via shared pointer in DataHandler

Slightly cleaner code and fixes an issue when using sdl mixer audio backend and sdl device in irrlicht, where irrlicht's device was being terminated before the audio backend, thus calling SDL_Quit before the audio backend could do its cleanup

Author: edo9300

gframe/data_handler.h

@@ -27,7 +27,7 @@ class DataHandler {
 public:
 	DataHandler();
 	~DataHandler();
-	irr::IrrlichtDevice* tmp_device{ nullptr };
+	std::shared_ptr<irr::IrrlichtDevice> tmp_device{ nullptr };
 	std::unique_ptr<DeckManager> deckManager{ nullptr };
 	std::unique_ptr<RepoManager> gitManager{ nullptr };
 	std::unique_ptr<GameConfig> configs{ nullptr };

gframe/game.cpp

@@ -139,13 +139,13 @@ void Game::Initialize() {
 #endif
 	filesystem = device->getFileSystem();
 	filesystem->grab();
-	skinSystem = new CGUISkinSystem(epro::format(EPRO_TEXT("{}/skin"), Utils::GetWorkingDirectory()).data(), device);
+	skinSystem = new CGUISkinSystem(epro::format(EPRO_TEXT("{}/skin"), Utils::GetWorkingDirectory()).data(), device.get());
 	if(!skinSystem)
 		throw std::runtime_error("Couldn't create skin system");
 	linePatternGL = 0x0f0f;
 	menuHandler.prev_sel = -1;
 	driver = device->getVideoDriver();
-	imageManager.SetDevice(device);
+	imageManager.SetDevice(device.get());
 	imageManager.Initial();
 	RefreshAiDecks();
 	if(!discord.Initialize())

gframe/game.h

@@ -702,7 +702,7 @@ class Game final : public info_panel_elements, public main_menu_panel_elements,
 	ClientField dField;
 	DeckBuilder deckBuilder;
 	MenuHandler menuHandler;
-	irr::IrrlichtDevice* device;
+	std::shared_ptr<irr::IrrlichtDevice> device;
 	irr::video::IVideoDriver* driver;
 	irr::scene::ISceneManager* smgr;
 	irr::scene::ICameraSceneNode* camera;

gframe/gframe.cpp

@@ -183,7 +183,7 @@ int edopro_main(const args_t& args) {
 	do {
 		Game _game{};
 		ygo::mainGame = &_game;
-		ygo::mainGame->device = std::exchange(data->tmp_device, nullptr);
+		std::swap(data->tmp_device, ygo::mainGame->device);
 		try {
 			ygo::mainGame->Initialize();
 		}
@@ -195,13 +195,13 @@ int edopro_main(const args_t& args) {
 			return EXIT_FAILURE;
 		}
 		if(firstlaunch) {
-			joystick = std::make_unique<JWrapper>(ygo::mainGame->device);
+			joystick = std::make_unique<JWrapper>(ygo::mainGame->device.get());
 			gJWrapper = joystick.get();
 			firstlaunch = false;
 			CheckArguments(args);
 		}
 		reset = ygo::mainGame->MainLoop();
-		data->tmp_device = ygo::mainGame->device;
+		std::swap(data->tmp_device, ygo::mainGame->device);
 		if(reset) {
 			auto device = data->tmp_device;
 			device->setEventReceiver(nullptr);
@@ -216,6 +216,5 @@ int edopro_main(const args_t& args) {
 			env->clear();
 		}
 	} while(reset);
-	data->tmp_device->drop();
 	return EXIT_SUCCESS;
 }

gframe/utils_gui.cpp

@@ -79,7 +79,7 @@ static inline irr::video::E_DRIVER_TYPE getDefaultDriver(irr::E_DEVICE_TYPE devi
 #endif
 }
 
-irr::IrrlichtDevice* GUIUtils::CreateDevice(GameConfig* configs) {
+std::shared_ptr<irr::IrrlichtDevice> GUIUtils::CreateDevice(GameConfig* configs) {
 	irr::SIrrlichtCreationParameters params{};
 	params.AntiAlias = configs->antialias;
 	params.Vsync = (!EDOPRO_MACOS) && configs->vsync;
@@ -181,10 +181,12 @@ irr::IrrlichtDevice* GUIUtils::CreateDevice(GameConfig* configs) {
 		EDOPRO_SetWindowRect(driver->getExposedVideoData().OpenGLOSX.Window, gGameConfig->windowStruct.data());
 #endif
 	device->getLogger()->setLogLevel(irr::ELL_ERROR);
-	return device;
+	return std::shared_ptr<irr::IrrlichtDevice>(device, [](irr::IrrlichtDevice* ptr){
+		ptr->drop();
+	});
 }
 
-void GUIUtils::ChangeCursor(irr::IrrlichtDevice* device, /*irr::gui::ECURSOR_ICON*/ int _icon) {
+void GUIUtils::ChangeCursor(std::shared_ptr<irr::IrrlichtDevice>& device, /*irr::gui::ECURSOR_ICON*/ int _icon) {
 #if !EDOPRO_ANDROID && !EDOPRO_IOS
 	auto icon = static_cast<irr::gui::ECURSOR_ICON>(_icon);
 	auto cursor = device->getCursorControl();
@@ -208,7 +210,7 @@ bool GUIUtils::TakeScreenshot(irr::IrrlichtDevice* device) {
 	return written;
 }
 #if (IRRLICHT_VERSION_MAJOR==1 && IRRLICHT_VERSION_MINOR==9)
-void GUIUtils::ToggleFullscreen(irr::IrrlichtDevice* device, bool& fullscreen) {
+void GUIUtils::ToggleFullscreen(std::shared_ptr<irr::IrrlichtDevice>& device, bool& fullscreen) {
 	(void)fullscreen;
 #if EDOPRO_MACOS
 	EDOPRO_ToggleFullScreen();
@@ -226,7 +228,7 @@ static BOOL CALLBACK callback(HMONITOR hMon, HDC hdc, LPRECT lprcMonitor, LPARAM
 	return TRUE;
 }
 #endif
-void GUIUtils::ToggleFullscreen(irr::IrrlichtDevice* device, bool& fullscreen) {
+void GUIUtils::ToggleFullscreen(std::shared_ptr<irr::IrrlichtDevice>& device, bool& fullscreen) {
 	(void)fullscreen;
 #if EDOPRO_MACOS
 	EDOPRO_ToggleFullScreen();
@@ -395,7 +397,7 @@ void GUIUtils::ToggleSwapInterval(irr::video::IVideoDriver* driver, int interval
 	SetSwapInterval(driver, interval);
 }
 
-std::string GUIUtils::SerializeWindowPosition(irr::IrrlichtDevice* device) {
+std::string GUIUtils::SerializeWindowPosition(std::shared_ptr<irr::IrrlichtDevice>& device) {
 #if EDOPRO_WINDOWS
 	auto hWnd = GetWindowHandle(device->getVideoDriver());
 	WINDOWPLACEMENT wp;

gframe/utils_gui.h

@@ -2,6 +2,7 @@
 #define UTILS_GUI_H
 
 #include "text_types.h"
+#include <memory>
 
 namespace irr {
 class IrrlichtDevice;
@@ -16,13 +17,13 @@ struct GameConfig;
 
 namespace GUIUtils {
 
-irr::IrrlichtDevice* CreateDevice(GameConfig* configs);
-void ChangeCursor(irr::IrrlichtDevice* device, /*irr::gui::ECURSOR_ICON*/ int icon);
-bool TakeScreenshot(irr::IrrlichtDevice* device);
-void ToggleFullscreen(irr::IrrlichtDevice* device, bool& fullscreen);
+std::shared_ptr<irr::IrrlichtDevice> CreateDevice(GameConfig* configs);
+void ChangeCursor(std::shared_ptr<irr::IrrlichtDevice>& device, /*irr::gui::ECURSOR_ICON*/ int icon);
+bool TakeScreenshot(std::shared_ptr<irr::IrrlichtDevice>& device);
+void ToggleFullscreen(std::shared_ptr<irr::IrrlichtDevice>& device, bool& fullscreen);
 void ShowErrorWindow(epro::stringview context, epro::stringview message);
 void ToggleSwapInterval(irr::video::IVideoDriver* driver, int interval);
-std::string SerializeWindowPosition(irr::IrrlichtDevice* device);
+std::string SerializeWindowPosition(std::shared_ptr<irr::IrrlichtDevice>& device);
 
 }