gosu 0.8.7.2-x64-mingw32 → 0.9.0-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9012667b595b00d15d26b07ed47da2d923602c2
-  data.tar.gz: 1fb007b4d50bd1dad15cf70920abcb689747c77b
+  metadata.gz: 9704d7a5bf616373600f78e20ec4ef65d7600538
+  data.tar.gz: b4d4947e6e3dcf31ee013c5aad10b3614ebef51f
 SHA512:
-  metadata.gz: d88d930fa97a27cd49cf2d509a743f051a04e8ad6277aa85dbbd0f175391a3dae346adde70256cb7cc7820c417ad287305ec2baed84b44b9d29483fd6807a4cf
-  data.tar.gz: 4bd4ad9a755c61704e24b6c7afd28f56040691f75535e2b73b4ae446687709c9c4df6c406b5fdccc515ea92d7b4fcb7e1c54a666d630b2d710ec9ee9aa897b3a
+  metadata.gz: 0ed0a0e725b7232d3bfe6c805ccb5cf108405964c58f00f423f862923f526f937a2935918960f7a4352237c3a6f5e911a14b091db66d11be4f2d3b45b7d09472
+  data.tar.gz: 2a07ea83ac53bc8b1c1d11aa64a52e457a91b3b61fc420b86d5234e282e7d254224b5e8c1a49e06615251c262598997363e9cccebe97305f307d0ec878fb4035

data/Gosu/Audio.hpp

@@ -36,6 +36,7 @@ namespace Gosu
 
 	public:
         //! Called by Sample, do not use.
+        // TODO: See if we can use 'friend' here.
 		SampleInstance(int handle, int extra);
 
 		bool playing() const;

data/Gosu/Font.hpp

@@ -8,6 +8,7 @@
 #include <Gosu/Color.hpp>
 #include <Gosu/GraphicsBase.hpp>
 #include <Gosu/Platform.hpp>
+#include <Gosu/Text.hpp>
 #include <Gosu/TR1.hpp>
 #include <string>
 
@@ -29,8 +30,8 @@ namespace Gosu
         //! \param fontHeight Height of the font, in pixels.
         //! \param fontFlags Flags used to render individual characters of
         //!        the font.
-        Font(Graphics& graphics, const std::wstring& fontName,
-            unsigned fontHeight, unsigned fontFlags = ffBold);
+        Font(unsigned fontHeight, const std::wstring& fontName = defaultFontName(),
+            unsigned fontFlags = ffBold);
         
         //! Returns the name of the font that was used to create it.
         std::wstring name() const;
@@ -70,10 +71,13 @@ namespace Gosu
         void setImage(wchar_t wc, const Gosu::Image& image);
         
         #ifndef SWIG
+        GOSU_DEPRECATED Font(Graphics& graphics, const std::wstring& fontName,
+            unsigned fontHeight, unsigned fontFlags = ffBold);
+        
         GOSU_DEPRECATED
         #endif
-        //! DEPRECATED: Analogous to draw, but rotates the text by a given angle. Use 
-        //! a simple pushTransform to achieve the same effect.
+        //! DEPRECATED: Analogous to draw, but rotates the text by a given angle.
+        //! Use Graphics::pushTransform to achieve the same effect.
         void drawRot(const std::wstring& text, double x, double y, ZPos z, double angle,
             double factorX = 1, double factorY = 1,
             Color c = Color::WHITE, AlphaMode mode = amDefault) const;

data/Gosu/Graphics.hpp

@@ -12,6 +12,8 @@
 
 namespace Gosu
 {
+    struct DrawOp;
+    
     //! Returns the maximum size of an texture that will be allocated
     //! internally by Gosu.
     //! Useful when extending Gosu using OpenGL.
@@ -20,9 +22,15 @@ namespace Gosu
     //! Serves as the target of all drawing and provides primitive drawing
     //! functionality.
     //! Usually created internally by Gosu::Window.
+    //
+    // TODO: This class should be separated into a Gosu::Viewport class, which
+    // carries the width/height/fullscreen attributes, and global Gosu::drawFoo
+    // functions. A Window then has a Viewport, and in theory, multiple windows
+    // could have their own viewports etc.
     class Graphics
     {
         struct Impl;
+        
         const GOSU_UNIQUE_PTR<Impl> pimpl;
         
     #if defined(GOSU_CPP11_ENABLED)
@@ -37,7 +45,6 @@ namespace Gosu
         Graphics(unsigned physicalWidth, unsigned physicalHeight, bool fullscreen);
         ~Graphics();
 
-        // TODO: Replace by setBaseTransform()
         void setResolution(unsigned virtualWidth, unsigned virtualHeight,
             double horizontalBlackBarWidth = 0, double verticalBlackBarHeight = 0);
         
@@ -50,65 +57,68 @@ namespace Gosu
         bool begin(Color clearWithColor = Color::BLACK);
         //! Every call to begin must have a matching call to end.
         void end();
+        
         //! Flushes the Z queue to the screen and starts a new one.
         //! Useful for games that are *very* composite in nature (splitscreen).
-        void flush();
+        static void flush();
         
         //! Finishes all pending Gosu drawing operations and executes
         //! the following OpenGL code in a clean environment.
-        void beginGL();
+        static void beginGL();
         //! Resets Gosu into its default rendering state.
-        void endGL();
+        static void endGL();
         //! Schedules a custom GL functor to be executed at a certain Z level.
         //! The functor is called in a clean GL context (as given by beginGL/endGL).
         //! Gosu's rendering up to the Z level may not yet have been glFlush()ed.
         //! Note: You may not call any Gosu rendering functions from within the
         //! functor, and you must schedule it from within Window::draw's call tree.
-        void scheduleGL(const std::tr1::function<void()>& functor, ZPos z);
+        static void scheduleGL(const std::tr1::function<void()>& functor, ZPos z);
         
         //! Enables clipping to a specified rectangle.
-        void beginClipping(double x, double y, double width, double height);
+        static void beginClipping(double x, double y, double width, double height);
         //! Disables clipping.
-        void endClipping();
+        static void endClipping();
         
         //! Starts recording a macro. Cannot be nested.
-        void beginRecording();
+        static void beginRecording();
         //! Finishes building the macro and returns it as a drawable object.
         //! The width and height affect nothing about the recording process,
         //! the resulting macro will simply return these values when you ask
         //! it.
         //! Most usually, the return value is passed to Image::Image().
-        GOSU_UNIQUE_PTR<Gosu::ImageData> endRecording(int width, int height);
+        static GOSU_UNIQUE_PTR<Gosu::ImageData> endRecording(int width, int height);
         
         //! Pushes one transformation onto the transformation stack.
-        void pushTransform(const Transform& transform);
+        static void pushTransform(const Transform& transform);
         //! Pops one transformation from the transformation stack.
-        void popTransform();
+        static void popTransform();
 
         //! Draws a line from one point to another (last pixel exclusive).
         //! Note: OpenGL lines are not reliable at all and may have a missing pixel at the start
         //! or end point. Please only use this for debugging purposes. Otherwise, use a quad or
         //! image to simulate lines, or contribute a better drawLine to Gosu.
-        void drawLine(double x1, double y1, Color c1,
+        static void drawLine(double x1, double y1, Color c1,
             double x2, double y2, Color c2,
             ZPos z, AlphaMode mode = amDefault);
 
-        void drawTriangle(double x1, double y1, Color c1,
+        static void drawTriangle(double x1, double y1, Color c1,
             double x2, double y2, Color c2,
             double x3, double y3, Color c3,
             ZPos z, AlphaMode mode = amDefault);
 
-        void drawQuad(double x1, double y1, Color c1,
+        static void drawQuad(double x1, double y1, Color c1,
             double x2, double y2, Color c2,
             double x3, double y3, Color c3,
             double x4, double y4, Color c4,
             ZPos z, AlphaMode mode = amDefault);
+        
+        //! For internal use only.
+        static void scheduleDrawOp(const DrawOp& op);
 
-        //! Turns a portion of a bitmap into something that can be drawn on
-        //! this graphics object.
-        GOSU_UNIQUE_PTR<ImageData> createImage(const Bitmap& src,
+        //! Turns a portion of a bitmap into something that can be drawn on a Graphics object.
+        static GOSU_UNIQUE_PTR<ImageData> createImage(const Bitmap& src,
             unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-            unsigned borderFlags);
+            unsigned imageFlags);
     };
 }
 

data/Gosu/GraphicsBase.hpp

@@ -31,11 +31,11 @@ namespace Gosu
         //! The color's channels will be multiplied with each other.
         MULTIPLY
     };
-    GOSU_DEPRECATED constexpr AlphaMode amDefault = AlphaMode::DEFAULT;
-    GOSU_DEPRECATED constexpr AlphaMode amInterpolate = AlphaMode::INTERPOLATE;
-    GOSU_DEPRECATED constexpr AlphaMode amAdd = AlphaMode::ADD;
-    GOSU_DEPRECATED constexpr AlphaMode amAdditive = AlphaMode::ADD;
-    GOSU_DEPRECATED constexpr AlphaMode amMultiply = AlphaMode::MULTIPLY;
+    constexpr AlphaMode amDefault = AlphaMode::DEFAULT;
+    constexpr AlphaMode amInterpolate = AlphaMode::INTERPOLATE;
+    constexpr AlphaMode amAdd = AlphaMode::ADD;
+    constexpr AlphaMode amAdditive = AlphaMode::ADD;
+    constexpr AlphaMode amMultiply = AlphaMode::MULTIPLY;
 #else
     enum AlphaMode
     {
@@ -68,15 +68,19 @@ namespace Gosu
         taJustify
     };
     
-    //! Flags that affect the tileability of an image.
-    enum BorderFlags
+    enum ImageFlags
     {
-        bfSmooth = 0,
-        bfTileableLeft = 1,
-        bfTileableTop = 2,
-        bfTileableRight = 4,
-        bfTileableBottom = 8,
-        bfTileable = bfTileableLeft | bfTileableTop | bfTileableRight | bfTileableBottom
+        //! Flags that affect the tileability of an image.
+        ifSmooth = 0,
+        // Note: No constant for '1', but Gosu treats '1' as ifTileable for
+        // backward compatibility reasons (this used to be a bool).
+        ifTileableLeft = 2,
+        ifTileableTop = 4,
+        ifTileableRight = 8,
+        ifTileableBottom = 16,
+        ifTileable = ifTileableLeft | ifTileableTop | ifTileableRight | ifTileableBottom
+        
+        // TODO - ifNearestNeighbor to replace undocumentedRetrofication.
     };
     
 #ifdef GOSU_IS_MAC

data/Gosu/Image.hpp

@@ -19,31 +19,29 @@ namespace Gosu
         std::tr1::shared_ptr<ImageData> data;
 
     public:
-        //! Loads an image from a given filename that can be drawn onto
-        //! graphics.
-        //! This constructor can handle PNG and BMP images. A color key of #ff00ff is
-        //! automatically applied to BMP type images. For more flexibility, use the
-        //! corresponding constructor that uses a Bitmap object.
-        Image(Graphics& graphics, const std::wstring& filename,
-              bool tileable = false);
-        //! Loads a portion of the the image at the given filename that can be
-        //! drawn onto graphics.
-        //! This constructor can handle PNG and BMP images. A color key of #ff00ff is
-        //! automatically applied to BMP type images. For more flexibility, use the
-        //! corresponding constructor that uses a Bitmap object.
-        Image(Graphics& graphics, const std::wstring& filename, unsigned srcX,
+        //! Loads an image from a given filename.
+        //!
+        //! A color key of #ff00ff is automatically applied to BMP image files.
+        //! For more flexibility, use the corresponding constructor that uses a Bitmap object.
+        explicit Image(const std::wstring& filename,
+            unsigned imageFlags = ifSmooth);
+        
+        //! Loads a portion of the the image at the given filename..
+        //!
+        //! A color key of #ff00ff is automatically applied to BMP image files.
+        //! For more flexibility, use the corresponding constructor that uses a Bitmap object.
+        Image(const std::wstring& filename, unsigned srcX,
               unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-              bool tileable = false);
+              unsigned imageFlags = ifSmooth);
         
-        //! Converts the given bitmap into an image that can be drawn onto
-        //! graphics.
-        Image(Graphics& graphics, const Bitmap& source,
-            bool tileable = false);
-        //! Converts a portion of the given bitmap into an image that can be
-        //! drawn onto graphics.
-        Image(Graphics& graphics, const Bitmap& source, unsigned srcX,
+        //! Converts the given bitmap into an image.
+        explicit Image(const Bitmap& source,
+            unsigned imageFlags = ifSmooth);
+        
+        //! Converts a portion of the given bitmap into an image.
+        Image(const Bitmap& source, unsigned srcX,
             unsigned srcY, unsigned srcWidth, unsigned srcHeight,
-            bool tileable = false);
+            unsigned imageFlags = ifSmooth);
         
         //! Creates an Image from a user-supplied instance of the ImageData interface.
         explicit Image(GOSU_UNIQUE_PTR<ImageData> data);
@@ -56,8 +54,8 @@ namespace Gosu
             double factorX = 1, double factorY = 1,
             Color c = Color::WHITE,
             AlphaMode mode = amDefault) const;
-        //! Like draw(), but allows to give modulation colors for all four
-        //! corners.
+        //! Like draw(), but with modulation colors for all four corners.
+        //! TODO: This can be an overload of draw() - in any case the name is terrible.
         void drawMod(double x, double y, ZPos z,
             double factorX, double factorY,
             Color c1, Color c2, Color c3, Color c4,
@@ -77,46 +75,57 @@ namespace Gosu
             double factorX = 1, double factorY = 1,
             Color c = Color::WHITE,
             AlphaMode mode = amDefault) const;
-
+        
+        #ifndef SWIG
         //! Provides access to the underlying image data object.
         ImageData& getData() const;
+        
+        GOSU_DEPRECATED Image(Graphics& graphics, const std::wstring& filename,
+              bool tileable = false);
+        GOSU_DEPRECATED Image(Graphics& graphics, const std::wstring& filename, unsigned srcX,
+              unsigned srcY, unsigned srcWidth, unsigned srcHeight,
+              bool tileable = false);
+        GOSU_DEPRECATED Image(Graphics& graphics, const Bitmap& source,
+              bool tileable = false);
+        GOSU_DEPRECATED Image(Graphics& graphics, const Bitmap& source, unsigned srcX,
+              unsigned srcY, unsigned srcWidth, unsigned srcHeight,
+              bool tileable = false);
+        #endif
     };
     
-    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);
+    #ifndef SWIG
+    //! Convenience function that slices an image file into a grid and creates images from them.
+    //! \param tileWidth If positive, specifies the width of one tile in pixels.
+    //! If negative, the bitmap is divided into -tileWidth rows.
+    //! \param tileHeight See tileWidth.
+    std::vector<Gosu::Image> loadTiles(const Bitmap& bmp,
+        int tileWidth, int tileHeight, unsigned imageFlags = ifSmooth);
     
-    //! 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
-    //! pixels. If negative, the bitmap is divided into -tileWidth rows.
+    //! Convenience function that slices a bitmap into a grid and creates images from them.
+    //! \param tileWidth If positive, specifies the width of one tile in pixels.
+    //! If negative, the bitmap is divided into -tileWidth rows.
     //! \param tileHeight See tileWidth.
-    //! \param appendTo STL container to which the images will be appended.
-    //! Must provide a push_back member function; vector<tr1::shared_ptr<Image>>
-    //! or boost::ptr_vector<Image> are good choices.
+    std::vector<Gosu::Image> loadTiles(const std::wstring& filename,
+        int tileWidth, int tileHeight, unsigned imageFlags = ifSmooth);
+    
+    GOSU_DEPRECATED std::vector<Gosu::Image> loadTiles(Graphics& graphics, const Bitmap& bmp, int tileWidth, int tileHeight, bool tileable);
+    GOSU_DEPRECATED std::vector<Gosu::Image> loadTiles(Graphics& graphics, const std::wstring& bmp, int tileWidth, int tileHeight, bool tileable);
     template<typename Container>
-    void imagesFromTiledBitmap(Graphics& graphics, const std::wstring& filename, int tileWidth, int tileHeight, bool tileable, Container& appendTo)
+    GOSU_DEPRECATED void imagesFromTiledBitmap(Graphics& graphics, const std::wstring& filename, int tileWidth, int tileHeight, bool tileable, Container& 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
-    //! pixels. If negative, the bitmap is divided into -tileWidth rows.
-    //! \param tileHeight See tileWidth.
-    //! \param appendTo STL container to which the images will be appended.
-    //! Must provide a push_back member function; std::vector<std::tr1::shared_ptr<Image>>
-    //! or boost::ptr_vector<Image> are good choices.
     template<typename Container>
-    void imagesFromTiledBitmap(Graphics& graphics, const Bitmap& bmp,
+    GOSU_DEPRECATED void imagesFromTiledBitmap(Graphics& graphics, const Bitmap& bmp,
         int tileWidth, int tileHeight, bool tileable, Container& appendTo)
     {
         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])));
     }
+    #endif
 }
 
 #endif

data/Gosu/Input.hpp

@@ -103,7 +103,7 @@ namespace Gosu
         
         //! Returns true if a button is currently pressed.
         //! Updated every tick.
-        bool down(Button btn) const;
+        static bool down(Button btn);
         
         //! Returns the horizontal position of the mouse relative to the top
         //! left corner of the window given to Input's constructor.
@@ -112,8 +112,8 @@ namespace Gosu
         double mouseY() const;
         
         //! Immediately moves the mouse as far towards the desired position
-        //! as possible. x and y are relativ to the window just as in the mouse
-        //! position accessors.
+        //! as possible. x and y are relative to the window, just as in mouseX()
+        //! and mouseY(), so (0, 0) is the top left corner of the window..
         void setMousePosition(double x, double y);
 
         // Undocumented for the moment. Also applies to currentTouches().
@@ -132,11 +132,11 @@ namespace Gosu
         void update();
         
         //! Assignable events that are called by update. You can bind these to your own functions.
-        //! If you use the Window class, it will assign forward these to its own methods.
+        //! If you use the Window class, it will assign these to its own methods.
         std::tr1::function<void (Button)> onButtonDown, onButtonUp;
         
         //! Assignable events that are called by update. You can bind these to your own functions.
-        //! If you use the Window class, it will assign forward these to its own methods.
+        //! If you use the Window class, it will assign these to its own methods.
         std::tr1::function<void (Touch)> onTouchBegan, onTouchMoved, onTouchEnded;
         
         //! Returns the currently active TextInput instance, or 0.

data/Gosu/Version.hpp

@@ -2,9 +2,9 @@
 #define GOSU_VERSION_HPP
 
 #define GOSU_MAJOR_VERSION 0
-#define GOSU_MINOR_VERSION 8
-#define GOSU_POINT_VERSION 7
-#define GOSU_VERSION "0.8.7.2"
+#define GOSU_MINOR_VERSION 9
+#define GOSU_POINT_VERSION 0
+#define GOSU_VERSION "0.9.0"
 
 #define GOSU_COPYRIGHT_NOTICE \
     "This software uses the following third-party libraries:\n" \

data/Gosu/Window.hpp

@@ -57,7 +57,7 @@ namespace Gosu
         //! \param height See width.
         //! \param updateInterval Interval in milliseconds between two calls
         //! to the update member function.
-        Window(unsigned width, unsigned height, bool fullscreen,
+        Window(unsigned width, unsigned height, bool fullscreen = false,
             double updateInterval = 16.666666);
         virtual ~Window();
 
@@ -113,13 +113,6 @@ namespace Gosu
         const Input& input() const;
         Input& input();
         
-        #ifdef GOSU_IS_UNIX
-        // Context for creating shared contexts.
-        // Only on Unices (so far).
-        typedef std::tr1::shared_ptr<std::tr1::function<void()> > SharedContext;
-        SharedContext createSharedContext();
-        #endif
-        
         #ifdef GOSU_IS_IPHONE
         void* rootViewController() const;
         // iPhone-only callbacks for touch events.

data/lib/gosu/patches.rb

@@ -1,76 +1,112 @@
-# Extend Numeric with simple angle conversion methods.
+# Extend Numeric with simple angle conversion methods,
+# for easier integration with Chipmunk.
 class ::Numeric
   def degrees_to_radians
     self * Math::PI / 180.0
   end
+  
   def radians_to_degrees
     self * 180.0 / Math::PI
   end
+  
   def gosu_to_radians
     (self - 90) * Math::PI / 180.0
   end
+  
   def radians_to_gosu
     self * 180.0 / Math::PI + 90
   end
 end
-    
-# Backwards compatibility: import constants into Gosu::Button.
+
+# Backwards compatibility:
+# Import constants into Gosu::Button.
 module Gosu::Button
   Gosu.constants.each { |c| const_set(c, Gosu.const_get(c)) }
 end
 
-# Backwards compatibility: Window arguments to Sample and Song
+# Backwards compatibility:
+# The old version of from_text has been deprecated in Gosu 0.9.
+class Gosu::Image
+  class << self
+    alias from_text_without_window from_text
+  end
+  
+  def self.from_text(*args)
+    if args.size == 4
+      from_text_without_window(args[1], args[3], :font => args[2])
+    elsif args.size == 7
+      from_text_without_window(args[1], args[3], :font => args[2],
+        :spacing => args[4], :width => args[5], :align => args[6])
+    else
+      from_text_without_window(*args)
+    end
+  end
+end
+
+# Backwards compatibility:
+# Passing a Window Sample#initialize has been deprecated in Gosu 0.7.17.
 class Gosu::Sample
-  alias initialize_ initialize
+  alias initialize_without_window initialize
   
   def initialize(*args)
     args.shift if args.first.is_a? Gosu::Window
-    initialize_(*args)
+    initialize_without_window(*args)
   end
 end
+
+# Backwards compatibility:
+# Passing a Window to Song#initialize has been deprecated in Gosu 0.7.17.
 class Gosu::Song
-  alias initialize_ initialize
+  alias initialize_without_window initialize
   
   def initialize(*args)
     args.shift if args.first.is_a? Gosu::Window
-    initialize_(*args)
+    initialize_without_window(*args)
   end
 end
 
-# Color constants (SWIG messes up constants somehow)
-class Gosu::Color
-  class Constant < Gosu::Color
-  private
-    def alpha=; end
-    def red=; end
-    def green=; end
-    def blue=; end
-    def hue=; end
-    def saturation=; end
-    def value=; end
+# Color constants.
+# This is cleaner than having SWIG define them.
+module Gosu
+  class ImmutableColor < Color
+    private :alpha=, :red=, :green=, :blue=, :hue=, :saturation=, :value=
   end
   
-  NONE    = Gosu::Color::Constant.argb(0x00000000)
-  BLACK   = Gosu::Color::Constant.argb(0xff000000)
-  GRAY    = Gosu::Color::Constant.argb(0xff808080)
-  WHITE   = Gosu::Color::Constant.argb(0xffffffff)            
-  AQUA    = Gosu::Color::Constant.argb(0xff00ffff)
-  RED     = Gosu::Color::Constant.argb(0xffff0000)
-  GREEN   = Gosu::Color::Constant.argb(0xff00ff00)
-  BLUE    = Gosu::Color::Constant.argb(0xff0000ff)
-  YELLOW  = Gosu::Color::Constant.argb(0xffffff00)
-  FUCHSIA = Gosu::Color::Constant.argb(0xffff00ff)
-  CYAN    = Gosu::Color::Constant.argb(0xff00ffff)
+  class Color
+    NONE    = Gosu::ImmutableColor.new(0x00_000000)
+    BLACK   = Gosu::ImmutableColor.new(0xff_000000)
+    GRAY    = Gosu::ImmutableColor.new(0xff_808080)
+    WHITE   = Gosu::ImmutableColor.new(0xff_ffffff)
+    AQUA    = Gosu::ImmutableColor.new(0xff_00ffff)
+    RED     = Gosu::ImmutableColor.new(0xff_ff0000)
+    GREEN   = Gosu::ImmutableColor.new(0xff_00ff00)
+    BLUE    = Gosu::ImmutableColor.new(0xff_0000ff)
+    YELLOW  = Gosu::ImmutableColor.new(0xff_ffff00)
+    FUCHSIA = Gosu::ImmutableColor.new(0xff_ff00ff)
+    CYAN    = Gosu::ImmutableColor.new(0xff_00ffff)
+  end
 end
 
-# Instance methods for button_id_to_char and char_to_button_id
 class Gosu::Window
-  def button_id_to_char(id)
-    self.class.button_id_to_char(id)
+  # Backwards compatibility:
+  # Class methods that have been turned into module methods.
+  def self.button_id_to_char(id)
+    Gosu.button_id_to_char(id)
+  end
+  
+  def self.char_to_button_id(ch)
+    Gosu.char_to_button_id(ch)
   end
   
-  def char_to_button_id(ch)
-    self.class.char_to_button_id(ch)
+  # Backwards compatibility:
+  # Instance methods taht have been turned into module methods.
+  %w(draw_line draw_triangle draw_quad
+     flush gl clip_to record
+     transform translate rotate scale
+     button_id_to_char char_to_button_id button_down?).each do |method|
+    define_method method.to_sym do |*args, &block|
+      Gosu.send method, *args, &block
+    end
   end
 end