gosu 1.4.6 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/COPYING +2 -1
- data/dependencies/SDL/include/SDL3/SDL.h +91 -0
- data/dependencies/SDL/include/SDL3/SDL_assert.h +710 -0
- data/dependencies/SDL/include/SDL3/SDL_asyncio.h +550 -0
- data/dependencies/SDL/include/SDL3/SDL_atomic.h +692 -0
- data/dependencies/SDL/include/SDL3/SDL_audio.h +2382 -0
- data/dependencies/SDL/include/SDL3/SDL_begin_code.h +553 -0
- data/dependencies/SDL/include/{SDL_bits.h → SDL3/SDL_bits.h} +47 -27
- data/dependencies/SDL/include/{SDL_blendmode.h → SDL3/SDL_blendmode.h} +59 -55
- data/dependencies/SDL/include/SDL3/SDL_camera.h +535 -0
- data/dependencies/SDL/include/SDL3/SDL_clipboard.h +331 -0
- data/dependencies/SDL/include/{close_code.h → SDL3/SDL_close_code.h} +9 -8
- data/dependencies/SDL/include/{SDL_types.h → SDL3/SDL_copying.h} +2 -9
- data/dependencies/SDL/include/SDL3/SDL_cpuinfo.h +374 -0
- data/dependencies/SDL/include/SDL3/SDL_dialog.h +343 -0
- data/dependencies/SDL/include/SDL3/SDL_dlopennote.h +234 -0
- data/dependencies/SDL/include/{SDL_egl.h → SDL3/SDL_egl.h} +11 -8
- data/dependencies/SDL/include/SDL3/SDL_endian.h +645 -0
- data/dependencies/SDL/include/SDL3/SDL_error.h +226 -0
- data/dependencies/SDL/include/SDL3/SDL_events.h +1651 -0
- data/dependencies/SDL/include/SDL3/SDL_filesystem.h +537 -0
- data/dependencies/SDL/include/SDL3/SDL_gamepad.h +1657 -0
- data/dependencies/SDL/include/SDL3/SDL_gpu.h +4637 -0
- data/dependencies/SDL/include/SDL3/SDL_guid.h +106 -0
- data/dependencies/SDL/include/SDL3/SDL_haptic.h +1461 -0
- data/dependencies/SDL/include/SDL3/SDL_hidapi.h +571 -0
- data/dependencies/SDL/include/SDL3/SDL_hints.h +5041 -0
- data/dependencies/SDL/include/SDL3/SDL_init.h +508 -0
- data/dependencies/SDL/include/SDL3/SDL_intrin.h +410 -0
- data/dependencies/SDL/include/SDL3/SDL_iostream.h +1379 -0
- data/dependencies/SDL/include/SDL3/SDL_joystick.h +1385 -0
- data/dependencies/SDL/include/SDL3/SDL_keyboard.h +615 -0
- data/dependencies/SDL/include/SDL3/SDL_keycode.h +348 -0
- data/dependencies/SDL/include/SDL3/SDL_loadso.h +145 -0
- data/dependencies/SDL/include/{SDL_locale.h → SDL3/SDL_locale.h} +40 -24
- data/dependencies/SDL/include/SDL3/SDL_log.h +541 -0
- data/dependencies/SDL/include/SDL3/SDL_main.h +704 -0
- data/dependencies/SDL/include/SDL3/SDL_main_impl.h +149 -0
- data/dependencies/SDL/include/{SDL_messagebox.h → SDL3/SDL_messagebox.h} +85 -48
- data/dependencies/SDL/include/{SDL_metal.h → SDL3/SDL_metal.h} +29 -29
- data/dependencies/SDL/include/{SDL_misc.h → SDL3/SDL_misc.h} +13 -12
- data/dependencies/SDL/include/SDL3/SDL_mouse.h +813 -0
- data/dependencies/SDL/include/SDL3/SDL_mutex.h +1117 -0
- data/dependencies/SDL/include/SDL3/SDL_oldnames.h +1339 -0
- data/dependencies/SDL/include/{SDL_opengl.h → SDL3/SDL_opengl.h} +1247 -278
- data/dependencies/SDL/include/{SDL_opengl_glext.h → SDL3/SDL_opengl_glext.h} +5 -1
- data/dependencies/SDL/include/{SDL_opengles.h → SDL3/SDL_opengles.h} +6 -7
- data/dependencies/SDL/include/{SDL_opengles2.h → SDL3/SDL_opengles2.h} +10 -11
- data/dependencies/SDL/include/SDL3/SDL_pen.h +198 -0
- data/dependencies/SDL/include/SDL3/SDL_pixels.h +1441 -0
- data/dependencies/SDL/include/{SDL_test_log.h → SDL3/SDL_platform.h} +25 -26
- data/dependencies/SDL/include/SDL3/SDL_platform_defines.h +497 -0
- data/dependencies/SDL/include/{SDL_power.h → SDL3/SDL_power.h} +40 -20
- data/dependencies/SDL/include/SDL3/SDL_process.h +441 -0
- data/dependencies/SDL/include/SDL3/SDL_properties.h +572 -0
- data/dependencies/SDL/include/SDL3/SDL_rect.h +528 -0
- data/dependencies/SDL/include/SDL3/SDL_render.h +3034 -0
- data/dependencies/SDL/include/SDL3/SDL_revision.h +56 -0
- data/dependencies/SDL/include/{SDL_scancode.h → SDL3/SDL_scancode.h} +60 -68
- data/dependencies/SDL/include/SDL3/SDL_sensor.h +321 -0
- data/dependencies/SDL/include/SDL3/SDL_stdinc.h +6186 -0
- data/dependencies/SDL/include/SDL3/SDL_storage.h +686 -0
- data/dependencies/SDL/include/SDL3/SDL_surface.h +1769 -0
- data/dependencies/SDL/include/SDL3/SDL_system.h +840 -0
- data/dependencies/SDL/include/{SDL_test.h → SDL3/SDL_test.h} +16 -22
- data/dependencies/SDL/include/{SDL_test_assert.h → SDL3/SDL_test_assert.h} +27 -34
- data/dependencies/SDL/include/{SDL_test_common.h → SDL3/SDL_test_common.h} +109 -52
- data/dependencies/SDL/include/{SDL_test_compare.h → SDL3/SDL_test_compare.h} +22 -14
- data/dependencies/SDL/include/{SDL_test_crc32.h → SDL3/SDL_test_crc32.h} +27 -30
- data/dependencies/SDL/include/{SDL_test_font.h → SDL3/SDL_test_font.h} +50 -49
- data/dependencies/SDL/include/{SDL_test_fuzzer.h → SDL3/SDL_test_fuzzer.h} +64 -79
- data/dependencies/SDL/include/{SDL_test_harness.h → SDL3/SDL_test_harness.h} +47 -30
- data/dependencies/SDL/include/SDL3/SDL_test_log.h +83 -0
- data/dependencies/SDL/include/{SDL_test_md5.h → SDL3/SDL_test_md5.h} +21 -28
- data/dependencies/SDL/include/{SDL_test_memory.h → SDL3/SDL_test_memory.h} +19 -16
- data/dependencies/SDL/include/SDL3/SDL_thread.h +602 -0
- data/dependencies/SDL/include/SDL3/SDL_time.h +249 -0
- data/dependencies/SDL/include/SDL3/SDL_timer.h +454 -0
- data/dependencies/SDL/include/SDL3/SDL_touch.h +184 -0
- data/dependencies/SDL/include/SDL3/SDL_tray.h +544 -0
- data/dependencies/SDL/include/SDL3/SDL_version.h +198 -0
- data/dependencies/SDL/include/SDL3/SDL_video.h +3497 -0
- data/dependencies/SDL/include/SDL3/SDL_vulkan.h +287 -0
- data/dependencies/SDL/lib/x64/libSDL3.dll.a +0 -0
- data/dependencies/SDL/lib/x86/libSDL3.dll.a +0 -0
- data/dependencies/SDL_sound/SDL3_sound/SDL_sound.h +755 -0
- data/dependencies/SDL_sound/SDL_sound.c +136 -215
- data/dependencies/SDL_sound/SDL_sound_aiff.c +55 -54
- data/dependencies/SDL_sound/SDL_sound_au.c +32 -32
- data/dependencies/SDL_sound/SDL_sound_coreaudio.c +24 -41
- data/dependencies/SDL_sound/SDL_sound_flac.c +32 -12
- data/dependencies/SDL_sound/SDL_sound_internal.h +33 -48
- data/dependencies/SDL_sound/SDL_sound_modplug.c +21 -29
- data/dependencies/SDL_sound/SDL_sound_mp3.c +35 -13
- data/dependencies/SDL_sound/SDL_sound_raw.c +14 -15
- data/dependencies/SDL_sound/SDL_sound_shn.c +82 -82
- data/dependencies/SDL_sound/SDL_sound_voc.c +30 -30
- data/dependencies/SDL_sound/SDL_sound_vorbis.c +34 -25
- data/dependencies/SDL_sound/SDL_sound_wav.c +86 -82
- data/dependencies/SDL_sound/dr_flac.h +1890 -1301
- data/dependencies/SDL_sound/dr_mp3.h +1098 -660
- data/dependencies/SDL_sound/libmodplug/fastmix.c +1 -1
- data/dependencies/SDL_sound/libmodplug/libmodplug.h +5 -4
- data/dependencies/SDL_sound/libmodplug/load_ams.c +6 -3
- data/dependencies/SDL_sound/libmodplug/load_dsm.c +2 -1
- data/dependencies/SDL_sound/libmodplug/load_mt2.c +2 -2
- data/dependencies/SDL_sound/libmodplug/modplug.h +2 -1
- data/dependencies/SDL_sound/libmodplug/snd_fx.c +3 -3
- data/dependencies/SDL_sound/libmodplug/sndfile.c +3 -0
- data/dependencies/SDL_sound/libmodplug/sndmix.c +7 -3
- data/dependencies/SDL_sound/stb_vorbis.h +397 -342
- data/dependencies/mojoAL/AL/alc.h +2 -2
- data/dependencies/mojoAL/mojoal.c +2120 -1885
- data/dependencies/stb/stb_image.h +1190 -1379
- data/dependencies/stb/stb_image_write.h +329 -129
- data/dependencies/stb/stb_truetype.h +304 -60
- data/dependencies/utf8proc/utf8proc.c +133 -75
- data/dependencies/utf8proc/utf8proc.h +131 -50
- data/dependencies/utf8proc/utf8proc_data.h +16213 -15658
- data/ext/gosu-ffi/extconf.rb +103 -0
- data/ext/gosu-ffi/gosu-ffi.def +467 -0
- data/ffi/Gosu.cpp +330 -0
- data/ffi/Gosu.h +84 -0
- data/ffi/Gosu_Channel.cpp +62 -0
- data/ffi/Gosu_Channel.h +17 -0
- data/ffi/Gosu_Color.cpp +176 -0
- data/ffi/Gosu_Color.h +31 -0
- data/ffi/Gosu_Constants.cpp +334 -0
- data/ffi/Gosu_FFI.h +34 -0
- data/ffi/Gosu_FFI_internal.h +160 -0
- data/ffi/Gosu_Font.cpp +97 -0
- data/ffi/Gosu_Font.h +32 -0
- data/ffi/Gosu_Image.cpp +239 -0
- data/ffi/Gosu_Image.h +71 -0
- data/ffi/Gosu_Sample.cpp +29 -0
- data/ffi/Gosu_Sample.h +14 -0
- data/ffi/Gosu_Song.cpp +69 -0
- data/ffi/Gosu_Song.h +18 -0
- data/ffi/Gosu_TextInput.cpp +94 -0
- data/ffi/Gosu_TextInput.h +25 -0
- data/ffi/Gosu_Window.cpp +314 -0
- data/ffi/Gosu_Window.h +78 -0
- data/include/Gosu/Audio.hpp +6 -11
- data/include/Gosu/Bitmap.hpp +38 -53
- data/include/Gosu/Buffer.hpp +54 -0
- data/include/Gosu/Color.hpp +29 -36
- data/include/Gosu/Directories.hpp +25 -28
- data/include/Gosu/Drawable.hpp +58 -0
- data/include/Gosu/Font.hpp +6 -5
- data/include/Gosu/Fwd.hpp +4 -6
- data/include/Gosu/Gosu.hpp +5 -5
- data/include/Gosu/Graphics.hpp +53 -61
- data/include/Gosu/GraphicsBase.hpp +1 -11
- data/include/Gosu/Image.hpp +12 -15
- data/include/Gosu/Math.hpp +50 -72
- data/include/Gosu/Transform.hpp +32 -0
- data/include/Gosu/Utility.hpp +77 -1
- data/include/Gosu/Version.hpp +2 -2
- data/include/Gosu/Window.hpp +15 -9
- data/lib/SDL3.dll +0 -0
- data/lib/gosu/channel.rb +50 -0
- data/lib/gosu/color.rb +173 -0
- data/lib/gosu/compat.rb +130 -17
- data/lib/gosu/constants.rb +386 -0
- data/lib/gosu/ffi.rb +269 -0
- data/lib/gosu/font.rb +62 -0
- data/lib/gosu/gl_tex_info.rb +33 -0
- data/lib/gosu/gosu.rb +250 -0
- data/lib/gosu/image.rb +179 -0
- data/lib/gosu/numeric.rb +17 -0
- data/lib/gosu/preview.rb +6 -6
- data/lib/gosu/sample.rb +25 -0
- data/lib/gosu/song.rb +57 -0
- data/lib/gosu/text_input.rb +83 -0
- data/lib/gosu/window.rb +249 -0
- data/lib/gosu.rb +29 -8
- data/lib64/SDL3.dll +0 -0
- data/rdoc/gosu.rb +2 -2
- data/src/Audio.cpp +30 -24
- data/src/AudioFile.hpp +5 -4
- data/src/AudioFileAudioToolbox.cpp +8 -8
- data/src/AudioFileSDLSound.cpp +12 -15
- data/src/BinPacker.cpp +188 -0
- data/src/BinPacker.hpp +55 -0
- data/src/Bitmap.cpp +172 -143
- data/src/BitmapIO.cpp +60 -86
- data/src/Buffer.cpp +150 -0
- data/src/ClipRectStack.cpp +38 -0
- data/src/ClipRectStack.hpp +17 -83
- data/src/Color.cpp +75 -80
- data/src/Directories.cpp +47 -0
- data/src/DirectoriesUIKit.cpp +50 -0
- data/src/DrawOp.hpp +20 -18
- data/src/DrawOpQueue.hpp +27 -33
- data/src/Drawable.cpp +95 -0
- data/src/EmptyDrawable.hpp +38 -0
- data/src/FPS.cpp +31 -0
- data/src/Font.cpp +104 -74
- data/src/GosuGLView.cpp +13 -11
- data/src/GosuViewController.cpp +2 -10
- data/src/Graphics.cpp +86 -145
- data/src/GraphicsImpl.hpp +14 -68
- data/src/Image.cpp +41 -35
- data/src/Input.cpp +73 -78
- data/src/Macro.cpp +46 -29
- data/src/Macro.hpp +23 -17
- data/src/MarkupParser.cpp +5 -5
- data/src/Math.cpp +48 -22
- data/src/OffScreenTarget.cpp +47 -50
- data/src/OffScreenTarget.hpp +13 -11
- data/src/OpenGLContext.cpp +116 -0
- data/src/OpenGLContext.hpp +41 -0
- data/src/RenderState.hpp +49 -71
- data/src/Resolution.cpp +65 -53
- data/src/TexChunk.cpp +35 -80
- data/src/TexChunk.hpp +44 -35
- data/src/Text.cpp +1 -1
- data/src/TextBuilder.cpp +35 -21
- data/src/TextBuilder.hpp +6 -9
- data/src/TextInput.cpp +9 -9
- data/src/Texture.cpp +62 -80
- data/src/Texture.hpp +25 -23
- data/src/TiledDrawable.cpp +149 -0
- data/src/TiledDrawable.hpp +47 -0
- data/src/TimingApple.cpp +1 -1
- data/src/Transform.cpp +45 -50
- data/src/TransformStack.hpp +16 -16
- data/src/TrueTypeFont.cpp +59 -51
- data/src/TrueTypeFont.hpp +6 -7
- data/src/TrueTypeFontApple.cpp +28 -19
- data/src/TrueTypeFontUnix.cpp +39 -32
- data/src/TrueTypeFontWin.cpp +30 -30
- data/src/Utility.cpp +113 -37
- data/src/UtilityWin.cpp +49 -0
- data/src/Window.cpp +121 -151
- data/src/WindowUIKit.cpp +14 -14
- metadata +165 -118
- data/dependencies/SDL/include/SDL.h +0 -233
- data/dependencies/SDL/include/SDL_assert.h +0 -320
- data/dependencies/SDL/include/SDL_atomic.h +0 -415
- data/dependencies/SDL/include/SDL_audio.h +0 -1500
- data/dependencies/SDL/include/SDL_clipboard.h +0 -141
- data/dependencies/SDL/include/SDL_config.h +0 -331
- data/dependencies/SDL/include/SDL_cpuinfo.h +0 -594
- data/dependencies/SDL/include/SDL_endian.h +0 -348
- data/dependencies/SDL/include/SDL_error.h +0 -163
- data/dependencies/SDL/include/SDL_events.h +0 -1166
- data/dependencies/SDL/include/SDL_filesystem.h +0 -149
- data/dependencies/SDL/include/SDL_gamecontroller.h +0 -1074
- data/dependencies/SDL/include/SDL_gesture.h +0 -117
- data/dependencies/SDL/include/SDL_guid.h +0 -100
- data/dependencies/SDL/include/SDL_haptic.h +0 -1341
- data/dependencies/SDL/include/SDL_hidapi.h +0 -451
- data/dependencies/SDL/include/SDL_hints.h +0 -2569
- data/dependencies/SDL/include/SDL_joystick.h +0 -1066
- data/dependencies/SDL/include/SDL_keyboard.h +0 -353
- data/dependencies/SDL/include/SDL_keycode.h +0 -358
- data/dependencies/SDL/include/SDL_loadso.h +0 -115
- data/dependencies/SDL/include/SDL_log.h +0 -404
- data/dependencies/SDL/include/SDL_main.h +0 -275
- data/dependencies/SDL/include/SDL_mouse.h +0 -465
- data/dependencies/SDL/include/SDL_mutex.h +0 -471
- data/dependencies/SDL/include/SDL_name.h +0 -33
- data/dependencies/SDL/include/SDL_pixels.h +0 -644
- data/dependencies/SDL/include/SDL_platform.h +0 -261
- data/dependencies/SDL/include/SDL_quit.h +0 -58
- data/dependencies/SDL/include/SDL_rect.h +0 -376
- data/dependencies/SDL/include/SDL_render.h +0 -1919
- data/dependencies/SDL/include/SDL_revision.h +0 -7
- data/dependencies/SDL/include/SDL_rwops.h +0 -841
- data/dependencies/SDL/include/SDL_sensor.h +0 -322
- data/dependencies/SDL/include/SDL_shape.h +0 -155
- data/dependencies/SDL/include/SDL_stdinc.h +0 -830
- data/dependencies/SDL/include/SDL_surface.h +0 -997
- data/dependencies/SDL/include/SDL_system.h +0 -623
- data/dependencies/SDL/include/SDL_syswm.h +0 -386
- data/dependencies/SDL/include/SDL_test_images.h +0 -78
- data/dependencies/SDL/include/SDL_test_random.h +0 -115
- data/dependencies/SDL/include/SDL_thread.h +0 -464
- data/dependencies/SDL/include/SDL_timer.h +0 -222
- data/dependencies/SDL/include/SDL_touch.h +0 -150
- data/dependencies/SDL/include/SDL_version.h +0 -204
- data/dependencies/SDL/include/SDL_video.h +0 -2150
- data/dependencies/SDL/include/SDL_vulkan.h +0 -215
- data/dependencies/SDL/include/begin_code.h +0 -187
- data/dependencies/SDL/lib/x64/libSDL2.dll.a +0 -0
- data/dependencies/SDL/lib/x86/libSDL2.dll.a +0 -0
- data/dependencies/SDL_sound/SDL_sound.h +0 -725
- data/ext/gosu/extconf.rb +0 -119
- data/include/Gosu/IO.hpp +0 -254
- data/include/Gosu/ImageData.hpp +0 -53
- data/include/Gosu/Inspection.hpp +0 -7
- data/lib/SDL2.dll +0 -0
- data/lib/gosu/patches.rb +0 -66
- data/lib/gosu/run.rb +0 -20
- data/lib/gosu/swig_patches.rb +0 -110
- data/lib64/SDL2.dll +0 -0
- data/src/BlockAllocator.cpp +0 -131
- data/src/BlockAllocator.hpp +0 -32
- data/src/DirectoriesApple.cpp +0 -69
- data/src/DirectoriesUnix.cpp +0 -46
- data/src/DirectoriesWin.cpp +0 -65
- data/src/EmptyImageData.hpp +0 -52
- data/src/FileUnix.cpp +0 -99
- data/src/FileWin.cpp +0 -88
- data/src/IO.cpp +0 -60
- data/src/Iconv.hpp +0 -51
- data/src/Inspection.cpp +0 -27
- data/src/LargeImageData.cpp +0 -215
- data/src/LargeImageData.hpp +0 -39
- data/src/Log.hpp +0 -19
- data/src/RubyGosu.cxx +0 -13100
- data/src/RubyGosu.h +0 -49
- data/src/WinUtility.cpp +0 -61
- data/src/WinUtility.hpp +0 -27
- /data/dependencies/SDL/include/{SDL_opengles2_gl2.h → SDL3/SDL_opengles2_gl2.h} +0 -0
- /data/dependencies/SDL/include/{SDL_opengles2_gl2ext.h → SDL3/SDL_opengles2_gl2ext.h} +0 -0
- /data/dependencies/SDL/include/{SDL_opengles2_gl2platform.h → SDL3/SDL_opengles2_gl2platform.h} +0 -0
- /data/dependencies/SDL/include/{SDL_opengles2_khrplatform.h → SDL3/SDL_opengles2_khrplatform.h} +0 -0
data/src/Image.cpp
CHANGED
|
@@ -1,53 +1,54 @@
|
|
|
1
1
|
#include <Gosu/Bitmap.hpp>
|
|
2
|
+
#include <Gosu/Buffer.hpp>
|
|
3
|
+
#include <Gosu/Drawable.hpp>
|
|
2
4
|
#include <Gosu/Graphics.hpp>
|
|
3
|
-
#include <Gosu/IO.hpp>
|
|
4
5
|
#include <Gosu/Image.hpp>
|
|
5
|
-
#include <Gosu/ImageData.hpp>
|
|
6
6
|
#include <Gosu/Math.hpp>
|
|
7
|
-
#include "
|
|
7
|
+
#include "EmptyDrawable.hpp"
|
|
8
8
|
#include <stdexcept>
|
|
9
9
|
|
|
10
10
|
Gosu::Image::Image()
|
|
11
|
-
: m_data{EmptyImageData::instance_ptr()}
|
|
12
11
|
{
|
|
12
|
+
static const auto default_data_ptr = std::make_shared<EmptyDrawable>(0, 0);
|
|
13
|
+
m_drawable = default_data_ptr;
|
|
13
14
|
}
|
|
14
15
|
|
|
15
16
|
Gosu::Image::Image(const std::string& filename, unsigned image_flags)
|
|
16
|
-
: Image(load_image_file(filename), image_flags)
|
|
17
|
+
: Image(load_image_file(filename), image_flags)
|
|
17
18
|
{
|
|
18
19
|
}
|
|
19
20
|
|
|
20
|
-
Gosu::Image::Image(const std::string& filename,
|
|
21
|
-
|
|
22
|
-
: Image(load_image_file(filename), src_x, src_y, src_width, src_height, image_flags)
|
|
21
|
+
Gosu::Image::Image(const std::string& filename, const Rect& source_rect, unsigned image_flags)
|
|
22
|
+
: Image(load_image_file(filename), source_rect, image_flags)
|
|
23
23
|
{
|
|
24
24
|
}
|
|
25
25
|
|
|
26
26
|
Gosu::Image::Image(const Bitmap& source, unsigned image_flags)
|
|
27
|
-
: Image(source,
|
|
27
|
+
: Image(source, Rect::covering(source), image_flags)
|
|
28
28
|
{
|
|
29
29
|
}
|
|
30
30
|
|
|
31
|
-
Gosu::Image::Image(const Bitmap& source,
|
|
32
|
-
|
|
33
|
-
: m_data{Graphics::create_image(source, src_x, src_y, src_width, src_height, image_flags)}
|
|
31
|
+
Gosu::Image::Image(const Bitmap& source, const Rect& source_rect, unsigned image_flags)
|
|
32
|
+
: m_drawable(create_drawable(source, source_rect, image_flags))
|
|
34
33
|
{
|
|
35
34
|
}
|
|
36
35
|
|
|
37
|
-
Gosu::Image::Image(std::unique_ptr<
|
|
38
|
-
:
|
|
36
|
+
Gosu::Image::Image(std::unique_ptr<Drawable> data)
|
|
37
|
+
: m_drawable(std::move(data))
|
|
39
38
|
{
|
|
40
|
-
if (!
|
|
39
|
+
if (!m_drawable) {
|
|
40
|
+
throw std::invalid_argument("Gosu::Image cannot be initialized with nullptr");
|
|
41
|
+
}
|
|
41
42
|
}
|
|
42
43
|
|
|
43
44
|
unsigned Gosu::Image::width() const
|
|
44
45
|
{
|
|
45
|
-
return
|
|
46
|
+
return m_drawable->width();
|
|
46
47
|
}
|
|
47
48
|
|
|
48
49
|
unsigned Gosu::Image::height() const
|
|
49
50
|
{
|
|
50
|
-
return
|
|
51
|
+
return m_drawable->height();
|
|
51
52
|
}
|
|
52
53
|
|
|
53
54
|
void Gosu::Image::draw(double x, double y, ZPos z, double scale_x, double scale_y, Color c,
|
|
@@ -56,7 +57,7 @@ void Gosu::Image::draw(double x, double y, ZPos z, double scale_x, double scale_
|
|
|
56
57
|
double x2 = x + width() * scale_x;
|
|
57
58
|
double y2 = y + height() * scale_y;
|
|
58
59
|
|
|
59
|
-
|
|
60
|
+
m_drawable->draw(x, y, c, x2, y, c, x, y2, c, x2, y2, c, z, mode);
|
|
60
61
|
}
|
|
61
62
|
|
|
62
63
|
void Gosu::Image::draw_mod(double x, double y, ZPos z, double scale_x, double scale_y, Color c1,
|
|
@@ -65,7 +66,7 @@ void Gosu::Image::draw_mod(double x, double y, ZPos z, double scale_x, double sc
|
|
|
65
66
|
double x2 = x + width() * scale_x;
|
|
66
67
|
double y2 = y + height() * scale_y;
|
|
67
68
|
|
|
68
|
-
|
|
69
|
+
m_drawable->draw(x, y, c1, x2, y, c2, x, y2, c3, x2, y2, c4, z, mode);
|
|
69
70
|
}
|
|
70
71
|
|
|
71
72
|
void Gosu::Image::draw_rot(double x, double y, ZPos z, double angle, double center_x,
|
|
@@ -87,44 +88,49 @@ void Gosu::Image::draw_rot(double x, double y, ZPos z, double angle, double cent
|
|
|
87
88
|
double dist_to_bottom_x = -offs_x * size_y * (1 - center_y);
|
|
88
89
|
double dist_to_bottom_y = -offs_y * size_y * (1 - center_y);
|
|
89
90
|
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
91
|
+
m_drawable->draw( //
|
|
92
|
+
x + dist_to_left_x + dist_to_top_x, y + dist_to_left_y + dist_to_top_y, c,
|
|
93
|
+
x + dist_to_right_x + dist_to_top_x, y + dist_to_right_y + dist_to_top_y, c,
|
|
94
|
+
x + dist_to_left_x + dist_to_bottom_x, y + dist_to_left_y + dist_to_bottom_y, c,
|
|
95
|
+
x + dist_to_right_x + dist_to_bottom_x, y + dist_to_right_y + dist_to_bottom_y, c, //
|
|
96
|
+
z, mode);
|
|
95
97
|
}
|
|
96
98
|
|
|
97
|
-
Gosu::
|
|
99
|
+
Gosu::Drawable& Gosu::Image::drawable() const
|
|
98
100
|
{
|
|
99
|
-
return *
|
|
101
|
+
return *m_drawable;
|
|
100
102
|
}
|
|
101
103
|
|
|
102
|
-
std::vector<Gosu::Image> Gosu::load_tiles(const Bitmap&
|
|
104
|
+
std::vector<Gosu::Image> Gosu::load_tiles(const Bitmap& bitmap, //
|
|
103
105
|
int tile_width, int tile_height, unsigned flags)
|
|
104
106
|
{
|
|
107
|
+
if (tile_width == 0 || tile_height == 0) {
|
|
108
|
+
throw std::invalid_argument("Gosu::load_tiles does not support empty tiles");
|
|
109
|
+
}
|
|
110
|
+
|
|
105
111
|
int tiles_x, tiles_y;
|
|
106
112
|
std::vector<Image> images;
|
|
107
113
|
|
|
108
114
|
if (tile_width > 0) {
|
|
109
|
-
tiles_x =
|
|
115
|
+
tiles_x = bitmap.width() / tile_width;
|
|
110
116
|
}
|
|
111
117
|
else {
|
|
112
118
|
tiles_x = -tile_width;
|
|
113
|
-
tile_width =
|
|
119
|
+
tile_width = bitmap.width() / tiles_x;
|
|
114
120
|
}
|
|
115
121
|
|
|
116
122
|
if (tile_height > 0) {
|
|
117
|
-
tiles_y =
|
|
123
|
+
tiles_y = bitmap.height() / tile_height;
|
|
118
124
|
}
|
|
119
125
|
else {
|
|
120
126
|
tiles_y = -tile_height;
|
|
121
|
-
tile_height =
|
|
127
|
+
tile_height = bitmap.height() / tiles_y;
|
|
122
128
|
}
|
|
123
129
|
|
|
124
130
|
for (int y = 0; y < tiles_y; ++y) {
|
|
125
131
|
for (int x = 0; x < tiles_x; ++x) {
|
|
126
|
-
|
|
127
|
-
|
|
132
|
+
Rect rect = Rect::xywh(x * tile_width, y * tile_height, tile_width, tile_height);
|
|
133
|
+
images.emplace_back(bitmap, rect, flags);
|
|
128
134
|
}
|
|
129
135
|
}
|
|
130
136
|
|
|
@@ -134,6 +140,6 @@ std::vector<Gosu::Image> Gosu::load_tiles(const Bitmap& bmp, //
|
|
|
134
140
|
std::vector<Gosu::Image> Gosu::load_tiles(const std::string& filename, //
|
|
135
141
|
int tile_width, int tile_height, unsigned flags)
|
|
136
142
|
{
|
|
137
|
-
Bitmap
|
|
138
|
-
return load_tiles(
|
|
143
|
+
const Bitmap bitmap = load_image_file(filename);
|
|
144
|
+
return load_tiles(bitmap, tile_width, tile_height, flags);
|
|
139
145
|
}
|
data/src/Input.cpp
CHANGED
|
@@ -5,24 +5,23 @@
|
|
|
5
5
|
#include <Gosu/TextInput.hpp>
|
|
6
6
|
#include <Gosu/Utility.hpp>
|
|
7
7
|
|
|
8
|
-
#include <SDL.h>
|
|
8
|
+
#include <SDL3/SDL.h>
|
|
9
9
|
#include <utf8proc.h>
|
|
10
10
|
|
|
11
|
-
#include <cwctype>
|
|
12
11
|
#include <cstdlib>
|
|
13
12
|
#include <algorithm>
|
|
14
13
|
#include <array>
|
|
15
|
-
#include <mutex>
|
|
16
14
|
#include <stdexcept>
|
|
17
15
|
using namespace std;
|
|
18
16
|
|
|
19
17
|
static void require_sdl_video()
|
|
20
18
|
{
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
19
|
+
// Don't bother shutting down the SDL video subsystem because OpenGLContext.cpp keeps it alive
|
|
20
|
+
// forever as well, and it is hard to know when to free things in a Ruby C extension.
|
|
21
|
+
static const int initialized = SDL_Init(SDL_INIT_VIDEO);
|
|
22
|
+
if (initialized < 0) {
|
|
23
|
+
throw std::runtime_error(SDL_GetError());
|
|
24
|
+
}
|
|
26
25
|
}
|
|
27
26
|
|
|
28
27
|
static const unsigned NUM_BUTTONS_PER_GAMEPAD =
|
|
@@ -33,7 +32,7 @@ static const unsigned NUM_BUTTONS = Gosu::GP_RANGE_END + 1;
|
|
|
33
32
|
static array<bool, NUM_BUTTONS> button_states = {false};
|
|
34
33
|
static array<double, NUM_AXES_PER_GAMEPAD * (Gosu::NUM_GAMEPADS + 1)> axis_states = {0.0};
|
|
35
34
|
static vector<shared_ptr<SDL_Joystick>> open_joysticks;
|
|
36
|
-
static vector<shared_ptr<
|
|
35
|
+
static vector<shared_ptr<SDL_Gamepad>> open_game_controllers;
|
|
37
36
|
// Stores joystick instance id or -1 if empty
|
|
38
37
|
static array<int, Gosu::NUM_GAMEPADS> gamepad_slots = {-1, -1, -1, -1};
|
|
39
38
|
|
|
@@ -66,7 +65,7 @@ struct Gosu::Input::Impl : private Gosu::Noncopyable
|
|
|
66
65
|
{
|
|
67
66
|
require_sdl_video();
|
|
68
67
|
|
|
69
|
-
SDL_InitSubSystem(
|
|
68
|
+
SDL_InitSubSystem(SDL_INIT_GAMEPAD);
|
|
70
69
|
}
|
|
71
70
|
|
|
72
71
|
~Impl()
|
|
@@ -74,12 +73,13 @@ struct Gosu::Input::Impl : private Gosu::Noncopyable
|
|
|
74
73
|
open_joysticks.clear();
|
|
75
74
|
open_game_controllers.clear();
|
|
76
75
|
|
|
77
|
-
SDL_QuitSubSystem(
|
|
76
|
+
SDL_QuitSubSystem(SDL_INIT_GAMEPAD);
|
|
78
77
|
}
|
|
79
78
|
|
|
80
79
|
void update_mouse_position()
|
|
81
80
|
{
|
|
82
|
-
|
|
81
|
+
float x, y;
|
|
82
|
+
int window_x, window_y;
|
|
83
83
|
SDL_GetWindowPosition(window, &window_x, &window_y);
|
|
84
84
|
SDL_GetGlobalMouseState(&x, &y);
|
|
85
85
|
mouse_x = x - window_x;
|
|
@@ -88,9 +88,9 @@ struct Gosu::Input::Impl : private Gosu::Noncopyable
|
|
|
88
88
|
|
|
89
89
|
void set_mouse_position(double x, double y)
|
|
90
90
|
{
|
|
91
|
-
SDL_WarpMouseInWindow(window,
|
|
92
|
-
|
|
93
|
-
|
|
91
|
+
SDL_WarpMouseInWindow(window, //
|
|
92
|
+
(x - mouse_offset_x) / mouse_scale_x,
|
|
93
|
+
(y - mouse_offset_y) / mouse_scale_y);
|
|
94
94
|
|
|
95
95
|
#if !defined(GOSU_IS_X)
|
|
96
96
|
// On systems where we have a working GetGlobalMouseState, we can warp the mouse and
|
|
@@ -106,23 +106,23 @@ struct Gosu::Input::Impl : private Gosu::Noncopyable
|
|
|
106
106
|
bool feed_sdl_event(const SDL_Event* e)
|
|
107
107
|
{
|
|
108
108
|
switch (e->type) {
|
|
109
|
-
case
|
|
110
|
-
case
|
|
111
|
-
if (e->key.repeat == 0 && e->key.
|
|
112
|
-
enqueue_event(e->key.
|
|
109
|
+
case SDL_EVENT_KEY_DOWN:
|
|
110
|
+
case SDL_EVENT_KEY_UP: {
|
|
111
|
+
if (e->key.repeat == 0 && e->key.scancode <= static_cast<int>(KB_RANGE_END)) {
|
|
112
|
+
enqueue_event(e->key.scancode, e->type == SDL_EVENT_KEY_DOWN);
|
|
113
113
|
return true;
|
|
114
114
|
}
|
|
115
115
|
break;
|
|
116
116
|
}
|
|
117
|
-
case
|
|
118
|
-
case
|
|
117
|
+
case SDL_EVENT_MOUSE_BUTTON_DOWN:
|
|
118
|
+
case SDL_EVENT_MOUSE_BUTTON_UP: {
|
|
119
119
|
if (e->button.button >= 1 && e->button.button <= 3) {
|
|
120
|
-
enqueue_event(MS_LEFT + e->button.button - 1, e->type ==
|
|
120
|
+
enqueue_event(MS_LEFT + e->button.button - 1, e->type == SDL_EVENT_MOUSE_BUTTON_DOWN);
|
|
121
121
|
return true;
|
|
122
122
|
}
|
|
123
123
|
break;
|
|
124
124
|
}
|
|
125
|
-
case
|
|
125
|
+
case SDL_EVENT_MOUSE_WHEEL: {
|
|
126
126
|
if (e->wheel.y > 0) {
|
|
127
127
|
enqueue_event(MS_WHEEL_UP, true);
|
|
128
128
|
enqueue_event(MS_WHEEL_UP, false);
|
|
@@ -135,41 +135,37 @@ struct Gosu::Input::Impl : private Gosu::Noncopyable
|
|
|
135
135
|
}
|
|
136
136
|
break;
|
|
137
137
|
}
|
|
138
|
-
case
|
|
138
|
+
case SDL_EVENT_JOYSTICK_ADDED: {
|
|
139
139
|
if (available_gamepad_slot_index() == -1) {
|
|
140
140
|
break;
|
|
141
141
|
}
|
|
142
142
|
int gamepad_slot = -1;
|
|
143
143
|
int joystick_instance_id = -1;
|
|
144
|
-
int i = e->jdevice.which; //
|
|
144
|
+
int i = e->jdevice.which; // SDL3 instance_id
|
|
145
145
|
|
|
146
|
-
if (
|
|
147
|
-
if (
|
|
146
|
+
if (SDL_IsGamepad(i)) {
|
|
147
|
+
if (SDL_Gamepad *gamepad = SDL_OpenGamepad(i)) {
|
|
148
148
|
gamepad_slot = available_gamepad_slot_index();
|
|
149
|
-
joystick_instance_id =
|
|
149
|
+
joystick_instance_id = SDL_GetJoystickID(SDL_GetGamepadJoystick(gamepad));
|
|
150
150
|
if (gamepad_instance_id_is_known(joystick_instance_id)) {
|
|
151
151
|
return true;
|
|
152
152
|
}
|
|
153
|
-
|
|
154
|
-
SDL_GameControllerSetPlayerIndex(game_controller, gamepad_slot);
|
|
155
|
-
#endif
|
|
153
|
+
SDL_SetGamepadPlayerIndex(gamepad, gamepad_slot);
|
|
156
154
|
open_game_controllers.emplace_back(
|
|
157
|
-
shared_ptr<
|
|
155
|
+
shared_ptr<SDL_Gamepad>(gamepad, SDL_CloseGamepad)
|
|
158
156
|
);
|
|
159
157
|
}
|
|
160
158
|
}
|
|
161
159
|
// ...but fall back on the good, old SDL_Joystick API.
|
|
162
|
-
else if (SDL_Joystick* joystick =
|
|
160
|
+
else if (SDL_Joystick* joystick = SDL_OpenJoystick(i)) {
|
|
163
161
|
gamepad_slot = available_gamepad_slot_index();
|
|
164
|
-
joystick_instance_id =
|
|
162
|
+
joystick_instance_id = SDL_GetJoystickID(joystick);
|
|
165
163
|
if (gamepad_instance_id_is_known(joystick_instance_id)) {
|
|
166
164
|
return true;
|
|
167
165
|
}
|
|
168
|
-
|
|
169
|
-
SDL_JoystickSetPlayerIndex(joystick, gamepad_slot);
|
|
170
|
-
#endif
|
|
166
|
+
SDL_SetJoystickPlayerIndex(joystick, gamepad_slot);
|
|
171
167
|
open_joysticks.emplace_back(
|
|
172
|
-
shared_ptr<SDL_Joystick>(joystick,
|
|
168
|
+
shared_ptr<SDL_Joystick>(joystick, SDL_CloseJoystick)
|
|
173
169
|
);
|
|
174
170
|
}
|
|
175
171
|
|
|
@@ -180,7 +176,7 @@ struct Gosu::Input::Impl : private Gosu::Noncopyable
|
|
|
180
176
|
}
|
|
181
177
|
break;
|
|
182
178
|
}
|
|
183
|
-
case
|
|
179
|
+
case SDL_EVENT_JOYSTICK_REMOVED: {
|
|
184
180
|
int gamepad_slot = gamepad_slot_index(e->jdevice.which);
|
|
185
181
|
if (gamepad_slot >= 0) {
|
|
186
182
|
enqueue_gamepad_connection_event(gamepad_slot, false, e->jdevice.which);
|
|
@@ -239,8 +235,8 @@ struct Gosu::Input::Impl : private Gosu::Noncopyable
|
|
|
239
235
|
int index = gamepad_slot_index(instance_id);
|
|
240
236
|
|
|
241
237
|
for (int i = 0; i < open_game_controllers.size(); i++) {
|
|
242
|
-
SDL_Joystick* joystick =
|
|
243
|
-
if (
|
|
238
|
+
SDL_Joystick* joystick = SDL_GetGamepadJoystick(open_game_controllers[i].get());
|
|
239
|
+
if (SDL_GetJoystickID(joystick) == instance_id) {
|
|
244
240
|
open_game_controllers.erase(open_game_controllers.begin() + i);
|
|
245
241
|
gamepad_slots[index] = -1;
|
|
246
242
|
return;
|
|
@@ -248,7 +244,7 @@ struct Gosu::Input::Impl : private Gosu::Noncopyable
|
|
|
248
244
|
}
|
|
249
245
|
|
|
250
246
|
for (int i = 0; i < open_joysticks.size(); i++) {
|
|
251
|
-
if (
|
|
247
|
+
if (SDL_GetJoystickID(open_joysticks[i].get()) == instance_id) {
|
|
252
248
|
open_joysticks.erase(open_joysticks.begin() + i);
|
|
253
249
|
gamepad_slots[index] = -1;
|
|
254
250
|
return;
|
|
@@ -280,11 +276,11 @@ struct Gosu::Input::Impl : private Gosu::Noncopyable
|
|
|
280
276
|
|
|
281
277
|
// Poll data from SDL, using either of two API interfaces.
|
|
282
278
|
GamepadBuffer current_gamepad;
|
|
283
|
-
if (
|
|
284
|
-
current_gamepad = poll_game_controller(
|
|
279
|
+
if (SDL_Gamepad* gamepad = SDL_GetGamepadFromID(gamepad_slots[i])) {
|
|
280
|
+
current_gamepad = poll_game_controller(gamepad);
|
|
285
281
|
}
|
|
286
282
|
else {
|
|
287
|
-
current_gamepad = poll_joystick(
|
|
283
|
+
current_gamepad = poll_joystick(SDL_GetJoystickFromID(gamepad_slots[i]));
|
|
288
284
|
}
|
|
289
285
|
|
|
290
286
|
int axis_offset = NUM_AXES_PER_GAMEPAD * (i + 1);
|
|
@@ -405,37 +401,37 @@ private:
|
|
|
405
401
|
event_queue.push_back(event);
|
|
406
402
|
}
|
|
407
403
|
|
|
408
|
-
GamepadBuffer poll_game_controller(
|
|
404
|
+
GamepadBuffer poll_game_controller(SDL_Gamepad* controller)
|
|
409
405
|
{
|
|
410
406
|
GamepadBuffer gamepad;
|
|
411
407
|
|
|
412
408
|
// Poll axes first.
|
|
413
409
|
gamepad.axes[GP_LEFT_STICK_X_AXIS] =
|
|
414
|
-
scale_axis(
|
|
410
|
+
scale_axis(SDL_GetGamepadAxis(controller, SDL_GAMEPAD_AXIS_LEFTX));
|
|
415
411
|
gamepad.axes[GP_LEFT_STICK_Y_AXIS] =
|
|
416
|
-
scale_axis(
|
|
412
|
+
scale_axis(SDL_GetGamepadAxis(controller, SDL_GAMEPAD_AXIS_LEFTY));
|
|
417
413
|
gamepad.axes[GP_RIGHT_STICK_X_AXIS] =
|
|
418
|
-
scale_axis(
|
|
414
|
+
scale_axis(SDL_GetGamepadAxis(controller, SDL_GAMEPAD_AXIS_RIGHTX));
|
|
419
415
|
gamepad.axes[GP_RIGHT_STICK_Y_AXIS] =
|
|
420
|
-
scale_axis(
|
|
416
|
+
scale_axis(SDL_GetGamepadAxis(controller, SDL_GAMEPAD_AXIS_RIGHTY));
|
|
421
417
|
gamepad.axes[GP_LEFT_TRIGGER_AXIS] =
|
|
422
|
-
scale_axis(
|
|
418
|
+
scale_axis(SDL_GetGamepadAxis(controller, SDL_GAMEPAD_AXIS_LEFT_TRIGGER));
|
|
423
419
|
gamepad.axes[GP_RIGHT_TRIGGER_AXIS] =
|
|
424
|
-
scale_axis(
|
|
420
|
+
scale_axis(SDL_GetGamepadAxis(controller, SDL_GAMEPAD_AXIS_RIGHT_TRIGGER));
|
|
425
421
|
|
|
426
422
|
gamepad.buttons[GP_DPAD_LEFT - GP_RANGE_BEGIN] =
|
|
427
|
-
|
|
423
|
+
SDL_GetGamepadButton(controller, SDL_GAMEPAD_BUTTON_DPAD_LEFT);
|
|
428
424
|
gamepad.buttons[GP_DPAD_RIGHT - GP_RANGE_BEGIN] =
|
|
429
|
-
|
|
425
|
+
SDL_GetGamepadButton(controller, SDL_GAMEPAD_BUTTON_DPAD_RIGHT);
|
|
430
426
|
gamepad.buttons[GP_DPAD_UP - GP_RANGE_BEGIN] =
|
|
431
|
-
|
|
427
|
+
SDL_GetGamepadButton(controller, SDL_GAMEPAD_BUTTON_DPAD_UP);
|
|
432
428
|
gamepad.buttons[GP_DPAD_DOWN - GP_RANGE_BEGIN] =
|
|
433
|
-
|
|
429
|
+
SDL_GetGamepadButton(controller, SDL_GAMEPAD_BUTTON_DPAD_DOWN);
|
|
434
430
|
|
|
435
431
|
int button = 0;
|
|
436
|
-
for (; button <
|
|
432
|
+
for (; button < SDL_GAMEPAD_BUTTON_DPAD_UP; ++button) {
|
|
437
433
|
gamepad.buttons[GP_BUTTON_0 + button - GP_RANGE_BEGIN] =
|
|
438
|
-
|
|
434
|
+
SDL_GetGamepadButton(controller, (SDL_GamepadButton) button);
|
|
439
435
|
}
|
|
440
436
|
// Represent the triggers as buttons in addition to them being axes.
|
|
441
437
|
gamepad.buttons[GP_BUTTON_0 + button++ - GP_RANGE_BEGIN] =
|
|
@@ -452,37 +448,37 @@ private:
|
|
|
452
448
|
GamepadBuffer gamepad;
|
|
453
449
|
|
|
454
450
|
// Just guess that the first four axes are equivalent to two analog sticks.
|
|
455
|
-
int axes =
|
|
451
|
+
int axes = SDL_GetNumJoystickAxes(joystick);
|
|
456
452
|
if (axes > 0) {
|
|
457
453
|
gamepad.axes[GP_LEFT_STICK_X_AXIS] =
|
|
458
|
-
scale_axis(
|
|
454
|
+
scale_axis(SDL_GetJoystickAxis(joystick, 0));
|
|
459
455
|
}
|
|
460
456
|
if (axes > 1) {
|
|
461
457
|
gamepad.axes[GP_LEFT_STICK_Y_AXIS] =
|
|
462
|
-
scale_axis(
|
|
458
|
+
scale_axis(SDL_GetJoystickAxis(joystick, 1));
|
|
463
459
|
}
|
|
464
460
|
if (axes > 2) {
|
|
465
461
|
gamepad.axes[GP_RIGHT_STICK_X_AXIS] =
|
|
466
|
-
scale_axis(
|
|
462
|
+
scale_axis(SDL_GetJoystickAxis(joystick, 2));
|
|
467
463
|
}
|
|
468
464
|
if (axes > 3) {
|
|
469
465
|
gamepad.axes[GP_RIGHT_STICK_Y_AXIS] =
|
|
470
|
-
scale_axis(
|
|
466
|
+
scale_axis(SDL_GetJoystickAxis(joystick, 3));
|
|
471
467
|
}
|
|
472
468
|
|
|
473
469
|
// All hats are merged into the DPad.
|
|
474
|
-
int hats =
|
|
470
|
+
int hats = SDL_GetNumJoystickHats(joystick);
|
|
475
471
|
for (int hat = 0; hat < hats; ++hat) {
|
|
476
|
-
Uint8 value =
|
|
472
|
+
Uint8 value = SDL_GetJoystickHat(joystick, hat);
|
|
477
473
|
if (value & SDL_HAT_LEFT) gamepad.buttons[GP_DPAD_LEFT - GP_RANGE_BEGIN] = true;
|
|
478
474
|
if (value & SDL_HAT_RIGHT) gamepad.buttons[GP_DPAD_RIGHT - GP_RANGE_BEGIN] = true;
|
|
479
475
|
if (value & SDL_HAT_UP) gamepad.buttons[GP_DPAD_UP - GP_RANGE_BEGIN] = true;
|
|
480
476
|
if (value & SDL_HAT_DOWN) gamepad.buttons[GP_DPAD_DOWN - GP_RANGE_BEGIN] = true;
|
|
481
477
|
}
|
|
482
478
|
|
|
483
|
-
int buttons = min<int>(NUM_BUTTONS_PER_GAMEPAD - 4,
|
|
479
|
+
int buttons = min<int>(NUM_BUTTONS_PER_GAMEPAD - 4, SDL_GetNumJoystickButtons(joystick));
|
|
484
480
|
for (int button = 0; button < buttons; ++button) {
|
|
485
|
-
if (
|
|
481
|
+
if (SDL_GetJoystickButton(joystick, button)) {
|
|
486
482
|
gamepad.buttons[GP_BUTTON_0 + button - GP_RANGE_BEGIN] = true;
|
|
487
483
|
}
|
|
488
484
|
}
|
|
@@ -535,8 +531,7 @@ string Gosu::Input::id_to_char(Button btn)
|
|
|
535
531
|
|
|
536
532
|
// SDL_GetKeyName returns "Space" for this value, but we want the character value.
|
|
537
533
|
if (btn == KB_SPACE) return " ";
|
|
538
|
-
|
|
539
|
-
SDL_Keycode keycode = SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(btn));
|
|
534
|
+
SDL_Keycode keycode = SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(btn), SDL_KMOD_NONE, false);
|
|
540
535
|
if (keycode == SDLK_UNKNOWN) return "";
|
|
541
536
|
|
|
542
537
|
const char* name = SDL_GetKeyName(keycode);
|
|
@@ -560,14 +555,14 @@ Gosu::Button Gosu::Input::char_to_id(string ch)
|
|
|
560
555
|
require_sdl_video();
|
|
561
556
|
|
|
562
557
|
SDL_Keycode keycode = SDL_GetKeyFromName(ch.c_str());
|
|
563
|
-
return keycode == SDLK_UNKNOWN ? NO_BUTTON : Button(SDL_GetScancodeFromKey(keycode));
|
|
558
|
+
return keycode == SDLK_UNKNOWN ? NO_BUTTON : Button(SDL_GetScancodeFromKey(keycode, nullptr));
|
|
564
559
|
}
|
|
565
560
|
|
|
566
561
|
std::string Gosu::Input::button_name(Button btn)
|
|
567
562
|
{
|
|
568
563
|
require_sdl_video();
|
|
569
564
|
|
|
570
|
-
SDL_Keycode keycode = SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(btn));
|
|
565
|
+
SDL_Keycode keycode = SDL_GetKeyFromScancode(static_cast<SDL_Scancode>(btn), SDL_KMOD_NONE, false);
|
|
571
566
|
return SDL_GetKeyName(keycode);
|
|
572
567
|
}
|
|
573
568
|
|
|
@@ -583,11 +578,11 @@ std::string Gosu::Input::gamepad_name(int index)
|
|
|
583
578
|
return "";
|
|
584
579
|
}
|
|
585
580
|
|
|
586
|
-
if (
|
|
587
|
-
return
|
|
581
|
+
if (SDL_Gamepad* game_controller = SDL_GetGamepadFromID(instance_id)) {
|
|
582
|
+
return SDL_GetGamepadName(game_controller);
|
|
588
583
|
}
|
|
589
|
-
else if (SDL_Joystick* joystick =
|
|
590
|
-
return
|
|
584
|
+
else if (SDL_Joystick* joystick = SDL_GetJoystickFromID(instance_id)) {
|
|
585
|
+
return SDL_GetJoystickName(joystick);
|
|
591
586
|
}
|
|
592
587
|
|
|
593
588
|
return "";
|
|
@@ -602,7 +597,7 @@ bool Gosu::Input::down(Gosu::Button btn)
|
|
|
602
597
|
|
|
603
598
|
double Gosu::Input::axis(Gosu::Button btn)
|
|
604
599
|
{
|
|
605
|
-
unsigned axis_id = btn - GP_LEFT_STICK_X_AXIS;
|
|
600
|
+
unsigned axis_id = btn - static_cast<unsigned>(GP_LEFT_STICK_X_AXIS);
|
|
606
601
|
|
|
607
602
|
if (axis_id >= axis_states.size()) {
|
|
608
603
|
throw std::out_of_range("Invalid axis ID: " + std::to_string(btn));
|
|
@@ -673,10 +668,10 @@ Gosu::TextInput* Gosu::Input::text_input() const
|
|
|
673
668
|
void Gosu::Input::set_text_input(TextInput* text_input)
|
|
674
669
|
{
|
|
675
670
|
if (pimpl->text_input && text_input == nullptr) {
|
|
676
|
-
SDL_StopTextInput();
|
|
671
|
+
SDL_StopTextInput(pimpl->window);
|
|
677
672
|
}
|
|
678
673
|
else if (pimpl->text_input == nullptr && text_input) {
|
|
679
|
-
SDL_StartTextInput();
|
|
674
|
+
SDL_StartTextInput(pimpl->window);
|
|
680
675
|
}
|
|
681
676
|
|
|
682
677
|
pimpl->text_input = text_input;
|