gosu 0.7.40-universal-darwin → 0.7.41-universal-darwin

data/Gosu/Image.hpp

@@ -5,9 +5,11 @@
 #define GOSU_IMAGE_HPP
 
 #include <Gosu/Fwd.hpp>
-#include <Gosu/Bitmap.hpp>
+#include <Gosu/Color.hpp>
+#include <Gosu/GraphicsBase.hpp>
 #include <Gosu/TR1.hpp>
 #include <memory>
+#include <vector>
 
 namespace Gosu
 {
@@ -79,7 +81,10 @@ namespace Gosu
         //! Provides access to the underlying image data object.
         ImageData& getData() const;
     };
-
+    
+    std::vector<Gosu::Image> loadTiles(Graphics& graphics, const Bitmap& bmp, int tileWidth, int tileHeight, bool tileable);
+    std::vector<Gosu::Image> loadTiles(Graphics& graphics, const std::wstring& bmp, int tileWidth, int tileHeight, bool tileable);
+    
     //! Convenience function that splits a BMP or PNG file into an array
     //! of small rectangles and creates images from them.
     //! \param tileWidth If positive, specifies the width of one tile in
@@ -89,14 +94,13 @@ namespace Gosu
     //! Must provide a push_back member function; vector<tr1::shared_ptr<Image>>
     //! or boost::ptr_vector<Image> are good choices.
     template<typename Container>
-    void imagesFromTiledBitmap(Graphics& graphics, const std::wstring& filename,
-        int tileWidth, int tileHeight, bool tileable, Container& appendTo)
+    void imagesFromTiledBitmap(Graphics& graphics, const std::wstring& filename, int tileWidth, int tileHeight, bool tileable, Container& appendTo)
     {
-        Bitmap bmp;
-        loadImageFile(bmp, filename);
-        imagesFromTiledBitmap(graphics, bmp, tileWidth, tileHeight, tileable, appendTo);
+        std::vector<Gosu::Image> tiles = loadTiles(graphics, filename, tileWidth, tileHeight, tileable);
+        for (int i = 0, num = tiles.size(); i < num; ++i)
+            appendTo.push_back(typename Container::value_type(new Gosu::Image(tiles[i])));
     }
-
+    
     //! Convenience function that splits a bitmap into an area of array 
     //! rectangles and creates images from them.
     //! \param tileWidth If positive, specifies the width of one tile in
@@ -109,29 +113,9 @@ namespace Gosu
     void imagesFromTiledBitmap(Graphics& graphics, const Bitmap& bmp,
         int tileWidth, int tileHeight, bool tileable, Container& appendTo)
     {
-        int tilesX, tilesY;
-
-        if (tileWidth > 0)
-            tilesX = bmp.width() / tileWidth;
-        else
-        {
-            tilesX = -tileWidth;
-            tileWidth = bmp.width() / tilesX;
-        }
-        
-        if (tileHeight > 0)
-            tilesY = bmp.height() / tileHeight;
-        else
-        {
-            tilesY = -tileHeight;
-            tileHeight = bmp.height() / tilesY;
-        }
-        
-        for (int y = 0; y < tilesY; ++y)
-            for (int x = 0; x < tilesX; ++x)
-                appendTo.push_back(typename Container::value_type(new Image(graphics, bmp,
-                    x * tileWidth, y * tileHeight, tileWidth, tileHeight,
-                    tileable)));
+        std::vector<Gosu::Image> tiles = loadTiles(graphics, bmp, tileWidth, tileHeight, tileable);
+        for (int i = 0, num = tiles.size(); i < num; ++i)
+            appendTo.push_back(typename Container::value_type(new Gosu::Image(tiles[i])));
     }
 }
 

data/Gosu/TR1.hpp

@@ -1,26 +1,34 @@
 //! \file TR1.hpp
-//! Includes all parts of C++03 (TR1) that are relevant for Gosu.
+//! Includes all parts of C++03 (TR1) that are relevant for Gosu. It makes available the following members of the std::tr1 namespace: array, bind, function, shared_ptr, uint*_t and int*_t.
 
 #ifndef GOSU_TR1_HPP
 #define GOSU_TR1_HPP
 
-#ifdef _MSC_VER
+#include <memory>
+
+#if defined(_MSC_VER) || defined(_LIBCPP_MEMORY)
     #include <array>
-    #include <memory>
     #include <functional>
     namespace std
     {
         namespace tr1
         {
-            typedef unsigned char        uint8_t;
-            typedef unsigned short       uint16_t;
-            typedef unsigned int         uint32_t;
-            typedef unsigned long long   uint64_t;
-            typedef signed char          int8_t;
-            typedef signed short         int16_t;
-            typedef signed int           int32_t;
-            typedef signed long long     int64_t;
-        }
+            typedef unsigned char uint8_t;
+            typedef unsigned short uint16_t;
+            typedef unsigned int uint32_t;
+            typedef unsigned long long uint64_t;
+            typedef signed char int8_t;
+            typedef signed short int16_t;
+            typedef signed int int32_t;
+            typedef signed long long int64_t;
+            
+            #ifdef _LIBCPP_MEMORY
+            using std::array;
+            using std::bind;
+            using std::function;
+            using std::shared_ptr;
+            #endif
+        }        
     }
 #else
     #include <tr1/array>
@@ -32,7 +40,7 @@
         {
             namespace tr1
             {
-                using ::int8_t;  using ::int16_t;  using ::int32_t;  using ::int64_t;
+                using ::int8_t; using ::int16_t; using ::int32_t; using ::int64_t;
                 using ::uint8_t; using ::uint16_t; using ::uint32_t; using ::uint64_t;
             }
         }

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 40
-#define GOSU_VERSION "0.7.40"
+#define GOSU_POINT_VERSION 41
+#define GOSU_VERSION "0.7.41"
 
 #define GOSU_COPYRIGHT_NOTICE \
   " " \

data/Gosu/Window.hpp

@@ -105,6 +105,7 @@ namespace Gosu
         #endif
         
         #ifdef GOSU_IS_IPHONE
+        void* rootViewController() const;
         // iPhone-only callbacks for touch events.
         // Note that it does not hurt to override them even if you compile
         // for another platform; if you don't specify "virtual" the code
@@ -121,4 +122,8 @@ namespace Gosu
     };
 }
 
+#ifdef GOSU_IS_IPHONE
+Gosu::Window& windowInstance();
+#endif
+
 #endif

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 83
+  hash: 81
   prerelease: 
   segments: 
   - 0
   - 7
-  - 40
-  version: 0.7.40
+  - 41
+  version: 0.7.41
 platform: universal-darwin
 authors: 
 - Julian Raschke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-19 00:00:00 Z
+date: 2011-12-17 00:00:00 Z
 dependencies: []
 
 description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and OpenGL.\n"