diff options
Diffstat (limited to 'src/libjin/graphics')
| -rw-r--r-- | src/libjin/graphics/je_window.cpp | 2 | ||||
| -rw-r--r-- | src/libjin/graphics/je_window.h | 25 | ||||
| -rw-r--r-- | src/libjin/graphics/shaders/je_jsl_compiler.h | 1 |
3 files changed, 12 insertions, 16 deletions
diff --git a/src/libjin/graphics/je_window.cpp b/src/libjin/graphics/je_window.cpp index 492fd22..148f1b9 100644 --- a/src/libjin/graphics/je_window.cpp +++ b/src/libjin/graphics/je_window.cpp @@ -20,7 +20,7 @@ namespace JinEngine namespace Graphics { - bool Window::initSystem(const SettingBase* s) + bool Window::startSystem(const SettingBase* s) { jin_log_info("Initialize window system."); diff --git a/src/libjin/graphics/je_window.h b/src/libjin/graphics/je_window.h index 831f3e6..6e23445 100644 --- a/src/libjin/graphics/je_window.h +++ b/src/libjin/graphics/je_window.h @@ -35,6 +35,16 @@ namespace JinEngine bool resizable; ///< resizable }; + /// + /// + /// + Window() {}; + + /// + /// + /// + virtual ~Window() {}; + /// /// /// @@ -72,23 +82,10 @@ namespace JinEngine private: - // declare a singleton - singleton(Window); - - /// - /// - /// - Window() {}; - - /// - /// - /// - virtual ~Window() {}; - /// /// /// - bool initSystem(const SettingBase* setting) override; + bool startSystem(const SettingBase* setting) override; /// /// diff --git a/src/libjin/graphics/shaders/je_jsl_compiler.h b/src/libjin/graphics/shaders/je_jsl_compiler.h index fb2f8bb..337d389 100644 --- a/src/libjin/graphics/shaders/je_jsl_compiler.h +++ b/src/libjin/graphics/shaders/je_jsl_compiler.h @@ -32,7 +32,6 @@ namespace JinEngine bool compile(const std::string& jsl, std::string* glsl_vertex, std::string* glsl_fragment); private: - singleton(JSLCompiler); }; |