chingu 0.5.6 → 0.5.7

data/History.txt

@@ -1,3 +1,6 @@
+=== 0.5.7 / 2009-10-15
+alot,alot of stuffz :].. see github commithistory.
+
 === 0.5 / 2009-10-7
 Big refactor of GameObject. Now has BasicGameObject as base.
 A first basic "trait"-system where GameObject "has_traits :visual, :velocity" etc.

data/Manifest.txt

@@ -24,15 +24,29 @@ examples/example6.rb
 examples/example7.rb
 examples/example8.rb
 examples/example9.rb
+examples/game1.rb
 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/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

data/README.rdoc

@@ -606,10 +606,10 @@ GameObject.all is naming straight from rails for example. Most stuff in GameObje
 * Don't separate too much from Gosus core-naming
 
 == CREDITS:
-* Jacius of Rubygame (For doing cool stuff that's well documented as re-usable). So far rect.rb and named_resource.rb is taken from Rubygame.
-* Jduff for input / commits.
-* Jlnr,Philymore,Shawn24,JamesKilton for constructive feedback/discussions.
-* Apillet for codesuggestions and cleanups
+* Jacius of Rubygame (For doing cool stuff that's well documented as re-usable). So far rect.rb and named_resource.rb is straight outta Rubygame.
+* Jduff for input / commits
+* Jlnr,Philymore,Shawn24,JamesKilton for constructive feedback/discussions
+* Ariel Pillet for codesuggestions and cleanups
 * Thanks to http://github.com/tarcieri for require_all code, good stuff
 
 == REQUIREMENTS:

data/Rakefile

@@ -17,3 +17,19 @@ task :gemspec do
   system "rake git:manifest"
   system "rake debug_gem | grep -v \"(in \" | grep -v \"erik\" > chingu.gemspec"
 end
+
+
+#begin
+#  require 'jeweler'
+#  Jeweler::Tasks.new do |gemspec|
+#    gemspec.name = "chingu"
+#    gemspec.summary = "Game framework built on top of the OpenGL accelerated game lib Gosu"
+#    gemspec.description = "Game framework built on top of the OpenGL accelerated game lib Gosu"
+#    gemspec.email = "ippa@rubylicio.us"
+#    gemspec.homepage = "http://github.com/ippa/chingu"
+#    gemspec.authors = ["ippa"]
+#    gemspec.rubyforge_project = "chingu"
+#  end
+#rescue LoadError
+#  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+#end

data/chingu.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.5.6"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-10-10}
+  s.date = %q{2009-10-14}
   s.description = %q{Game framework built on top of the OpenGL accelerated game lib Gosu. 
 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/example2.rb", "examples/example3.rb", "examples/example4.rb", "examples/example5.rb", "examples/example6.rb", "examples/example7.rb", "examples/example8.rb", "examples/example9.rb", "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/fire_bullet.png", "examples/media/fireball.png", "examples/media/particle.png", "examples/media/ruby.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/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/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/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/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/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/example2.rb

@@ -1,10 +1,11 @@
 require 'rubygems'
+require 'devil'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu
 
 #
 # A little more complicated example where we do our own #update and #draw code.
-# We also add another Actor - a bullet fired with space.
+# We also add another GameObject - a bullet fired with space.
 #
 # Also tests out the Debug game state.
 #
@@ -64,8 +65,8 @@ class Play < Chingu::GameState
                       :holding_right => :move_right, 
                       :holding_up => :move_up, 
                       :holding_down => :move_down, 
-                      :space => :fire,
-                      }
+                      :space => :fire
+                    }
     self.input = { :f1 => :debug, :escape => :exit }
   end
   
@@ -75,19 +76,19 @@ class Play < Chingu::GameState
     
   #
   # If we want to add extra graphics drawn just define your own draw.
-  # Be sure to call #super for enabling Chingus autodrawing of Actors.
+  # Be sure to call #super for enabling Chingus autodrawing of instances of GameObject.
   # Putting #super before or after the background-draw-call really doesn't matter since Gosu work with "zorder".
   #
   def draw
     # Raw Gosu Image.draw(x,y,zorder)-call
-    Image["background1.png"].draw(0, 0, 0)    
+    Image["background1.png"].draw(0, 0, 0)
     super
   end
 
   #
   # Gosus place for gamelogic is #update in the mainwindow
   #
-  # A #super call here would call #update on all Chingu::Actors and check their inputs, and call the specified method.
+  # A #super call here would call #update on all Chingu::GameObject-instances and check their inputs, and call the specified method.
   # 
   def update
     super

data/examples/example3.rb

@@ -8,33 +8,51 @@ include Gosu
 #
 class Game < Chingu::Window
   def initialize
-    super    
-    self.input = {  :holding_left => :scroll_left, :holding_right => :scroll_right, :escape => :exit }
+    super(600,200)
+    self.input = {  :holding_left => :camera_left, 
+                    :holding_right => :camera_right, 
+                    :holding_up => :camera_up,
+                    :holding_down => :camera_down,
+                    :escape => :exit }
           
     self.caption = "Chingu::Parallax example. Scroll with left/right arrows."
     
     @parallax = Chingu::Parallax.create(:x => 0, :y => 0, :center_x => 0, :center_y => 0)
     
     #
-    # If no :zorder is given to @parallax.add_background it defaults to first added -> lowest zorder
+    # If no :zorder is given to @parallax.add_layer it defaults to first added -> lowest zorder
     # Everywhere the :image argument is used, theese 2 values are the Same:
     # 1) Image["foo.png"]  2) "foo.png"
     #
-    # TODO: scrolling to left borks outm, fix. + get rid of center_x / center_y args in a clean way.
-    @parallax.add_background(:image => "Parallax-scroll-example-layer-0.png", :damping => 100, :center => 0)
-    @parallax.add_background(:image => "Parallax-scroll-example-layer-1.png", :damping => 10, :center => 0)
-    @parallax.add_background(:image => "Parallax-scroll-example-layer-2.png", :damping => 5, :center => 0)
+    # Notice we add layers to the parallax scroller in 3 different ways. 
+    # They all end up as ParallaxLayer-instances internally
+    #
+    @parallax.add_layer(:image => "Parallax-scroll-example-layer-0.png", :damping => 100, :center => 0)
+    @parallax.add_layer(:image => "Parallax-scroll-example-layer-1.png", :damping => 10, :center => 0)
+    @parallax << Chingu::ParallaxLayer.new(:image => "Parallax-scroll-example-layer-2.png", :damping => 5, :center => 0)
     @parallax << {:image => "Parallax-scroll-example-layer-3.png", :damping => 1, :center => 0} # you can also add like this
   end
   
-  def scroll_left
-    @parallax.x -= 2
+  def camera_left
+    # This is essentially the same as @parallax.x += 2
+    @parallax.camera_x -= 2
   end
   
-  def scroll_right
-    @parallax.x += 2
+  def camera_right
+    # This is essentially the same as @parallax.x -= 2
+    @parallax.camera_x += 2
   end  
-  
+
+  def camera_up
+    # This is essentially the same as @parallax.y += 2
+    @parallax.camera_y -= 2
+  end
+
+  def camera_down
+    # This is essentially the same as @parallax.y -= 2
+    @parallax.camera_y += 2
+  end
+
 end
 
 Game.new.show

data/examples/game1.rb

@@ -0,0 +1,304 @@
+#
+#
+# A "full" simple game in Chingu, using GameState, GameObject, Paralaxx, has_traits etc
+# 
+# TODO: clean up code as Chingu moves along :). Comments.
+#
+#
+require 'rubygems'
+require File.join(File.dirname($0), "..", "lib", "chingu")
+
+require 'texplay'     # adds Image#get_pixel
+#require 'devil/gosu'  # adds Gosu::Window#screenshot and better file support
+require 'opengl'      # adds raw gl stuff so Image#retrofy works (in some setups this seems to be 'gl')
+
+include Gosu
+include Chingu
+
+class Game < Chingu::Window
+  attr_reader :factor
+  
+  def initialize
+    super(1000,800,false)
+    self.input = { :escape => :exit }
+    @factor = 2
+    switch_game_state(Level)
+  end
+end
+
+#
+# GAME STATE: GAME OVER
+#
+class GameOver < Chingu::GameState  
+  def setup
+    @text = Text.create(:text => "GAME OVER (ESC to quit, RETURN to try again!)", :size => 40, :x => 30, :y => 100)
+    self.input = { :esc => :exit, :return => :try_again}
+    @layover = Color.new(0x99000000)
+  end
+  
+  def draw
+    super
+    previous_game_state.draw
+    fill(@layover)
+  end
+  
+  def try_again
+    pop_game_state  # pop back to our playing game state
+  end
+end
+
+#
+# GAME STATE: GAME OVER
+#
+class Done < Chingu::GameState
+  def initialize(options)
+    @score = options[:score]
+  end
+  
+  def setup
+    @text = Text.create(:text => "You made it! Score #{@score} (ESC to quit, RETURN to try again!)", :size => 40, :x => 30, :y => 100)
+    self.input = { :esc => :exit, :return => :try_again}
+  end  
+  
+  def try_again
+    pop_game_state  # pop back to our playing game state
+  end
+end
+
+
+#
+# GAME STATE: LEVEL
+#
+class Level < Chingu::GameState
+  def initialize(options = {})
+    super
+    
+    @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["city1.png"].retrofy, :center => 0, :damping => 1, :factor => $window.factor)
+    @player = Player.create(:x => 10, :y => 100)
+    
+    @bg1 = Color.new(0xFFCE28FF)
+    @bg2 = Color.new(0xFF013E87)
+  end
+  
+  #
+  # This is called each time this GameState is switched/pushed/poped to.
+  #
+  def setup
+    # Remove all lingering g
+    Enemy.destroy_all
+    Bullet.destroy_all
+    
+    @player.score = 0
+    @player.x = 10
+    @player.y = 100
+    
+    @parallax.camera_x = 0
+    @total_game_ticks = 100000
+    @timer = 100
+    @total_ticks = 0
+  end
+
+  #
+  # Our 
+  #
+  def solid_pixel_at?(x, y)
+    @parallax.layers.last.get_pixel(x, y)[3] != 0
+  end
+  
+  def update
+    super
+    
+    # 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 }
+    
+    # Collide player with terrain
+    push_game_state(GameOver) if solid_pixel_at?(@player.x, @player.y)
+    
+    # Collide player with enemies and enemy bullets
+    @player.each_radius_collision(Enemy) do |player, enemy|
+      enemy.die
+      push_game_state(GameOver)
+    end
+    
+    Bullet.each_radius_collision(Enemy) do |bullet, enemy|
+      bullet.die
+      if enemy.hit_by(bullet)
+        @player.score += 20
+      end
+    end
+    
+    
+    @timer = @timer * 0.9999
+    @total_ticks += 1
+    if @total_ticks > @timer
+      Enemy.create(:x => $window.width/2, :y => rand(300))
+      @total_ticks = 0
+    end
+    
+    #push_game_state(Done.new(:score => @player.score)) if @game_steps == 1
+    
+    $window.caption = "City Battle! Score: #{@player.score}"
+  end
+  
+  def draw
+    fill_gradient(:from => @bg2, :to => @bg1)
+    super    
+  end
+end
+
+#
+# OUR PLAYER
+#
+class Player < GameObject
+  has_trait :velocity, :collision_detection, :retrofy
+  attr_accessor :score
+  
+  def initialize(options = {})
+    super
+    @image = Image["plane.png"].retrofy
+    self.factor = $window.factor
+    
+    self.input = { 
+      :holding_left => :left, 
+      :holding_right => :right, 
+      :holding_up => :up, 
+      :holding_down => :down, 
+      :space => :fire }
+    
+    @max_velocity = 1
+    @radius = 10
+    @score = 0
+  end
+  
+  def up
+    @velocity_y += -@max_velocity
+  end
+  def down
+    @velocity_y += @max_velocity
+  end
+  def right
+    @velocity_x += @max_velocity
+  end
+  def left
+    @velocity_x -= @max_velocity
+  end
+  
+  def fire
+    Bullet.create(:x => self.x, :y => self.y)
+    Sound["laser.wav"].play
+  end
+  
+  def update
+    @velocity_y *= 0.6
+    @velocity_x *= 0.6
+    
+    @x = @last_x  if @x < 0 || @x > $window.width/$window.factor
+    @y = @last_y  if @y < 0 || @y > $window.height/$window.factor
+    @last_x, @last_y = @x, @y
+  end
+  
+end
+
+#
+# OUR PLAYERS BULLETS
+#
+class Bullet < GameObject
+  has_trait :retrofy, :timer, :collision_detection
+  attr_reader :status
+  
+  def initialize(options)
+    super
+    @image = Image["bullet.png"].retrofy
+    self.factor = $window.factor
+    @velocity_x = 10
+    @status = :default
+    @radius = 3
+  end
+  
+  def die
+    return  if @status == :dying
+    Sound["bullet_hit.wav"].play
+    @status = :dying
+    during(50) { @factor_x += 1; @factor_y += 1; @x -= 1; }.then { self.destroy }
+  end
+  
+  def update
+    return if @status == :dying
+    @x += @velocity_x
+  end
+end
+
+#
+# ENEMY BULLET
+#
+class EnemyBullet < Bullet
+  def initialize(options)
+    super
+    @image = Image["enemy_bullet.png"].retrofy
+    @velocity_x = -3
+  end
+end
+
+#
+# OUR ENEMY SAUCER
+#
+class Enemy < GameObject
+  has_trait :collision_detection, :retrofy, :timer 
+  
+  def initialize(options)
+    super
+    @velocity = options[:velocity] || 2
+    @health = options[:health] || 100
+    
+    @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
+  end
+  
+  def hit_by(object)
+    return if @status == :dying
+    
+    during(20) { @mode = :additive; }.then { @mode = :default }
+    @health -= 20
+  
+    if @health <= 0
+      die
+      return true
+    else
+      return false
+    end
+  end
+  
+  def fire
+    EnemyBullet.create(:x => self.x, :y => self.y)
+  end
+  
+  def die
+    return  if @status == :dying
+    Sound["explosion.wav"].play
+    @status = :dying
+    @color = @black
+    @color.alpha = 50
+    during(200) { @factor_x += 0.5; @factor_y += 0.5; @x -= 1; @color.alpha -= 1}.then { self.destroy }
+  end
+  
+  def update
+    return if @status == :dying
+    
+    @image = @anim.next!
+    @x -= @velocity
+  end
+end
+
+Game.new.show

data/examples/media/city1.csv

@@ -0,0 +1,2 @@
+"Name","Transparent Color","Transparent Color(Hex)"
+"Frame1","-1","FFFFFFFF"

data/examples/media/plane.csv

@@ -0,0 +1,2 @@
+"Name","Transparent Color","Transparent Color(Hex)"
+"Frame1","-1","FFFFFFFF"

data/examples/media/saucer.csv

@@ -0,0 +1,4 @@
+"Name","Transparent Color","Transparent Color(Hex)"
+"Frame1","-1","FFFFFFFF"
+"Copy_Frame1","-1","FFFFFFFF"
+"Copy_Copy_Frame1","-1","FFFFFFFF"

data/lib/chingu.rb

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

data/lib/chingu/basic_game_object.rb

@@ -6,7 +6,7 @@ module Chingu
   # It will also acts as a container for the trait-system of chingu.
   #
   class BasicGameObject
-    attr_reader :options
+    attr_reader :options, :paused, :visible
     attr_accessor :parent
         
     #
@@ -43,6 +43,12 @@ module Chingu
         @parent = $window.game_state_manager.inside_state || $window
       end
       
+      # if true, BasicGameObject#update will be called
+      @paused = options[:paused] || false
+      
+      # if true, BasicGameObject#draw will be called
+      @visible = options[:visible] || true
+
       # This will call #setup_trait on the latest trait mixed in
       # which then will pass it on to the next setup_trait() with a super-call.
       setup_trait(options)
@@ -67,7 +73,32 @@ module Chingu
       
       return instance
     end
-    
+
+    #
+    # Disable auto-updating of traits 
+    #
+    def pause!
+      @paused = true
+    end
+    #
+    # Enable auto-update of traits
+    #
+    def unpause!
+      @paused = false
+    end
+    #
+    # Disable auto-drawing of object
+    #
+    def hide!
+      @visible = false
+    end
+    #
+    # Enable auto-drawing of object
+    #
+    def show!
+      @visible = true
+    end
+
     def setup_trait(options)
     end
     
@@ -125,7 +156,6 @@ module Chingu
     #
     def destroy
       @parent.remove_game_object(self) if @parent
-      self.freeze
     end
     alias :destroy! :destroy
   end

data/lib/chingu/game_object.rb

@@ -28,7 +28,7 @@ module Chingu
   #
   class GameObject < Chingu::BasicGameObject
     attr_accessor :image, :x, :y, :angle, :center_x, :center_y, :factor_x, :factor_y, :color, :mode, :zorder
-    attr_reader :paused, :visible, :factor, :center
+    attr_reader :factor, :center
     
     include Chingu::Helpers::InputClient        # Adds input and input=
     include Chingu::Helpers::RotationCenter     # Adds easy and verbose modification of @center_x and @center_y
@@ -62,39 +62,10 @@ module Chingu
       
       @mode = options[:mode] || :default # :additive is also available.
       @zorder = options[:zorder] || 100
-                        
-      # gameloop/framework logic (TODO: use or get rid of)
-      @paused = options[:paused] || false
-      @visible = options[:visible] || true
-      
+                              
       setup_trait(options)  if respond_to?(:setup_trait)
     end
     
-    #
-    # Disable auto-updating of traits 
-    #
-    def pause!
-      @paused = true
-    end
-    #
-    # Enable auto-update of traits
-    #
-    def unpause!
-      @paused = false
-    end
-    #
-    # Disable auto-drawing of object
-    #
-    def hide!
-      @visible = false
-    end
-    #
-    # Enable auto-drawing of object
-    #
-    def show!
-      @visible = true
-    end
-    
     # Quick way of setting both factor_x and factor_y
     def factor=(factor)
       @factor = factor

data/lib/chingu/game_object_list.rb

@@ -41,11 +41,12 @@ module Chingu
       #@game_objects_by_class[klass] || []
     end
     
-    def remove_all
+    def destroy_all
       @game_objects.clear
       #@game_objects_of_class.clear
     end
-    alias :clear :remove_all
+    alias :clear :destroy_all
+    alias :remove_all :destroy_all
     
     def add_game_object(object)
       @game_objects.push(object)

data/lib/chingu/parallax.rb

@@ -1,42 +1,72 @@
 #
 # Class for simple parallaxscrolling
+#
 # See: http://en.wikipedia.org/wiki/Parallax_scrolling
 #
 module Chingu
   class Parallax < Chingu::GameObject
-    attr_reader :backgrounds
+    attr_reader :layers
 
     #
     # Options (in hash-format):
     #
-    # repeat: [true|false]  When one background ends within the screen, repeat/loop it
+    # repeat: [true|false]  When one layer ends within the screen, repeat/loop it
     #
     def initialize(options = {})
       super(options)
       @repeat = options[:repeat] || true
-      @backgrounds = Array.new
+      @layers = Array.new
     end
     
     #
-    # Add one background, either an ParallaxBackground-object or a Hash of options to create one
-    # You can also add new backgrounds with the shortcut "<<":
+    # Add one layer, either an ParallaxLayer-object or a Hash of options to create one
+    # You can also add new layers with the shortcut "<<":
     #   @parallax << {:image => "landscape.png", :damping => 1}
     #
-    def add_background(arg)
-      @backgrounds << (arg.is_a?(ParallaxBackground) ? arg : ParallaxBackground.new(arg))
+    def add_layer(arg)
+      @layers << (arg.is_a?(ParallaxLayer) ? arg : ParallaxLayer.new(arg))
+    end
+    alias << add_layer
+
+    
+    #
+    # Parallax#camera_x= works in inverse to Parallax#x (moving the "camera", not the image)
+    #
+    def camera_x=(x)
+      @x = -x
+    end
+
+    #
+    # Parallax#camera_y= works in inverse to Parallax#y (moving the "camera", not the image)
+    #
+    def camera_y=(y)
+      @y = -y
+    end
+
+    #
+    # Get the x-coordinate for the camera (inverse to x)
+    #
+    def camera_x
+      -@x
+    end
+
+    #
+    # Get the y-coordinate for the camera (inverse to y)
+    #
+    def camera_y
+      -@y
     end
-    alias << add_background
     
     #
     # TODO: make use of $window.milliseconds_since_last_update here!
     #
     def update
-      @backgrounds.each do |background|
-        background.x = -@x / background.damping
-        background.y =  @y / background.damping
+      @layers.each do |layer|
+        layer.x = @x / layer.damping
+        layer.y = @y / layer.damping
         
-        # This is the magic that repeats the background to the left and right
-        background.x -= background.image.width  while background.x > 0
+        # This is the magic that repeats the layer to the left and right
+        layer.x -= layer.image.width  while layer.x > 0
       end
     end
     
@@ -44,40 +74,62 @@ module Chingu
     # Draw 
     #
     def draw
-      @backgrounds.each do |background|
-        background.draw
+      @layers.each do |layer|
+        layer.draw
         
-        save_x = background.x
+        save_x = layer.x
         
-        ## If background lands inside our screen, repeat it
-        while (background.x + background.image.width) < $window.width
-          background.x += background.image.width
-          background.draw
+        ## If layer lands inside our screen, repeat it
+        while (layer.x + layer.image.width) < $window.width
+          layer.x += layer.image.width
+          layer.draw
         end
                 
-        background.x = save_x
+        layer.x = save_x
       end
       self
-    end	 
+    end
   end
   
   #
-  # One background item
+  # ParallaxLayer is mainly used by class Parallax to keep track of the different layers.
+  # If you @parallax << { :image => "foo.png" } a ParallaxLayer will be created automaticly from that Hash.
+  #
+  # If no zorder is provided the ParallaxLayer-class increments an internal zorder number which will
+  # put the last layer added on top of the rest.
   #
-  class ParallaxBackground < Chingu::GameObject
+  class ParallaxLayer < Chingu::GameObject    
     @@zorder_counter = 0
     attr_reader :damping
     
     def initialize(options)
-      ## No auto update/draw, the parentclass Parallax takes care of that!
-      options.merge!(:draw => false, :update => false)
+      # No auto update/draw, the parentclass Parallax takes care of that!
+      options.merge!(:visible => false, :paused => true)
       
       # If no zorder is given, use a global incrementing counter. First added, furthest behind when drawn.
       options.merge!(:zorder => (@@zorder_counter+=1))  if options[:zorder].nil?
       
       super(options)
-
+      
       @damping = options[:damping] || 10
-    end    
+    end
+    
+    #
+    # Gets pixel from layers image
+    # The pixel is from the window point of view, so coordinates are converted:
+    #
+    #   @parallax.layers.first.get_pixel(10, 10)        # the visible pixel at 10, 10
+    #   @parallax.layers.first.image.get_pixel(10, 10)  # gets pixel 10, 10 from layers image no matter where layer is positioned
+    #
+    def get_pixel(x, y)
+      image_x = x - @x
+      image_y = y - @y
+      
+      # On a 100 x 100 image, get_pixel works to 99 x 99
+      image_x -= @image.width   while image_x >= @image.width 
+      
+      @image.get_pixel(image_x, image_y)
+    end
+    
   end
 end

data/lib/chingu/traits/retrofy.rb

@@ -35,6 +35,14 @@ module Chingu
 
         super
       end
+      
+      def screen_width
+        (@image.width * self.factor).to_i
+      end
+
+      def screen_height
+        (@image.heigt * self.factor).to_i
+      end
 
       def screen_x
         (@x * self.factor).to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - ippa
@@ -30,7 +30,7 @@ cert_chain:
   hxtMlw==
   -----END CERTIFICATE-----
 
-date: 2009-10-10 00:00:00 +02:00
+date: 2009-10-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -83,15 +83,29 @@ files:
 - examples/example7.rb
 - examples/example8.rb
 - examples/example9.rb
+- examples/game1.rb
 - 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/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