chingu 0.7.7.5 → 0.8rc1

data/History.txt

@@ -1,6 +1,6 @@
 === 0.6 / 2009-11-21
 More traits, better input, fixes
-This file is kind of deprecated -- see github commit-history instead!
+This file is deprecated -- see github commit-history instead!
 
 === 0.5.7 / 2009-10-15
 See github commithistory.

data/Rakefile

@@ -14,10 +14,12 @@ begin
     gemspec.rubyforge_project = "chingu"
     gemspec.version = Chingu::VERSION
     
-    gemspec.add_dependency 'gosu', '>= 0.7.22'
-    gemspec.add_development_dependency 'rspec', '>= 2.0.0.beta.12'
+    gemspec.add_dependency 'gosu', '>= 0.7.24'
+    gemspec.add_development_dependency 'rspec', '>= 2.0.0'
     gemspec.add_development_dependency 'watchr'
     gemspec.add_development_dependency 'rcov'
+    gemspec.add_development_dependency 'rest_client'
+    gemspec.add_development_dependency 'crack'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/chingu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.7.7.5"
+  s.version = "0.8rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2010-08-23}
+  s.date = %q{2010-11-14}
   s.description = %q{OpenGL accelerated 2D game framework for Ruby. Builds on Gosu (Ruby/C++) which provides all the core functionality. Chingu adds simple yet powerful game states, prettier input handling, deployment safe asset-handling, a basic re-usable game object and stackable game logic.}
   s.email = %q{ippa@rubylicio.us}
   s.extra_rdoc_files = [
@@ -50,6 +50,10 @@ Gem::Specification.new do |s|
      "examples/example21_sidescroller_with_edit.rb",
      "examples/example22_text.rb",
      "examples/example23_chipmunk.rb",
+     "examples/example24_enter_name.rb",
+     "examples/example24_input_codes.rb",
+     "examples/example25.yml",
+     "examples/example25_fibers_state_machine.rb",
      "examples/example2_gamestate_basics.rb",
      "examples/example3_parallax.rb",
      "examples/example4_gamestates.rb",
@@ -117,6 +121,7 @@ Gem::Specification.new do |s|
      "lib/chingu/game_state_manager.rb",
      "lib/chingu/game_states/debug.rb",
      "lib/chingu/game_states/edit.rb",
+     "lib/chingu/game_states/enter_name.rb",
      "lib/chingu/game_states/fade_to.rb",
      "lib/chingu/game_states/pause.rb",
      "lib/chingu/game_states/popup.rb",
@@ -159,7 +164,7 @@ Gem::Specification.new do |s|
      "spec/chingu/helpers/options_setter_spec.rb",
      "spec/chingu/images/rect_20x20.png",
      "spec/chingu/inflector_spec.rb",
-     "spec/chingu/rect_20x20.png",
+     "spec/chingu/input_spec.rb",
      "spec/chingu/text_spec.rb",
      "spec/spec_helper.rb",
      "specs.watchr"
@@ -177,6 +182,7 @@ Gem::Specification.new do |s|
      "spec/chingu/helpers/input_dispatcher_spec.rb",
      "spec/chingu/helpers/options_setter_spec.rb",
      "spec/chingu/inflector_spec.rb",
+     "spec/chingu/input_spec.rb",
      "spec/chingu/text_spec.rb",
      "spec/spec_helper.rb",
      "examples/example10_traits_retrofy.rb",
@@ -194,6 +200,9 @@ Gem::Specification.new do |s|
      "examples/example21_sidescroller_with_edit.rb",
      "examples/example22_text.rb",
      "examples/example23_chipmunk.rb",
+     "examples/example24_enter_name.rb",
+     "examples/example24_input_codes.rb",
+     "examples/example25_fibers_state_machine.rb",
      "examples/example2_gamestate_basics.rb",
      "examples/example3_parallax.rb",
      "examples/example4_gamestates.rb",
@@ -211,21 +220,27 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gosu>, [">= 0.7.22"])
-      s.add_development_dependency(%q<rspec>, [">= 2.0.0.beta.12"])
+      s.add_runtime_dependency(%q<gosu>, [">= 0.7.24"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_development_dependency(%q<watchr>, [">= 0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<rest_client>, [">= 0"])
+      s.add_development_dependency(%q<crack>, [">= 0"])
     else
-      s.add_dependency(%q<gosu>, [">= 0.7.22"])
-      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.12"])
+      s.add_dependency(%q<gosu>, [">= 0.7.24"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0"])
       s.add_dependency(%q<watchr>, [">= 0"])
       s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<rest_client>, [">= 0"])
+      s.add_dependency(%q<crack>, [">= 0"])
     end
   else
-    s.add_dependency(%q<gosu>, [">= 0.7.22"])
-    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.12"])
+    s.add_dependency(%q<gosu>, [">= 0.7.24"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
     s.add_dependency(%q<watchr>, [">= 0"])
     s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<rest_client>, [">= 0"])
+    s.add_dependency(%q<crack>, [">= 0"])
   end
 end
 

data/examples/example10_traits_retrofy.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require File.join(File.dirname($0), "..", "lib", "chingu")
+require 'rubygems' rescue nil
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), "..", "..", "lib")
+require 'chingu'
 include Gosu
 include Chingu
 $stderr.sync = $stdout.sync = true

data/examples/example11_animation.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require File.join(File.dirname($0), "..", "lib", "chingu")
+require 'rubygems' rescue nil
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), "..", "..", "lib")
+require 'chingu'
 include Gosu
 include Chingu
 

data/examples/example12_trait_timer.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require File.join(File.dirname($0), "..", "lib", "chingu")
+require 'rubygems' rescue nil
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), "..", "..", "lib")
+require 'chingu'
 include Gosu
 include Chingu
 

data/examples/example13_high_scores.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require File.join(File.dirname($0), "..", "lib", "chingu")
+require 'rubygems' rescue nil
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), "..", "..", "lib")
+require 'chingu'
 include Gosu
 include Chingu
 

data/examples/example14_bounding_box_circle.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require File.join(File.dirname($0), "..", "lib", "chingu")
+require 'rubygems' rescue nil
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), "..", "..", "lib")
+require 'chingu'
 include Gosu
 include Chingu
 
@@ -12,6 +13,7 @@ class Game < Chingu::Window
     super(640,400)
     self.input = {:esc => :exit, :q => :decrease_size, :w => :increase_size, :a => :decrease_speed, :s => :increase_speed}
     
+    self.factor = 1
     20.times { Circle.create(:x => width/2, :y => height/2) }
     20.times { Box.create(:x => width/2, :y => height/2) }
     @blue = Color.new(0xFF0000FF)
@@ -71,7 +73,6 @@ class Circle < GameObject
     @image = Image["circle.png"]
     self.velocity_x = 3 - rand * 6
     self.velocity_y = 3 - rand * 6
-    self.factor = 2
     self.input = [:holding_left, :holding_right, :holding_down, :holding_up]  # NOTE: giving input an Array, not a Hash 
     cache_bounding_circle
   end
@@ -99,10 +100,10 @@ class Box < GameObject
     # Test to make sure the bounding_box works with all bellow combos
     #self.factor = 2
     #self.factor = -2
-    #self.rotation_center = :left_top
+    self.rotation_center = :left_top
     #self.rotation_center = :center
     #self.rotation_center = :right_bottom
-    
+        
     cache_bounding_box
   end
   

data/examples/example15_trait_timer2.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require File.join(File.dirname($0), "..", "lib", "chingu")
+require 'rubygems' rescue nil
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), "..", "..", "lib")
+require 'chingu'
 include Gosu
 include Chingu
 

data/examples/example16_online_high_scores.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require File.join(File.dirname($0), "..", "lib", "chingu")
+require 'rubygems' rescue nil
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), "..", "..", "lib")
+require 'chingu'
 include Gosu
 include Chingu
 

data/examples/example17_gosu_tutorial.rb

@@ -1,104 +1,105 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require File.join(File.dirname($0), "..", "lib", "chingu")
-include Gosu
-include Chingu
-
-# Set to true to see bounding circles used for collision detection
-DEBUG = false
-
-class Game < Chingu::Window
-  def initialize
-    super(640,400)
-    self.input = {:esc => :exit}
-    
-    @player = Player.create(:zorder => 2, :x=>320, :y=>240)
-    @score = 0
-    @score_text = Text.create("Score: #{@score}", :x => 10, :y => 10, :zorder => 55, :size=>20)
-  end
-
-  def update
-    super
-
-    if rand(100) < 4 && Star.all.size < 25
-      Star.create
-    end
-    
-    #
-    # Collide @player with all instances of class Star
-    #
-    @player.each_collision(Star) do |player, star| 
-      star.destroy
-      @score+=10
-    end
-    
-    @score_text.text = "Score: #{@score}"
-    self.caption = "Chingu Game - " + @score_text.text
-  end
-end
-
-class Player < GameObject
-  trait :bounding_circle, :debug => DEBUG
-  traits :collision_detection, :effect, :velocity
-  
-  def initialize(options={})
-    super(options)
-    @image = Image["Starfighter.bmp"]
-    self.input = {:holding_right=>:turn_right, :holding_left=>:turn_left, :holding_up=>:accelerate}
-    self.max_velocity = 10
-  end
-  
-  def accelerate
-    self.velocity_x = Gosu::offset_x(self.angle, 0.5)*self.max_velocity_x
-    self.velocity_y = Gosu::offset_y(self.angle, 0.5)*self.max_velocity_y
-  end
-  
-  def turn_right
-    # The same can be achieved without trait 'effect' as: self.angle += 4.5
-    rotate(4.5)
-  end
-  
-  def turn_left
-    # The same can be achieved without trait 'effect' as: self.angle -= 4.5
-    rotate(-4.5)
-  end
-  
-  def update
-    self.velocity_x *= 0.95 # dampen the movement
-    self.velocity_y *= 0.95
-    
-    @x %= $window.width # wrap around the screen
-    @y %= $window.height
-  end
-end
-
-class Star < GameObject
-  trait :bounding_circle, :debug => DEBUG
-  trait :collision_detection
-  
-  def initialize(options={})
-    super(:zorder=>1)
-    @animation = Chingu::Animation.new(:file => media_path("Star.png"), :size => 25)
-    @image = @animation.next
-    self.color = Gosu::Color.new(0xff000000)
-    self.color.red = rand(255 - 40) + 40
-    self.color.green = rand(255 - 40) + 40
-    self.color.blue = rand(255 - 40) + 40
-    self.x =rand * 640
-    self.y =rand * 480
-    
-    #
-    # A cached bounding circle will not adapt to changes in size, but it will follow objects X / Y
-    # Same is true for "cache_bounding_box"
-    #
-    cache_bounding_circle
-  end
-  
-  def update
-    # Move the animation forward by fetching the next frame and putting it into @image
-    # @image is drawn by default by GameObject#draw
-    @image = @animation.next
-  end
-end
-
+#!/usr/bin/env ruby
+require 'rubygems' rescue nil
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), "..", "..", "lib")
+require 'chingu'
+include Gosu
+include Chingu
+
+# Set to true to see bounding circles used for collision detection
+DEBUG = false
+
+class Game < Chingu::Window
+  def initialize
+    super(640,400)
+    self.input = {:esc => :exit}
+    
+    @player = Player.create(:zorder => 2, :x=>320, :y=>240)
+    @score = 0
+    @score_text = Text.create("Score: #{@score}", :x => 10, :y => 10, :zorder => 55, :size=>20)
+  end
+
+  def update
+    super
+
+    if rand(100) < 4 && Star.all.size < 25
+      Star.create
+    end
+    
+    #
+    # Collide @player with all instances of class Star
+    #
+    @player.each_collision(Star) do |player, star| 
+      star.destroy
+      @score+=10
+    end
+    
+    @score_text.text = "Score: #{@score}"
+    self.caption = "Chingu Game - " + @score_text.text
+  end
+end
+
+class Player < GameObject
+  trait :bounding_circle, :debug => DEBUG
+  traits :collision_detection, :effect, :velocity
+  
+  def initialize(options={})
+    super(options)
+    @image = Image["Starfighter.bmp"]
+    self.input = {:holding_right=>:turn_right, :holding_left=>:turn_left, :holding_up=>:accelerate}
+    self.max_velocity = 10
+  end
+  
+  def accelerate
+    self.velocity_x = Gosu::offset_x(self.angle, 0.5)*self.max_velocity_x
+    self.velocity_y = Gosu::offset_y(self.angle, 0.5)*self.max_velocity_y
+  end
+  
+  def turn_right
+    # The same can be achieved without trait 'effect' as: self.angle += 4.5
+    rotate(4.5)
+  end
+  
+  def turn_left
+    # The same can be achieved without trait 'effect' as: self.angle -= 4.5
+    rotate(-4.5)
+  end
+  
+  def update
+    self.velocity_x *= 0.95 # dampen the movement
+    self.velocity_y *= 0.95
+    
+    @x %= $window.width # wrap around the screen
+    @y %= $window.height
+  end
+end
+
+class Star < GameObject
+  trait :bounding_circle, :debug => DEBUG
+  trait :collision_detection
+  
+  def initialize(options={})
+    super(:zorder=>1)
+    @animation = Chingu::Animation.new(:file => media_path("Star.png"), :size => 25)
+    @image = @animation.next
+    self.color = Gosu::Color.new(0xff000000)
+    self.color.red = rand(255 - 40) + 40
+    self.color.green = rand(255 - 40) + 40
+    self.color.blue = rand(255 - 40) + 40
+    self.x =rand * 640
+    self.y =rand * 480
+    
+    #
+    # A cached bounding circle will not adapt to changes in size, but it will follow objects X / Y
+    # Same is true for "cache_bounding_box"
+    #
+    cache_bounding_circle
+  end
+  
+  def update
+    # Move the animation forward by fetching the next frame and putting it into @image
+    # @image is drawn by default by GameObject#draw
+    @image = @animation.next
+  end
+end
+
 Game.new.show

data/examples/example18_animation_trait.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require File.join(File.dirname($0), "..", "lib", "chingu")
+require 'rubygems' rescue nil
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), "..", "..", "lib")
+require 'chingu'
 include Gosu
 include Chingu
 

data/examples/example19_edit_viewport.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-require File.join(File.dirname($0), "..", "lib", "chingu")
+require 'rubygems' rescue nil
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), "..", "..", "lib")
+require 'chingu'
 include Gosu
 include Chingu