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
@@ -0,0 +1,149 @@
1
+ #include <Gosu/Bitmap.hpp>
2
+ #include <Gosu/Graphics.hpp>
3
+ #include "GraphicsImpl.hpp"
4
+ #include "TiledDrawable.hpp"
5
+ #include <cmath>
6
+ #include <stdexcept>
7
+
8
+ Gosu::TiledDrawable::TiledDrawable(const Bitmap& source, const Rect& source_rect, int tile_size,
9
+ unsigned image_flags)
10
+ : m_width(source_rect.width),
11
+ m_height(source_rect.height)
12
+ {
13
+ if (!Rect::covering(source).contains(source_rect) || source_rect.empty()) {
14
+ throw std::invalid_argument("Invalid TiledDrawable source_rect");
15
+ }
16
+ if (tile_size <= 0) {
17
+ throw std::invalid_argument("tile_size must be greater than 0");
18
+ }
19
+
20
+ // Manually round up during this integer division.
21
+ const int tiles_x = (source_rect.width + tile_size - 1) / tile_size;
22
+ const int tiles_y = (source_rect.height + tile_size - 1) / tile_size;
23
+
24
+ for (int ty = 0; ty < tiles_y; ++ty) {
25
+ for (int tx = 0; tx < tiles_x; ++tx) {
26
+ Rect tile_source_rect { .x = source_rect.x + tx * tile_size,
27
+ .y = source_rect.y + ty * tile_size,
28
+ .width = tile_size,
29
+ .height = tile_size };
30
+ tile_source_rect.clip_to(source_rect);
31
+
32
+ unsigned local_flags = image_flags;
33
+
34
+ // The left edge must always be tileable in all columns except for the first.
35
+ if (tx > 0) {
36
+ local_flags |= IF_TILEABLE_LEFT;
37
+ }
38
+ // The right edge must always be tileable in all columns except for the last.
39
+ if (tx < tiles_x - 1) {
40
+ local_flags |= IF_TILEABLE_RIGHT;
41
+ }
42
+ // The top edge must always be tileable in all rows except for the first.
43
+ if (ty > 0) {
44
+ local_flags |= IF_TILEABLE_TOP;
45
+ }
46
+ // The bottom edge must always be tileable in all rows except for the last.
47
+ if (ty < tiles_y - 1) {
48
+ local_flags |= IF_TILEABLE_BOTTOM;
49
+ }
50
+
51
+ m_tiles.push_back(Tile {
52
+ .x = tile_source_rect.x,
53
+ .y = tile_source_rect.y,
54
+ .data = create_drawable(source, tile_source_rect, local_flags),
55
+ });
56
+ }
57
+ }
58
+ }
59
+
60
+ Gosu::TiledDrawable::TiledDrawable(const TiledDrawable& parent, const Rect& rect)
61
+ : m_width(rect.width),
62
+ m_height(rect.height)
63
+ {
64
+ for (const Tile& tile : parent.m_tiles) {
65
+ // rect is the source area on the parent, tile_rect is this tile's area on the parent.
66
+ Rect tile_rect = Rect::xywh(tile.x, tile.y, tile.data->width(), tile.data->height());
67
+ // The x/y source position on the tile...
68
+ int x = 0, y = 0;
69
+ // ...must be adjusted while clipping.
70
+ tile_rect.clip_to(rect, &x, &y);
71
+ // If there is anything left of the tile_rect after clipping, we need to create a tile too.
72
+ if (!tile_rect.empty()) {
73
+ m_tiles.push_back(Tile {
74
+ .x = tile.x - rect.x,
75
+ .y = tile.y - rect.y,
76
+ .data = tile.data->subimage(Rect::xywh(x, y, tile_rect.width, tile_rect.height)),
77
+ });
78
+ }
79
+ }
80
+ }
81
+
82
+ void Gosu::TiledDrawable::draw(double x1, double y1, Color c1, double x2, double y2, Color c2,
83
+ double x3, double y3, Color c3, double x4, double y4, Color c4,
84
+ ZPos z, BlendMode mode) const
85
+ {
86
+ normalize_coordinates(x1, y1, x2, y2, x3, y3, c3, x4, y4, c4);
87
+
88
+ double f_width = m_width, f_height = m_height;
89
+ for (const Tile& tile : m_tiles) {
90
+ double rel_x_l = tile.x / f_width;
91
+ double rel_x_r = (tile.x + tile.data->width()) / f_width;
92
+ double rel_y_t = tile.y / f_height;
93
+ double rel_y_b = (tile.y + tile.data->height()) / f_height;
94
+
95
+ using std::lerp;
96
+ // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
97
+ #define LERP2D(what, x_weight, y_weight) \
98
+ lerp(lerp(what##1, what##3, y_weight), lerp(what##2, what##4, y_weight), x_weight);
99
+
100
+ double x_t_l = LERP2D(x, rel_x_l, rel_y_t);
101
+ double x_t_r = LERP2D(x, rel_x_r, rel_y_t);
102
+ double x_b_l = LERP2D(x, rel_x_l, rel_y_b);
103
+ double x_b_r = LERP2D(x, rel_x_r, rel_y_b);
104
+
105
+ double y_t_l = LERP2D(y, rel_x_l, rel_y_t);
106
+ double y_t_r = LERP2D(y, rel_x_r, rel_y_t);
107
+ double y_b_l = LERP2D(y, rel_x_l, rel_y_b);
108
+ double y_b_r = LERP2D(y, rel_x_r, rel_y_b);
109
+
110
+ Color c_t_l = LERP2D(c, rel_x_l, rel_y_t);
111
+ Color c_t_r = LERP2D(c, rel_x_r, rel_y_t);
112
+ Color c_b_l = LERP2D(c, rel_x_l, rel_y_b);
113
+ Color c_b_r = LERP2D(c, rel_x_r, rel_y_b);
114
+
115
+ tile.data->draw(x_t_l, y_t_l, c_t_l, x_t_r, y_t_r, c_t_r, //
116
+ x_b_l, y_b_l, c_b_l, x_b_r, y_b_r, c_b_r, z, mode);
117
+ }
118
+ }
119
+
120
+ std::unique_ptr<Gosu::Drawable> Gosu::TiledDrawable::subimage(const Rect& source_rect) const
121
+ {
122
+ auto tiled_drawable = std::make_unique<TiledDrawable>(*this, source_rect);
123
+ if (tiled_drawable->m_tiles.size() == 1) {
124
+ // Optimization: If the tiled subimage only contains a single tile, return that.
125
+ return std::move(tiled_drawable->m_tiles[0].data);
126
+ }
127
+ return tiled_drawable;
128
+ }
129
+
130
+ Gosu::Bitmap Gosu::TiledDrawable::to_bitmap() const
131
+ {
132
+ Bitmap bitmap(width(), height());
133
+ for (const Tile& tile : m_tiles) {
134
+ bitmap.insert(tile.data->to_bitmap(), tile.x, tile.y);
135
+ }
136
+ return bitmap;
137
+ }
138
+
139
+ void Gosu::TiledDrawable::insert(const Bitmap& bitmap, int x, int y)
140
+ {
141
+ const Rect target_rect = Rect::xywh(x, y, bitmap.width(), bitmap.height());
142
+ for (const Tile& tile : m_tiles) {
143
+ Rect tile_rect = Rect::xywh(tile.x, tile.y, tile.data->width(), tile.data->height());
144
+ tile_rect.clip_to(target_rect);
145
+ if (!tile_rect.empty()) {
146
+ tile.data->insert(bitmap, x - tile.x, y - tile.y);
147
+ }
148
+ }
149
+ }
@@ -0,0 +1,47 @@
1
+ #pragma once
2
+
3
+ #include <Gosu/Fwd.hpp>
4
+ #include <Gosu/Drawable.hpp>
5
+ #include <Gosu/Platform.hpp>
6
+ #include <functional>
7
+ #include <memory>
8
+ #include <vector>
9
+
10
+ namespace Gosu
11
+ {
12
+ /// When an image file is too large to be represented by a single OpenGL texture, Gosu automatically
13
+ /// splits it up into a rectangle of tiles instead of throwing an error.
14
+ class TiledDrawable : public Drawable
15
+ {
16
+ int m_width, m_height;
17
+ struct Tile
18
+ {
19
+ int x = 0, y = 0;
20
+ std::unique_ptr<Drawable> data = nullptr;
21
+ };
22
+ std::vector<Tile> m_tiles;
23
+
24
+ public:
25
+ TiledDrawable(const Bitmap& source, const Rect& source_rect, int tile_size,
26
+ unsigned image_flags);
27
+ /// This constructor is used to implement subimage().
28
+ TiledDrawable(const TiledDrawable& parent, const Rect& rect);
29
+
30
+ int width() const override { return m_width; }
31
+ int height() const override { return m_height; }
32
+
33
+ void draw(double x1, double y1, Color c1, //
34
+ double x2, double y2, Color c2, //
35
+ double x3, double y3, Color c3, //
36
+ double x4, double y4, Color c4, //
37
+ ZPos z, BlendMode mode) const override;
38
+
39
+ const GLTexInfo* gl_tex_info() const override { return nullptr; }
40
+
41
+ std::unique_ptr<Drawable> subimage(const Rect& rect) const override;
42
+
43
+ Bitmap to_bitmap() const override;
44
+
45
+ void insert(const Bitmap& bitmap, int x, int y) override;
46
+ };
47
+ }
data/src/TimingApple.cpp CHANGED
@@ -23,7 +23,7 @@ unsigned long Gosu::milliseconds()
23
23
  }();
24
24
 
25
25
  uint64_t runtime = mach_absolute_time() - first_tick;
26
- return runtime * info.numer / info.denom / 1000000;
26
+ return runtime * info.numer / info.denom / 1'000'000;
27
27
  }
28
28
 
29
29
  #endif
data/src/Transform.cpp CHANGED
@@ -1,73 +1,68 @@
1
- // Default matrices, adapted from original Transform support
2
- // contribution by erisdiscord. Thank you!
1
+ // Default matrices, adapted from original Transform support contribution by erisdiscord. Thank you!
3
2
 
4
- #include "GraphicsImpl.hpp"
5
- #include <Gosu/GraphicsBase.hpp>
6
3
  #include <Gosu/Math.hpp>
4
+ #include <Gosu/Transform.hpp>
7
5
  #include <cmath>
8
- using namespace std;
9
6
 
10
- Gosu::Transform Gosu::rotate(double angle, double around_x, double around_y)
7
+ void Gosu::Transform::apply(double& x, double& y) const
11
8
  {
12
- double c = cos(degrees_to_radians(angle));
13
- double s = sin(degrees_to_radians(angle));
14
- Transform result = {
15
- +c, +s, 0, 0,
16
- -s, +c, 0, 0,
17
- 0, 0, 1, 0,
18
- 0, 0, 0, 1
19
- };
20
- if (around_x != 0 || around_y != 0) {
21
- result = concat(concat(translate(-around_x, -around_y), result),
22
- translate(around_x, around_y));
9
+ double in[4] = { x, y, 0, 1 };
10
+ double out[4] = { 0, 0, 0, 0 };
11
+ for (int i = 0; i < 4; ++i) {
12
+ for (int j = 0; j < 4; ++j) {
13
+ out[i] += in[j] * matrix[j * 4 + i];
14
+ }
23
15
  }
24
- return result;
16
+ x = out[0] / out[3];
17
+ y = out[1] / out[3];
25
18
  }
26
19
 
27
- Gosu::Transform Gosu::translate(double x, double y)
20
+ Gosu::Transform Gosu::Transform::translate(double x, double y)
28
21
  {
29
- Transform result = {
30
- 1, 0, 0, 0,
31
- 0, 1, 0, 0,
32
- 0, 0, 1, 0,
33
- x, y, 0, 1
34
- };
35
- return result;
22
+ return Transform { 1, 0, 0, 0, //
23
+ 0, 1, 0, 0, //
24
+ 0, 0, 1, 0, //
25
+ x, y, 0, 1 };
36
26
  }
37
27
 
38
- Gosu::Transform Gosu::scale(double factor)
28
+ Gosu::Transform Gosu::Transform::rotate(double angle)
39
29
  {
40
- Transform result = {
41
- factor, 0, 0, 0,
42
- 0, factor, 0, 0,
43
- 0, 0, 1, 0,
44
- 0, 0, 0, 1
45
- };
46
- return result;
30
+ double c = std::cos(degrees_to_radians(angle));
31
+ double s = std::sin(degrees_to_radians(angle));
32
+ return Transform { +c, +s, 0, 0, //
33
+ -s, +c, 0, 0, //
34
+ 0, 0, 1, 0, //
35
+ 0, 0, 0, 1 };
47
36
  }
48
37
 
49
- Gosu::Transform Gosu::scale(double scale_x, double scale_y, double around_x, double around_y)
38
+ Gosu::Transform Gosu::Transform::scale(double factor)
50
39
  {
51
- Transform result = {
52
- scale_x, 0, 0, 0,
53
- 0, scale_y, 0, 0,
54
- 0, 0, 1, 0,
55
- 0, 0, 0, 1
56
- };
57
- if (around_x != 0 || around_y != 0) {
58
- result = concat(concat(translate(-around_x, -around_y), result),
59
- translate(around_x, around_y));
60
- }
61
- return result;
40
+ return Transform { factor, 0, 0, 0, //
41
+ 0, factor, 0, 0, //
42
+ 0, 0, 1, 0, //
43
+ 0, 0, 0, 1 };
44
+ }
45
+
46
+ Gosu::Transform Gosu::Transform::scale(double scale_x, double scale_y)
47
+ {
48
+ return Transform { scale_x, 0, 0, 0, //
49
+ 0, scale_y, 0, 0, //
50
+ 0, 0, 1, 0, //
51
+ 0, 0, 0, 1 };
52
+ }
53
+
54
+ Gosu::Transform Gosu::Transform::around(double around_x, double around_y) const
55
+ {
56
+ return translate(-around_x, -around_y) * *this * translate(around_x, around_y);
62
57
  }
63
58
 
64
- Gosu::Transform Gosu::concat(const Transform& left, const Transform& right)
59
+ Gosu::Transform Gosu::Transform::operator*(const Transform& rhs) const
65
60
  {
66
- Transform result;
61
+ Transform result { 0 };
67
62
  for (int i = 0; i < 16; ++i) {
68
- result[i] = 0;
63
+ result.matrix[i] = 0;
69
64
  for (int j = 0; j < 4; ++j) {
70
- result[i] += left[i / 4 * 4 + j] * right[i % 4 + j * 4];
65
+ result.matrix[i] += matrix[i / 4 * 4 + j] * rhs.matrix[i % 4 + j * 4];
71
66
  }
72
67
  }
73
68
  return result;
@@ -14,7 +14,7 @@ namespace Gosu
14
14
  Transforms absolute;
15
15
  // Points to one absolute transform.
16
16
  Transforms::const_iterator current_iterator;
17
-
17
+
18
18
  void make_current(const Transform& transform)
19
19
  {
20
20
  current_iterator = std::find(absolute.begin(), absolute.end(), transform);
@@ -22,12 +22,12 @@ namespace Gosu
22
22
  current_iterator = absolute.insert(absolute.end(), transform);
23
23
  }
24
24
  }
25
-
25
+
26
26
  public:
27
27
  TransformStack()
28
28
  {
29
29
  reset();
30
- individual.front() = absolute.front() = scale(1);
30
+ individual.front() = absolute.front() = Transform::scale(1);
31
31
  }
32
32
 
33
33
  void reset()
@@ -39,18 +39,18 @@ namespace Gosu
39
39
  absolute.resize(1);
40
40
  current_iterator = absolute.begin();
41
41
  }
42
-
42
+
43
43
  TransformStack(const TransformStack& other)
44
44
  {
45
45
  *this = other;
46
46
  }
47
-
47
+
48
48
  // Custom assignment to ensure valid current_iterator
49
49
  TransformStack& operator=(const TransformStack& other)
50
50
  {
51
51
  individual = other.individual;
52
52
  absolute = other.absolute;
53
-
53
+
54
54
  // Reset our current_iterator to point to the respective element
55
55
  // in our own 'absolute' transforms by iterating both lists up to
56
56
  // the other lists' current iterator
@@ -60,39 +60,39 @@ namespace Gosu
60
60
  ++current_iterator;
61
61
  ++other_iterator;
62
62
  }
63
-
63
+
64
64
  return *this;
65
65
  }
66
-
66
+
67
67
  void set_base_transform(const Transform& base_transform)
68
68
  {
69
69
  assert (individual.size() == 1);
70
70
  assert (absolute.size() == 1);
71
-
71
+
72
72
  individual.front() = absolute.front() = base_transform;
73
73
  }
74
-
74
+
75
75
  const Transform& current()
76
76
  {
77
77
  return *current_iterator;
78
78
  }
79
-
79
+
80
80
  void push(const Transform& transform)
81
81
  {
82
82
  individual.push_back(transform);
83
- Transform result = concat(transform, current());
83
+ Transform result = transform * current();
84
84
  make_current(result);
85
85
  }
86
-
86
+
87
87
  void pop()
88
88
  {
89
89
  assert (individual.size() > 1);
90
-
90
+
91
91
  individual.pop_back();
92
- Transform result = scale(1);
92
+ Transform result = Transform::scale(1);
93
93
  for (Transforms::reverse_iterator it = individual.rbegin(),
94
94
  end = individual.rend(); it != end; ++it)
95
- result = concat(result, *it);
95
+ result = result * *it;
96
96
  make_current(result);
97
97
  }
98
98
  };
data/src/TrueTypeFont.cpp CHANGED
@@ -1,9 +1,10 @@
1
1
  #include "TrueTypeFont.hpp"
2
- #include <Gosu/IO.hpp>
2
+ #include <Gosu/Buffer.hpp>
3
3
  #include <Gosu/Text.hpp>
4
4
  #include <Gosu/Utility.hpp>
5
5
  #include <algorithm>
6
6
  #include <map>
7
+ #include <mutex>
7
8
  #include <stdexcept>
8
9
 
9
10
  #define STB_TRUETYPE_IMPLEMENTATION
@@ -11,23 +12,25 @@
11
12
 
12
13
  struct Gosu::TrueTypeFont::Impl : private Gosu::Noncopyable
13
14
  {
14
- stbtt_fontinfo info{};
15
+ stbtt_fontinfo info {};
15
16
  std::shared_ptr<TrueTypeFont> fallback;
16
17
 
17
18
  // The height of the ascent in internal font metrics (an arbitrary integer scale). The ascent is
18
19
  // the part of the font above the baseline (which TrueType considers to be at y = 0).
19
- int ascent{};
20
+ int ascent = 0;
20
21
 
21
22
  // Scaling factor from internal font metrics (an arbitrary integer scale) to a font with
22
23
  // height = 1px.
23
24
  double base_scale;
24
25
 
25
- Impl(const unsigned char* ttf_data, std::shared_ptr<TrueTypeFont> fallback)
26
- : fallback{move(fallback)}
26
+ Impl(const std::uint8_t* ttf_data, std::shared_ptr<TrueTypeFont> fallback)
27
+ : fallback(std::move(fallback))
27
28
  {
28
29
  auto offset = stbtt_GetFontOffsetForIndex(ttf_data, 0);
29
30
  int success = stbtt_InitFont(&info, ttf_data, offset);
30
- if (!success) throw std::runtime_error{"Invalid TrueType font data"};
31
+ if (!success) {
32
+ throw std::runtime_error("Invalid TrueType font data");
33
+ }
31
34
 
32
35
  // Calculate metrics.
33
36
  int descent, line_gap;
@@ -40,7 +43,9 @@ struct Gosu::TrueTypeFont::Impl : private Gosu::Noncopyable
40
43
  double draw_text(const std::u32string& text, bool is_end, double height, Bitmap* bitmap,
41
44
  double x, double y, Color c)
42
45
  {
43
- if (text.empty()) return 0;
46
+ if (text.empty()) {
47
+ return 0;
48
+ }
44
49
 
45
50
  // The 'x' parameter is used as the running cursor variable in this method.
46
51
 
@@ -51,7 +56,9 @@ struct Gosu::TrueTypeFont::Impl : private Gosu::Noncopyable
51
56
  for (std::size_t index = 0; index < text.size(); ++index) {
52
57
  auto codepoint = text[index];
53
58
  // Silently skip control characters, including the \r in Windows-style line breaks.
54
- if (codepoint < ' ') continue;
59
+ if (codepoint < ' ') {
60
+ continue;
61
+ }
55
62
 
56
63
  int glyph = stbtt_FindGlyphIndex(&info, static_cast<int>(codepoint));
57
64
  // Handle missing characters in this font...
@@ -98,10 +105,11 @@ struct Gosu::TrueTypeFont::Impl : private Gosu::Noncopyable
98
105
  float fscale = static_cast<float>(scale);
99
106
  int last_xoff, last_width;
100
107
  // TODO: Don't allocate a buffer just to get metrics!
101
- std::shared_ptr<unsigned char> unused_data{
102
- stbtt_GetGlyphBitmapSubpixel(&info, fscale, fscale, shift_x, 0, last_glyph,
103
- &last_width, nullptr, &last_xoff, nullptr),
104
- std::free};
108
+ std::shared_ptr<std::uint8_t> unused_data {
109
+ stbtt_GetGlyphBitmapSubpixel(&info, fscale, fscale, shift_x, 0, last_glyph,
110
+ &last_width, nullptr, &last_xoff, nullptr),
111
+ std::free
112
+ };
105
113
  // Move the cursor to the right if pixels have been touched by draw_glyph that are
106
114
  // to the right of the current cursor.
107
115
  // If the last character extends to the right of the cursor, then this prevents the
@@ -144,16 +152,16 @@ struct Gosu::TrueTypeFont::Impl : private Gosu::Noncopyable
144
152
  int w, h, xoff, yoff;
145
153
  // As an optimization, this method/class could try to re-use a buffer for rasterization
146
154
  // instead of having stb_truetype allocate a fresh one for each draw_glyph call.
147
- std::shared_ptr<unsigned char> pixels{stbtt_GetGlyphBitmapSubpixel(&info, fscale, fscale,
148
- shift_x, shift_y, glyph,
149
- &w, &h, &xoff, &yoff),
150
- std::free};
155
+ std::shared_ptr<std::uint8_t> pixels(stbtt_GetGlyphBitmapSubpixel(&info, fscale, fscale, //
156
+ shift_x, shift_y, glyph,
157
+ &w, &h, &xoff, &yoff),
158
+ std::free);
151
159
 
152
160
  int target_y = static_cast<int>(y + ascent * scale + yoff);
153
161
  blend_into_bitmap(bitmap, pixels.get(), x + xoff, target_y, w, h, c);
154
162
  }
155
163
 
156
- static void blend_into_bitmap(Bitmap& bitmap, const unsigned char* pixels, //
164
+ static void blend_into_bitmap(Bitmap& bitmap, const std::uint8_t* pixels, //
157
165
  int x, int y, int w, int h, Color c)
158
166
  {
159
167
  int stride = w;
@@ -188,9 +196,9 @@ struct Gosu::TrueTypeFont::Impl : private Gosu::Noncopyable
188
196
  }
189
197
  };
190
198
 
191
- Gosu::TrueTypeFont::TrueTypeFont(const unsigned char* ttf_data,
199
+ Gosu::TrueTypeFont::TrueTypeFont(const std::uint8_t* ttf_data,
192
200
  std::shared_ptr<TrueTypeFont> fallback)
193
- : m_impl{new Impl(ttf_data, std::move(fallback))}
201
+ : m_impl(new Impl(ttf_data, std::move(fallback)))
194
202
  {
195
203
  }
196
204
 
@@ -200,31 +208,33 @@ double Gosu::TrueTypeFont::draw_text(const std::u32string& text, double height,
200
208
  return m_impl->draw_text(text, true, height, bitmap, x, y, c);
201
209
  }
202
210
 
203
- bool Gosu::TrueTypeFont::matches(const unsigned char* ttf_data, const std::string& font_name,
211
+ bool Gosu::TrueTypeFont::matches(const std::uint8_t* ttf_data, const std::string& font_name,
204
212
  unsigned font_flags)
205
213
  {
206
214
  // Gosu::FontFlags uses the same values as the STBTT_ macros, except for this one.
207
215
  int flags = (font_flags == 0 ? STBTT_MACSTYLE_NONE : static_cast<int>(font_flags));
208
216
 
209
- return stbtt_FindMatchingFont(ttf_data, font_name.c_str(), flags) >= 0 ||
210
- stbtt_FindMatchingFont(ttf_data, font_name.c_str(), STBTT_MACSTYLE_DONTCARE) >= 0;
217
+ return stbtt_FindMatchingFont(ttf_data, font_name.c_str(), flags) >= 0
218
+ || stbtt_FindMatchingFont(ttf_data, font_name.c_str(), STBTT_MACSTYLE_DONTCARE) >= 0;
211
219
  }
212
220
 
213
- static Gosu::TrueTypeFont& font_with_stack(std::vector<const unsigned char*> ttf_stack)
221
+ static Gosu::TrueTypeFont& font_with_stack(std::vector<const std::uint8_t*> ttf_stack)
214
222
  {
215
- // TODO: Make this cache thread-safe.
216
- static std::map<const unsigned char*, std::shared_ptr<Gosu::TrueTypeFont>> cache_by_data;
223
+ static std::map<const std::uint8_t*, std::shared_ptr<Gosu::TrueTypeFont>> cache_by_data;
224
+ static std::recursive_mutex mutex;
225
+ std::scoped_lock lock(mutex);
217
226
 
218
- // Filter out any fonts that could not be found, as well as duplicates.
219
- auto end = unique(ttf_stack.begin(), ttf_stack.end());
220
- end = remove(ttf_stack.begin(), end, nullptr);
221
- ttf_stack.erase(end, ttf_stack.end());
227
+ // Filter out any fonts that could not be found, as well as (adjacent) duplicates.
228
+ ttf_stack.erase(std::remove(ttf_stack.begin(), ttf_stack.end(), nullptr), ttf_stack.end());
229
+ ttf_stack.erase(std::unique(ttf_stack.begin(), ttf_stack.end()), ttf_stack.end());
222
230
 
223
231
  // This cannot happen because ttf_stack contains ttf_fallback_data(), which never returns null.
224
- if (ttf_stack.empty()) throw std::logic_error{"Empty font stack"};
232
+ if (ttf_stack.empty()) {
233
+ throw std::logic_error("Empty font stack");
234
+ }
225
235
 
226
236
  std::shared_ptr<Gosu::TrueTypeFont> head_of_stack = nullptr;
227
- for (const unsigned char* ttf_data : ttf_stack) {
237
+ for (const std::uint8_t* ttf_data : ttf_stack) {
228
238
  auto& font_ptr = cache_by_data[ttf_data];
229
239
  if (!font_ptr) {
230
240
  font_ptr = std::make_shared<Gosu::TrueTypeFont>(ttf_data, head_of_stack);
@@ -236,17 +246,20 @@ static Gosu::TrueTypeFont& font_with_stack(std::vector<const unsigned char*> ttf
236
246
 
237
247
  Gosu::TrueTypeFont& Gosu::font_by_name(const std::string& font_name, unsigned font_flags)
238
248
  {
239
- // TODO: Make this cache thread-safe.
240
249
  static std::map<std::pair<std::string, unsigned>, TrueTypeFont*> cache_by_name_and_flags;
250
+ static std::recursive_mutex mutex;
251
+ std::scoped_lock lock(mutex);
241
252
 
242
253
  auto& font_ptr = cache_by_name_and_flags[make_pair(font_name, font_flags)];
243
254
  if (!font_ptr) {
244
255
  // Build a stack of TTF data in order of preference, where the fallback font is at the
245
256
  // front, and the desired font with all the right font flags (most preferable) at the back.
246
- std::vector<const unsigned char*> ttf_stack;
257
+ std::vector<const std::uint8_t*> ttf_stack;
247
258
  ttf_stack.push_back(ttf_fallback_data());
248
259
  ttf_stack.push_back(ttf_data_by_name(default_font_name(), 0));
249
- if (font_flags != 0) ttf_stack.push_back(ttf_data_by_name(default_font_name(), font_flags));
260
+ if (font_flags != 0) {
261
+ ttf_stack.push_back(ttf_data_by_name(default_font_name(), font_flags));
262
+ }
250
263
 
251
264
  if (font_name.find_first_of("./\\") != std::string::npos) {
252
265
  // A filename? Load it and add it to the stack.
@@ -255,30 +268,25 @@ Gosu::TrueTypeFont& Gosu::font_by_name(const std::string& font_name, unsigned fo
255
268
  else if (font_name != default_font_name()) {
256
269
  // A font name? Add it to the stack, both with font_flags and without.
257
270
  ttf_stack.push_back(ttf_data_by_name(font_name, 0));
258
- if (font_flags != 0) ttf_stack.push_back(ttf_data_by_name(font_name, font_flags));
271
+ if (font_flags != 0) {
272
+ ttf_stack.push_back(ttf_data_by_name(font_name, font_flags));
273
+ }
259
274
  }
260
275
 
261
- font_ptr = &font_with_stack(move(ttf_stack));
276
+ font_ptr = &font_with_stack(std::move(ttf_stack));
262
277
  }
263
278
 
264
279
  return *font_ptr;
265
280
  }
266
281
 
267
- const unsigned char* Gosu::ttf_data_from_file(const std::string& filename)
282
+ const std::uint8_t* Gosu::ttf_data_from_file(const std::string& filename)
268
283
  {
269
- // TODO: Make this cache thread-safe.
270
- static std::map<std::string, std::shared_ptr<Buffer>> ttf_file_cache;
271
-
272
- auto& buffer_ptr = ttf_file_cache[filename];
273
- if (!buffer_ptr) {
274
- buffer_ptr = std::make_shared<Buffer>();
275
- try {
276
- load_file(*buffer_ptr, filename);
277
- } catch (...) {
278
- // Prevent partially loaded files from getting stuck in the cache.
279
- buffer_ptr = nullptr;
280
- throw;
281
- }
284
+ static std::map<std::string, Buffer> ttf_file_cache;
285
+ static std::recursive_mutex mutex;
286
+ std::scoped_lock lock(mutex);
287
+
288
+ if (!ttf_file_cache.contains(filename)) {
289
+ ttf_file_cache.emplace(filename, load_file(filename));
282
290
  }
283
- return static_cast<const unsigned char*>(buffer_ptr->data());
291
+ return ttf_file_cache.at(filename).data();
284
292
  }