chingu 0.6.8 → 0.6.9

data/Rakefile

@@ -14,7 +14,7 @@ begin
     gemspec.rubyforge_project = "chingu"
     gemspec.version = Chingu::VERSION
     
-    gemspec.add_dependency 'gosu', '>= 0.7.15'
+    gemspec.add_dependency 'gosu', '>= 0.7.17'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/chingu.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.6.8"
+  s.version = "0.6.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-12-27}
+  s.date = %q{2010-01-05}
   s.description = %q{OpenGL accelerated 2D game framework for Ruby. Builds on Gosu (Ruby/C++) which provides all the core functionality. Chingu adds simple yet powerful game states, prettier input handling, deployment safe asset-handling, a basic re-usable game object and stackable game logic.}
   s.email = %q{ippa@rubylicio.us}
   s.extra_rdoc_files = [
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
     ".gitignore",
      "History.txt",
      "LICENSE",
-     "Manifest.txt",
      "README.rdoc",
      "Rakefile",
      "benchmarks/README.txt",
@@ -156,12 +155,12 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<gosu>, [">= 0.7.15"])
+      s.add_runtime_dependency(%q<gosu>, [">= 0.7.17"])
     else
-      s.add_dependency(%q<gosu>, [">= 0.7.15"])
+      s.add_dependency(%q<gosu>, [">= 0.7.17"])
     end
   else
-    s.add_dependency(%q<gosu>, [">= 0.7.15"])
+    s.add_dependency(%q<gosu>, [">= 0.7.17"])
   end
 end
 

data/examples/example10_traits_retrofy.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require 'opengl'
 require File.join(File.dirname($0), "..", "lib", "chingu")

data/examples/example11_animation.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require 'opengl'
 require File.join(File.dirname($0), "..", "lib", "chingu")

data/examples/example12_trait_timer.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu
@@ -21,9 +22,6 @@ class Cube < GameObject
   
   def initialize(options)
     super
-    @white = Color.new(0xFFFFFFFF)
-    @red = Color.new(0xFFFF0000)
-    @blue = Color.new(0xFF0000FF)
     self.input = {  :left => :left, :right => :right, :up => :up, :down => :down, 
                     :space => :shake1, :return => :shake2 }
   end
@@ -37,13 +35,13 @@ class Cube < GameObject
   end
   
   def up
-    @color = @red
-    during(500) { @y -= 1 }.then { @color = @white }
+    @color = Color::RED
+    during(500) { @y -= 1 }.then { @color = Color::WHITE }
   end
 
   def down
-    @color = @blue
-    during(500) { @y += 1 }.then { @color = @white }
+    @color = Color::BLUE
+    during(500) { @y += 1 }.then { @color = Color::WHITE }
   end
 
   def shake1

data/examples/example13_high_scores.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu
@@ -65,9 +66,6 @@ end
 #
 class PulsatingText < Text
   has_traits :timer, :effect
-  @@red = Color.new(0xFFFF0000)
-  @@green = Color.new(0xFF00FF00)
-  @@blue = Color.new(0xFF0000FF)
   
   def initialize(text, options = {})
     super(text, options)
@@ -80,7 +78,7 @@ class PulsatingText < Text
   
   def create_pulse
     pulse = PulsatingText.create(@text, :x => @x, :y => @y, :height => @height, :pulse => true, :image => @image, :zorder => @zorder+1)
-    colors = [@@red, @@green, @@blue]
+    colors = [Color::RED, Color::GREEN, Color::BLUE]
     pulse.color = colors[rand(colors.size)].dup
     pulse.mode = :additive
     pulse.alpha -= 150

data/examples/example14_bounding_box_circle.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu

data/examples/example15_trait_timer2.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu
@@ -19,14 +20,15 @@ class Stuff < GameState
   
   def initialize(options = {})
     super
-    self.input = {:t => :toggle, :"1" => :fast, :"2" => :slow}
+    self.input = {:s => :stop, :"1" => :fast, :"2" => :slow}
     @thing = Thing.create(:x => $window.width/2, :y => $window.height / 2 )
     
     every(500, :name => :blink) { @thing.visible? ? @thing.hide! : @thing.show! }
     p timer_exists?(:blink)
+    $window.caption = "Timer-usage. 's' to stop timer, '1' for fast timer, '2' for slow timer"
   end
   
-  def toggle
+  def stop
     stop_timer(:name => :blink)
   end
   

data/examples/example16_online_high_scores.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu

data/examples/example17_gosu_tutorial.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu

data/examples/example1_basics.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu

data/examples/example2_gamestate_basics.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu

data/examples/example3_parallax.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu

data/examples/example4_gamestates.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu

data/examples/example5_gamestates_in_pure_gosu.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu

data/examples/example6_transitional_game_state.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu

data/examples/example7_gfx_helpers.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu

data/examples/example8_traits.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu

data/examples/example9_collision_detection.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 include Gosu

data/examples/game1.rb

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 #
 #
 # A "full" simple game in Chingu, using GameState, GameObject, Paralaxx, has_traits etc

data/lib/chingu.rb

@@ -33,7 +33,7 @@ require_all "#{CHINGU_ROOT}/chingu/traits"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/helpers/game_state.rb

@@ -29,6 +29,10 @@ module Chingu
   # It will make call new() on a class, and just push an object.
   #
   module GameState
+    def game_states
+      game_state_manager.game_states
+    end
+    
     def push_game_state(state, options = {})
       #$window.game_state_manager.push_game_state(state, options)
       game_state_manager.push_game_state(state, options)

data/lib/chingu/input.rb

@@ -21,8 +21,8 @@
 
 module Chingu
   module Input
-    include Gosu::Button
-  
+    include Gosu
+    
     #
     # Ruby symbols describing http://www.libgosu.org/rdoc/classes/Gosu.html
     #

data/lib/chingu/traits/effect.rb

@@ -50,6 +50,8 @@ module Chingu
         ## puts "Effect#setup_trait(#{options})"
         @rotation_rate = options[:rotation_rate] || nil
         @scale_rate = options[:scale_rate] || nil
+        @scale_x_rate = options[:scale_x_rate] || nil
+        @scale_y_rate = options[:scale_y_rate] || nil
         @fade_rate = options[:fade_rate] || nil
         super
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors: 
 - ippa
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-27 00:00:00 +01:00
+date: 2010-01-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.15
+        version: 0.7.17
     version: 
 description: OpenGL accelerated 2D game framework for Ruby. Builds on Gosu (Ruby/C++) which provides all the core functionality. Chingu adds simple yet powerful game states, prettier input handling, deployment safe asset-handling, a basic re-usable game object and stackable game logic.
 email: ippa@rubylicio.us
@@ -35,7 +35,6 @@ files:
 - .gitignore
 - History.txt
 - LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
 - benchmarks/README.txt

data/Manifest.txt

@@ -1,102 +0,0 @@
-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/example15.rb
-examples/example16.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/circle.png
-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/rect.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_ext/array.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/gosu_ext/image.rb
-lib/chingu/helpers/class_inheritable_accessor.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/online_high_score_list.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/bounding_circle.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