diff options
author | Fox Caminiti <fox@foxcam.net> | 2022-12-22 13:29:02 -0500 |
---|---|---|
committer | Fox Caminiti <fox@foxcam.net> | 2022-12-22 13:29:02 -0500 |
commit | 375c120d30456738897c4bd775e38aa1db7d239c (patch) | |
tree | 5b365a6233cf736db15fa52fcfac4ba80a986217 /dependencies | |
parent | 4854647d659f75ac6cf4575b61d1dcfd25865791 (diff) |
v3.1
Diffstat (limited to 'dependencies')
-rw-r--r-- | dependencies/include/SDL/SDL.h (renamed from dependencies/SDL/SDL.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_assert.h (renamed from dependencies/SDL/SDL_assert.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_atomic.h (renamed from dependencies/SDL/SDL_atomic.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_audio.h (renamed from dependencies/SDL/SDL_audio.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_bits.h (renamed from dependencies/SDL/SDL_bits.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_blendmode.h (renamed from dependencies/SDL/SDL_blendmode.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_clipboard.h (renamed from dependencies/SDL/SDL_clipboard.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_config.h (renamed from dependencies/SDL/SDL_config.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_copying.h (renamed from dependencies/SDL/SDL_copying.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_cpuinfo.h (renamed from dependencies/SDL/SDL_cpuinfo.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_egl.h (renamed from dependencies/SDL/SDL_egl.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_endian.h (renamed from dependencies/SDL/SDL_endian.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_error.h (renamed from dependencies/SDL/SDL_error.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_events.h (renamed from dependencies/SDL/SDL_events.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_filesystem.h (renamed from dependencies/SDL/SDL_filesystem.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_gamecontroller.h (renamed from dependencies/SDL/SDL_gamecontroller.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_gesture.h (renamed from dependencies/SDL/SDL_gesture.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_guid.h (renamed from dependencies/SDL/SDL_guid.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_haptic.h (renamed from dependencies/SDL/SDL_haptic.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_hidapi.h (renamed from dependencies/SDL/SDL_hidapi.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_hints.h (renamed from dependencies/SDL/SDL_hints.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_joystick.h (renamed from dependencies/SDL/SDL_joystick.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_keyboard.h (renamed from dependencies/SDL/SDL_keyboard.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_keycode.h (renamed from dependencies/SDL/SDL_keycode.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_loadso.h (renamed from dependencies/SDL/SDL_loadso.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_locale.h (renamed from dependencies/SDL/SDL_locale.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_log.h (renamed from dependencies/SDL/SDL_log.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_main.h (renamed from dependencies/SDL/SDL_main.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_messagebox.h (renamed from dependencies/SDL/SDL_messagebox.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_metal.h (renamed from dependencies/SDL/SDL_metal.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_misc.h (renamed from dependencies/SDL/SDL_misc.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_mouse.h (renamed from dependencies/SDL/SDL_mouse.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_mutex.h (renamed from dependencies/SDL/SDL_mutex.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_name.h (renamed from dependencies/SDL/SDL_name.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_opengl.h (renamed from dependencies/SDL/SDL_opengl.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_opengl_glext.h (renamed from dependencies/SDL/SDL_opengl_glext.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_opengles.h (renamed from dependencies/SDL/SDL_opengles.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_opengles2.h (renamed from dependencies/SDL/SDL_opengles2.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_opengles2_gl2.h (renamed from dependencies/SDL/SDL_opengles2_gl2.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_opengles2_gl2ext.h (renamed from dependencies/SDL/SDL_opengles2_gl2ext.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_opengles2_gl2platform.h (renamed from dependencies/SDL/SDL_opengles2_gl2platform.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_opengles2_khrplatform.h (renamed from dependencies/SDL/SDL_opengles2_khrplatform.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_pixels.h (renamed from dependencies/SDL/SDL_pixels.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_platform.h (renamed from dependencies/SDL/SDL_platform.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_power.h (renamed from dependencies/SDL/SDL_power.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_quit.h (renamed from dependencies/SDL/SDL_quit.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_rect.h (renamed from dependencies/SDL/SDL_rect.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_render.h (renamed from dependencies/SDL/SDL_render.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_revision.h (renamed from dependencies/SDL/SDL_revision.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_rwops.h (renamed from dependencies/SDL/SDL_rwops.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_scancode.h (renamed from dependencies/SDL/SDL_scancode.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_sensor.h (renamed from dependencies/SDL/SDL_sensor.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_shape.h (renamed from dependencies/SDL/SDL_shape.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_stdinc.h (renamed from dependencies/SDL/SDL_stdinc.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_surface.h (renamed from dependencies/SDL/SDL_surface.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_system.h (renamed from dependencies/SDL/SDL_system.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_syswm.h (renamed from dependencies/SDL/SDL_syswm.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test.h (renamed from dependencies/SDL/SDL_test.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test_assert.h (renamed from dependencies/SDL/SDL_test_assert.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test_common.h (renamed from dependencies/SDL/SDL_test_common.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test_compare.h (renamed from dependencies/SDL/SDL_test_compare.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test_crc32.h (renamed from dependencies/SDL/SDL_test_crc32.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test_font.h (renamed from dependencies/SDL/SDL_test_font.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test_fuzzer.h (renamed from dependencies/SDL/SDL_test_fuzzer.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test_harness.h (renamed from dependencies/SDL/SDL_test_harness.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test_images.h (renamed from dependencies/SDL/SDL_test_images.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test_log.h (renamed from dependencies/SDL/SDL_test_log.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test_md5.h (renamed from dependencies/SDL/SDL_test_md5.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test_memory.h (renamed from dependencies/SDL/SDL_test_memory.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_test_random.h (renamed from dependencies/SDL/SDL_test_random.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_thread.h (renamed from dependencies/SDL/SDL_thread.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_timer.h (renamed from dependencies/SDL/SDL_timer.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_touch.h (renamed from dependencies/SDL/SDL_touch.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_types.h (renamed from dependencies/SDL/SDL_types.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_version.h (renamed from dependencies/SDL/SDL_version.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_video.h (renamed from dependencies/SDL/SDL_video.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/SDL_vulkan.h (renamed from dependencies/SDL/SDL_vulkan.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/begin_code.h (renamed from dependencies/SDL/begin_code.h) | 0 | ||||
-rw-r--r-- | dependencies/include/SDL/close_code.h (renamed from dependencies/SDL/close_code.h) | 0 | ||||
-rw-r--r-- | dependencies/src/imgui/imgui_impl_sdl.cpp | 34 |
80 files changed, 34 insertions, 0 deletions
diff --git a/dependencies/SDL/SDL.h b/dependencies/include/SDL/SDL.h index 12e7f31..12e7f31 100644 --- a/dependencies/SDL/SDL.h +++ b/dependencies/include/SDL/SDL.h diff --git a/dependencies/SDL/SDL_assert.h b/dependencies/include/SDL/SDL_assert.h index e71cf97..e71cf97 100644 --- a/dependencies/SDL/SDL_assert.h +++ b/dependencies/include/SDL/SDL_assert.h diff --git a/dependencies/SDL/SDL_atomic.h b/dependencies/include/SDL/SDL_atomic.h index f0c05f4..f0c05f4 100644 --- a/dependencies/SDL/SDL_atomic.h +++ b/dependencies/include/SDL/SDL_atomic.h diff --git a/dependencies/SDL/SDL_audio.h b/dependencies/include/SDL/SDL_audio.h index c42de3e..c42de3e 100644 --- a/dependencies/SDL/SDL_audio.h +++ b/dependencies/include/SDL/SDL_audio.h diff --git a/dependencies/SDL/SDL_bits.h b/dependencies/include/SDL/SDL_bits.h index 22cb853..22cb853 100644 --- a/dependencies/SDL/SDL_bits.h +++ b/dependencies/include/SDL/SDL_bits.h diff --git a/dependencies/SDL/SDL_blendmode.h b/dependencies/include/SDL/SDL_blendmode.h index 08c9f9d..08c9f9d 100644 --- a/dependencies/SDL/SDL_blendmode.h +++ b/dependencies/include/SDL/SDL_blendmode.h diff --git a/dependencies/SDL/SDL_clipboard.h b/dependencies/include/SDL/SDL_clipboard.h index 783c7c2..783c7c2 100644 --- a/dependencies/SDL/SDL_clipboard.h +++ b/dependencies/include/SDL/SDL_clipboard.h diff --git a/dependencies/SDL/SDL_config.h b/dependencies/include/SDL/SDL_config.h index c6283b2..c6283b2 100644 --- a/dependencies/SDL/SDL_config.h +++ b/dependencies/include/SDL/SDL_config.h diff --git a/dependencies/SDL/SDL_copying.h b/dependencies/include/SDL/SDL_copying.h index 49e3f9d..49e3f9d 100644 --- a/dependencies/SDL/SDL_copying.h +++ b/dependencies/include/SDL/SDL_copying.h diff --git a/dependencies/SDL/SDL_cpuinfo.h b/dependencies/include/SDL/SDL_cpuinfo.h index b5ad0fc..b5ad0fc 100644 --- a/dependencies/SDL/SDL_cpuinfo.h +++ b/dependencies/include/SDL/SDL_cpuinfo.h diff --git a/dependencies/SDL/SDL_egl.h b/dependencies/include/SDL/SDL_egl.h index e8bd657..e8bd657 100644 --- a/dependencies/SDL/SDL_egl.h +++ b/dependencies/include/SDL/SDL_egl.h diff --git a/dependencies/SDL/SDL_endian.h b/dependencies/include/SDL/SDL_endian.h index c3f8431..c3f8431 100644 --- a/dependencies/SDL/SDL_endian.h +++ b/dependencies/include/SDL/SDL_endian.h diff --git a/dependencies/SDL/SDL_error.h b/dependencies/include/SDL/SDL_error.h index 5c961e4..5c961e4 100644 --- a/dependencies/SDL/SDL_error.h +++ b/dependencies/include/SDL/SDL_error.h diff --git a/dependencies/SDL/SDL_events.h b/dependencies/include/SDL/SDL_events.h index 55a343e..55a343e 100644 --- a/dependencies/SDL/SDL_events.h +++ b/dependencies/include/SDL/SDL_events.h diff --git a/dependencies/SDL/SDL_filesystem.h b/dependencies/include/SDL/SDL_filesystem.h index 1914f81..1914f81 100644 --- a/dependencies/SDL/SDL_filesystem.h +++ b/dependencies/include/SDL/SDL_filesystem.h diff --git a/dependencies/SDL/SDL_gamecontroller.h b/dependencies/include/SDL/SDL_gamecontroller.h index 4703b63..4703b63 100644 --- a/dependencies/SDL/SDL_gamecontroller.h +++ b/dependencies/include/SDL/SDL_gamecontroller.h diff --git a/dependencies/SDL/SDL_gesture.h b/dependencies/include/SDL/SDL_gesture.h index e2caea2..e2caea2 100644 --- a/dependencies/SDL/SDL_gesture.h +++ b/dependencies/include/SDL/SDL_gesture.h diff --git a/dependencies/SDL/SDL_guid.h b/dependencies/include/SDL/SDL_guid.h index b971636..b971636 100644 --- a/dependencies/SDL/SDL_guid.h +++ b/dependencies/include/SDL/SDL_guid.h diff --git a/dependencies/SDL/SDL_haptic.h b/dependencies/include/SDL/SDL_haptic.h index f240ae9..f240ae9 100644 --- a/dependencies/SDL/SDL_haptic.h +++ b/dependencies/include/SDL/SDL_haptic.h diff --git a/dependencies/SDL/SDL_hidapi.h b/dependencies/include/SDL/SDL_hidapi.h index 354af5c..354af5c 100644 --- a/dependencies/SDL/SDL_hidapi.h +++ b/dependencies/include/SDL/SDL_hidapi.h diff --git a/dependencies/SDL/SDL_hints.h b/dependencies/include/SDL/SDL_hints.h index 76a74f0..76a74f0 100644 --- a/dependencies/SDL/SDL_hints.h +++ b/dependencies/include/SDL/SDL_hints.h diff --git a/dependencies/SDL/SDL_joystick.h b/dependencies/include/SDL/SDL_joystick.h index 72c6604..72c6604 100644 --- a/dependencies/SDL/SDL_joystick.h +++ b/dependencies/include/SDL/SDL_joystick.h diff --git a/dependencies/SDL/SDL_keyboard.h b/dependencies/include/SDL/SDL_keyboard.h index e7663fb..e7663fb 100644 --- a/dependencies/SDL/SDL_keyboard.h +++ b/dependencies/include/SDL/SDL_keyboard.h diff --git a/dependencies/SDL/SDL_keycode.h b/dependencies/include/SDL/SDL_keycode.h index 65420f2..65420f2 100644 --- a/dependencies/SDL/SDL_keycode.h +++ b/dependencies/include/SDL/SDL_keycode.h diff --git a/dependencies/SDL/SDL_loadso.h b/dependencies/include/SDL/SDL_loadso.h index 61857c8..61857c8 100644 --- a/dependencies/SDL/SDL_loadso.h +++ b/dependencies/include/SDL/SDL_loadso.h diff --git a/dependencies/SDL/SDL_locale.h b/dependencies/include/SDL/SDL_locale.h index 7515779..7515779 100644 --- a/dependencies/SDL/SDL_locale.h +++ b/dependencies/include/SDL/SDL_locale.h diff --git a/dependencies/SDL/SDL_log.h b/dependencies/include/SDL/SDL_log.h index 1d8b20b..1d8b20b 100644 --- a/dependencies/SDL/SDL_log.h +++ b/dependencies/include/SDL/SDL_log.h diff --git a/dependencies/SDL/SDL_main.h b/dependencies/include/SDL/SDL_main.h index 113d11d..113d11d 100644 --- a/dependencies/SDL/SDL_main.h +++ b/dependencies/include/SDL/SDL_main.h diff --git a/dependencies/SDL/SDL_messagebox.h b/dependencies/include/SDL/SDL_messagebox.h index d763534..d763534 100644 --- a/dependencies/SDL/SDL_messagebox.h +++ b/dependencies/include/SDL/SDL_messagebox.h diff --git a/dependencies/SDL/SDL_metal.h b/dependencies/include/SDL/SDL_metal.h index 9285471..9285471 100644 --- a/dependencies/SDL/SDL_metal.h +++ b/dependencies/include/SDL/SDL_metal.h diff --git a/dependencies/SDL/SDL_misc.h b/dependencies/include/SDL/SDL_misc.h index 261b6b8..261b6b8 100644 --- a/dependencies/SDL/SDL_misc.h +++ b/dependencies/include/SDL/SDL_misc.h diff --git a/dependencies/SDL/SDL_mouse.h b/dependencies/include/SDL/SDL_mouse.h index b318c70..b318c70 100644 --- a/dependencies/SDL/SDL_mouse.h +++ b/dependencies/include/SDL/SDL_mouse.h diff --git a/dependencies/SDL/SDL_mutex.h b/dependencies/include/SDL/SDL_mutex.h index 173468f..173468f 100644 --- a/dependencies/SDL/SDL_mutex.h +++ b/dependencies/include/SDL/SDL_mutex.h diff --git a/dependencies/SDL/SDL_name.h b/dependencies/include/SDL/SDL_name.h index 6ff35b4..6ff35b4 100644 --- a/dependencies/SDL/SDL_name.h +++ b/dependencies/include/SDL/SDL_name.h diff --git a/dependencies/SDL/SDL_opengl.h b/dependencies/include/SDL/SDL_opengl.h index 0f2b257..0f2b257 100644 --- a/dependencies/SDL/SDL_opengl.h +++ b/dependencies/include/SDL/SDL_opengl.h diff --git a/dependencies/SDL/SDL_opengl_glext.h b/dependencies/include/SDL/SDL_opengl_glext.h index 8527e17..8527e17 100644 --- a/dependencies/SDL/SDL_opengl_glext.h +++ b/dependencies/include/SDL/SDL_opengl_glext.h diff --git a/dependencies/SDL/SDL_opengles.h b/dependencies/include/SDL/SDL_opengles.h index 8511b96..8511b96 100644 --- a/dependencies/SDL/SDL_opengles.h +++ b/dependencies/include/SDL/SDL_opengles.h diff --git a/dependencies/SDL/SDL_opengles2.h b/dependencies/include/SDL/SDL_opengles2.h index 172fcb3..172fcb3 100644 --- a/dependencies/SDL/SDL_opengles2.h +++ b/dependencies/include/SDL/SDL_opengles2.h diff --git a/dependencies/SDL/SDL_opengles2_gl2.h b/dependencies/include/SDL/SDL_opengles2_gl2.h index d13622a..d13622a 100644 --- a/dependencies/SDL/SDL_opengles2_gl2.h +++ b/dependencies/include/SDL/SDL_opengles2_gl2.h diff --git a/dependencies/SDL/SDL_opengles2_gl2ext.h b/dependencies/include/SDL/SDL_opengles2_gl2ext.h index 9448ce0..9448ce0 100644 --- a/dependencies/SDL/SDL_opengles2_gl2ext.h +++ b/dependencies/include/SDL/SDL_opengles2_gl2ext.h diff --git a/dependencies/SDL/SDL_opengles2_gl2platform.h b/dependencies/include/SDL/SDL_opengles2_gl2platform.h index 426796e..426796e 100644 --- a/dependencies/SDL/SDL_opengles2_gl2platform.h +++ b/dependencies/include/SDL/SDL_opengles2_gl2platform.h diff --git a/dependencies/SDL/SDL_opengles2_khrplatform.h b/dependencies/include/SDL/SDL_opengles2_khrplatform.h index 0164644..0164644 100644 --- a/dependencies/SDL/SDL_opengles2_khrplatform.h +++ b/dependencies/include/SDL/SDL_opengles2_khrplatform.h diff --git a/dependencies/SDL/SDL_pixels.h b/dependencies/include/SDL/SDL_pixels.h index 5d2c0c8..5d2c0c8 100644 --- a/dependencies/SDL/SDL_pixels.h +++ b/dependencies/include/SDL/SDL_pixels.h diff --git a/dependencies/SDL/SDL_platform.h b/dependencies/include/SDL/SDL_platform.h index a8e3ac2..a8e3ac2 100644 --- a/dependencies/SDL/SDL_platform.h +++ b/dependencies/include/SDL/SDL_platform.h diff --git a/dependencies/SDL/SDL_power.h b/dependencies/include/SDL/SDL_power.h index ecb3f4b..ecb3f4b 100644 --- a/dependencies/SDL/SDL_power.h +++ b/dependencies/include/SDL/SDL_power.h diff --git a/dependencies/SDL/SDL_quit.h b/dependencies/include/SDL/SDL_quit.h index 4090f7f..4090f7f 100644 --- a/dependencies/SDL/SDL_quit.h +++ b/dependencies/include/SDL/SDL_quit.h diff --git a/dependencies/SDL/SDL_rect.h b/dependencies/include/SDL/SDL_rect.h index 6c641c5..6c641c5 100644 --- a/dependencies/SDL/SDL_rect.h +++ b/dependencies/include/SDL/SDL_rect.h diff --git a/dependencies/SDL/SDL_render.h b/dependencies/include/SDL/SDL_render.h index 5b7b059..5b7b059 100644 --- a/dependencies/SDL/SDL_render.h +++ b/dependencies/include/SDL/SDL_render.h diff --git a/dependencies/SDL/SDL_revision.h b/dependencies/include/SDL/SDL_revision.h index 5f44fb5..5f44fb5 100644 --- a/dependencies/SDL/SDL_revision.h +++ b/dependencies/include/SDL/SDL_revision.h diff --git a/dependencies/SDL/SDL_rwops.h b/dependencies/include/SDL/SDL_rwops.h index 3960f56..3960f56 100644 --- a/dependencies/SDL/SDL_rwops.h +++ b/dependencies/include/SDL/SDL_rwops.h diff --git a/dependencies/SDL/SDL_scancode.h b/dependencies/include/SDL/SDL_scancode.h index 17e8fe2..17e8fe2 100644 --- a/dependencies/SDL/SDL_scancode.h +++ b/dependencies/include/SDL/SDL_scancode.h diff --git a/dependencies/SDL/SDL_sensor.h b/dependencies/include/SDL/SDL_sensor.h index 684d2c6..684d2c6 100644 --- a/dependencies/SDL/SDL_sensor.h +++ b/dependencies/include/SDL/SDL_sensor.h diff --git a/dependencies/SDL/SDL_shape.h b/dependencies/include/SDL/SDL_shape.h index 1bca927..1bca927 100644 --- a/dependencies/SDL/SDL_shape.h +++ b/dependencies/include/SDL/SDL_shape.h diff --git a/dependencies/SDL/SDL_stdinc.h b/dependencies/include/SDL/SDL_stdinc.h index 70dba7d..70dba7d 100644 --- a/dependencies/SDL/SDL_stdinc.h +++ b/dependencies/include/SDL/SDL_stdinc.h diff --git a/dependencies/SDL/SDL_surface.h b/dependencies/include/SDL/SDL_surface.h index 838de65..838de65 100644 --- a/dependencies/SDL/SDL_surface.h +++ b/dependencies/include/SDL/SDL_surface.h diff --git a/dependencies/SDL/SDL_system.h b/dependencies/include/SDL/SDL_system.h index 0edca63..0edca63 100644 --- a/dependencies/SDL/SDL_system.h +++ b/dependencies/include/SDL/SDL_system.h diff --git a/dependencies/SDL/SDL_syswm.h b/dependencies/include/SDL/SDL_syswm.h index 45f8e75..45f8e75 100644 --- a/dependencies/SDL/SDL_syswm.h +++ b/dependencies/include/SDL/SDL_syswm.h diff --git a/dependencies/SDL/SDL_test.h b/dependencies/include/SDL/SDL_test.h index 8cc9d61..8cc9d61 100644 --- a/dependencies/SDL/SDL_test.h +++ b/dependencies/include/SDL/SDL_test.h diff --git a/dependencies/SDL/SDL_test_assert.h b/dependencies/include/SDL/SDL_test_assert.h index 7342305..7342305 100644 --- a/dependencies/SDL/SDL_test_assert.h +++ b/dependencies/include/SDL/SDL_test_assert.h diff --git a/dependencies/SDL/SDL_test_common.h b/dependencies/include/SDL/SDL_test_common.h index b86520d..b86520d 100644 --- a/dependencies/SDL/SDL_test_common.h +++ b/dependencies/include/SDL/SDL_test_common.h diff --git a/dependencies/SDL/SDL_test_compare.h b/dependencies/include/SDL/SDL_test_compare.h index 8a7a070..8a7a070 100644 --- a/dependencies/SDL/SDL_test_compare.h +++ b/dependencies/include/SDL/SDL_test_compare.h diff --git a/dependencies/SDL/SDL_test_crc32.h b/dependencies/include/SDL/SDL_test_crc32.h index 049da74..049da74 100644 --- a/dependencies/SDL/SDL_test_crc32.h +++ b/dependencies/include/SDL/SDL_test_crc32.h diff --git a/dependencies/SDL/SDL_test_font.h b/dependencies/include/SDL/SDL_test_font.h index 6e7247d..6e7247d 100644 --- a/dependencies/SDL/SDL_test_font.h +++ b/dependencies/include/SDL/SDL_test_font.h diff --git a/dependencies/SDL/SDL_test_fuzzer.h b/dependencies/include/SDL/SDL_test_fuzzer.h index bbe8eb8..bbe8eb8 100644 --- a/dependencies/SDL/SDL_test_fuzzer.h +++ b/dependencies/include/SDL/SDL_test_fuzzer.h diff --git a/dependencies/SDL/SDL_test_harness.h b/dependencies/include/SDL/SDL_test_harness.h index 1fd4236..1fd4236 100644 --- a/dependencies/SDL/SDL_test_harness.h +++ b/dependencies/include/SDL/SDL_test_harness.h diff --git a/dependencies/SDL/SDL_test_images.h b/dependencies/include/SDL/SDL_test_images.h index e2bfc36..e2bfc36 100644 --- a/dependencies/SDL/SDL_test_images.h +++ b/dependencies/include/SDL/SDL_test_images.h diff --git a/dependencies/SDL/SDL_test_log.h b/dependencies/include/SDL/SDL_test_log.h index e3d39ad..e3d39ad 100644 --- a/dependencies/SDL/SDL_test_log.h +++ b/dependencies/include/SDL/SDL_test_log.h diff --git a/dependencies/SDL/SDL_test_md5.h b/dependencies/include/SDL/SDL_test_md5.h index 17b1d2b..17b1d2b 100644 --- a/dependencies/SDL/SDL_test_md5.h +++ b/dependencies/include/SDL/SDL_test_md5.h diff --git a/dependencies/SDL/SDL_test_memory.h b/dependencies/include/SDL/SDL_test_memory.h index cc2edc1..cc2edc1 100644 --- a/dependencies/SDL/SDL_test_memory.h +++ b/dependencies/include/SDL/SDL_test_memory.h diff --git a/dependencies/SDL/SDL_test_random.h b/dependencies/include/SDL/SDL_test_random.h index b1d6060..b1d6060 100644 --- a/dependencies/SDL/SDL_test_random.h +++ b/dependencies/include/SDL/SDL_test_random.h diff --git a/dependencies/SDL/SDL_thread.h b/dependencies/include/SDL/SDL_thread.h index 7364f81..7364f81 100644 --- a/dependencies/SDL/SDL_thread.h +++ b/dependencies/include/SDL/SDL_thread.h diff --git a/dependencies/SDL/SDL_timer.h b/dependencies/include/SDL/SDL_timer.h index 62f81d4..62f81d4 100644 --- a/dependencies/SDL/SDL_timer.h +++ b/dependencies/include/SDL/SDL_timer.h diff --git a/dependencies/SDL/SDL_touch.h b/dependencies/include/SDL/SDL_touch.h index 9592413..9592413 100644 --- a/dependencies/SDL/SDL_touch.h +++ b/dependencies/include/SDL/SDL_touch.h diff --git a/dependencies/SDL/SDL_types.h b/dependencies/include/SDL/SDL_types.h index 355fb50..355fb50 100644 --- a/dependencies/SDL/SDL_types.h +++ b/dependencies/include/SDL/SDL_types.h diff --git a/dependencies/SDL/SDL_version.h b/dependencies/include/SDL/SDL_version.h index 786b112..786b112 100644 --- a/dependencies/SDL/SDL_version.h +++ b/dependencies/include/SDL/SDL_version.h diff --git a/dependencies/SDL/SDL_video.h b/dependencies/include/SDL/SDL_video.h index b2f1509..b2f1509 100644 --- a/dependencies/SDL/SDL_video.h +++ b/dependencies/include/SDL/SDL_video.h diff --git a/dependencies/SDL/SDL_vulkan.h b/dependencies/include/SDL/SDL_vulkan.h index ab86a0b..ab86a0b 100644 --- a/dependencies/SDL/SDL_vulkan.h +++ b/dependencies/include/SDL/SDL_vulkan.h diff --git a/dependencies/SDL/begin_code.h b/dependencies/include/SDL/begin_code.h index b3e69e8..b3e69e8 100644 --- a/dependencies/SDL/begin_code.h +++ b/dependencies/include/SDL/begin_code.h diff --git a/dependencies/SDL/close_code.h b/dependencies/include/SDL/close_code.h index dc73432..dc73432 100644 --- a/dependencies/SDL/close_code.h +++ b/dependencies/include/SDL/close_code.h diff --git a/dependencies/src/imgui/imgui_impl_sdl.cpp b/dependencies/src/imgui/imgui_impl_sdl.cpp index 1273a2f..34e1abb 100644 --- a/dependencies/src/imgui/imgui_impl_sdl.cpp +++ b/dependencies/src/imgui/imgui_impl_sdl.cpp @@ -278,6 +278,18 @@ bool ImGui_ImplSDL2_ProcessEvent(const SDL_Event* event) SDL_GetWindowPosition(SDL_GetWindowFromID(event->motion.windowID), &window_x, &window_y); mouse_pos.x += window_x; mouse_pos.y += window_y; + } else { +#if defined(__APPLE__) + // Fix for high DPI mac + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + int display_id = SDL_GetWindowDisplayIndex(SDL_GetWindowFromID(event->motion.windowID)); + if (!platform_io.Monitors.empty() && platform_io.Monitors[display_id].DpiScale > 1.0f) + { + // The Framebuffer is scaled by an integer ceiling of the actual ratio, so 2.0 not 1.685 on Mac! + mouse_pos.x *= roundf(platform_io.Monitors[display_id].DpiScale); + mouse_pos.y *= roundf(platform_io.Monitors[display_id].DpiScale); + } +#endif } io.AddMousePosEvent(mouse_pos.x, mouse_pos.y); return true; @@ -534,7 +546,19 @@ static void ImGui_ImplSDL2_UpdateMouseData() SDL_GetWindowPosition(focused_window, &window_x, &window_y); mouse_x -= window_x; mouse_y -= window_y; + #if defined(__APPLE__) + // Fix for high DPI mac + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + int display_id = SDL_GetWindowDisplayIndex(focused_window); + if (!platform_io.Monitors.empty() && platform_io.Monitors[display_id].DpiScale > 1.0f) + { + // The Framebuffer is scaled by an integer ceiling of the actual ratio, so 2.0 not 1.685 on Mac! + mouse_x *= roundf(platform_io.Monitors[display_id].DpiScale); + mouse_y *= roundf(platform_io.Monitors[display_id].DpiScale); + } +#endif } + io.AddMousePosEvent((float)mouse_x, (float)mouse_y); } } @@ -673,6 +697,16 @@ void ImGui_ImplSDL2_NewFrame() if (w > 0 && h > 0) io.DisplayFramebufferScale = ImVec2((float)display_w / w, (float)display_h / h); +#if defined(__APPLE__) + // On Apple, The window size is reported in Low DPI, even when running in high DPI mode + ImGuiPlatformIO& platform_io = ImGui::GetPlatformIO(); + if (!platform_io.Monitors.empty() && platform_io.Monitors[0].DpiScale > 1.0f && display_h != h) + { + io.DisplayFramebufferScale = ImVec2(1.0f, 1.0f); + io.DisplaySize = ImVec2((float)display_w, (float)display_h); + } +#endif + // Setup time step (we don't use SDL_GetTicks() because it is using millisecond resolution) static Uint64 frequency = SDL_GetPerformanceFrequency(); Uint64 current_time = SDL_GetPerformanceCounter(); |