ippa-chingu 0.4.4 → 0.4.5

data/History.txt

@@ -1,7 +1,15 @@
-=== 0.0.3 / 2009-08-14
+=== 0.4.5 / 2009-08-27
+Tons of small fixes across the board. 
+Started on GFX Helpers (fill, fill_rect, fill_gradient so far).
+A basic particle system (see example7.rb)
+
+=== 0.4.0 / 2009-08-19
+Alot of game state love. Now also works stand alone with pure gosu.
+
+=== 0.3.0 / 2009-08-14
 Too much to list. remade inputsystem. gamestates are better. window.rb is cleaner. lots of small bugfixes. Bigger readme.
 
-=== 0.0.2 / 2009-08-10
+=== 0.2.0 / 2009-08-10
 tons of new stuff and fixes. complete keymap. gamestate system. moreexamples/docs. better game_object.
 
 === 0.0.1 / 2009-08-05

data/Manifest.txt

@@ -7,28 +7,39 @@ examples/example1.rb
 examples/example2.rb
 examples/example3.rb
 examples/example4.rb
+examples/example5.rb
+examples/example6.rb
+examples/example7.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/chipmunk_object.rb
-lib/chingu/data_structures.rb
+lib/chingu/core_extensions.rb
+lib/chingu/effects.rb
 lib/chingu/fpscounter.rb
 lib/chingu/game_object.rb
 lib/chingu/game_state.rb
 lib/chingu/game_state_manager.rb
+lib/chingu/game_states/fade_to.rb
+lib/chingu/game_states/pause.rb
+lib/chingu/gfx_helpers.rb
 lib/chingu/helpers.rb
 lib/chingu/input.rb
 lib/chingu/named_resource.rb
 lib/chingu/parallax.rb
+lib/chingu/particle.rb
 lib/chingu/rect.rb
 lib/chingu/text.rb
 lib/chingu/window.rb

data/README.rdoc

@@ -432,7 +432,7 @@ See http://www.libgosu.org/rdoc/classes/Gosu/Window.html for a full set of metho
 == TODO:
 * (done) Complete the input-definitions with all possible inputs (keyboard, gamepad, mouse)!
 * (done) Complete input-stuff with released-states etc
-* More gfx effects, for example: fade in/out to a specific color (black makes sense between levels).
+* (done) More gfx effects, for example: fade in/out to a specific color (black makes sense between levels).
 * (posted request on forums) Summon good proven community gosu snippets into Chingu
 * (done) Generate docs @ ippa.github.com-  http://rdoc.info/projects/ippa/chingu !
 * (done) A good scene-manager to manage welcome screens, levels and game flow- GameStateManager / GameState !
@@ -448,7 +448,7 @@ See http://www.libgosu.org/rdoc/classes/Gosu/Window.html for a full set of metho
 * (done) Streamline fps / tick code
 * (done) Encapsulate Font.new / draw_rot with a "class Text < GameObject"
 * (10% done) Make it possible for ppl to use the parts of Chingu they like
-* At least make GameStateManager really easy to use with pure Gosu / Document it!
+* (done) At least make GameStateManager really easy to use with pure Gosu / Document it!
 * A more robust game state <-> game_object system to connect them together.
 * (50% done) Get better at styling rdocs
 * (done) all �gamestate� ? �game state� ?   it's "game state"

data/Rakefile

@@ -15,5 +15,5 @@ end
 desc "Build a working gemspec"
 task :gemspec do
   system "rake git:manifest"
-  system "rake debug_gem | grep -v \"(in \" > chingu.gemspec"
+  system "rake debug_gem | grep -v \"(in \" | grep -v \"erik\" > chingu.gemspec"
 end

data/chingu.gemspec

@@ -2,15 +2,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-08-21}
+  s.date = %q{2009-08-27}
   s.description = %q{Game framework built on top of the OpenGL accelerated game lib Gosu.  It adds simple yet powerfull game states, prettier inputhandling, deploymentsafe 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"]
-  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "chingu.gemspec", "examples/example1.rb", "examples/example2.rb", "examples/example3.rb", "examples/example4.rb", "examples/example5.rb", "examples/example6.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/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/chipmunk_object.rb", "lib/chingu/data_structures.rb", "lib/chingu/fpscounter.rb", "lib/chingu/game_object.rb", "lib/chingu/game_state.rb", "lib/chingu/game_state_manager.rb", "lib/chingu/helpers.rb", "lib/chingu/input.rb", "lib/chingu/named_resource.rb", "lib/chingu/parallax.rb", "lib/chingu/rect.rb", "lib/chingu/text.rb", "lib/chingu/window.rb"]
+  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "chingu.gemspec", "examples/example1.rb", "examples/example2.rb", "examples/example3.rb", "examples/example4.rb", "examples/example5.rb", "examples/example6.rb", "examples/example7.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/core_extensions.rb", "lib/chingu/effects.rb", "lib/chingu/fpscounter.rb", "lib/chingu/game_object.rb", "lib/chingu/game_state.rb", "lib/chingu/game_state_manager.rb", "lib/chingu/game_states/fade_to.rb", "lib/chingu/game_states/pause.rb", "lib/chingu/gfx_helpers.rb", "lib/chingu/helpers.rb", "lib/chingu/input.rb", "lib/chingu/named_resource.rb", "lib/chingu/parallax.rb", "lib/chingu/particle.rb", "lib/chingu/rect.rb", "lib/chingu/text.rb", "lib/chingu/window.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/ippa/chingu/tree/master}
   s.rdoc_options = ["--main", "README.rdoc"]

data/examples/example7.rb

@@ -0,0 +1,132 @@
+require 'rubygems'
+require File.join(File.dirname($0), "..", "lib", "chingu")
+include Gosu
+
+#
+# GFXHelpers example - demonstrating Chingus GFX
+#
+class Game < Chingu::Window
+  def initialize
+    super(640,400)
+    self.input = {:space => :next_effect, :esc => :exit}
+    self.caption = "Example of Chingus GFX Helpers"
+    
+    push_game_state(Fill)
+    push_game_state(FillRect)
+    push_game_state(FillGradient)
+    push_game_state(FillGradientRect)
+    push_game_state(Particles)
+  end
+  
+  def next_effect
+    pop_game_state
+  end
+end
+
+
+class Fill < Chingu::GameState 
+  def setup
+    @white = Color.new(255,255,255,255)
+  end
+  def draw
+    $window.caption = "fill (space to continue)"
+    fill(@white)
+  end
+end
+
+class FillRect < Chingu::GameState 
+  def setup
+    @white = Color.new(255,255,255,255)
+  end
+  def draw
+    $window.caption = "fill_rect (space to continue)"
+    fill_rect([10,10,100,100], @white)
+  end
+end
+
+class FillGradient < Chingu::GameState 
+  def setup
+    @pinkish = Color.new(0xFFCE17B6)
+    @blueish = Color.new(0xFF6DA9FF)
+  end
+  
+  def draw
+    $window.caption = "fill_gradient (space to continue)"
+    fill_gradient(:from => @pinkish, :to => @blueish, :orientation => :vertical)
+  end
+end
+
+class FillGradientRect < Chingu::GameState 
+  def setup
+    @color1 = Color.new(0xFFFFEA02)
+    @color2 = Color.new(0xFF078B20)
+  end
+  
+  def draw
+    $window.caption = "fill_gradient with :rect-option (space to continue)"
+    fill_gradient(:from => @color1, :to => @color2, :rect => [100,100,200,200], :orientation => :horizontal)
+  end
+end
+
+class Particles < Chingu::GameState
+  def setup
+    @color1 = Color.new(0xFFFFEA02)
+    @color2 = Color.new(0xFF078B20)
+    @blue_laserish = Color.new(0xFF86EFFF)
+    @red = Color.new(0xFFFF0000)
+    @white = Color.new(0xFFFFFFFF)
+    @yellow = Color.new(0xFFF9F120)
+    
+    # Thanks jsb in #gosu of Encave-fame for fireball.png :)
+    @fireball_animation = Animation.new(:file => media_path("fireball.png"), :width => 32, :height => 32)
+    @ground_y = $window.height * 0.95
+  end
+  
+  def update(time)
+    #
+    # Fire 1. Dies quickly (big :fade). Small in size (small :zoom)
+    #
+    Chingu::Particle.new( :x => 100, 
+                          :y => @ground_y, 
+                          :animation => @fireball_animation,
+                          :zoom => +0.05, 
+                          :fade => -10, 
+                          :rotation => +1,
+                          :mode => :default
+                        )
+
+    #
+    # Fire 2. Higher flame, :fade only -4. Wide Flame with bigger :zoom.
+    #
+    Chingu::Particle.new( :x => 300, 
+                          :y => @ground_y, 
+                          :animation => @fireball_animation, 
+                          :zoom => +0.2, 
+                          :fade => -4, 
+                          :rotation => +3,
+                          :mode => :default
+                        )
+    #
+    # Fire 3. Blue plasma with smooth particle.png and color-overlay.
+    #
+    Chingu::Particle.new( :x => 500, 
+                          :y => @ground_y,
+                          :image => "particle.png", 
+                          :color => @blue_laserish,
+                          :mode => :additive
+                        )
+
+    game_objects_of_class(Particle).each { |particle| particle.y -= 5; particle.x += 2 - rand(4) }
+    self.game_objects.reject! { |object| object.outside_window? || object.color.alpha == 0 }
+    super
+  end
+  
+  def draw
+    $window.caption = "particle example (space to continue) [particles#: #{game_objects.size} - framerate: #{$window.fps}]"
+    fill_gradient(:from => Color.new(255,0,0,0), :to => Color.new(255,60,60,80), :rect => [0,0,$window.width,@ground_y])
+    fill_gradient(:from => Color.new(255,100,100,100), :to => Color.new(255,50,50,50), :rect => [0,@ground_y,$window.width,$window.height-@ground_y])
+    super
+  end
+end
+
+Game.new.show

data/lib/chingu.rb

@@ -7,17 +7,19 @@ require 'gosu'
 require 'set'
 
 %w{	helpers
+    gfx_helpers
+    game_object
+    effects
     game_state_manager
     game_state
     window
 		fpscounter
 		named_resource
 		assets
-    game_object
     text
-		data_structures
 		rect
 		animation
+    particle    
 		input
     parallax
 		}.each do |lib|
@@ -33,5 +35,5 @@ require 'set'
     end
 
 module Chingu
-  VERSION = "0.4.3"
+  VERSION = "0.4.5"
 end

data/lib/chingu/animation.rb

@@ -26,7 +26,7 @@ module Chingu
       @width = options[:width] || 32
       @index = options[:index] || 0
       @delay = options[:delay] || 100
-      @ticks = 0
+      @dt = 0
 			
       @frame_actions = []
       @frames = Gosu::Image.load_tiles($window, @file, @width, @height, true)
@@ -72,8 +72,8 @@ module Chingu
     # #next! will look at bounce and loop flags to always return a correct frame (a Gosu#Image)
     #
     def next!
-      if (@ticks += $window.tick) > @delay
-        @ticks = 0
+      if (@dt += $window.milliseconds_since_last_tick) > @delay
+        @dt = 0
         @index += @step
         
         # Has the animation hit end or beginning... time for bounce or loop?

data/lib/chingu/assets.rb

@@ -54,4 +54,11 @@ module Gosu
       (path = find_file(name)) ? Gosu::Image.load_tiles($window, path, 32, 32, true) : nil
     end
   end
+  
+  class CutTiles
+    def self.[](name, width, height)
+      @@tiles = Hash.new unless defined?(@@tiles)
+      @@tiles[name] ||= Gosu::Image.load_tiles($window, name, width, height, true)
+    end
+  end
 end

data/lib/chingu/core_extensions.rb

@@ -0,0 +1,11 @@
+#
+# Core extensions
+#
+# Extensions to the classes GOSU offers
+#
+module Gosu
+  class Color
+    def average(other, weight)
+    end
+  end
+end

data/lib/chingu/effects.rb

@@ -0,0 +1,14 @@
+#
+# Effect-class
+#
+module Chingu
+  class Effect
+    def initialize(options)
+      super({:mode => :additive}.merge(options))
+      @trail = options[:trail] || 10
+    end
+      
+    def update(time)
+    end    
+  end
+end

data/lib/chingu/game_object.rb

@@ -79,7 +79,10 @@ module Chingu
       @center_y = options[:center_y] || options[:center] || @@center_y
       @factor_x = options[:factor_x] || options[:factor] || @@factor_x
       @factor_y = options[:factor_y] || options[:factor] || @@factor_y
-      @color = options[:color] || 0xFFFFFFFF
+      @color = Gosu::Color.new(options[:color]) if options[:color].is_a? Bignum
+      @color = options[:color]                  if options[:color].respond_to?(:alpha)
+      @color = Gosu::Color.new(0xFFFFFFFF)      if @color.nil?
+      
       @mode = options[:mode] || :default # :additive is also available.
       
       # Shortcuts for draw_rot arguments
@@ -117,7 +120,7 @@ module Chingu
     #
     # Zoom - increase @factor_x and @factor_y at the same time.
     #
-    def zoom(amount)
+    def zoom(amount = 0.1)
       @factor_x += amount
       @factor_y += amount
     end
@@ -125,7 +128,7 @@ module Chingu
     #
     # Zoom Out - decrease @factor_x and @factor_y at the same time.
     #
-    def zoom_out(amount)
+    def zoom_out(amount = 0.1)
       @factor_x -= amount
       @factor_y -= amount
     end
@@ -133,25 +136,53 @@ module Chingu
     #
     # Rotate object 'amount' degrees
     #
-    def rotate(amount)
+    def rotate(amount = 1)
       @angle += amount
     end
-    
+
+    #
+    # Fade object by decreasing/increasing color.alpha
+    #
+    def fade(amount = 1)
+      return if amount == 0
+      
+      new_alpha = @color.alpha + amount
+      if amount < 0
+        @color.alpha =  [0, new_alpha].max
+      else
+        @color.alpha =  [0, new_alpha].min
+      end
+    end
+
     #
-    # Returns true if game object is inside the game window, false if outside
+    # Fade out objects color by decreasing color.alpha
+    #
+    def fade_out(amount = 1)
+      fade(-amount)
+    end
+
+    #
+    # Fade in objects color by increasing color.alpha
+    #
+    def fade_in(amount = 1)
+      fade(amount)
+    end
+
+    #
+    # Returns true if object is inside the game window, false if outside
     #
     def inside_window?(x = @x, y = @y)
       x >= 0 && x <= $window.width && y >= 0 && y <= $window.height
     end
 
     #
-    # 
+    # Returns true object is outside the game window 
     #
     def outside_window?(x = @x, y = @y)
       not inside_window?(x,y)
     end
 
-    def update(time = 1)
+    def update(time = 0)
       # Objects gamelogic here, 'time' is the time passed between 2 iterations of the main game loop
 		end
     

data/lib/chingu/game_state.rb

@@ -28,7 +28,7 @@ module Chingu
 
   class GameState
     include Chingu::GameStateHelpers    # Easy access to the global game state-queue
-    include Chingu::DrawHelpers         # Adds fill(), fade() etc to each game state
+    include Chingu::GFXHelpers          # Adds fill(), fade() etc to each game state
     include Chingu::GameObjectHelpers   # adds game_objects_of_class etc ...
     include Chingu::InputDispatcher     # dispatch-helpers
     include Chingu::InputClient

data/lib/chingu/game_states/fade_to.rb

@@ -0,0 +1,55 @@
+#
+# Premade game state for chingu - Fade between two game states
+# Fade from the current game state to a new one whenever with: 
+#
+#   push_game_state(Chingu::GameStates::FadeTo.new(new_game_state, :speed => 3))
+#
+# .. Or make your whole game look better with 1 line:
+#
+#   transitional_game_state(Chingu::GameStates::FadeTo, :speed => 10)
+#
+module Chingu
+  module GameStates
+    class FadeTo < Chingu::GameState
+      def initialize(new_game_state, options = {})
+        @options = {:speed => 3}.merge(options)
+        @new_game_state = new_game_state        
+      end
+    
+      def setup
+        @color = Gosu::Color.new(0,0,0,0)
+        @alpha = 0.0
+        @fading_in = false
+        @new_game_state.update(0)      # Make sure states game logic is run Once (for a correct draw())
+      end
+    
+      def update(dt)
+        @alpha += (@fading_in ? -@options[:speed] : @options[:speed])
+        if @alpha >= 255
+          @fading_in = true
+        else
+          @color.alpha = @alpha.to_i
+        end
+        @drawn = false
+      end
+      
+      def draw
+        # Stop endless loops
+        if @drawn == false
+          @drawn = true
+          @game_state_manager.previous_game_state.draw  if @fading_in == false
+          @new_game_state.draw                          if @fading_in == true
+      
+          $window.draw_quad( 0,0,@color,
+                              $window.width,0,@color,
+                              $window.width,$window.height,@color,
+                              0,$window.height,@color,999)
+                          
+          if @fading_in == true && @alpha == 0
+            @game_state_manager.switch_game_state(@new_game_state, :transitional => false)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chingu/game_states/pause.rb

@@ -0,0 +1,34 @@
+#
+# Premade game state for chingu - A simple pause state.
+# Pause whenever with: 
+#   push_game_state(Chingu::GameStates::Pause)
+#
+# requires global $window
+#
+module Chingu
+  module GameStates
+    class Pause < Chingu::GameState
+      def initialize(options)
+        super
+        @white = Color.new(255,255,255,255)
+        @color = Gosu::Color.new(200,0,0,0)
+        @font = Gosu::Font.new($window, default_font_name, 35)
+        @text = "PAUSED - press key to continue"
+      end
+    
+      def button_down(id)
+        game_state_manager.pop_game_state(:setup => false)    # Return the previous game state, dont call setup()
+      end
+      
+      def draw
+        game_state_manager.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,$window.height,@color,
+                            0,$window.height,@color,10)
+                            
+        @font.draw(@text, ($window.width/2 - @font.text_width(@text)/2), $window.height/2 - @font.height, 999)
+      end  
+    end
+  end
+end

data/lib/chingu/gfx_helpers.rb

@@ -0,0 +1,67 @@
+module Chingu
+  #
+  # Various helper-methods to manipulate the screen.
+  # All drawings depend on the global variable $window which should be an instance of Gosu::Window or Chingu::Window
+  #
+  module GFXHelpers
+  
+    #
+    # Fills whole window with color 'color'.
+    #
+    def fill(color)
+      $window.draw_quad(0, 0, color,
+                        $window.width, 0, color,
+                        $window.width, $window.height, color,
+                        0, $window.height, color,
+                        0, :default)
+    end
+     
+    #
+    # Fills a given Rect 'rect' with Color 'color'
+    #
+    def fill_rect(rect, color)
+      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)
+    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_gradient(options)
+      default_options = { :from => Gosu::Color.new(255,0,0,0),
+                          :to => Gosu::Color.new(255,255,255,255), 
+                          :thickness => 10, 
+                          :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
+        $window.draw_quad(  rect.x, rect.y, options[:from],
+                            rect.right, rect.y, options[:from],
+                            rect.right, rect.bottom, options[:to],
+                            rect.x, rect.bottom, options[:to],
+                            options[:zorder], options[:mode]
+                          )
+      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
+  end
+end

data/lib/chingu/helpers.rb

@@ -116,28 +116,6 @@ module Chingu
       $window.game_state_manager.clear_game_states
     end
   end
-
-  #
-  # Various helper-methods to manipulate the screen
-  #
-  module DrawHelpers
-    #
-    # Fills whole window with color 'c'
-    #
-    def fill(c)
-      $window.draw_quad(0,0,c,$window.width,0,c,$window.width,$window.width,c,0,$window.height,c,0,:default)
-    end
-     
-    #
-    # Fills a given Rect 'r' with color 'c'
-    #
-    def fill_rect(r, c)
-      $window.draw_quad(r.x,r.y,c, r.right,r.y,c, r.right,r.bottom,c, r.x,r.bottom,c,0,:default)
-    end
-     
-    def fade(options = {})
-    end
-  end
   
   module GameObjectHelpers
     #

data/lib/chingu/particle.rb

@@ -0,0 +1,23 @@
+#
+# Our basic particle class
+#
+include Chingu
+module Chingu
+  class Particle < Chingu::GameObject      
+    def initialize(options)
+      super({:mode => :additive}.merge(options))
+      @rotation = options[:rotation] || 0
+      @zoom = options[:zoom] || 0
+      @fade = options[:fade] || 0      
+      @animation = options[:animation] || nil      
+    end
+      
+    def update(time)
+      self.image = @animation.next!   if @animation
+      self.rotate(@rotation)
+      self.zoom(@zoom)
+      self.fade(@fade)
+    end
+    
+  end
+end

data/lib/chingu/window.rb

@@ -1,10 +1,11 @@
 module Chingu
+  CHINGU_ROOT = File.dirname(File.expand_path($0))
   class Window < Gosu::Window
     # adds push_game_state, pop_game_state, current_game_state and previous_game_state
     include Chingu::GameStateHelpers    
     
     # adds fill() etc...
-    include Chingu::DrawHelpers
+    include Chingu::GFXHelpers
     
     # adds game_objects_of_class etc ...
     include Chingu::GameObjectHelpers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ippa-chingu
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - ippa
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-21 00:00:00 -07:00
+date: 2009-08-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,12 +44,15 @@ files:
 - examples/example4.rb
 - examples/example5.rb
 - examples/example6.rb
+- examples/example7.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
@@ -58,16 +61,20 @@ files:
 - lib/chingu.rb
 - lib/chingu/animation.rb
 - lib/chingu/assets.rb
-- lib/chingu/chipmunk_object.rb
-- lib/chingu/data_structures.rb
+- lib/chingu/core_extensions.rb
+- lib/chingu/effects.rb
 - lib/chingu/fpscounter.rb
 - lib/chingu/game_object.rb
 - lib/chingu/game_state.rb
 - lib/chingu/game_state_manager.rb
+- lib/chingu/game_states/fade_to.rb
+- lib/chingu/game_states/pause.rb
+- lib/chingu/gfx_helpers.rb
 - lib/chingu/helpers.rb
 - lib/chingu/input.rb
 - lib/chingu/named_resource.rb
 - lib/chingu/parallax.rb
+- lib/chingu/particle.rb
 - lib/chingu/rect.rb
 - lib/chingu/text.rb
 - lib/chingu/window.rb

data/lib/chingu/chipmunk_object.rb

@@ -1,117 +0,0 @@
-module Chingu
-  #
-  # A basic class, all your gameobjects / actors should be built on this. Encapsulates
-  # Gosus draw_rot and it's parameters. 
-  #
-  # All objects that inherits from this class will automaticly be updated and drawn.
-  #
-  class Actor
-    attr_accessor :image, :x, :y, :angle, :center_x, :center_y, :factor_x, :factor_y, :mode
-    attr_accessor :update, :draw, :keymap
-    attr_reader :options
-    
-    #
-    # Class-level default values. 
-    # This allows you to set default-values that affect all created actors after that.
-    # You might want to draw screenobjects from the top-left @ x/y instead of putting it's center there:
-    # 
-    # in Gosu::Window#initialize: Actor.center_x = Actor.center_y = 0
-    #
-    @@zorder = 100
-    @@center_x = 0.5
-    @@center_y = 0.5
-    @@factor_x = 1.0
-    @@factor_y = 1.0
-
-    def self.zorder; @@zorder; end
-    def self.zorder=(value); @@zorder = value; end
-
-    def self.center_x; @@center_x; end
-    def self.center_x=(value); @@center_x = value; end
-
-    def self.center_y; @@center_y; end
-    def self.center_y=(value); @@center_y = value; end
-
-    def self.factor_x; @@factor_x; end
-    def self.factor_x=(value); @@factor_x = value; end
-
-    def self.factor_y; @@factor_y; end
-    def self.factor_y=(value); @@factor_y = value; end
-
-    #
-    # Create a new Actor. Arguments are given in hash-format:
-    # 
-    # :x        screen x-coordinate (default 0, to the left)
-    # :y        screen y-coordinate (default 0, top of screen)
-    # :angle    angle of object, used in draw_rot, (default 0, no rotation)
-    # :zorder   a gameclass "foo" with higher zorder then gameclass "bar" is drawn on top of "foo".
-    # :center_x relative horizontal position of the rotation center on the image. 
-    #           0 is the left border, 1 is the right border, 0.5 is the center (default 0.5)
-    # :center_y see center_x. (default 0.5)
-    # :factor_x horizontal zoom-factor, use >1.0 to zoom in. (default 1.0, no zoom).
-    # :factor_y vertical zoom-factor, use >1.0 to zoom in. (default 1.0, no zoom).
-    #
-    # :update [true|false] Automaticly call #update on object each gameloop. Default +true+.
-    # :draw   [true|false] Automaticly call #update on object each gameloop. Default +true+.
-    #
-    def initialize(options = {})
-      @options = options
-      
-      # draw_rot arguments
-      @image = options[:image]          if options[:image].is_a? Gosu::Image
-      @image = Image[options[:image]]   if options[:image].is_a? String
-      
-      @x = options[:x] || 0
-      @y = options[:y] || 0
-      @angle = options[:angle] || 0
-      @zorder = options[:zorder] || @@zorder
-      @center_x = options[:center_x] || options[:center] || @@center_x
-      @center_y = options[:center_y] || options[:center] || @@center_y
-      @factor_x = options[:factor_x] || options[:factor] || @@factor_x
-      @factor_y = options[:factor_y] || options[:factor] || @@factor_y
-      @mode = options[:mode] || :additive
-      
-      # gameloop logic
-      @update = options[:update] || true
-      @draw = options[:draw] || true
-      
-      automatic_update!	if @update
-      automatic_draw!		if @draw
-    end
-    
-    #
-    # Add self to the list of objects that Chingu calls #update on each update-loop. 
-    # This is done by default except if you create a gameobject with {:update => false}
-    #
-    def automatic_update!
-      $window.automatic_update_for(self)
-    end
-    #
-    # Add self to the list of objects that Chingu calls #draw on each update-loop.
-    # This is done by default except if you create a gameobject with {:draw => false}
-    #		
-    def automatic_draw!
-      $window.automatic_draw_for(self)
-    end
-    
-    def keymap=(keymap)
-      @keymap = keymap
-      $window.key_recievers << self		unless $window.key_recievers.include? self
-    end
-    
-    #
-    # Override this with your own actor/game-logic
-    # 
-    def update
-			
-		end
-    
-    #
-    # The core of the gameclass, the draw_rot encapsulation. Draws the sprite on screen.
-    # Calling #to_i on @x and @y enables thoose to be Float's, for subpixel slow movement in #update
-    #
-    def draw
-      @image.draw_rot(@x.to_i, @y.to_i, @zorder, @angle, @center_x, @center_y, @factor_x, @factor_y, @mode)
-    end
-  end
-end

data/lib/chingu/data_structures.rb

@@ -1,6 +0,0 @@
-module Chingu
-	Velocity = Struct.new(:x, :y, :z)
-	Position = Struct.new(:x, :y, :z)
-	Point = Struct.new(:x, :y)
-	#Rect = Struct.new(:x, :y, :width, :height)
-end