chingu 0.7.7.5 → 0.8rc1

data/lib/chingu/helpers/game_object.rb

@@ -29,7 +29,6 @@ module Chingu
   module GameObject
   
     def add_game_object(object)
-      # puts "#{self.to_s} add_game_object(#{object.to_s})"
       @game_objects.add_game_object(object)
     end
     
@@ -86,10 +85,16 @@ module Chingu
     # :game_objects - an Array, game objects to save
     # :classes      - an Array, save only game objects of theese classes
     #
+    # NOTE: To save a color do:  :color => game_object.color.argb
+    #
     def save_game_objects(options = {})
+      #
+      # TODO: Move this to GameObjectList#save ?
+      #
       file = options[:file] || "#{self.class.to_s.downcase}.yml"
       game_objects = options[:game_objects]
       classes = options[:classes]
+      attributes = options[:attributes] || [:x, :y, :angle, :zorder, :factor_x, :factor_y, :alpha]
       
       require 'yaml'
       objects = []
@@ -97,30 +102,14 @@ module Chingu
         # Only save specified classes, if given.
         next if classes and !classes.empty? and !classes.include?(game_object.class)
         
-        objects << {game_object.class.to_s  => 
-                      {
-                      :x => game_object.x, 
-                      :y => game_object.y,
-                      :angle => game_object.angle,
-                      :zorder => game_object.zorder,
-                      :factor_x => game_object.factor_x,
-                      :factor_y => game_object.factor_y,
-                      :color => game_object.color.argb,
-                      #:color => sprintf("0x%x",game_object.color.argb)
-                      #:center_x => game_object.center_x,
-                      #:center_y => game_object.center_y,
-                      }
-                    }
+        attr_hash = {}
+        attributes.each { |attr| attr_hash[attr] = game_object.send(attr) }
+        objects << {game_object.class.to_s => attr_hash}
       end
 
-        
-      #Marshal.dump(previous_game_state.game_objects, File.open(@filename, "w"))
-      File.open(file, 'w') do |out|
-        YAML.dump(objects, out)
-      end
+      File.open(file, 'w') { |out| YAML.dump(objects, out) }
     end
     
-  
   end
 
   end

data/lib/chingu/input.rb

@@ -51,6 +51,7 @@ module Chingu
       KbLeftAlt     => [:left_alt, :lalt],
       KbLeftControl => [:left_control, :left_ctrl, :lctrl],
       KbLeftShift   => [:left_shift, :lshift],
+      KbLeftMeta    => [:left_meta, :lmeta],
       
       
       KbNumpadAdd       => [:"+", :add, :plus],
@@ -65,6 +66,7 @@ module Chingu
       KbRightAlt        => [:right_alt, :ralt],
       KbRightControl    => [:right_control, :right_ctrl, :rctrl],
       KbRightShift      => [:right_shift, :rshift],
+      KbRightMeta       => [:right_meta, :rmeta],
       KbSpace           => [:" ", :space],
       KbTab             => [:tabulator, :tab],
       KbUp              => [:up_arrow, :up],

data/lib/chingu/online_high_score_list.rb

@@ -26,7 +26,7 @@ module Chingu
   # - fetch high scores, add new ones
   # - Iterate through highscores with each and each_with_index
   #
-  # Requires gems 'crack' and 'rest_client', included on initialize.
+  # This class is the reason for the 'crack' and 'rest_client' dependencies.
   #
   class OnlineHighScoreList
     attr_reader :resource, :high_scores
@@ -37,9 +37,6 @@ module Chingu
       @login = options[:login] || options[:user]
       @password = options[:password]
       @game_id = options[:game_id]
-
-      require 'rest_client'
-      require 'crack/xml'
       @resource = RestClient::Resource.new("http://api.gamercv.com/games/#{@game_id}/high_scores", 
                                               :user => @login, :password => @password, :timeout => 20, :open_timeout => 5)
                                               

data/lib/chingu/rect.rb

@@ -189,6 +189,7 @@ class Rect < Array
 	end
 
 	# Return the x coordinate of the right side of the Rect.
+  # def right; return self.at(0)+self.at(2)-1; end
 	def right; return self.at(0)+self.at(2); end
 
 	# Set the x coordinate of the right side of the Rect by translating the
@@ -199,6 +200,7 @@ class Rect < Array
 	alias r= right=;
 
 	# Return the y coordinate of the bottom side of the Rect.
+  #def bottom; return self.at(1)+self.at(3)-1; end
 	def bottom; return self.at(1)+self.at(3); end
 
 	# Set the y coordinate of the bottom side of the Rect by translating the
@@ -616,5 +618,4 @@ class Rect < Array
 
 end # class Rect
 
-
 end # module Chingu

data/lib/chingu/window.rb

@@ -39,7 +39,7 @@ module Chingu
     include Chingu::Helpers::InputClient        # Window has its own inputmap
     
     attr_reader :root, :game_state_manager, :game_objects, :milliseconds_since_last_tick
-    attr_accessor :factor
+    attr_accessor :factor, :cursor
     
     def initialize(width = 800, height = 600, fullscreen = false, update_interval = 16.666666)
       fullscreen ||= ARGV.include?("--fullscreen")
@@ -59,10 +59,19 @@ module Chingu
       @game_state_manager = GameStateManager.new
       @milliseconds_since_last_tick = 0
       @factor = 1
+      @cursor = false
       
       setup
     end
     
+    #
+    # If this returns true, GOSU will show a cursor
+    # Chingu solves this with the $window.cursor = [true|false] accessor
+    #
+    def needs_cursor?
+      @cursor
+    end
+    
     # Placeholder to be overwritten
     def setup; end;
     

data/spec/chingu/game_object_spec.rb

@@ -3,9 +3,11 @@ require 'spec_helper'
 module Chingu
 
   describe GameObject do
-
-    before(:all) do 
+    before :all do
       @game = Chingu::Window.new
+      
+      # Gosu uses the paths based on where rspec is, not where this file is, so we need to do it manually!
+      Gosu::Image::autoload_dirs.unshift File.join(File.dirname(File.expand_path(__FILE__)), 'images')
     end
 
     it { should respond_to(:x) }
@@ -19,11 +21,7 @@ module Chingu
     it { should respond_to(:mode) }
     it { should respond_to(:color) }
 
-    describe "a newly created GameObject" do
-      before do
-        subject { GameObject.new }
-      end
-      
+    context "when created with defaults" do
       it "should have default values" do
         subject.angle.should == 0
         subject.x.should == 0
@@ -55,32 +53,34 @@ module Chingu
         subject.alpha = 1000
         subject.alpha.should == 255
       end
-      
     end
 
-    describe "GameObject with an image" do
+    it "should raise an exception if the image fails to load" do
+      lambda { described_class.new(:image => "monkey_with_a_nuclear_tail.png") }.should raise_error Exception
+    end
 
-      let(:game_object) { GameObject.new(:image => "rect_20x20.png") }
+    context "when created with an image named in a string" do
+      subject { described_class.new(:image => "rect_20x20.png") }
 
       it "should have width,height & size" do
-        game_object.height.should == 20
-        game_object.width.should == 20
-        game_object.size.should == [20,20]
+        subject.height.should == 20
+        subject.width.should == 20
+        subject.size.should == [20,20]
       end
       
       it "should adapt width,height & size to scaling" do
-        game_object.factor = 2
-        game_object.height.should == 40
-        game_object.width.should == 40
-        game_object.size.should == [40,40]
+        subject.factor = 2
+        subject.height.should == 40
+        subject.width.should == 40
+        subject.size.should == [40,40]
       end
 
       it "should adapt factor_x/factor_y to new size" do
-        game_object.size = [10,40]  # half the width, double the height
-        game_object.width.should == 10
-        game_object.height.should == 40
-        game_object.factor_x.should == 0.5
-        game_object.factor_y.should == 2
+        subject.size = [10,40]  # half the width, double the height
+        subject.width.should == 10
+        subject.height.should == 40
+        subject.factor_x.should == 0.5
+        subject.factor_y.should == 2
       end
       
     end

data/spec/chingu/input_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe Chingu::Input do
+  it "should map all defined Gosu input constants to Chinu symbols" do
+    # Simpler if all the inputs are in a big hash.
+    input_names = Gosu.constants.select {|constant| constant =~ /^(?:Kb|Ms|Gp)/ }
+    input_names.delete_if {|name| name.to_s =~ /Range(?:Start|End)|Num$/ } # Special entries.
+    gosu_inputs = input_names.inject({}) {|hash, name| hash[name] = Gosu.const_get name; hash }
+
+    gosu_inputs.each_value do |code|
+      symbols = described_class::CONSTANT_TO_SYMBOL[code]
+      symbols.should_not be_empty
+      symbols.each {|s| s.should be_kind_of Symbol }
+    end
+  end
+
+  it "should map all Chingu symbols to Gosu input codes" do
+    described_class::CONSTANT_TO_SYMBOL.values.flatten.uniq.each do |symbol|
+      described_class::SYMBOL_TO_CONSTANT[symbol].should be_kind_of Fixnum
+    end
+  end
+end

metadata

@@ -1,14 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  hash: 97
-  prerelease: false
+  prerelease: true
   segments: 
   - 0
-  - 7
-  - 7
-  - 5
-  version: 0.7.7.5
+  - 8rc1
+  version: 0.8rc1
 platform: ruby
 authors: 
 - ippa
@@ -16,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +02:00
+date: 2010-11-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,12 +24,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
         segments: 
         - 0
         - 7
-        - 22
-        version: 0.7.22
+        - 24
+        version: 0.7.24
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -43,14 +39,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: -744372164
         segments: 
         - 2
         - 0
         - 0
-        - beta
-        - 12
-        version: 2.0.0.beta.12
+        version: 2.0.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -61,7 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -75,12 +67,37 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rest_client
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: crack
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 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 game object and stackable game logic.
 email: ippa@rubylicio.us
 executables: []
@@ -124,6 +141,10 @@ files:
 - 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
@@ -191,6 +212,7 @@ files:
 - 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
@@ -233,7 +255,7 @@ files:
 - 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
@@ -251,19 +273,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: chingu
@@ -278,6 +300,7 @@ test_files:
 - 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
@@ -295,6 +318,9 @@ test_files:
 - 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