chingu 0.8rc1 → 0.8rc2

data/lib/chingu/parallax.rb

@@ -123,8 +123,6 @@ module Chingu
     #
     def draw
       @layers.each do |layer|
-        #layer.draw
-        
         save_x, save_y = layer.x, layer.y
         
         # If layer lands inside our window and repeat_x is true (defaults to true), draw it until window ends
@@ -183,15 +181,19 @@ module Chingu
           :zorder => (@@zorder_counter+=1)
       }.merge(options)
       
-      
       @repeat_x = options[:repeat_x]
       @repeat_y = options[:repeat_y]
-      
+            
       super(options)
       
       @damping = options[:damping] || 1
     end
     
+    def draw
+      super
+      #p "draw @ #{x} / #{y}: #{image} - #{zorder} - #{color}"
+    end
+    
     #
     # Gets pixel from layers image
     # The pixel is from the window point of view, so coordinates are converted:

data/lib/chingu/text.rb

@@ -65,18 +65,20 @@ module Chingu
         text = nil
       end
      
+      # We remove the :size param so it doesn't get to GameObject where it means something else
+      @size = options.delete(:size) || options.delete(:height) || @@size || 15
+     
       super(options)
   
       @text = text || options[:text] || "-No text specified-"
       @font =  options[:font] || @@font || Gosu::default_font_name()
-      @size = options[:size] || options[:height] || @@size || 15
       @line_spacing = options[:line_spacing] || 1
       @align = options[:align] || :left
       @max_width = options[:max_width]
       @padding = options[:padding] || @@padding
       self.rotation_center = :top_left
 
-      @gosu_font = Gosu::Font.new($window, @font, @size)
+      @gosu_font = Gosu::Font[@font, @size]
       create_image  unless @image
 
       if options[:background]

data/lib/chingu/traits/sprite.rb

@@ -28,8 +28,8 @@ module Chingu
     #  :x, :y, :angle, :factor_x, :factor_y, :center_x, :center_y, :zorder, :mode, :visible
     #
     module Sprite
-
       include Chingu::Helpers::OptionsSetter
+      include Chingu::Helpers::RotationCenter    # Adds easy and verbose modification of @center_x and @center_y
       
       module ClassMethods
         def initialize_trait(options = {})
@@ -37,19 +37,23 @@ module Chingu
         end
       end
       
-      attr_accessor :x, :y, :angle, :factor_x, :factor_y, :center_x, :center_y, :zorder, :mode, :visible
-
-      # default settings for all variables unless set in constructor
-      DEFAULTS = {
-        :x => 0, :y => 0, :angle => 0,
-        :factor_x => 1.0, :factor_y => 1.0,
-        :zorder => 100, :center_x => 0.5, :center_y => 0.5,
-        :mode => :default,
-        :color => nil
-      }
-
-      def setup_trait(object_options = {})
-        set_options(trait_options[:sprite].merge(object_options), DEFAULTS)
+      attr_accessor :x, :y, :angle, :factor_x, :factor_y, :center_x, :center_y, :zorder, :mode, :visible, :color
+      attr_reader :factor, :center, :height, :width, :image     
+
+      def setup_trait(object_options = {})        
+        # default settings for all variables unless set in constructor
+        defaults = {
+          :x => 0, :y => 0, :angle => 0,
+          :factor => ($window.factor||1.0),
+          :zorder => 100, :center_x => 0.5, :center_y => 0.5,
+          :mode => :default, :color => nil
+        }
+        
+        # if user specs :image take care of it first since width, height etc depends on it.
+        self.image = object_options.delete(:image)  if object_options[:image]
+        
+        set_options(trait_options[:sprite].merge(object_options), defaults)
+        
         super
       end
 
@@ -139,14 +143,13 @@ module Chingu
         [self.width, self.height]
       end
       
-
       # Quick way of setting both factor_x and factor_y
       def factor=(factor)
-        @factor_x = @factor_y = factor
+        @factor = @factor_x = @factor_y = factor
       end
       alias scale= factor=
-      # alias scale factor
-          
+      alias scale factor
+      
       # Quick way of setting both center_x and center_y
       def center=(center)
         @center_x = @center_y = center
@@ -220,7 +223,7 @@ module Chingu
       # Works as #draw() but takes offsets for all draw_rot()-arguments. Used among others by the viewport-trait.
       #      
       def draw_relative(x=0, y=0, zorder=0, angle=0, center_x=0, center_y=0, factor_x=0, factor_y=0)
-        @image.draw_rot(@x+x, @y+y, @zorder+zorder, @angle+angle, @center_x+center_x, @center_y+center_y, @factor_x+factor_x, @factor_y+factor_y, @color, @mode) if @visible
+        @image.draw_rot(@x+x, @y+y, @zorder+zorder, @angle+angle, @center_x+center_x, @center_y+center_y, @factor_x+factor_x, @factor_y+factor_y, @color, @mode)
       end
 
       #

data/lib/chingu/window.rb

@@ -42,6 +42,8 @@ module Chingu
     attr_accessor :factor, :cursor
     
     def initialize(width = 800, height = 600, fullscreen = false, update_interval = 16.666666)
+      raise "Cannot create a new #{self.class} before the old one has been closed" if $window
+
       fullscreen ||= ARGV.include?("--fullscreen")
       $window = super(width, height, fullscreen, update_interval)
 			
@@ -51,6 +53,7 @@ module Chingu
       Gosu::Image.autoload_dirs   += [".", File.join(@root, "images"), File.join(@root, "gfx"), File.join(@root, "media")]
       Gosu::Sample.autoload_dirs  += [".", File.join(@root, "sounds"), File.join(@root, "sfx"), File.join(@root, "media")]
       Gosu::Song.autoload_dirs    += [".", File.join(@root, "songs"), File.join(@root, "sounds"), File.join(@root, "sfx"), File.join(@root, "media")]
+      Gosu::Font.autoload_dirs    += [".", File.join(@root, "fonts"), File.join(@root, "media")]
       			
       @game_objects = GameObjectList.new
       @input_clients = Array.new
@@ -198,5 +201,19 @@ module Chingu
       @input_clients.each { |object| dispatch_button_down(id, object) unless object.paused? }
       @game_state_manager.button_down(id)
     end
+	
+    #
+    # Close the window when it is no longer required. Ensure this is done before a new window is initialized.
+    #
+    def close
+      super
+
+      # Clear out all assets, tied to this $window, so that a new instance can create more.
+      [Gosu::Image, Gosu::Song, Gosu::Font, Gosu::Sample].each do |asset|
+        asset.clear
+      end
+
+      $window = nil
+    end
   end
 end

data/spec/chingu/game_object_spec.rb

@@ -20,6 +20,10 @@ module Chingu
     it { should respond_to(:zorder) }
     it { should respond_to(:mode) }
     it { should respond_to(:color) }
+    it { should respond_to(:attributes) }
+    it { should respond_to(:draw) }
+    it { should respond_to(:draw_at) }
+    it { should respond_to(:draw_relative) }
 
     context "when created with defaults" do
       it "should have default values" do
@@ -54,10 +58,55 @@ module Chingu
         subject.alpha.should == 255
       end
     end
+    
+    it "should have the same value for self.alpha as self.color.alpha" do
+      subject.alpha.should == subject.color.alpha
+    end
+    
+    it "should have a corrent filename created from class name" do
+      subject.filename.should == "game_object"
+    end
 
     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
+    
+    context "position" do
+      it "inside_window?" do
+        subject.x = 1
+        subject.y = 1
+        subject.inside_window?.should == true
+        subject.outside_window?.should == false
+      end
+      it "outside_window?" do
+        subject.x = @game.width + 1
+        subject.y = @game.height + 1
+        subject.inside_window?.should == false
+        subject.outside_window?.should == true
+      end
+    end
+    
+    context "setters" do
+      it "factor should set both factor_x and factor_y" do
+        subject.factor = 4
+        subject.factor_x.should == 4
+        subject.factor_y.should == 4
+      end
+      
+      it "scale should work as alias for factor" do
+        subject.scale = 5
+        subject.factor.should == 5
+      end
+    end
+    
+    context "visibility" do
+      it "should hide/show object on self.hide! and self.show!" do
+        subject.hide!
+        subject.visible?.should == false
+        subject.show!
+        subject.visible?.should == true
+      end
+    end
 
     context "when created with an image named in a string" do
       subject { described_class.new(:image => "rect_20x20.png") }
@@ -81,9 +130,28 @@ module Chingu
         subject.height.should == 40
         subject.factor_x.should == 0.5
         subject.factor_y.should == 2
+      end      
+    end
+    
+    context "when created with multiple arguments" do
+      subject { described_class.new(:image => "rect_20x20.png", :size => [10, 10]) }
+      it "should initialize values correclty" do
+        subject.width.should == 10
+        subject.height.should == 10
       end
-      
     end
+    
+    #context "when there's a global factor/scale" do
+    #  $window = Chingu::Window.new
+    #  $window.factor = 2
+    #  subject { described_class.new(:image => "rect_20x20.png") }
+    #  it "should use global factor/scale" do
+    #    subject.factor_x.should == 2
+    #    subject.factor_y.should == 2
+    #    subject.width.should == 40
+    #    subject.height.should == 40
+    #  end
+    #end
 
     after(:all) do
       $window.close

data/spec/chingu/parallax_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+module Chingu
+
+  describe Parallax 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
+    
+    context "layers" do
+      before :all do
+        @parallax = Parallax.new
+        @parallax << {:image => "rect_20x20.png", :repeat_x => true, :repeat_y => true}
+        @parallax.add_layer(:image => "rect_20x20.png", :repeat_x => true, :repeat_y => true)
+        @parallax << ParallaxLayer.new(:image => "rect_20x20.png", :repeat_x => true, :repeat_y => true)
+      end
+      
+      it "should have 3 different ways of adding layers" do
+        @parallax.layers.count.should == 3
+      end
+      
+      it "should have incrementing zorder" do
+        @parallax.layers[0].zorder == 0
+        @parallax.layers[1].zorder == 1
+        @parallax.layers[2].zorder == 2
+      end
+    end
+    
+  end
+
+end

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: true
   segments: 
   - 0
-  - 8rc1
-  version: 0.8rc1
+  - 8rc2
+  version: 0.8rc2
 platform: ruby
 authors: 
 - ippa
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-14 00:00:00 +01:00
+date: 2010-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 7
-        - 24
-        version: 0.7.24
+        - 25
+        version: 0.7.25
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,9 +41,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 2
+        - 1
         - 0
-        - 0
-        version: 2.0.0
+        version: 2.1.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -108,7 +108,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - .rspec
 - History.txt
 - LICENSE
@@ -142,9 +141,9 @@ files:
 - 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/example26_splash_screen.rb
 - examples/example2_gamestate_basics.rb
 - examples/example3_parallax.rb
 - examples/example4_gamestates.rb
@@ -199,10 +198,12 @@ files:
 - examples/media/tube.png
 - examples/media/video_games.png
 - examples/media/wood.png
+- examples/tool1_input_codes.rb
 - lib/chingu.rb
 - lib/chingu/animation.rb
 - lib/chingu/assets.rb
 - lib/chingu/basic_game_object.rb
+- lib/chingu/classic_game_object.rb
 - lib/chingu/core_ext/array.rb
 - lib/chingu/fpscounter.rb
 - lib/chingu/game_object.rb
@@ -256,6 +257,7 @@ files:
 - spec/chingu/images/rect_20x20.png
 - spec/chingu/inflector_spec.rb
 - spec/chingu/input_spec.rb
+- spec/chingu/parallax_spec.rb
 - spec/chingu/text_spec.rb
 - spec/spec_helper.rb
 - specs.watchr
@@ -264,8 +266,8 @@ homepage: http://github.com/ippa/chingu
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -294,15 +296,6 @@ signing_key:
 specification_version: 3
 summary: OpenGL accelerated 2D game framework for Ruby
 test_files: 
-- spec/chingu/fpscounter_spec.rb
-- spec/chingu/game_object_spec.rb
-- spec/chingu/helpers/input_client_spec.rb
-- 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
 - examples/example11_animation.rb
 - examples/example12_trait_timer.rb
@@ -319,8 +312,8 @@ test_files:
 - 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/example26_splash_screen.rb
 - examples/example2_gamestate_basics.rb
 - examples/example3_parallax.rb
 - examples/example4_gamestates.rb
@@ -331,3 +324,14 @@ test_files:
 - examples/example9_collision_detection.rb
 - examples/game1.rb
 - examples/game_of_life.rb
+- examples/tool1_input_codes.rb
+- spec/chingu/fpscounter_spec.rb
+- spec/chingu/game_object_spec.rb
+- spec/chingu/helpers/input_client_spec.rb
+- 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/parallax_spec.rb
+- spec/chingu/text_spec.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,6 +0,0 @@
-*.gem
-pkg
-.gem
-.git
-.idea
-coverage