gosu 0.7.35-universal-darwin → 0.7.36.1-universal-darwin

data/Gosu/Image.hpp

@@ -19,16 +19,16 @@ namespace Gosu
     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.
+        //! 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.
+        //! 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,
               unsigned srcY, unsigned srcWidth, unsigned srcHeight,
               bool tileable = false);
@@ -80,8 +80,8 @@ namespace Gosu
         ImageData& getData() const;
     };
 
-	//! Convenience function that splits a BMP or PNG file into an array
-	//! of small rectangles and creates images from them.
+    //! 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.
     //! \param tileHeight See tileWidth.

data/Gosu/Input.hpp

@@ -33,42 +33,42 @@
 
 namespace Gosu
 {
-	//! Very lightweight class that identifies a button (keyboard, mouse or other device).
-	class Button
-	{
-		unsigned id_;
-		
-	public:
-		//! For internal use.
-		explicit Button(unsigned id) : id_(id) {}
-		//! For internal use.
-		unsigned id() const { return id_; }
+    //! Very lightweight class that identifies a button (keyboard, mouse or other device).
+    class Button
+    {
+        unsigned id_;
+        
+    public:
+        //! For internal use.
+        explicit Button(unsigned id) : id_(id) {}
+        //! For internal use.
+        unsigned id() const { return id_; }
 
-		//! Default constructor; == noButton.
-		Button() : id_(noButton) {}
+        //! Default constructor; == noButton.
+        Button() : id_(noButton) {}
 
-		//! Conversion from ButtonName constants.
-		Button(ButtonName name) : id_(name) {}
-	};
+        //! Conversion from ButtonName constants.
+        Button(ButtonName name) : id_(name) {}
+    };
     
-	//! Tests whether two Buttons identify the same physical button.
-	inline bool operator==(Button lhs, Button rhs)
-	{
-		return lhs.id() == rhs.id();
-	}
-	inline bool operator!=(Button lhs, Button rhs)
-	{
-		return !(lhs == rhs);
-	}
+    //! Tests whether two Buttons identify the same physical button.
+    inline bool operator==(Button lhs, Button rhs)
+    {
+        return lhs.id() == rhs.id();
+    }
+    inline bool operator!=(Button lhs, Button rhs)
+    {
+        return !(lhs == rhs);
+    }
     inline bool operator<(Button lhs, Button rhs)
     {
         return lhs.id() < rhs.id();
     }
-	
+    
     //! Struct that saves information about a touch on the surface of a multi-
     //! touch device.
-	//! Available even on non-iPhone platforms to make it easier to compile the
-	//! same source for multiple platforms.
+    //! Available even on non-iPhone platforms to make it easier to compile the
+    //! same source for multiple platforms.
     struct Touch
     {
         //! Allows for identification of a touch across calls.
@@ -79,13 +79,13 @@ namespace Gosu
     typedef std::vector<Touch> Touches;
     
     //! Manages initialization and shutdown of the input system. Only one Input
-	//! instance can exist per application.
+    //! instance can exist per application.
     class Input
     {
         struct Impl;
         const std::auto_ptr<Impl> pimpl;
 
-	public:
+    public:
         #ifdef GOSU_IS_WIN
         Input(HWND window);
         #endif
@@ -113,9 +113,9 @@ namespace Gosu
         //! given character, or noButton.
         static Button charToId(wchar_t ch);
         
-		//! Returns true if a button is currently pressed.
+        //! Returns true if a button is currently pressed.
         //! Updated every tick.
-		bool down(Button btn) const;
+        bool down(Button btn) const;
         
         //! Returns the horizontal position of the mouse relative to the top
         //! left corner of the window given to Input's constructor.
@@ -143,12 +143,12 @@ namespace Gosu
         //! mouse is and calls onButtonUp/onButtonDown, if assigned.
         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.
+        //! 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.
         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.
+        //! 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.
         std::tr1::function<void (Touch)> onTouchBegan, onTouchMoved, onTouchEnded;
         
         //! Returns the currently active TextInput instance, or 0.

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 35
-#define GOSU_VERSION "0.7.35"
+#define GOSU_POINT_VERSION 36
+#define GOSU_VERSION "0.7.36.1"
 
 #define GOSU_COPYRIGHT_NOTICE \
   "May contain `ogg', `vorbis' libraries (c) 2002-2008 Xiph.org Foundation" \

data/Gosu/Window.hpp

@@ -21,7 +21,7 @@
 namespace Gosu
 {
     //! Convenient all-in-one class that serves as the foundation of a standard
-	//! Gosu application. Manages initialization of all of Gosu's core components
+    //! Gosu application. Manages initialization of all of Gosu's core components
     //! and provides timing functionality.
     //! Note that you should really only use one instance of this class at the same time.
     //! This may or may not change later.
@@ -43,7 +43,8 @@ namespace Gosu
         
         double updateInterval() const;
 
-        //! Enters a modal loop where the Window is visible on screen and receives calls to draw, update etc.
+        //! Enters a modal loop where the Window is visible on screen and
+        //! receives calls to draw, update etc.
         void show();
         //! Closes the window if it is currently shown.
         void close();
@@ -61,9 +62,9 @@ namespace Gosu
         //! By default, the window is redrawn all the time.
         virtual bool needsRedraw() const { return true; }
 
-		//! If this function returns true, the system arrow cursor is drawn while
-		//! over the window.
-		virtual bool needsCursor() const { return false; }
+        //! If this function returns true, the system arrow cursor is drawn while
+        //! over the window.
+        virtual bool needsCursor() const { return false; }
         
         //! This function is called when the window loses focus on some platforms.
         //! Most importantly, it is called on the iPhone or iPad when the user

data/lib/gosu/preview.rb

@@ -0,0 +1,116 @@
+require 'gosu'
+
+# Wrapper around Gosu 0.7 that provides the work-in-progress 0.8 interface
+
+module Gosu
+  class Font
+    alias :initialize07 :initialize
+    
+    def initialize *args
+      if args.first.is_a? Gosu::Window then
+        initialize07 *args
+      else
+        height  = args[0]
+        options = args[1] || {}
+        name = options[:name] || Gosu::default_font_name
+        initialize07 $window, name, height
+      end
+    end
+  end
+  
+  class Window
+    alias :initialize07 :initialize
+    
+    def initialize width, height, *args
+      if args.empty? or args.first.is_a? Hash then
+       options = args.first || {}
+       fullscreen = !!options[:fullscreen]
+       update_interval = options[:update_interval] || 16.66
+      else
+       fullscreen, update_interval = *args
+      end
+      $window = initialize07 width, height, fullscreen, update_interval
+    end
+  end
+  
+  class Image
+    alias :initialize07 :initialize
+    
+    def initialize *args
+      if args.first.is_a? Gosu::Window then
+        initialize07 *args
+      else
+        source = args[0]
+        tileable = !args[1] || args[1][:tileable]
+        initialize07 $window, source, !!tileable
+      end
+    end
+    
+    class <<self
+      alias load_tiles07 load_tiles
+    end
+    
+    def self.load_tiles *args
+      if args.first.is_a? Gosu::Window then
+        load_tiles07 *args
+      else
+        source = args[0]
+        x, y = args[1..2]
+        tileable = !args[3] || args[3][:tileable]
+        load_tiles07 $window, source, x, y, !!tileable
+      end
+    end
+    
+    def self.from_text *args
+      if args.first.is_a? Gosu::Window then
+        args.size == 4 ? from_text4(*args) : from_text7(*args)
+      else
+        text      = args[0]
+        height    = args[1]
+        options   = args[2] || {}
+        font      = options[:font]    || Gosu::default_font_name
+        if width  = options[:width] then
+          spacing = options[:spacing] || 0
+          align   = options[:align]   || :left
+          Gosu::Image.from_text7 $window, text, font, height, spacing, width, align
+        else
+          Gosu::Image.from_text4 $window, text, font, height
+        end
+      end
+    end
+  end
+  
+  def self.draw_quad *args
+    $window.draw_quad *args
+  end
+  
+  def self.clip_to *args
+    $window.clip_to *args do
+      yield
+    end
+  end
+  
+  def self.translate *args
+    $window.translate *args do
+      yield
+    end
+  end
+  
+  def self.scale *args
+    $window.scale *args do
+      yield
+    end
+  end
+  
+  def self.rotate *args
+    $window.rotate *args do
+      yield
+    end
+  end
+  
+  def self.transform *args
+    $window.transform *args do
+      yield
+    end
+  end
+end

data/lib/gosu/run.rb

@@ -0,0 +1,11 @@
+# Replace the load path
+$LOAD_PATH.clear
+$LOAD_PATH << File.dirname(__FILE__)[0..-6]
+$LOAD_PATH << $LOAD_PATH[0] + '/lib'
+# Ruby portions of Gosu
+require 'gosu/patches'
+require 'gosu/swig_patches'
+# Let the application know it is being run from the Mac app wrapper.
+OSX_EXECUTABLE = true
+# Main application
+require 'Main'

data/lib/gosu/zen.rb

@@ -0,0 +1,28 @@
+require 'gosu'
+require 'singleton'
+
+module Gosu
+  class ZenWindow < Window
+    include Singleton
+    
+    def initialize
+      super 800, 600, false
+    end
+  end
+end
+
+def set what, value
+  Gosu::ZenWindow.instance.send "#{what}=", value
+end
+
+def update(&proc)
+  Gosu::ZenWindow.send :define_method, :update, proc
+end
+
+# WIP - needs all other callbacks, even with arguments
+
+# WIP - needs to be compatible with gosu/preview.rb later
+
+at_exit do
+  Gosu::ZenWindow.instance.show
+end

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 69
+  hash: 229
   prerelease: 
   segments: 
   - 0
   - 7
-  - 35
-  version: 0.7.35
+  - 36
+  - 1
+  version: 0.7.36.1
 platform: universal-darwin
 authors: 
 - Julian Raschke
-- Jan Luecker
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-12 00:00:00 Z
+date: 2011-08-24 00:00:00 Z
 dependencies: []
 
-description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and Ruby-OpenGL.\n"
+description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and OpenGL.\n"
 email: julian@raschke.de
 executables: []
 
@@ -60,9 +60,12 @@ files:
 - Gosu/Version.hpp
 - Gosu/Window.hpp
 - Gosu/WinUtility.hpp
-- lib/gosu.rb
 - lib/gosu/patches.rb
+- lib/gosu/preview.rb
+- lib/gosu/run.rb
 - lib/gosu/swig_patches.rb
+- lib/gosu/zen.rb
+- lib/gosu.rb
 - examples/ChipmunkIntegration.rb
 - examples/CptnRuby.rb
 - examples/MoreChipmunkAndRMagick.rb
@@ -118,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: 2D game development library.