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,41 @@
1
+ #ifndef GOSU_OPENGLCONTEXT_HPP
2
+ #define GOSU_OPENGLCONTEXT_HPP
3
+
4
+ #include <Gosu/Platform.hpp>
5
+ #include <Gosu/Utility.hpp>
6
+
7
+ #if defined(GOSU_IS_IPHONE) || defined(GOSU_IS_OPENGLES)
8
+ #include <OpenGLES/ES1/gl.h>
9
+ #include <OpenGLES/ES1/glext.h>
10
+ #else
11
+ #include <SDL3/SDL.h>
12
+ #include <SDL3/SDL_opengl.h>
13
+ #endif
14
+
15
+ #include <mutex>
16
+
17
+ namespace Gosu
18
+ {
19
+ /// Recursive lock/RAII class that makes an OpenGL context the current context, and prevents
20
+ /// other threads from taking over the context until this instance is destroyed.
21
+ class OpenGLContext : Noncopyable
22
+ {
23
+ std::unique_lock<std::mutex> m_lock;
24
+
25
+ public:
26
+ /// Makes an OpenGL context current. The very first call of this constructor may throw, all
27
+ /// other calls can only block.
28
+ explicit OpenGLContext(bool for_rendering_to_window = false);
29
+ ~OpenGLContext();
30
+
31
+ #ifndef GOSU_IS_IPHONE
32
+ // SDL does not allow creation of OpenGL contexts without creating an SDL_Window first.
33
+ // Therefore, this class internally creates a global SDL_Window, and derives OpenGL contexts
34
+ // from it. The Gosu::Window implementation can then show and hide this single SDL_Window
35
+ // to simulate the window lifecycle.
36
+ static SDL_Window* shared_sdl_window();
37
+ #endif
38
+ };
39
+ }
40
+
41
+ #endif
data/src/RenderState.hpp CHANGED
@@ -1,31 +1,23 @@
1
1
  #pragma once
2
2
 
3
+ #include <Gosu/Transform.hpp>
4
+ #include "ClipRectStack.hpp"
3
5
  #include "GraphicsImpl.hpp"
6
+ #include "OpenGLContext.hpp"
4
7
  #include "Texture.hpp"
8
+ #include <optional>
5
9
 
6
10
  // Properties that potentially need to be changed between each draw operation.
7
11
  // This does not include the color or vertex data of the actual quads.
8
12
  struct Gosu::RenderState
9
13
  {
10
14
  std::shared_ptr<Texture> texture;
11
- const Transform* transform;
12
- ClipRect clip_rect;
13
- BlendMode mode;
14
-
15
- RenderState()
16
- : transform(0), mode(BM_DEFAULT)
17
- {
18
- clip_rect.width = NO_CLIPPING;
19
- }
20
-
21
- bool operator==(const RenderState& rhs) const
22
- {
23
- return texture == rhs.texture &&
24
- transform == rhs.transform &&
25
- clip_rect == rhs.clip_rect &&
26
- mode == rhs.mode;
27
- }
28
-
15
+ const Transform* transform = nullptr;
16
+ std::optional<Rect> clip_rect;
17
+ BlendMode mode = BM_DEFAULT;
18
+
19
+ bool operator==(const RenderState&) const = default;
20
+
29
21
  void apply_texture() const
30
22
  {
31
23
  if (texture) {
@@ -36,7 +28,7 @@ struct Gosu::RenderState
36
28
  glDisable(GL_TEXTURE_2D);
37
29
  }
38
30
  }
39
-
31
+
40
32
  void apply_alpha_mode() const
41
33
  {
42
34
  if (mode == BM_ADD) {
@@ -49,18 +41,18 @@ struct Gosu::RenderState
49
41
  glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
50
42
  }
51
43
  }
52
-
44
+
53
45
  void apply_clip_rect() const
54
46
  {
55
- if (clip_rect.width == NO_CLIPPING) {
56
- glDisable(GL_SCISSOR_TEST);
47
+ if (clip_rect.has_value()) {
48
+ glEnable(GL_SCISSOR_TEST);
49
+ glScissor(clip_rect->x, clip_rect->y, clip_rect->width, clip_rect->height);
57
50
  }
58
51
  else {
59
- glEnable(GL_SCISSOR_TEST);
60
- glScissor(clip_rect.x, clip_rect.y, clip_rect.width, clip_rect.height);
52
+ glDisable(GL_SCISSOR_TEST);
61
53
  }
62
54
  }
63
-
55
+
64
56
  // Only used by Macro so far
65
57
  #ifndef GOSU_IS_OPENGLES
66
58
  void apply() const
@@ -74,29 +66,25 @@ struct Gosu::RenderState
74
66
 
75
67
  // Manages the OpenGL rendering state. It caches the current state, only forwarding the
76
68
  // changes to OpenGL if the new state is really different.
77
- class Gosu::RenderStateManager : private Gosu::RenderState
69
+ class Gosu::RenderStateManager : private Gosu::RenderState, private Gosu::Noncopyable
78
70
  {
79
- // Not copyable
80
- RenderStateManager(const RenderStateManager&);
81
- RenderStateManager& operator=(const RenderStateManager&);
82
-
83
71
  void apply_transform() const
84
72
  {
85
73
  glMatrixMode(GL_MODELVIEW);
86
74
  glLoadIdentity();
87
-
75
+
88
76
  #ifndef GOSU_IS_OPENGLES
89
- glMultMatrixd(&(*transform)[0]);
77
+ glMultMatrixd(transform->matrix.data());
90
78
  #else
91
79
  // TODO: Ouch, should always use floats!
92
80
  GLfloat matrix[16];
93
81
  for (int i = 0; i < 16; ++i) {
94
- matrix[i] = (*transform)[i];
82
+ matrix[i] = transform->matrix[i];
95
83
  }
96
84
  glMultMatrixf(matrix);
97
85
  #endif
98
86
  }
99
-
87
+
100
88
  public:
101
89
  RenderStateManager()
102
90
  {
@@ -105,18 +93,16 @@ public:
105
93
  glMatrixMode(GL_MODELVIEW);
106
94
  glPushMatrix();
107
95
  }
108
-
96
+
109
97
  ~RenderStateManager()
110
98
  {
111
- ClipRect no_clipping;
112
- no_clipping.width = NO_CLIPPING;
113
- set_clip_rect(no_clipping);
114
- set_texture(std::shared_ptr<Texture>());
99
+ set_clip_rect(std::nullopt);
100
+ set_texture(nullptr);
115
101
  // Return to previous MV matrix
116
102
  glMatrixMode(GL_MODELVIEW);
117
103
  glPopMatrix();
118
104
  }
119
-
105
+
120
106
  void set_render_state(const RenderState& rs)
121
107
  {
122
108
  set_texture(rs.texture);
@@ -124,10 +110,12 @@ public:
124
110
  set_clip_rect(rs.clip_rect);
125
111
  set_alpha_mode(rs.mode);
126
112
  }
127
-
128
- void set_texture(std::shared_ptr<Texture> new_texture)
113
+
114
+ void set_texture(const std::shared_ptr<Texture>& new_texture)
129
115
  {
130
- if (new_texture == texture) return;
116
+ if (new_texture == texture) {
117
+ return;
118
+ }
131
119
 
132
120
  if (new_texture) {
133
121
  if (!texture) {
@@ -141,49 +129,39 @@ public:
141
129
  }
142
130
  texture = new_texture;
143
131
  }
144
-
132
+
145
133
  void set_transform(const Transform* new_transform)
146
134
  {
147
- if (new_transform == transform) return;
148
-
135
+ if (new_transform == transform) {
136
+ return;
137
+ }
138
+
149
139
  transform = new_transform;
150
140
  apply_transform();
151
141
  }
152
142
 
153
- void set_clip_rect(const ClipRect& new_clip_rect)
143
+ void set_clip_rect(const std::optional<Rect>& new_clip_rect)
154
144
  {
155
- if (new_clip_rect.width == NO_CLIPPING) {
156
- // Disable clipping
157
- if (clip_rect.width != NO_CLIPPING) {
158
- glDisable(GL_SCISSOR_TEST);
159
- clip_rect.width = NO_CLIPPING;
160
- }
161
- }
162
- else {
163
- // Enable clipping if off
164
- if (clip_rect.width == NO_CLIPPING) {
165
- glEnable(GL_SCISSOR_TEST);
166
- clip_rect = new_clip_rect;
167
- glScissor(clip_rect.x, clip_rect.y, clip_rect.width, clip_rect.height);
168
- }
169
- // Adjust clipping if necessary
170
- else if (!(clip_rect == new_clip_rect)) {
171
- clip_rect = new_clip_rect;
172
- glScissor(clip_rect.x, clip_rect.y, clip_rect.width, clip_rect.height);
173
- }
145
+ if (clip_rect == new_clip_rect) {
146
+ return;
174
147
  }
148
+
149
+ clip_rect = new_clip_rect;
150
+ apply_clip_rect();
175
151
  }
176
-
152
+
177
153
  void set_alpha_mode(BlendMode new_mode)
178
154
  {
179
- if (new_mode == mode) return;
180
-
155
+ if (new_mode == mode) {
156
+ return;
157
+ }
158
+
181
159
  mode = new_mode;
182
160
  apply_alpha_mode();
183
161
  }
184
-
162
+
185
163
  // The cached values may have been messed with. Reset them again.
186
- void enforce_after_untrusted_gL() const
164
+ void enforce_after_untrusted_gl() const
187
165
  {
188
166
  apply_texture();
189
167
  apply_transform();
data/src/Resolution.cpp CHANGED
@@ -1,30 +1,33 @@
1
1
  #include <Gosu/Platform.hpp>
2
- #ifndef GOSU_IS_IPHONE // iPhone definitions live in WindowUIKit.cpp
2
+ #ifndef GOSU_IS_IPHONE // Definitions for iOS live in WindowUIKit.cpp
3
3
 
4
4
  #include <Gosu/Window.hpp>
5
5
  #include "GraphicsImpl.hpp"
6
- #include <SDL.h>
6
+ #include <SDL3/SDL.h>
7
7
 
8
- static SDL_DisplayMode display_mode(Gosu::Window* window)
8
+ static const SDL_DisplayMode& display_mode(const Gosu::Window* window)
9
9
  {
10
- static struct VideoSubsystem
10
+ static const struct VideoSubsystem : Gosu::Noncopyable
11
11
  {
12
12
  VideoSubsystem() { SDL_InitSubSystem(SDL_INIT_VIDEO); };
13
13
  ~VideoSubsystem() { SDL_QuitSubSystem(SDL_INIT_VIDEO); };
14
14
  } subsystem;
15
15
 
16
- int index = window ? SDL_GetWindowDisplayIndex(Gosu::shared_window()) : 0;
17
- SDL_DisplayMode result;
18
- SDL_GetDesktopDisplayMode(index, &result);
19
- return result;
16
+ SDL_DisplayID index
17
+ = window ? SDL_GetDisplayForWindow(window->sdl_window()) : SDL_GetPrimaryDisplay();
18
+ const SDL_DisplayMode* result = SDL_GetDesktopDisplayMode(index);
19
+ if (result == nullptr) {
20
+ throw std::runtime_error("SDL_GetDesktopDisplayMode: " + std::string(SDL_GetError()));
21
+ }
22
+ return *result;
20
23
  }
21
24
 
22
- int Gosu::screen_width(Window* window)
25
+ int Gosu::screen_width(const Window* window)
23
26
  {
24
27
  return display_mode(window).w;
25
28
  }
26
29
 
27
- int Gosu::screen_height(Window* window)
30
+ int Gosu::screen_height(const Window* window)
28
31
  {
29
32
  return display_mode(window).h;
30
33
  }
@@ -32,63 +35,67 @@ int Gosu::screen_height(Window* window)
32
35
  #ifdef GOSU_IS_MAC
33
36
  #import <AppKit/AppKit.h>
34
37
 
35
- static SDL_Rect max_window_size(Gosu::Window* window)
38
+ static SDL_Rect max_window_size(const Gosu::Window* window)
36
39
  {
40
+ static const struct VideoSubsystem : Gosu::Noncopyable
41
+ {
42
+ VideoSubsystem() { SDL_InitSubSystem(SDL_INIT_VIDEO); };
43
+ ~VideoSubsystem() { SDL_QuitSubSystem(SDL_INIT_VIDEO); };
44
+ } subsystem;
45
+
37
46
  // The extra size that a window needs depends on its style.
38
47
  // This logic must be kept in sync with SDL_cocoawindow.m to be 100% accurate.
39
- NSUInteger style;
40
- if (window && window->borderless()) {
41
- style = NSWindowStyleMaskBorderless;
42
- }
43
- else {
44
- style = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable |
45
- NSWindowStyleMaskMiniaturizable;
46
- }
47
- if (window && window->resizable()) {
48
- style |= NSWindowStyleMaskResizable;
49
- }
50
-
51
- auto index = window ? SDL_GetWindowDisplayIndex(Gosu::shared_window()) : 0;
52
- NSRect screen_frame = NSScreen.screens[index].visibleFrame;
53
- NSRect content_rect = [NSWindow contentRectForFrameRect:screen_frame styleMask:style];
48
+ NSUInteger style
49
+ = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable;
54
50
 
51
+ // SDL_GetDisplayUsableBounds gives the maximum size of a borderless window (the screen minus
52
+ // the menu bar and dock).
53
+ SDL_DisplayID display
54
+ = window ? SDL_GetDisplayForWindow(window->sdl_window()) : SDL_GetPrimaryDisplay();
55
55
  SDL_Rect result;
56
- result.x = 0;
57
- result.y = 0;
58
- result.w = content_rect.size.width;
59
- result.h = content_rect.size.height;
56
+ if (!SDL_GetDisplayUsableBounds(display, &result)) {
57
+ throw std::runtime_error("SDL_GetDisplayUsableBounds: " + std::string(SDL_GetError()));
58
+ }
59
+
60
+ // Now subtract the decorations that a default-styled Cocoa window would add.
61
+ NSRect content =
62
+ [NSWindow contentRectForFrameRect:NSMakeRect(0, 0, result.w, result.h) styleMask:style];
63
+ result.w = content.size.width;
64
+ result.h = content.size.height;
60
65
  return result;
61
66
  }
62
67
  #endif
63
68
 
64
- // TODO: Remove this implementation and remove ifdef for GOSU_IS_X once WIN_GetWindowBordersSize is patched
65
69
  #ifdef GOSU_IS_WIN
66
- #include <SDL_syswm.h>
67
70
  #include <dwmapi.h>
68
71
  #include <windows.h>
69
- #pragma comment(lib, "Dwmapi.lib")
70
72
 
71
- static SDL_Rect max_window_size(Gosu::Window* window)
73
+ static SDL_Rect max_window_size(const Gosu::Window* window)
72
74
  {
73
- // Replicate SDL's WIN_GetWindowBordersSize implementation (https://github.com/libsdl-org/SDL/blob/9f71a809e9bd6fbb5fa401a45c1537fc26abc1b4/src/video/windows/SDL_windowswindow.c#L514-L554)
74
- // until it's patched to ignore the window drop shadow (window border is 1px but with drop shadow it's reported as 8px)
75
+ // Replicate SDL's WIN_GetWindowBordersSize implementation because the original includes the
76
+ // size of the drop shadow, which doesn't make sense as they don't actually take up space.
75
77
  // REF: https://github.com/libsdl-org/SDL/issues/3835
76
78
 
77
- static struct VideoSubsystem
79
+ static const struct VideoSubsystem : Gosu::Noncopyable
78
80
  {
79
81
  VideoSubsystem() { SDL_InitSubSystem(SDL_INIT_VIDEO); };
80
82
  ~VideoSubsystem() { SDL_QuitSubSystem(SDL_INIT_VIDEO); };
81
83
  } subsystem;
82
84
 
83
- int index = window ? SDL_GetWindowDisplayIndex(Gosu::shared_window()) : 0;
85
+ SDL_DisplayID display
86
+ = window ? SDL_GetDisplayForWindow(window->sdl_window()) : SDL_GetPrimaryDisplay();
84
87
  SDL_Rect rect;
85
- SDL_GetDisplayUsableBounds(index, &rect);
88
+ if (!SDL_GetDisplayUsableBounds(display, &rect)) {
89
+ throw std::runtime_error("SDL_GetDisplayUsableBounds: " + std::string(SDL_GetError()));
90
+ }
86
91
 
92
+ // Note: We only subtract the window border when a window is given - but the main use case of
93
+ // available_width/available_height is to determine the available space for a new window!
94
+ // TODO: Replace DWM with a better API (AdjustWindowRectExForDpi?)
87
95
  if (window) {
88
- SDL_SysWMinfo info;
89
- SDL_VERSION(&info.version);
90
- SDL_GetWindowWMInfo(Gosu::shared_window(), &info);
91
- HWND hwnd = info.info.win.window;
96
+ HWND hwnd = static_cast<HWND>(
97
+ SDL_GetPointerProperty(SDL_GetWindowProperties(window->sdl_window()),
98
+ SDL_PROP_WINDOW_WIN32_HWND_POINTER, nullptr));
92
99
 
93
100
  RECT rcClient, rcWindow;
94
101
  POINT ptDiff;
@@ -137,33 +144,38 @@ static SDL_Rect max_window_size(Gosu::Window* window)
137
144
  #endif
138
145
 
139
146
  #ifdef GOSU_IS_X
140
- static SDL_Rect max_window_size(Gosu::Window* window)
147
+ static SDL_Rect max_window_size(const Gosu::Window* window)
141
148
  {
142
- static struct VideoSubsystem
149
+ static const struct VideoSubsystem : Gosu::Noncopyable
143
150
  {
144
151
  VideoSubsystem() { SDL_InitSubSystem(SDL_INIT_VIDEO); };
145
152
  ~VideoSubsystem() { SDL_QuitSubSystem(SDL_INIT_VIDEO); };
146
153
  } subsystem;
147
154
 
148
- int index = window ? SDL_GetWindowDisplayIndex(Gosu::shared_window()) : 0;
155
+ SDL_DisplayID index
156
+ = window ? SDL_GetDisplayForWindow(window->sdl_window()) : SDL_GetPrimaryDisplay();
149
157
  SDL_Rect rect;
150
- int top, left, bottom, right;
151
- SDL_GetDisplayUsableBounds(index, &rect);
152
- SDL_GetWindowBordersSize(Gosu::shared_window(), &top, &left, &bottom, &right);
158
+ if (!SDL_GetDisplayUsableBounds(index, &rect)) {
159
+ throw std::runtime_error("SDL_GetDisplayUsableBounds: " + std::string(SDL_GetError()));
160
+ }
153
161
 
154
- rect.w -= left + right;
155
- rect.h -= top + bottom;
162
+ if (window) {
163
+ int top, left, bottom, right;
164
+ SDL_GetWindowBordersSize(window->sdl_window(), &top, &left, &bottom, &right);
165
+ rect.w -= left + right;
166
+ rect.h -= top + bottom;
167
+ }
156
168
 
157
169
  return rect;
158
170
  }
159
171
  #endif
160
172
 
161
- int Gosu::available_width(Window* window)
173
+ int Gosu::available_width(const Window* window)
162
174
  {
163
175
  return max_window_size(window).w;
164
176
  }
165
177
 
166
- int Gosu::available_height(Window* window)
178
+ int Gosu::available_height(const Window* window)
167
179
  {
168
180
  return max_window_size(window).h;
169
181
  }
data/src/TexChunk.cpp CHANGED
@@ -5,50 +5,20 @@
5
5
  #include "Texture.hpp"
6
6
  #include <stdexcept>
7
7
 
8
- void Gosu::TexChunk::set_tex_info()
8
+ Gosu::TexChunk::TexChunk(const std::shared_ptr<Texture>& texture, const Rect& rect,
9
+ const std::shared_ptr<const Rect>& rect_handle)
10
+ : m_texture(texture),
11
+ m_rect(rect),
12
+ m_info { .tex_name = texture->tex_name(),
13
+ .left = 1.0 * m_rect.x / texture->width(),
14
+ .right = 1.0 * m_rect.right() / texture->width(),
15
+ .top = 1.0 * m_rect.y / texture->height(),
16
+ .bottom = 1.0 * m_rect.bottom() / texture->height() },
17
+ m_rect_handle(rect_handle)
9
18
  {
10
- double width = m_texture->width(), height = m_texture->height();
11
-
12
- m_info.tex_name = m_texture->tex_name();
13
- m_info.left = m_x / width;
14
- m_info.top = m_y / height;
15
- m_info.right = (m_x + m_w) / width;
16
- m_info.bottom = (m_y + m_h) / height;
17
- }
18
-
19
- Gosu::TexChunk::TexChunk(std::shared_ptr<Texture> texture, int x, int y, int w, int h, int padding)
20
- : m_texture{move(texture)},
21
- m_x{x},
22
- m_y{y},
23
- m_w{w},
24
- m_h{h},
25
- m_padding{padding}
26
- {
27
- set_tex_info();
28
- }
29
-
30
- Gosu::TexChunk::TexChunk(const TexChunk& parent, int x, int y, int w, int h)
31
- : m_texture{parent.m_texture},
32
- m_x{parent.m_x + x},
33
- m_y{parent.m_y + y},
34
- m_w{w},
35
- m_h{h},
36
- m_padding{0}
37
- {
38
- if (x < 0 || y < 0 || x + w > parent.m_w || y + h > parent.m_h) {
39
- throw std::invalid_argument{"subimage bounds exceed those of its parent"};
19
+ if (!Rect::covering(*texture).contains(rect)) {
20
+ throw std::invalid_argument("Gosu::TexChunk exceeds its Gosu::Texture");
40
21
  }
41
- if (w <= 0 || h <= 0) {
42
- throw std::invalid_argument{"cannot create empty image"};
43
- }
44
-
45
- set_tex_info();
46
- m_texture->block(m_x, m_y, m_w, m_h);
47
- }
48
-
49
- Gosu::TexChunk::~TexChunk()
50
- {
51
- m_texture->free(m_x - m_padding, m_y - m_padding, m_w + 2 * m_padding, m_h + 2 * m_padding);
52
22
  }
53
23
 
54
24
  void Gosu::TexChunk::draw(double x1, double y1, Color c1, double x2, double y2, Color c2, //
@@ -59,6 +29,8 @@ void Gosu::TexChunk::draw(double x1, double y1, Color c1, double x2, double y2,
59
29
  op.render_state.texture = m_texture;
60
30
  op.render_state.mode = mode;
61
31
 
32
+ op.rect_handle = m_rect_handle;
33
+
62
34
  normalize_coordinates(x1, y1, x2, y2, x3, y3, c3, x4, y4, c4);
63
35
 
64
36
  op.vertices_or_block_index = 4;
@@ -78,62 +50,45 @@ void Gosu::TexChunk::draw(double x1, double y1, Color c1, double x2, double y2,
78
50
  op.bottom = m_info.bottom;
79
51
 
80
52
  op.z = z;
81
- Graphics::schedule_draw_op(op);
53
+ schedule_draw_op(op);
82
54
  }
83
55
 
84
- std::unique_ptr<Gosu::ImageData> Gosu::TexChunk::subimage(int x, int y, int width, int height) const
56
+ std::unique_ptr<Gosu::Drawable> Gosu::TexChunk::subimage(const Rect& rect) const
85
57
  {
86
- return std::unique_ptr<Gosu::ImageData>(new TexChunk(*this, x, y, width, height));
58
+ // Note: m_rect is relative to m_texture, but rect should be relative to m_rect.
59
+ if (!Rect::covering(*this).contains(rect)) {
60
+ throw std::invalid_argument("Gosu::TexChunk::subimage cannot exceed parent size");
61
+ }
62
+ Rect nested_rect = Rect::xywh(m_rect.x + rect.x, m_rect.y + rect.y, rect.width, rect.height);
63
+ return std::make_unique<TexChunk>(m_texture, nested_rect, m_rect_handle);
87
64
  }
88
65
 
89
66
  Gosu::Bitmap Gosu::TexChunk::to_bitmap() const
90
67
  {
91
- return m_texture->to_bitmap(m_x, m_y, m_w, m_h);
68
+ return m_texture->to_bitmap(m_rect);
92
69
  }
93
70
 
94
- void Gosu::TexChunk::insert(const Bitmap& original_bitmap, int x, int y)
71
+ void Gosu::TexChunk::insert(const Bitmap& bitmap, int x, int y)
95
72
  {
96
73
  Bitmap clipped_bitmap;
97
- const Bitmap* bitmap = &original_bitmap;
74
+ const Bitmap* source = &bitmap;
98
75
 
76
+ Rect target_rect = Rect::xywh(x, y, bitmap.width(), bitmap.height());
77
+ int offset_x = 0, offset_y = 0;
99
78
  // If inserting the bitmap at the given position exceeds the boundaries of the space allocated
100
79
  // for this image on the texture, we need to clip the bitmap and insert the clipped version
101
80
  // instead.
102
- if (x < 0 || y < 0 || x + original_bitmap.width() > m_w || y + original_bitmap.height() > m_h) {
103
- // How many pixels to remove at the top and left sides.
104
- int clip_left = 0, clip_top = 0;
105
- // How large the clipped version needs to be.
106
- int clipped_width = original_bitmap.width(), clipped_height = original_bitmap.height();
81
+ if (!Rect::covering(*this).contains(target_rect)) {
82
+ target_rect.clip_to(Rect::covering(*this), &offset_x, &offset_y);
107
83
 
108
- // Clip away pixels on the left side, if necessary.
109
- if (x < 0) {
110
- clip_left = -x;
111
- clipped_width -= -x;
112
- x = 0;
84
+ if (target_rect.empty()) {
85
+ return;
113
86
  }
114
- // Clip away pixels at the top, if necessary.
115
- if (y < 0) {
116
- clip_top = -y;
117
- clipped_height -= -y;
118
- y = 0;
119
- }
120
- // Clip away pixels on the right side, if necessary.
121
- if (x + clipped_width > m_w) {
122
- clipped_width = (m_w - x);
123
- }
124
- // Clip away pixels on the bottom, if necessary.
125
- if (y + clipped_height > m_h) {
126
- clipped_height = (m_h - y);
127
- }
128
-
129
- if (clipped_width <= 0 || clipped_height <= 0) return;
130
87
 
131
- clipped_bitmap.resize(clipped_width, clipped_height);
132
- clipped_bitmap.insert(-clip_left, -clip_top, original_bitmap);
133
- bitmap = &clipped_bitmap;
88
+ clipped_bitmap.resize(target_rect.width, target_rect.height);
89
+ clipped_bitmap.insert(bitmap, -offset_x, -offset_y);
90
+ source = &clipped_bitmap;
134
91
  }
135
92
 
136
- glBindTexture(GL_TEXTURE_2D, tex_name());
137
- glTexSubImage2D(GL_TEXTURE_2D, 0, m_x + x, m_y + y, bitmap->width(), bitmap->height(),
138
- Color::GL_FORMAT, GL_UNSIGNED_BYTE, bitmap->data());
93
+ m_texture->insert(*source, m_rect.x + x + offset_x, m_rect.y + y + offset_y);
139
94
  }