mirror of
https://github.com/godotengine/godot.git
synced 2025-12-07 22:00:10 +00:00
Move server files into their subfolders
This commit is contained in:
parent
d705613db3
commit
3d1c9fd5de
393 changed files with 600 additions and 579 deletions
|
|
@ -31,7 +31,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "core/os/mutex.h"
|
||||
#include "servers/audio_server.h"
|
||||
#include "servers/audio/audio_server.h"
|
||||
|
||||
#include <SLES/OpenSLES.h>
|
||||
#include <SLES/OpenSLES_Android.h>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#if defined(RD_ENABLED)
|
||||
class RenderingContextDriver;
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@ import java.util.Set;
|
|||
*/
|
||||
@Keep
|
||||
public class GodotTTS extends UtteranceProgressListener implements TextToSpeech.OnInitListener {
|
||||
// Note: These constants must be in sync with DisplayServer::TTSUtteranceEvent enum from "servers/display_server.h".
|
||||
// Note: These constants must be in sync with DisplayServer::TTSUtteranceEvent enum from "servers/display/display_server.h".
|
||||
final private static int EVENT_START = 0;
|
||||
final private static int EVENT_END = 1;
|
||||
final private static int EVENT_CANCEL = 2;
|
||||
|
|
|
|||
|
|
@ -49,10 +49,10 @@
|
|||
#include "core/config/project_settings.h"
|
||||
#include "core/input/input.h"
|
||||
#include "main/main.h"
|
||||
#include "servers/rendering_server.h"
|
||||
#include "servers/rendering/rendering_server.h"
|
||||
|
||||
#ifndef XR_DISABLED
|
||||
#include "servers/xr_server.h"
|
||||
#include "servers/xr/xr_server.h"
|
||||
#endif // XR_DISABLED
|
||||
|
||||
#ifdef TOOLS_ENABLED
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@
|
|||
#endif
|
||||
#include "main/main.h"
|
||||
#include "scene/main/scene_tree.h"
|
||||
#include "servers/rendering_server.h"
|
||||
#include "servers/rendering/rendering_server.h"
|
||||
|
||||
#include <dlfcn.h>
|
||||
#include <sys/system_properties.h>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include "core/os/main_loop.h"
|
||||
#include "drivers/unix/os_unix.h"
|
||||
#include "servers/audio_server.h"
|
||||
#include "servers/audio/audio_server.h"
|
||||
|
||||
class GodotJavaWrapper;
|
||||
class GodotIOJavaWrapper;
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#include "core/string/ustring.h"
|
||||
#include "core/templates/hash_map.h"
|
||||
#include "core/variant/array.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#include <jni.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#include "core/config/project_settings.h"
|
||||
#include "core/os/keyboard.h"
|
||||
#include "main/main.h"
|
||||
#include "servers/audio_server.h"
|
||||
#include "servers/audio/audio_server.h"
|
||||
|
||||
#import <AudioToolbox/AudioServices.h>
|
||||
#import <GameController/GameController.h>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include "core/os/thread.h"
|
||||
#include "core/os/thread_safe.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
struct DBusMessage;
|
||||
struct DBusConnection;
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@
|
|||
#include "drivers/sdl/joypad_sdl.h"
|
||||
#endif
|
||||
#include "main/main.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/rendering_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
#include "servers/rendering/rendering_server.h"
|
||||
|
||||
#ifdef X11_ENABLED
|
||||
#include "x11/detect_prime_x11.h"
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
#include "drivers/alsamidi/midi_driver_alsamidi.h"
|
||||
#include "drivers/pulseaudio/audio_driver_pulseaudio.h"
|
||||
#include "drivers/unix/os_unix.h"
|
||||
#include "servers/audio_server.h"
|
||||
#include "servers/audio/audio_server.h"
|
||||
|
||||
#ifdef FONTCONFIG_ENABLED
|
||||
#ifdef SOWRAP_ENABLED
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#include "tts_linux.h"
|
||||
|
||||
#include "core/config/project_settings.h"
|
||||
#include "servers/text_server.h"
|
||||
#include "servers/text/text_server.h"
|
||||
|
||||
TTS_Linux *TTS_Linux::singleton = nullptr;
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#include "core/templates/hash_map.h"
|
||||
#include "core/templates/list.h"
|
||||
#include "core/variant/array.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#ifdef SOWRAP_ENABLED
|
||||
#include "speechd-so_wrap.h"
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@
|
|||
|
||||
#include "core/config/project_settings.h"
|
||||
#include "core/input/input.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#include <climits>
|
||||
#include <cstdio>
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@
|
|||
#endif // LIBDECOR_ENABLED
|
||||
|
||||
#include "core/os/thread.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
class WaylandThread {
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -40,10 +40,10 @@
|
|||
#include "drivers/alsamidi/midi_driver_alsamidi.h"
|
||||
#include "drivers/pulseaudio/audio_driver_pulseaudio.h"
|
||||
#include "drivers/unix/os_unix.h"
|
||||
#include "servers/audio_server.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/audio/audio_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
#include "servers/rendering/renderer_compositor.h"
|
||||
#include "servers/rendering_server.h"
|
||||
#include "servers/rendering/rendering_server.h"
|
||||
|
||||
#if defined(SPEECHD_ENABLED)
|
||||
#include "tts_linux.h"
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include "core/os/os.h"
|
||||
#include "core/templates/local_vector.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#ifdef SOWRAP_ENABLED
|
||||
#include "dynwrappers/xlib-so_wrap.h"
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#include "core/os/os.h"
|
||||
#include "core/templates/local_vector.h"
|
||||
#include "drivers/egl/egl_manager.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#pragma once
|
||||
|
||||
#include "core/input/input.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#define FontVariation __FontVariation
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include "core/os/os.h"
|
||||
#include "core/templates/local_vector.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#import <AppKit/AppKit.h>
|
||||
#import <ApplicationServices/ApplicationServices.h>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#include "core/os/os.h"
|
||||
#include "core/templates/local_vector.h"
|
||||
#include "drivers/egl/egl_manager.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
// Suppress redefinition conflicts
|
||||
#define FontVariation __FontVariation
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include "core/os/os.h"
|
||||
#include "core/templates/local_vector.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#import <AppKit/AppKit.h>
|
||||
#import <ApplicationServices/ApplicationServices.h>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#import <AppKit/AppKit.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#import <AppKit/AppKit.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#import <AppKit/AppKit.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#import <AppKit/AppKit.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#import <AppKit/AppKit.h>
|
||||
#import <Foundation/Foundation.h>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
#import "drivers/coreaudio/audio_driver_coreaudio.h"
|
||||
#import "drivers/coremidi/midi_driver_coremidi.h"
|
||||
#include "drivers/unix/os_unix.h"
|
||||
#include "servers/audio_server.h"
|
||||
#include "servers/audio/audio_server.h"
|
||||
|
||||
class JoypadSDL;
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#include "core/templates/hash_map.h"
|
||||
#include "core/templates/list.h"
|
||||
#include "core/variant/array.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#import <AppKit/AppKit.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
#include "core/os/mutex.h"
|
||||
#include "core/os/thread.h"
|
||||
#include "servers/audio_server.h"
|
||||
#include "servers/audio/audio_server.h"
|
||||
|
||||
class AudioDriverWeb : public AudioDriver {
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
#pragma once
|
||||
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#include "godot_js.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
#include "core/input/input.h"
|
||||
#include "drivers/unix/os_unix.h"
|
||||
#include "servers/audio_server.h"
|
||||
#include "servers/audio/audio_server.h"
|
||||
|
||||
#include <emscripten/html5.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -40,11 +40,11 @@
|
|||
#include "core/os/os.h"
|
||||
#include "drivers/wasapi/audio_driver_wasapi.h"
|
||||
#include "drivers/winmidi/midi_driver_winmidi.h"
|
||||
#include "servers/audio_server.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/audio/audio_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
#include "servers/rendering/renderer_compositor.h"
|
||||
#include "servers/rendering/renderer_rd/renderer_compositor_rd.h"
|
||||
#include "servers/rendering_server.h"
|
||||
#include "servers/rendering/rendering_server.h"
|
||||
|
||||
#ifdef XAUDIO2_ENABLED
|
||||
#include "drivers/xaudio2/audio_driver_xaudio2.h"
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
#include "core/os/os.h"
|
||||
#include "core/templates/local_vector.h"
|
||||
#include "drivers/egl/egl_manager.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
#include "core/os/os.h"
|
||||
#include "core/templates/local_vector.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#include <windows.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -46,9 +46,9 @@
|
|||
#include "drivers/windows/net_socket_winsock.h"
|
||||
#include "drivers/windows/thread_windows.h"
|
||||
#include "main/main.h"
|
||||
#include "servers/audio_server.h"
|
||||
#include "servers/audio/audio_server.h"
|
||||
#include "servers/rendering/rendering_server_default.h"
|
||||
#include "servers/text_server.h"
|
||||
#include "servers/text/text_server.h"
|
||||
|
||||
#include <avrt.h>
|
||||
#include <bcrypt.h>
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
#include "core/os/os.h"
|
||||
#include "drivers/wasapi/audio_driver_wasapi.h"
|
||||
#include "drivers/winmidi/midi_driver_winmidi.h"
|
||||
#include "servers/audio_server.h"
|
||||
#include "servers/audio/audio_server.h"
|
||||
|
||||
#ifdef XAUDIO2_ENABLED
|
||||
#include "drivers/xaudio2/audio_driver_xaudio2.h"
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
#include "core/templates/hash_map.h"
|
||||
#include "core/templates/list.h"
|
||||
#include "core/variant/array.h"
|
||||
#include "servers/display_server.h"
|
||||
#include "servers/display/display_server.h"
|
||||
|
||||
#include <objbase.h>
|
||||
#include <sapi.h>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue