gosu 0.7.18 → 0.7.19

data/COPYING.txt

@@ -1,4 +1,4 @@
-Copyright (C) 2004-2007 Julian Raschke, Jan Lücker and all contributors.
+Copyright (C) 2004-2010 Julian Raschke, Jan Lücker and all contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

data/Gosu/GraphicsBase.hpp

@@ -28,7 +28,9 @@ namespace Gosu
         //! The colors' channels will be added. The alpha channel specifies
         //! the percentage of the new color's channels that will be added
         //! to the old color's channels.
-        amAdditive
+        amAdditive,
+        //! The color's channels will be multiplied with each other.
+        amMultiply
     };
     
     enum FontFlags
@@ -49,7 +51,7 @@ namespace Gosu
     //! Flags that affect the tileability of an image.
     enum BorderFlags
     {
-        bfSoft = 0,
+        bfSmooth = 0,
         bfTileableLeft = 1,
         bfTileableTop = 2,
         bfTileableRight = 4,

data/Gosu/IO.hpp

@@ -192,15 +192,8 @@ namespace Gosu
             return *this;
         }
 
-        std::size_t size() const
-        {
-            return buf.size();
-        }
-
-        void resize(std::size_t newSize)
-        {
-            buf.resize(newSize);
-        }
+        std::size_t size() const;
+        void resize(std::size_t newSize);
 
         void read(std::size_t offset, std::size_t length,
             void* destBuffer) const;

data/Gosu/Math.hpp

@@ -29,26 +29,28 @@ namespace Gosu
     //! Uses std::rand, so you should call std::srand before using it.
     double random(double min, double max);
     
-    //! Translates between Gosu's angle system and radians.
+    //! Translates between Gosu's angle system (where 0� is at the top)
+    //! and radians (where 0 is at the right).
     inline double gosuToRadians(double angle)
     {
         return (angle - 90) * pi / 180;
     }
-    //! Translates between Gosu's angle system and radians.
+    //! Translates between Gosu's angle system (where 0� is at the top)
+    //! and radians (where 0 is at the right).
     inline double radiansToGosu(double angle)
     {
         return angle * 180 / pi + 90;
     }
 
-    //! Translates between Gosu's angle scaling and radians, i.e. it
+    //! Translates between degrees (used by Gosu) and radians, i.e. it
     //! does not change the 'origin' of the angle system.
-    inline double gosuToRadianScale(double angle)
+    inline double degreesToRadians(double angle)
     {
         return angle * pi / 180;
     }
-    //! Translates between Gosu's angle scaling and radians, i.e. it
+    //! Translates between degrees (used by Gosu) and radians, i.e. it
     //! does not change the 'origin' of the angle system.
-    inline double radiansScaleToGosu(double angle)
+    inline double radiansToDegrees(double angle)
     {
         return angle * 180 / pi;
     }

data/Gosu/Version.hpp

@@ -3,7 +3,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 18
-#define GOSU_VERSION "0.7.18"
+#define GOSU_POINT_VERSION 19
+#define GOSU_VERSION "0.7.19"
 
 #endif

data/GosuImpl/Graphics/Common.hpp

@@ -33,16 +33,17 @@ namespace Gosu
     {
         return (xb - xa) * (yp - ya) - (xp - xa) * (yb - ya) > 0;
     }
-    
-    template<typename T>
+        
+    template<typename T, typename C>
     void reorderCoordinatesIfNecessary(T& x1, T& y1,
-        T& x2, T& y2, T& x3, T& y3, T& x4, T& y4)
+        T& x2, T& y2, T& x3, T& y3, C& c3, T& x4, T& y4, C& c4)
     {
         if (isPToTheLeftOfAB(x1, y1, x2, y2, x3, y3) ==
             isPToTheLeftOfAB(x2, y2, x3, y3, x4, y4))
         {
             std::swap(x3, x4);
             std::swap(y3, y4);
+            std::swap(c3, c4);
         }
     }
 }

data/GosuImpl/Graphics/DrawOp.hpp

@@ -54,6 +54,8 @@ namespace Gosu
         
             if (mode == amAdditive)
                 glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+            else if (mode == amMultiply)
+                glBlendFunc(GL_DST_COLOR, GL_ZERO);
             else
                 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
@@ -146,6 +148,8 @@ namespace Gosu
             
             if (mode == amAdditive)
                 glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+            else if (mode == amMultiply)
+                glBlendFunc(GL_DST_COLOR, GL_ZERO);
             else
                 glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
             

data/GosuImpl/Graphics/Graphics.cpp

@@ -281,7 +281,7 @@ void Gosu::Graphics::drawQuad(double x1, double y1, Color c1,
     double x4, double y4, Color c4,
     ZPos z, AlphaMode mode)
 {
-    reorderCoordinatesIfNecessary(x1, y1, x2, y2, x3, y3, x4, y4);
+    reorderCoordinatesIfNecessary(x1, y1, x2, y2, x3, y3, c3, x4, y4, c4);
 
     DrawOp op;
 

data/GosuImpl/Graphics/Image.cpp

@@ -29,7 +29,7 @@ Gosu::Image::Image(Graphics& graphics, const Bitmap& source,
     unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
     bool tileable)
 : data(graphics.createImage(source, srcX, srcY, srcWidth, srcHeight,
-    tileable ? Gosu::bfTileable : Gosu::bfSoft))
+    tileable ? Gosu::bfTileable : Gosu::bfSmooth))
 {
 }
 

data/GosuImpl/Graphics/LargeImageData.cpp

@@ -85,7 +85,7 @@ void Gosu::LargeImageData::draw(double x1, double y1, Color c1,
     if (parts.empty())
         return;
 
-    reorderCoordinatesIfNecessary(x1, y1, x2, y2, x3, y3, x4, y4);
+    reorderCoordinatesIfNecessary(x1, y1, x2, y2, x3, y3, c3, x4, y4, c4);
     
     for (unsigned py = 0; py < partsY; ++py)
         for (unsigned px = 0; px < partsX; ++px)

data/GosuImpl/Graphics/TexChunk.cpp

@@ -47,7 +47,7 @@ void Gosu::TexChunk::draw(double x1, double y1, Color c1,
 {
     DrawOp newDrawOp;
     
-    reorderCoordinatesIfNecessary(x1, y1, x2, y2, x3, y3, x4, y4);
+    reorderCoordinatesIfNecessary(x1, y1, x2, y2, x3, y3, c3, x4, y4, c4);
     
     x1 *= graphics->factorX();
     y1 *= graphics->factorY();

data/GosuImpl/Graphics/TextTouch.mm

@@ -21,14 +21,83 @@ typedef NSFont OSXFont;
 
 namespace
 {
-    map<pair<wstring, double>, OSXFont*> usedFonts;
-    OSXFont* getFont(const wstring& name, double height)
+    // TODO: Merge with InputMac.mm
+    template<typename CFTypeRef>
+    class CFScope : boost::noncopyable
     {
-        OSXFont* result = usedFonts[make_pair(name, height)];
+        CFTypeRef ref;
+    public:
+        explicit CFScope(CFTypeRef ref) : ref(ref) {}
+        ~CFScope() { CFRelease(ref); }
+        CFTypeRef get() { return ref; }
+    };
+    
+    // If a font is a filename, loads the font and returns its family name that can be used
+    // like any system font. Otherwise, just returns the family name.
+    std::wstring normalizeFont(const std::wstring& fontName)
+    {
+        #ifdef GOSU_IS_IPHONE
+        return fontName;
+        #else
+        static map<wstring, wstring> familyOfFiles;
+        
+        // Not a path name: It is already a family name
+        if (fontName.find(L"/") == std::wstring::npos)
+            return fontName;
+        
+        // Already activated font & extracted family name
+        if (familyOfFiles.count(fontName) > 0)
+            return familyOfFiles[fontName];
+        
+        CFScope<CFStringRef> urlString(
+            CFStringCreateWithBytes(NULL,
+                reinterpret_cast<const UInt8*>(fontName.c_str()),
+                fontName.length() * sizeof(wchar_t),
+                kCFStringEncodingUTF32LE, NO));
+        CFScope<CFURLRef> url(
+            CFURLCreateWithFileSystemPath(NULL, urlString.get(),
+                kCFURLPOSIXPathStyle, YES));
+        if (!url.get())
+            return familyOfFiles[fontName] = Gosu::defaultFontName();
+            
+        CFScope<CFArrayRef> array(
+            CTFontManagerCreateFontDescriptorsFromURL(url.get()));
+
+        if (array.get() == NULL || CFArrayGetCount(array.get()) < 1 ||
+            !CTFontManagerRegisterFontsForURL(url.get(),
+                    kCTFontManagerScopeProcess, NULL))
+            return familyOfFiles[fontName] = Gosu::defaultFontName();
+
+        CTFontDescriptorRef ref =
+            (CTFontDescriptorRef)CFArrayGetValueAtIndex(array.get(), 0);
+        CFScope<CFStringRef> fontNameStr(
+            (CFStringRef)CTFontDescriptorCopyAttribute(ref, kCTFontFamilyNameAttribute));
+                
+        const char* utf8FontName =
+            [(NSString*)fontNameStr.get() cStringUsingEncoding: NSUTF8StringEncoding];
+        return familyOfFiles[fontName] = Gosu::utf8ToWstring(utf8FontName);
+        #endif
+    }
+
+    OSXFont* getFont(wstring fontName, double height)
+    {
+        fontName = normalizeFont(fontName);
+    
+        static map<pair<wstring, double>, OSXFont*> usedFonts;
+        
+        OSXFont* result = usedFonts[make_pair(fontName, height)];
         if (!result)
         {
-            Gosu::ObjRef<NSString> fontName([[NSString alloc] initWithUTF8String: Gosu::wstringToUTF8(name).c_str()]);
-            result = [[OSXFont fontWithName: fontName.obj() size: height] retain];
+            Gosu::ObjRef<NSString> name([[NSString alloc] initWithUTF8String: Gosu::wstringToUTF8(fontName).c_str()]);
+            #ifdef GOSU_IS_IPHONE
+            result = [[OSXFont fontWithName: name.obj() size: height] retain];
+            #else
+            NSFontDescriptor* desc = [[[NSFontDescriptor alloc] initWithFontAttributes:nil] fontDescriptorWithFamily:name.obj()];
+            result = [[NSFont fontWithDescriptor:desc size:height] retain];
+            #endif
+            if (!result && fontName != Gosu::defaultFontName())
+                result = getFont(Gosu::defaultFontName(), height);
+            usedFonts[make_pair(fontName, height)] = result;
         }
         return result;
     }
@@ -46,7 +115,8 @@ unsigned Gosu::textWidth(const wstring& text,
 {
     OSXFont* font = getFont(fontName, fontHeight);
     
-    // This will, of course, compute a too large size; fontHeight is in pixels, the method expects point.
+    // This will, of course, compute a too large size; fontHeight is in pixels,
+    // the method expects point.
     ObjRef<NSString> string([[NSString alloc] initWithUTF8String: wstringToUTF8(text).c_str()]);
     #ifndef GOSU_IS_IPHONE
     ObjRef<NSDictionary> attributes([[NSDictionary alloc] initWithObjectsAndKeys:
@@ -111,8 +181,9 @@ void Gosu::drawText(Bitmap& bitmap, const wstring& text, int x, int y,
         font, NSFontAttributeName, [NSColor whiteColor], NSForegroundColorAttributeName, nil]);
     
     [NSGraphicsContext saveGraphicsState];
-    [NSGraphicsContext setCurrentContext: [NSGraphicsContext graphicsContextWithGraphicsPort:(void *)context flipped:false]];
-        [string.obj() drawAtPoint: NSPointZero withAttributes: attributes.get()];
+    [NSGraphicsContext setCurrentContext:
+        [NSGraphicsContext graphicsContextWithGraphicsPort:(void *)context flipped:false]];
+    [string.obj() drawAtPoint: NSPointZero withAttributes: attributes.get()];
     [NSGraphicsContext restoreGraphicsState];
     #endif
     CGContextRelease(context);

data/GosuImpl/Graphics/Texture.cpp

@@ -37,6 +37,11 @@ unsigned Gosu::Texture::maxTextureSize()
 
 //const unsigned Gosu::MAX_TEXTURE_SIZE = Gosu::Texture::maxTextureSize();
 
+namespace Gosu
+{
+    bool undocumentedRetrofication = false;
+}
+
 Gosu::Texture::Texture(unsigned size)
 : allocator(size, size), num(0)
 {
@@ -54,7 +59,15 @@ Gosu::Texture::Texture(unsigned size)
     glTexImage2D(GL_TEXTURE_2D, 0, 4, allocator.width(), allocator.height(), 0,
                  GL_RGBA, GL_UNSIGNED_BYTE, 0);
 #endif
-    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    
+    if (undocumentedRetrofication)
+    {
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+    }
+    else
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    
 #ifdef GOSU_IS_WIN
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
@@ -121,6 +134,7 @@ std::auto_ptr<Gosu::TexChunk>
     glBindTexture(GL_TEXTURE_2D, name);
     glTexSubImage2D(GL_TEXTURE_2D, 0, block->left, block->top, block->width, block->height,
                  format, GL_UNSIGNED_BYTE, texData);
+
     num += 1;
     return result;
 }

data/GosuImpl/IO.cpp

@@ -18,6 +18,16 @@ void Gosu::Writer::write(const void* source, std::size_t length)
     seek(length);
 }
 
+std::size_t Gosu::Buffer::size() const
+{
+    return buf.size();
+}
+
+void Gosu::Buffer::resize(std::size_t newSize)
+{
+    buf.resize(newSize);
+}
+
 void Gosu::Buffer::read(std::size_t offset, std::size_t length,
     void* destBuffer) const
 {

data/GosuImpl/InputTouch.mm

@@ -1,4 +1,13 @@
-#include <Gosu/input.hpp>
+#include <Gosu/Input.hpp>
+#include <Gosu/TextInput.hpp>
+
+struct Gosu::TextInput::Impl {};
+Gosu::TextInput::TextInput() {}
+Gosu::TextInput::~TextInput() {}
+std::wstring Gosu::TextInput::text() const { return L""; }
+void Gosu::TextInput::setText(const std::wstring& text) {}
+unsigned Gosu::TextInput::caretPos() const { return 0; }
+unsigned Gosu::TextInput::selectionStart() const { return 0; }
 
 struct Gosu::Input::Impl {
 };

data/GosuImpl/RubyGosu.swg

@@ -78,6 +78,8 @@
         $1 = Gosu::amDefault;
     else if (!strcmp(StringValueCStr(localTemporary), "additive"))
         $1 = Gosu::amAdditive;
+    else if (!strcmp(StringValueCStr(localTemporary), "multiply"))
+        $1 = Gosu::amMultiply;
     else
         SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode");
 }
@@ -159,6 +161,7 @@
 // For Ruby-only MAX_TEXTURE_SIZE
 #include <Gosu/../GosuImpl/Graphics/Texture.hpp>
 namespace Gosu {
+    void enableUndocumentedRetrofication() { extern bool undocumentedRetrofication; undocumentedRetrofication = true; }
     unsigned __maxTextureSize() { return Gosu::Texture::maxTextureSize(); }
 }
 
@@ -283,6 +286,7 @@ namespace Gosu
 //%constant unsigned MAX_TEXTURE_SIZE = Gosu::Texture::maxTextureSize();
 
 namespace Gosu {
+    void enableUndocumentedRetrofication() { extern bool undocumentedRetrofication; undocumentedRetrofication = true; }
     unsigned __maxTextureSize() { return Gosu::Texture::maxTextureSize(); }
 }
 
@@ -357,7 +361,7 @@ namespace Gosu {
 %include "../Gosu/ImageData.hpp"
 
 // Image
-// Hackishly allow the user to pass Window& instead of Graphics&.
+// Allow the user to pass Window& instead of Graphics&.
 // Also, provide convenience functions.
 
 // Typemap to return an array of images (for loadTiles)
@@ -377,7 +381,8 @@ namespace Gosu {
 %include "../Gosu/Image.hpp"
 %extend Gosu::Image {
     Image(Gosu::Window& window, VALUE source, bool tileable = false) {
-        return new Gosu::Image(window.graphics(), Gosu::loadBitmap(source), tileable);
+        return new Gosu::Image(window.graphics(),
+            Gosu::loadBitmap(source), tileable);
     }
     Image(Gosu::Window& window, VALUE source, bool tileable,
           unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight) {
@@ -451,17 +456,6 @@ namespace Gosu {
 // Does not matter that it's the Mac file, %include only analyses symbols to export, not their values.
 %include "../Gosu/ButtonsMac.hpp"
 %init %{
-    // ARGH, SWIG workaround...
-    // It doesn't understand the C++ overloading otherwise.
-    rb_eval_string("class Gosu::Image; def self.from_text(*args); args.size == 4 ? from_text4(*args) : from_text7(*args); end; end");
-
-    // ARGH, SWIG workaround 2..
-    // It won't let me have a class method and method with the same name.
-    rb_eval_string("class Gosu::Window; def button_id_to_char(id); self.class.button_id_to_char(id); end; def char_to_button_id(ch); self.class.char_to_button_id(ch); end; end");
-    
-    // ARGH, Linux workaround: instead of declaring a constant, we declare a hidden function and call it when we need to define the constant.
-    rb_eval_string("module Gosu;def self.const_missing sym;if sym == :MAX_TEXTURE_SIZE then;const_set sym, __max_texture_size;else;super;end;end;end");
-    
     GosusDarkSide::oncePerTick = GosusDarkSide::yieldToOtherRubyThreads;
 %}
 

data/GosuImpl/RubyGosu_wrap.cxx

@@ -2232,6 +2232,7 @@ static VALUE mGosu;
 // For Ruby-only MAX_TEXTURE_SIZE
 #include <Gosu/../GosuImpl/Graphics/Texture.hpp>
 namespace Gosu {
+    void enableUndocumentedRetrofication() { extern bool undocumentedRetrofication; undocumentedRetrofication = true; }
     unsigned __maxTextureSize() { return Gosu::Texture::maxTextureSize(); }
 }
 
@@ -2573,7 +2574,8 @@ SWIG_AsVal_bool (VALUE obj, bool *val)
 }
 
 SWIGINTERN Gosu::Image *new_Gosu_Image__SWIG_0(Gosu::Window &window,VALUE source,bool tileable=false){
-        return new Gosu::Image(window.graphics(), Gosu::loadBitmap(source), tileable);
+        return new Gosu::Image(window.graphics(),
+            Gosu::loadBitmap(source), tileable);
     }
 SWIGINTERN Gosu::Image *new_Gosu_Image__SWIG_1(Gosu::Window &window,VALUE source,bool tileable,unsigned int srcX,unsigned int srcY,unsigned int srcWidth,unsigned int srcHeight){
         return new Gosu::Image(window.graphics(), Gosu::loadBitmap(source),
@@ -2851,7 +2853,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_gosu_to_radian_scale(int argc, VALUE *argv, VALUE self) {
+_wrap_degrees_to_radians(int argc, VALUE *argv, VALUE self) {
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
@@ -2863,12 +2865,12 @@ _wrap_gosu_to_radian_scale(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_double(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","Gosu::gosuToRadianScale", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","Gosu::degreesToRadians", 1, argv[0] ));
   } 
   arg1 = static_cast< double >(val1);
   {
     try {
-      result = (double)Gosu::gosuToRadianScale(arg1);
+      result = (double)Gosu::degreesToRadians(arg1);
     } catch(const std::runtime_error& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
@@ -2881,7 +2883,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_radians_scale_to_gosu(int argc, VALUE *argv, VALUE self) {
+_wrap_radians_to_degrees(int argc, VALUE *argv, VALUE self) {
   double arg1 ;
   double val1 ;
   int ecode1 = 0 ;
@@ -2893,12 +2895,12 @@ _wrap_radians_scale_to_gosu(int argc, VALUE *argv, VALUE self) {
   }
   ecode1 = SWIG_AsVal_double(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","Gosu::radiansScaleToGosu", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "double","Gosu::radiansToDegrees", 1, argv[0] ));
   } 
   arg1 = static_cast< double >(val1);
   {
     try {
-      result = (double)Gosu::radiansScaleToGosu(arg1);
+      result = (double)Gosu::radiansToDegrees(arg1);
     } catch(const std::runtime_error& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
@@ -3240,6 +3242,24 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_enable_undocumented_retrofication(int argc, VALUE *argv, VALUE self) {
+  if ((argc < 0) || (argc > 0)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 0)",argc); SWIG_fail;
+  }
+  {
+    try {
+      Gosu::enableUndocumentedRetrofication();
+    } catch(const std::runtime_error& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap___max_texture_size(int argc, VALUE *argv, VALUE self) {
   unsigned int result;
@@ -4677,6 +4697,8 @@ _wrap_Font_draw(int argc, VALUE *argv, VALUE self) {
       arg9 = Gosu::amDefault;
       else if (!strcmp(StringValueCStr(localTemporary), "additive"))
       arg9 = Gosu::amAdditive;
+      else if (!strcmp(StringValueCStr(localTemporary), "multiply"))
+      arg9 = Gosu::amMultiply;
       else
       SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode");
     }
@@ -4797,6 +4819,8 @@ _wrap_Font_draw_rel(int argc, VALUE *argv, VALUE self) {
       arg11 = Gosu::amDefault;
       else if (!strcmp(StringValueCStr(localTemporary), "additive"))
       arg11 = Gosu::amAdditive;
+      else if (!strcmp(StringValueCStr(localTemporary), "multiply"))
+      arg11 = Gosu::amMultiply;
       else
       SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode");
     }
@@ -4909,6 +4933,8 @@ _wrap_Font_draw_rot(int argc, VALUE *argv, VALUE self) {
       arg10 = Gosu::amDefault;
       else if (!strcmp(StringValueCStr(localTemporary), "additive"))
       arg10 = Gosu::amAdditive;
+      else if (!strcmp(StringValueCStr(localTemporary), "multiply"))
+      arg10 = Gosu::amMultiply;
       else
       SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode");
     }
@@ -5453,6 +5479,8 @@ _wrap_Image_draw(int argc, VALUE *argv, VALUE self) {
       arg8 = Gosu::amDefault;
       else if (!strcmp(StringValueCStr(localTemporary), "additive"))
       arg8 = Gosu::amAdditive;
+      else if (!strcmp(StringValueCStr(localTemporary), "multiply"))
+      arg8 = Gosu::amMultiply;
       else
       SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode");
     }
@@ -5580,6 +5608,8 @@ _wrap_Image_draw_mod(int argc, VALUE *argv, VALUE self) {
       arg11 = Gosu::amDefault;
       else if (!strcmp(StringValueCStr(localTemporary), "additive"))
       arg11 = Gosu::amAdditive;
+      else if (!strcmp(StringValueCStr(localTemporary), "multiply"))
+      arg11 = Gosu::amMultiply;
       else
       SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode");
     }
@@ -5705,6 +5735,8 @@ _wrap_Image_draw_rot(int argc, VALUE *argv, VALUE self) {
       arg11 = Gosu::amDefault;
       else if (!strcmp(StringValueCStr(localTemporary), "additive"))
       arg11 = Gosu::amAdditive;
+      else if (!strcmp(StringValueCStr(localTemporary), "multiply"))
+      arg11 = Gosu::amMultiply;
       else
       SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode");
     }
@@ -6086,6 +6118,8 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
       arg15 = Gosu::amDefault;
       else if (!strcmp(StringValueCStr(localTemporary), "additive"))
       arg15 = Gosu::amAdditive;
+      else if (!strcmp(StringValueCStr(localTemporary), "multiply"))
+      arg15 = Gosu::amMultiply;
       else
       SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode");
     }
@@ -8045,6 +8079,8 @@ _wrap_Window_draw_line(int argc, VALUE *argv, VALUE self) {
       arg9 = Gosu::amDefault;
       else if (!strcmp(StringValueCStr(localTemporary), "additive"))
       arg9 = Gosu::amAdditive;
+      else if (!strcmp(StringValueCStr(localTemporary), "multiply"))
+      arg9 = Gosu::amMultiply;
       else
       SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode");
     }
@@ -8178,6 +8214,8 @@ _wrap_Window_draw_triangle(int argc, VALUE *argv, VALUE self) {
       arg12 = Gosu::amDefault;
       else if (!strcmp(StringValueCStr(localTemporary), "additive"))
       arg12 = Gosu::amAdditive;
+      else if (!strcmp(StringValueCStr(localTemporary), "multiply"))
+      arg12 = Gosu::amMultiply;
       else
       SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode");
     }
@@ -8339,6 +8377,8 @@ _wrap_Window_draw_quad(int argc, VALUE *argv, VALUE self) {
       arg15 = Gosu::amDefault;
       else if (!strcmp(StringValueCStr(localTemporary), "additive"))
       arg15 = Gosu::amAdditive;
+      else if (!strcmp(StringValueCStr(localTemporary), "multiply"))
+      arg15 = Gosu::amMultiply;
       else
       SWIG_exception_fail(SWIG_ValueError, "invalid alpha mode");
     }
@@ -9235,12 +9275,12 @@ 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 >(7)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(18)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.18"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(19)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.19"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
-  rb_define_module_function(mGosu, "gosu_to_radian_scale", VALUEFUNC(_wrap_gosu_to_radian_scale), -1);
-  rb_define_module_function(mGosu, "radians_scale_to_gosu", VALUEFUNC(_wrap_radians_scale_to_gosu), -1);
+  rb_define_module_function(mGosu, "degrees_to_radians", VALUEFUNC(_wrap_degrees_to_radians), -1);
+  rb_define_module_function(mGosu, "radians_to_degrees", VALUEFUNC(_wrap_radians_to_degrees), -1);
   rb_define_module_function(mGosu, "offset_x", VALUEFUNC(_wrap_offset_x), -1);
   rb_define_module_function(mGosu, "offset_y", VALUEFUNC(_wrap_offset_y), -1);
   rb_define_module_function(mGosu, "angle", VALUEFUNC(_wrap_angle), -1);
@@ -9250,6 +9290,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_module_function(mGosu, "default_font_name", VALUEFUNC(_wrap_default_font_name), -1);
   rb_define_module_function(mGosu, "screen_width", VALUEFUNC(_wrap_screen_width), -1);
   rb_define_module_function(mGosu, "screen_height", VALUEFUNC(_wrap_screen_height), -1);
+  rb_define_module_function(mGosu, "enable_undocumented_retrofication", VALUEFUNC(_wrap_enable_undocumented_retrofication), -1);
   rb_define_module_function(mGosu, "__max_texture_size", VALUEFUNC(_wrap___max_texture_size), -1);
   
   SwigClassColor.klass = rb_define_class_under(mGosu, "Color", rb_cObject);
@@ -9512,17 +9553,6 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "NumButtons", SWIG_From_int(static_cast< int >(Gosu::numButtons)));
   rb_define_const(mGosu, "NoButton", SWIG_From_int(static_cast< int >(Gosu::noButton)));
   
-  // ARGH, SWIG workaround...
-  // It doesn't understand the C++ overloading otherwise.
-  rb_eval_string("class Gosu::Image; def self.from_text(*args); args.size == 4 ? from_text4(*args) : from_text7(*args); end; end");
-  
-  // ARGH, SWIG workaround 2..
-  // It won't let me have a class method and method with the same name.
-  rb_eval_string("class Gosu::Window; def button_id_to_char(id); self.class.button_id_to_char(id); end; def char_to_button_id(ch); self.class.char_to_button_id(ch); end; end");
-  
-  // ARGH, Linux workaround: instead of declaring a constant, we declare a hidden function and call it when we need to define the constant.
-  rb_eval_string("module Gosu;def self.const_missing sym;if sym == :MAX_TEXTURE_SIZE then;const_set sym, __max_texture_size;else;super;end;end;end");
-  
   GosusDarkSide::oncePerTick = GosusDarkSide::yieldToOtherRubyThreads;
   
   rb_define_module_function(mGosu, "disown_TextInput", VALUEFUNC(_wrap_disown_TextInput), -1);