From e4cd163c5f9c99c6e8b44f144f076209b3b2001e Mon Sep 17 00:00:00 2001 From: Jake Turner Date: Thu, 1 Apr 2021 06:35:10 +0100 Subject: [PATCH] Reformatting *.mm files with clang-format --- renderdoc/driver/vulkan/vk_apple.mm | 2 +- renderdoc/os/posix/apple/apple_helpers.mm | 41 ++++++++++++----------- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/renderdoc/driver/vulkan/vk_apple.mm b/renderdoc/driver/vulkan/vk_apple.mm index 47895b929..0d3ee50ab 100644 --- a/renderdoc/driver/vulkan/vk_apple.mm +++ b/renderdoc/driver/vulkan/vk_apple.mm @@ -1,6 +1,6 @@ #import -void getMetalLayerSize(void* layerHandle, int& width, int& height) +void getMetalLayerSize(void *layerHandle, int &width, int &height) { CALayer *layer = (CALayer *)layerHandle; assert([layer isKindOfClass:[CALayer class]]); diff --git a/renderdoc/os/posix/apple/apple_helpers.mm b/renderdoc/os/posix/apple/apple_helpers.mm index db8ccfdfc..3d1f87332 100644 --- a/renderdoc/os/posix/apple/apple_helpers.mm +++ b/renderdoc/os/posix/apple/apple_helpers.mm @@ -30,28 +30,29 @@ static id s_eventMonitor; void apple_InitKeyboard() { - s_eventMonitor = [NSEvent addLocalMonitorForEventsMatchingMask: - (NSEventMaskKeyDown|NSEventMaskKeyUp) - handler:^(NSEvent *incomingEvent) { - NSEvent *result = incomingEvent; - //NSWindow *targetWindowForEvent = [incomingEvent window]; - //if (targetWindowForEvent == _window) - { - unsigned short keyCode = [incomingEvent keyCode]; - if ([incomingEvent type] == NSEventTypeKeyDown) - { - s_keysPressed[keyCode] = true; - } - if ([incomingEvent type] == NSEventTypeKeyUp) - { - s_keysPressed[keyCode] = false; - } - } - return result; - }]; + s_eventMonitor = + [NSEvent addLocalMonitorForEventsMatchingMask:(NSEventMaskKeyDown | NSEventMaskKeyUp) + handler:^(NSEvent *incomingEvent) { + NSEvent *result = incomingEvent; + // NSWindow *targetWindowForEvent = [incomingEvent + // window]; + // if (targetWindowForEvent == _window) + { + unsigned short keyCode = [incomingEvent keyCode]; + if([incomingEvent type] == NSEventTypeKeyDown) + { + s_keysPressed[keyCode] = true; + } + if([incomingEvent type] == NSEventTypeKeyUp) + { + s_keysPressed[keyCode] = false; + } + } + return result; + }]; } bool apple_IsKeyPressed(int appleKeyCode) { - return s_keysPressed[appleKeyCode]; + return s_keysPressed[appleKeyCode]; }