diff options
| author | Juan Linietsky <juan@godotengine.org> | 2020-03-01 19:14:37 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2020-03-26 15:49:32 +0100 |
| commit | 4396e98834f159da59ec790f2ff64fb65dacd9ce (patch) | |
| tree | d618e96d7a7b856260fd96e5e727f38a26de0724 /scene/2d | |
| parent | a2da99f40cf2123c0906c734a2eb01e9b65a45a2 (diff) | |
Refactored Input, create DisplayServer and DisplayServerX11
Diffstat (limited to 'scene/2d')
| -rw-r--r-- | scene/2d/canvas_item.cpp | 3 | ||||
| -rw-r--r-- | scene/2d/touch_screen_button.cpp | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index ef7aa9ba01..0f93a61b09 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -29,9 +29,10 @@ /*************************************************************************/ #include "canvas_item.h" + +#include "core/input/input.h" #include "core/message_queue.h" #include "core/method_bind_ext.gen.inc" -#include "core/os/input.h" #include "scene/main/canvas_layer.h" #include "scene/main/viewport.h" #include "scene/resources/font.h" diff --git a/scene/2d/touch_screen_button.cpp b/scene/2d/touch_screen_button.cpp index 1cca45b422..20d73113dc 100644 --- a/scene/2d/touch_screen_button.cpp +++ b/scene/2d/touch_screen_button.cpp @@ -30,8 +30,8 @@ #include "touch_screen_button.h" -#include "core/input_map.h" -#include "core/os/input.h" +#include "core/input/input.h" +#include "core/input/input_map.h" #include "core/os/os.h" void TouchScreenButton::set_texture(const Ref<Texture2D> &p_texture) { |