gosu 1.3.0 → 1.4.0

data/src/WindowUIKit.cpp

@@ -4,51 +4,48 @@
 #include "GosuViewController.hpp"
 #include <Gosu/Gosu.hpp>
 
-using namespace std;
-
-struct Gosu::Window::Impl
+struct Gosu::Window::Impl : Gosu::Noncopyable
 {
     UIWindow* window;
     GosuViewController* controller;
-    unique_ptr<Graphics> graphics;
-    unique_ptr<Input> input;
-    
+    std::unique_ptr<Graphics> graphics;
+    std::unique_ptr<Input> input;
+
     double update_interval;
-    string caption;
+    std::string caption;
 };
 
 Gosu::Window::Window(int width, int height, unsigned window_flags, double update_interval)
-: pimpl(new Impl)
+: m_impl{new Impl}
 {
-    pimpl->window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
-    pimpl->controller = [GosuViewController new];
-    pimpl->controller.gosuWindow = this;
-    pimpl->window.rootViewController = pimpl->controller;
-    
+    m_impl->window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+    m_impl->controller = [GosuViewController new];
+    m_impl->controller.gosuWindow = this;
+    m_impl->window.rootViewController = m_impl->controller;
+
     // It is important to (implicitly) load the view before creating the Graphics instance.
-    [pimpl->controller view];
-    
-    pimpl->graphics.reset(new Graphics(screen_width(), screen_height()));
-    pimpl->graphics->set_resolution(width, height);
-    
-    pimpl->input.reset(new Input((__bridge void*) pimpl->controller.view, update_interval));
-    pimpl->input->set_mouse_factors(1.0 * width / available_width(), 1.0 * height / available_height());
-    
-    pimpl->input->on_touch_began = [this](Gosu::Touch touch) { touch_began(touch); };
-    pimpl->input->on_touch_moved = [this](Gosu::Touch touch) { touch_moved(touch); };
-    pimpl->input->on_touch_ended = [this](Gosu::Touch touch) { touch_ended(touch); };
-    pimpl->input->on_touch_cancelled = [this](Gosu::Touch touch) { touch_cancelled(touch); };
-    
+    [m_impl->controller view];
+
+    m_impl->graphics.reset(new Graphics(screen_width(), screen_height()));
+    m_impl->graphics->set_resolution(width, height);
+
+    m_impl->input.reset(new Input((__bridge void*) m_impl->controller.view, update_interval));
+    m_impl->input->set_mouse_factors(1.0 * width / available_width(),
+                                     1.0 * height / available_height());
+
+    m_impl->input->on_touch_began = [this](Gosu::Touch touch) { touch_began(touch); };
+    m_impl->input->on_touch_moved = [this](Gosu::Touch touch) { touch_moved(touch); };
+    m_impl->input->on_touch_ended = [this](Gosu::Touch touch) { touch_ended(touch); };
+    m_impl->input->on_touch_cancelled = [this](Gosu::Touch touch) { touch_cancelled(touch); };
+
     // Now let the controller know about our Input instance.
-    [pimpl->controller trackTextInput:*pimpl->input];
-    
-    pimpl->update_interval = update_interval;
-}
+    [m_impl->controller trackTextInput:*m_impl->input];
 
-Gosu::Window::~Window()
-{
+    m_impl->update_interval = update_interval;
 }
 
+Gosu::Window::~Window() = default;
+
 int Gosu::Window::width() const
 {
     return graphics().width();
@@ -69,7 +66,7 @@ bool Gosu::Window::resizable() const
     return false;
 }
 
-void Gosu::Window::set_resizable(bool resizable)
+void Gosu::Window::set_resizable(bool)
 {
 }
 
@@ -78,53 +75,53 @@ bool Gosu::Window::borderless() const
     return true;
 }
 
-void Gosu::Window::set_borderless(bool borderless)
+void Gosu::Window::set_borderless(bool)
 {
 }
 
-void Gosu::Window::resize(int width, int height, bool fullscreen)
+void Gosu::Window::resize(int, int, bool)
 {
-    throw logic_error("Cannot resize windows on iOS");
+    throw std::logic_error{"Cannot resize windows on iOS"};
 }
 
 double Gosu::Window::update_interval() const
 {
-    return pimpl->update_interval;
+    return m_impl->update_interval;
 }
 
-void Gosu::Window::set_update_interval(double update_interval)
+void Gosu::Window::set_update_interval(double)
 {
-    throw logic_error("Cannot change the update interval on iOS");
+    throw std::logic_error{"Cannot change the update interval on iOS"};
 }
 
-string Gosu::Window::caption() const
+std::string Gosu::Window::caption() const
 {
-    return pimpl->caption;
+    return m_impl->caption;
 }
 
-void Gosu::Window::set_caption(const string& caption)
+void Gosu::Window::set_caption(const std::string& caption)
 {
-    pimpl->caption = caption;
+    m_impl->caption = caption;
 }
 
 const Gosu::Graphics& Gosu::Window::graphics() const
 {
-    return *pimpl->graphics;
+    return *m_impl->graphics;
 }
 
 Gosu::Graphics& Gosu::Window::graphics()
 {
-    return *pimpl->graphics;
+    return *m_impl->graphics;
 }
 
 const Gosu::Input& Gosu::Window::input() const
 {
-    return *pimpl->input;
+    return *m_impl->input;
 }
 
 Gosu::Input& Gosu::Window::input()
 {
-    return *pimpl->input;
+    return *m_impl->input;
 }
 
 void Gosu::Window::show()
@@ -138,7 +135,7 @@ bool Gosu::Window::tick()
 
 void Gosu::Window::close()
 {
-    throw logic_error("Cannot close windows manually on iOS");
+    throw std::logic_error{"Cannot close windows manually on iOS"};
 }
 
 void Gosu::Window::button_down(Button button)
@@ -147,7 +144,7 @@ void Gosu::Window::button_down(Button button)
 
 void* Gosu::Window::uikit_window() const
 {
-    return (__bridge void*) pimpl->window;
+    return (__bridge void*) m_impl->window;
 }
 
 int Gosu::screen_width(Window*)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Julian Raschke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-02 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -40,7 +40,6 @@ files:
 - dependencies/SDL/include/SDL_config_iphoneos.h
 - dependencies/SDL/include/SDL_config_macosx.h
 - dependencies/SDL/include/SDL_config_minimal.h
-- dependencies/SDL/include/SDL_config_os2.h
 - dependencies/SDL/include/SDL_config_pandora.h
 - dependencies/SDL/include/SDL_config_psp.h
 - dependencies/SDL/include/SDL_config_windows.h
@@ -56,6 +55,7 @@ files:
 - dependencies/SDL/include/SDL_gamecontroller.h
 - dependencies/SDL/include/SDL_gesture.h
 - dependencies/SDL/include/SDL_haptic.h
+- dependencies/SDL/include/SDL_hidapi.h
 - dependencies/SDL/include/SDL_hints.h
 - dependencies/SDL/include/SDL_joystick.h
 - dependencies/SDL/include/SDL_keyboard.h
@@ -136,23 +136,20 @@ files:
 - dependencies/SDL_sound/libmodplug/fastmix.c
 - dependencies/SDL_sound/libmodplug/libmodplug.h
 - dependencies/SDL_sound/libmodplug/load_669.c
-- dependencies/SDL_sound/libmodplug/load_abc.c
 - dependencies/SDL_sound/libmodplug/load_amf.c
 - dependencies/SDL_sound/libmodplug/load_ams.c
 - dependencies/SDL_sound/libmodplug/load_dbm.c
 - dependencies/SDL_sound/libmodplug/load_dmf.c
 - dependencies/SDL_sound/libmodplug/load_dsm.c
 - dependencies/SDL_sound/libmodplug/load_far.c
+- dependencies/SDL_sound/libmodplug/load_gdm.c
 - dependencies/SDL_sound/libmodplug/load_it.c
 - dependencies/SDL_sound/libmodplug/load_mdl.c
 - dependencies/SDL_sound/libmodplug/load_med.c
-- dependencies/SDL_sound/libmodplug/load_mid.c
 - dependencies/SDL_sound/libmodplug/load_mod.c
 - dependencies/SDL_sound/libmodplug/load_mt2.c
 - dependencies/SDL_sound/libmodplug/load_mtm.c
 - dependencies/SDL_sound/libmodplug/load_okt.c
-- dependencies/SDL_sound/libmodplug/load_pat.c
-- dependencies/SDL_sound/libmodplug/load_pat.h
 - dependencies/SDL_sound/libmodplug/load_psm.c
 - dependencies/SDL_sound/libmodplug/load_ptm.c
 - dependencies/SDL_sound/libmodplug/load_s3m.c
@@ -170,14 +167,9 @@ files:
 - dependencies/SDL_sound/libmodplug/sndmix.c
 - dependencies/SDL_sound/libmodplug/tables.h
 - dependencies/SDL_sound/stb_vorbis.h
-- dependencies/al_soft/AL/al.h
-- dependencies/al_soft/AL/alc.h
-- dependencies/al_soft/AL/alext.h
-- dependencies/al_soft/AL/efx-creative.h
-- dependencies/al_soft/AL/efx-presets.h
-- dependencies/al_soft/AL/efx.h
-- dependencies/al_soft/x64/libOpenAL32.dll.a
-- dependencies/al_soft/x86/libOpenAL32.dll.a
+- dependencies/mojoAL/AL/al.h
+- dependencies/mojoAL/AL/alc.h
+- dependencies/mojoAL/mojoal.c
 - dependencies/stb/stb_image.h
 - dependencies/stb/stb_image_write.h
 - dependencies/stb/stb_truetype.h
@@ -208,7 +200,6 @@ files:
 - include/Gosu/Utility.hpp
 - include/Gosu/Version.hpp
 - include/Gosu/Window.hpp
-- lib/OpenAL32.dll
 - lib/SDL2.dll
 - lib/gosu.rb
 - lib/gosu/compat.rb
@@ -216,7 +207,6 @@ files:
 - lib/gosu/preview.rb
 - lib/gosu/run.rb
 - lib/gosu/swig_patches.rb
-- lib64/OpenAL32.dll
 - lib64/SDL2.dll
 - rdoc/gosu.rb
 - src/Audio.cpp

data/dependencies/SDL/include/SDL_config_os2.h

@@ -1,188 +0,0 @@
-/*
-  Simple DirectMedia Layer
-  Copyright (C) 1997-2020 Sam Lantinga <slouken@libsdl.org>
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-*/
-
-#ifndef SDL_config_os2_h_
-#define SDL_config_os2_h_
-#define SDL_config_h_
-
-#include "SDL_platform.h"
-
-#define SDL_AUDIO_DRIVER_DUMMY 1
-#define SDL_AUDIO_DRIVER_DISK 1
-#define SDL_AUDIO_DRIVER_OS2 1
-
-#define SDL_POWER_DISABLED  1
-#define SDL_JOYSTICK_DISABLED 1
-#define SDL_HAPTIC_DISABLED 1
-/*#undef SDL_JOYSTICK_HIDAPI */
-/*#undef SDL_JOYSTICK_VIRTUAL */
-
-#define SDL_SENSOR_DUMMY 1
-#define SDL_VIDEO_DRIVER_DUMMY 1
-#define SDL_VIDEO_DRIVER_OS2 1
-
-/* Enable OpenGL support */
-/* #undef SDL_VIDEO_OPENGL */
-
-/* Enable Vulkan support */
-/* #undef SDL_VIDEO_VULKAN */
-
-#define SDL_THREAD_OS2 1
-#define SDL_LOADSO_OS2 1
-#define SDL_TIMER_OS2 1
-#define SDL_FILESYSTEM_OS2 1
-
-/* Enable assembly routines */
-#define SDL_ASSEMBLY_ROUTINES 1
-
-/* use libsamplerate for audio rate conversion. */
-/*#define HAVE_LIBSAMPLERATE_H 1 */
-
-/* Enable dynamic libsamplerate support */
-#define SDL_LIBSAMPLERATE_DYNAMIC "SAMPRATE.DLL"
-
-#define HAVE_LIBC 1
-
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_STDIO_H 1
-#define STDC_HEADERS 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STDARG_H 1
-#define HAVE_STDDEF_H 1
-#define HAVE_MALLOC_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_STRING_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_WCHAR_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_STDINT_H 1
-#define HAVE_LIMITS_H 1
-#define HAVE_CTYPE_H 1
-#define HAVE_MATH_H 1
-#define HAVE_FLOAT_H 1
-#define HAVE_SIGNAL_H 1
-
-#define HAVE_MALLOC 1
-#define HAVE_CALLOC 1
-#define HAVE_REALLOC 1
-#define HAVE_FREE 1
-#if defined(__WATCOMC__)
-#define HAVE__FSEEKI64 1
-#define HAVE__FTELLI64 1
-#endif
-#define HAVE_ALLOCA 1
-#define HAVE_GETENV 1
-#define HAVE_SETENV 1
-#define HAVE_PUTENV 1
-#define HAVE_QSORT 1
-#define HAVE_ABS 1
-#define HAVE_BCOPY 1
-#define HAVE_MEMSET 1
-#define HAVE_MEMCPY 1
-#define HAVE_MEMMOVE 1
-#define HAVE_MEMCMP 1
-#define HAVE_WCSLEN 1
-#define HAVE_WCSLCPY 1
-#define HAVE_WCSLCAT 1
-#define HAVE_WCSCMP 1
-#define HAVE__WCSICMP 1
-#define HAVE__WCSNICMP 1
-#define HAVE_STRLEN 1
-#define HAVE_STRLCPY 1
-#define HAVE_STRLCAT 1
-#define HAVE__STRREV 1
-#define HAVE__STRUPR 1
-#define HAVE__STRLWR 1
-#define HAVE_INDEX 1
-#define HAVE_RINDEX 1
-#define HAVE_STRCHR 1
-#define HAVE_STRRCHR 1
-#define HAVE_STRSTR 1
-/* #undef HAVE_STRTOK_R */
-#define HAVE_ITOA 1
-#define HAVE__LTOA 1
-#define HAVE__ULTOA 1
-#define HAVE_STRTOL 1
-#define HAVE_STRTOUL 1
-#define HAVE__I64TOA 1
-#define HAVE__UI64TOA 1
-#define HAVE_STRTOLL 1
-#define HAVE_STRTOULL 1
-#define HAVE_STRTOD 1
-#define HAVE_ATOI 1
-#define HAVE_ATOF 1
-#define HAVE_WCSLEN 1
-#define HAVE_WCSLCPY 1
-#define HAVE_WCSLCAT 1
-/* #define HAVE_WCSDUP 1 */
-/* #define wcsdup _wcsdup */
-#define HAVE_WCSSTR 1
-#define HAVE_WCSCMP 1
-#define HAVE_WCSNCMP 1
-#define HAVE_STRCMP 1
-#define HAVE_STRNCMP 1
-#define HAVE_STRICMP 1
-#define HAVE_STRCASECMP 1
-#define HAVE_STRNCASECMP 1
-#define HAVE_SSCANF  1
-#define HAVE_VSSCANF 1
-#define HAVE_SNPRINTF 1
-#define HAVE_VSNPRINTF 1
-#define HAVE_SETJMP 1
-#define HAVE_ACOS 1
-/* #undef HAVE_ACOSF */
-#define HAVE_ASIN 1
-/* #undef HAVE_ASINF */
-#define HAVE_ATAN 1
-#define HAVE_ATAN2 1
-/* #undef HAVE_ATAN2F */
-#define HAVE_CEIL 1
-/* #undef HAVE_CEILF */
-/* #undef HAVE_COPYSIGN */
-/* #undef HAVE_COPYSIGNF */
-#define HAVE_COS 1
-/* #undef HAVE_COSF */
-#define HAVE_EXP 1
-/* #undef HAVE_EXPF */
-#define HAVE_FABS 1
-/* #undef HAVE_FABSF */
-#define HAVE_FLOOR 1
-/* #undef HAVE_FLOORF */
-#define HAVE_FMOD 1
-/* #undef HAVE_FMODF */
-#define HAVE_LOG 1
-/* #undef HAVE_LOGF */
-#define HAVE_LOG10 1
-/* #undef HAVE_LOG10F */
-#define HAVE_POW 1
-/* #undef HAVE_POWF */
-#define HAVE_SIN 1
-/* #undef HAVE_SINF */
-/* #undef HAVE_SCALBN */
-/* #undef HAVE_SCALBNF */
-#define HAVE_SQRT 1
-/* #undef HAVE_SQRTF */
-#define HAVE_TAN 1
-/* #undef HAVE_TANF */
-/* #undef HAVE_TRUNC */
-/* #undef HAVE_TRUNCF */
-
-#endif /* SDL_config_os2_h_ */