chingu 0.6 → 0.6.1

data/Manifest.txt

@@ -55,6 +55,7 @@ examples/media/spaceship.png
 examples/media/stickfigure.bmp
 examples/media/stickfigure.png
 examples/media/video_games.png
+examples/media/wood.png
 lib/chingu.rb
 lib/chingu/animation.rb
 lib/chingu/assets.rb

data/chingu.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.6"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-11-21}
+  s.date = %q{2009-11-22}
   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/example14.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/bounding_box.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/effect.rb", "lib/chingu/traits/radius.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/example14.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", "examples/media/wood.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/bounding_box.rb", "lib/chingu/traits/collision_detection.rb", "lib/chingu/traits/effect.rb", "lib/chingu/traits/radius.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/example3.rb

@@ -8,29 +8,34 @@ include Gosu
 #
 class Game < Chingu::Window
   def initialize
-    super(600,200)
-    self.input = {  :holding_left => :camera_left, 
+    super(600,200)          
+    self.caption = "Chingu::Parallax example. Scroll with left/right arrows. Space for new parallax example!"
+    switch_game_state(Wood)
+  end
+end
+
+class Scroller < Chingu::GameState
+  def initialize(options)
+    super
+    @text_color = Color.new(0xFF000000)
+  end
+  
+  def setup
+    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_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"
-    #
-    # 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
+                    :space => :next_game_state,
+                    :escape => :exit
+                  }
+  end
+  
+  def next_game_state
+    if current_game_state.class == Wood
+      switch_game_state(Jungle)
+    else
+      switch_game_state(Wood)
+    end
   end
   
   def camera_left
@@ -51,8 +56,38 @@ class Game < Chingu::Window
   def camera_down
     # This is essentially the same as @parallax.y -= 2
     @parallax.camera_y += 2
+  end  
+end
+
+class Wood < Scroller
+  def initialize(options = {})
+    super
+    @parallax = Chingu::Parallax.create(:x => 0, :y => 0, :rotation_center => :top_left)
+    @parallax << { :image => "wood.png", :repeat_x => true, :repeat_y => true}
+    Chingu::Text.create("82x64 image with repeat_x and repeat_y set to TRUE", :x => 0, :y => 0, :size => 30, :color => @text_color)
   end
+end
 
+class Jungle < Scroller
+  def initialize(options = {})
+    super
+    @parallax = Chingu::Parallax.create(:x => 0, :y => 0, :rotation_center => :top_left)
+  
+    #
+    # 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"
+    #
+    # 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)
+    @parallax.add_layer(:image => "Parallax-scroll-example-layer-1.png", :damping => 10)
+    @parallax << Chingu::ParallaxLayer.new(:image => "Parallax-scroll-example-layer-2.png", :damping => 5, :parallax => @parallax)
+    @parallax << {:image => "Parallax-scroll-example-layer-3.png", :damping => 1}
+    
+    Chingu::Text.create("Multiple layers with repeat_x set to TRUE", :x => 0, :y => 0, :size => 30, :color => @text_color)
+  end
 end
 
 Game.new.show

data/lib/chingu.rb

@@ -28,7 +28,7 @@ require File.join(CHINGU_ROOT,"chingu","require_all") # Thanks to http://github.
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.6"
+  VERSION = "0.6.1"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

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 :factor, :center
+    attr_reader :factor, :center#, :rotation_center
     
     include Chingu::Helpers::InputClient        # Adds input and input=
     include Chingu::Helpers::RotationCenter     # Adds easy and verbose modification of @center_x and @center_y
@@ -48,13 +48,16 @@ module Chingu
       @y = options[:y] || 0
       @angle = options[:angle] || 0
       
-
       self.factor = options[:factor] || 1.0
       @factor_x = options[:factor_x] if options[:factor_x]
       @factor_y = options[:factor_y] if options[:factor_y]
       
-      self.center = options[:center] || 0.5      
+      self.center = options[:center] || 0.5
+      
+      
+      @rotation_center = options[:rotation_center]
       self.rotation_center(options[:rotation_center]) if options[:rotation_center]
+      
       @center_x = options[:center_x] if options[:center_x]
       @center_y = options[:center_y] if options[:center_y]
       

data/lib/chingu/parallax.rb

@@ -40,7 +40,9 @@ module Chingu
     #
     def initialize(options = {})
       super(options)
-      @repeat = options[:repeat] || true
+      @repeat_x = options[:repeat_x] || true
+      @repeat_y = options[:repeat_y] || false
+      
       @layers = Array.new
     end
     
@@ -50,7 +52,7 @@ module Chingu
     #   @parallax << {:image => "landscape.png", :damping => 1}
     #
     def add_layer(arg)
-      @layers << (arg.is_a?(ParallaxLayer) ? arg : ParallaxLayer.new(arg))
+      @layers << (arg.is_a?(ParallaxLayer) ? arg : ParallaxLayer.new(arg.merge({:parallax => self})))
     end
     alias << add_layer
 
@@ -108,7 +110,10 @@ module Chingu
         layer.y = @y / layer.damping
         
         # This is the magic that repeats the layer to the left and right
-        layer.x -= layer.image.width  while layer.x > 0
+        layer.x -= layer.image.width  while (layer.repeat_x && layer.x > 0)
+       
+        # This is the magic that repeats the layer to the left and right
+        layer.y -= layer.image.height while (layer.repeat_y && layer.y > 0)
       end
     end
     
@@ -119,14 +124,29 @@ module Chingu
       @layers.each do |layer|
         layer.draw
         
-        save_x = layer.x
+        save_x, save_y = layer.x, layer.y
         
-        ## If layer lands inside our screen, repeat it
-        while (layer.x + layer.image.width) < $window.width
+        # If layer lands inside our window and repeat_x is true (defaults to true), draw it until window ends
+        while layer.repeat_x && layer.x < $window.width
+          while layer.repeat_y && layer.y < $window.height
+            layer.y += layer.image.height
+            layer.draw
+          end
+          layer.y = save_y
+          
           layer.x += layer.image.width
           layer.draw
         end
-                
+        
+        # Special loop for when repeat_y is set but not repeat_x
+        if layer.repeat_y && !layer.repeat_x
+          while layer.repeat_y && layer.y < $window.height
+            layer.y += layer.image.height
+            layer.draw
+          end
+        end
+
+          
         layer.x = save_x
       end
       self
@@ -143,17 +163,33 @@ module Chingu
   class ParallaxLayer < Chingu::GameObject    
     @@zorder_counter = 0
     attr_reader :damping
+    attr_accessor :repeat_x, :repeat_y
     
-    def initialize(options)
+    def initialize(options)      
+      @parallax = options[:parallax]      
       # No auto update/draw, the parentclass Parallax takes care of that!
       options.merge!(:visible => false, :paused => true)
+    
+      options = {:rotation_center => @parallax.options[:rotation_center]}.merge(options)  if @parallax
+      
+      #
+      # Default arguments for repeat_x and repeat_y
+      # If no zorder is given, use a global incrementing counter. 
+      # First added, furthest behind when drawn.
+      #
+      options = {
+          :repeat_x => true, 
+          :repeat_y => false, 
+          :zorder => (@@zorder_counter+=1)
+      }.merge(options)
+      
       
-      # 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?
+      @repeat_x = options[:repeat_x]
+      @repeat_y = options[:repeat_y]
       
       super(options)
       
-      @damping = options[:damping] || 10
+      @damping = options[:damping] || 1
     end
     
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  version: 0.6.1
 platform: ruby
 authors: 
 - ippa
@@ -30,7 +30,7 @@ cert_chain:
   hxtMlw==
   -----END CERTIFICATE-----
 
-date: 2009-11-21 00:00:00 +01:00
+date: 2009-11-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -115,6 +115,7 @@ files:
 - examples/media/stickfigure.bmp
 - examples/media/stickfigure.png
 - examples/media/video_games.png
+- examples/media/wood.png
 - lib/chingu.rb
 - lib/chingu/animation.rb
 - lib/chingu/assets.rb