chingu 0.8.0.3 → 0.8.0.4

data/README.rdoc

@@ -26,6 +26,8 @@ There's also more complex examples, like a clone of Conways game of life (http:/
 
 == PROJECTS USING CHINGU
 Links to some of the projects using/depending on Chingu:
+* http://ippa.se/games/unexpected_outcome.zip (LD#19 game compo entry by ippa)
+* https://bitbucket.org/philomory/ld19/ (LD#19 game compo entry by philomory)
 * https://github.com/Spooner/fidgit  (GUI-lib )
 * https://github.com/Spooner/sidney  (Sleep Is Death remake in ruby)
 * https://github.com/ippa/the_light_at_the_end_of_the_tunnel (LD#16 game compo entry)

data/chingu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.8.0.3"
+  s.version = "0.8.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2010-12-20}
+  s.date = %q{2011-01-02}
   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 = [

data/lib/chingu.rb

@@ -37,7 +37,7 @@ require_all "#{CHINGU_ROOT}/chingu/traits"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.8.0.3"
+  VERSION = "0.8.0.4"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/animation.rb

@@ -30,8 +30,6 @@ module Chingu
       @loop = options[:loop]
       @bounce = options[:bounce]
       @file = options[:file]
-      @height = options[:height]
-      @width = options[:width]
       @index = options[:index]
       @delay = options[:delay]
       @step = options[:step] || 1
@@ -39,12 +37,24 @@ module Chingu
       
       @sub_animations = {}
       @frame_actions = []
-      @file = media_path(@file)  if @file && !File.exist?(@file)
+      
+      unless File.exists?(@file)
+        Gosu::Image.autoload_dirs.each do |autoload_dir|
+          full_path = File.join(autoload_dir, @file)
+          if File.exists?(full_path)
+            @file = full_path
+            break
+          end
+        end
+      end
       
       #
       # Various ways of determening the framesize
       #
-      if options[:size] && options[:size].is_a?(Array)
+      if options[:height] && options[:width]
+        @height = options[:height]
+        @width = options[:width]
+      elsif options[:size] && options[:size].is_a?(Array)
         @width = options[:size][0]
         @height = options[:size][1]
       elsif options[:size]

data/lib/chingu/game_object_list.rb

@@ -56,7 +56,7 @@ module Chingu
       @game_objects.delete(object)
       #@remove_game_objects.push(object)
     end
-        
+    
     def destroy_if
       @game_objects.reject! { |object| yield(object) }
     end
@@ -101,7 +101,11 @@ module Chingu
     def select
       @game_objects.dup.select { |object| yield object }
     end
-    
+
+    def map
+      @game_objects.map { |object| yield object }
+    end
+
     def first
       @game_objects.first
     end

data/lib/chingu/game_state_manager.rb

@@ -269,10 +269,8 @@ module Chingu
     #
     def update(options = {})
       puts current_game_state.to_s  if options[:debug]
-      if current_game_state
-        current_game_state.update_trait
-        current_game_state.update
-      end
+      current_game_state.update_trait if current_game_state
+      current_game_state.update       if current_game_state
     end
 
     #

data/lib/chingu/helpers/input_client.rb

@@ -202,8 +202,10 @@ module Chingu
       end
 
       # Backwards compatibility function. Use on_inputs or on_input instead.
+      # On object.input = nil we make object not respond to any key.
       def input=(input_list)
         @input = nil
+        return if input_list == nil
         input_list.is_a?(Array) ? add_inputs(*input_list) : add_inputs(input_list)
       end
 

data/spec/chingu/animation_spec.rb

@@ -5,6 +5,7 @@ module Chingu
     before :each do
       @game = Chingu::Window.new
       @test_dir = File.join(File.dirname(File.expand_path(__FILE__)), 'images')
+      Gosu::Image.autoload_dirs << @test_dir
       @animation_clean = Animation.new(:file => File.join(@test_dir, "droid_11x15.bmp"))
       @animation = Animation.new(:file => File.join(@test_dir, "droid_11x15.bmp"), :delay => 0)
     end
@@ -21,6 +22,17 @@ module Chingu
         @animation_clean.index.should == 0
         @animation_clean.step.should == 1
       end
+      
+      it "should find single filename in Image.autoload_dirs" do
+        @anim = Animation.new(:file => "droid_11x15.bmp")
+        @anim.frames.count.should == 14
+      end
+      
+      it "should find relative filename path" do
+        Dir.chdir(File.dirname(File.expand_path(__FILE__)))
+        @anim = Animation.new(:file => "images/droid_11x15.bmp")
+        @anim.frames.count.should == 14
+      end
     end
 
     describe "Animation loading file: droid_11x15.bmp" do

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 8
   - 0
-  - 3
-  version: 0.8.0.3
+  - 4
+  version: 0.8.0.4
 platform: ruby
 authors: 
 - ippa
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-20 00:00:00 +01:00
+date: 2011-01-02 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency