gosu 1.0.0.pre1 → 1.1.0

data/src/RubyGosu.h

@@ -28,7 +28,7 @@ public:
 class SwigDirector_Window : public Gosu::Window, public Swig::Director {
 
 public:
-    SwigDirector_Window(VALUE self,unsigned int width,unsigned int height,bool fullscreen=false,double update_interval=16.666666,bool resizable=false);
+    SwigDirector_Window(VALUE self,int width,int height,unsigned int window_flags=Gosu::WF_WINDOWED,double update_interval=16.666666);
     virtual ~SwigDirector_Window();
     virtual void show();
     virtual bool tick();

data/src/TrueTypeFontWin.cpp

@@ -32,9 +32,9 @@ const unsigned char* Gosu::ttf_data_by_name(const string& font_name, unsigned fo
     LOGFONT logfont = {
         0, 0, 0, 0,
         (font_flags & Gosu::FF_BOLD) ? FW_BOLD : FW_NORMAL,
-        (font_flags & Gosu::FF_ITALIC) ? TRUE : FALSE,
-        (font_flags & Gosu::FF_UNDERLINE) ? TRUE : FALSE,
-        FALSE /* no strikethrough */,
+        static_cast<BYTE>((font_flags & Gosu::FF_ITALIC) ? TRUE : FALSE),
+        static_cast<BYTE>((font_flags & Gosu::FF_UNDERLINE) ? TRUE : FALSE),
+        0 /* no strikethrough */,
         ANSI_CHARSET, OUT_OUTLINE_PRECIS, CLIP_DEFAULT_PRECIS, ANTIALIASED_QUALITY,
         DEFAULT_PITCH
     };

data/src/Window.cpp

@@ -1,6 +1,10 @@
 #include <Gosu/Platform.hpp>
 #if !defined(GOSU_IS_IPHONE)
 
+#if defined(GOSU_IS_WIN)
+#include <windows.h>
+#endif
+
 #include <Gosu/Gosu.hpp>
 #include "GraphicsImpl.hpp"
 #include <SDL.h>
@@ -30,11 +34,7 @@ namespace Gosu
                 throw_sdl_error("Could not initialize SDL Video");
             }
 
-            Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN;
-
-        #if SDL_VERSION_ATLEAST(2, 0, 1)
-            flags |= SDL_WINDOW_ALLOW_HIGHDPI;
-        #endif
+            Uint32 flags = SDL_WINDOW_OPENGL | SDL_WINDOW_HIDDEN | SDL_WINDOW_ALLOW_HIGHDPI;
 
             window =
                 SDL_CreateWindow("", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, 64, 64, flags);
@@ -87,13 +87,11 @@ struct Gosu::Window::Impl
     unique_ptr<Input> input;
 };
 
-Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double update_interval,
-                     bool resizable)
+Gosu::Window::Window(int width, int height, unsigned window_flags, double update_interval)
 : pimpl(new Impl)
 {
-#if SDL_VERSION_ATLEAST(2, 0, 5)
-    SDL_SetWindowResizable(shared_window(), (SDL_bool)resizable);
-#endif
+    set_borderless(window_flags & WF_BORDERLESS);
+    set_resizable(window_flags & WF_RESIZABLE);
 
     // Even in fullscreen mode, temporarily show the window in windowed mode to centre it.
     // This ensures that the window will be centered correctly when exiting fullscreen mode.
@@ -103,12 +101,11 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double up
     SDL_SetWindowPosition(shared_window(), SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
 
     // Really enable fullscreen if desired.
-    resize(width, height, fullscreen);
+    resize(width, height, (window_flags & WF_FULLSCREEN));
 
     SDL_GL_SetSwapInterval(1);
 
     pimpl->update_interval = update_interval;
-    pimpl->resizable = resizable;
 
     input().on_button_down = [this](Button button) { button_down(button); };
     input().on_button_up   = [this](Button button) { button_up(button); };
@@ -121,12 +118,12 @@ Gosu::Window::~Window()
     SDL_HideWindow(shared_window());
 }
 
-unsigned Gosu::Window::width() const
+int Gosu::Window::width() const
 {
     return graphics().width();
 }
 
-unsigned Gosu::Window::height() const
+int Gosu::Window::height() const
 {
     return graphics().height();
 }
@@ -136,12 +133,7 @@ bool Gosu::Window::fullscreen() const
     return pimpl->fullscreen;
 }
 
-bool Gosu::Window::resizable() const
-{
-    return pimpl->resizable;
-}
-
-void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
+void Gosu::Window::resize(int width, int height, bool fullscreen)
 {
     pimpl->fullscreen = fullscreen;
 
@@ -175,8 +167,8 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
         }
     }
     else {
-        unsigned max_width  = Gosu::available_width(this);
-        unsigned max_height = Gosu::available_height(this);
+        int max_width  = Gosu::available_width(this);
+        int max_height = Gosu::available_height(this);
 
         if (resizable()) {
             // If the window is resizable, limit its size, without preserving the aspect ratio.
@@ -196,9 +188,7 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
         SDL_SetWindowSize(shared_window(), actual_width, actual_height);
     }
 
-#if SDL_VERSION_ATLEAST(2, 0, 1)
     SDL_GL_GetDrawableSize(shared_window(), &actual_width, &actual_height);
-#endif
 
     ensure_current_context();
 
@@ -217,6 +207,27 @@ void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
                                     black_bar_width, black_bar_height);
 }
 
+bool Gosu::Window::resizable() const
+{
+    return pimpl->resizable;
+}
+
+void Gosu::Window::set_resizable(bool resizable)
+{
+    pimpl->resizable = resizable;
+    SDL_SetWindowResizable(shared_window(), resizable ? SDL_TRUE : SDL_FALSE);
+}
+
+bool Gosu::Window::borderless() const
+{
+    return SDL_GetWindowFlags(shared_window()) & SDL_WINDOW_BORDERLESS;
+}
+
+void Gosu::Window::set_borderless(bool borderless)
+{
+    SDL_SetWindowBordered(shared_window(), borderless ? SDL_FALSE : SDL_TRUE);
+}
+
 double Gosu::Window::update_interval() const
 {
     return pimpl->update_interval;
@@ -242,16 +253,34 @@ void Gosu::Window::show()
 {
     unsigned long time_before_tick = milliseconds();
 
-    while (tick()) {
-        // Sleep to keep this loop from eating 100% CPU.
-        unsigned long tick_time = milliseconds() - time_before_tick;
-        if (tick_time < update_interval()) {
-            sleep(update_interval() - tick_time);
-        }
+#ifdef GOSU_IS_WIN
+    // Try to convince Windows to only run this thread on the first core, to avoid timing glitches.
+    // (If we ever run into a situation where the first core is not available, we should start to
+    // use GetProcessAffinityMask to retrieve the allowed cores as a bitmask.)
+    DWORD_PTR previous_affinity = SetThreadAffinityMask(GetCurrentThread(), 1);
+#endif
+
+    try {
+        while (tick()) {
+            // Sleep to keep this loop from eating 100% CPU.
+            unsigned long tick_time = milliseconds() - time_before_tick;
+            if (tick_time < update_interval()) {
+                sleep(update_interval() - tick_time);
+            }
 
-        time_before_tick = milliseconds();
+            time_before_tick = milliseconds();
+        }
+    } catch (...) {
+    #ifdef GOSU_IS_WIN
+        if (previous_affinity) SetThreadAffinityMask(GetCurrentThread(), previous_affinity);
+    #endif
+        throw;
     }
 
+#ifdef GOSU_IS_WIN
+    if (previous_affinity) SetThreadAffinityMask(GetCurrentThread(), previous_affinity);
+#endif
+
     pimpl->state = Impl::CLOSED;
 }
 

data/src/WindowUIKit.cpp

@@ -17,8 +17,7 @@ struct Gosu::Window::Impl
     string caption;
 };
 
-Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen, double update_interval,
-                     bool resizable)
+Gosu::Window::Window(int width, int height, unsigned window_flags, double update_interval)
 : pimpl(new Impl)
 {
     pimpl->window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
@@ -50,12 +49,12 @@ Gosu::Window::~Window()
 {
 }
 
-unsigned Gosu::Window::width() const
+int Gosu::Window::width() const
 {
     return graphics().width();
 }
 
-unsigned Gosu::Window::height() const
+int Gosu::Window::height() const
 {
     return graphics().height();
 }
@@ -70,7 +69,20 @@ bool Gosu::Window::resizable() const
     return false;
 }
 
-void Gosu::Window::resize(unsigned width, unsigned height, bool fullscreen)
+void Gosu::Window::set_resizable(bool resizable)
+{
+}
+
+bool Gosu::Window::borderless() const
+{
+    return true;
+}
+
+void Gosu::Window::set_borderless(bool borderless)
+{
+}
+
+void Gosu::Window::resize(int width, int height, bool fullscreen)
 {
     throw logic_error("Cannot resize windows on iOS");
 }
@@ -138,24 +150,24 @@ void* Gosu::Window::uikit_window() const
     return (__bridge void*) pimpl->window;
 }
 
-unsigned Gosu::screen_width(Window*)
+int Gosu::screen_width(Window*)
 {
     return available_width() * [UIScreen mainScreen].scale;
 }
 
-unsigned Gosu::screen_height(Window*)
+int Gosu::screen_height(Window*)
 {
     return available_height() * [UIScreen mainScreen].scale;
 }
 
-unsigned Gosu::available_width(Window*)
+int Gosu::available_width(Window*)
 {
     static CGSize screen_size = [UIScreen mainScreen].bounds.size;
     static CGFloat width = MAX(screen_size.width, screen_size.height);
     return width;
 }
 
-unsigned Gosu::available_height(Window*)
+int Gosu::available_height(Window*)
 {
     static CGSize screen_size = [UIScreen mainScreen].bounds.size;
     static CGFloat height = MIN(screen_size.width, screen_size.height);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre1
+  version: 1.1.0
 platform: ruby
 authors:
 - Julian Raschke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-28 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -186,37 +186,27 @@ files:
 - dependencies/utf8proc/utf8proc_data.h
 - ext/gosu/extconf.rb
 - include/Gosu/Audio.hpp
-- include/Gosu/AutoLink.hpp
 - include/Gosu/Bitmap.hpp
 - include/Gosu/Buttons.hpp
-- include/Gosu/Channel.h
-- include/Gosu/Color.h
 - include/Gosu/Color.hpp
 - include/Gosu/Directories.hpp
-- include/Gosu/Font.h
 - include/Gosu/Font.hpp
 - include/Gosu/Fwd.hpp
-- include/Gosu/Gosu.h
 - include/Gosu/Gosu.hpp
 - include/Gosu/Graphics.hpp
 - include/Gosu/GraphicsBase.hpp
 - include/Gosu/IO.hpp
-- include/Gosu/Image.h
 - include/Gosu/Image.hpp
 - include/Gosu/ImageData.hpp
 - include/Gosu/Input.hpp
 - include/Gosu/Inspection.hpp
 - include/Gosu/Math.hpp
 - include/Gosu/Platform.hpp
-- include/Gosu/Sample.h
-- include/Gosu/Song.h
 - include/Gosu/Text.hpp
-- include/Gosu/TextInput.h
 - include/Gosu/TextInput.hpp
 - include/Gosu/Timing.hpp
 - include/Gosu/Utility.hpp
 - include/Gosu/Version.hpp
-- include/Gosu/Window.h
 - include/Gosu/Window.hpp
 - lib/OpenAL32.dll
 - lib/SDL2.dll
@@ -226,13 +216,8 @@ files:
 - lib/gosu/preview.rb
 - lib/gosu/run.rb
 - lib/gosu/swig_patches.rb
-- lib/gosu/zen.rb
-- lib/libmpg123.dll
-- lib/libsndfile.dll
 - lib64/OpenAL32.dll
 - lib64/SDL2.dll
-- lib64/libmpg123.dll
-- lib64/libsndfile.dll
 - rdoc/gosu.rb
 - src/Audio.cpp
 - src/AudioFile.hpp
@@ -245,11 +230,8 @@ files:
 - src/BlockAllocator.cpp
 - src/BlockAllocator.hpp
 - src/Channel.cpp
-- src/ChannelWrapper.cpp
 - src/ClipRectStack.hpp
 - src/Color.cpp
-- src/ColorWrapper.cpp
-- src/Constants.cpp
 - src/DirectoriesApple.cpp
 - src/DirectoriesUnix.cpp
 - src/DirectoriesWin.cpp
@@ -259,25 +241,21 @@ files:
 - src/FileUnix.cpp
 - src/FileWin.cpp
 - src/Font.cpp
-- src/FontWrapper.cpp
 - src/GosuGLView.cpp
 - src/GosuGLView.hpp
 - src/GosuViewController.cpp
 - src/GosuViewController.hpp
-- src/GosuWrapper.cpp
 - src/Graphics.cpp
 - src/GraphicsImpl.hpp
 - src/IO.cpp
 - src/Iconv.hpp
 - src/Image.cpp
-- src/ImageWrapper.cpp
 - src/Input.cpp
 - src/InputUIKit.cpp
 - src/Inspection.cpp
 - src/LargeImageData.cpp
 - src/LargeImageData.hpp
 - src/Log.hpp
-- src/MPEGFile.hpp
 - src/Macro.cpp
 - src/Macro.hpp
 - src/MarkupParser.cpp
@@ -289,15 +267,12 @@ files:
 - src/Resolution.cpp
 - src/RubyGosu.cxx
 - src/RubyGosu.h
-- src/SampleWrapper.cpp
-- src/SongWrapper.cpp
 - src/TexChunk.cpp
 - src/TexChunk.hpp
 - src/Text.cpp
 - src/TextBuilder.cpp
 - src/TextBuilder.hpp
 - src/TextInput.cpp
-- src/TextInputWrapper.cpp
 - src/Texture.cpp
 - src/Texture.hpp
 - src/TimingApple.cpp
@@ -318,7 +293,6 @@ files:
 - src/WinUtility.hpp
 - src/Window.cpp
 - src/WindowUIKit.cpp
-- src/WindowWrapper.cpp
 homepage: https://www.libgosu.org/
 licenses:
 - MIT
@@ -335,12 +309,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.3
 signing_key:

data/include/Gosu/AutoLink.hpp

@@ -1,14 +0,0 @@
-//! \file AutoLink.hpp
-//! Contains pragmas that make MSVC link against all the necessary libraries
-//! automatically.
-
-#ifdef _MSC_VER
-#pragma once
-
-#ifdef NDEBUG
-#pragma comment(lib, "Gosu.lib")
-#else
-#pragma comment(lib, "GosuDebug.lib")
-#endif
-
-#endif

data/include/Gosu/Channel.h

@@ -1,25 +0,0 @@
-#pragma once
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct Gosu_Channel Gosu_Channel;
-
-Gosu_Channel* Gosu_Channel_create(Gosu_Channel* channel);
-void Gosu_Channel_destroy(Gosu_Channel* channel);
-
-void Gosu_Channel_play(Gosu_Channel *channel);
-bool Gosu_Channel_playing(Gosu_Channel *channel);
-void Gosu_Channel_pause(Gosu_Channel *channel);
-bool Gosu_Channel_paused(Gosu_Channel *channel);
-void Gosu_Channel_resume(Gosu_Channel *channel);
-void Gosu_Channel_stop(Gosu_Channel *channel);
-
-void Gosu_Channel_set_volume(Gosu_Channel *channel, double volume);
-void Gosu_Channel_set_speed(Gosu_Channel *channel, double speed);
-void Gosu_Channel_set_pan(Gosu_Channel *channel, double pan);
-
-#ifdef __cplusplus
-}
-#endif