GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move GLFW error handling into PlatformGLFW

Browse Source
This commit is contained in:
GeorgH93
2020-10-26 23:23:23 +01:00
parent ae76fa59e9
commit c219fc3778
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
openVulkanoCpp/Host/GLFW/PlatformGLFW.cpp
View File

@@ -10,6 +10,14 @@
namespace openVulkanoCpp::GLFW namespace openVulkanoCpp::GLFW
{ {
namespace
{
void ErrorCallback(const int error, const char* description)
{
Logger::WINDOW->error("GLFW error (e{0}): {1}", error, description);
}
}
PlatformGLFW::~PlatformGLFW() PlatformGLFW::~PlatformGLFW()
{ {
if (IsInitialized()) if (IsInitialized())
@@ -21,6 +29,7 @@ namespace openVulkanoCpp::GLFW
void PlatformGLFW::Init() void PlatformGLFW::Init()
{ {
if (!glfwInit()) throw PlatformInitFailedException("Failed to initialize glfw"); if (!glfwInit()) throw PlatformInitFailedException("Failed to initialize glfw");
glfwSetErrorCallback(ErrorCallback);
inputProvider.Init(); inputProvider.Init();
initialized = true; initialized = true;
} }
@@ -34,10 +43,6 @@ namespace openVulkanoCpp::GLFW
void PlatformGLFW::Close() void PlatformGLFW::Close()
{ {
for(const IWindow* window : windows)
{
delete window;
}
windows.clear(); windows.clear();
inputProvider.Close(); inputProvider.Close();
glfwTerminate(); glfwTerminate();
@@ -45,8 +50,9 @@ namespace openVulkanoCpp::GLFW
IWindow* PlatformGLFW::MakeWindow() IWindow* PlatformGLFW::MakeWindow()
{ {
WindowGLFW* window = new WindowGLFW(inputProvider); auto window = std::make_unique<WindowGLFW>(inputProvider);
windows.push_back(window); IWindow* windowPtr = window.get();
return window; windows.emplace_back(std::move(window));
return windowPtr;
} }
} }

2
openVulkanoCpp/Host/GLFW/PlatformGLFW.hpp
View File

@@ -17,7 +17,7 @@ namespace openVulkanoCpp
{ {
class PlatformGLFW final : public IPlatform class PlatformGLFW final : public IPlatform
{ {
std::vector<WindowGLFW*> windows; std::vector<std::unique_ptr<IWindow>> windows;
InputProviderGLFW inputProvider; InputProviderGLFW inputProvider;
bool initialized = false; bool initialized = false;

7
openVulkanoCpp/Host/GLFW/WindowGLFW.cpp
View File

@@ -61,8 +61,6 @@ namespace openVulkanoCpp::GLFW
void WindowGLFW::RegisterCallbacks() const void WindowGLFW::RegisterCallbacks() const
{ {
glfwSetErrorCallback(ErrorCallback);
glfwSetDropCallback(window, DropCallback); glfwSetDropCallback(window, DropCallback);
glfwSetFramebufferSizeCallback(window, ResizeCallback); glfwSetFramebufferSizeCallback(window, ResizeCallback);
glfwSetWindowFocusCallback(window, FocusCallback); glfwSetWindowFocusCallback(window, FocusCallback);
@@ -405,11 +403,6 @@ namespace openVulkanoCpp::GLFW
//TODO something useful //TODO something useful
} }
void WindowGLFW::ErrorCallback(const int error, const char* description)
{
Logger::WINDOW->error("GLFW error (e{0}): {1}", error, description);
}
std::vector<std::string> WindowGLFW::GetVulkanRequiredInstanceExtensions() std::vector<std::string> WindowGLFW::GetVulkanRequiredInstanceExtensions()
{ {
std::vector<std::string> result; std::vector<std::string> result;

2
openVulkanoCpp/Host/GLFW/WindowGLFW.hpp
View File

@@ -128,8 +128,6 @@ namespace openVulkanoCpp::GLFW
static void DropCallback(GLFWwindow* window, int count, const char** paths); static void DropCallback(GLFWwindow* window, int count, const char** paths);
static void ErrorCallback(int error, const char* description);
public: public:
static std::vector<std::string> GetVulkanRequiredInstanceExtensions(); static std::vector<std::string> GetVulkanRequiredInstanceExtensions();
}; };