gosu 0.7.29-i386-mingw32 → 0.7.30-i386-mingw32

data/Gosu/Audio.hpp

@@ -20,7 +20,9 @@
 namespace Gosu
 {
     // Deprecated.
-    class Audio;
+    #ifndef SWIG
+    GOSU_DEPRECATED class Audio;
+    #endif
 
     //! An instance of a Sample playing. Can be used to stop sounds dynamically,
     //! or to check if they are finished.
@@ -94,8 +96,6 @@ namespace Gosu
         SampleInstance playPan(double pan, double volume = 1, double speed = 1,
             bool looping = false) const;
 
-
-        // Deprecated.
         #ifndef SWIG
         GOSU_DEPRECATED Sample(Audio& audio, const std::wstring& filename);
         GOSU_DEPRECATED Sample(Audio& audio, Reader reader);
@@ -150,16 +150,8 @@ namespace Gosu
         //! Called every tick by Window for management purposes.
         static void update();
 
-        // Deprecated.
         #ifndef SWIG
-        //! There are two types of songs that can be loaded as a Song: Streamed
-        //! songs (like OGG) and modules (like MOD or XM).
-        enum Type
-        {
-            stStream,
-            stModule
-        };
-
+        enum Type { stStream, stModule };
         GOSU_DEPRECATED Song(Audio&, const std::wstring& filename);
         GOSU_DEPRECATED Song(Audio&, Type type, Reader reader);
         #endif

data/Gosu/Bitmap.hpp

@@ -7,6 +7,7 @@
 #include <Gosu/Color.hpp>
 #include <Gosu/Fwd.hpp>
 #include <Gosu/GraphicsBase.hpp>
+#include <Gosu/Platform.hpp>
 #include <boost/scoped_ptr.hpp>
 #include <string>
 #include <vector>
@@ -23,18 +24,16 @@ namespace Gosu
         std::vector<Color> pixels;
 
     public:
-        Bitmap();
+        Bitmap() : w(0), h(0) {}
+        Bitmap(unsigned w, unsigned h, Color c = Color::NONE) : w(w), h(h), pixels(w * h, c) {}
 
-        unsigned width() const { return w; }
+        unsigned width()  const { return w; }
         unsigned height() const { return h; }
 
         void swap(Bitmap& other);
 
         void resize(unsigned width, unsigned height, Color c = Color::NONE);
-
-        void fill(Color c);
-        void replace(Color oldColor, Color newColor);
-
+        
         //! Returns the color at the specified position. x and y must be on the
         //! bitmap.
         Color getPixel(unsigned x, unsigned y) const { return pixels[y * w + x]; }
@@ -56,32 +55,43 @@ namespace Gosu
 		
 		//! Direct access to the array of color values. May be useful for optimized
         //! OpenGL operations.
-        const unsigned* data() const { return reinterpret_cast<const unsigned*>(&pixels[0]); }
-        unsigned* data() { return reinterpret_cast<unsigned*>(&pixels[0]); }
-    };
+        const Color* data() const { return &pixels[0]; }
+        Color* data()             { return &pixels[0]; }
 
-    //! Loads a Windows or OS/2 BMP file into the given bitmap.
-    Reader loadFromBMP(Bitmap& bmp, Reader reader);
-    //! Saves the contents of the given bitmap into windows BMP file data.
-    Writer saveToBMP(const Bitmap& bmp, Writer writer);
-    //! Loads a PNG file into the given bitmap.
-    Reader loadFromPNG(Bitmap& bmp, Reader reader);
-    //! Saves the contents of the given bitmap into PNG file data, 24 bits.
-    Writer saveToPNG(const Bitmap& bmp, Writer writer);
+        // Work with data() instead if you need fast operations.
+        GOSU_DEPRECATED void fill(Color c);
+        GOSU_DEPRECATED void replace(Color oldColor, Color newColor);
+    };
+    
+	//! Loads any supported image into a Bitmap.
+	Bitmap loadImageFile(const std::wstring& filename);
+	//! Loads any supported image into a Bitmap.
+	Bitmap loadImageFile(Reader input);
     
+    //! Saves a Bitmap to a file.
+    void saveImageFile(const Bitmap& bitmap, const std::wstring& filename);
+    //! Saves a Bitmap to an arbitrary resource.
+    void saveImageFile(const Bitmap& bitmap, Gosu::Writer writer,
+        const std::wstring& formatHint = L"png");
+
     //! Set the alpha value of all pixels which are equal to the color key
     //! to zero. Color values are adjusted so that no borders show up when
     //! the image is stretched or rotated.
     void applyColorKey(Bitmap& bitmap, Color key);
     
+    //! The reverse of applyColorKey. Resets all fully transparent pixels by
+    //! a background color, makes all other pixels fully opaque.
+    void unapplyColorKey(Bitmap& bitmap, Color background);
+    
     void applyBorderFlags(Bitmap& dest, const Bitmap& source,
         unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight,
         unsigned borderFlags);	
-    
-	//! Loads any supported image into a Bitmap object.
-	Bitmap loadImageFile(const std::wstring& filename);
-	//! Loads any supported image into a Bitmap object.
-	Bitmap loadImageFile(Gosu::Reader input);
+
+    // Use loadImageFile/saveImageFile instead.
+    GOSU_DEPRECATED Reader loadFromBMP(Bitmap& bmp, Reader reader);
+    GOSU_DEPRECATED Writer saveToBMP(const Bitmap& bmp, Writer writer);
+    GOSU_DEPRECATED Reader loadFromPNG(Bitmap& bmp, Reader reader);
+    GOSU_DEPRECATED Writer saveToPNG(const Bitmap& bmp, Writer writer);
 }
 
 #endif

data/Gosu/Color.hpp

@@ -9,7 +9,7 @@
 
 namespace Gosu
 {
-    //! Represents an ARGB color value with 8 bits for each channel. Can be
+    //! Represents an RGBA 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
@@ -138,6 +138,12 @@ namespace Gosu
             return alpha() << 24 | blue() << 16 | green() << 8 | red();
         }
         
+        //! Returns the internal representation of the color (RGBA in memory).
+        boost::uint32_t gl() const
+        {
+            return rep;
+        }
+        
         static const Color NONE;
         static const Color BLACK;
         static const Color GRAY;
@@ -152,24 +158,20 @@ namespace Gosu
         static const Color CYAN;
     };
     
-    // Causes weird errors when included in the SWIG wrapping process.
-    // If, with a future version of SWIG, this can be included and
-    // require 'gosu'; include Gosu
-    // works from within Ruby, the #ifndef guard can be removed.
     #ifndef SWIG
     inline bool operator<(Color a, Color b)
     {
-        return a.argb() < b.argb();
+        return a.gl() < b.gl();
     }
     
     inline bool operator==(Color a, Color b)
     {
-        return a.argb() == b.argb();
+        return a.gl() == b.gl();
     }
 
     inline bool operator!=(Color a, Color b)
     {
-        return a.argb() != b.argb();
+        return a.gl() != b.gl();
     }
     #endif
 

data/Gosu/GraphicsBase.hpp

@@ -14,15 +14,6 @@ namespace Gosu
     //! lower ZPos value, that is, they are performed last.
     typedef double ZPos;
     
-    //! The lowest possible Z position. By using this, you tell Gosu that
-    //! your drawing operation does not need Z ordering and can be performed
-    //! immediately.
-    //! Deprecated because this turned out not be very useful in optimizing.
-    #ifndef SWIG
-    GOSU_DEPRECATED
-    #endif
-    const double zImmediate = -std::numeric_limits<double>::infinity();
-    
     //! Determines the way colors are combined when one is drawn onto
     //! another.
     enum AlphaMode
@@ -64,6 +55,11 @@ namespace Gosu
         bfTileableBottom = 8,
         bfTileable = bfTileableLeft | bfTileableTop | bfTileableRight | bfTileableBottom
     };        
+    
+    #ifndef SWIG
+    // A not so useful optimization.
+    GOSU_DEPRECATED const double zImmediate = -std::numeric_limits<double>::infinity();
+    #endif
 }
 
 #endif

data/Gosu/Platform.hpp

@@ -5,17 +5,17 @@
 #define GOSU_PLATFORM_HPP
 
 #ifdef __BIG_ENDIAN__
-#define GOSU_IS_BIG_ENDIAN
-#define IDENTITY_FUN bigToNative
-#define IDENTITY_FUN2 nativeToBig
-#define CONV_FUN littleToNative
-#define CONV_FUN2 nativeToLittle
+# define GOSU_IS_BIG_ENDIAN
+# define IDENTITY_FUN bigToNative
+# define IDENTITY_FUN2 nativeToBig
+# define CONV_FUN littleToNative
+# define CONV_FUN2 nativeToLittle
 #else
-#define GOSU_IS_LITTLE_ENDIAN
-#define IDENTITY_FUN littleToNative
-#define IDENTITY_FUN2 nativeToLittle
-#define CONV_FUN bigToNative
-#define CONV_FUN2 nativeToBig
+# define GOSU_IS_LITTLE_ENDIAN
+# define IDENTITY_FUN littleToNative
+# define IDENTITY_FUN2 nativeToLittle
+# define CONV_FUN bigToNative
+# define CONV_FUN2 nativeToBig
 #endif
 
 #include <algorithm>
@@ -42,9 +42,9 @@ namespace Gosu
 #undef CONV_FUN2
 
 #if defined(_MSC_VER)
-#define GOSU_NORETURN __declspec(noreturn)
+# define GOSU_NORETURN __declspec(noreturn)
 #elif defined(__GNUC__)
-#define GOSU_NORETURN __attribute__ ((noreturn))
+# define GOSU_NORETURN __attribute__ ((noreturn))
 #endif
 
 #if defined(WIN32)
@@ -62,10 +62,10 @@ namespace Gosu
 # endif
 #endif
 
-#if (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-# define GOSU_DEPRECATED  __attribute__((__deprecated__))
-#elif defined(GOSU_IS_WIN)
+#if defined(GOSU_IS_WIN)
 # define GOSU_DEPRECATED __declspec(deprecated)
+#elif (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+# define GOSU_DEPRECATED  __attribute__((__deprecated__))
 #else
 # define GOSU_DEPRECATED 
 #endif

data/Gosu/Version.hpp

@@ -3,7 +3,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 29
-#define GOSU_VERSION "0.7.29"
+#define GOSU_POINT_VERSION 30
+#define GOSU_VERSION "0.7.30"
 
 #endif

data/README.txt

@@ -1,26 +1,25 @@
- Moin and welcome to Gosu!
-
- Gosu's main website is http://www.libgosu.org/ which always has the latest
-links to all relevant information.
-
- The actual source code, wiki, issue tracker etc. are currently moving away
-from Gosu's old Google Code project to GitHub:
-
-    http://code.google.com/p/gosu/ -> http://github.com/jlnr/gosu/
-
- The best entry point into Gosu's documentation is still this wiki page:
-
-    http://code.google.com/p/gosu/wiki/DocsOverview
-
- Try doing the tutorial there if you don't know how to start out. Or look at
-one of the games in the Gosu Users board.
-
- Remember that Gosu is licensed under the MIT license and feel invited to fork,
-port and transmogrify all parts of it. The only license that may affect you by
-indirection is libogg's (BSD-style). If you release a Gosu game in any common
-binary form, you will need to mention use of libogg and libvorbis somewhere.
- 
- Complaints, questions, feedback?
-* Visit the boards,                         http://www.libgosu.org/
-* try your luck in the chat,              irc://irc.freenode.org/gosu
-* or e-mail me. Have fun, write games!         julian@raschke.de
+ Moin and welcome to Gosu!
+
+ Gosu's main website is http://www.libgosu.org/, which always has the latest
+links to all relevant information.
+
+ The actual source code, wiki, issue tracker etc. are all hosted on GitHub:
+
+    http://github.com/jlnr/gosu/
+
+ The best entry point into Gosu's documentation is the wiki home page:
+
+    http://github.com/jlnr/gosu/wiki
+
+ Try doing the tutorial there if you don't know how to start out. Or look at
+one of the games in the Gosu Users board.
+
+ Remember that Gosu is licensed under the MIT license and feel invited to fork,
+port and transmogrify all parts of it. The only license that may affect you by
+indirection is libogg's (BSD-style). If you release a Gosu game in any common
+binary form, you will need to mention use of libogg and libvorbis somewhere.
+ 
+ Complaints, questions, feedback?
+* Visit the boards,                         http://www.libgosu.org/
+* try your luck in the chat,              irc://irc.freenode.org/gosu
+* or e-mail me. Have fun, write games!         julian@raschke.de

data/examples/RMagickIntegration.rb

@@ -21,29 +21,78 @@ NULL_PIXEL = Magick::Pixel.from_color('none')
 # Design:
 # * Dynamic map creation at startup, holding it as RMagick Image in @image
 # * Testing for solidity by testing @image's pixel values
-# * Drawing by (re)creating an array of Gosu::Image instances, each representing
-#   a part of the large @image
+# * Drawing from a Gosu::Image instance
 # * Blasting holes into the map is implemented by drawing and erasing portions
-#   of @image, then setting the corresponding Gosu::Image instances to nil, so
-#   they will be recreated in Map#draw
-# Note: The splitting is done because recreating such a large Gosu::Image for
-#       every map change would be a very noticeable delay!
+#   of @image, then recreating the corresponding area in the Gosu::Image
 
 class Map
   WIDTH, HEIGHT = 800, 600
-  TILE_SIZE = 100
-  TILES_X = WIDTH / TILE_SIZE
-  TILES_Y = HEIGHT / TILE_SIZE
   
-  def initialize(window)
+  def initialize window
     # We'll need the window later for re-creating Gosu images.
     @window = window
 
     # Let's start with something simple and load the sky via RMagick.
-    # Loading JPEG files isn't possible with Gosu, so say wow!
-    sky = Magick::Image.read("media/Sky.jpg").first
+    # Loading SVG files isn't possible with Gosu, so say wow!
+    # (Seems to take a while though)
+    sky = Magick::Image.read("media/Landscape.svg").first
     @sky = Gosu::Image.new(window, sky, true)
+      
+    # Create the map an stores the RMagick image in @image
+    create_rmagick_map
     
+    # Copy the RMagick Image to a Gosu Image (still unchanged)
+    @gosu_image = Gosu::Image.new(window, @image, true)
+  end
+  
+  def solid? x, y
+    # Map is open at the top.
+    return false if y < 0
+    # Map is closed on all other sides.
+    return true if x < 0 or x >= 800 or y >= 600
+    # Inside of the map, determine solidity from the map image.
+    @image.pixel_color(x, y) != NULL_PIXEL
+  end
+  
+  def draw
+    # Sky background.
+    @sky.draw(0, 0, 0)
+    # The landscape.
+    @gosu_image.draw 0, 0, 0
+  end
+
+  # Radius of a crater.
+  RADIUS = 25
+  # Radius of a crater, Shadow included.
+  SH_RADIUS = 45
+  
+  # Create the crater image (basically a circle shape that is used to erase
+  # parts of the map) and the crater shadow image.
+  CRATER_IMAGE = begin
+    crater = Magick::Image.new(2 * RADIUS, 2 * RADIUS) { self.background_color = 'none' }
+    gc = Magick::Draw.new
+    gc.fill('black').circle(RADIUS, RADIUS, RADIUS, 0)
+    gc.draw crater
+    crater
+  end
+  CRATER_SHADOW = CRATER_IMAGE.shadow(0, 0, (SH_RADIUS - RADIUS) / 2, 1)
+  
+  def blast x, y
+    # Draw the shadow (twice for more intensity), then erase a circle from the map.
+    @image.composite!(CRATER_SHADOW, x - SH_RADIUS, y - SH_RADIUS, Magick::AtopCompositeOp)
+    @image.composite!(CRATER_SHADOW, x - SH_RADIUS, y - SH_RADIUS, Magick::AtopCompositeOp)
+    @image.composite!(CRATER_IMAGE,  x - RADIUS,    y - RADIUS,    Magick::DstOutCompositeOp)
+    
+    # Isolate the affected portion of the RMagick image.
+    dirty_portion = @image.crop(x - SH_RADIUS, y - SH_RADIUS, SH_RADIUS * 2, SH_RADIUS * 2)
+    # Overwrite this part of the Gosu image. If the crater begins outside of the map, still
+    # just update the inner part.
+    @gosu_image.insert dirty_portion, [x - SH_RADIUS, 0].max, [y - SH_RADIUS, 0].max
+  end
+  
+  private
+  
+  def create_rmagick_map
     # This is the one large RMagick image that represents the map.
     @image = Magick::Image.new(WIDTH, HEIGHT) { self.background_color = 'none' }
     
@@ -55,8 +104,8 @@ class Map
     gc.stroke('#603000').stroke_width(1.5)
     # Draw a smooth bezier island onto the map!
     polypoints = [0, HEIGHT]
-    0.upto(TILES_X) do |x|
-      polypoints += [x * TILE_SIZE, HEIGHT * 0.2 + rand(HEIGHT * 0.8)]
+    0.upto(8) do |x|
+      polypoints += [x * 100, HEIGHT * 0.2 + rand(HEIGHT * 0.8)]
     end
     polypoints += [WIDTH, HEIGHT]
     gc.bezier(*polypoints)
@@ -75,80 +124,6 @@ class Map
     star_y += 20 until solid?(WIDTH / 2, star_y)
     @image.composite!(star, (WIDTH - star.columns) / 2, star_y - star.rows * 0.85,
       Magick::DstOverCompositeOp)
-
-    # Creates an X*Y array for the Gosu images.
-    # (Initialized to nil automatically).
-    @gosu_images = Array.new(TILES_X) { Array.new(TILES_Y) }
-  end
-  
-  def solid?(x, y)
-    # Map is open at the top.
-    return false if y < 0
-    # Map is closed on all other sides.
-    return true if x < 0 or x >= 800 or y >= 600
-    # Inside of the map, determine solidity from the map image.
-    @image.pixel_color(x, y) != NULL_PIXEL
-  end
-  
-  def draw
-    # Sky background.
-    @sky.draw(0, 0, 0)
-    # All the tiles.
-    TILES_Y.times do |y|
-      TILES_X.times do |x|
-        # Recreate images that haven't been created yet, or need to be recreated
-        # due to map changes.
-        if @gosu_images[x][y].nil? then
-          part = @image.crop(x * TILE_SIZE, y * TILE_SIZE, TILE_SIZE, TILE_SIZE)
-          @gosu_images[x][y] = Gosu::Image.new(@window, part, true)
-        end
-        # At last - draw it!
-        @gosu_images[x][y].draw(x * TILE_SIZE, y * TILE_SIZE, 0)
-      end
-    end
-  end
-
-  # Radius of a crater.
-  RADIUS = 25
-  # Radius of a crater, SHadow included.
-  SH_RADIUS = 45
-  
-  def blast(x, y)
-    # This code assumes at most 2x2 tiles are affected by a blast, so
-    # don't change the RADIUS to 200 or something ;)
-    # Calculate the x/y indices of the two to four affected tiles.
-    # (left/right and top/bottom might be the same).
-    
-    left = (x - SH_RADIUS) / TILE_SIZE
-    right = (x + SH_RADIUS) / TILE_SIZE
-    top = (y - SH_RADIUS) / TILE_SIZE
-    bottom = (y + SH_RADIUS) / TILE_SIZE
-
-    # Set affected images to nil.
-    # A 'double-free' doesn't hurt if e.g. left == right! However, we have to watch out
-    # for out-of-bounds errors.
-    
-    @gosu_images[left][top] = nil unless left < 0 or top < 0
-    @gosu_images[right][top] = nil unless right >= TILES_X or top < 0
-    @gosu_images[left][bottom] = nil unless left < 0 or bottom >= TILES_Y
-    @gosu_images[right][bottom] = nil unless right >= TILES_X or bottom >= TILES_Y
-
-    # Create the crater image (basically a circle shape that is used to erase
-    # parts of the map) and the crater shadow image, if they don't exist
-    # already.
-    
-    if @crater_image.nil? then
-      @crater_image = Magick::Image.new(2 * RADIUS, 2 * RADIUS) { self.background_color = 'none' }
-      gc = Magick::Draw.new
-      gc.fill('black').circle(RADIUS, RADIUS, RADIUS, 0)
-      gc.draw(@crater_image)
-      @crater_shadow = @crater_image.shadow(0, 0, (SH_RADIUS - RADIUS) / 2, 1)
-    end
-    
-    # Draw the shadow (twice for more intensity), then erase a circle from the map.
-    @image.composite!(@crater_shadow, x - SH_RADIUS, y - SH_RADIUS, Magick::AtopCompositeOp)
-    @image.composite!(@crater_shadow, x - SH_RADIUS, y - SH_RADIUS, Magick::AtopCompositeOp)
-    @image.composite!(@crater_image, x - RADIUS, y - RADIUS, Magick::DstOutCompositeOp)
   end
 end
 
@@ -266,7 +241,7 @@ class Player
     @window.objects << Missile.new(@window, x + 10 * @dir, y - 10, @angle * @dir)
   end
   
-  def hit_by?(missile)
+  def hit_by? missile
     if Gosu::distance(missile.x, missile.y, x, y) < 30 then
       # Was hit :(
       @dead = true
@@ -281,11 +256,11 @@ end
 
 class Missile
   attr_reader :x, :y, :vx, :vy
+
+  # All missile instances use the same sound.
+  EXPLOSION = Gosu::Sample.new("media/Explosion.wav")
   
   def initialize(window, x, y, angle)
-    # All missile instances use the same sound.
-    @@explosion_sound ||= Gosu::Sample.new(window, "media/Explosion.wav")
-    
     # Horizontal/vertical velocity.
     @vx, @vy = Gosu::offset_x(angle, 20).to_i, Gosu::offset_y(angle, 20).to_i
     
@@ -303,7 +278,7 @@ class Missile
       5.times { @window.objects << Particle.new(@window, x - 25 + rand(51), y - 25 + rand(51)) }
       @window.map.blast(x, y)
       # Weeee, stereo sound!
-      @@explosion_sound.play_pan((2 * @x - Map::WIDTH) / Map::WIDTH)
+      EXPLOSION.play_pan((2 * @x - Map::WIDTH) / Map::WIDTH)
       return false
     else
       return true
@@ -360,7 +335,7 @@ class GameWindow < Gosu::Window
   
   def initialize()
     super(800, 600, false)
-    self.caption = "Medal of Anna - Gosu & RMagick Integration Demo"
+    self.caption = "Gosu & RMagick Integration Demo"
 
     # Texts to display in the appropriate situations.
     @player_instructions = []
@@ -369,10 +344,10 @@ class GameWindow < Gosu::Window
       @player_instructions << Gosu::Image.from_text(self,
         "It is the #{ plr == 0 ? 'green' : 'red' } toy soldier's turn.\n" +
         "(Arrow keys to walk and aim, Return to jump, Space to shoot)",
-        Gosu::default_font_name, 25, 0, width, :center)
+        Gosu::default_font_name, 30, 0, width, :center)
       @player_won_messages << Gosu::Image.from_text(self,
         "The #{ plr == 0 ? 'green' : 'red' } toy soldier has won!",
-        Gosu::default_font_name, 25, 5, width, :center)
+        Gosu::default_font_name, 30, 5, width, :center)
     end
 
     # Create everything!
@@ -403,7 +378,7 @@ class GameWindow < Gosu::Window
       cur_text.draw(x + 1, y, 0, 1, 1, 0xff000000)
       cur_text.draw(x, y - 1, 0, 1, 1, 0xff000000)
       cur_text.draw(x, y + 1, 0, 1, 1, 0xff000000)
-      cur_text.draw(x, y, 0, 1, 1, 0xffffffff)
+      cur_text.draw(x,     y, 0, 1, 1, 0xffffffff)
     end
   end
   
@@ -418,18 +393,17 @@ class GameWindow < Gosu::Window
     # If it's a player's turn, forward controls.
     if not @waiting and not @players[@current_player].dead then
       player = @players[@current_player]
-      player.aim_up if button_down? Gosu::KbUp
-      player.aim_down if button_down? Gosu::KbDown
+      player.aim_up       if button_down? Gosu::KbUp
+      player.aim_down     if button_down? Gosu::KbDown
       player.try_walk(-1) if button_down? Gosu::KbLeft
-      player.try_walk(1) if button_down? Gosu::KbRight
-      player.try_jump if button_down? Gosu::KbReturn
+      player.try_walk(+1) if button_down? Gosu::KbRight
+      player.try_jump     if button_down? Gosu::KbReturn
     end
   end
   
   def button_down(id)
     if id == Gosu::KbSpace and not @waiting and not @players[@current_player].dead then
-      # Shoot! This is handled in button_down because holding space shouldn't
-      # auto-fire - the shots would come from different players.
+      # Shoot! This is handled in button_down because holding space shouldn't auto-fire.
       @players[@current_player].shoot
       @current_player = 1 - @current_player
       @waiting = true

data/examples/media/Landscape.svg

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" clip-rule="evenodd" stroke-miterlimit="10" viewBox="0 0 850.39 637.80">
+    <desc>SVG generated by Lineform</desc>
+    <defs/>
+    <g>
+        <rect width="940.00" height="734.00" x="-25.50" y="-55.50" fill="#5FB7FF" stroke="#000000" stroke-width="2.20"/>
+        <path d="M 223.50 49.00 C 171.16 49.00 118.84 59.51 78.91 80.50 C -0.96 122.48 -0.96 190.52 78.91 232.50 C 134.24 261.59 213.37 270.50 283.34 259.28 C 350.32 290.78 452.18 289.47 516.06 255.19 C 582.65 219.45 582.65 161.55 516.06 125.81 C 482.95 108.04 439.59 99.12 396.19 99.03 C 388.26 92.46 378.99 86.23 368.09 80.50 C 328.16 59.51 275.84 49.00 223.50 49.00 Z M 223.50 49.00 " fill="#FFFFFF" stroke="#BFBFBF" stroke-width="6.00"/>
+        <path d="M 735.48 183.00 C 699.52 183.00 663.55 187.05 636.11 195.16 C 607.54 203.59 593.99 214.76 595.17 225.81 C 561.74 227.76 529.60 233.37 503.83 242.72 C 438.71 266.35 438.71 304.65 503.83 328.28 C 568.96 351.91 674.56 351.91 739.69 328.28 C 787.65 310.88 800.17 285.50 777.48 263.91 C 798.41 261.97 818.28 258.74 834.86 253.84 C 889.73 237.64 889.73 211.36 834.86 195.16 C 807.42 187.05 771.44 183.00 735.48 183.00 Z M 735.48 183.00 " fill="#FFFFFF" stroke="#BFBFBF" stroke-width="6.00"/>
+    </g>
+</svg>

data/lib/gosu/patches.rb

@@ -14,26 +14,26 @@ class ::Numeric
   end
 end
     
-# Backwards compatibility: import the 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
 class Gosu::Sample
-  alias new_initialize initialize
+  alias initialize_ initialize
   
   def initialize(*args)
     args.shift if args.first.is_a? Gosu::Window
-    new_initialize(*args)
+    initialize_(*args)
   end
 end
 class Gosu::Song
-  alias new_initialize initialize
+  alias initialize_ initialize
   
   def initialize(*args)
     args.shift if args.first.is_a? Gosu::Window
-    new_initialize(*args)
+    initialize_(*args)
   end
 end
 

data/lib/gosu/swig_patches.rb

@@ -1,6 +1,28 @@
 # SWIG workarounds
 # These are offloaded into a separate file because rb_eval_string() is weird on Ruby 1.8.
 
+# Exceptions in Window callbacks often get lost, this is especially annoying in draw/update.
+# It is not clear whether this is a SWIG issue or if some stack frame is not exception
+# compatible, but I just call update_ and draw_ in the Ruby wrapper so I can add this
+# custom debugging help:
+class Gosu::Window
+  def update_
+    update
+  rescue Exception => e
+    puts e.inspect
+    puts e.backtrace
+    raise e
+  end
+
+  def draw_
+    draw
+  rescue Exception => e
+    puts e.inspect
+    puts e.backtrace
+    raise e
+  end
+end
+
 # SWIG doesn't understand the C++ overloading.
 class Gosu::Image
   def self.from_text(*args)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 7
-  - 29
-  version: 0.7.29
+  - 30
+  version: 0.7.30
 platform: i386-mingw32
 authors: 
 - Julian Raschke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-30 00:00:00 +08:00
+date: 2011-04-30 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -78,8 +78,8 @@ files:
 - examples/media/Cursor.png
 - examples/media/Earth.png
 - examples/media/Explosion.wav
+- examples/media/Landscape.svg
 - examples/media/LargeStar.png
-- examples/media/Sky.jpg
 - examples/media/Smoke.png
 - examples/media/Soldier.png
 - examples/media/Space.png
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: 2D game development library.