diff options
| author | BastiaanOlij <mux213@gmail.com> | 2017-08-21 00:17:24 +1000 |
|---|---|---|
| committer | Bastiaan Olij <mux213@gmail.com> | 2019-06-15 21:30:32 +1000 |
| commit | 02ea99129e8f3882914431374c60a7d80c5146e1 (patch) | |
| tree | 6e41adaa70a2d5a3441ba6c1d455d9b63ea8c1de /platform/x11/os_x11.h | |
| parent | 0a3c21d999559617cc9cdfe261d631e6d1267374 (diff) | |
| download | redot-engine-02ea99129e8f3882914431374c60a7d80c5146e1.tar.gz | |
Adding a new Camera Server implementation to Godot.
This is a new singleton where camera sources such as webcams or cameras on a mobile phone can register themselves with the Server.
Other parts of Godot can interact with this to obtain images from the camera as textures.
This work includes additions to the Visual Server to use this functionality to present the camera image in the background. This is specifically targetted at AR applications.
Diffstat (limited to 'platform/x11/os_x11.h')
| -rw-r--r-- | platform/x11/os_x11.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index ad35cdb4f9..eca617bd90 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -42,6 +42,7 @@ #include "main/input_default.h" #include "power_x11.h" #include "servers/audio_server.h" +#include "servers/camera_server.h" #include "servers/visual/rasterizer.h" #include "servers/visual_server.h" //#include "servers/visual/visual_server_wrap_mt.h" @@ -146,6 +147,8 @@ class OS_X11 : public OS_Unix { void get_key_modifier_state(unsigned int p_x11_state, Ref<InputEventWithModifiers> state); void flush_mouse_motion(); + CameraServer *camera_server; + MouseMode mouse_mode; Point2i center; |