gosu 0.7.24 → 0.7.25

data/Gosu/ButtonsMac.hpp

@@ -3,8 +3,8 @@
 
 namespace Gosu
 {
-    //! List of all the button ids that can be used with Gosu::Input.
-    //! This enumeration contains ids for non-character keyboard keys (kb*),
+    //! List of button ids that can be used with Gosu::Input.
+    //! This enumeration contains ids for keyboard keys (kb*),
     //! mouse buttons and mouse wheel (ms*) and gamepad buttons (gp*).
     enum ButtonName
     {

data/Gosu/ButtonsWin.hpp

@@ -3,7 +3,10 @@
 
 namespace Gosu
 {
-	enum ButtonName
+    //! List of button ids that can be used with Gosu::Input.
+    //! This enumeration contains ids for keyboard keys (kb*),
+    //! mouse buttons and mouse wheel (ms*) and gamepad buttons (gp*).
+    enum ButtonName
 	{
         kbRangeBegin = 1,
 		kbEscape = 0x01,

data/Gosu/ButtonsX.hpp

@@ -3,8 +3,8 @@
 
 namespace Gosu
 {
-    //! Enumerates all the named button ids that can be used with Gosu::Input.
-    //! This enumeration contains ids for non-character keyboard keys (kb*),
+    //! List of button ids that can be used with Gosu::Input.
+    //! This enumeration contains ids for keyboard keys (kb*),
     //! mouse buttons and mouse wheel (ms*) and gamepad buttons (gp*).
     enum ButtonName
     {

data/Gosu/Color.hpp

@@ -5,39 +5,58 @@
 #define GOSU_COLOR_HPP
 
 #include <boost/cstdint.hpp>
+#include <Gosu/Platform.hpp>
 
 namespace Gosu
 {
     //! Represents an ARGB color value with 8 bits for each channel. Can be
     //! implicitly constructed from literals of the form 0xaarrggbb. Has fast
     //! value semantics.
+    //! The four-byte layout in memory is RGBA. On Big-Endian machines the
+    //! unsigned int interpretation is 0xrrggbbaa, on Little-Endian machines
+    //! it is 0xaabbggrr.
     class Color
     {
         boost::uint32_t rep;
-
+        #ifdef GOSU_IS_LITTLE_ENDIAN
+        enum { RED_OFFSET = 0, GREEN_OFFSET = 8, BLUE_OFFSET = 16, ALPHA_OFFSET = 24 };
+        #else
+        enum { RED_OFFSET = 24, GREEN_OFFSET = 16, BLUE_OFFSET = 8, ALPHA_OFFSET = 0 };
+        #endif
+        
     public:
         typedef boost::uint8_t Channel;
-
+        static const unsigned GL_FORMAT = 0x1908; // GL_RGBA
+        
         //! The default constructor does not initialize the color to any value.
         Color()
         {
         }
-
+        
         //! Conversion constructor for literals of the form 0xaarrggbb.
         //! (C++ only.)
         Color(boost::uint32_t argb)
-        : rep(argb)
         {
+            *this = Color((argb >> 24) & 0xff, (argb >> 16) & 0xff,
+                          (argb >>  8) & 0xff, (argb >>  0) & 0xff);
         }
-
+        
         Color(Channel red, Channel green, Channel blue)
         {
-            rep = (0xff << 24) | (red << 16) | (green << 8) | blue;
+            *this = Color(0xff, red, green, blue);
         }
-
+        
         Color(Channel alpha, Channel red, Channel green, Channel blue)
         {
-            rep = (alpha << 24) | (red << 16) | (green << 8) | blue;
+            rep = (alpha << ALPHA_OFFSET) | (red << RED_OFFSET) |
+                  (green << GREEN_OFFSET) | (blue << BLUE_OFFSET);
+        }
+        
+        static Color fromRGBA(boost::uint32_t rgba)
+        {
+            Color result;
+            result.rep = rgba;
+            return result;
         }
         
         //! Constructs a color from the given hue/saturation/value triple.
@@ -47,48 +66,48 @@ namespace Gosu
         static Color fromHSV(double h, double s, double v);
         static Color fromAHSV(Channel alpha, double h, double s, double v);
 
-        Channel alpha() const
-        {
-            return static_cast<Channel>((rep >> 24) & 0xff);
-        }
-
         Channel red() const
         {
-            return static_cast<Channel>((rep >> 16) & 0xff);
+            return static_cast<Channel>(rep >> RED_OFFSET);
         }
 
         Channel green() const
         {
-            return static_cast<Channel>((rep >> 8) & 0xff);
+            return static_cast<Channel>(rep >> GREEN_OFFSET);
         }
 
         Channel blue() const
         {
-            return static_cast<Channel>(rep & 0xff);
+            return static_cast<Channel>(rep >> BLUE_OFFSET);
         }
 
-        void setAlpha(Channel value)
+        Channel alpha() const
         {
-            rep &= 0x00ffffff;
-            rep |= value << 24;
+            return static_cast<Channel>(rep >> ALPHA_OFFSET);
         }
 
         void setRed(Channel value)
         {
-            rep &= 0xff00ffff;
-            rep |= value << 16;
+            rep &= ~(0xff << RED_OFFSET);
+            rep |= value << RED_OFFSET;
         }
 
         void setGreen(Channel value)
         {
-            rep &= 0xffff00ff;
-            rep |= value << 8;
+            rep &= ~(0xff << GREEN_OFFSET);
+            rep |= value << GREEN_OFFSET;
         }
 
         void setBlue(Channel value)
         {
-            rep &= 0xffffff00;
-            rep |= value;
+            rep &= ~(0xff << BLUE_OFFSET);
+            rep |= value << BLUE_OFFSET;
+        }
+
+        void setAlpha(Channel value)
+        {
+            rep &= ~(0xff << ALPHA_OFFSET);
+            rep |= value << ALPHA_OFFSET;
         }
 
         //! Returns the hue of the color, in the usual range of 0..360.
@@ -112,19 +131,19 @@ namespace Gosu
         //! Returns the color in 0xaarrggbb representation.
         boost::uint32_t argb() const
         {
-            return rep;
+            return alpha() << 24 | red() << 16 | green() << 8 | blue();
         }
 
         //! Returns the color in 0x00bbggrr representation.
         boost::uint32_t bgr() const
         {
-            return red() | (rep & 0x0000ff00) | blue() << 16;
+            return blue() << 16 | green() << 8 | red();
         }
 
         //! Returns the color in 0xaabbggrr representation.
         boost::uint32_t abgr() const
         {
-            return alpha() << 24 | bgr();
+            return alpha() << 24 | blue() << 16 | green() << 8 | red();
         }
         
         static const Color NONE;
@@ -171,7 +190,6 @@ namespace Gosu
     //! and then multiplied with each other.
     Color multiply(Color a, Color b);
 
-    // Deprecated
     namespace Colors
     {
         const Color none    = 0x00000000;

data/Gosu/Graphics.hpp

@@ -22,7 +22,7 @@ namespace Gosu
     //! Returns the maximum size of an texture that will be allocated
     //! internally by Gosu.
     //! Useful when extending Gosu using OpenGL.
-    extern unsigned const MAX_TEXTURE_SIZE;
+    unsigned const MAX_TEXTURE_SIZE = 1024;
     
     typedef boost::array<double, 16> Transform;
     Transform translate(double x, double y);

data/Gosu/Version.hpp

@@ -3,7 +3,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 24
-#define GOSU_VERSION "0.7.24"
+#define GOSU_POINT_VERSION 25
+#define GOSU_VERSION "0.7.25"
 
 #endif

data/GosuImpl/Graphics/BitmapPNG.cpp

@@ -34,7 +34,7 @@ namespace Gosu
 }
 
 Gosu::Reader Gosu::loadFromPNG(Bitmap& out, Reader reader)
-{
+{    
 #if 0
     boost::mutex::scoped_lock lock(pngMutex);
 #endif

data/GosuImpl/Graphics/BitmapTouch.mm

@@ -34,10 +34,6 @@ Gosu::Reader Gosu::loadFromBMP(Bitmap& bmp, Reader reader)
     CGContextDrawImage(context, CGRectMake(0.0, 0.0, bmp.width(), bmp.height()), imageRef);
     CGContextRelease(context);
     
-    for (unsigned y = 0; y < bmp.height(); ++y)
-        for (unsigned x = 0; x < bmp.width(); ++x)
-            bmp.setPixel(x, y, bmp.getPixel(x, y).abgr());
-    
     return reader;
 }
 

data/GosuImpl/Graphics/Color.cpp

@@ -128,7 +128,7 @@ Gosu::Color Gosu::multiply(Color a, Color b)
 const Gosu::Color Gosu::Color::NONE    = 0x00000000;
 const Gosu::Color Gosu::Color::BLACK   = 0xff000000;
 const Gosu::Color Gosu::Color::GRAY    = 0xff808080;
-const Gosu::Color Gosu::Color::WHITE   = 0xffffffff;            
+const Gosu::Color Gosu::Color::WHITE   = 0xffffffff;
 const Gosu::Color Gosu::Color::AQUA    = 0xff00ffff;
 const Gosu::Color Gosu::Color::RED     = 0xffff0000;
 const Gosu::Color Gosu::Color::GREEN   = 0xff00ff00;

data/GosuImpl/Graphics/Graphics.cpp

@@ -357,7 +357,7 @@ std::auto_ptr<Gosu::ImageData> Gosu::Graphics::createImage(
     const Bitmap& src, unsigned srcX, unsigned srcY,
     unsigned srcWidth, unsigned srcHeight, unsigned borderFlags)
 {
-    static const unsigned maxSize = Texture::maxTextureSize();
+    static const unsigned maxSize = MAX_TEXTURE_SIZE;
 
     // Special case: If the texture is supposed to have hard borders,
     // is quadratic, has a size that is at least 64 pixels but less than 256

data/GosuImpl/Graphics/Texture.cpp

@@ -5,43 +5,6 @@
 #include <Gosu/Platform.hpp>
 #include <stdexcept>
 
-#ifndef GL_BGRA
-#define GL_BGRA 0x80E1
-#endif
-
-// TODO: Move from Texture:: to local namespace and use MAX_TEXTURE_SIZE instead.
-unsigned Gosu::Texture::maxTextureSize()
-{
-#if defined(GOSU_IS_MAC)
-    // Includes the iPhone
-    return 1024;
-#elif defined(GOSU_IS_UNIX)
-    // Since we cannot get the max. texture size until after context creation, we have to
-    // just be pessimistic about it until Gosu is restructured to create the context
-    // earlier. Otherwise, libGL will segfault left and right.
-    return 512;
-#else
-    const static unsigned MIN_SIZE = 256, MAX_SIZE = 1024;
-
-    static unsigned size = 0;
-    if (size == 0)
-    {
-        size = MIN_SIZE / 2;
-        GLint width = 1;
-        do
-        {
-            size *= 2;
-            glTexImage2D(GL_PROXY_TEXTURE_2D, 0, 4, size * 2, size * 2, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0);
-            glGetTexLevelParameteriv(GL_PROXY_TEXTURE_2D, 0, GL_TEXTURE_WIDTH, &width); 
-        } while (width != 0 && size < MAX_SIZE);
-    }
-    
-    return size;
-#endif
-}
-
-const unsigned Gosu::MAX_TEXTURE_SIZE = Gosu::Texture::maxTextureSize();
-
 namespace Gosu
 {
     bool undocumentedRetrofication = false;
@@ -113,32 +76,9 @@ std::auto_ptr<Gosu::TexChunk>
     result.reset(new TexChunk(graphics, transforms, queues, ptr, block->left + padding, block->top + padding,
                               block->width - 2 * padding, block->height - 2 * padding, padding));
     
-#if defined(__BIG_ENDIAN__)
-    std::vector<unsigned> pixelData(srcWidth * srcHeight);
-    for (unsigned y = 0; y < srcHeight; ++y)
-        for (unsigned x = 0; x < srcWidth; ++x)
-        {
-            boost::uint32_t pixVal = (bmp.getPixel(x, y).argb() & 0x00ffffff) << 8 | bmp.getPixel(x, y).alpha();
-            pixVal = bigToNative(pixVal);
-            pixelData[y * srcWidth + x] = pixVal;
-        }
-    const unsigned* texData = &pixelData[0];
-    unsigned format = GL_RGBA;
-#elif defined(GOSU_IS_IPHONE)
-    std::vector<unsigned> pixelData(srcWidth * srcHeight);
-    for (unsigned y = 0; y < srcHeight; ++y)
-        for (unsigned x = 0; x < srcWidth; ++x)
-            pixelData[y * srcWidth + x] = bmp.getPixel(x, y).abgr();
-    const unsigned* texData = &pixelData[0];
-    unsigned format = GL_RGBA;
-#else
-    const unsigned* texData = bmp.data();
-    unsigned format = GL_BGRA;
-#endif
-    
     glBindTexture(GL_TEXTURE_2D, name);
     glTexSubImage2D(GL_TEXTURE_2D, 0, block->left, block->top, block->width, block->height,
-                 format, GL_UNSIGNED_BYTE, texData);
+                 Color::GL_FORMAT, GL_UNSIGNED_BYTE, bmp.data());
 
     num += 1;
     return result;
@@ -158,21 +98,11 @@ Gosu::Bitmap Gosu::Texture::toBitmap(unsigned x, unsigned y, unsigned width, uns
     Gosu::Bitmap fullTexture;
     fullTexture.resize(size(), size());
     glBindTexture(GL_TEXTURE_2D, name);
-    glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_BYTE, fullTexture.data());
+    glGetTexImage(GL_TEXTURE_2D, 0, GL_RGBA, GL_UNSIGNED_BYTE, fullTexture.data());
     Gosu::Bitmap bitmap;
     bitmap.resize(width, height);
     bitmap.insert(fullTexture, -int(x), -int(y));
     
-#if defined(__BIG_ENDIAN__)
-    for (unsigned y = 0; y < height; ++y)
-        for (unsigned x = 0; x < width; ++x)
-            bitmap.setPixel(x, y, bigToNative(bitmap.getPixel(x, y).argb() & 0xffffff00 >> 8 | bitmap.getPixel(x, y).alpha() << 24));
-#elif defined(GOSU_IS_IPHONE)
-    for (unsigned y = 0; y < height; ++y)
-        for (unsigned x = 0; x < width; ++x)
-            bitmap.setPixel(x, y, bitmap.getPixel(x, y).abgr());
-#endif
-    
     return bitmap;
 #endif
 }

data/GosuImpl/Graphics/Texture.hpp

@@ -19,8 +19,6 @@ namespace Gosu
         unsigned num;
 
     public:
-        static unsigned maxTextureSize();
-
         Texture(unsigned size);
         ~Texture();
         unsigned size() const;

data/GosuImpl/InputMac.mm

@@ -441,11 +441,49 @@ namespace {
         
         idChars.assign(0);
 
-#ifndef __LP64__
+#ifdef __LP64__
+        CFRef<TISInputSourceRef> is(TISCopyCurrentKeyboardLayoutInputSource());
+        CFRef<CFDataRef> UCHR(
+            static_cast<CFDataRef>(TISGetInputSourceProperty(is.obj(), kTISPropertyUnicodeKeyLayoutData)));
+        if (!UCHR.get())
+            return;
+        
+        // Reverse for() to prefer lower IDs in charToId
+        for (int code = numScancodes - 1; code >= 0; --code)
+        {
+            UInt32 deadKeyState = 0;
+            UniChar value[8];
+            UniCharCount valueLength = 8;
+            
+            if (code == kbLeftShift || code == kbRightShift ||
+                    code == kbLeftAlt || code == kbRightAlt ||
+                    code == kbLeftControl || code == kbRightControl ||
+                    code == kbLeftMeta || code == kbRightMeta)
+                continue;
+            
+            if (noErr != UCKeyTranslate(
+                    reinterpret_cast<const UCKeyboardLayout*>(CFDataGetBytePtr(UCHR.obj())),
+                    code, kUCKeyActionDown, 0, LMGetKbdType(),
+                    kUCKeyTranslateNoDeadKeysMask, &deadKeyState,
+                    valueLength, &valueLength, value))
+                continue;
+            
+            // Ignore special characters except newline.
+            if (value[0] == 3)
+                value[0] = 13; // convert Enter to Return
+            if (value[0] < 32 && value[0] != 13)
+                continue;
+            
+            idChars[code] = value[0];
+            charIds[value[0]] = code;
+        }
+#else
+        // The very old-school way.
 		const void* KCHR = reinterpret_cast<const void*>(GetScriptManagerVariable(smKCHRCache));
 		if (!KCHR)
 			return;
         
+        // Reverse for() to prefer lower IDs in charToId
         for (int code = numScancodes - 1; code >= 0; --code)
         {
             UInt32 deadKeyState = 0;
@@ -454,20 +492,12 @@ namespace {
 			if (deadKeyState != 0)
 				value = KeyTranslate(KCHR, code, &deadKeyState);
 			
-			// No character! Pity.
-			if (value == 0)
-				continue;
-                
             // Ignore special characters except newline.
             if (value == 3)
                 value = 13; // convert Enter to Return
             if (value < 32 && value != 13)
                 continue;
 			
-			// Now we have a character which is *not* limited to the ASCII range. To correctly
-			// translate this into a wchar_t, we need to convert it based on the current locale.
-			// TODO: That locale stuff should be explicit. Locales always cause trouble.
-            
 			std::string str(1, char(value));
 			wchar_t ch = Gosu::macRomanToWstring(str).at(0);
 			

data/GosuImpl/RubyGosu.swg

@@ -1,6 +1,6 @@
-// Mini Swig Style Improvement List:
-// - %predicate instead of %rename
-// - use Python names for op overloading
+// Mini SWIG file TODO List:
+// - %predicate instead of %rename where applicable
+// - use Python names for op overloading for easier porting to other languages
 
 %trackobjects;
 %include exception.i  
@@ -61,14 +61,16 @@
         $1 = Gosu::Button(NUM2LONG($input));
 }
 %typemap(out) Gosu::Button {
-	$result = LONG2NUM($1.id());
-    if ($result == -1)
+    if ($1 == Gosu::noButton)
         $result = Qnil;
+    else
+        $result = LONG2NUM($1.id());
 }
 %typemap(directorin) Gosu::Button {
-	$input = LONG2NUM($1.id());
-    if ($input == -1)
+    if ($1 == Gosu::noButton)
         $input = Qnil;
+    else
+        $input = LONG2NUM($1.id());
 }
 
 // Typemaps for enums that should be given in as symbols.
@@ -164,7 +166,9 @@ namespace Gosu {
     void register_entity(const std::wstring& name, Gosu::Image* image) { registerEntity(name, image->getData().toBitmap()); }
 }
 
+#include <ctime>
 #include <sstream>
+#include <boost/algorithm/string.hpp>
 
 // New Ruby 1.9 syntax (for compilation with Ruby 1.8)
 #ifndef RSTRING_LEN
@@ -219,14 +223,8 @@ namespace Gosu
             throw std::logic_error("Blob length mismatch!");
         Bitmap result;
         result.resize(width, height);
-        const unsigned* rgbaIter = reinterpret_cast<const unsigned*>(RSTRING_PTR(blob));
-        for (unsigned y = 0; y < height; ++y)
-            for (unsigned x = 0; x < width; ++x)
-            {
-                unsigned rgba = *rgbaIter;
-                result.setPixel(x, y, Gosu::Color(rgba).abgr()); // swap R and B
-                ++rgbaIter;
-            }
+        std::memcpy(result.data(),
+            reinterpret_cast<const boost::uint32_t*>(RSTRING_PTR(blob)), width * height * 4);
         return result;
     }
 }
@@ -434,6 +432,7 @@ namespace Gosu {
     }
     std::string toBlob() const
     {
+        // TODO: Optimize with direct copy into a Ruby string
         Gosu::Bitmap bmp = $self->getData().toBitmap();
         return std::string(reinterpret_cast<const char*>(bmp.data()),
                            reinterpret_cast<const char*>(bmp.data()) + bmp.width() * bmp.height() * 4);
@@ -446,6 +445,16 @@ namespace Gosu {
     {
         return $self->height();
     }
+    void save(const std::wstring& filename) const
+    {
+        Gosu::Bitmap bmp = $self->getData().toBitmap();
+        Gosu::Buffer buf;
+        if (boost::iends_with(filename, L".bmp"))
+            Gosu::saveToBMP(bmp, buf.backWriter());
+        else
+            Gosu::saveToPNG(bmp, buf.backWriter());
+        Gosu::saveFile(buf, filename);
+    }
 }
 
 // Audio:
@@ -472,6 +481,9 @@ namespace Gosu {
 %include "../Gosu/ButtonsMac.hpp"
 %init %{
     GosusDarkSide::oncePerTick = GosusDarkSide::yieldToOtherRubyThreads;
+	// While we are at it, to some healthy srand() - otherwise unavailable to Ruby people
+	std::srand(static_cast<unsigned int>(std::time(0)));
+    std::rand(); // and flush the first value
 %}
 
 // TextInput
@@ -624,6 +636,11 @@ namespace Gosu {
         rb_yield(Qnil);
         $self->graphics().popTransform();
     }
+    void scale(double factorX, double factorY, double aroundX, double aroundY) {
+        $self->graphics().pushTransform(Gosu::scale(factorX, factorY, aroundX, aroundY));
+        rb_yield(Qnil);
+        $self->graphics().popTransform();
+    }
     void translate(double x, double y) {
         $self->graphics().pushTransform(Gosu::translate(x, y));
         rb_yield(Qnil);