gosu 1.4.6 → 1.5.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/COPYING +2 -1
- data/dependencies/SDL/include/SDL3/SDL.h +91 -0
- data/dependencies/SDL/include/SDL3/SDL_assert.h +710 -0
- data/dependencies/SDL/include/SDL3/SDL_asyncio.h +550 -0
- data/dependencies/SDL/include/SDL3/SDL_atomic.h +692 -0
- data/dependencies/SDL/include/SDL3/SDL_audio.h +2382 -0
- data/dependencies/SDL/include/SDL3/SDL_begin_code.h +553 -0
- data/dependencies/SDL/include/{SDL_bits.h → SDL3/SDL_bits.h} +47 -27
- data/dependencies/SDL/include/{SDL_blendmode.h → SDL3/SDL_blendmode.h} +59 -55
- data/dependencies/SDL/include/SDL3/SDL_camera.h +535 -0
- data/dependencies/SDL/include/SDL3/SDL_clipboard.h +331 -0
- data/dependencies/SDL/include/{close_code.h → SDL3/SDL_close_code.h} +9 -8
- data/dependencies/SDL/include/{SDL_types.h → SDL3/SDL_copying.h} +2 -9
- data/dependencies/SDL/include/SDL3/SDL_cpuinfo.h +374 -0
- data/dependencies/SDL/include/SDL3/SDL_dialog.h +343 -0
- data/dependencies/SDL/include/SDL3/SDL_dlopennote.h +234 -0
- data/dependencies/SDL/include/{SDL_egl.h → SDL3/SDL_egl.h} +11 -8
- data/dependencies/SDL/include/SDL3/SDL_endian.h +645 -0
- data/dependencies/SDL/include/SDL3/SDL_error.h +226 -0
- data/dependencies/SDL/include/SDL3/SDL_events.h +1651 -0
- data/dependencies/SDL/include/SDL3/SDL_filesystem.h +537 -0
- data/dependencies/SDL/include/SDL3/SDL_gamepad.h +1657 -0
- data/dependencies/SDL/include/SDL3/SDL_gpu.h +4637 -0
- data/dependencies/SDL/include/SDL3/SDL_guid.h +106 -0
- data/dependencies/SDL/include/SDL3/SDL_haptic.h +1461 -0
- data/dependencies/SDL/include/SDL3/SDL_hidapi.h +571 -0
- data/dependencies/SDL/include/SDL3/SDL_hints.h +5041 -0
- data/dependencies/SDL/include/SDL3/SDL_init.h +508 -0
- data/dependencies/SDL/include/SDL3/SDL_intrin.h +410 -0
- data/dependencies/SDL/include/SDL3/SDL_iostream.h +1379 -0
- data/dependencies/SDL/include/SDL3/SDL_joystick.h +1385 -0
- data/dependencies/SDL/include/SDL3/SDL_keyboard.h +615 -0
- data/dependencies/SDL/include/SDL3/SDL_keycode.h +348 -0
- data/dependencies/SDL/include/SDL3/SDL_loadso.h +145 -0
- data/dependencies/SDL/include/{SDL_locale.h → SDL3/SDL_locale.h} +40 -24
- data/dependencies/SDL/include/SDL3/SDL_log.h +541 -0
- data/dependencies/SDL/include/SDL3/SDL_main.h +704 -0
- data/dependencies/SDL/include/SDL3/SDL_main_impl.h +149 -0
- data/dependencies/SDL/include/{SDL_messagebox.h → SDL3/SDL_messagebox.h} +85 -48
- data/dependencies/SDL/include/{SDL_metal.h → SDL3/SDL_metal.h} +29 -29
- data/dependencies/SDL/include/{SDL_misc.h → SDL3/SDL_misc.h} +13 -12
- data/dependencies/SDL/include/SDL3/SDL_mouse.h +813 -0
- data/dependencies/SDL/include/SDL3/SDL_mutex.h +1117 -0
- data/dependencies/SDL/include/SDL3/SDL_oldnames.h +1339 -0
- data/dependencies/SDL/include/{SDL_opengl.h → SDL3/SDL_opengl.h} +1247 -278
- data/dependencies/SDL/include/{SDL_opengl_glext.h → SDL3/SDL_opengl_glext.h} +5 -1
- data/dependencies/SDL/include/{SDL_opengles.h → SDL3/SDL_opengles.h} +6 -7
- data/dependencies/SDL/include/{SDL_opengles2.h → SDL3/SDL_opengles2.h} +10 -11
- data/dependencies/SDL/include/SDL3/SDL_pen.h +198 -0
- data/dependencies/SDL/include/SDL3/SDL_pixels.h +1441 -0
- data/dependencies/SDL/include/{SDL_test_log.h → SDL3/SDL_platform.h} +25 -26
- data/dependencies/SDL/include/SDL3/SDL_platform_defines.h +497 -0
- data/dependencies/SDL/include/{SDL_power.h → SDL3/SDL_power.h} +40 -20
- data/dependencies/SDL/include/SDL3/SDL_process.h +441 -0
- data/dependencies/SDL/include/SDL3/SDL_properties.h +572 -0
- data/dependencies/SDL/include/SDL3/SDL_rect.h +528 -0
- data/dependencies/SDL/include/SDL3/SDL_render.h +3034 -0
- data/dependencies/SDL/include/SDL3/SDL_revision.h +56 -0
- data/dependencies/SDL/include/{SDL_scancode.h → SDL3/SDL_scancode.h} +60 -68
- data/dependencies/SDL/include/SDL3/SDL_sensor.h +321 -0
- data/dependencies/SDL/include/SDL3/SDL_stdinc.h +6186 -0
- data/dependencies/SDL/include/SDL3/SDL_storage.h +686 -0
- data/dependencies/SDL/include/SDL3/SDL_surface.h +1769 -0
- data/dependencies/SDL/include/SDL3/SDL_system.h +840 -0
- data/dependencies/SDL/include/{SDL_test.h → SDL3/SDL_test.h} +16 -22
- data/dependencies/SDL/include/{SDL_test_assert.h → SDL3/SDL_test_assert.h} +27 -34
- data/dependencies/SDL/include/{SDL_test_common.h → SDL3/SDL_test_common.h} +109 -52
- data/dependencies/SDL/include/{SDL_test_compare.h → SDL3/SDL_test_compare.h} +22 -14
- data/dependencies/SDL/include/{SDL_test_crc32.h → SDL3/SDL_test_crc32.h} +27 -30
- data/dependencies/SDL/include/{SDL_test_font.h → SDL3/SDL_test_font.h} +50 -49
- data/dependencies/SDL/include/{SDL_test_fuzzer.h → SDL3/SDL_test_fuzzer.h} +64 -79
- data/dependencies/SDL/include/{SDL_test_harness.h → SDL3/SDL_test_harness.h} +47 -30
- data/dependencies/SDL/include/SDL3/SDL_test_log.h +83 -0
- data/dependencies/SDL/include/{SDL_test_md5.h → SDL3/SDL_test_md5.h} +21 -28
- data/dependencies/SDL/include/{SDL_test_memory.h → SDL3/SDL_test_memory.h} +19 -16
- data/dependencies/SDL/include/SDL3/SDL_thread.h +602 -0
- data/dependencies/SDL/include/SDL3/SDL_time.h +249 -0
- data/dependencies/SDL/include/SDL3/SDL_timer.h +454 -0
- data/dependencies/SDL/include/SDL3/SDL_touch.h +184 -0
- data/dependencies/SDL/include/SDL3/SDL_tray.h +544 -0
- data/dependencies/SDL/include/SDL3/SDL_version.h +198 -0
- data/dependencies/SDL/include/SDL3/SDL_video.h +3497 -0
- data/dependencies/SDL/include/SDL3/SDL_vulkan.h +287 -0
- data/dependencies/SDL/lib/x64/libSDL3.dll.a +0 -0
- data/dependencies/SDL/lib/x86/libSDL3.dll.a +0 -0
- data/dependencies/SDL_sound/SDL3_sound/SDL_sound.h +755 -0
- data/dependencies/SDL_sound/SDL_sound.c +136 -215
- data/dependencies/SDL_sound/SDL_sound_aiff.c +55 -54
- data/dependencies/SDL_sound/SDL_sound_au.c +32 -32
- data/dependencies/SDL_sound/SDL_sound_coreaudio.c +24 -41
- data/dependencies/SDL_sound/SDL_sound_flac.c +32 -12
- data/dependencies/SDL_sound/SDL_sound_internal.h +33 -48
- data/dependencies/SDL_sound/SDL_sound_modplug.c +21 -29
- data/dependencies/SDL_sound/SDL_sound_mp3.c +35 -13
- data/dependencies/SDL_sound/SDL_sound_raw.c +14 -15
- data/dependencies/SDL_sound/SDL_sound_shn.c +82 -82
- data/dependencies/SDL_sound/SDL_sound_voc.c +30 -30
- data/dependencies/SDL_sound/SDL_sound_vorbis.c +34 -25
- data/dependencies/SDL_sound/SDL_sound_wav.c +86 -82
- data/dependencies/SDL_sound/dr_flac.h +1890 -1301
- data/dependencies/SDL_sound/dr_mp3.h +1098 -660
- data/dependencies/SDL_sound/libmodplug/fastmix.c +1 -1
- data/dependencies/SDL_sound/libmodplug/libmodplug.h +5 -4
- data/dependencies/SDL_sound/libmodplug/load_ams.c +6 -3
- data/dependencies/SDL_sound/libmodplug/load_dsm.c +2 -1
- data/dependencies/SDL_sound/libmodplug/load_mt2.c +2 -2
- data/dependencies/SDL_sound/libmodplug/modplug.h +2 -1
- data/dependencies/SDL_sound/libmodplug/snd_fx.c +3 -3
- data/dependencies/SDL_sound/libmodplug/sndfile.c +3 -0
- data/dependencies/SDL_sound/libmodplug/sndmix.c +7 -3
- data/dependencies/SDL_sound/stb_vorbis.h +397 -342
- data/dependencies/mojoAL/AL/alc.h +2 -2
- data/dependencies/mojoAL/mojoal.c +2120 -1885
- data/dependencies/stb/stb_image.h +1190 -1379
- data/dependencies/stb/stb_image_write.h +329 -129
- data/dependencies/stb/stb_truetype.h +304 -60
- data/dependencies/utf8proc/utf8proc.c +133 -75
- data/dependencies/utf8proc/utf8proc.h +131 -50
- data/dependencies/utf8proc/utf8proc_data.h +16213 -15658
- data/ext/gosu-ffi/extconf.rb +103 -0
- data/ext/gosu-ffi/gosu-ffi.def +467 -0
- data/ffi/Gosu.cpp +330 -0
- data/ffi/Gosu.h +84 -0
- data/ffi/Gosu_Channel.cpp +62 -0
- data/ffi/Gosu_Channel.h +17 -0
- data/ffi/Gosu_Color.cpp +176 -0
- data/ffi/Gosu_Color.h +31 -0
- data/ffi/Gosu_Constants.cpp +334 -0
- data/ffi/Gosu_FFI.h +34 -0
- data/ffi/Gosu_FFI_internal.h +160 -0
- data/ffi/Gosu_Font.cpp +97 -0
- data/ffi/Gosu_Font.h +32 -0
- data/ffi/Gosu_Image.cpp +239 -0
- data/ffi/Gosu_Image.h +71 -0
- data/ffi/Gosu_Sample.cpp +29 -0
- data/ffi/Gosu_Sample.h +14 -0
- data/ffi/Gosu_Song.cpp +69 -0
- data/ffi/Gosu_Song.h +18 -0
- data/ffi/Gosu_TextInput.cpp +94 -0
- data/ffi/Gosu_TextInput.h +25 -0
- data/ffi/Gosu_Window.cpp +314 -0
- data/ffi/Gosu_Window.h +78 -0
- data/include/Gosu/Audio.hpp +6 -11
- data/include/Gosu/Bitmap.hpp +38 -53
- data/include/Gosu/Buffer.hpp +54 -0
- data/include/Gosu/Color.hpp +29 -36
- data/include/Gosu/Directories.hpp +25 -28
- data/include/Gosu/Drawable.hpp +58 -0
- data/include/Gosu/Font.hpp +6 -5
- data/include/Gosu/Fwd.hpp +4 -6
- data/include/Gosu/Gosu.hpp +5 -5
- data/include/Gosu/Graphics.hpp +53 -61
- data/include/Gosu/GraphicsBase.hpp +1 -11
- data/include/Gosu/Image.hpp +12 -15
- data/include/Gosu/Math.hpp +50 -72
- data/include/Gosu/Transform.hpp +32 -0
- data/include/Gosu/Utility.hpp +77 -1
- data/include/Gosu/Version.hpp +2 -2
- data/include/Gosu/Window.hpp +15 -9
- data/lib/SDL3.dll +0 -0
- data/lib/gosu/channel.rb +50 -0
- data/lib/gosu/color.rb +173 -0
- data/lib/gosu/compat.rb +130 -17
- data/lib/gosu/constants.rb +386 -0
- data/lib/gosu/ffi.rb +269 -0
- data/lib/gosu/font.rb +62 -0
- data/lib/gosu/gl_tex_info.rb +33 -0
- data/lib/gosu/gosu.rb +250 -0
- data/lib/gosu/image.rb +179 -0
- data/lib/gosu/numeric.rb +17 -0
- data/lib/gosu/preview.rb +6 -6
- data/lib/gosu/sample.rb +25 -0
- data/lib/gosu/song.rb +57 -0
- data/lib/gosu/text_input.rb +83 -0
- data/lib/gosu/window.rb +249 -0
- data/lib/gosu.rb +29 -8
- data/lib64/SDL3.dll +0 -0
- data/rdoc/gosu.rb +2 -2
- data/src/Audio.cpp +30 -24
- data/src/AudioFile.hpp +5 -4
- data/src/AudioFileAudioToolbox.cpp +8 -8
- data/src/AudioFileSDLSound.cpp +12 -15
- data/src/BinPacker.cpp +188 -0
- data/src/BinPacker.hpp +55 -0
- data/src/Bitmap.cpp +172 -143
- data/src/BitmapIO.cpp +60 -86
- data/src/Buffer.cpp +150 -0
- data/src/ClipRectStack.cpp +38 -0
- data/src/ClipRectStack.hpp +17 -83
- data/src/Color.cpp +75 -80
- data/src/Directories.cpp +47 -0
- data/src/DirectoriesUIKit.cpp +50 -0
- data/src/DrawOp.hpp +20 -18
- data/src/DrawOpQueue.hpp +27 -33
- data/src/Drawable.cpp +95 -0
- data/src/EmptyDrawable.hpp +38 -0
- data/src/FPS.cpp +31 -0
- data/src/Font.cpp +104 -74
- data/src/GosuGLView.cpp +13 -11
- data/src/GosuViewController.cpp +2 -10
- data/src/Graphics.cpp +86 -145
- data/src/GraphicsImpl.hpp +14 -68
- data/src/Image.cpp +41 -35
- data/src/Input.cpp +73 -78
- data/src/Macro.cpp +46 -29
- data/src/Macro.hpp +23 -17
- data/src/MarkupParser.cpp +5 -5
- data/src/Math.cpp +48 -22
- data/src/OffScreenTarget.cpp +47 -50
- data/src/OffScreenTarget.hpp +13 -11
- data/src/OpenGLContext.cpp +116 -0
- data/src/OpenGLContext.hpp +41 -0
- data/src/RenderState.hpp +49 -71
- data/src/Resolution.cpp +65 -53
- data/src/TexChunk.cpp +35 -80
- data/src/TexChunk.hpp +44 -35
- data/src/Text.cpp +1 -1
- data/src/TextBuilder.cpp +35 -21
- data/src/TextBuilder.hpp +6 -9
- data/src/TextInput.cpp +9 -9
- data/src/Texture.cpp +62 -80
- data/src/Texture.hpp +25 -23
- data/src/TiledDrawable.cpp +149 -0
- data/src/TiledDrawable.hpp +47 -0
- data/src/TimingApple.cpp +1 -1
- data/src/Transform.cpp +45 -50
- data/src/TransformStack.hpp +16 -16
- data/src/TrueTypeFont.cpp +59 -51
- data/src/TrueTypeFont.hpp +6 -7
- data/src/TrueTypeFontApple.cpp +28 -19
- data/src/TrueTypeFontUnix.cpp +39 -32
- data/src/TrueTypeFontWin.cpp +30 -30
- data/src/Utility.cpp +113 -37
- data/src/UtilityWin.cpp +49 -0
- data/src/Window.cpp +121 -151
- data/src/WindowUIKit.cpp +14 -14
- metadata +165 -118
- data/dependencies/SDL/include/SDL.h +0 -233
- data/dependencies/SDL/include/SDL_assert.h +0 -320
- data/dependencies/SDL/include/SDL_atomic.h +0 -415
- data/dependencies/SDL/include/SDL_audio.h +0 -1500
- data/dependencies/SDL/include/SDL_clipboard.h +0 -141
- data/dependencies/SDL/include/SDL_config.h +0 -331
- data/dependencies/SDL/include/SDL_cpuinfo.h +0 -594
- data/dependencies/SDL/include/SDL_endian.h +0 -348
- data/dependencies/SDL/include/SDL_error.h +0 -163
- data/dependencies/SDL/include/SDL_events.h +0 -1166
- data/dependencies/SDL/include/SDL_filesystem.h +0 -149
- data/dependencies/SDL/include/SDL_gamecontroller.h +0 -1074
- data/dependencies/SDL/include/SDL_gesture.h +0 -117
- data/dependencies/SDL/include/SDL_guid.h +0 -100
- data/dependencies/SDL/include/SDL_haptic.h +0 -1341
- data/dependencies/SDL/include/SDL_hidapi.h +0 -451
- data/dependencies/SDL/include/SDL_hints.h +0 -2569
- data/dependencies/SDL/include/SDL_joystick.h +0 -1066
- data/dependencies/SDL/include/SDL_keyboard.h +0 -353
- data/dependencies/SDL/include/SDL_keycode.h +0 -358
- data/dependencies/SDL/include/SDL_loadso.h +0 -115
- data/dependencies/SDL/include/SDL_log.h +0 -404
- data/dependencies/SDL/include/SDL_main.h +0 -275
- data/dependencies/SDL/include/SDL_mouse.h +0 -465
- data/dependencies/SDL/include/SDL_mutex.h +0 -471
- data/dependencies/SDL/include/SDL_name.h +0 -33
- data/dependencies/SDL/include/SDL_pixels.h +0 -644
- data/dependencies/SDL/include/SDL_platform.h +0 -261
- data/dependencies/SDL/include/SDL_quit.h +0 -58
- data/dependencies/SDL/include/SDL_rect.h +0 -376
- data/dependencies/SDL/include/SDL_render.h +0 -1919
- data/dependencies/SDL/include/SDL_revision.h +0 -7
- data/dependencies/SDL/include/SDL_rwops.h +0 -841
- data/dependencies/SDL/include/SDL_sensor.h +0 -322
- data/dependencies/SDL/include/SDL_shape.h +0 -155
- data/dependencies/SDL/include/SDL_stdinc.h +0 -830
- data/dependencies/SDL/include/SDL_surface.h +0 -997
- data/dependencies/SDL/include/SDL_system.h +0 -623
- data/dependencies/SDL/include/SDL_syswm.h +0 -386
- data/dependencies/SDL/include/SDL_test_images.h +0 -78
- data/dependencies/SDL/include/SDL_test_random.h +0 -115
- data/dependencies/SDL/include/SDL_thread.h +0 -464
- data/dependencies/SDL/include/SDL_timer.h +0 -222
- data/dependencies/SDL/include/SDL_touch.h +0 -150
- data/dependencies/SDL/include/SDL_version.h +0 -204
- data/dependencies/SDL/include/SDL_video.h +0 -2150
- data/dependencies/SDL/include/SDL_vulkan.h +0 -215
- data/dependencies/SDL/include/begin_code.h +0 -187
- data/dependencies/SDL/lib/x64/libSDL2.dll.a +0 -0
- data/dependencies/SDL/lib/x86/libSDL2.dll.a +0 -0
- data/dependencies/SDL_sound/SDL_sound.h +0 -725
- data/ext/gosu/extconf.rb +0 -119
- data/include/Gosu/IO.hpp +0 -254
- data/include/Gosu/ImageData.hpp +0 -53
- data/include/Gosu/Inspection.hpp +0 -7
- data/lib/SDL2.dll +0 -0
- data/lib/gosu/patches.rb +0 -66
- data/lib/gosu/run.rb +0 -20
- data/lib/gosu/swig_patches.rb +0 -110
- data/lib64/SDL2.dll +0 -0
- data/src/BlockAllocator.cpp +0 -131
- data/src/BlockAllocator.hpp +0 -32
- data/src/DirectoriesApple.cpp +0 -69
- data/src/DirectoriesUnix.cpp +0 -46
- data/src/DirectoriesWin.cpp +0 -65
- data/src/EmptyImageData.hpp +0 -52
- data/src/FileUnix.cpp +0 -99
- data/src/FileWin.cpp +0 -88
- data/src/IO.cpp +0 -60
- data/src/Iconv.hpp +0 -51
- data/src/Inspection.cpp +0 -27
- data/src/LargeImageData.cpp +0 -215
- data/src/LargeImageData.hpp +0 -39
- data/src/Log.hpp +0 -19
- data/src/RubyGosu.cxx +0 -13100
- data/src/RubyGosu.h +0 -49
- data/src/WinUtility.cpp +0 -61
- data/src/WinUtility.hpp +0 -27
- /data/dependencies/SDL/include/{SDL_opengles2_gl2.h → SDL3/SDL_opengles2_gl2.h} +0 -0
- /data/dependencies/SDL/include/{SDL_opengles2_gl2ext.h → SDL3/SDL_opengles2_gl2ext.h} +0 -0
- /data/dependencies/SDL/include/{SDL_opengles2_gl2platform.h → SDL3/SDL_opengles2_gl2platform.h} +0 -0
- /data/dependencies/SDL/include/{SDL_opengles2_khrplatform.h → SDL3/SDL_opengles2_khrplatform.h} +0 -0
data/src/Buffer.cpp
ADDED
|
@@ -0,0 +1,150 @@
|
|
|
1
|
+
#include <Gosu/Buffer.hpp>
|
|
2
|
+
#include <Gosu/Platform.hpp>
|
|
3
|
+
#include <limits>
|
|
4
|
+
#include <memory>
|
|
5
|
+
#include <stdexcept>
|
|
6
|
+
|
|
7
|
+
#ifdef GOSU_IS_IPHONE
|
|
8
|
+
#include <filesystem>
|
|
9
|
+
#include <fstream>
|
|
10
|
+
#else
|
|
11
|
+
#include <SDL3/SDL.h>
|
|
12
|
+
#endif
|
|
13
|
+
|
|
14
|
+
Gosu::Buffer::Buffer(void* buffer, std::size_t size, std::function<void(void*)> deleter)
|
|
15
|
+
: m_buffer(buffer),
|
|
16
|
+
m_size(size),
|
|
17
|
+
m_deleter(std::move(deleter))
|
|
18
|
+
{
|
|
19
|
+
if (buffer == nullptr && size > 0) {
|
|
20
|
+
throw std::invalid_argument("Tried to create non-empty Gosu::Buffer from nullptr");
|
|
21
|
+
}
|
|
22
|
+
if (size >= std::numeric_limits<std::ptrdiff_t>::max()) {
|
|
23
|
+
throw std::length_error("Tried to create Gosu::Buffer with a negative size");
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
Gosu::Buffer::Buffer(Gosu::Buffer&& other) noexcept
|
|
28
|
+
: m_buffer(nullptr),
|
|
29
|
+
m_size(0),
|
|
30
|
+
m_deleter(nullptr)
|
|
31
|
+
{
|
|
32
|
+
*this = std::move(other);
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
Gosu::Buffer& Gosu::Buffer::operator=(Gosu::Buffer&& other) noexcept
|
|
36
|
+
{
|
|
37
|
+
if (this == &other) {
|
|
38
|
+
return *this;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
if (m_buffer && m_deleter) {
|
|
42
|
+
m_deleter(m_buffer);
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
m_buffer = other.m_buffer;
|
|
46
|
+
m_size = other.m_size;
|
|
47
|
+
// In theory, this could throw. In that case, we are fine with a full crash of the current
|
|
48
|
+
// process (as this function is marked noexcept) because throwing deleters are a user error.
|
|
49
|
+
m_deleter = std::move(other.m_deleter);
|
|
50
|
+
|
|
51
|
+
other.m_buffer = nullptr;
|
|
52
|
+
other.m_size = 0;
|
|
53
|
+
other.m_deleter = nullptr;
|
|
54
|
+
|
|
55
|
+
return *this;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
Gosu::Buffer::~Buffer()
|
|
59
|
+
{
|
|
60
|
+
if (m_buffer && m_deleter) {
|
|
61
|
+
m_deleter(m_buffer);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
Gosu::Buffer::Buffer(std::size_t size)
|
|
66
|
+
: m_buffer(nullptr),
|
|
67
|
+
m_size(size),
|
|
68
|
+
m_deleter([](void* p) { delete[] static_cast<std::uint8_t*>(p); })
|
|
69
|
+
{
|
|
70
|
+
if (size >= std::numeric_limits<std::ptrdiff_t>::max()) {
|
|
71
|
+
throw std::length_error("Tried to create Gosu::Buffer with a negative size");
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
if (m_size) {
|
|
75
|
+
m_buffer = new std::uint8_t[m_size];
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
Gosu::Buffer::Buffer(std::vector<std::uint8_t>&& vector) noexcept
|
|
80
|
+
: m_buffer(vector.data()),
|
|
81
|
+
m_size(vector.size()),
|
|
82
|
+
// Absorb the vector into this Gosu::Buffer by moving it into the deleter lambda.
|
|
83
|
+
// This is safe because the vector move constructor guarantees that pointers remain stable.
|
|
84
|
+
m_deleter([vector = std::move(vector)](void*) mutable { vector.clear(); })
|
|
85
|
+
{
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
Gosu::Buffer::Buffer(const Gosu::Buffer& other)
|
|
89
|
+
: Buffer(std::vector<std::uint8_t>(other.data(), other.data() + other.size()))
|
|
90
|
+
{
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
Gosu::Buffer& Gosu::Buffer::operator=(const Gosu::Buffer& other)
|
|
94
|
+
{
|
|
95
|
+
if (this == &other) {
|
|
96
|
+
return *this;
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
// Delegate to copy constructor + move assignment operator.
|
|
100
|
+
return *this = Buffer(other);
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
#ifdef GOSU_IS_IPHONE
|
|
104
|
+
Gosu::Buffer Gosu::load_file(const std::string& filename)
|
|
105
|
+
{
|
|
106
|
+
Buffer buffer(std::filesystem::file_size(filename));
|
|
107
|
+
char* ptr = reinterpret_cast<char*>(buffer.data());
|
|
108
|
+
std::ifstream file(filename, std::ios::binary);
|
|
109
|
+
// GCOV_EXCL_START: It is hard to set up a file where file_size works but reading doesn't.
|
|
110
|
+
if (!file || !file.read(ptr, static_cast<std::streamoff>(buffer.size()))) {
|
|
111
|
+
throw std::runtime_error("Could not read file '" + filename + "'");
|
|
112
|
+
}
|
|
113
|
+
// GCOV_EXCL_END
|
|
114
|
+
return buffer;
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
void Gosu::save_file(const Buffer& buffer, const std::string& filename)
|
|
118
|
+
{
|
|
119
|
+
std::ofstream file(filename, std::ios::binary | std::ios::trunc);
|
|
120
|
+
const char* ptr = reinterpret_cast<const char*>(buffer.data());
|
|
121
|
+
if (!file || !file.write(ptr, static_cast<std::streamoff>(buffer.size()))) {
|
|
122
|
+
throw std::runtime_error("Could not write file '" + filename + "'");
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
#else
|
|
126
|
+
Gosu::Buffer Gosu::load_file(const std::string& filename)
|
|
127
|
+
{
|
|
128
|
+
std::size_t size = 0;
|
|
129
|
+
void* contents = SDL_LoadFile(filename.c_str(), &size);
|
|
130
|
+
if (contents == nullptr) {
|
|
131
|
+
throw std::runtime_error("Could not read '" + filename + "', error: " + SDL_GetError());
|
|
132
|
+
}
|
|
133
|
+
return Buffer(contents, size, &SDL_free);
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
void Gosu::save_file(const Buffer& buffer, const std::string& filename)
|
|
137
|
+
{
|
|
138
|
+
std::unique_ptr<SDL_IOStream, decltype(&SDL_CloseIO)> io(
|
|
139
|
+
SDL_IOFromFile(filename.c_str(), "w"), &SDL_CloseIO);
|
|
140
|
+
if (io == nullptr) {
|
|
141
|
+
throw std::runtime_error("Could not open '" + filename + "', error: " + SDL_GetError());
|
|
142
|
+
}
|
|
143
|
+
std::size_t written = SDL_WriteIO(io.get(), buffer.data(), buffer.size());
|
|
144
|
+
// GCOV_EXCL_START: It is hard to set up a file where opening works but writing doesn't.
|
|
145
|
+
if (written == 0) {
|
|
146
|
+
throw std::runtime_error("Could not write to '" + filename + "', error: " + SDL_GetError());
|
|
147
|
+
}
|
|
148
|
+
// GCOV_EXCL_END
|
|
149
|
+
}
|
|
150
|
+
#endif
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
#include "ClipRectStack.hpp"
|
|
2
|
+
#include <stdexcept>
|
|
3
|
+
|
|
4
|
+
void Gosu::ClipRectStack::clear()
|
|
5
|
+
{
|
|
6
|
+
m_stack.clear();
|
|
7
|
+
m_effective_rect = std::nullopt;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
void Gosu::ClipRectStack::push(const Rect& rect)
|
|
11
|
+
{
|
|
12
|
+
m_stack.push_back(rect);
|
|
13
|
+
if (m_effective_rect) {
|
|
14
|
+
m_effective_rect->clip_to(rect);
|
|
15
|
+
}
|
|
16
|
+
else {
|
|
17
|
+
m_effective_rect = rect;
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
void Gosu::ClipRectStack::pop()
|
|
22
|
+
{
|
|
23
|
+
if (m_stack.empty()) {
|
|
24
|
+
throw std::logic_error("ClipRectStack is empty");
|
|
25
|
+
}
|
|
26
|
+
m_stack.pop_back();
|
|
27
|
+
|
|
28
|
+
// The clip rect is the intersection of all active clip rects (if any).
|
|
29
|
+
m_effective_rect = std::nullopt;
|
|
30
|
+
for (const auto& rect : m_stack) {
|
|
31
|
+
if (m_effective_rect) {
|
|
32
|
+
m_effective_rect->clip_to(rect);
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
m_effective_rect = rect;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
data/src/ClipRectStack.hpp
CHANGED
|
@@ -1,90 +1,24 @@
|
|
|
1
1
|
#pragma once
|
|
2
2
|
|
|
3
|
+
#include <Gosu/Utility.hpp>
|
|
3
4
|
#include "GraphicsImpl.hpp"
|
|
4
|
-
#include <
|
|
5
|
+
#include <limits>
|
|
6
|
+
#include <optional>
|
|
7
|
+
#include <stdexcept>
|
|
5
8
|
#include <vector>
|
|
6
9
|
|
|
7
|
-
|
|
10
|
+
namespace Gosu
|
|
8
11
|
{
|
|
9
|
-
|
|
10
|
-
bool has_effective_rect; // is effective_rect valid?
|
|
11
|
-
ClipRect effective_rect;
|
|
12
|
-
|
|
13
|
-
void update_effective_rect()
|
|
12
|
+
class ClipRectStack
|
|
14
13
|
{
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
result.x = std::max(result.x, rect.x);
|
|
27
|
-
result.y = std::max(result.y, rect.y);
|
|
28
|
-
|
|
29
|
-
if (result.x >= result_right || result.y >= result_bottom) {
|
|
30
|
-
// We have clipped the world away!
|
|
31
|
-
has_effective_rect = false;
|
|
32
|
-
return;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
result.width = result_right - result.x;
|
|
36
|
-
result.height = result_bottom - result.y;
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
// On the iPhone, we may have to multiply everything by 2 for Retina displays.
|
|
40
|
-
// TODO: Doesn't this affect Retina Macs as well?
|
|
41
|
-
// TODO: This should be handled by a global transform.
|
|
42
|
-
int fac = clip_rect_base_factor();
|
|
43
|
-
result.x *= fac;
|
|
44
|
-
result.y *= fac;
|
|
45
|
-
result.width *= fac;
|
|
46
|
-
result.height *= fac;
|
|
47
|
-
|
|
48
|
-
// Normal clipping.
|
|
49
|
-
effective_rect = result;
|
|
50
|
-
has_effective_rect = true;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
public:
|
|
54
|
-
ClipRectStack()
|
|
55
|
-
: has_effective_rect(false)
|
|
56
|
-
{
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
void clear()
|
|
60
|
-
{
|
|
61
|
-
stack.clear();
|
|
62
|
-
has_effective_rect = false;
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
void begin_clipping(double x, double y, double width, double height)
|
|
66
|
-
{
|
|
67
|
-
ClipRect rect = { x, y, width, height };
|
|
68
|
-
stack.push_back(rect);
|
|
69
|
-
update_effective_rect();
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
void end_clipping()
|
|
73
|
-
{
|
|
74
|
-
assert (!stack.empty());
|
|
75
|
-
stack.pop_back();
|
|
76
|
-
update_effective_rect();
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
const ClipRect* maybe_effective_rect() const
|
|
80
|
-
{
|
|
81
|
-
return has_effective_rect ? &effective_rect : 0;
|
|
82
|
-
}
|
|
83
|
-
|
|
84
|
-
bool clipped_world_away() const
|
|
85
|
-
{
|
|
86
|
-
// When we have no effective rect but the stack is not empty, we have clipped
|
|
87
|
-
// the whole world away and don't need to render things.
|
|
88
|
-
return !has_effective_rect && !stack.empty();
|
|
89
|
-
}
|
|
90
|
-
};
|
|
14
|
+
std::vector<Rect> m_stack;
|
|
15
|
+
std::optional<Rect> m_effective_rect;
|
|
16
|
+
|
|
17
|
+
public:
|
|
18
|
+
void clear();
|
|
19
|
+
void push(const Rect& rect);
|
|
20
|
+
void pop();
|
|
21
|
+
|
|
22
|
+
const std::optional<Rect>& effective_rect() const { return m_effective_rect; }
|
|
23
|
+
};
|
|
24
|
+
}
|
data/src/Color.cpp
CHANGED
|
@@ -1,56 +1,8 @@
|
|
|
1
1
|
#include <Gosu/Color.hpp>
|
|
2
2
|
#include <Gosu/Math.hpp>
|
|
3
|
-
#include <algorithm>
|
|
3
|
+
#include <algorithm> // for std::min, std::max
|
|
4
4
|
#include <cmath>
|
|
5
|
-
|
|
6
|
-
namespace
|
|
7
|
-
{
|
|
8
|
-
struct HSV
|
|
9
|
-
{
|
|
10
|
-
double h, s, v;
|
|
11
|
-
};
|
|
12
|
-
|
|
13
|
-
HSV color_to_hsv(const Gosu::Color& c)
|
|
14
|
-
{
|
|
15
|
-
double r = c.red / 255.0;
|
|
16
|
-
double g = c.green / 255.0;
|
|
17
|
-
double b = c.blue / 255.0;
|
|
18
|
-
|
|
19
|
-
double min = std::min(std::min(r, g), b);
|
|
20
|
-
double max = std::max(std::max(r, g), b);
|
|
21
|
-
double delta = max - min;
|
|
22
|
-
|
|
23
|
-
if (max == 0) {
|
|
24
|
-
HSV hsv = {0, 0, 0};
|
|
25
|
-
return hsv;
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
HSV hsv{};
|
|
29
|
-
|
|
30
|
-
// Value.
|
|
31
|
-
hsv.v = max;
|
|
32
|
-
|
|
33
|
-
// Saturation.
|
|
34
|
-
hsv.s = delta / max;
|
|
35
|
-
|
|
36
|
-
// Hue.
|
|
37
|
-
if (delta == 0) {
|
|
38
|
-
hsv.h = 0;
|
|
39
|
-
}
|
|
40
|
-
else if (r == max) {
|
|
41
|
-
hsv.h = (g - b) / delta + (g < b ? 6 : 0);
|
|
42
|
-
}
|
|
43
|
-
else if (g == max) {
|
|
44
|
-
hsv.h = (b - r) / delta + 2;
|
|
45
|
-
}
|
|
46
|
-
else {
|
|
47
|
-
hsv.h = (r - g) / delta + 4;
|
|
48
|
-
}
|
|
49
|
-
hsv.h *= 60;
|
|
50
|
-
|
|
51
|
-
return hsv;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
5
|
+
#include <iomanip> // for std::setw
|
|
54
6
|
|
|
55
7
|
Gosu::Color Gosu::Color::from_hsv(double h, double s, double v)
|
|
56
8
|
{
|
|
@@ -60,32 +12,51 @@ Gosu::Color Gosu::Color::from_hsv(double h, double s, double v)
|
|
|
60
12
|
s = std::clamp(s, 0.0, 1.0);
|
|
61
13
|
v = std::clamp(v, 0.0, 1.0);
|
|
62
14
|
|
|
15
|
+
const auto to_channel = [](double d) { return static_cast<Channel>(std::round(255.0 * d)); };
|
|
16
|
+
|
|
63
17
|
int sector = static_cast<int>(h / 60);
|
|
64
|
-
double
|
|
18
|
+
double remainder = h / 60 - sector;
|
|
65
19
|
|
|
66
|
-
Channel p =
|
|
67
|
-
Channel q =
|
|
68
|
-
Channel t =
|
|
20
|
+
Channel p = to_channel(v * (1 - s));
|
|
21
|
+
Channel q = to_channel(v * (1 - s * remainder));
|
|
22
|
+
Channel t = to_channel(v * (1 - s * (1 - remainder)));
|
|
69
23
|
|
|
70
24
|
switch (sector) {
|
|
71
25
|
case 0:
|
|
72
|
-
return Color{
|
|
26
|
+
return Color { to_channel(v), t, p };
|
|
73
27
|
case 1:
|
|
74
|
-
return Color{q,
|
|
28
|
+
return Color { q, to_channel(v), p };
|
|
75
29
|
case 2:
|
|
76
|
-
return Color{p,
|
|
30
|
+
return Color { p, to_channel(v), t };
|
|
77
31
|
case 3:
|
|
78
|
-
return Color{p, q,
|
|
32
|
+
return Color { p, q, to_channel(v) };
|
|
79
33
|
case 4:
|
|
80
|
-
return Color{t, p,
|
|
34
|
+
return Color { t, p, to_channel(v) };
|
|
81
35
|
default: // sector 5
|
|
82
|
-
return Color{
|
|
36
|
+
return Color { to_channel(v), p, q };
|
|
83
37
|
}
|
|
84
38
|
}
|
|
85
39
|
|
|
86
40
|
double Gosu::Color::hue() const
|
|
87
41
|
{
|
|
88
|
-
|
|
42
|
+
double max = std::max({ red, green, blue });
|
|
43
|
+
double min = std::min({ red, green, blue });
|
|
44
|
+
|
|
45
|
+
if (min == max) {
|
|
46
|
+
return 0;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
double factor = 60 / (max - min);
|
|
50
|
+
|
|
51
|
+
if (green == max) {
|
|
52
|
+
return (blue - red) * factor + 120; // 60...180
|
|
53
|
+
} else if (blue == max) {
|
|
54
|
+
return (red - green) * factor + 240; // 180...300
|
|
55
|
+
} else if (blue > green) {
|
|
56
|
+
return (green - blue) * factor + 360; // 300...360
|
|
57
|
+
} else {
|
|
58
|
+
return (green - blue) * factor + 0; // 0...60
|
|
59
|
+
}
|
|
89
60
|
}
|
|
90
61
|
|
|
91
62
|
void Gosu::Color::set_hue(double h)
|
|
@@ -95,7 +66,15 @@ void Gosu::Color::set_hue(double h)
|
|
|
95
66
|
|
|
96
67
|
double Gosu::Color::saturation() const
|
|
97
68
|
{
|
|
98
|
-
|
|
69
|
+
double max = std::max({ red, green, blue });
|
|
70
|
+
|
|
71
|
+
if (max == 0) {
|
|
72
|
+
return 0;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
double min = std::min({ red, green, blue });
|
|
76
|
+
|
|
77
|
+
return 1 - (min / max);
|
|
99
78
|
}
|
|
100
79
|
|
|
101
80
|
void Gosu::Color::set_saturation(double s)
|
|
@@ -105,7 +84,7 @@ void Gosu::Color::set_saturation(double s)
|
|
|
105
84
|
|
|
106
85
|
double Gosu::Color::value() const
|
|
107
86
|
{
|
|
108
|
-
return
|
|
87
|
+
return std::max({ red, green, blue }) / 255.0;
|
|
109
88
|
}
|
|
110
89
|
|
|
111
90
|
void Gosu::Color::set_value(double v)
|
|
@@ -113,10 +92,23 @@ void Gosu::Color::set_value(double v)
|
|
|
113
92
|
*this = from_hsv(hue(), saturation(), v).with_alpha(alpha);
|
|
114
93
|
}
|
|
115
94
|
|
|
95
|
+
const Gosu::Color Gosu::Color::NONE { 0x00'000000 };
|
|
96
|
+
const Gosu::Color Gosu::Color::BLACK { 0, 0, 0 };
|
|
97
|
+
const Gosu::Color Gosu::Color::GRAY { 128, 128, 128 };
|
|
98
|
+
const Gosu::Color Gosu::Color::WHITE { 255, 255, 255 };
|
|
99
|
+
|
|
100
|
+
const Gosu::Color Gosu::Color::AQUA { 0, 255, 255 };
|
|
101
|
+
const Gosu::Color Gosu::Color::RED { 255, 0, 0 };
|
|
102
|
+
const Gosu::Color Gosu::Color::GREEN { 0, 255, 0 };
|
|
103
|
+
const Gosu::Color Gosu::Color::BLUE { 0, 0, 255 };
|
|
104
|
+
const Gosu::Color Gosu::Color::YELLOW { 255, 255, 0 };
|
|
105
|
+
const Gosu::Color Gosu::Color::FUCHSIA { 255, 0, 255 };
|
|
106
|
+
const Gosu::Color Gosu::Color::CYAN { 0, 255, 255 };
|
|
107
|
+
|
|
116
108
|
Gosu::Color Gosu::lerp(Color a, Color b, double t)
|
|
117
109
|
{
|
|
118
110
|
const auto lerp_channel = [](Color::Channel a, Color::Channel b, double t) {
|
|
119
|
-
return static_cast<Color::Channel>(std::clamp(std::round(lerp(a, b, t)), 0.0, 255.0));
|
|
111
|
+
return static_cast<Color::Channel>(std::clamp(std::round(std::lerp(a, b, t)), 0.0, 255.0));
|
|
120
112
|
};
|
|
121
113
|
|
|
122
114
|
Color result;
|
|
@@ -129,23 +121,26 @@ Gosu::Color Gosu::lerp(Color a, Color b, double t)
|
|
|
129
121
|
|
|
130
122
|
Gosu::Color Gosu::multiply(Color a, Color b)
|
|
131
123
|
{
|
|
124
|
+
const auto multiply_channel = [](Color::Channel a, Color::Channel b) {
|
|
125
|
+
return static_cast<Color::Channel>(std::round(a * b / 255.0));
|
|
126
|
+
};
|
|
127
|
+
|
|
132
128
|
Color result;
|
|
133
|
-
result.red =
|
|
134
|
-
result.green =
|
|
135
|
-
result.blue =
|
|
136
|
-
result.alpha =
|
|
129
|
+
result.red = multiply_channel(a.red, b.red);
|
|
130
|
+
result.green = multiply_channel(a.green, b.green);
|
|
131
|
+
result.blue = multiply_channel(a.blue, b.blue);
|
|
132
|
+
result.alpha = multiply_channel(a.alpha, b.alpha);
|
|
137
133
|
return result;
|
|
138
134
|
}
|
|
139
135
|
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
const
|
|
143
|
-
const
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
const Gosu::Color Gosu::Color::CYAN{0, 255, 255};
|
|
136
|
+
std::ostream& Gosu::operator<<(std::ostream& stream, Gosu::Color color)
|
|
137
|
+
{
|
|
138
|
+
const auto previous_flags = stream.flags();
|
|
139
|
+
const char previous_fill = stream.fill();
|
|
140
|
+
stream << std::setfill('0');
|
|
141
|
+
stream << "0x" << std::hex << std::setw(2) << static_cast<int>(color.alpha);
|
|
142
|
+
stream << '\'' << std::setw(6) << static_cast<int>(color.argb() & 0x00'ffffff);
|
|
143
|
+
stream.flags(previous_flags);
|
|
144
|
+
stream.fill(previous_fill);
|
|
145
|
+
return stream;
|
|
146
|
+
}
|
data/src/Directories.cpp
ADDED
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
#include <Gosu/Directories.hpp>
|
|
2
|
+
#include <Gosu/Platform.hpp>
|
|
3
|
+
|
|
4
|
+
#ifdef GOSU_IS_WIN
|
|
5
|
+
#include <Gosu/Utility.hpp>
|
|
6
|
+
#include <windows.h>
|
|
7
|
+
#else
|
|
8
|
+
#include <unistd.h>
|
|
9
|
+
#endif
|
|
10
|
+
|
|
11
|
+
void Gosu::use_resource_directory()
|
|
12
|
+
{
|
|
13
|
+
#ifdef GOSU_IS_WIN
|
|
14
|
+
SetCurrentDirectoryW(utf8_to_utf16(resource_path()).c_str());
|
|
15
|
+
#else
|
|
16
|
+
chdir(resource_path().c_str());
|
|
17
|
+
#endif
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
#ifndef GOSU_IS_IPHONE
|
|
21
|
+
#include <SDL3/SDL.h>
|
|
22
|
+
#include <memory>
|
|
23
|
+
#include <stdexcept>
|
|
24
|
+
#endif
|
|
25
|
+
|
|
26
|
+
#ifndef GOSU_IS_IPHONE
|
|
27
|
+
std::string Gosu::resource_path(const std::string& relative_filename)
|
|
28
|
+
{
|
|
29
|
+
static const char* resource_prefix = SDL_GetBasePath(); // never freed, doesn't matter
|
|
30
|
+
return relative_filename.empty() ? resource_prefix : resource_prefix + relative_filename;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
std::string Gosu::user_settings_path(const std::string& organization,
|
|
34
|
+
const std::string& application,
|
|
35
|
+
const std::string& relative_filename)
|
|
36
|
+
{
|
|
37
|
+
char* settings_prefix = SDL_GetPrefPath(organization.c_str(), application.c_str());
|
|
38
|
+
// GCOV_EXCL_START: Hard to simulate errors here because even creating "/:\\/:\\" works (macOS).
|
|
39
|
+
if (!settings_prefix) {
|
|
40
|
+
throw std::runtime_error("Could not create settings directory: "
|
|
41
|
+
+ std::string(SDL_GetError()));
|
|
42
|
+
}
|
|
43
|
+
// GCOV_EXCL_END
|
|
44
|
+
const std::unique_ptr<char, decltype(&SDL_free)> guard(settings_prefix, &SDL_free);
|
|
45
|
+
return relative_filename.empty() ? settings_prefix : settings_prefix + relative_filename;
|
|
46
|
+
}
|
|
47
|
+
#endif
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
#include <Gosu/Directories.hpp>
|
|
2
|
+
#include <Gosu/Platform.hpp>
|
|
3
|
+
#if defined(GOSU_IS_IPHONE)
|
|
4
|
+
|
|
5
|
+
#import <Foundation/Foundation.h>
|
|
6
|
+
#include <filesystem>
|
|
7
|
+
|
|
8
|
+
std::string Gosu::resource_path(const std::string& relative_filename)
|
|
9
|
+
{
|
|
10
|
+
static const std::string resource_prefix = [] {
|
|
11
|
+
@autoreleasepool {
|
|
12
|
+
NSString* resources = [NSBundle mainBundle].resourcePath;
|
|
13
|
+
return std::string(resources.UTF8String ?: ".");
|
|
14
|
+
}
|
|
15
|
+
}();
|
|
16
|
+
|
|
17
|
+
return relative_filename.empty() ? resource_prefix : resource_prefix + "/" + relative_filename;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
std::string Gosu::user_settings_path(const std::string& organization,
|
|
21
|
+
const std::string& application,
|
|
22
|
+
const std::string& relative_filename)
|
|
23
|
+
{
|
|
24
|
+
static const std::string user_settings_prefix = [] {
|
|
25
|
+
@autoreleasepool {
|
|
26
|
+
NSString* library
|
|
27
|
+
= NSSearchPathForDirectoriesInDomains(NSLibraryDirectory, NSUserDomainMask, YES)
|
|
28
|
+
.firstObject;
|
|
29
|
+
NSString* preferences = [library stringByAppendingPathComponent:@"Application Support"];
|
|
30
|
+
return std::string(preferences.UTF8String ?: ".");
|
|
31
|
+
}
|
|
32
|
+
}();
|
|
33
|
+
|
|
34
|
+
std::string directory = user_settings_prefix;
|
|
35
|
+
if (!organization.empty()) {
|
|
36
|
+
directory += '/';
|
|
37
|
+
directory += organization;
|
|
38
|
+
}
|
|
39
|
+
if (!application.empty()) {
|
|
40
|
+
directory += '/';
|
|
41
|
+
directory += application;
|
|
42
|
+
}
|
|
43
|
+
if (!std::filesystem::is_directory(directory)) {
|
|
44
|
+
std::filesystem::create_directories(directory);
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
return relative_filename.empty() ? directory : directory + '/' + relative_filename;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
#endif
|
data/src/DrawOp.hpp
CHANGED
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
#include "TexChunk.hpp"
|
|
6
6
|
#include <Gosu/Color.hpp>
|
|
7
7
|
#include <Gosu/GraphicsBase.hpp>
|
|
8
|
+
#include <algorithm>
|
|
8
9
|
#include <cassert>
|
|
9
10
|
|
|
10
11
|
namespace Gosu
|
|
@@ -15,13 +16,15 @@ namespace Gosu
|
|
|
15
16
|
ZPos z;
|
|
16
17
|
|
|
17
18
|
RenderState render_state;
|
|
18
|
-
// Only
|
|
19
|
-
GLfloat top, left, bottom, right;
|
|
20
|
-
|
|
19
|
+
// Only set if render_state.tex_name != NO_TEXTURE
|
|
20
|
+
GLfloat top = 0, left = 0, bottom = 0, right = 0;
|
|
21
|
+
// Used to keep TexChunk rectangles on shared textures alive until the end of the frame.
|
|
22
|
+
std::shared_ptr<const Rect> rect_handle;
|
|
23
|
+
|
|
21
24
|
// TODO: Merge with Gosu::ArrayVertex.
|
|
22
25
|
struct Vertex
|
|
23
26
|
{
|
|
24
|
-
float x, y;
|
|
27
|
+
float x = 0, y = 0;
|
|
25
28
|
Color c;
|
|
26
29
|
Vertex() {}
|
|
27
30
|
Vertex(float x, float y, Color c) : x(x), y(y), c(c) {}
|
|
@@ -30,7 +33,7 @@ namespace Gosu
|
|
|
30
33
|
|
|
31
34
|
// Number of vertices used, or: complement index of code block
|
|
32
35
|
int vertices_or_block_index;
|
|
33
|
-
|
|
36
|
+
|
|
34
37
|
void perform(const DrawOp* next) const
|
|
35
38
|
{
|
|
36
39
|
// This should not be called on GL code ops.
|
|
@@ -137,12 +140,17 @@ namespace Gosu
|
|
|
137
140
|
// frame anyway.
|
|
138
141
|
ArrayVertex result[4];
|
|
139
142
|
for (int i = 0; i < 4; ++i) {
|
|
140
|
-
|
|
141
|
-
|
|
143
|
+
// Triangles are turned into quads by repeating the last vertex.
|
|
144
|
+
// This allows us to use the same array for both triangles and quads.
|
|
145
|
+
// (This is also why draw_line does not work inside macros right now.)
|
|
146
|
+
const Vertex& vertex = vertices[std::min(i, vertices_or_block_index - 1)];
|
|
147
|
+
double x = vertex.x;
|
|
148
|
+
double y = vertex.y;
|
|
149
|
+
render_state.transform->apply(x, y);
|
|
150
|
+
result[i].vertices[0] = static_cast<float>(x);
|
|
151
|
+
result[i].vertices[1] = static_cast<float>(y);
|
|
142
152
|
result[i].vertices[2] = 0;
|
|
143
|
-
result[i].color =
|
|
144
|
-
apply_transform(*render_state.transform,
|
|
145
|
-
result[i].vertices[0], result[i].vertices[1]);
|
|
153
|
+
result[i].color = vertex.c.abgr();
|
|
146
154
|
}
|
|
147
155
|
RenderState va_render_state = render_state;
|
|
148
156
|
va_render_state.transform = 0;
|
|
@@ -156,17 +164,11 @@ namespace Gosu
|
|
|
156
164
|
result[3].tex_coords[0] = left;
|
|
157
165
|
result[3].tex_coords[1] = bottom;
|
|
158
166
|
|
|
159
|
-
if (vas.empty() ||
|
|
160
|
-
vas.
|
|
161
|
-
vas.back().render_state = va_render_state;
|
|
167
|
+
if (vas.empty() || vas.back().render_state != va_render_state) {
|
|
168
|
+
vas.emplace_back().render_state = va_render_state;
|
|
162
169
|
}
|
|
163
170
|
|
|
164
171
|
vas.back().vertices.insert(vas.back().vertices.end(), result, result + 4);
|
|
165
172
|
}
|
|
166
|
-
|
|
167
|
-
bool operator<(const DrawOp& other) const
|
|
168
|
-
{
|
|
169
|
-
return z < other.z;
|
|
170
|
-
}
|
|
171
173
|
};
|
|
172
174
|
}
|