gosu 0.14.0 → 0.14.3.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74fc901e66738f4992205611236f6a7e71e5e3db59f91cda307c54a7b4f1c1d5
-  data.tar.gz: '08b48f76d3a3d55f5d192551abd7c8c41c6b1a5c8fce354261195a179f7f45c9'
+  metadata.gz: 72db8840a17208ca69cb3fe332ab3acb532bba3951b38d117bfb9077f7e541c2
+  data.tar.gz: 3a9766f8ca34f70d833756024c1e9716db63b5efbec441f47a55bfe83ae127bb
 SHA512:
-  metadata.gz: eb408ee328e685dea6324d6bc8a954b180fd7b1bcb286df3897e7f3b734ba7225c7d05895d21cbfaa9cb168cd59e806a3a16599d9c770603727d9f9a20cb1a7d
-  data.tar.gz: d033a75590ece4317582ad74f6b2183e0ebe715df51d8993c5d2b3754499ca209bebe6bb31d5e3ec38d5a44fd8516e5bd09de50256cf11782243f353fef21871
+  metadata.gz: d498e4bcb3497f40a240ebd3fe1541b5ba9a000353645d80c3157b44cfa4871d257710f2815f46aabb3d01cd68bd5a7fe37d6da5b62d32ea59439dc85c11a748
+  data.tar.gz: 3c572470779e3814b3885c16cbeaf05de2754c53dbda66103a08431b7e1f11c25fc925dbdd95e48ed35170f3751928e0995da14e53e0e25eb822a440560a7c14

data/Gosu/Graphics.hpp

@@ -60,7 +60,10 @@ namespace Gosu
                             const std::function<void ()>& f);
         
         //! Renders everything drawn in f onto a new Image of size (width, height).
-        static Gosu::Image render(int width, int height, const std::function<void ()>& f);
+        //! \param image_flags Pass Gosu::IF_RETRO if you do not want the resulting image to use
+        //! interpolation when it is scaled or rotated.
+        static Gosu::Image render(int width, int height, const std::function<void ()>& f,
+                                  unsigned image_flags = 0);
         
         //! Records a macro and returns it as an Image.
         static Gosu::Image record(int width, int height, const std::function<void ()>& f);

data/Gosu/Version.hpp

@@ -4,7 +4,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 14
-#define GOSU_POINT_VERSION 0
+#define GOSU_POINT_VERSION 3
 
 namespace Gosu
 {

data/Gosu/Window.hpp

@@ -94,7 +94,7 @@ namespace Gosu
 
         //! Called before update when the user presses a button while the window has the focus.
         //! By default, this will toggle fullscreen mode if the user presses Alt+Enter (Windows,
-        //! Linux) or cmd+F (macOS).
+        //! Linux), cmd+F (macOS), or F11 (on all operating systems).
         //! To support these shortcuts in your application, make sure to call Window::button_down
         //! in your implementation.
         virtual void button_down(Gosu::Button);

data/rdoc/gosu.rb

@@ -852,8 +852,8 @@ module Gosu
     ##
     # This method is called before {#update} if a button is pressed while the window has focus.
     #
-    # By default, this method  will toggle fullscreen mode if the user presses Alt+Enter (Windows,
-    # Linux) or cmd+F (macOS).
+    # By default, this will toggle fullscreen mode if the user presses Alt+Enter (Windows,
+    # Linux), cmd+F (macOS), or F11 (on all operating systems).
     # To support these shortcuts in your application, make sure to call super in your
     # implementation.
     #
@@ -1080,6 +1080,8 @@ module Gosu
     # @return [Gosu::Image] the rendered drawing operations.
     # @param width [Integer] the width of the recorded image.
     # @param height [Integer] the height of the recorded image.
+    # @param [Hash] options
+    # @option options [true, false] :retro (false) if true, the resulting image will not be interpolated when it is scaled up or down.
     # @yield rendering code.
     #
     # @see Window#record

data/src/Audio.cpp

@@ -12,11 +12,9 @@
 #ifdef GOSU_IS_MAC
 #import <Foundation/Foundation.h>
 #include "AudioToolboxFile.hpp"
-#define WAVE_FILE AudioToolboxFile
 #else
 #include "MPEGFile.hpp"
 #include "SndFile.hpp"
-#define WAVE_FILE SndFile
 #endif
 
 #ifdef GOSU_IS_IPHONE
@@ -47,7 +45,7 @@ struct Gosu::Sample::SampleData
 {
     ALuint buffer;
 
-    SampleData(AudioFile& audio_file)
+    SampleData(AudioFile&& audio_file)
     {
         al_initialize();
         alGenBuffers(1, &buffer);
@@ -74,37 +72,41 @@ Gosu::Sample::Sample(const string& filename)
 {
     if (is_ogg_file(filename)) {
         File file(filename);
-        OggFile ogg_file(file.front_reader());
-        data.reset(new SampleData(ogg_file));
+        data.reset(new SampleData(OggFile(file.front_reader())));
+        return;
     }
-    else {
-        WAVE_FILE audio_file(filename);
-        data.reset(new SampleData(audio_file));
+    
+#ifdef GOSU_IS_MAC
+    File file(filename);
+    data.reset(new SampleData(AudioToolboxFile(file.front_reader())));
+#else
+    try {
+        data.reset(new SampleData(SndFile(filename)));
     }
+    catch (const runtime_error& ex) {
+        File file(filename);
+        data.reset(new SampleData(MPEGFile(file.front_reader())));
+    }
+#endif
 }
 
 Gosu::Sample::Sample(Gosu::Reader reader)
 {
     if (is_ogg_file(reader)) {
-        OggFile ogg_file(reader);
-        data.reset(new SampleData(ogg_file));
+        data.reset(new SampleData(OggFile(reader)));
         return;
     }
 
+#ifdef GOSU_IS_MAC
+    data.reset(new SampleData(AudioToolboxFile(reader)));
+#else
     try {
-        WAVE_FILE audio_file(reader);
-        data.reset(new SampleData(audio_file));
+        data.reset(new SampleData(SndFile(reader)));
     }
     catch (const runtime_error& ex) {
-    #ifndef GOSU_IS_MAC
-        if (string(ex.what()).find("unknown format") != string::npos) {
-            MPEGFile mpeg_file(reader);
-            data.reset(new SampleData(mpeg_file));
-            return;
-        }
-    #endif
-        throw ex;
+        data.reset(new SampleData(MPEGFile(reader)));
     }
+#endif
 }
 
 Gosu::Channel Gosu::Sample::play(double volume, double speed, bool looping) const
@@ -252,19 +254,17 @@ public:
             file.reset(new OggFile(source_file.front_reader()));
         }
         else {
+        #ifdef GOSU_IS_MAC
+            file.reset(new AudioToolboxFile(filename));
+        #else
             try {
-                file.reset(new WAVE_FILE(filename));
+                file.reset(new SndFile(filename));
             }
             catch (const runtime_error& ex) {
-            #ifndef GOSU_IS_MAC
-                if (string(ex.what()).find("unknown format") != string::npos) {
-                    File source_file(filename);
-                    file.reset(new MPEGFile(source_file.front_reader()));
-                }
-                else
-            #endif
-                throw ex;
+                File source_file(filename);
+                file.reset(new MPEGFile(source_file.front_reader()));
             }
+        #endif
         }
         
         al_initialize();
@@ -277,18 +277,16 @@ public:
             file.reset(new OggFile(reader));
         }
         else {
+        #ifdef GOSU_IS_MAC
+            file.reset(new AudioToolboxFile(reader));
+        #else
             try {
-                file.reset(new WAVE_FILE(reader));
+                file.reset(new SndFile(reader));
             }
             catch (const runtime_error& ex) {
-            #ifndef GOSU_IS_MAC
-                if (string(ex.what()).find("unknown format") != string::npos) {
-                    file.reset(new MPEGFile(reader));
-                }
-                else
-            #endif
-                throw ex;
+                file.reset(new MPEGFile(reader));
             }
+        #endif
         }
         
         al_initialize();
@@ -401,8 +399,8 @@ Gosu::Song::Song(const string& filename)
             has_extension(filename, ".aac") ||
             has_extension(filename, ".m4a")) {
         data.reset(new ModuleData(filename));
+        return;
     }
-    else
 #endif
     data.reset(new StreamData(filename));
 }

data/src/Bitmap.cpp

@@ -1,24 +1,24 @@
-#include <Gosu/Bitmap.hpp>
-#include <cassert>
-#include <algorithm>
+#include <Gosu/Bitmap.hpp>
+#include <cassert>
+#include <algorithm>
 #include <vector>
-using namespace std;
-
-void Gosu::Bitmap::swap(Bitmap& other)
-{
-    std::swap(pixels, other.pixels);
-    std::swap(w, other.w);
-    std::swap(h, other.h);
-}
-
-void Gosu::Bitmap::resize(unsigned width, unsigned height, Color c)
-{
-    if (width == w && height == h) return;
-
-    Bitmap temp(width, height, c);
-    temp.insert(*this, 0, 0);
-    swap(temp);
-}
+using namespace std;
+
+void Gosu::Bitmap::swap(Bitmap& other)
+{
+    std::swap(pixels, other.pixels);
+    std::swap(w, other.w);
+    std::swap(h, other.h);
+}
+
+void Gosu::Bitmap::resize(unsigned width, unsigned height, Color c)
+{
+    if (width == w && height == h) return;
+
+    Bitmap temp(width, height, c);
+    temp.insert(*this, 0, 0);
+    swap(temp);
+}
 
 void Gosu::Bitmap::blend_pixel(unsigned x, unsigned y, Color c)
 {
@@ -39,146 +39,160 @@ void Gosu::Bitmap::blend_pixel(unsigned x, unsigned y, Color c)
     
     set_pixel(x, y, out);
 }
-
-void Gosu::Bitmap::insert(const Bitmap& source, int x, int y)
-{
-    insert(source, x, y, 0, 0, source.width(), source.height());
-}
-
-void Gosu::Bitmap::insert(const Bitmap& source, int x, int y, unsigned src_x, unsigned src_y,
-                          unsigned src_width, unsigned src_height)
-{
-    // TODO: This should use memcpy if possible (x == 0 && src_width == this->width())
-
-    if (x < 0) {
-        unsigned clip_left = -x;
-
-        if (clip_left >= src_width) return;
-
-        src_x += clip_left;
-        src_width -= clip_left;
-        x = 0;
-    }
-
-    if (y < 0) {
-        unsigned clip_top = -y;
-
-        if (clip_top >= src_height) return;
-
-        src_y += clip_top;
-        src_height -= clip_top;
-        y = 0;
-    }
-
-    if (x + src_width > w) {
-        if (static_cast<unsigned>(x) >= w) return;
-
-        src_width = w - x;
-    }
-
-    if (y + src_height > h) {
-        if (static_cast<unsigned>(y) >= h) return;
-
-        src_height = h - y;
-    }
-
-    for (unsigned rel_y = 0; rel_y < src_height; ++rel_y) {
-        for (unsigned rel_x = 0; rel_x < src_width; ++rel_x) {
+
+void Gosu::Bitmap::insert(const Bitmap& source, int x, int y)
+{
+    insert(source, x, y, 0, 0, source.width(), source.height());
+}
+
+void Gosu::Bitmap::insert(const Bitmap& source, int x, int y, unsigned src_x, unsigned src_y,
+                          unsigned src_width, unsigned src_height)
+{
+    // TODO: This should use memcpy if possible (x == 0 && src_width == this->width())
+
+    if (x < 0) {
+        unsigned clip_left = -x;
+
+        if (clip_left >= src_width) return;
+
+        src_x += clip_left;
+        src_width -= clip_left;
+        x = 0;
+    }
+
+    if (y < 0) {
+        unsigned clip_top = -y;
+
+        if (clip_top >= src_height) return;
+
+        src_y += clip_top;
+        src_height -= clip_top;
+        y = 0;
+    }
+
+    if (x + src_width > w) {
+        if (static_cast<unsigned>(x) >= w) return;
+
+        src_width = w - x;
+    }
+
+    if (y + src_height > h) {
+        if (static_cast<unsigned>(y) >= h) return;
+
+        src_height = h - y;
+    }
+
+    for (unsigned rel_y = 0; rel_y < src_height; ++rel_y) {
+        for (unsigned rel_x = 0; rel_x < src_width; ++rel_x) {
             set_pixel(x + rel_x, y + rel_y, source.get_pixel(src_x + rel_x, src_y + rel_y));
         }
-    }
-}
-
-void Gosu::apply_color_key(Bitmap& bitmap, Color key)
-{
-    vector<Color> surrounding_colors;
-    surrounding_colors.reserve(4);
-
-    for (unsigned y = 0; y < bitmap.height(); ++y)
-        for (unsigned x = 0; x < bitmap.width(); ++x)
-            if (bitmap.get_pixel(x, y) == key) {
-                surrounding_colors.clear();
-                if (x > 0 && bitmap.get_pixel(x - 1, y) != key)
-                    surrounding_colors.push_back(bitmap.get_pixel(x - 1, y));
-                if (x < bitmap.width() - 1 && bitmap.get_pixel(x + 1, y) != key)
-                    surrounding_colors.push_back(bitmap.get_pixel(x + 1, y));
-                if (y > 0 && bitmap.get_pixel(x, y - 1) != key)
-                    surrounding_colors.push_back(bitmap.get_pixel(x, y - 1));
-                if (y < bitmap.height() - 1 && bitmap.get_pixel(x, y + 1) != key)
-                    surrounding_colors.push_back(bitmap.get_pixel(x, y + 1));
-
-                if (surrounding_colors.empty()) {
-                    bitmap.set_pixel(x, y, Color::NONE);
-                    continue;
-                }
-
-                unsigned red = 0, green = 0, blue = 0;
-                for (auto& color : surrounding_colors) {
-                    red   += color.red();
-                    green += color.green();
-                    blue  += color.blue();
-                }
+    }
+}
+
+void Gosu::apply_color_key(Bitmap& bitmap, Color key)
+{
+    vector<Color> surrounding_colors;
+    surrounding_colors.reserve(4);
+
+    for (unsigned y = 0; y < bitmap.height(); ++y) {
+        for (unsigned x = 0; x < bitmap.width(); ++x) {
+            if (bitmap.get_pixel(x, y) == key) {
+                surrounding_colors.clear();
+                if (x > 0 && bitmap.get_pixel(x - 1, y) != key) {
+                    surrounding_colors.push_back(bitmap.get_pixel(x - 1, y));
+                }
+                if (x < bitmap.width() - 1 && bitmap.get_pixel(x + 1, y) != key) {
+                    surrounding_colors.push_back(bitmap.get_pixel(x + 1, y));
+                }
+                if (y > 0 && bitmap.get_pixel(x, y - 1) != key) {
+                    surrounding_colors.push_back(bitmap.get_pixel(x, y - 1));
+                }
+                if (y < bitmap.height() - 1 && bitmap.get_pixel(x, y + 1) != key) {
+                    surrounding_colors.push_back(bitmap.get_pixel(x, y + 1));
+                }
+
+                if (surrounding_colors.empty()) {
+                    bitmap.set_pixel(x, y, Color::NONE);
+                    continue;
+                }
+
+                unsigned red = 0, green = 0, blue = 0;
+                for (auto& color : surrounding_colors) {
+                    red   += color.red();
+                    green += color.green();
+                    blue  += color.blue();
+                }
                 bitmap.set_pixel(x, y, Color(0,
-                                             red   / surrounding_colors.size(),
+                                             red   / surrounding_colors.size(),
                                              green / surrounding_colors.size(),
-                                             blue  / surrounding_colors.size()));
-            }
-}
-
-void Gosu::unapply_color_key(Bitmap& bitmap, Color color)
-{
-    Color* p = bitmap.data();
-    for (int i = bitmap.width() * bitmap.height(); i > 0; --i, ++p) {
-        if (p->alpha() == 0) {
+                                             blue  / surrounding_colors.size()));
+            }
+        }
+    }
+}
+
+void Gosu::unapply_color_key(Bitmap& bitmap, Color color)
+{
+    Color* p = bitmap.data();
+    for (int i = bitmap.width() * bitmap.height(); i > 0; --i, ++p) {
+        if (p->alpha() == 0) {
             *p = color;
-        }
-        else {
+        }
+        else {
             p->set_alpha(255);
         }
-    }
-}
-
-void Gosu::apply_border_flags(Bitmap& dest, const Bitmap& source, unsigned src_x, unsigned src_y,
-                              unsigned src_width, unsigned src_height, unsigned image_flags)
-{
-    // Backward compatibility: This used to be 'bool tileable'.
-    if (image_flags == 1) image_flags = IF_TILEABLE;
-
-    dest.resize(src_width + 2, src_height + 2);
-
-    // The borders are made "harder" by duplicating the original bitmap's
-    // borders.
-
-    // Top.
-    if (image_flags & IF_TILEABLE_TOP)
-        dest.insert(source, 1, 0, src_x, src_y, src_width, 1);
-    // Bottom.
-    if (image_flags & IF_TILEABLE_BOTTOM)
-        dest.insert(source, 1, dest.height() - 1, src_x, src_y + src_height - 1, src_width, 1);
-    // Left.
-    if (image_flags & IF_TILEABLE_LEFT)
-        dest.insert(source, 0, 1, src_x, src_y, 1, src_height);
-    // Right.
-    if (image_flags & IF_TILEABLE_RIGHT)
-        dest.insert(source, dest.width() - 1, 1, src_x + src_width - 1, src_y, 1, src_height);
-
-    // Top left.
-    if ((image_flags & IF_TILEABLE_TOP) && (image_flags & IF_TILEABLE_LEFT))
+    }
+}
+
+void Gosu::apply_border_flags(Bitmap& dest, const Bitmap& source, unsigned src_x, unsigned src_y,
+                              unsigned src_width, unsigned src_height, unsigned image_flags)
+{
+    // Backward compatibility: This used to be 'bool tileable'.
+    if (image_flags == 1) image_flags = IF_TILEABLE;
+
+    dest.resize(src_width + 2, src_height + 2);
+
+    // The borders are made "harder" by duplicating the original bitmap's
+    // borders.
+
+    // Top.
+    if (image_flags & IF_TILEABLE_TOP) {
+        dest.insert(source, 1, 0, src_x, src_y, src_width, 1);
+    }
+    // Bottom.
+    if (image_flags & IF_TILEABLE_BOTTOM) {
+        dest.insert(source, 1, dest.height() - 1, src_x, src_y + src_height - 1, src_width, 1);
+    }
+    // Left.
+    if (image_flags & IF_TILEABLE_LEFT) {
+        dest.insert(source, 0, 1, src_x, src_y, 1, src_height);
+    }
+    // Right.
+    if (image_flags & IF_TILEABLE_RIGHT) {
+        dest.insert(source, dest.width() - 1, 1, src_x + src_width - 1, src_y, 1, src_height);
+    }
+
+    // Top left.
+    if ((image_flags & IF_TILEABLE_TOP) && (image_flags & IF_TILEABLE_LEFT)) {
         dest.set_pixel(0, 0,
-                       source.get_pixel(src_x, src_y));
-    // Top right.
-    if ((image_flags & IF_TILEABLE_TOP) && (image_flags & IF_TILEABLE_RIGHT))
+                       source.get_pixel(src_x, src_y));
+    }
+    // Top right.
+    if ((image_flags & IF_TILEABLE_TOP) && (image_flags & IF_TILEABLE_RIGHT)) {
         dest.set_pixel(dest.width() - 1, 0,
-                       source.get_pixel(src_x + src_width - 1, src_y));
-    // Bottom left.
-    if ((image_flags & IF_TILEABLE_BOTTOM) && (image_flags & IF_TILEABLE_LEFT))
+                       source.get_pixel(src_x + src_width - 1, src_y));
+    }
+    // Bottom left.
+    if ((image_flags & IF_TILEABLE_BOTTOM) && (image_flags & IF_TILEABLE_LEFT)) {
         dest.set_pixel(0, dest.height() - 1,
-                       source.get_pixel(src_x, src_y + src_height - 1));
-    // Bottom right.
-    if ((image_flags & IF_TILEABLE_BOTTOM) && (image_flags & IF_TILEABLE_RIGHT))
-        dest.set_pixel(dest.width() - 1, dest.height() - 1,
-                       source.get_pixel(src_x + src_width - 1, src_y + src_height - 1));
-
-    // Now put the final image into the prepared borders.
-    dest.insert(source, 1, 1, src_x, src_y, src_width, src_height);
-}
+                       source.get_pixel(src_x, src_y + src_height - 1));
+    }
+    // Bottom right.
+    if ((image_flags & IF_TILEABLE_BOTTOM) && (image_flags & IF_TILEABLE_RIGHT)) {
+        dest.set_pixel(dest.width() - 1, dest.height() - 1,
+                       source.get_pixel(src_x + src_width - 1, src_y + src_height - 1));
+    }
+
+    // Now put the final image into the prepared borders.
+    dest.insert(source, 1, 1, src_x, src_y, src_width, src_height);
+}