chingu 0.5.9 → 0.5.9.2

data/Manifest.txt

@@ -65,6 +65,7 @@ lib/chingu/game_object_list.rb
 lib/chingu/game_state.rb
 lib/chingu/game_state_manager.rb
 lib/chingu/game_states/debug.rb
+lib/chingu/game_states/edit.rb
 lib/chingu/game_states/fade_to.rb
 lib/chingu/game_states/pause.rb
 lib/chingu/helpers/game_object.rb

data/chingu.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.5.9"
+  s.version = "0.5.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-10-25}
+  s.date = %q{2009-11-09}
   s.description = %q{OpenGL accelerated 2D game framework for Ruby.
 Builds on the awesome Gosu (Ruby/C++) which provides all the core functionality.
 It adds simple yet powerful game states, prettier input handling, deployment safe asset-handling, a basic re-usable game object and automation of common task.}
   s.email = ["ippa@rubylicio.us"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "benchmarks/README.txt"]
-  s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "benchmarks/README.txt", "benchmarks/benchmark.rb", "benchmarks/benchmark3.rb", "benchmarks/benchmark4.rb", "benchmarks/benchmark5.rb", "benchmarks/benchmark6.rb", "benchmarks/meta_benchmark.rb", "benchmarks/meta_benchmark2.rb", "chingu.gemspec", "examples/example1.rb", "examples/example10.rb", "examples/example11.rb", "examples/example12.rb", "examples/example13.rb", "examples/example2.rb", "examples/example3.rb", "examples/example4.rb", "examples/example5.rb", "examples/example6.rb", "examples/example7.rb", "examples/example8.rb", "examples/example9.rb", "examples/game1.rb", "examples/high_score_list.yml", "examples/media/Parallax-scroll-example-layer-0.png", "examples/media/Parallax-scroll-example-layer-1.png", "examples/media/Parallax-scroll-example-layer-2.png", "examples/media/Parallax-scroll-example-layer-3.png", "examples/media/background1.png", "examples/media/bullet.png", "examples/media/bullet_hit.wav", "examples/media/city1.csv", "examples/media/city1.png", "examples/media/city2.png", "examples/media/droid.bmp", "examples/media/enemy_bullet.png", "examples/media/explosion.wav", "examples/media/fire_bullet.png", "examples/media/fireball.png", "examples/media/laser.wav", "examples/media/particle.png", "examples/media/plane.csv", "examples/media/plane.png", "examples/media/ruby.png", "examples/media/saucer.csv", "examples/media/saucer.gal", "examples/media/saucer.png", "examples/media/spaceship.png", "examples/media/stickfigure.bmp", "examples/media/stickfigure.png", "examples/media/video_games.png", "lib/chingu.rb", "lib/chingu/animation.rb", "lib/chingu/assets.rb", "lib/chingu/basic_game_object.rb", "lib/chingu/core_extensions.rb", "lib/chingu/fpscounter.rb", "lib/chingu/game_object.rb", "lib/chingu/game_object_list.rb", "lib/chingu/game_state.rb", "lib/chingu/game_state_manager.rb", "lib/chingu/game_states/debug.rb", "lib/chingu/game_states/fade_to.rb", "lib/chingu/game_states/pause.rb", "lib/chingu/helpers/game_object.rb", "lib/chingu/helpers/game_state.rb", "lib/chingu/helpers/gfx.rb", "lib/chingu/helpers/input_client.rb", "lib/chingu/helpers/input_dispatcher.rb", "lib/chingu/helpers/rotation_center.rb", "lib/chingu/high_score_list.rb", "lib/chingu/inflector.rb", "lib/chingu/input.rb", "lib/chingu/named_resource.rb", "lib/chingu/parallax.rb", "lib/chingu/particle.rb", "lib/chingu/rect.rb", "lib/chingu/require_all.rb", "lib/chingu/text.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/effect.rb", "lib/chingu/traits/retrofy.rb", "lib/chingu/traits/timer.rb", "lib/chingu/traits/velocity.rb", "lib/chingu/window.rb"]
+  s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "benchmarks/README.txt", "benchmarks/benchmark.rb", "benchmarks/benchmark3.rb", "benchmarks/benchmark4.rb", "benchmarks/benchmark5.rb", "benchmarks/benchmark6.rb", "benchmarks/meta_benchmark.rb", "benchmarks/meta_benchmark2.rb", "chingu.gemspec", "examples/example1.rb", "examples/example10.rb", "examples/example11.rb", "examples/example12.rb", "examples/example13.rb", "examples/example2.rb", "examples/example3.rb", "examples/example4.rb", "examples/example5.rb", "examples/example6.rb", "examples/example7.rb", "examples/example8.rb", "examples/example9.rb", "examples/game1.rb", "examples/high_score_list.yml", "examples/media/Parallax-scroll-example-layer-0.png", "examples/media/Parallax-scroll-example-layer-1.png", "examples/media/Parallax-scroll-example-layer-2.png", "examples/media/Parallax-scroll-example-layer-3.png", "examples/media/background1.png", "examples/media/bullet.png", "examples/media/bullet_hit.wav", "examples/media/city1.csv", "examples/media/city1.png", "examples/media/city2.png", "examples/media/droid.bmp", "examples/media/enemy_bullet.png", "examples/media/explosion.wav", "examples/media/fire_bullet.png", "examples/media/fireball.png", "examples/media/laser.wav", "examples/media/particle.png", "examples/media/plane.csv", "examples/media/plane.png", "examples/media/ruby.png", "examples/media/saucer.csv", "examples/media/saucer.gal", "examples/media/saucer.png", "examples/media/spaceship.png", "examples/media/stickfigure.bmp", "examples/media/stickfigure.png", "examples/media/video_games.png", "lib/chingu.rb", "lib/chingu/animation.rb", "lib/chingu/assets.rb", "lib/chingu/basic_game_object.rb", "lib/chingu/core_extensions.rb", "lib/chingu/fpscounter.rb", "lib/chingu/game_object.rb", "lib/chingu/game_object_list.rb", "lib/chingu/game_state.rb", "lib/chingu/game_state_manager.rb", "lib/chingu/game_states/debug.rb", "lib/chingu/game_states/edit.rb", "lib/chingu/game_states/fade_to.rb", "lib/chingu/game_states/pause.rb", "lib/chingu/helpers/game_object.rb", "lib/chingu/helpers/game_state.rb", "lib/chingu/helpers/gfx.rb", "lib/chingu/helpers/input_client.rb", "lib/chingu/helpers/input_dispatcher.rb", "lib/chingu/helpers/rotation_center.rb", "lib/chingu/high_score_list.rb", "lib/chingu/inflector.rb", "lib/chingu/input.rb", "lib/chingu/named_resource.rb", "lib/chingu/parallax.rb", "lib/chingu/particle.rb", "lib/chingu/rect.rb", "lib/chingu/require_all.rb", "lib/chingu/text.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/effect.rb", "lib/chingu/traits/retrofy.rb", "lib/chingu/traits/timer.rb", "lib/chingu/traits/velocity.rb", "lib/chingu/window.rb"]
   s.homepage = %q{http://github.com/ippa/chingu/tree/master}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]

data/examples/game1.rb

@@ -75,7 +75,8 @@ class Level < Chingu::GameState
     
     @parallax = Parallax.create
     ParallaxLayer.has_trait :retrofy
-    @parallax << ParallaxLayer.new(:image => Image["city2.png"].retrofy, :center => 0, :damping => 5, :factor => $window.factor)
+    #@parallax << ParallaxLayer.new(:image => Image["city3.png"].retrofy, :center => 0, :damping => 4, :factor => $window.factor)
+    @parallax << ParallaxLayer.new(:image => Image["city2.png"].retrofy, :center => 0, :damping => 2, :factor => $window.factor)
     @parallax << ParallaxLayer.new(:image => Image["city1.png"].retrofy, :center => 0, :damping => 1, :factor => $window.factor)
     @player = Player.create(:x => 10, :y => 100)
     
@@ -102,10 +103,14 @@ class Level < Chingu::GameState
   end
 
   #
-  # Our 
+  # The foremost layer in our parallax scroller is the collidable terrain
   #
   def solid_pixel_at?(x, y)
-    @parallax.layers.last.get_pixel(x, y)[3] != 0
+    begin
+      @parallax.layers.last.get_pixel(x, y)[3] != 0
+    rescue
+      puts "Error in get_pixel(#{x}, #{y})"
+    end
   end
   
   def update
@@ -114,9 +119,12 @@ class Level < Chingu::GameState
     # Move the level forward by increasing the parallax-scrollers camera x-coordinate
     @parallax.camera_x += 1
     
-    #
-    Bullet.all.select { |b| solid_pixel_at?(b.x, b.y)}.each { |b| b.die }
-    
+    # Remove all objects outside screen
+    game_objects.destroy_if { |game_object| game_object.respond_to?("outside_window?") && game_object.outside_window? }
+
+    # Collide bullets with terrain
+    Bullet.all.select { |o| solid_pixel_at?(o.x, o.y)}.each { |o| o.die }
+        
     # Collide player with terrain
     push_game_state(GameOver) if solid_pixel_at?(@player.x, @player.y)
     
@@ -143,7 +151,7 @@ class Level < Chingu::GameState
     
     #push_game_state(Done.new(:score => @player.score)) if @game_steps == 1
     
-    $window.caption = "City Battle! Score: #{@player.score}"
+    $window.caption = "City Battle! Score: #{@player.score} .... FPS: #{$window.fps} ... game objects: #{game_objects.size}"
   end
   
   def draw
@@ -156,7 +164,7 @@ end
 # OUR PLAYER
 #
 class Player < GameObject
-  has_trait :velocity, :collision_detection, :retrofy
+  has_trait :velocity, :collision_detection, :retrofy, :timer
   attr_accessor :score
   
   def initialize(options = {})
@@ -169,11 +177,12 @@ class Player < GameObject
       :holding_right => :right, 
       :holding_up => :up, 
       :holding_down => :down, 
-      :space => :fire }
+      :holding_space => :fire }
     
     @max_velocity = 1
     @radius = 10
     @score = 0
+    @cooling_down = false
   end
   
   def up
@@ -190,8 +199,12 @@ class Player < GameObject
   end
   
   def fire
+    return if @cooling_down
+    @cooling_down = true
+    after(100) { @cooling_down = false}
+    
     Bullet.create(:x => self.x, :y => self.y)
-    Sound["laser.wav"].play
+    Sound["laser.wav"].play(0.1)
   end
   
   def update
@@ -223,7 +236,7 @@ class Bullet < GameObject
   
   def die
     return  if @status == :dying
-    Sound["bullet_hit.wav"].play
+    Sound["bullet_hit.wav"].play(0.2)
     @status = :dying
     during(50) { @factor_x += 1; @factor_y += 1; @x -= 1; }.then { self.destroy }
   end
@@ -245,11 +258,74 @@ class EnemyBullet < Bullet
   end
 end
 
+class Explosion < GameObject
+  has_trait :timer,:retrofy
+  
+  def initialize(options)
+    super
+    
+    unless defined?(@@image)
+      @@image = TexPlay::create_blank_image($window, 100, 100)
+      @@image.paint { circle 50,50,49, :fill => true, :color => [1,1,1,1] }
+    end
+    
+    @image = @@image.dup  if @image.nil?
+    
+    
+    self.rotation_center(:center)
+    self.factor = options[:factor] ? options[:factor] : $window.factor
+    during(100) { self.alpha -= 30}.then { destroy }
+  end
+  
+  def self.create_image_for(object)
+    width = height = (object.image.width + object.image.height) / 2
+    explosion_image = TexPlay::create_blank_image($window, 100, 100)
+    explosion_image.paint { circle 50,50,49, :fill => true, :color => [1,1,1,1] }
+    return explosion_image
+  end
+  
+end
+
+class Shrapnel < GameObject
+  has_trait :retrofy, :timer, :effect, :velocity
+  
+  def initialize(options)
+    super
+    
+    self.rotation_rate = 1 + rand(10)
+    self.velocity_x = 4 - rand(8)
+    self.velocity_y = 4 - rand(10)
+    self.acceleration_y = 0.2 # gravity = downards acceleration
+    
+    rotation_center(:center)
+    self.factor = $window.factor
+    @status = :default
+  end
+  
+  def self.create_image_for(object)
+    image = object.image
+    width = image.width / 5
+    height = image.width / 5
+    
+    shrapnel_image = TexPlay::create_blank_image($window, width, height)
+    x1 = rand(image.width/width)
+    y1 = rand(image.height/height)
+    shrapnel_image.paint { splice image,0,0, :crop => [x1, y1, x1+width, y1+height] }    
+    
+    return shrapnel_image
+  end
+  
+  def die
+    destroy
+  end
+  
+end
+
 #
 # OUR ENEMY SAUCER
 #
 class Enemy < GameObject
-  has_trait :collision_detection, :retrofy, :timer 
+  has_trait :collision_detection, :retrofy, :timer  
   
   def initialize(options)
     super
@@ -259,17 +335,28 @@ class Enemy < GameObject
     @anim = Animation.new(:file => "media/saucer.png", :size => [32,13], :delay => 100)
     @anim.retrofy
     @image = @anim.first
-    
+      
     self.factor = $window.factor
     @radius = 5
     @black = Color.new(0xFF000000)
     @status == :default
+    
+    #
+    # Cache explosion and shrapnel images (created with texplay, not recomended doing over and over each time)
+    #
+    @@shrapnel_image ||= Shrapnel.create_image_for(self)
+    @@explosion_image ||= Explosion.create_image_for(self)
   end
   
   def hit_by(object)
     return if @status == :dying
     
+    #
+    # During 20 millisecons, use Gosus :additive draw-mode, which here results in a white sprite
+    # Classic "hit by a bullet"-effect
+    #
     during(20) { @mode = :additive; }.then { @mode = :default }
+    
     @health -= 20
   
     if @health <= 0
@@ -285,9 +372,24 @@ class Enemy < GameObject
   end
   
   def die
+    #
+    # Make sure die() is only called once
+    #
     return  if @status == :dying
-    Sound["explosion.wav"].play
     @status = :dying
+    
+    #
+    # Play our explosion-sound file
+    # Create an explosion-object
+    # Create some shrapnel-objects
+    #
+    Sound["explosion.wav"].play(0.3)
+    Explosion.create(:x => @x, :y => @y, :image => @@explosion_image )
+    5.times { Shrapnel.create(:x => @x, :y => @y, :image => @@shrapnel_image)}
+    
+    #
+    # During 200 ms, fade and scale image, then destroy it
+    #
     @color = @black
     @color.alpha = 50
     during(200) { @factor_x += 0.5; @factor_y += 0.5; @x -= 1; @color.alpha -= 1}.then { self.destroy }
@@ -296,7 +398,7 @@ class Enemy < GameObject
   def update
     return if @status == :dying
     
-    @image = @anim.next!
+    @image = @anim.next
     @x -= @velocity
   end
 end

data/lib/chingu.rb

@@ -28,5 +28,5 @@ require File.join(CHINGU_ROOT,"chingu","require_all") # Thanks to http://github.
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.5.9"
+  VERSION = "0.5.9.2"
 end

data/lib/chingu/animation.rb

@@ -10,7 +10,7 @@ module Chingu
   # Is autodetection of width / height possible? 
   #
   class Animation
-    attr_accessor :frames, :delay, :step
+    attr_accessor :frames, :delay, :step, :loop, :bounce, :step
     
     #
     # Create a new Animation. 
@@ -59,7 +59,7 @@ module Chingu
     # Returns last frame (GOSU::Image) from animation
     #
     def last
-      @frames.first
+      @frames.last
     end
     
     #

data/lib/chingu/assets.rb

@@ -7,7 +7,11 @@ module Chingu
   def media_path(file)
     File.join(ROOT, "media", file)  
   end
-  
+
+  def root_path(file)
+    File.join(ROOT, file)  
+  end
+
   def image_path(file)
     File.join(ROOT, "images", file)
   end

data/lib/chingu/basic_game_object.rb

@@ -53,7 +53,7 @@ module Chingu
       # which then will pass it on to the next setup_trait() with a super-call.
       setup_trait(options)
     end
-    
+
     #
     # Creates a new object from class just as new() but also:
     # - adds game object to current game state
@@ -74,6 +74,14 @@ module Chingu
       return instance
     end
 
+    #
+    # This ruby callback is called each time someone subclasses BasicGameObject or GameObject
+    # We hook into it to keep track of all game object classes (just as we keep track of game objects instances)
+    #
+    ## def self.inherited(klass)
+    ##   instance.parent.add_game_object_class(klass) if instance.parent
+    ## end
+
     #
     # Disable automatic calling of update() and update_trait() each game loop
     #

data/lib/chingu/game_object.rb

@@ -33,6 +33,7 @@ module Chingu
     include Chingu::Helpers::InputClient        # Adds input and input=
     include Chingu::Helpers::RotationCenter     # Adds easy and verbose modification of @center_x and @center_y
         
+    
     def initialize(options = {})
       super
 
@@ -61,7 +62,9 @@ module Chingu
         @color = options[:color]
       else
         @color = Gosu::Color.new(options[:color] || 0xFFFFFFFF)
-      end      
+      end
+      
+      self.alpha = options[:alpha]  if options[:alpha]
       
       @mode = options[:mode] || :default # :additive is also available.
       @zorder = options[:zorder] || 100

data/lib/chingu/game_state_manager.rb

@@ -102,6 +102,8 @@ module Chingu
     def switch_game_state(state, options = {})
       options = {:setup => true, :finalize => true, :transitional => true}.merge(options)
 
+      @previous_game_state = current_game_state
+      
       new_state = game_state_instance(state)
       
       if new_state
@@ -109,7 +111,6 @@ module Chingu
         new_state.game_state_manager = self
         
         # Give the soon-to-be-disabled state a chance to clean up by calling finalize() on it.
-        @previous_game_state = current_game_state
         current_game_state.finalize   if current_game_state.respond_to?(:finalize) && options[:finalize]
         
         # So BasicGameObject#create connects object to new state in its setup()
@@ -143,6 +144,8 @@ module Chingu
     def push_game_state(state, options = {})
       options = {:setup => true, :finalize => true, :transitional => true}.merge(options)
 
+      @previous_game_state = current_game_state
+      
       new_state = game_state_instance(state)
             
       if new_state
@@ -157,7 +160,6 @@ module Chingu
         new_state.game_state_manager = self
         
         # Give the soon-to-be-disabled state a chance to clean up by calling finalize() on it.
-        @previous_game_state = current_game_state
         current_game_state.finalize   if current_game_state.respond_to?(:finalize) && options[:finalize]
         
         if @transitional_game_state && options[:transitional]

data/lib/chingu/game_states/edit.rb

@@ -0,0 +1,164 @@
+#--
+#
+# Chingu -- OpenGL accelerated 2D game framework for Ruby
+# Copyright (C) 2009 ippa / ippa@rubylicio.us
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+#++
+
+module Chingu
+  module GameStates
+  
+    #
+    # Premade game state for chingu - A simple pause state.
+    # Pause whenever with: 
+    #   push_game_state(Chingu::GameStates::Pause)
+    #
+    # requires the global $window set to the instance of Gosu::Window (automaticly handled if you use Chingu::Window)
+    #
+    class Edit < Chingu::GameState
+      def initialize(options = {})
+        super
+        @color = Gosu::Color.new(200,0,0,0)
+        @red = Gosu::Color.new(0xFFFF0000)
+        @white = Gosu::Color.new(0xFFFFFFFF)
+        @selected_game_object = nil        
+        self.input =  { :left_mouse_button => :left_mouse_button, 
+                        :released_left_mouse_button => :released_left_mouse_button,
+                        :e => :save_and_quit,
+                        :s => :save,
+                        :esc => :quit 
+          }
+      end
+
+      def setup
+        name = if defined?(previous_game_state.filename)
+          previous_game_state.filename
+        else 
+          "#{previous_game_state.class.to_s.downcase}.yml"
+        end
+        @filename = File.join($window.root, name)
+        @title = Text.create("Editing #{@filename}", :x => 5, :y => 10)
+        @title2 = Text.create("(S) Save  (E) Save and Quit  (ESC) Quit without saving", :x => 5, :y => 30)
+        @text = Text.create("", :x => 5, :y => 50)
+      end
+      
+      def draw
+        previous_game_state.draw    # Draw prev game state onto screen (in this case our level)
+        
+        $window.draw_quad(  0,0,@color,
+                            $window.width,0,@color,
+                            $window.width,100,@color,
+                            0,100,@color,10)
+        super
+        
+        previous_game_state.game_objects.select { |o| o.options[:selected] }.each do |game_object|
+          
+        #  rect = game_object.bounding_box
+        #  rect.x *= $window.factor
+        #  rect.y *= $window.factor
+        #  $window.fill_rect(rect, @red, game_object.zorder - 1)
+        end
+        
+        #
+        # draw a simple triagle-shaped cursor
+        #
+        $window.draw_triangle( $window.mouse_x, $window.mouse_y, @white, 
+                               $window.mouse_x, $window.mouse_y + 10, @white, 
+                               $window.mouse_x + 10, $window.mouse_y + 10, @white, 9999)
+                               
+        if @left_mouse_button && @selected_game_object
+          @selected_game_object.x = $window.mouse_x / $window.factor
+          @selected_game_object.y = $window.mouse_y / $window.factor
+          
+          #
+          # Can we abstract this out somehow?
+          #
+          if @selected_game_object.respond_to?(:bounding_box)
+            @selected_game_object.bounding_box.x = @selected_game_object.x
+            @selected_game_object.bounding_box.y = @selected_game_object.y
+          end
+        end
+      end  
+       
+      def left_mouse_button
+        @left_mouse_button = true
+        x = $window.mouse_x / $window.factor
+        y = $window.mouse_y / $window.factor
+        @text.text = "Click @ #{x} / #{y}"
+        @selected_game_object = game_object_at(x, y)
+        if @selected_game_object
+          @text.text = "#{@text.text} : #{@game_object.class.to_s}"
+          @selected_game_object.options[:selected] = true
+        end
+      end
+      
+      def released_left_mouse_button
+        @left_mouse_button = false
+        @selected_game_object = false
+      end
+      
+      def game_object_at(x, y)
+        previous_game_state.game_objects.select do |game_object| 
+          game_object.respond_to?(:bounding_box) && game_object.bounding_box.collide_point?(x,y)
+        end.first
+      end
+      
+      
+      def save
+        require 'yaml'
+        objects = []
+        previous_game_state.game_objects.each do |game_object|
+          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,
+                        :center_x => game_object.center_x,
+                        :center_y => game_object.center_y,
+                        }
+                      }
+        end
+        
+        #Marshal.dump(previous_game_state.game_objects, File.open(@filename, "w"))
+        File.open(@filename, 'w') do |out|
+          YAML.dump(objects, out)
+        end
+      end
+      
+      def save_and_quit
+        save
+        quit
+      end
+      
+      def quit
+        pop_game_state
+      end
+      
+      #
+      # If we're editing a game state with automaticly called special methods, 
+      # the following takes care of those.
+      #
+      def method_missing(symbol, *args)
+        previous_game_state.__send__(symbol, *args)
+      end
+      
+    end
+  end
+end

data/lib/chingu/helpers/game_object.rb

@@ -46,6 +46,33 @@ module Chingu
     def game_objects_of_class(klass)
       @game_objects.select { |game_object| game_object.is_a? klass }
     end
+    
+    #
+    # Creates game objects from a Chingu-spezed game objects file (created with game state 'Edit')
+    #
+    def load_game_objects(options = {})
+      filename = options[:file] || "#{self.class.to_s.downcase}.yml"
+      
+      require 'yaml'
+      
+      if File.exists?(filename)
+        game_objects = YAML.load_file(filename)
+        game_objects.each do |game_object|
+          game_object.each_pair do |klassname, attributes|
+            begin
+              klass = Kernel::const_get(klassname)
+              unless klass.class == "GameObject"
+                puts "Creating #{klassname.to_s}: #{attributes.to_s}"
+                klass.create(attributes)
+              end
+            rescue
+              puts "Couldn't create class '#{klassname}'"
+            end
+          end
+        end
+      end
+    end
+  
   end
 
   end

data/lib/chingu/helpers/gfx.rb

@@ -29,26 +29,85 @@ module Chingu
   module GFX
   
     #
-    # Fills whole window with color 'color'.
+    # Fills whole window with specified 'color' and 'zorder'
     #
-    def fill(color)
-      $window.draw_quad(0, 0, color,
-                        $window.width, 0, color,
-                        $window.width, $window.height, color,
-                        0, $window.height, color,
-                        0, :default)
+    #def fill(color, zorder = 0)
+    #  $window.draw_quad(0, 0, color,
+    #                    $window.width, 0, color,
+    #                    $window.width, $window.height, color,
+    #                    0, $window.height, color,
+    #                    zorder, :default)
+    #end
+    #
+    
+    # Fills window or a given rect with a gradient between two colors.
+    #
+    #   :from         - Start with this color
+    #   :to           - End with this color
+    #   :rect         - Only fill rectangle :rect with the gradient, either a Rect-instance or [x,y,width,height] Array.
+    #   :orientation  - Either :vertical (top to bottom) or :horizontal (left to right)
+    #
+    
+    def fill(options)
+      #
+      # if only 1 color-argument is given, assume fullscreen simple color fill.
+      #
+      if options.is_a?(Gosu::Color)
+        $window.draw_quad(0, 0, color,
+                        $window.width, 0, options,
+                        $window.width, $window.height, options,
+                        0, $window.height, options, 0, :default)
+        return
+      end
+      
+      default_options = { :colors => [Gosu::Color.new(0xFFFFFFFF), Gosu::Color.new(0xFF000000)],
+                          :orientation => :vertical,
+                          :rect => Rect.new([0, 0, $window.width, $window.height]),
+                          :zorder => 0,
+                          :mode => :default
+                        }
+			options = default_options.merge(options)
+      rect = Rect.new(options[:rect])
+      
+      if options[:orientation] == :vertical
+        x = rect.x
+        y = rect.y
+        right = rect.right
+        bottom = rect.bottom
+        
+        step = (rect.x + rect.right) / options[:colors].size
+        1.upto(options[:colors].size).each do |nr|
+          from = options[:colors]
+          to = 
+        
+          $window.draw_quad(  x, y, options[:from],
+                            x + step, rect.y, options[:from],
+                            x + step, rect.bottom, options[:to],
+                            x, rect.bottom, options[:to],
+                            options[:zorder], options[:mode]
+                          )
+        end
+      else
+        $window.draw_quad(  rect.x, rect.y, options[:from],
+                            rect.x, rect.bottom, options[:from],
+                            rect.right, rect.bottom, options[:to],
+                            rect.right, rect.y, options[:to],
+                            options[:zorder], options[:mode]
+                          )        
+      end
     end
+    
      
     #
-    # Fills a given Rect 'rect' with Color 'color'
+    # Fills a given Rect 'rect' with Color 'color', drawing with zorder 'zorder'
     #
-    def fill_rect(rect, color)
+    def fill_rect(rect, color, zorder = 0)
       rect = Rect.new(rect)     # Make sure it's a rect
       $window.draw_quad(  rect.x, rect.y, color,
                           rect.right, rect.y, color,
                           rect.right, rect.bottom, color,
                           rect.x, rect.bottom, color,
-                          0, :default)
+                          zorder, :default)
     end
     
     #
@@ -69,7 +128,8 @@ module Chingu
                           :mode => :default
                         }
 			options = default_options.merge(options)
-      rect = Rect.new(options[:rect])      
+      rect = Rect.new(options[:rect])
+      
       if options[:orientation] == :vertical
         $window.draw_quad(  rect.x, rect.y, options[:from],
                             rect.right, rect.y, options[:from],

data/lib/chingu/parallax.rb

@@ -55,6 +55,22 @@ module Chingu
     alias << add_layer
 
     
+    #
+    # returns true if any part of the parallax-scroller is inside the window
+    #
+    def inside_window?
+      return true if @repeat
+      @layers.each { |layer| return true if layer.inside_window? }
+      return false
+    end
+
+    #
+    # Returns true if all parallax-layers are outside the window
+    #
+    def outside_window?
+      not inside_window?
+    end
+    
     #
     # Parallax#camera_x= works in inverse to Parallax#x (moving the "camera", not the image)
     #

data/lib/chingu/text.rb

@@ -66,7 +66,7 @@ module Chingu
       super(options)
   
       @text = text || options[:text] || "-No text specified-"
-      @font =  options[:font] || @@font || default_font_name()
+      @font =  options[:font] || @@font || Gosu::default_font_name()
       @height = @size = options[:height] || options[:size] || @@size || 15
       @line_spacing = options[:line_spacing] || 1
       @align = options[:align] || :left

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: 0.5.9
+  version: 0.5.9.2
 platform: ruby
 authors: 
 - ippa
@@ -30,7 +30,7 @@ cert_chain:
   hxtMlw==
   -----END CERTIFICATE-----
 
-date: 2009-10-25 01:00:00 +02:00
+date: 2009-11-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -125,6 +125,7 @@ files:
 - lib/chingu/game_state.rb
 - lib/chingu/game_state_manager.rb
 - lib/chingu/game_states/debug.rb
+- lib/chingu/game_states/edit.rb
 - lib/chingu/game_states/fade_to.rb
 - lib/chingu/game_states/pause.rb
 - lib/chingu/helpers/game_object.rb