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.
Files changed (320) hide show
  1. checksums.yaml +4 -4
  2. data/COPYING +2 -1
  3. data/dependencies/SDL/include/SDL3/SDL.h +91 -0
  4. data/dependencies/SDL/include/SDL3/SDL_assert.h +710 -0
  5. data/dependencies/SDL/include/SDL3/SDL_asyncio.h +550 -0
  6. data/dependencies/SDL/include/SDL3/SDL_atomic.h +692 -0
  7. data/dependencies/SDL/include/SDL3/SDL_audio.h +2382 -0
  8. data/dependencies/SDL/include/SDL3/SDL_begin_code.h +553 -0
  9. data/dependencies/SDL/include/{SDL_bits.h → SDL3/SDL_bits.h} +47 -27
  10. data/dependencies/SDL/include/{SDL_blendmode.h → SDL3/SDL_blendmode.h} +59 -55
  11. data/dependencies/SDL/include/SDL3/SDL_camera.h +535 -0
  12. data/dependencies/SDL/include/SDL3/SDL_clipboard.h +331 -0
  13. data/dependencies/SDL/include/{close_code.h → SDL3/SDL_close_code.h} +9 -8
  14. data/dependencies/SDL/include/{SDL_types.h → SDL3/SDL_copying.h} +2 -9
  15. data/dependencies/SDL/include/SDL3/SDL_cpuinfo.h +374 -0
  16. data/dependencies/SDL/include/SDL3/SDL_dialog.h +343 -0
  17. data/dependencies/SDL/include/SDL3/SDL_dlopennote.h +234 -0
  18. data/dependencies/SDL/include/{SDL_egl.h → SDL3/SDL_egl.h} +11 -8
  19. data/dependencies/SDL/include/SDL3/SDL_endian.h +645 -0
  20. data/dependencies/SDL/include/SDL3/SDL_error.h +226 -0
  21. data/dependencies/SDL/include/SDL3/SDL_events.h +1651 -0
  22. data/dependencies/SDL/include/SDL3/SDL_filesystem.h +537 -0
  23. data/dependencies/SDL/include/SDL3/SDL_gamepad.h +1657 -0
  24. data/dependencies/SDL/include/SDL3/SDL_gpu.h +4637 -0
  25. data/dependencies/SDL/include/SDL3/SDL_guid.h +106 -0
  26. data/dependencies/SDL/include/SDL3/SDL_haptic.h +1461 -0
  27. data/dependencies/SDL/include/SDL3/SDL_hidapi.h +571 -0
  28. data/dependencies/SDL/include/SDL3/SDL_hints.h +5041 -0
  29. data/dependencies/SDL/include/SDL3/SDL_init.h +508 -0
  30. data/dependencies/SDL/include/SDL3/SDL_intrin.h +410 -0
  31. data/dependencies/SDL/include/SDL3/SDL_iostream.h +1379 -0
  32. data/dependencies/SDL/include/SDL3/SDL_joystick.h +1385 -0
  33. data/dependencies/SDL/include/SDL3/SDL_keyboard.h +615 -0
  34. data/dependencies/SDL/include/SDL3/SDL_keycode.h +348 -0
  35. data/dependencies/SDL/include/SDL3/SDL_loadso.h +145 -0
  36. data/dependencies/SDL/include/{SDL_locale.h → SDL3/SDL_locale.h} +40 -24
  37. data/dependencies/SDL/include/SDL3/SDL_log.h +541 -0
  38. data/dependencies/SDL/include/SDL3/SDL_main.h +704 -0
  39. data/dependencies/SDL/include/SDL3/SDL_main_impl.h +149 -0
  40. data/dependencies/SDL/include/{SDL_messagebox.h → SDL3/SDL_messagebox.h} +85 -48
  41. data/dependencies/SDL/include/{SDL_metal.h → SDL3/SDL_metal.h} +29 -29
  42. data/dependencies/SDL/include/{SDL_misc.h → SDL3/SDL_misc.h} +13 -12
  43. data/dependencies/SDL/include/SDL3/SDL_mouse.h +813 -0
  44. data/dependencies/SDL/include/SDL3/SDL_mutex.h +1117 -0
  45. data/dependencies/SDL/include/SDL3/SDL_oldnames.h +1339 -0
  46. data/dependencies/SDL/include/{SDL_opengl.h → SDL3/SDL_opengl.h} +1247 -278
  47. data/dependencies/SDL/include/{SDL_opengl_glext.h → SDL3/SDL_opengl_glext.h} +5 -1
  48. data/dependencies/SDL/include/{SDL_opengles.h → SDL3/SDL_opengles.h} +6 -7
  49. data/dependencies/SDL/include/{SDL_opengles2.h → SDL3/SDL_opengles2.h} +10 -11
  50. data/dependencies/SDL/include/SDL3/SDL_pen.h +198 -0
  51. data/dependencies/SDL/include/SDL3/SDL_pixels.h +1441 -0
  52. data/dependencies/SDL/include/{SDL_test_log.h → SDL3/SDL_platform.h} +25 -26
  53. data/dependencies/SDL/include/SDL3/SDL_platform_defines.h +497 -0
  54. data/dependencies/SDL/include/{SDL_power.h → SDL3/SDL_power.h} +40 -20
  55. data/dependencies/SDL/include/SDL3/SDL_process.h +441 -0
  56. data/dependencies/SDL/include/SDL3/SDL_properties.h +572 -0
  57. data/dependencies/SDL/include/SDL3/SDL_rect.h +528 -0
  58. data/dependencies/SDL/include/SDL3/SDL_render.h +3034 -0
  59. data/dependencies/SDL/include/SDL3/SDL_revision.h +56 -0
  60. data/dependencies/SDL/include/{SDL_scancode.h → SDL3/SDL_scancode.h} +60 -68
  61. data/dependencies/SDL/include/SDL3/SDL_sensor.h +321 -0
  62. data/dependencies/SDL/include/SDL3/SDL_stdinc.h +6186 -0
  63. data/dependencies/SDL/include/SDL3/SDL_storage.h +686 -0
  64. data/dependencies/SDL/include/SDL3/SDL_surface.h +1769 -0
  65. data/dependencies/SDL/include/SDL3/SDL_system.h +840 -0
  66. data/dependencies/SDL/include/{SDL_test.h → SDL3/SDL_test.h} +16 -22
  67. data/dependencies/SDL/include/{SDL_test_assert.h → SDL3/SDL_test_assert.h} +27 -34
  68. data/dependencies/SDL/include/{SDL_test_common.h → SDL3/SDL_test_common.h} +109 -52
  69. data/dependencies/SDL/include/{SDL_test_compare.h → SDL3/SDL_test_compare.h} +22 -14
  70. data/dependencies/SDL/include/{SDL_test_crc32.h → SDL3/SDL_test_crc32.h} +27 -30
  71. data/dependencies/SDL/include/{SDL_test_font.h → SDL3/SDL_test_font.h} +50 -49
  72. data/dependencies/SDL/include/{SDL_test_fuzzer.h → SDL3/SDL_test_fuzzer.h} +64 -79
  73. data/dependencies/SDL/include/{SDL_test_harness.h → SDL3/SDL_test_harness.h} +47 -30
  74. data/dependencies/SDL/include/SDL3/SDL_test_log.h +83 -0
  75. data/dependencies/SDL/include/{SDL_test_md5.h → SDL3/SDL_test_md5.h} +21 -28
  76. data/dependencies/SDL/include/{SDL_test_memory.h → SDL3/SDL_test_memory.h} +19 -16
  77. data/dependencies/SDL/include/SDL3/SDL_thread.h +602 -0
  78. data/dependencies/SDL/include/SDL3/SDL_time.h +249 -0
  79. data/dependencies/SDL/include/SDL3/SDL_timer.h +454 -0
  80. data/dependencies/SDL/include/SDL3/SDL_touch.h +184 -0
  81. data/dependencies/SDL/include/SDL3/SDL_tray.h +544 -0
  82. data/dependencies/SDL/include/SDL3/SDL_version.h +198 -0
  83. data/dependencies/SDL/include/SDL3/SDL_video.h +3497 -0
  84. data/dependencies/SDL/include/SDL3/SDL_vulkan.h +287 -0
  85. data/dependencies/SDL/lib/x64/libSDL3.dll.a +0 -0
  86. data/dependencies/SDL/lib/x86/libSDL3.dll.a +0 -0
  87. data/dependencies/SDL_sound/SDL3_sound/SDL_sound.h +755 -0
  88. data/dependencies/SDL_sound/SDL_sound.c +136 -215
  89. data/dependencies/SDL_sound/SDL_sound_aiff.c +55 -54
  90. data/dependencies/SDL_sound/SDL_sound_au.c +32 -32
  91. data/dependencies/SDL_sound/SDL_sound_coreaudio.c +24 -41
  92. data/dependencies/SDL_sound/SDL_sound_flac.c +32 -12
  93. data/dependencies/SDL_sound/SDL_sound_internal.h +33 -48
  94. data/dependencies/SDL_sound/SDL_sound_modplug.c +21 -29
  95. data/dependencies/SDL_sound/SDL_sound_mp3.c +35 -13
  96. data/dependencies/SDL_sound/SDL_sound_raw.c +14 -15
  97. data/dependencies/SDL_sound/SDL_sound_shn.c +82 -82
  98. data/dependencies/SDL_sound/SDL_sound_voc.c +30 -30
  99. data/dependencies/SDL_sound/SDL_sound_vorbis.c +34 -25
  100. data/dependencies/SDL_sound/SDL_sound_wav.c +86 -82
  101. data/dependencies/SDL_sound/dr_flac.h +1890 -1301
  102. data/dependencies/SDL_sound/dr_mp3.h +1098 -660
  103. data/dependencies/SDL_sound/libmodplug/fastmix.c +1 -1
  104. data/dependencies/SDL_sound/libmodplug/libmodplug.h +5 -4
  105. data/dependencies/SDL_sound/libmodplug/load_ams.c +6 -3
  106. data/dependencies/SDL_sound/libmodplug/load_dsm.c +2 -1
  107. data/dependencies/SDL_sound/libmodplug/load_mt2.c +2 -2
  108. data/dependencies/SDL_sound/libmodplug/modplug.h +2 -1
  109. data/dependencies/SDL_sound/libmodplug/snd_fx.c +3 -3
  110. data/dependencies/SDL_sound/libmodplug/sndfile.c +3 -0
  111. data/dependencies/SDL_sound/libmodplug/sndmix.c +7 -3
  112. data/dependencies/SDL_sound/stb_vorbis.h +397 -342
  113. data/dependencies/mojoAL/AL/alc.h +2 -2
  114. data/dependencies/mojoAL/mojoal.c +2120 -1885
  115. data/dependencies/stb/stb_image.h +1190 -1379
  116. data/dependencies/stb/stb_image_write.h +329 -129
  117. data/dependencies/stb/stb_truetype.h +304 -60
  118. data/dependencies/utf8proc/utf8proc.c +133 -75
  119. data/dependencies/utf8proc/utf8proc.h +131 -50
  120. data/dependencies/utf8proc/utf8proc_data.h +16213 -15658
  121. data/ext/gosu-ffi/extconf.rb +103 -0
  122. data/ext/gosu-ffi/gosu-ffi.def +467 -0
  123. data/ffi/Gosu.cpp +330 -0
  124. data/ffi/Gosu.h +84 -0
  125. data/ffi/Gosu_Channel.cpp +62 -0
  126. data/ffi/Gosu_Channel.h +17 -0
  127. data/ffi/Gosu_Color.cpp +176 -0
  128. data/ffi/Gosu_Color.h +31 -0
  129. data/ffi/Gosu_Constants.cpp +334 -0
  130. data/ffi/Gosu_FFI.h +34 -0
  131. data/ffi/Gosu_FFI_internal.h +160 -0
  132. data/ffi/Gosu_Font.cpp +97 -0
  133. data/ffi/Gosu_Font.h +32 -0
  134. data/ffi/Gosu_Image.cpp +239 -0
  135. data/ffi/Gosu_Image.h +71 -0
  136. data/ffi/Gosu_Sample.cpp +29 -0
  137. data/ffi/Gosu_Sample.h +14 -0
  138. data/ffi/Gosu_Song.cpp +69 -0
  139. data/ffi/Gosu_Song.h +18 -0
  140. data/ffi/Gosu_TextInput.cpp +94 -0
  141. data/ffi/Gosu_TextInput.h +25 -0
  142. data/ffi/Gosu_Window.cpp +314 -0
  143. data/ffi/Gosu_Window.h +78 -0
  144. data/include/Gosu/Audio.hpp +6 -11
  145. data/include/Gosu/Bitmap.hpp +38 -53
  146. data/include/Gosu/Buffer.hpp +54 -0
  147. data/include/Gosu/Color.hpp +29 -36
  148. data/include/Gosu/Directories.hpp +25 -28
  149. data/include/Gosu/Drawable.hpp +58 -0
  150. data/include/Gosu/Font.hpp +6 -5
  151. data/include/Gosu/Fwd.hpp +4 -6
  152. data/include/Gosu/Gosu.hpp +5 -5
  153. data/include/Gosu/Graphics.hpp +53 -61
  154. data/include/Gosu/GraphicsBase.hpp +1 -11
  155. data/include/Gosu/Image.hpp +12 -15
  156. data/include/Gosu/Math.hpp +50 -72
  157. data/include/Gosu/Transform.hpp +32 -0
  158. data/include/Gosu/Utility.hpp +77 -1
  159. data/include/Gosu/Version.hpp +2 -2
  160. data/include/Gosu/Window.hpp +15 -9
  161. data/lib/SDL3.dll +0 -0
  162. data/lib/gosu/channel.rb +50 -0
  163. data/lib/gosu/color.rb +173 -0
  164. data/lib/gosu/compat.rb +130 -17
  165. data/lib/gosu/constants.rb +386 -0
  166. data/lib/gosu/ffi.rb +269 -0
  167. data/lib/gosu/font.rb +62 -0
  168. data/lib/gosu/gl_tex_info.rb +33 -0
  169. data/lib/gosu/gosu.rb +250 -0
  170. data/lib/gosu/image.rb +179 -0
  171. data/lib/gosu/numeric.rb +17 -0
  172. data/lib/gosu/preview.rb +6 -6
  173. data/lib/gosu/sample.rb +25 -0
  174. data/lib/gosu/song.rb +57 -0
  175. data/lib/gosu/text_input.rb +83 -0
  176. data/lib/gosu/window.rb +249 -0
  177. data/lib/gosu.rb +29 -8
  178. data/lib64/SDL3.dll +0 -0
  179. data/rdoc/gosu.rb +2 -2
  180. data/src/Audio.cpp +30 -24
  181. data/src/AudioFile.hpp +5 -4
  182. data/src/AudioFileAudioToolbox.cpp +8 -8
  183. data/src/AudioFileSDLSound.cpp +12 -15
  184. data/src/BinPacker.cpp +188 -0
  185. data/src/BinPacker.hpp +55 -0
  186. data/src/Bitmap.cpp +172 -143
  187. data/src/BitmapIO.cpp +60 -86
  188. data/src/Buffer.cpp +150 -0
  189. data/src/ClipRectStack.cpp +38 -0
  190. data/src/ClipRectStack.hpp +17 -83
  191. data/src/Color.cpp +75 -80
  192. data/src/Directories.cpp +47 -0
  193. data/src/DirectoriesUIKit.cpp +50 -0
  194. data/src/DrawOp.hpp +20 -18
  195. data/src/DrawOpQueue.hpp +27 -33
  196. data/src/Drawable.cpp +95 -0
  197. data/src/EmptyDrawable.hpp +38 -0
  198. data/src/FPS.cpp +31 -0
  199. data/src/Font.cpp +104 -74
  200. data/src/GosuGLView.cpp +13 -11
  201. data/src/GosuViewController.cpp +2 -10
  202. data/src/Graphics.cpp +86 -145
  203. data/src/GraphicsImpl.hpp +14 -68
  204. data/src/Image.cpp +41 -35
  205. data/src/Input.cpp +73 -78
  206. data/src/Macro.cpp +46 -29
  207. data/src/Macro.hpp +23 -17
  208. data/src/MarkupParser.cpp +5 -5
  209. data/src/Math.cpp +48 -22
  210. data/src/OffScreenTarget.cpp +47 -50
  211. data/src/OffScreenTarget.hpp +13 -11
  212. data/src/OpenGLContext.cpp +116 -0
  213. data/src/OpenGLContext.hpp +41 -0
  214. data/src/RenderState.hpp +49 -71
  215. data/src/Resolution.cpp +65 -53
  216. data/src/TexChunk.cpp +35 -80
  217. data/src/TexChunk.hpp +44 -35
  218. data/src/Text.cpp +1 -1
  219. data/src/TextBuilder.cpp +35 -21
  220. data/src/TextBuilder.hpp +6 -9
  221. data/src/TextInput.cpp +9 -9
  222. data/src/Texture.cpp +62 -80
  223. data/src/Texture.hpp +25 -23
  224. data/src/TiledDrawable.cpp +149 -0
  225. data/src/TiledDrawable.hpp +47 -0
  226. data/src/TimingApple.cpp +1 -1
  227. data/src/Transform.cpp +45 -50
  228. data/src/TransformStack.hpp +16 -16
  229. data/src/TrueTypeFont.cpp +59 -51
  230. data/src/TrueTypeFont.hpp +6 -7
  231. data/src/TrueTypeFontApple.cpp +28 -19
  232. data/src/TrueTypeFontUnix.cpp +39 -32
  233. data/src/TrueTypeFontWin.cpp +30 -30
  234. data/src/Utility.cpp +113 -37
  235. data/src/UtilityWin.cpp +49 -0
  236. data/src/Window.cpp +121 -151
  237. data/src/WindowUIKit.cpp +14 -14
  238. metadata +165 -118
  239. data/dependencies/SDL/include/SDL.h +0 -233
  240. data/dependencies/SDL/include/SDL_assert.h +0 -320
  241. data/dependencies/SDL/include/SDL_atomic.h +0 -415
  242. data/dependencies/SDL/include/SDL_audio.h +0 -1500
  243. data/dependencies/SDL/include/SDL_clipboard.h +0 -141
  244. data/dependencies/SDL/include/SDL_config.h +0 -331
  245. data/dependencies/SDL/include/SDL_cpuinfo.h +0 -594
  246. data/dependencies/SDL/include/SDL_endian.h +0 -348
  247. data/dependencies/SDL/include/SDL_error.h +0 -163
  248. data/dependencies/SDL/include/SDL_events.h +0 -1166
  249. data/dependencies/SDL/include/SDL_filesystem.h +0 -149
  250. data/dependencies/SDL/include/SDL_gamecontroller.h +0 -1074
  251. data/dependencies/SDL/include/SDL_gesture.h +0 -117
  252. data/dependencies/SDL/include/SDL_guid.h +0 -100
  253. data/dependencies/SDL/include/SDL_haptic.h +0 -1341
  254. data/dependencies/SDL/include/SDL_hidapi.h +0 -451
  255. data/dependencies/SDL/include/SDL_hints.h +0 -2569
  256. data/dependencies/SDL/include/SDL_joystick.h +0 -1066
  257. data/dependencies/SDL/include/SDL_keyboard.h +0 -353
  258. data/dependencies/SDL/include/SDL_keycode.h +0 -358
  259. data/dependencies/SDL/include/SDL_loadso.h +0 -115
  260. data/dependencies/SDL/include/SDL_log.h +0 -404
  261. data/dependencies/SDL/include/SDL_main.h +0 -275
  262. data/dependencies/SDL/include/SDL_mouse.h +0 -465
  263. data/dependencies/SDL/include/SDL_mutex.h +0 -471
  264. data/dependencies/SDL/include/SDL_name.h +0 -33
  265. data/dependencies/SDL/include/SDL_pixels.h +0 -644
  266. data/dependencies/SDL/include/SDL_platform.h +0 -261
  267. data/dependencies/SDL/include/SDL_quit.h +0 -58
  268. data/dependencies/SDL/include/SDL_rect.h +0 -376
  269. data/dependencies/SDL/include/SDL_render.h +0 -1919
  270. data/dependencies/SDL/include/SDL_revision.h +0 -7
  271. data/dependencies/SDL/include/SDL_rwops.h +0 -841
  272. data/dependencies/SDL/include/SDL_sensor.h +0 -322
  273. data/dependencies/SDL/include/SDL_shape.h +0 -155
  274. data/dependencies/SDL/include/SDL_stdinc.h +0 -830
  275. data/dependencies/SDL/include/SDL_surface.h +0 -997
  276. data/dependencies/SDL/include/SDL_system.h +0 -623
  277. data/dependencies/SDL/include/SDL_syswm.h +0 -386
  278. data/dependencies/SDL/include/SDL_test_images.h +0 -78
  279. data/dependencies/SDL/include/SDL_test_random.h +0 -115
  280. data/dependencies/SDL/include/SDL_thread.h +0 -464
  281. data/dependencies/SDL/include/SDL_timer.h +0 -222
  282. data/dependencies/SDL/include/SDL_touch.h +0 -150
  283. data/dependencies/SDL/include/SDL_version.h +0 -204
  284. data/dependencies/SDL/include/SDL_video.h +0 -2150
  285. data/dependencies/SDL/include/SDL_vulkan.h +0 -215
  286. data/dependencies/SDL/include/begin_code.h +0 -187
  287. data/dependencies/SDL/lib/x64/libSDL2.dll.a +0 -0
  288. data/dependencies/SDL/lib/x86/libSDL2.dll.a +0 -0
  289. data/dependencies/SDL_sound/SDL_sound.h +0 -725
  290. data/ext/gosu/extconf.rb +0 -119
  291. data/include/Gosu/IO.hpp +0 -254
  292. data/include/Gosu/ImageData.hpp +0 -53
  293. data/include/Gosu/Inspection.hpp +0 -7
  294. data/lib/SDL2.dll +0 -0
  295. data/lib/gosu/patches.rb +0 -66
  296. data/lib/gosu/run.rb +0 -20
  297. data/lib/gosu/swig_patches.rb +0 -110
  298. data/lib64/SDL2.dll +0 -0
  299. data/src/BlockAllocator.cpp +0 -131
  300. data/src/BlockAllocator.hpp +0 -32
  301. data/src/DirectoriesApple.cpp +0 -69
  302. data/src/DirectoriesUnix.cpp +0 -46
  303. data/src/DirectoriesWin.cpp +0 -65
  304. data/src/EmptyImageData.hpp +0 -52
  305. data/src/FileUnix.cpp +0 -99
  306. data/src/FileWin.cpp +0 -88
  307. data/src/IO.cpp +0 -60
  308. data/src/Iconv.hpp +0 -51
  309. data/src/Inspection.cpp +0 -27
  310. data/src/LargeImageData.cpp +0 -215
  311. data/src/LargeImageData.hpp +0 -39
  312. data/src/Log.hpp +0 -19
  313. data/src/RubyGosu.cxx +0 -13100
  314. data/src/RubyGosu.h +0 -49
  315. data/src/WinUtility.cpp +0 -61
  316. data/src/WinUtility.hpp +0 -27
  317. /data/dependencies/SDL/include/{SDL_opengles2_gl2.h → SDL3/SDL_opengles2_gl2.h} +0 -0
  318. /data/dependencies/SDL/include/{SDL_opengles2_gl2ext.h → SDL3/SDL_opengles2_gl2ext.h} +0 -0
  319. /data/dependencies/SDL/include/{SDL_opengles2_gl2platform.h → SDL3/SDL_opengles2_gl2platform.h} +0 -0
  320. /data/dependencies/SDL/include/{SDL_opengles2_khrplatform.h → SDL3/SDL_opengles2_khrplatform.h} +0 -0
data/src/Audio.cpp CHANGED
@@ -1,6 +1,5 @@
1
1
  #include <Gosu/Audio.hpp>
2
- #include <Gosu/IO.hpp>
3
- #include <Gosu/Math.hpp>
2
+ #include <Gosu/Buffer.hpp>
4
3
  #include "AudioFile.hpp"
5
4
  #include "AudioImpl.hpp"
6
5
  #include <algorithm>
@@ -18,11 +17,11 @@ struct Gosu::Sample::Impl : private Gosu::Noncopyable
18
17
  ALuint buffer;
19
18
 
20
19
  explicit Impl(AudioFile&& audio_file)
21
- : buffer{}
20
+ : buffer()
22
21
  {
23
22
  al_initialize();
24
23
  alGenBuffers(1, &buffer);
25
- alBufferData(buffer, audio_file.format(), &audio_file.decoded_data().front(),
24
+ alBufferData(buffer, audio_file.format(), audio_file.decoded_data().data(),
26
25
  static_cast<ALsizei>(audio_file.decoded_data().size()),
27
26
  static_cast<ALsizei>(audio_file.sample_rate()));
28
27
  }
@@ -31,7 +30,9 @@ struct Gosu::Sample::Impl : private Gosu::Noncopyable
31
30
  {
32
31
  // It's hard to free things in the right order in Ruby/Gosu.
33
32
  // Make sure buffer isn't deleted after the context/device are shut down.
34
- if (!al_initialized()) return;
33
+ if (!al_initialized()) {
34
+ return;
35
+ }
35
36
 
36
37
  alDeleteBuffers(1, &buffer);
37
38
  }
@@ -42,12 +43,12 @@ Gosu::Sample::Sample()
42
43
  }
43
44
 
44
45
  Gosu::Sample::Sample(const std::string& filename)
45
- : m_impl{new Impl(AudioFile(filename))}
46
+ : m_impl(new Impl(AudioFile(filename)))
46
47
  {
47
48
  }
48
49
 
49
- Gosu::Sample::Sample(Gosu::Reader reader)
50
- : m_impl{new Impl(AudioFile(reader))}
50
+ Gosu::Sample::Sample(Buffer buffer)
51
+ : m_impl(new Impl(AudioFile(std::move(buffer))))
51
52
  {
52
53
  }
53
54
 
@@ -58,12 +59,16 @@ Gosu::Channel Gosu::Sample::play(double volume, double speed, bool looping) cons
58
59
 
59
60
  Gosu::Channel Gosu::Sample::play_pan(double pan, double volume, double speed, bool looping) const
60
61
  {
61
- if (!m_impl) return Channel{};
62
+ if (!m_impl) {
63
+ return Channel();
64
+ }
62
65
 
63
66
  Channel channel = allocate_channel();
64
67
 
65
68
  // Couldn't allocate a free channel.
66
- if (channel.current_channel() == NO_CHANNEL) return channel;
69
+ if (channel.current_channel() == NO_CHANNEL) {
70
+ return channel;
71
+ }
67
72
 
68
73
  ALuint source = al_source_for_channel(channel.current_channel());
69
74
  alSourcei(source, AL_BUFFER, static_cast<ALint>(m_impl->buffer));
@@ -101,16 +106,16 @@ private:
101
106
 
102
107
  public:
103
108
  explicit Impl(const std::string& filename)
104
- : m_buffers{},
105
- m_file{new AudioFile{filename}}
109
+ : m_buffers(),
110
+ m_file(new AudioFile(filename))
106
111
  {
107
112
  al_initialize();
108
113
  alGenBuffers(2, m_buffers);
109
114
  }
110
115
 
111
- explicit Impl(Reader reader)
112
- : m_buffers{},
113
- m_file{new AudioFile{reader}}
116
+ explicit Impl(Buffer buffer)
117
+ : m_buffers(),
118
+ m_file(new AudioFile(std::move(buffer)))
114
119
  {
115
120
  al_initialize();
116
121
  alGenBuffers(2, m_buffers);
@@ -120,7 +125,9 @@ public:
120
125
  {
121
126
  // It's hard to free things in the right order in Ruby/Gosu.
122
127
  // Make sure buffers aren't deleted after the context/device are shut down.
123
- if (!al_initialized()) return;
128
+ if (!al_initialized()) {
129
+ return;
130
+ }
124
131
 
125
132
  alDeleteBuffers(2, m_buffers);
126
133
  }
@@ -192,7 +199,9 @@ public:
192
199
  for (int i = 0; i < processed; ++i) {
193
200
  alSourceUnqueueBuffers(source, 1, &buffer);
194
201
  active = stream_to_buffer(buffer);
195
- if (active) alSourceQueueBuffers(source, 1, &buffer);
202
+ if (active) {
203
+ alSourceQueueBuffers(source, 1, &buffer);
204
+ }
196
205
  }
197
206
 
198
207
  ALint state;
@@ -216,10 +225,7 @@ public:
216
225
  }
217
226
  }
218
227
 
219
- double volume() const
220
- {
221
- return m_volume;
222
- }
228
+ double volume() const { return m_volume; }
223
229
 
224
230
  void set_volume(double volume)
225
231
  {
@@ -229,12 +235,12 @@ public:
229
235
  };
230
236
 
231
237
  Gosu::Song::Song(const std::string& filename)
232
- : m_impl{new Impl(filename)}
238
+ : m_impl(new Impl(filename))
233
239
  {
234
240
  }
235
241
 
236
- Gosu::Song::Song(Reader reader)
237
- : m_impl{new Impl(reader)}
242
+ Gosu::Song::Song(Buffer buffer)
243
+ : m_impl(new Impl(std::move(buffer)))
238
244
  {
239
245
  }
240
246
 
data/src/AudioFile.hpp CHANGED
@@ -1,10 +1,10 @@
1
1
  #pragma once
2
2
 
3
- #include <Gosu/IO.hpp>
3
+ #include <Gosu/Fwd.hpp>
4
4
 
5
5
  #ifdef GOSU_IS_IPHONE
6
- // Ignore OpenAL deprecation warnings. If macOS stops shipping OpenAL, it's more likely that we bundle our own version
7
- // of it than that we switch to another audio API.
6
+ // Ignore OpenAL deprecation warnings. If iOS stops shipping OpenAL, it's more likely that we
7
+ // bundle our own version of it than that we switch to another audio API.
8
8
  #define OPENAL_DEPRECATED
9
9
  #include <OpenAL/al.h>
10
10
  #else
@@ -12,6 +12,7 @@
12
12
  #endif
13
13
 
14
14
  #include <cstddef>
15
+ #include <memory>
15
16
  #include <string>
16
17
  #include <vector>
17
18
 
@@ -24,7 +25,7 @@ namespace Gosu
24
25
 
25
26
  public:
26
27
  explicit AudioFile(const std::string& filename);
27
- explicit AudioFile(Reader reader);
28
+ explicit AudioFile(Buffer buffer);
28
29
  ~AudioFile();
29
30
 
30
31
  ALenum format() const;
@@ -8,6 +8,7 @@
8
8
 
9
9
  #include "AudioFile.hpp"
10
10
  #include "AudioImpl.hpp"
11
+ #include <Gosu/Buffer.hpp>
11
12
  #include <Gosu/Utility.hpp>
12
13
 
13
14
  #import <AudioToolbox/AudioToolbox.h>
@@ -18,6 +19,7 @@
18
19
 
19
20
  #include <algorithm>
20
21
  #include <arpa/inet.h>
22
+ #include <cstring>
21
23
  #include <stdexcept>
22
24
  #include <vector>
23
25
 
@@ -53,16 +55,16 @@ struct Gosu::AudioFile::Impl : private Gosu::Noncopyable
53
55
  static OSStatus AudioFile_ReadProc(void* in_client_data, SInt64 in_position,
54
56
  UInt32 request_count, void* buffer, UInt32* actual_count)
55
57
  {
56
- const Resource& res = *static_cast<Resource*>(in_client_data);
58
+ const Buffer& res = *static_cast<Buffer*>(in_client_data);
57
59
  *actual_count = std::min<UInt32>(request_count,
58
60
  static_cast<UInt32>(res.size() - in_position));
59
- res.read(in_position, *actual_count, buffer);
61
+ std::memcpy(buffer, res.data() + in_position, *actual_count);
60
62
  return noErr;
61
63
  }
62
64
 
63
65
  static SInt64 AudioFile_GetSizeProc(void* in_client_data)
64
66
  {
65
- const Resource& res = *static_cast<Resource*>(in_client_data);
67
+ const Buffer& res = *static_cast<Buffer*>(in_client_data);
66
68
  return res.size();
67
69
  }
68
70
 
@@ -162,14 +164,12 @@ Gosu::AudioFile::AudioFile(const std::string& filename)
162
164
  pimpl->init();
163
165
  }
164
166
 
165
- Gosu::AudioFile::AudioFile(Reader reader)
167
+ Gosu::AudioFile::AudioFile(Buffer buffer)
166
168
  : pimpl(new Impl)
167
169
  {
168
- pimpl->buffer.resize(reader.resource().size() - reader.position());
169
- reader.read(pimpl->buffer.data(), pimpl->buffer.size());
170
+ pimpl->buffer = std::move(buffer);
170
171
 
171
- void* client_data = &pimpl->buffer;
172
- CHECK_OS(AudioFileOpenWithCallbacks(client_data, Impl::AudioFile_ReadProc, nullptr,
172
+ CHECK_OS(AudioFileOpenWithCallbacks(&pimpl->buffer, Impl::AudioFile_ReadProc, nullptr,
173
173
  Impl::AudioFile_GetSizeProc, nullptr, 0, &pimpl->file_id));
174
174
  CHECK_OS(ExtAudioFileWrapAudioFileID(pimpl->file_id, false, &pimpl->file));
175
175
 
@@ -1,20 +1,18 @@
1
+ #include <Gosu/Buffer.hpp>
1
2
  #include <Gosu/Platform.hpp>
2
3
 
3
4
  #ifndef GOSU_IS_IPHONE
4
5
 
5
6
  #include "AudioFile.hpp"
6
7
  #include "AudioImpl.hpp"
7
-
8
- #include <SDL_sound.h>
9
-
8
+ #include <SDL3_sound/SDL_sound.h>
9
+ #include <algorithm>
10
10
  #include <cstdlib>
11
11
  #include <cstring>
12
- #include <algorithm>
13
12
  #include <memory>
14
13
  #include <mutex>
15
14
  #include <stdexcept>
16
15
  #include <vector>
17
- #include <stdexcept>
18
16
 
19
17
  struct Gosu::AudioFile::Impl : private Gosu::Noncopyable
20
18
  {
@@ -38,12 +36,12 @@ Gosu::AudioFile::AudioFile(const std::string& filename)
38
36
  {
39
37
  // We need to set a "desired" audio format, otherwise we may encounter data formats such as
40
38
  // floating-point samples that Apple's OpenAL implementation does not support.
41
- Sound_AudioInfo desired;
39
+ SDL_AudioSpec desired;
42
40
  // Prefer 16-bit signed data which is supported by all versions of OpenAL.
43
- desired.format = AUDIO_S16;
41
+ desired.format = SDL_AUDIO_S16;
44
42
  // 0 means "use whatever we have" (see SDL_sound.c, init_sample).
45
43
  desired.channels = 0;
46
- desired.rate = 0;
44
+ desired.freq = 0;
47
45
 
48
46
  pimpl->sample.reset(Sound_NewSampleFromFile(filename.c_str(), &desired, 4096),
49
47
  Sound_FreeSample);
@@ -57,14 +55,13 @@ Gosu::AudioFile::AudioFile(const std::string& filename)
57
55
  }
58
56
  }
59
57
 
60
- Gosu::AudioFile::AudioFile(Reader reader)
58
+ Gosu::AudioFile::AudioFile(Gosu::Buffer buffer)
61
59
  : pimpl(new Impl)
62
60
  {
63
- pimpl->buffer.resize(reader.resource().size() - reader.position());
64
- reader.read(pimpl->buffer.data(), pimpl->buffer.size());
65
- pimpl->sample.reset(Sound_NewSampleFromMem(reinterpret_cast<Uint8*>(pimpl->buffer.data()),
66
- static_cast<Uint32>(pimpl->buffer.size()),
67
- "", nullptr, 4096),
61
+ pimpl->buffer = std::move(buffer);
62
+ pimpl->sample.reset(Sound_NewSampleFromMem(pimpl->buffer.data(),
63
+ static_cast<Uint32>(pimpl->buffer.size()), "",
64
+ nullptr, 4096),
68
65
  Sound_FreeSample);
69
66
  if (!pimpl->sample) {
70
67
  std::string message = "Could not parse audio file";
@@ -100,7 +97,7 @@ ALenum Gosu::AudioFile::format() const
100
97
 
101
98
  ALuint Gosu::AudioFile::sample_rate() const
102
99
  {
103
- return pimpl->sample->actual.rate;
100
+ return pimpl->sample->actual.freq;
104
101
  }
105
102
 
106
103
  void Gosu::AudioFile::rewind()
data/src/BinPacker.cpp ADDED
@@ -0,0 +1,188 @@
1
+ #include <Gosu/Utility.hpp>
2
+ #include "BinPacker.hpp"
3
+ #include <algorithm>
4
+
5
+ #ifndef NDEBUG
6
+ #include <cassert>
7
+ #endif
8
+
9
+ Gosu::BinPacker::BinPacker(int width, int height)
10
+ : m_width(width),
11
+ m_height(height),
12
+ m_free_rects { Rect::xywh(0, 0, width, height) }
13
+ {
14
+ }
15
+
16
+ std::shared_ptr<const Gosu::Rect> Gosu::BinPacker::alloc(int width, int height)
17
+ {
18
+ std::unique_lock lock(m_mutex);
19
+
20
+ const Rect* best_rect = best_free_rect(width, height);
21
+
22
+ // We didn't find a single free rectangle that can fit the required size? Exit.
23
+ if (best_rect == nullptr) {
24
+ return nullptr;
25
+ }
26
+
27
+ // We found a free area, place the result in the top left corner of it.
28
+ // (Also make sure that the pointer's deleter returns the rectangle. Note: Even though
29
+ // shared_ptr may call its deleter with a nullptr in general, it will not do so here.)
30
+ std::shared_ptr<const Rect> result(
31
+ new Rect(Rect::xywh(best_rect->x, best_rect->y, width, height)),
32
+ [this](const Rect* p) { add_free_rect(*p); });
33
+
34
+ // We need to split the remaining rectangle into two. We use the axis with the longer side.
35
+ // (Called "Longer Axis Split Rule", "-LAS" in the paper.)
36
+ Rect new_rect_right = *best_rect;
37
+ Rect new_rect_below = *best_rect;
38
+ if (best_rect->width < best_rect->height) {
39
+ // ┏━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┓
40
+ // ┃ result ┃ new_rect_right ┃
41
+ // ┣━━━━━━━━━━━━━━━━┻━━━━━━━━━━━━━━━━┫
42
+ // ┃ new_rect_below ┃
43
+ // ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
44
+ new_rect_right.x += width;
45
+ new_rect_right.width -= width;
46
+ new_rect_right.height = height;
47
+
48
+ new_rect_below.y += height;
49
+ new_rect_below.height -= height;
50
+ }
51
+ else {
52
+ // ┏━━━━━━━━━━━━━━━━┳━━━━━━━━━━━━━━━━┓
53
+ // ┃ result ┃ ┃
54
+ // ┣━━━━━━━━━━━━━━━━┫ new_rect_right ┃
55
+ // ┃ new_rect_below ┃ ┃
56
+ // ┗━━━━━━━━━━━━━━━━┻━━━━━━━━━━━━━━━━┛
57
+ new_rect_right.x += width;
58
+ new_rect_right.width -= width;
59
+
60
+ new_rect_below.y += height;
61
+ new_rect_below.height -= height;
62
+ new_rect_below.width = width;
63
+ }
64
+
65
+ remove_free_rect(static_cast<int>(best_rect - m_free_rects.data()));
66
+
67
+ // Release the mutex lock before calling add_free_rect to avoid a deadlock.
68
+ lock.unlock();
69
+
70
+ if (!new_rect_below.empty()) {
71
+ add_free_rect(new_rect_below);
72
+ }
73
+ if (!new_rect_right.empty()) {
74
+ add_free_rect(new_rect_right);
75
+ }
76
+
77
+ return result;
78
+ }
79
+
80
+ void Gosu::BinPacker::add_free_rect(const Rect& rect)
81
+ {
82
+ const std::scoped_lock lock(m_mutex);
83
+
84
+ #ifndef NDEBUG
85
+ for (const Rect& other_free_rect : m_free_rects) {
86
+ assert(!rect.overlaps(other_free_rect));
87
+ }
88
+ #endif
89
+
90
+ m_free_rects.push_back(rect);
91
+ merge_neighbors(static_cast<int>(m_free_rects.size() - 1));
92
+ }
93
+
94
+ const Gosu::Rect* Gosu::BinPacker::best_free_rect(int width, int height) const
95
+ {
96
+ // The rect wouldn't even fit onto the texture!
97
+ if (width > m_width || height > m_height) {
98
+ return nullptr;
99
+ }
100
+
101
+ const Rect* best_rect = nullptr;
102
+ int best_weight = 0;
103
+
104
+ for (const Rect& free_rect : m_free_rects) {
105
+ // This implements the "Best Short Side Fit" (BSSF) metric for choosing a free area.
106
+ int weight = std::min(free_rect.width - width, free_rect.height - height);
107
+ if (weight < 0) {
108
+ continue;
109
+ }
110
+ if (best_rect == nullptr || weight < best_weight) {
111
+ best_rect = &free_rect;
112
+ best_weight = weight;
113
+ }
114
+ }
115
+
116
+ return best_rect;
117
+ }
118
+
119
+ void Gosu::BinPacker::remove_free_rect(int index, int* other_index)
120
+ {
121
+ std::swap(m_free_rects.at(index), m_free_rects.back());
122
+ if (other_index && *other_index == m_free_rects.size() - 1) {
123
+ *other_index = index;
124
+ }
125
+
126
+ m_free_rects.pop_back();
127
+ }
128
+
129
+ void Gosu::BinPacker::merge_neighbors(int index)
130
+ {
131
+ // This algorithm tries to merge adjacent free rectangles into larger ones where possible.
132
+ // However, it only finds pairwise combinations of rectangles that can be merged into a single,
133
+ // larger rectangle. You may find that textures/bins sometimes end up with free rectangles that
134
+ // are shaped like this:
135
+ // ┏━━━━┳━┓
136
+ // ┣━┳━━┫ ┃
137
+ // ┃ ┣━━┻━┫
138
+ // ┗━┻━━━━┛
139
+ // In this case, the texture gets stuck in this fragmented state. We assume that this is not an
140
+ // issue in practice, just like RAM fragmentation has never been problematic for us.
141
+
142
+ // Merge any of the other rectangles in the list into the one with the given index if they share
143
+ // any of their four sides.
144
+ for (int j = 0; j < m_free_rects.size(); ++j) {
145
+ Rect& rect = m_free_rects[index];
146
+
147
+ const Rect& other_rect = m_free_rects[j];
148
+ bool merged = false;
149
+ if (rect.x == other_rect.x && rect.width == other_rect.width) {
150
+ // Both rectangles are horizontally aligned.
151
+
152
+ if (rect.y == other_rect.bottom()) {
153
+ // rect is directly below other_rect, expand it upward.
154
+ rect.y = other_rect.y;
155
+ rect.height += other_rect.height;
156
+ merged = true;
157
+ }
158
+ else if (other_rect.y == rect.bottom()) {
159
+ // rect is directly above other_rect, expand it downward.
160
+ rect.height += other_rect.height;
161
+ merged = true;
162
+ }
163
+ }
164
+ else if (rect.y == other_rect.y && rect.height == other_rect.height) {
165
+ // Both rectangles are vertically aligned.
166
+
167
+ if (rect.x == other_rect.right()) {
168
+ // rect is directly to the right of other_rect, expand it to the left.
169
+ rect.x = other_rect.x;
170
+ rect.width += other_rect.width;
171
+ merged = true;
172
+ }
173
+ else if (other_rect.x == rect.right()) {
174
+ // rect is directly to the left of other_rect, expand it to the right.
175
+ rect.width += other_rect.width;
176
+ merged = true;
177
+ }
178
+ }
179
+
180
+ // If we merged two rectangles, then we need to start over because the longer sides of the
181
+ // combined rectangle might allow new mergers with other adjacent rectangles, and so on.
182
+ if (merged) {
183
+ remove_free_rect(j, &index);
184
+ // Reset j to -1 so that the next loop iteration will resume at j == 0.
185
+ j = -1;
186
+ }
187
+ }
188
+ }
data/src/BinPacker.hpp ADDED
@@ -0,0 +1,55 @@
1
+ #pragma once
2
+
3
+ #include <Gosu/Platform.hpp>
4
+ #include <Gosu/Utility.hpp>
5
+ #include <mutex>
6
+ #include <memory>
7
+ #include <vector>
8
+
9
+ namespace Gosu
10
+ {
11
+ /// This implements an allocator for 2D rects in a given "bin", which is typically an OpenGL
12
+ /// texture. It uses the GUILLOTINE-LAS-RM-BSSF algorithm because it has the best worst-case
13
+ /// performance in the PDF paper found here: https://github.com/juj/RectangleBinPack
14
+ /// (The extra complexity of the MAXRECTS algorithm did not seem to be worth it, and the Skyline
15
+ /// algorithm does not seem well-suited for scenarios where images are occasionally deleted.)
16
+ ///
17
+ /// Note: This class cannot use stb_rect_pack.h because that uses an "offline" algorithm,
18
+ /// i.e. it requires all boxes to be allocated at the same time, which is not how Gosu games are
19
+ /// usually structured.
20
+ ///
21
+ /// (This class is non-copyable because alloc returns shared_ptrs that reference this object.
22
+ /// Moving a BinPacker instance would lead to dangling pointers.)
23
+ class BinPacker : private Noncopyable
24
+ {
25
+ const int m_width, m_height;
26
+ std::vector<Rect> m_free_rects;
27
+ std::mutex m_mutex;
28
+
29
+ public:
30
+ BinPacker(int width, int height);
31
+
32
+ int width() const { return m_width; }
33
+ int height() const { return m_height; }
34
+
35
+ /// Finds a free rectangle in the bin and marks it as used, or returns nullptr.
36
+ /// The returned shared_ptr will automatically mark the rectangle as freed through its
37
+ /// deleter. The shared_ptr must not outlive the BinPacker.
38
+ std::shared_ptr<const Rect> alloc(int width, int height);
39
+ /// Marks a previously allocated rectangle as free again. This must be called with one of
40
+ /// the rectangles previously returned by alloc().
41
+ void add_free_rect(const Rect& rect);
42
+
43
+ private:
44
+ /// Finds the best free rectangle using the "Best Short Side Fit" ("BSSF") metric, if any.
45
+ const Rect* best_free_rect(int width, int height) const;
46
+
47
+ /// Removes m_free_rects[index]. If a pointer to another index is given, it will be adjusted
48
+ /// to the new index of the previously pointed-to rectangle (if it has moved).
49
+ void remove_free_rect(int index, int* other_index = nullptr);
50
+
51
+ /// Performs the "Rectangle Merge Improvement" (-RM) by repeatedly merging adjacent free
52
+ /// rects into m_free_rects[index] if they can be replaced by a single, larger rectangle.
53
+ void merge_neighbors(int index);
54
+ };
55
+ }