From 2513403014290633065ac5b1793e446da3b9d9d1 Mon Sep 17 00:00:00 2001 From: Sanian <76259603+Sanian-Creations@users.noreply.github.com> Date: Mon, 16 Jan 2023 22:46:46 +0100 Subject: [PATCH 1/3] Removed an SDL_ prefix that was missed --- vendor/sdl2/sdl2.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/sdl2/sdl2.odin b/vendor/sdl2/sdl2.odin index a89394d4b..adf6dbd49 100644 --- a/vendor/sdl2/sdl2.odin +++ b/vendor/sdl2/sdl2.odin @@ -294,7 +294,7 @@ WindowShapeModeEnum :: enum c.int { ColorKey, } -SDL_SHAPEMODEALPHA :: #force_inline proc "c" (mode: WindowShapeModeEnum) -> bool { +SHAPEMODEALPHA :: #force_inline proc "c" (mode: WindowShapeModeEnum) -> bool { return bool(mode == .Default || mode == .BinarizeAlpha || mode == .ReverseBinarizeAlpha) } From a046c41c7cacc983f566920f0ee96f167edcb48f Mon Sep 17 00:00:00 2001 From: Sanian <76259603+Sanian-Creations@users.noreply.github.com> Date: Mon, 16 Jan 2023 23:41:11 +0100 Subject: [PATCH 2/3] Removed another missed SDL_ in sdl_mouse.odin `sdl2.SDL_MouseWheelDirection` is now `sdl2.MouseWheelDirection` --- vendor/sdl2/sdl_mouse.odin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vendor/sdl2/sdl_mouse.odin b/vendor/sdl2/sdl_mouse.odin index 13220c94b..0243b6623 100644 --- a/vendor/sdl2/sdl_mouse.odin +++ b/vendor/sdl2/sdl_mouse.odin @@ -38,7 +38,7 @@ SystemCursor :: enum c.int { NUM_SYSTEM_CURSORS, } -SDL_MouseWheelDirection :: enum c.int { +MouseWheelDirection :: enum c.int { NORMAL, /**< The scroll direction is normal */ FLIPPED, /**< The scroll direction is flipped / natural */ } From b918acd87170bb4949860ec1c8c42222b5384055 Mon Sep 17 00:00:00 2001 From: Sanian <76259603+Sanian-Creations@users.noreply.github.com> Date: Mon, 16 Jan 2023 23:45:03 +0100 Subject: [PATCH 3/3] Removed some more SDL_'s in sdl_render.odin --- vendor/sdl2/sdl_render.odin | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vendor/sdl2/sdl_render.odin b/vendor/sdl2/sdl_render.odin index 57845235b..f948b39b0 100644 --- a/vendor/sdl2/sdl_render.odin +++ b/vendor/sdl2/sdl_render.odin @@ -49,9 +49,9 @@ TextureAccess :: enum c.int { TARGET, /**< Texture can be used as a render target */ } -SDL_TEXTUREMODULATE_NONE :: 0x00000000 /**< No modulation */ -SDL_TEXTUREMODULATE_COLOR :: 0x00000001 /**< srcC = srcC * color */ -SDL_TEXTUREMODULATE_ALPHA :: 0x00000002 /**< srcA = srcA * alpha */ +TEXTUREMODULATE_NONE :: 0x00000000 /**< No modulation */ +TEXTUREMODULATE_COLOR :: 0x00000001 /**< srcC = srcC * color */ +TEXTUREMODULATE_ALPHA :: 0x00000002 /**< srcA = srcA * alpha */ /** * Flip constants for SDL_RenderCopyEx