From 11a8de82d4b49e5926a7f1f88ab1608a1310f2dc Mon Sep 17 00:00:00 2001 From: Anakin Date: Thu, 8 Sep 2016 11:36:57 +0200 Subject: [PATCH] fixed interaction bug --- MshViewer/Header/OpenGLController.h | 2 +- MshViewer/Source/OpenGlController.cpp | 4 ++-- MshViewer/main.cpp | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/MshViewer/Header/OpenGLController.h b/MshViewer/Header/OpenGLController.h index 11ec9c5..fbf782d 100644 --- a/MshViewer/Header/OpenGLController.h +++ b/MshViewer/Header/OpenGLController.h @@ -10,7 +10,7 @@ class OpenGLController //////////////////////////////////////////////////////////////////////////////////////////// // constructor/destructor public: - static OpenGLController& getInstance(int oglMajor = 4, int oglMinor = 5); + static OpenGLController* getInstance(int oglMajor = 4, int oglMinor = 5); ~OpenGLController(); private: diff --git a/MshViewer/Source/OpenGlController.cpp b/MshViewer/Source/OpenGlController.cpp index adec9e4..f9c5865 100644 --- a/MshViewer/Source/OpenGlController.cpp +++ b/MshViewer/Source/OpenGlController.cpp @@ -16,9 +16,9 @@ ///////////////////////////////////////////////////////////////////////// // public constructor/destructor -OpenGLController& OpenGLController::getInstance(int oglMajor, int oglMinor) +OpenGLController* OpenGLController::getInstance(int oglMajor, int oglMinor) { - static OpenGLController instace(oglMajor, oglMinor); + static OpenGLController *instace = new OpenGLController(oglMajor, oglMinor); return instace; } diff --git a/MshViewer/main.cpp b/MshViewer/main.cpp index b52da07..0d35789 100644 --- a/MshViewer/main.cpp +++ b/MshViewer/main.cpp @@ -6,13 +6,13 @@ int main(int argc, char** argv) { - OpenGLController scene = OpenGLController::getInstance(); - - //scene.loadMsh(""); + OpenGLController *scene = OpenGLController::getInstance(); do { - scene.updateScene(); - } while (!glfwWindowShouldClose(scene.getWindow())); + scene->updateScene(); + } while (!glfwWindowShouldClose(scene->getWindow())); + + delete scene; return 0; } \ No newline at end of file