diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-06-16 10:22:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-16 10:22:26 +0200 |
| commit | baab976d0f2853231e8ea2f048f4a32334d635b8 (patch) | |
| tree | aa11ccbe2a70610647a4b59f398689a0c070f245 /platform/x11/os_x11.cpp | |
| parent | ce8e5413390b48542b98ffafe5fc8b0b8032efa2 (diff) | |
| parent | 02ea99129e8f3882914431374c60a7d80c5146e1 (diff) | |
Merge pull request #10643 from BastiaanOlij/camera_server
CameraServer class
Diffstat (limited to 'platform/x11/os_x11.cpp')
| -rw-r--r-- | platform/x11/os_x11.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 510f3d6114..146cd8bb66 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -583,6 +583,9 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a AudioDriverManager::initialize(p_audio_driver); + ///@TODO implement a subclass for Linux and instantiate that instead + camera_server = memnew(CameraServer); + input = memnew(InputDefault); window_has_focus = true; // Set focus to true at init @@ -783,6 +786,8 @@ void OS_X11::finalize() { memdelete(input); + memdelete(camera_server); + visual_server->finish(); memdelete(visual_server); //memdelete(rasterizer); |