chingu 0.9rc6 → 0.9rc7

data/examples/example4_gamestates.rb

@@ -124,7 +124,8 @@ class Level < Chingu::GameState
                        :holding_right => :move_right, 
                        :holding_up => :move_up, 
                        :holding_down => :move_down, 
-                       :space => :fire }
+                       :space => :fire,
+                       :holding_a => :fire }
 
     #
     # The input-handler understands gamestates. P is pressed --> push_gamegate(Pause)

data/examples/tests/holding_a_test.rb

@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+require 'rubygems' rescue nil
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), "..", "..", "lib")
+require 'chingu'
+include Gosu
+
+class Game < Chingu::Window
+  def initialize
+    super(640,480,false)              # leave it blank and it will be 800,600,non fullscreen
+    self.input = { :escape => :exit } # exits example on Escape
+    
+    @player = Player.create(:x => 200, :y => 200, :image => Image["spaceship.png"])
+    @player.input = [ :holding_left, :holding_right, :holding_up, :holding_down, :holding_a ]
+  end
+  
+  def update
+    super
+    self.caption = "FPS: #{self.fps} milliseconds_since_last_tick: #{self.milliseconds_since_last_tick}"
+  end
+end
+
+class Player < Chingu::GameObject  
+  def holding_left;  @x -= 3; end
+  def holding_right; @x += 3; end
+  def holding_up;    @y -= 3; end
+  def holding_down;  @y += 3; end
+  def holding_a
+    Bullet.create(:x => @x, :y => @y)
+  end
+end
+
+class Bullet < Chingu::GameObject
+  def setup
+    @image = Image["fire_bullet.png"]
+  end
+  
+  def update
+    @y -= 2
+  end
+end
+
+
+Game.new.show

data/lib/chingu.rb

@@ -38,7 +38,7 @@ require_all "#{CHINGU_ROOT}/chingu/async_tasks"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.9rc6"
+  VERSION = "0.9rc7"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/core_ext/array.rb

@@ -1,27 +1,35 @@
-class Array
-  
-  def each_collision(*klasses)
-    self.each do |object1|
-      object1.each_collision(*klasses) do |object1, object2|
-        yield object1, object2
-      end
-    end
-  end
-  
-  def each_bounding_circle_collision(*klasses)
-    self.each do |object1|
-      object1.each_bounding_circle_collision(*klasses) do |object1, object2|
-        yield object1, object2
-      end
-    end    
-  end
-
-  def each_bounding_box_collision(*klasses)
-    self.each do |object1|
-      object1.each_bounding_box_collision(*klasses) do |object1, object2|
-        yield object1, object2
-      end
-    end
-  end
-
+class Array
+  
+  def each_collision(*klasses)
+    self.each do |object1|
+      object1.each_collision(*klasses) do |object, object2|
+        yield object, object2
+      end
+    end
+  end
+  
+  def each_bounding_circle_collision(*klasses)
+    self.each do |object1|
+      object1.each_bounding_circle_collision(*klasses) do |object1, object2|
+        yield object1, object2
+      end
+    end    
+  end
+
+  def each_bounding_box_collision(*klasses)
+    self.each do |object1|
+      object1.each_bounding_box_collision(*klasses) do |object1, object2|
+        yield object1, object2
+      end
+    end
+  end
+
+  def each_at(x, y)
+    self.each do |object|
+      object.each_at(x, y) do |obj|
+        yield obj
+      end
+    end
+  end
+
 end

data/lib/chingu/traits/bounding_box.rb

@@ -56,7 +56,7 @@ module Chingu
           return @cached_bounding_box
         end
         
-        width, height = self.size
+        width, height = self.width, self.height
         
         if scale = trait_options[:bounding_box][:scale]
           width_scale, height_scale = scale.is_a?(Array) ? [scale[0],scale[1]] : [scale,scale]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chingu
 version: !ruby/object:Gem::Version
-  version: 0.9rc6
+  version: 0.9rc7
   prerelease: 3
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-06-25 00:00:00.000000000Z
+date: 2011-06-28 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &25668120 !ruby/object:Gem::Requirement
+  requirement: &27817008 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.33
   type: :runtime
   prerelease: false
-  version_requirements: *25668120
+  version_requirements: *27817008
 - !ruby/object:Gem::Dependency
   name: gosu
-  requirement: &25667832 !ruby/object:Gem::Requirement
+  requirement: &27816648 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.7.33
   type: :runtime
   prerelease: false
-  version_requirements: *25667832
+  version_requirements: *27816648
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &25667544 !ruby/object:Gem::Requirement
+  requirement: &27816288 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *25667544
+  version_requirements: *27816288
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &25667256 !ruby/object:Gem::Requirement
+  requirement: &27815988 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25667256
+  version_requirements: *27815988
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &25666968 !ruby/object:Gem::Requirement
+  requirement: &27815616 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *25666968
+  version_requirements: *27815616
 description: 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
@@ -221,7 +221,8 @@ files:
 - examples/media/tube.png
 - examples/media/video_games.png
 - examples/media/wood.png
-- examples/tool1_input_codes.rb
+- examples/tests/holding_a_test.rb
+- examples/tests/tool1_input_codes.rb
 - benchmarks/arrays_bench.rb
 - benchmarks/array_vs_hash.rb
 - benchmarks/benchmark.rb