From 71ee0c169d681c07b14e4e9c5e57237ca2ed35fb Mon Sep 17 00:00:00 2001 From: Lubos Lenco Date: Wed, 19 Feb 2025 22:50:23 +0100 Subject: [PATCH] Fix macos compile --- .../macos/kinc/backend/BasicOpenGLView.m.h | 32 +++++++++---------- .../backends/macos/kinc/backend/mouse.m.h | 2 +- .../backends/macos/kinc/backend/window.c.h | 1 - .../metal/kinc/backend/g5_texture.m.h | 3 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/armorcore/sources/backends/macos/kinc/backend/BasicOpenGLView.m.h b/armorcore/sources/backends/macos/kinc/backend/BasicOpenGLView.m.h index a591dbf3..511a7ef7 100644 --- a/armorcore/sources/backends/macos/kinc/backend/BasicOpenGLView.m.h +++ b/armorcore/sources/backends/macos/kinc/backend/BasicOpenGLView.m.h @@ -262,71 +262,71 @@ static bool controlKeyMouseButton = false; - (void)mouseDown:(NSEvent *)theEvent { if ([theEvent modifierFlags] & NSControlKeyMask) { controlKeyMouseButton = true; - kinc_internal_mouse_trigger_press(0, 1, getMouseX(theEvent), getMouseY(theEvent)); + kinc_internal_mouse_trigger_press(1, getMouseX(theEvent), getMouseY(theEvent)); } else { controlKeyMouseButton = false; - kinc_internal_mouse_trigger_press(0, 0, getMouseX(theEvent), getMouseY(theEvent)); + kinc_internal_mouse_trigger_press(0, getMouseX(theEvent), getMouseY(theEvent)); } if ([theEvent subtype] == NSTabletPointEventSubtype) { - kinc_internal_pen_trigger_press(0, getMouseX(theEvent), getMouseY(theEvent), theEvent.pressure); + kinc_internal_pen_trigger_press(getMouseX(theEvent), getMouseY(theEvent), theEvent.pressure); } } - (void)mouseUp:(NSEvent *)theEvent { if (controlKeyMouseButton) { - kinc_internal_mouse_trigger_release(0, 1, getMouseX(theEvent), getMouseY(theEvent)); + kinc_internal_mouse_trigger_release(1, getMouseX(theEvent), getMouseY(theEvent)); } else { - kinc_internal_mouse_trigger_release(0, 0, getMouseX(theEvent), getMouseY(theEvent)); + kinc_internal_mouse_trigger_release(0, getMouseX(theEvent), getMouseY(theEvent)); } controlKeyMouseButton = false; if ([theEvent subtype] == NSTabletPointEventSubtype) { - kinc_internal_pen_trigger_release(0, getMouseX(theEvent), getMouseY(theEvent), theEvent.pressure); + kinc_internal_pen_trigger_release(getMouseX(theEvent), getMouseY(theEvent), theEvent.pressure); } } - (void)mouseMoved:(NSEvent *)theEvent { - kinc_internal_mouse_trigger_move(0, getMouseX(theEvent), getMouseY(theEvent)); + kinc_internal_mouse_trigger_move(getMouseX(theEvent), getMouseY(theEvent)); } - (void)mouseDragged:(NSEvent *)theEvent { - kinc_internal_mouse_trigger_move(0, getMouseX(theEvent), getMouseY(theEvent)); + kinc_internal_mouse_trigger_move(getMouseX(theEvent), getMouseY(theEvent)); if ([theEvent subtype] == NSTabletPointEventSubtype) { - kinc_internal_pen_trigger_move(0, getMouseX(theEvent), getMouseY(theEvent), theEvent.pressure); + kinc_internal_pen_trigger_move(getMouseX(theEvent), getMouseY(theEvent), theEvent.pressure); } } - (void)rightMouseDown:(NSEvent *)theEvent { - kinc_internal_mouse_trigger_press(0, 1, getMouseX(theEvent), getMouseY(theEvent)); + kinc_internal_mouse_trigger_press(1, getMouseX(theEvent), getMouseY(theEvent)); } - (void)rightMouseUp:(NSEvent *)theEvent { - kinc_internal_mouse_trigger_release(0, 1, getMouseX(theEvent), getMouseY(theEvent)); + kinc_internal_mouse_trigger_release(1, getMouseX(theEvent), getMouseY(theEvent)); } - (void)rightMouseDragged:(NSEvent *)theEvent { - kinc_internal_mouse_trigger_move(0, getMouseX(theEvent), getMouseY(theEvent)); + kinc_internal_mouse_trigger_move(getMouseX(theEvent), getMouseY(theEvent)); } - (void)otherMouseDown:(NSEvent *)theEvent { - kinc_internal_mouse_trigger_press(0, 2, getMouseX(theEvent), getMouseY(theEvent)); + kinc_internal_mouse_trigger_press(2, getMouseX(theEvent), getMouseY(theEvent)); } - (void)otherMouseUp:(NSEvent *)theEvent { - kinc_internal_mouse_trigger_release(0, 2, getMouseX(theEvent), getMouseY(theEvent)); + kinc_internal_mouse_trigger_release(2, getMouseX(theEvent), getMouseY(theEvent)); } - (void)otherMouseDragged:(NSEvent *)theEvent { - kinc_internal_mouse_trigger_move(0, getMouseX(theEvent), getMouseY(theEvent)); + kinc_internal_mouse_trigger_move(getMouseX(theEvent), getMouseY(theEvent)); } - (void)scrollWheel:(NSEvent *)theEvent { int delta = [theEvent deltaY]; - kinc_internal_mouse_trigger_scroll(0, -delta); + kinc_internal_mouse_trigger_scroll(-delta); } - (NSDragOperation)draggingEntered:(id)sender { diff --git a/armorcore/sources/backends/macos/kinc/backend/mouse.m.h b/armorcore/sources/backends/macos/kinc/backend/mouse.m.h index 9c0e8bce..71e9401c 100644 --- a/armorcore/sources/backends/macos/kinc/backend/mouse.m.h +++ b/armorcore/sources/backends/macos/kinc/backend/mouse.m.h @@ -34,7 +34,7 @@ void kinc_mouse_set_position(int x, int y) { point.x = window.frame.origin.x + (x / scale); point.y = rect.size.height - (window.frame.origin.y + (y / scale)); - CGDisplayMoveCursorToPoint(point); + CGDisplayMoveCursorToPoint(0, point); CGAssociateMouseAndMouseCursorPosition(true); } diff --git a/armorcore/sources/backends/macos/kinc/backend/window.c.h b/armorcore/sources/backends/macos/kinc/backend/window.c.h index 6709aded..d05dd7cb 100644 --- a/armorcore/sources/backends/macos/kinc/backend/window.c.h +++ b/armorcore/sources/backends/macos/kinc/backend/window.c.h @@ -27,7 +27,6 @@ void kinc_window_hide() {} void kinc_window_set_title(const char *title) {} void kinc_window_create(kinc_window_options_t *win, kinc_framebuffer_options_t *frame) { - return 0; } void kinc_window_set_resize_callback(void (*callback)(int x, int y, void *data), void *data) { diff --git a/armorcore/sources/backends/metal/kinc/backend/g5_texture.m.h b/armorcore/sources/backends/metal/kinc/backend/g5_texture.m.h index 322c5bd8..0a3998af 100644 --- a/armorcore/sources/backends/metal/kinc/backend/g5_texture.m.h +++ b/armorcore/sources/backends/metal/kinc/backend/g5_texture.m.h @@ -117,6 +117,7 @@ int kinc_g5_texture_stride(kinc_g5_texture_t *texture) { return texture->width; case KINC_IMAGE_FORMAT_RGBA32: case KINC_IMAGE_FORMAT_BGRA32: + default: return texture->width * 4; case KINC_IMAGE_FORMAT_RGBA64: return texture->width * 8; @@ -137,7 +138,7 @@ void kinc_g5_texture_unlock(kinc_g5_texture_t *tex) { withBytes:tex->impl.data bytesPerRow:kinc_g5_texture_stride(tex) bytesPerImage:kinc_g5_texture_stride(tex) * tex->height]; - texture->_uploaded = false; + tex->_uploaded = false; } void kinc_g5_texture_generate_mipmaps(kinc_g5_texture_t *texture, int levels) {}