godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge 46bf32517f into 15ff450680

This commit is contained in:
Thaddeus Crews 2025-02-28 01:36:01 +01:00 committed by GitHub
parent 15ff450680 46bf32517f
commit c3f4bd328b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
75 changed files with 132 additions and 274 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.pre-commit-config.yaml
View File

@ -154,7 +154,13 @@ repos:
language: python
entry: python misc/scripts/header_guards.py
files: \.(h|hpp|hh|hxx)$
exclude: ^.*/(dummy|thread|platform_config|platform_gl)\.h$
exclude: |
(?x)^(
core/os/thread\.h|
drivers/(apple/coreaudio|coremidi|metal)/.*|
misc/dist/ios_xcode/.*|
platform/(ios|macos)/(?!platform_(config|gl))[^/]*\.h
)$
- id: file-format
name: file-format

3
drivers/SCsub
View File

@ -31,7 +31,8 @@ if env["platform"] in ["macos", "ios"]:
SConscript("apple/SCsub")
# Midi drivers
SConscript("alsamidi/SCsub")
SConscript("coremidi/SCsub")
if env["platform"] in ["macos", "ios"]:
SConscript("coremidi/SCsub")
SConscript("winmidi/SCsub")
# Graphics drivers

2
drivers/apple/joypad_apple.mm
View File

@ -30,7 +30,7 @@
#import "joypad_apple.h"
#include <CoreHaptics/CoreHaptics.h>
#import <CoreHaptics/CoreHaptics.h>
#import <os/log.h>
#include "core/config/project_settings.h"

5
drivers/coreaudio/audio_driver_coreaudio.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef AUDIO_DRIVER_COREAUDIO_H
#define AUDIO_DRIVER_COREAUDIO_H
#ifdef COREAUDIO_ENABLED
#include "servers/audio_server.h"
@ -126,5 +123,3 @@ public:
};
#endif // COREAUDIO_ENABLED
#endif // AUDIO_DRIVER_COREAUDIO_H

2
drivers/coreaudio/audio_driver_coreaudio.mm
View File

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "audio_driver_coreaudio.h"
#import "audio_driver_coreaudio.h"
#ifdef COREAUDIO_ENABLED

2
drivers/coremidi/SCsub
View File

@ -4,4 +4,4 @@ from misc.utility.scons_hints import *
Import("env")
# Driver source files
env.add_source_files(env.drivers_sources, "*.cpp")
env.add_source_files(env.drivers_sources, "*.mm")

5
drivers/coremidi/midi_driver_coremidi.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef MIDI_DRIVER_COREMIDI_H
#define MIDI_DRIVER_COREMIDI_H
#ifdef COREMIDI_ENABLED
#include "core/os/midi_driver.h"
@ -67,5 +64,3 @@ public:
};
#endif // COREMIDI_ENABLED
#endif // MIDI_DRIVER_COREMIDI_H

4
drivers/coremidi/midi_driver_coremidi.cpp → drivers/coremidi/midi_driver_coremidi.mm
View File

@ -1,5 +1,5 @@
/**************************************************************************/
/* midi_driver_coremidi.cpp */
/* midi_driver_coremidi.mm */
/**************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "midi_driver_coremidi.h"
#import "midi_driver_coremidi.h"
#ifdef COREMIDI_ENABLED

7
drivers/metal/metal_device_properties.h
View File

@ -48,10 +48,7 @@
/* permissions and limitations under the License. */
/**************************************************************************/
#ifndef METAL_DEVICE_PROPERTIES_H
#define METAL_DEVICE_PROPERTIES_H
#import "servers/rendering/rendering_device.h"
#include "servers/rendering/rendering_device.h"
#import <Foundation/Foundation.h>
#import <Metal/Metal.h>
@ -152,5 +149,3 @@ public:
private:
static const SampleCount sample_count[RenderingDevice::TextureSamples::TEXTURE_SAMPLES_MAX];
};
#endif // METAL_DEVICE_PROPERTIES_H

7
drivers/metal/metal_objects.h
View File

@ -48,14 +48,11 @@
/* permissions and limitations under the License. */
/**************************************************************************/
#ifndef METAL_OBJECTS_H
#define METAL_OBJECTS_H
#import "metal_device_properties.h"
#import "metal_utils.h"
#import "pixel_formats.h"
#import "servers/rendering/rendering_device_driver.h"
#include "servers/rendering/rendering_device_driver.h"
#import <CommonCrypto/CommonDigest.h>
#import <Foundation/Foundation.h>
@ -975,5 +972,3 @@ auto release(RDD::ID p_id) {
}
} // namespace rid
#endif // METAL_OBJECTS_H

5
drivers/metal/metal_utils.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef METAL_UTILS_H
#define METAL_UTILS_H
#import <os/log.h>
#pragma mark - Boolean flags
@ -101,5 +98,3 @@ private:
extern os_log_t LOG_DRIVER;
// Used for dynamic tracing.
extern os_log_t LOG_INTERVALS;
#endif // METAL_UTILS_H

7
drivers/metal/pixel_formats.h
View File

@ -48,16 +48,13 @@
/* permissions and limitations under the License. */
/**************************************************************************/
#ifndef PIXEL_FORMATS_H
#define PIXEL_FORMATS_H
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#import "inflection_map.h"
#import "metal_device_properties.h"
#import "servers/rendering/rendering_device.h"
#include "servers/rendering/rendering_device.h"
#import <Metal/Metal.h>
@ -409,5 +406,3 @@ protected:
};
#pragma clang diagnostic pop
#endif // PIXEL_FORMATS_H

9
drivers/metal/rendering_context_driver_metal.h
View File

@ -28,13 +28,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef RENDERING_CONTEXT_DRIVER_METAL_H
#define RENDERING_CONTEXT_DRIVER_METAL_H
#ifdef METAL_ENABLED
#import "servers/rendering/rendering_context_driver.h"
#import "servers/rendering/rendering_device_driver.h"
#include "servers/rendering/rendering_context_driver.h"
#include "servers/rendering/rendering_device_driver.h"
#import <CoreGraphics/CGGeometry.h>
@ -143,5 +140,3 @@ public:
};
#endif // METAL_ENABLED
#endif // RENDERING_CONTEXT_DRIVER_METAL_H

7
drivers/metal/rendering_device_driver_metal.h
View File

@ -28,12 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef RENDERING_DEVICE_DRIVER_METAL_H
#define RENDERING_DEVICE_DRIVER_METAL_H
#import "metal_objects.h"
#import "servers/rendering/rendering_device_driver.h"
#include "servers/rendering/rendering_device_driver.h"
#import <Metal/Metal.h>
#import <variant>
@ -444,5 +441,3 @@ public:
RenderingDeviceDriverMetal(RenderingContextDriverMetal *p_context_driver);
~RenderingDeviceDriverMetal();
};
#endif // RENDERING_DEVICE_DRIVER_METAL_H

8
drivers/metal/rendering_device_driver_metal.mm
View File

@ -53,10 +53,10 @@
#import "pixel_formats.h"
#import "rendering_context_driver_metal.h"
#import "core/io/compression.h"
#import "core/io/marshalls.h"
#import "core/string/ustring.h"
#import "core/templates/hash_map.h"
#include "core/io/compression.h"
#include "core/io/marshalls.h"
#include "core/string/ustring.h"
#include "core/templates/hash_map.h"
#import <Metal/MTLTexture.h>
#import <Metal/Metal.h>

2
modules/camera/camera_macos.mm
View File

@ -31,7 +31,7 @@
///@TODO this is a near duplicate of CameraIOS, we should find a way to combine those to minimize code duplication!!!!
// If you fix something here, make sure you fix it there as well!
#include "camera_macos.h"
#import "camera_macos.h"
#include "servers/camera/camera_feed.h"

4
modules/mono/utils/macos_utils.cpp
View File

@ -28,10 +28,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "macos_utils.h"
#ifdef MACOS_ENABLED
#import "macos_utils.h"
#include "core/string/print_string.h"
#import <CoreFoundation/CoreFoundation.h>

5
modules/openxr/extensions/platform/openxr_metal_extension.mm
View File

@ -28,10 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "openxr_metal_extension.h"
#import "openxr_metal_extension.h"
#include "../../openxr_util.h"
#include "drivers/metal/rendering_device_driver_metal.h"
#import "drivers/metal/rendering_device_driver_metal.h"
#include "servers/rendering/rendering_server_globals.h"
HashMap<String, bool *> OpenXRMetalExtension::get_requested_extensions() {

5
platform/android/platform_config.h
View File

@ -28,5 +28,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef PLATFORM_CONFIG_H
#define PLATFORM_CONFIG_H
#include <alloca.h>
#include <malloc.h>
#endif // PLATFORM_CONFIG_H

7
platform/ios/display_server_ios.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef DISPLAY_SERVER_IOS_H
#define DISPLAY_SERVER_IOS_H
#include "core/input/input.h"
#include "servers/display_server.h"
@ -45,7 +42,7 @@
#endif // VULKAN_ENABLED
#if defined(METAL_ENABLED)
#include "drivers/metal/rendering_context_driver_metal.h"
#import "drivers/metal/rendering_context_driver_metal.h"
#endif // METAL_ENABLED
#endif // RD_ENABLED
@ -235,5 +232,3 @@ public:
void resize_window(CGSize size);
virtual void swap_buffers() override {}
};
#endif // DISPLAY_SERVER_IOS_H

5
platform/ios/ios.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef IOS_H
#define IOS_H
#include "core/object/class_db.h"
#import <CoreHaptics/CoreHaptics.h>
@ -58,5 +55,3 @@ public:
iOS();
};
#endif // IOS_H

5
platform/ios/ios_terminal_logger.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef IOS_TERMINAL_LOGGER_H
#define IOS_TERMINAL_LOGGER_H
#ifdef IOS_ENABLED
#include "core/io/logger.h"
@ -41,5 +38,3 @@ public:
};
#endif // IOS_ENABLED
#endif // IOS_TERMINAL_LOGGER_H

4
platform/ios/ios_terminal_logger.mm
View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "ios_terminal_logger.h"
#import "ios_terminal_logger.h"
#ifdef IOS_ENABLED
#include <os/log.h>
#import <os/log.h>
void IOSTerminalLogger::log_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, bool p_editor_notify, ErrorType p_type) {
if (!should_log(true)) {

5
platform/ios/key_mapping_ios.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef KEY_MAPPING_IOS_H
#define KEY_MAPPING_IOS_H
#include "core/os/keyboard.h"
#import <UIKit/UIKit.h>
@ -43,5 +40,3 @@ public:
static Key remap_key(CFIndex p_keycode);
static KeyLocation key_location(CFIndex p_keycode);
};
#endif // KEY_MAPPING_IOS_H

5
platform/ios/os_ios.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef OS_IOS_H
#define OS_IOS_H
#ifdef IOS_ENABLED
#import "ios.h"
@ -137,5 +134,3 @@ public:
};
#endif // IOS_ENABLED
#endif // OS_IOS_H

5
platform/ios/platform_config.h
View File

@ -28,6 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef PLATFORM_CONFIG_H
#define PLATFORM_CONFIG_H
#include <alloca.h>
#define PTHREAD_RENAME_SELF
@ -38,3 +41,5 @@
_Pragma("clang diagnostic ignored \"-Wshadow\"") \
__strong typeof(var) var = GDWeak_##var; \
_Pragma("clang diagnostic pop")
#endif // PLATFORM_CONFIG_H

5
platform/ios/rendering_context_driver_vulkan_ios.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef RENDERING_CONTEXT_DRIVER_VULKAN_IOS_H
#define RENDERING_CONTEXT_DRIVER_VULKAN_IOS_H
#ifdef VULKAN_ENABLED
#include "drivers/vulkan/rendering_context_driver_vulkan.h"
@ -54,5 +51,3 @@ public:
};
#endif // VULKAN_ENABLED
#endif // RENDERING_CONTEXT_DRIVER_VULKAN_IOS_H

5
platform/ios/tts_ios.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef TTS_IOS_H
#define TTS_IOS_H
#include "core/string/ustring.h"
#include "core/templates/hash_map.h"
#include "core/templates/list.h"
@ -59,5 +56,3 @@
- (void)speak:(const String &)text voice:(const String &)voice volume:(int)volume pitch:(float)pitch rate:(float)rate utterance_id:(int)utterance_id interrupt:(bool)interrupt;
- (Array)getVoices;
@end
#endif // TTS_IOS_H

5
platform/linuxbsd/platform_config.h
View File

@ -28,6 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef PLATFORM_CONFIG_H
#define PLATFORM_CONFIG_H
#ifdef __linux__
#include <alloca.h>
#endif
@ -43,3 +46,5 @@
#define PTHREAD_BSD_SET_NAME
#endif
#endif
#endif // PLATFORM_CONFIG_H

5
platform/macos/crash_handler_macos.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef CRASH_HANDLER_MACOS_H
#define CRASH_HANDLER_MACOS_H
class CrashHandler {
bool disabled;
@ -43,5 +40,3 @@ public:
CrashHandler();
~CrashHandler();
};
#endif // CRASH_HANDLER_MACOS_H

6
platform/macos/crash_handler_macos.mm
View File

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "crash_handler_macos.h"
#import "crash_handler_macos.h"
#include "core/config/project_settings.h"
#include "core/os/os.h"
@ -50,8 +50,8 @@
#include <signal.h>
#include <stdlib.h>
#include <mach-o/dyld.h>
#include <mach-o/getsect.h>
#import <mach-o/dyld.h>
#import <mach-o/getsect.h>
static uint64_t load_address() {
const struct segment_command_64 *cmd = getsegbyname("__TEXT");

5
platform/macos/dir_access_macos.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef DIR_ACCESS_MACOS_H
#define DIR_ACCESS_MACOS_H
#if defined(UNIX_ENABLED)
#include "core/io/dir_access.h"
@ -55,5 +52,3 @@ protected:
};
#endif // UNIX ENABLED
#endif // DIR_ACCESS_MACOS_H

6
platform/macos/dir_access_macos.mm
View File

@ -28,12 +28,12 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "dir_access_macos.h"
#include "core/config/project_settings.h"
#import "dir_access_macos.h"
#if defined(UNIX_ENABLED)
#include "core/config/project_settings.h"
#include <errno.h>
#import <AppKit/NSWorkspace.h>

11
platform/macos/display_server_macos.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef DISPLAY_SERVER_MACOS_H
#define DISPLAY_SERVER_MACOS_H
#include "core/input/input.h"
#include "servers/display_server.h"
@ -39,16 +36,16 @@
#include "gl_manager_macos_legacy.h"
#endif // GLES3_ENABLED
#include "native_menu_macos.h"
#import "native_menu_macos.h"
#if defined(RD_ENABLED)
#include "servers/rendering/rendering_device.h"
#if defined(VULKAN_ENABLED)
#include "rendering_context_driver_vulkan_macos.h"
#import "rendering_context_driver_vulkan_macos.h"
#endif // VULKAN_ENABLED
#if defined(METAL_ENABLED)
#include "drivers/metal/rendering_context_driver_metal.h"
#import "drivers/metal/rendering_context_driver_metal.h"
#endif
#endif // RD_ENABLED
@ -469,5 +466,3 @@ public:
DisplayServerMacOS(const String &p_rendering_driver, WindowMode p_mode, VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i *p_position, const Vector2i &p_resolution, int p_screen, Context p_context, int64_t p_parent_window, Error &r_error);
~DisplayServerMacOS();
};
#endif // DISPLAY_SERVER_MACOS_H

24
platform/macos/display_server_macos.mm
View File

@ -28,19 +28,19 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "display_server_macos.h"
#import "display_server_macos.h"
#include "godot_button_view.h"
#include "godot_content_view.h"
#include "godot_menu_delegate.h"
#include "godot_menu_item.h"
#include "godot_open_save_delegate.h"
#include "godot_status_item.h"
#include "godot_window.h"
#include "godot_window_delegate.h"
#include "key_mapping_macos.h"
#include "os_macos.h"
#include "tts_macos.h"
#import "godot_button_view.h"
#import "godot_content_view.h"
#import "godot_menu_delegate.h"
#import "godot_menu_item.h"
#import "godot_open_save_delegate.h"
#import "godot_status_item.h"
#import "godot_window.h"
#import "godot_window_delegate.h"
#import "key_mapping_macos.h"
#import "os_macos.h"
#import "tts_macos.h"
#include "core/config/project_settings.h"
#include "core/io/marshalls.h"

11
platform/macos/gl_manager_macos_angle.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef GL_MANAGER_MACOS_ANGLE_H
#define GL_MANAGER_MACOS_ANGLE_H
#if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
#include "core/error/error_list.h"
@ -39,9 +36,9 @@
#include "drivers/egl/egl_manager.h"
#include "servers/display_server.h"
#include <AppKit/AppKit.h>
#include <ApplicationServices/ApplicationServices.h>
#include <CoreVideo/CoreVideo.h>
#import <AppKit/AppKit.h>
#import <ApplicationServices/ApplicationServices.h>
#import <CoreVideo/CoreVideo.h>
class GLManagerANGLE_MacOS : public EGLManager {
private:
@ -59,5 +56,3 @@ public:
};
#endif // MACOS_ENABLED && GLES3_ENABLED
#endif // GL_MANAGER_MACOS_ANGLE_H

4
platform/macos/gl_manager_macos_angle.mm
View File

@ -28,14 +28,14 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "gl_manager_macos_angle.h"
#import "gl_manager_macos_angle.h"
#if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
#include <stdio.h>
#include <stdlib.h>
#include <EGL/eglext_angle.h>
#import <EGL/eglext_angle.h>
const char *GLManagerANGLE_MacOS::_get_platform_extension_name() const {
return "EGL_ANGLE_platform_angle";

5
platform/macos/gl_manager_macos_legacy.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef GL_MANAGER_MACOS_LEGACY_H
#define GL_MANAGER_MACOS_LEGACY_H
#if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)
#include "core/error/error_list.h"
@ -94,5 +91,3 @@ public:
#pragma clang diagnostic push
#endif // MACOS_ENABLED && GLES3_ENABLED
#endif // GL_MANAGER_MACOS_LEGACY_H

2
platform/macos/gl_manager_macos_legacy.mm
View File

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "gl_manager_macos_legacy.h"
#import "gl_manager_macos_legacy.h"
#if defined(MACOS_ENABLED) && defined(GLES3_ENABLED)

5
platform/macos/godot_application.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef GODOT_APPLICATION_H
#define GODOT_APPLICATION_H
#include "core/os/os.h"
#import <AppKit/AppKit.h>
@ -39,5 +36,3 @@
@interface GodotApplication : NSApplication
@end
#endif // GODOT_APPLICATION_H

4
platform/macos/godot_application.mm
View File

@ -28,9 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "godot_application.h"
#import "godot_application.h"
#include "display_server_macos.h"
#import "display_server_macos.h"
@implementation GodotApplication

5
platform/macos/godot_application_delegate.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef GODOT_APPLICATION_DELEGATE_H
#define GODOT_APPLICATION_DELEGATE_H
#include "core/os/os.h"
#import <AppKit/AppKit.h>
@ -42,5 +39,3 @@
- (void)forceUnbundledWindowActivationHackStep3;
- (void)handleAppleEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent;
@end
#endif // GODOT_APPLICATION_DELEGATE_H

8
platform/macos/godot_application_delegate.mm
View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "godot_application_delegate.h"
#import "godot_application_delegate.h"
#include "display_server_macos.h"
#include "native_menu_macos.h"
#include "os_macos.h"
#import "display_server_macos.h"
#import "native_menu_macos.h"
#import "os_macos.h"
@implementation GodotApplicationDelegate

5
platform/macos/godot_button_view.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef GODOT_BUTTON_VIEW_H
#define GODOT_BUTTON_VIEW_H
#include "servers/display_server.h"
#import <AppKit/AppKit.h>
@ -53,5 +50,3 @@
- (NSPoint)getOffset;
@end
#endif // GODOT_BUTTON_VIEW_H

2
platform/macos/godot_button_view.mm
View File

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "godot_button_view.h"
#import "godot_button_view.h"
@implementation GodotButtonView

5
platform/macos/godot_content_view.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef GODOT_CONTENT_VIEW_H
#define GODOT_CONTENT_VIEW_H
#include "servers/display_server.h"
#import <AppKit/AppKit.h>
@ -80,5 +77,3 @@
@end
#pragma clang diagnostic pop
#endif // GODOT_CONTENT_VIEW_H

6
platform/macos/godot_content_view.mm
View File

@ -28,10 +28,10 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "godot_content_view.h"
#import "godot_content_view.h"
#include "display_server_macos.h"
#include "key_mapping_macos.h"
#import "display_server_macos.h"
#import "key_mapping_macos.h"
#include "main/main.h"

2
platform/macos/godot_main_macos.mm
View File

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "os_macos.h"
#import "os_macos.h"
#include "main/main.h"

5
platform/macos/godot_menu_delegate.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef GODOT_MENU_DELEGATE_H
#define GODOT_MENU_DELEGATE_H
#import <AppKit/AppKit.h>
#import <Foundation/Foundation.h>
@ -40,5 +37,3 @@
- (void)doNothing:(id)sender;
@end
#endif // GODOT_MENU_DELEGATE_H

10
platform/macos/godot_menu_delegate.mm
View File

@ -28,12 +28,12 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "godot_menu_delegate.h"
#import "godot_menu_delegate.h"
#include "display_server_macos.h"
#include "godot_menu_item.h"
#include "key_mapping_macos.h"
#include "native_menu_macos.h"
#import "display_server_macos.h"
#import "godot_menu_item.h"
#import "key_mapping_macos.h"
#import "native_menu_macos.h"
@implementation GodotMenuDelegate

5
platform/macos/godot_menu_item.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef GODOT_MENU_ITEM_H
#define GODOT_MENU_ITEM_H
#include "servers/display_server.h"
#import <AppKit/AppKit.h>
@ -59,5 +56,3 @@ enum GlobalMenuCheckType {
}
@end
#endif // GODOT_MENU_ITEM_H

2
platform/macos/godot_menu_item.mm
View File

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "godot_menu_item.h"
#import "godot_menu_item.h"
@implementation GodotMenuItem

5
platform/macos/godot_open_save_delegate.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef GODOT_OPEN_SAVE_DELEGATE_H
#define GODOT_OPEN_SAVE_DELEGATE_H
#import <AppKit/AppKit.h>
#import <Foundation/Foundation.h>
#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
@ -63,5 +60,3 @@
- (void)setRootPath:(const String &)p_root_path;
@end
#endif // GODOT_OPEN_SAVE_DELEGATE_H

2
platform/macos/godot_open_save_delegate.mm
View File

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "godot_open_save_delegate.h"
#import "godot_open_save_delegate.h"
@implementation GodotOpenSaveDelegate

5
platform/macos/godot_status_item.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef GODOT_STATUS_ITEM_H
#define GODOT_STATUS_ITEM_H
#include "core/input/input_enums.h"
#include "core/variant/callable.h"
@ -46,5 +43,3 @@
- (void)setCallback:(const Callable &)callback;
@end
#endif // GODOT_STATUS_ITEM_H

4
platform/macos/godot_status_item.mm
View File

@ -28,9 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "godot_status_item.h"
#import "godot_status_item.h"
#include "display_server_macos.h"
#import "display_server_macos.h"
@implementation GodotStatusItemDelegate

5
platform/macos/godot_window.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef GODOT_WINDOW_H
#define GODOT_WINDOW_H
#include "servers/display_server.h"
#import <AppKit/AppKit.h>
@ -45,5 +42,3 @@
- (void)setAnimDuration:(NSTimeInterval)duration;
@end
#endif // GODOT_WINDOW_H

4
platform/macos/godot_window.mm
View File

@ -28,9 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "godot_window.h"
#import "godot_window.h"
#include "display_server_macos.h"
#import "display_server_macos.h"
@implementation GodotWindow

5
platform/macos/godot_window_delegate.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef GODOT_WINDOW_DELEGATE_H
#define GODOT_WINDOW_DELEGATE_H
#include "servers/display_server.h"
#import <AppKit/AppKit.h>
@ -43,5 +40,3 @@
- (void)setWindowID:(DisplayServer::WindowID)wid;
@end
#endif // GODOT_WINDOW_DELEGATE_H

8
platform/macos/godot_window_delegate.mm
View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "godot_window_delegate.h"
#import "godot_window_delegate.h"
#include "display_server_macos.h"
#include "godot_button_view.h"
#include "godot_window.h"
#import "display_server_macos.h"
#import "godot_button_view.h"
#import "godot_window.h"
@implementation GodotWindowDelegate

5
platform/macos/key_mapping_macos.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef KEY_MAPPING_MACOS_H
#define KEY_MAPPING_MACOS_H
#include "core/os/keyboard.h"
class KeyMappingMacOS {
@ -51,5 +48,3 @@ public:
static String keycode_get_native_string(Key p_keycode);
static unsigned int keycode_get_native_mask(Key p_keycode);
};
#endif // KEY_MAPPING_MACOS_H

2
platform/macos/key_mapping_macos.mm
View File

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "key_mapping_macos.h"
#import "key_mapping_macos.h"
#include "core/templates/hash_map.h"
#include "core/templates/hash_set.h"

5
platform/macos/macos_terminal_logger.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef MACOS_TERMINAL_LOGGER_H
#define MACOS_TERMINAL_LOGGER_H
#ifdef MACOS_ENABLED
#include "core/io/logger.h"
@ -41,5 +38,3 @@ public:
};
#endif // MACOS_ENABLED
#endif // MACOS_TERMINAL_LOGGER_H

2
platform/macos/macos_terminal_logger.mm
View File

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "macos_terminal_logger.h"
#import "macos_terminal_logger.h"
#ifdef MACOS_ENABLED

5
platform/macos/native_menu_macos.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef NATIVE_MENU_MACOS_H
#define NATIVE_MENU_MACOS_H
#include "core/templates/hash_map.h"
#include "core/templates/rid_owner.h"
#include "servers/display/native_menu.h"
@ -160,5 +157,3 @@ public:
NativeMenuMacOS();
~NativeMenuMacOS();
};
#endif // NATIVE_MENU_MACOS_H

8
platform/macos/native_menu_macos.mm
View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "native_menu_macos.h"
#import "native_menu_macos.h"
#include "display_server_macos.h"
#include "godot_menu_item.h"
#include "key_mapping_macos.h"
#import "display_server_macos.h"
#import "godot_menu_item.h"
#import "key_mapping_macos.h"
#include "scene/resources/image_texture.h"

7
platform/macos/os_macos.h
View File

@ -28,10 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef OS_MACOS_H
#define OS_MACOS_H
#include "crash_handler_macos.h"
#import "crash_handler_macos.h"
#include "core/input/input.h"
#import "drivers/apple/joypad_apple.h"
@ -137,5 +134,3 @@ public:
OS_MacOS();
~OS_MacOS();
};
#endif // OS_MACOS_H

14
platform/macos/os_macos.mm
View File

@ -28,13 +28,13 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "os_macos.h"
#import "os_macos.h"
#include "dir_access_macos.h"
#include "display_server_macos.h"
#include "godot_application.h"
#include "godot_application_delegate.h"
#include "macos_terminal_logger.h"
#import "dir_access_macos.h"
#import "display_server_macos.h"
#import "godot_application.h"
#import "godot_application_delegate.h"
#import "macos_terminal_logger.h"
#include "core/crypto/crypto_core.h"
#include "core/version_generated.gen.h"
@ -42,7 +42,7 @@
#include <dlfcn.h>
#include <libproc.h>
#include <mach-o/dyld.h>
#import <mach-o/dyld.h>
#include <os/log.h>
#include <sys/sysctl.h>

5
platform/macos/platform_config.h
View File

@ -28,6 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef PLATFORM_CONFIG_H
#define PLATFORM_CONFIG_H
#include <alloca.h>
#define PTHREAD_RENAME_SELF
@ -38,3 +41,5 @@
_Pragma("clang diagnostic ignored \"-Wshadow\"") \
__strong typeof(var) var = GDWeak_##var; \
_Pragma("clang diagnostic pop")
#endif // PLATFORM_CONFIG_H

5
platform/macos/rendering_context_driver_vulkan_macos.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef RENDERING_CONTEXT_DRIVER_VULKAN_MACOS_H
#define RENDERING_CONTEXT_DRIVER_VULKAN_MACOS_H
#ifdef VULKAN_ENABLED
#include "drivers/vulkan/rendering_context_driver_vulkan.h"
@ -54,5 +51,3 @@ public:
};
#endif // VULKAN_ENABLED
#endif // RENDERING_CONTEXT_DRIVER_VULKAN_MACOS_H

2
platform/macos/rendering_context_driver_vulkan_macos.mm
View File

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "rendering_context_driver_vulkan_macos.h"
#import "rendering_context_driver_vulkan_macos.h"
#ifdef VULKAN_ENABLED

5
platform/macos/tts_macos.h
View File

@ -28,9 +28,6 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef TTS_MACOS_H
#define TTS_MACOS_H
#include "core/string/ustring.h"
#include "core/templates/hash_map.h"
#include "core/templates/list.h"
@ -67,5 +64,3 @@
- (void)speak:(const String &)text voice:(const String &)voice volume:(int)volume pitch:(float)pitch rate:(float)rate utterance_id:(int)utterance_id interrupt:(bool)interrupt;
- (Array)getVoices;
@end
#endif // TTS_MACOS_H

2
platform/macos/tts_macos.mm
View File

@ -28,7 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#include "tts_macos.h"
#import "tts_macos.h"
@implementation TTS_MacOS

5
platform/web/platform_config.h
View File

@ -28,4 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef PLATFORM_CONFIG_H
#define PLATFORM_CONFIG_H
#include <alloca.h>
#endif // PLATFORM_CONFIG_H

5
platform/windows/platform_config.h
View File

@ -28,4 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef PLATFORM_CONFIG_H
#define PLATFORM_CONFIG_H
#include <malloc.h>
#endif // PLATFORM_CONFIG_H