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/TexChunk.hpp CHANGED
@@ -1,41 +1,50 @@
1
1
  #pragma once
2
2
 
3
3
  #include <Gosu/Fwd.hpp>
4
- #include <Gosu/ImageData.hpp>
5
- #include "GraphicsImpl.hpp"
4
+ #include <Gosu/Drawable.hpp>
5
+ #include <Gosu/Utility.hpp>
6
+ #include <cstdint>
6
7
  #include <memory>
7
- #include <stdexcept>
8
8
 
9
- class Gosu::TexChunk : public Gosu::ImageData
9
+ namespace Gosu
10
10
  {
11
- std::shared_ptr<Texture> m_texture;
12
- int m_x, m_y, m_w, m_h, m_padding;
13
-
14
- GLTexInfo m_info;
15
-
16
- void set_tex_info();
17
-
18
- public:
19
- TexChunk(std::shared_ptr<Texture> texture, int x, int y, int w, int h, int padding);
20
- TexChunk(const TexChunk& parent, int x, int y, int w, int h);
21
- ~TexChunk() override;
22
-
23
- int width() const override { return m_w; }
24
- int height() const override { return m_h; }
25
-
26
- GLuint tex_name() const { return m_info.tex_name; }
27
-
28
- void draw(double x1, double y1, Color c1, //
29
- double x2, double y2, Color c2, //
30
- double x3, double y3, Color c3, //
31
- double x4, double y4, Color c4, //
32
- ZPos z, BlendMode mode) const override;
33
-
34
- const GLTexInfo* gl_tex_info() const override { return &m_info; }
35
-
36
- std::unique_ptr<ImageData> subimage(int x, int y, int width, int height) const override;
37
-
38
- Gosu::Bitmap to_bitmap() const override;
39
-
40
- void insert(const Bitmap& bitmap, int x, int y) override;
41
- };
11
+ class Texture;
12
+
13
+ /// The most common Drawable implementation which uses a portion of, or a full, OpenGL texture
14
+ /// to store image data.
15
+ class TexChunk : public Drawable
16
+ {
17
+ const std::shared_ptr<Texture> m_texture;
18
+ const Rect m_rect;
19
+ const GLTexInfo m_info;
20
+ const std::shared_ptr<const Rect> m_rect_handle;
21
+
22
+ public:
23
+ /// @param texture The texture on which the image data resides.
24
+ /// @param rect The portion of the texture that will be represented by this TexChunk.
25
+ /// This excludes any padding pixels.
26
+ /// @param rect_handle A shared_ptr that references the full rectangle that was allocated
27
+ /// for this TexChunk, including padding. When this TexChunk and all
28
+ /// of its subimages have been deleted, this rectangle will be reclaimed
29
+ /// for use by other image data.
30
+ TexChunk(const std::shared_ptr<Texture>& texture, const Rect& rect,
31
+ const std::shared_ptr<const Rect>& rect_handle);
32
+
33
+ int width() const override { return m_rect.width; }
34
+ int height() const override { return m_rect.height; }
35
+
36
+ void draw(double x1, double y1, Color c1, //
37
+ double x2, double y2, Color c2, //
38
+ double x3, double y3, Color c3, //
39
+ double x4, double y4, Color c4, //
40
+ ZPos z, BlendMode mode) const override;
41
+
42
+ const GLTexInfo* gl_tex_info() const override { return &m_info; }
43
+
44
+ std::unique_ptr<Drawable> subimage(const Rect& rect) const override;
45
+
46
+ Bitmap to_bitmap() const override;
47
+
48
+ void insert(const Bitmap& bitmap, int x, int y) override;
49
+ };
50
+ }
data/src/Text.cpp CHANGED
@@ -52,7 +52,7 @@ Gosu::Bitmap Gosu::layout_markup(const std::string& markup, const std::string& f
52
52
  // Feed all formatted substrings to the TextBuilder, which will construct the result.
53
53
  // Split the input string into words, because this method implements word-wrapping.
54
54
  MarkupParser parser{font_flags, true, [&text_builder](std::vector<FormattedString> word) {
55
- text_builder.feed_word(move(word));
55
+ text_builder.feed_word(std::move(word));
56
56
  }};
57
57
  parser.parse(markup);
58
58
 
data/src/TextBuilder.cpp CHANGED
@@ -8,16 +8,20 @@ Gosu::WordInfo::WordInfo(const std::string& font_name, double font_height,
8
8
  std::vector<FormattedString> parts)
9
9
  {
10
10
  assert(!parts.empty());
11
+ assert(!parts[0].text.empty());
11
12
 
12
- const auto* properties = utf8proc_get_property(parts.front().text.front());
13
+ const auto first_character = static_cast<utf8proc_int32_t>(parts.front().text.front());
14
+ const auto* properties = utf8proc_get_property(first_character);
13
15
 
14
16
  // Also check the BiDi class to filter out non-breaking spaces.
15
- is_whitespace = properties->category == UTF8PROC_CATEGORY_ZS &&
16
- properties->bidi_class == UTF8PROC_BIDI_CLASS_WS;
17
+ is_whitespace = properties->category == UTF8PROC_CATEGORY_ZS
18
+ && properties->bidi_class == UTF8PROC_BIDI_CLASS_WS;
17
19
 
18
20
  is_end_of_line = parts.back().text.back() == '\n';
19
21
  // Remove the trailing backspace character to avoid errors from Gosu::text_width().
20
- if (is_end_of_line) parts.back().text.pop_back();
22
+ if (is_end_of_line) {
23
+ parts.back().text.pop_back();
24
+ }
21
25
 
22
26
  width = 0;
23
27
  for (const auto& part : parts) {
@@ -26,20 +30,31 @@ Gosu::WordInfo::WordInfo(const std::string& font_name, double font_height,
26
30
  width += text_width(part.text, font_name, font_height, part.flags);
27
31
  }
28
32
 
29
- this->parts = move(parts);
33
+ this->parts = std::move(parts);
30
34
  }
31
35
 
36
+ enum Gosu::TextBuilder::EndOfLineReason : int
37
+ {
38
+ LINE_TOO_LONG,
39
+ END_OF_PARAGRAPH,
40
+ END_OF_TEXT
41
+ };
42
+
32
43
  void Gosu::TextBuilder::flush_current_line(EndOfLineReason reason)
33
44
  {
34
45
  if (m_current_line.empty()) {
35
- if (reason == END_OF_PARAGRAPH) allocate_next_line();
46
+ if (reason == END_OF_PARAGRAPH) {
47
+ allocate_next_line();
48
+ }
36
49
  return;
37
50
  }
38
51
 
39
52
  allocate_next_line();
40
53
 
41
54
  // Remove trailing whitespace so that justifying the text across the line works.
42
- if (m_current_line.back().is_whitespace) m_current_line.pop_back();
55
+ if (m_current_line.back().is_whitespace) {
56
+ m_current_line.pop_back();
57
+ }
43
58
 
44
59
  // Shouldn't happen because the first word on a line should never be whitespace.
45
60
  assert(!m_current_line.empty());
@@ -84,26 +99,26 @@ void Gosu::TextBuilder::flush_current_line(EndOfLineReason reason)
84
99
  void Gosu::TextBuilder::allocate_next_line()
85
100
  {
86
101
  if (m_used_lines == m_allocated_lines) {
87
- m_allocated_lines += 10;
88
- resize_to_allocated_lines();
102
+ reallocate(m_allocated_lines += 10);
89
103
  }
90
104
 
91
105
  ++m_used_lines;
92
106
  }
93
107
 
94
- void Gosu::TextBuilder::resize_to_allocated_lines()
108
+ void Gosu::TextBuilder::reallocate(int lines)
95
109
  {
96
- double new_height =
97
- m_font_height * m_allocated_lines + m_line_spacing * std::max(0, m_allocated_lines - 1);
98
- m_result.resize(m_result.width(), ceil(new_height));
110
+ m_allocated_lines = lines;
111
+ double new_height
112
+ = m_font_height * m_allocated_lines + m_line_spacing * std::max(0, m_allocated_lines - 1);
113
+ m_result.resize(m_result.width(), std::ceil(new_height));
99
114
  }
100
115
 
101
116
  Gosu::TextBuilder::TextBuilder(const std::string& font_name, int font_height, int line_spacing,
102
117
  int width, Alignment align)
103
- : m_font_name{font_name},
104
- m_font_height{font_height * 1.0},
105
- m_line_spacing{line_spacing * 1.0},
106
- m_align{align}
118
+ : m_font_name(font_name),
119
+ m_font_height(font_height * 1.0),
120
+ m_line_spacing(line_spacing * 1.0),
121
+ m_align(align)
107
122
  {
108
123
  // This class uses result.width() to remember its destination width, so store it in there.
109
124
  m_result.resize(width, 0);
@@ -114,14 +129,13 @@ Gosu::Bitmap Gosu::TextBuilder::move_into_bitmap() &&
114
129
  flush_current_line(END_OF_TEXT);
115
130
 
116
131
  // Shrink to fit the currently used height.
117
- m_allocated_lines = m_used_lines;
118
- resize_to_allocated_lines();
132
+ reallocate(m_used_lines);
119
133
  return std::move(m_result);
120
134
  }
121
135
 
122
- void Gosu::TextBuilder::feed_word(std::vector<FormattedString>&& word)
136
+ void Gosu::TextBuilder::feed_word(std::vector<FormattedString> word)
123
137
  {
124
- WordInfo new_word(m_font_name, m_font_height, word);
138
+ WordInfo new_word(m_font_name, m_font_height, std::move(word));
125
139
 
126
140
  if (m_current_line_width + new_word.width > m_result.width()) {
127
141
  // Can't fit it on the same line as before, so flush the last line before adding the word to
data/src/TextBuilder.hpp CHANGED
@@ -6,6 +6,9 @@
6
6
 
7
7
  namespace Gosu
8
8
  {
9
+ // A single word and its formatting context. A "word" is anything that is atomic in terms of
10
+ // where Gosu can introduce line breaks. Even a single word has several "parts" because e.g. a
11
+ // single character in the middle could be bold.
9
12
  struct WordInfo
10
13
  {
11
14
  std::vector<FormattedString> parts;
@@ -25,16 +28,10 @@ namespace Gosu
25
28
  double m_line_spacing;
26
29
  Alignment m_align;
27
30
 
28
- enum EndOfLineReason
29
- {
30
- LINE_TOO_LONG,
31
- END_OF_PARAGRAPH,
32
- END_OF_TEXT
33
- };
34
-
35
31
  // Input.
36
32
  std::vector<WordInfo> m_current_line;
37
33
  int m_current_line_width = 0;
34
+ enum EndOfLineReason : int;
38
35
  void flush_current_line(EndOfLineReason reason);
39
36
 
40
37
  // Output.
@@ -42,13 +39,13 @@ namespace Gosu
42
39
  int m_used_lines = 0;
43
40
  int m_allocated_lines = 0;
44
41
  void allocate_next_line();
45
- void resize_to_allocated_lines();
42
+ void reallocate(int lines);
46
43
 
47
44
  public:
48
45
  TextBuilder(const std::string& font_name, int font_height, int line_spacing, int width,
49
46
  Alignment align);
50
47
 
51
- void feed_word(std::vector<FormattedString>&& word);
48
+ void feed_word(std::vector<FormattedString> word);
52
49
 
53
50
  Bitmap move_into_bitmap() &&;
54
51
  };
data/src/TextInput.cpp CHANGED
@@ -4,7 +4,7 @@
4
4
  #include <cctype>
5
5
 
6
6
  #ifndef GOSU_IS_IPHONE
7
- #include <SDL.h>
7
+ #include <SDL3/SDL.h>
8
8
  #endif
9
9
 
10
10
  struct Gosu::TextInput::Impl : private Gosu::Noncopyable
@@ -191,28 +191,28 @@ bool Gosu::TextInput::feed_sdl_event(void* event)
191
191
 
192
192
  switch (e->type) {
193
193
  // Direct text input or completed IME composition.
194
- case SDL_TEXTINPUT: {
194
+ case SDL_EVENT_TEXT_INPUT: {
195
195
  m_impl->insert_text(filter(e->text.text));
196
196
  return true;
197
197
  }
198
198
  // IME composition in progress.
199
- case SDL_TEXTEDITING: {
199
+ case SDL_EVENT_TEXT_EDITING: {
200
200
  m_impl->composition = e->edit.text;
201
201
  return true;
202
202
  }
203
203
  // Emulate "standard" Windows/Linux keyboard behavior.
204
- case SDL_KEYDOWN: {
204
+ case SDL_EVENT_KEY_DOWN: {
205
205
  // ...but not if the IME is currently compositing.
206
206
  if (!m_impl->composition.empty()) return false;
207
207
 
208
208
  #ifdef GOSU_IS_MAC
209
- bool words = (e->key.keysym.mod & (KMOD_LALT | KMOD_RALT));
210
- bool command_down = (e->key.keysym.mod & (KMOD_LGUI | KMOD_RGUI));
209
+ bool words = (e->key.mod & (SDL_KMOD_LALT | SDL_KMOD_RALT));
210
+ bool command_down = (e->key.mod & (SDL_KMOD_LGUI | SDL_KMOD_RGUI));
211
211
  #else
212
- bool words = (e->key.keysym.mod & (KMOD_LCTRL | KMOD_RCTRL));
212
+ bool words = (e->key.mod & (SDL_KMOD_LCTRL | SDL_KMOD_RCTRL));
213
213
  #endif
214
- bool shift_down = (e->key.keysym.mod & (KMOD_LSHIFT | KMOD_RSHIFT));
215
- SDL_Keycode key = e->key.keysym.sym;
214
+ bool shift_down = (e->key.mod & (SDL_KMOD_LSHIFT | SDL_KMOD_RSHIFT));
215
+ SDL_Keycode key = e->key.key;
216
216
 
217
217
  switch (key) {
218
218
  case SDLK_LEFT:
data/src/Texture.cpp CHANGED
@@ -1,39 +1,35 @@
1
1
  #include "Texture.hpp"
2
- #include "TexChunk.hpp"
3
- #include "Log.hpp"
4
2
  #include <Gosu/Bitmap.hpp>
5
- #include <Gosu/Graphics.hpp>
6
3
  #include <Gosu/Platform.hpp>
4
+ #include "OpenGLContext.hpp"
5
+ #include "TexChunk.hpp"
7
6
  #include <stdexcept>
8
- using namespace std;
9
7
 
10
- namespace Gosu
8
+ Gosu::Texture::Texture(int width, int height, bool retro)
9
+ : m_bin_packer(width, height),
10
+ m_tex_name(0),
11
+ m_retro(retro)
11
12
  {
12
- bool undocumented_retrofication = false;
13
- }
13
+ if (width <= 0 || height <= 0) {
14
+ throw std::invalid_argument("Gosu::Texture must not be empty");
15
+ }
14
16
 
15
- Gosu::Texture::Texture(unsigned width, unsigned height, bool retro)
16
- : allocator_(width, height), retro_(retro)
17
- {
18
- log("Allocating a new texture of size %dx%d (retro=%d)", width, height, (int) retro);
17
+ const OpenGLContext current_context;
19
18
 
20
- ensure_current_context();
21
-
22
19
  // Create texture name.
23
- glGenTextures(1, &tex_name_);
24
- if (tex_name_ == static_cast<GLuint>(-1)) throw runtime_error("Couldn't create OpenGL texture");
20
+ glGenTextures(1, &m_tex_name);
21
+ // GCOV_EXCL_START: Hard to simulate out-of-texture situations.
22
+ if (m_tex_name == static_cast<GLuint>(-1)) {
23
+ throw std::runtime_error("Failed to allocate OpenGL texture");
24
+ }
25
+ // GCOV_EXCL_END
25
26
 
26
27
  // Create empty texture.
27
- glBindTexture(GL_TEXTURE_2D, tex_name_);
28
- #ifdef GOSU_IS_OPENGLES
29
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, allocator_.width(), allocator_.height(), 0, GL_RGBA,
28
+ glBindTexture(GL_TEXTURE_2D, m_tex_name);
29
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, m_bin_packer.width(), m_bin_packer.height(), 0, GL_RGBA,
30
30
  GL_UNSIGNED_BYTE, nullptr);
31
- #else
32
- glTexImage2D(GL_TEXTURE_2D, 0, 4, allocator_.width(), allocator_.height(), 0, GL_RGBA,
33
- GL_UNSIGNED_BYTE, nullptr);
34
- #endif
35
-
36
- if (retro || undocumented_retrofication) {
31
+
32
+ if (retro) {
37
33
  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
38
34
  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
39
35
  }
@@ -41,7 +37,7 @@ Gosu::Texture::Texture(unsigned width, unsigned height, bool retro)
41
37
  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
42
38
  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
43
39
  }
44
-
40
+
45
41
  #ifdef GL_CLAMP_TO_EDGE
46
42
  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
47
43
  glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
@@ -53,79 +49,65 @@ Gosu::Texture::Texture(unsigned width, unsigned height, bool retro)
53
49
 
54
50
  Gosu::Texture::~Texture()
55
51
  {
56
- ensure_current_context();
57
-
58
- glDeleteTextures(1, &tex_name_);
52
+ try {
53
+ const OpenGLContext current_context;
54
+ glDeleteTextures(1, &m_tex_name);
55
+ } catch (...)
56
+ {
57
+ // Leaking is better than throwing in a destructor.
58
+ }
59
59
  }
60
60
 
61
- unsigned Gosu::Texture::width() const
61
+ std::unique_ptr<Gosu::TexChunk> Gosu::Texture::try_alloc(const Bitmap& bitmap, int padding)
62
62
  {
63
- return allocator_.width();
64
- }
63
+ const std::shared_ptr<const Rect> rect = m_bin_packer.alloc(bitmap.width(), bitmap.height());
65
64
 
66
- unsigned Gosu::Texture::height() const
67
- {
68
- return allocator_.height();
69
- }
65
+ if (!rect) {
66
+ return nullptr;
67
+ }
70
68
 
71
- GLuint Gosu::Texture::tex_name() const
72
- {
73
- return tex_name_;
74
- }
69
+ insert(bitmap, rect->x, rect->y);
75
70
 
76
- bool Gosu::Texture::retro() const
77
- {
78
- return retro_;
71
+ const Rect rect_without_padding { rect->x + padding, rect->y + padding,
72
+ rect->width - 2 * padding, rect->height - 2 * padding };
73
+ return std::make_unique<TexChunk>(shared_from_this(), rect_without_padding, rect);
79
74
  }
80
75
 
81
- unique_ptr<Gosu::TexChunk> Gosu::Texture::try_alloc(const Bitmap& bmp, unsigned padding)
76
+ void Gosu::Texture::insert(const Gosu::Bitmap& bitmap, int x, int y)
82
77
  {
83
- BlockAllocator::Block block;
84
-
85
- if (!allocator_.alloc(bmp.width(), bmp.height(), block)) return nullptr;
86
-
87
- unique_ptr<TexChunk> result(new TexChunk(shared_from_this(),
88
- block.left + padding,
89
- block.top + padding,
90
- block.width - 2 * padding,
91
- block.height - 2 * padding,
92
- padding));
93
-
94
- ensure_current_context();
95
-
96
- glBindTexture(GL_TEXTURE_2D, tex_name_);
97
- glTexSubImage2D(GL_TEXTURE_2D, 0, block.left, block.top, block.width, block.height,
98
- Color::GL_FORMAT, GL_UNSIGNED_BYTE, bmp.data());
99
-
100
- return result;
101
- }
78
+ if (!Rect::covering(*this).contains(Rect::xywh(x, y, bitmap.width(), bitmap.height()))) {
79
+ throw std::invalid_argument("Gosu::Texture::insert: Rect exceeds bounds");
80
+ }
102
81
 
103
- void Gosu::Texture::block(unsigned x, unsigned y, unsigned width, unsigned height)
104
- {
105
- allocator_.block(x, y, width, height);
82
+ const OpenGLContext current_context;
83
+ glBindTexture(GL_TEXTURE_2D, m_tex_name);
84
+ glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, bitmap.width(), bitmap.height(), GL_RGBA,
85
+ GL_UNSIGNED_BYTE, bitmap.data());
106
86
  }
107
87
 
108
- void Gosu::Texture::free(unsigned x, unsigned y, unsigned width, unsigned height)
88
+ Gosu::Bitmap Gosu::Texture::to_bitmap(const Rect& rect) const
109
89
  {
110
- allocator_.free(x, y, width, height);
111
- }
90
+ if (!Rect::covering(*this).contains(rect)) {
91
+ throw std::invalid_argument("Gosu::Texture::to_bitmap: Rect exceeds bounds");
92
+ }
112
93
 
113
- Gosu::Bitmap Gosu::Texture::to_bitmap(unsigned x, unsigned y, unsigned width, unsigned height) const
114
- {
115
94
  #ifdef GOSU_IS_OPENGLES
116
95
  // See here for one possible implementation: https://github.com/apitrace/apitrace/issues/70
117
96
  // (Could reuse a lot of code from OffScreenTarget)
118
- throw logic_error("Texture::to_bitmap not supported on iOS");
97
+ throw std::logic_error("Gosu::Texture::to_bitmap not supported in OpenGL ES");
119
98
  #else
120
- ensure_current_context();
121
-
122
- Bitmap full_texture(this->width(), this->height());
123
- glBindTexture(GL_TEXTURE_2D, tex_name());
124
- // TODO: There are ways to retrieve only part of a texture, which we should use sooner or later.
125
- glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, full_texture.data());
126
- Bitmap bitmap(width, height);
127
- bitmap.insert(-int(x), -int(y), full_texture);
128
-
99
+ const OpenGLContext current_context;
100
+ Bitmap bitmap(width(), height());
101
+ glBindTexture(GL_TEXTURE_2D, m_tex_name);
102
+ // This should use glGetTextureSubImage where available: https://stackoverflow.com/a/38148494
103
+ glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, bitmap.data());
104
+
105
+ if (rect != Rect::covering(*this)) {
106
+ Bitmap smaller_bitmap(rect.width, rect.height);
107
+ smaller_bitmap.insert(bitmap, -rect.x, -rect.y);
108
+ bitmap = std::move(smaller_bitmap);
109
+ }
110
+
129
111
  return bitmap;
130
112
  #endif
131
113
  }
data/src/Texture.hpp CHANGED
@@ -1,29 +1,31 @@
1
1
  #pragma once
2
2
 
3
- #include "BlockAllocator.hpp"
4
- #include "GraphicsImpl.hpp"
5
- #include "TexChunk.hpp"
6
3
  #include <Gosu/Fwd.hpp>
7
- #include <Gosu/Bitmap.hpp>
4
+ #include "BinPacker.hpp"
5
+ #include "TexChunk.hpp"
6
+ #include <cstdint>
8
7
  #include <memory>
9
- #include <vector>
10
8
 
11
- class Gosu::Texture : public std::enable_shared_from_this<Texture>
9
+ namespace Gosu
12
10
  {
13
- // BlockAllocator can't be copied or moved, so neither can Texture.
14
- BlockAllocator allocator_;
15
- GLuint tex_name_;
16
- bool retro_;
17
-
18
- public:
19
- Texture(unsigned width, unsigned height, bool retro);
20
- ~Texture();
21
- unsigned width() const;
22
- unsigned height() const;
23
- GLuint tex_name() const;
24
- bool retro() const;
25
- std::unique_ptr<TexChunk> try_alloc(const Bitmap& bmp, unsigned padding);
26
- void block(unsigned x, unsigned y, unsigned width, unsigned height);
27
- void free(unsigned x, unsigned y, unsigned width, unsigned height);
28
- Bitmap to_bitmap(unsigned x, unsigned y, unsigned width, unsigned height) const;
29
- };
11
+ class Texture : public std::enable_shared_from_this<Texture>, private Noncopyable
12
+ {
13
+ BinPacker m_bin_packer;
14
+ std::uint32_t m_tex_name;
15
+ const bool m_retro;
16
+
17
+ public:
18
+ Texture(int width, int height, bool retro);
19
+ ~Texture();
20
+
21
+ int width() const { return m_bin_packer.width(); }
22
+ int height() const { return m_bin_packer.height(); }
23
+ std::uint32_t tex_name() const { return m_tex_name; }
24
+ bool retro() const { return m_retro; }
25
+
26
+ [[nodiscard]] std::unique_ptr<TexChunk> try_alloc(const Bitmap& bitmap, int padding);
27
+
28
+ void insert(const Bitmap& bitmap, int x, int y);
29
+ Bitmap to_bitmap(const Rect& rect) const;
30
+ };
31
+ }