gosu 0.10.5 → 0.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 720a938ad883a798d38bf7b3608f1869ea6f55c2
-  data.tar.gz: 85a15c9e41c2e6717de163eb4ca45be8f498055f
+  metadata.gz: c7e0dac99c81c5a229672c489a3b4a7b4cadb588
+  data.tar.gz: 13fc464f740ed462b7669f27a19f912b19566692
 SHA512:
-  metadata.gz: 13f5e85de7eaad925b20def734945a968fb620e6d64daa43d209097216ca4ace21dd279f9963c5683a4bb8adb4713417a1a96596f21901c5d21f687500945feb
-  data.tar.gz: 8a4f69d223a28e10ba5616a1e23fc0f666affd62722fb89cad2d81a3bbce885190a158c606cbd0578d466d95dd1ca6ce7cdaac8d3e48f2dbccf2018270399ddf
+  metadata.gz: d4d75d8e44a3dac0d7cea92e1b09d5cfe9ec100de7483992e74c6292d6223e0de2d94d28aa8a56a7bce31c1b3dab7026b48504576de9fbc5325ebb367d9ff73d
+  data.tar.gz: a5e0d9396708b8706b5f0a90f2e2ba6a3294edd7361894665253cc4918295097cf1a43400e0a5ba60941e759a78f867c8940959556a2c24786253e18c8db1ee4

data/Gosu/Graphics.hpp

@@ -45,7 +45,7 @@ namespace Gosu
         Graphics(unsigned physicalWidth, unsigned physicalHeight, bool fullscreen);
         ~Graphics();
 
-        void setResolution(unsigned virtualWidth, unsigned virtualHeight,
+        void setResolution(unsigned logicalWidth, unsigned logicalHeight,
             double horizontalBlackBarWidth = 0, double verticalBlackBarHeight = 0);
         
         unsigned width() const;
@@ -111,7 +111,10 @@ namespace Gosu
             double x3, double y3, Color c3,
             double x4, double y4, Color c4,
             ZPos z, AlphaMode mode = amDefault);
-        
+
+        //! For internal use only.
+        void setPhysicalResolution(unsigned physicalWidth, unsigned physicalHeight);
+
         //! For internal use only.
         static void scheduleDrawOp(const DrawOp& op);
 

data/Gosu/GraphicsBase.hpp

@@ -87,21 +87,7 @@ namespace Gosu
         ifRetro          = 1 << 5
     };
     
-#ifdef GOSU_IS_MAC
-    // TODO: Without this gigantic hack, Gosu crashes in the "scale" function,
-    // but _only_ when used from Ruby 1.9. It is unclear what might cause this -
-    // maybe a compiler bug that tries to use SSE functions with the wrong
-    // alignment. Adding __attribute__((aligned(16))) does not help, though.
-    struct Transform
-    {
-        double value[16];
-        bool operator==(const Transform &other) { for (int i = 0; i < 16; ++i) if ((*this)[i] != other[i]) return false; return true; }
-        const double &operator[](std::size_t idx) const { return value[idx]; }
-        double &operator[](std::size_t idx) { return value[idx]; }
-    };
-#else
     typedef std::tr1::array<double, 16> Transform;
-#endif
     Transform translate(double x, double y);
     Transform rotate(double angle, double aroundX = 0, double aroundY = 0);
     Transform scale(double factor);

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 10
-#define GOSU_POINT_VERSION 5
-#define GOSU_VERSION "0.10.5"
+#define GOSU_POINT_VERSION 6
+#define GOSU_VERSION "0.10.6"
 
 #define GOSU_COPYRIGHT_NOTICE \
     "This software uses the following third-party libraries:\n" \

data/ext/gosu/gosu_wrap.cxx

@@ -10977,8 +10977,8 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_RubyInitializeTrackings();
   rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(0)));
   rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(10)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(5)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.10.5"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(6)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.10.6"));
   rb_define_const(mGosu, "GOSU_COPYRIGHT_NOTICE", SWIG_FromCharPtr("This software uses the following third-party libraries:\n\nGosu, http://www.libgosu.org, MIT License, http://opensource.org/licenses/MIT\nSDL 2, http://www.libsdl.org, MIT License, http://opensource.org/licenses/MIT\nlibsndfile, http://www.mega-nerd.com/libsndfile, GNU LGPL 3, http://www.gnu.org/copyleft/lesser.html\nOpenAL Soft, http://kcat.strangesoft.net/openal.html, GNU LGPL 2, http://www.gnu.org/licenses/old-licenses/lgpl-2.0.html\n"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);

data/src/Graphics/Graphics.cpp

@@ -50,33 +50,34 @@ struct Gosu::Graphics::Impl
     Transform baseTransform;
     
     DrawOpQueueStack warmedUpQueues;
+
+    void updateBaseTransform()
+    {
+        double scaleX = 1.0 * physWidth / virtWidth;
+        double scaleY = 1.0 * physHeight / virtHeight;
+        double scaleFactor = std::min(scaleX, scaleY);
+
+        Transform scaleTransform = scale(scaleFactor);
+        Transform translateTransform = translate(blackWidth, blackHeight);
+        baseTransform = concat(translateTransform, scaleTransform);
+    }
 };
 
 Gosu::Graphics::Graphics(unsigned physWidth, unsigned physHeight, bool fullscreen)
 : pimpl(new Impl)
 {
-    pimpl->physWidth  = physWidth;
-    pimpl->physHeight = physHeight;
     pimpl->virtWidth  = physWidth;
     pimpl->virtHeight = physHeight;
     pimpl->fullscreen = fullscreen;
     pimpl->blackWidth = 0;
     pimpl->blackHeight = 0;
-    
+
     // TODO: Should be merged into RenderState and removed from Graphics.
-    glMatrixMode(GL_PROJECTION);
-    glLoadIdentity();
-    glViewport(0, 0, physWidth, physHeight);
-    #ifdef GOSU_IS_OPENGLES
-    glOrthof(0, physWidth, physHeight, 0, -1, 1);
-    #else
-    glOrtho(0, physWidth, physHeight, 0, -1, 1);
-    #endif
-    
     glMatrixMode(GL_MODELVIEW);
     glLoadIdentity();
-    
     glEnable(GL_BLEND);
+
+    setPhysicalResolution(physWidth, physHeight);
 }
 
 Gosu::Graphics::~Graphics()
@@ -111,13 +112,7 @@ void Gosu::Graphics::setResolution(unsigned virtualWidth, unsigned virtualHeight
     pimpl->blackWidth = horizontalBlackBarWidth;
     pimpl->blackHeight = verticalBlackBarHeight;
 
-    double scaleX = 1.0 * pimpl->physWidth / virtualWidth;
-    double scaleY = 1.0 * pimpl->physHeight / virtualHeight;
-    double scaleFactor = std::min(scaleX, scaleY);
-
-    Transform scaleTransform = scale(scaleFactor);
-    Transform translateTransform = translate(pimpl->blackWidth, pimpl->blackHeight);
-    pimpl-> baseTransform = concat(translateTransform, scaleTransform);
+    pimpl->updateBaseTransform();
 }
 
 bool Gosu::Graphics::begin(Gosu::Color clearWithColor)
@@ -382,6 +377,23 @@ void Gosu::Graphics::scheduleDrawOp(const Gosu::DrawOp &op)
     currentQueue().scheduleDrawOp(op);
 }
 
+void Gosu::Graphics::setPhysicalResolution(unsigned physWidth, unsigned physHeight)
+{
+    pimpl->physWidth = physWidth;
+    pimpl->physHeight = physHeight;
+    // TODO: Should be merged into RenderState and removed from Graphics.
+    glMatrixMode(GL_PROJECTION);
+    glLoadIdentity();
+    glViewport(0, 0, physWidth, physHeight);
+#ifdef GOSU_IS_OPENGLES
+    glOrthof(0, physWidth, physHeight, 0, -1, 1);
+#else
+    glOrtho(0, physWidth, physHeight, 0, -1, 1);
+#endif
+
+    pimpl->updateBaseTransform();
+}
+
 GOSU_UNIQUE_PTR<Gosu::ImageData> Gosu::Graphics::createImage(
     const Bitmap& src, unsigned srcX, unsigned srcY,
     unsigned srcWidth, unsigned srcHeight, unsigned flags)

data/src/Window.cpp

@@ -182,6 +182,13 @@ bool Gosu::Window::tick()
 {
     if (SDL_GetWindowFlags(sharedWindow()) & SDL_WINDOW_HIDDEN) {
         SDL_ShowWindow(sharedWindow());
+
+        // SDL_GL_GetDrawableSize returns different values before and after showing the window.
+        // -> When first showing the window, update the physical size of Graphics (=glViewport).
+        // Fixes https://github.com/gosu/gosu/issues/318
+        int width, height;
+        SDL_GL_GetDrawableSize(sharedWindow(), &width, &height);
+        graphics().setPhysicalResolution(width, height);
     }
     
     SDL_Event e;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gosu
 version: !ruby/object:Gem::Version
-  version: 0.10.5
+  version: 0.10.6
 platform: ruby
 authors:
 - Julian Raschke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-11 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies: []
 description: |2
       2D game development library.
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: 2D game development library.