gosu 0.7.20 → 0.7.21

data/GosuImpl/Utility.cpp

@@ -53,6 +53,7 @@ namespace Gosu {
 
 #endif
 #else
+#define NOMINMAX
 #include <windows.h>
 wstring Gosu::utf8ToWstring(const string& utf8)
 {

data/GosuImpl/WindowWin.cpp

@@ -245,16 +245,16 @@ Gosu::Window::Window(unsigned width, unsigned height, bool fullscreen,
     if (GetLastError() != 0)
         Win::throwLastError("setting the window's GWLP_USERDATA pointer");
 
-    // Windowed: Create window large enough to display stuff
-    // This is a pretty brutal heuristic I guess.
-    
+    // Windowed: Create window large enough to display stuff
+    // This is a pretty brutal heuristic I guess.
+    
     if (!fullscreen)
     {
-		double factor = std::min(0.9 * screenWidth() / width,
-								 0.8 * screenHeight() / height);
-	    
-		if (factor < 1)
-			width *= factor, height *= factor;
+		double factor = std::min(0.9 * screenWidth() / width,
+								 0.8 * screenHeight() / height);
+	    
+		if (factor < 1)
+			width *= factor, height *= factor;
 	}
 
     // Determine the size the window needs to have.

data/examples/CptnRuby.rb

@@ -2,7 +2,7 @@
 
 # Shows how to
 #  * implement jumping/gravity
-#  * implement scrolling
+#  * implement scrolling using Window#translate
 #  * implement a simple tile-based map
 #  * load levels from primitive text files
 
@@ -25,14 +25,15 @@
 # ...Enemies, a more sophisticated object system, weapons, title and credits
 # screens...
 
-begin
-  # In case you use Gosu via rubygems.
-  require 'rubygems'
-rescue LoadError
-  # In case you don't.
-end
-
-require 'gosu'
+require '../lib/gosu'
+# begin
+#   # In case you use Gosu via rubygems.
+#   require 'rubygems'
+# rescue LoadError
+#   # In case you don't.
+# end
+# 
+# require 'gosu'
 include Gosu
 
 module Tiles
@@ -48,10 +49,9 @@ class CollectibleGem
     @x, @y = x, y
   end
   
-  def draw(screen_x, screen_y)
+  def draw
     # Draw, slowly rotating
-    @image.draw_rot(@x - screen_x, @y - screen_y, 0,
-      25 * Math.sin(milliseconds / 133.7))
+    @image.draw_rot(@x, @y, 0, 25 * Math.sin(milliseconds / 133.7))
   end
 end
 
@@ -72,7 +72,7 @@ class CptnRuby
     @cur_image = @standing    
   end
   
-  def draw(screen_x, screen_y)
+  def draw
     # Flip vertically when facing to the left.
     if @dir == :left then
       offs_x = -25
@@ -81,7 +81,7 @@ class CptnRuby
       offs_x = 25
       factor = -1.0
     end
-    @cur_image.draw(@x - screen_x + offs_x, @y - screen_y - 49, 0, factor, 1.0)
+    @cur_image.draw(@x + offs_x, @y - 49, 0, factor, 1.0)
   end
   
   # Could the object be placed at x + offs_x/y + offs_y without being stuck?
@@ -146,7 +146,6 @@ class Map
   def initialize(window, filename)
     # Load 60x60 tiles, 5px overlap in all four directions.
     @tileset = Image.load_tiles(window, "media/CptnRuby Tileset.png", 60, 60, true)
-    @sky = Image.new(window, "media/Space.png", true)
 
     gem_img = Image.new(window, "media/CptnRuby Gem.png", false)
     @gems = []
@@ -171,11 +170,7 @@ class Map
     end
   end
   
-  def draw(screen_x, screen_y)
-    # Sigh, stars!
-    @sky.draw(0, 0, 0)
-    
-
+  def draw
     # Very primitive drawing function:
     # Draws all the tiles, some off-screen, some on-screen.
     @height.times do |y|
@@ -184,11 +179,11 @@ class Map
         if tile
           # Draw the tile with an offset (tile images have some overlap)
           # Scrolling is implemented here just as in the game objects.
-          @tileset[tile].draw(x * 50 - screen_x - 5, y * 50 - screen_y - 5, 0)
+          @tileset[tile].draw(x * 50 - 5, y * 50 - 5, 0)
         end
       end
     end
-    @gems.each { |c| c.draw(screen_x, screen_y) }
+    @gems.each { |c| c.draw }
   end
   
   # Solid at a given pixel position?
@@ -203,10 +198,11 @@ class Game < Window
   def initialize
     super(640, 480, false)
     self.caption = "Cptn. Ruby"
+    @sky = Image.new(self, "media/Space.png", true)
     @map = Map.new(self, "media/CptnRuby Map.txt")
     @cptn = CptnRuby.new(self, 400, 100)
-    # Scrolling is stored as the position of the top left corner of the screen.
-    @screen_x = @screen_y = 0
+    # The scrolling position is stored as top left corner of the screen.
+    @camera_x = @camera_y = 0
   end
   def update
     move_x = 0
@@ -215,12 +211,15 @@ class Game < Window
     @cptn.update(move_x)
     @cptn.collect_gems(@map.gems)
     # Scrolling follows player
-    @screen_x = [[@cptn.x - 320, 0].max, @map.width * 50 - 640].min
-    @screen_y = [[@cptn.y - 240, 0].max, @map.height * 50 - 480].min
+    @camera_x = [[@cptn.x - 320, 0].max, @map.width * 50 - 640].min
+    @camera_y = [[@cptn.y - 240, 0].max, @map.height * 50 - 480].min
   end
   def draw
-    @map.draw @screen_x, @screen_y
-    @cptn.draw @screen_x, @screen_y
+    @sky.draw 0, 0, 0
+    translate(-@camera_x, -@camera_y) do
+      @map.draw
+      @cptn.draw
+    end
   end
   def button_down(id)
     if id == KbUp then @cptn.try_to_jump end

data/lib/gosu.rb

@@ -9,7 +9,7 @@ begin
   require "#{File.dirname(__FILE__)}/gosu.for_#{version}.#{Config::CONFIG['DLEXT']}"
   require "#{File.dirname(__FILE__)}/gosu/swig_patches.rb"
 rescue LoadError => e
-  require "#{File.dirname(__FILE__)}/gosu.custom.#{Config::CONFIG['DLEXT']}"
+  require "#{File.dirname(__FILE__)}/gosu.#{Config::CONFIG['DLEXT']}"
   require "#{File.dirname(__FILE__)}/gosu/swig_patches.rb"
 end
 

data/linux/extconf.rb

@@ -20,7 +20,7 @@ SOURCE_FILES =
 	     Graphics/RotFlip.cpp Graphics/BlockAllocator.cpp
 	     Graphics/Texture.cpp Graphics/LargeImageData.cpp
 	     Graphics/BitmapPNG.cpp Graphics/Font.cpp Graphics/BitmapBMP.cpp
-	     Graphics/TextUnix.cpp Graphics/Text.cpp
+	     Graphics/TextUnix.cpp Graphics/Text.cpp Graphics/Transform.cpp
 	     Graphics/BitmapColorKey.cpp DirectoriesUnix.cpp
 	     Audio/AudioSDL.cpp RubyGosu_wrap.cxx)
 
@@ -32,7 +32,7 @@ SOURCE_FILES.each { |file| `cp ../GosuImpl/#{file} #{File.basename(file)}` }
 
 # Symlink our pretty gosu.so into ../lib
 # FIXME gosu.rb should just look in the right place
-`ln -s ../linux/gosu.so ../lib/gosu.custom.so`
+`ln -s ../linux/gosu.so ../lib/gosu.so`
 
 sdl_config = with_config("sdl-config", "sdl-config")
 pango_config = "pkg-config pangoft2" # FIXME should probably use with_config

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  version: 0.7.20
+  hash: 41
+  prerelease: false
+  segments: 
+  - 0
+  - 7
+  - 21
+  version: 0.7.21
 platform: ruby
 authors: 
 - Julian Raschke
@@ -10,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-30 00:00:00 +08:00
+date: 2010-06-13 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
@@ -105,6 +111,7 @@ files:
 - GosuImpl/Graphics/Common.hpp
 - GosuImpl/Graphics/DrawOp.hpp
 - GosuImpl/Graphics/Font.cpp
+- GosuImpl/Graphics/FormattedString.hpp
 - GosuImpl/Graphics/GosuView.hpp
 - GosuImpl/Graphics/GosuView.mm
 - GosuImpl/Graphics/Graphics.cpp
@@ -123,6 +130,7 @@ files:
 - GosuImpl/Graphics/Texture.cpp
 - GosuImpl/Graphics/Texture.hpp
 - GosuImpl/Graphics/TextWin.cpp
+- GosuImpl/Graphics/Transform.cpp
 - GosuImpl/Iconv.hpp
 - GosuImpl/InputMac.mm
 - GosuImpl/InputTouch.mm
@@ -135,7 +143,6 @@ files:
 - GosuImpl/RubyGosu_DllMain.cxx
 - GosuImpl/RubyGosu_SWIG_GC_PATCH.patch
 - GosuImpl/RubyGosu_wrap.cxx
-- GosuImpl/RubyGosu_wrap.cxx.rej
 - GosuImpl/RubyGosu_wrap.h
 - GosuImpl/RubyGosuStub.mm
 - GosuImpl/Sockets/CommSocket.cpp
@@ -168,17 +175,25 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 51
+      segments: 
+      - 1
+      - 8
+      - 2
       version: 1.8.2
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: 
 - g++
 - pkg-config
@@ -191,7 +206,7 @@ requirements:
    g++ pkg-config ruby-dev xorg-dev libsdl-mixer1.2-dev libgl1-mesa-dev libpango1.0-dev
   )
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: 2D game development library.

data/GosuImpl/RubyGosu_wrap.cxx.rej

@@ -1,187 +0,0 @@
-***************
-*** 8,13 ****
-   * interface file instead. 
-   * ----------------------------------------------------------------------------- */
-  
-  #define SWIGRUBY
-  #define SWIG_DIRECTORS
-  
---- 8,17 ----
-   * interface file instead. 
-   * ----------------------------------------------------------------------------- */
-  
-+ // This file was afterwards patched using the following instructions:
-+ // http://sourceforge.net/tracker/index.php?func=detail&aid=2034216&group_id=1645&atid=101645
-+ // (Many thanks to Kevin Burge for that.)
-+ 
-  #define SWIGRUBY
-  #define SWIG_DIRECTORS
-  
-***************
-*** 855,860 ****
-  
-  
-  #include <ruby.h>
-  
-  /* Remove global macros defined in Ruby's win32.h */
-  #ifdef write
---- 859,865 ----
-  
-  
-  #include <ruby.h>
-+ #include <map>
-  
-  /* Remove global macros defined in Ruby's win32.h */
-  #ifdef write
-***************
-*** 1183,1189 ****
-  /* Global Ruby hash table to store Trackings from C/C++
-     structs to Ruby Objects. 
-  */
-- static VALUE swig_ruby_trackings = Qnil;
-  
-  /* Global variable that stores a reference to the ruby
-     hash table delete function. */
---- 1188,1194 ----
-  /* Global Ruby hash table to store Trackings from C/C++
-     structs to Ruby Objects. 
-  */
-+ static std::map<void*, VALUE> swig_ruby_trackings;
-  
-  /* Global variable that stores a reference to the ruby
-     hash table delete function. */
-***************
-*** 1200,1233 ****
-       This is done to allow multiple DSOs to share the same
-       tracking table.
-    */
--   ID trackings_id = rb_intern( "@__trackings__" );
-    VALUE verbose = rb_gv_get("VERBOSE");
-    rb_gv_set("VERBOSE", Qfalse);
--   swig_ruby_trackings = rb_ivar_get( _mSWIG, trackings_id );
-    rb_gv_set("VERBOSE", verbose);
-  
-    /* No, it hasn't.  Create one ourselves */ 
--   if ( swig_ruby_trackings == Qnil )
--     {
--       swig_ruby_trackings = rb_hash_new();
--       rb_ivar_set( _mSWIG, trackings_id, swig_ruby_trackings );
--     }
-  
-    /* Now store a reference to the hash table delete function
-       so that we only have to look it up once.*/
-    swig_ruby_hash_delete = rb_intern("delete");
-  }
-  
-- /* Get a Ruby number to reference a pointer */
-- SWIGRUNTIME VALUE SWIG_RubyPtrToReference(void* ptr) {
--   /* We cast the pointer to an unsigned long
--      and then store a reference to it using
--      a Ruby number object. */
-- 
--   /* Convert the pointer to a Ruby number */
--   return SWIG2NUM(ptr);
-- }
-- 
-  /* Get a Ruby number to reference an object */
-  SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) {
-    /* We cast the object to an unsigned long
---- 1205,1222 ----
-       This is done to allow multiple DSOs to share the same
-       tracking table.
-    */
-    VALUE verbose = rb_gv_get("VERBOSE");
-    rb_gv_set("VERBOSE", Qfalse);
-    rb_gv_set("VERBOSE", verbose);
-  
-    /* No, it hasn't.  Create one ourselves */ 
-+   swig_ruby_trackings.clear();
-  
-    /* Now store a reference to the hash table delete function
-       so that we only have to look it up once.*/
-    swig_ruby_hash_delete = rb_intern("delete");
-  }
-  
-  /* Get a Ruby number to reference an object */
-  SWIGRUNTIME VALUE SWIG_RubyObjectToReference(VALUE object) {
-    /* We cast the object to an unsigned long
-***************
-*** 1249,1287 ****
-  
-  /* Add a Tracking from a C/C++ struct to a Ruby object */
-  SWIGRUNTIME void SWIG_RubyAddTracking(void* ptr, VALUE object) {
--   /* In a Ruby hash table we store the pointer and
--      the associated Ruby object.  The trick here is
--      that we cannot store the Ruby object directly - if
--      we do then it cannot be garbage collected.  So
--      instead we typecast it as a unsigned long and
--      convert it to a Ruby number object.*/
-- 
--   /* Get a reference to the pointer as a Ruby number */
--   VALUE key = SWIG_RubyPtrToReference(ptr);
-- 
--   /* Get a reference to the Ruby object as a Ruby number */
--   VALUE value = SWIG_RubyObjectToReference(object);
-- 
-    /* Store the mapping to the global hash table. */
--   rb_hash_aset(swig_ruby_trackings, key, value);
-  }
-  
-  /* Get the Ruby object that owns the specified C/C++ struct */
-  SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
--   /* Get a reference to the pointer as a Ruby number */
--   VALUE key = SWIG_RubyPtrToReference(ptr);
-- 
--   /* Now lookup the value stored in the global hash table */
--   VALUE value = rb_hash_aref(swig_ruby_trackings, key);
-- 	
--   if (value == Qnil) {
--     /* No object exists - return nil. */
-      return Qnil;
--   }
--   else {
--     /* Convert this value to Ruby object */
--     return SWIG_RubyReferenceToObject(value);
--   }
-  }
-  
-  /* Remove a Tracking from a C/C++ struct to a Ruby object.  It
---- 1238,1253 ----
-  
-  /* Add a Tracking from a C/C++ struct to a Ruby object */
-  SWIGRUNTIME void SWIG_RubyAddTracking(void* ptr, VALUE object) {
-    /* Store the mapping to the global hash table. */
-+   swig_ruby_trackings[ptr] = object;
-  }
-  
-  /* Get the Ruby object that owns the specified C/C++ struct */
-  SWIGRUNTIME VALUE SWIG_RubyInstanceFor(void* ptr) {
-+   if (swig_ruby_trackings.count(ptr) == 0)
-      return Qnil;
-+   else
-+     return swig_ruby_trackings[ptr];
-  }
-  
-  /* Remove a Tracking from a C/C++ struct to a Ruby object.  It
-***************
-*** 1289,1300 ****
-     since the same memory address may be reused later to create
-     a new object. */
-  SWIGRUNTIME void SWIG_RubyRemoveTracking(void* ptr) {
--   /* Get a reference to the pointer as a Ruby number */
--   VALUE key = SWIG_RubyPtrToReference(ptr);
-- 
--   /* Delete the object from the hash table by calling Ruby's
--      do this we need to call the Hash.delete method.*/
--   rb_funcall(swig_ruby_trackings, swig_ruby_hash_delete, 1, key);
-  }
-  
-  /* This is a helper method that unlinks a Ruby object from its
---- 1255,1261 ----
-     since the same memory address may be reused later to create
-     a new object. */
-  SWIGRUNTIME void SWIG_RubyRemoveTracking(void* ptr) {
-+   swig_ruby_trackings.erase(ptr);
-  }
-  
-  /* This is a helper method that unlinks a Ruby object from its