chingu 0.5.8.1 → 0.5.8.2

data/Manifest.txt

@@ -16,6 +16,7 @@ examples/example1.rb
 examples/example10.rb
 examples/example11.rb
 examples/example12.rb
+examples/example13.rb
 examples/example2.rb
 examples/example3.rb
 examples/example4.rb
@@ -25,6 +26,7 @@ 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
@@ -71,7 +73,7 @@ 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.rb
+lib/chingu/high_score_list.rb
 lib/chingu/inflector.rb
 lib/chingu/input.rb
 lib/chingu/named_resource.rb

data/README.rdoc

@@ -528,10 +528,14 @@ You also have:
   Sound["shot.png"]
   Song["intromusic.ogg"]
 
-By default Image, Sound and Sound searches the current directory and directory "media".
+The default settings are like this:
+Image["image.png"] -- searches directories ".", "images", "gfx" and "media"
+Sample["sample.wav"] -- searches directories ".", "sounds", "sfx" and "media"
+Song["song.ogg"] -- searches directories ".", "songs", "sounds", "sfx" and "media"
+
 Add your own searchpaths like this:
-  Gosu::Image.autoload_dirs << File.join($window.root, "gfx")
-  Gosu::Sound.autoload_dirs << File.join($window.root, "samples")
+  Gosu::Image.autoload_dirs << File.join(ROOT, "gfx")
+  Gosu::Sound.autoload_dirs << File.join(ROOT, "samples")
 
 This will add \path\to\your\game\gfx and \path\to\your\game\samples  to Image and Sound.
   

data/chingu.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chingu}
-  s.version = "0.5.8.1"
+  s.version = "0.5.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ippa"]
-  s.date = %q{2009-10-19}
+  s.date = %q{2009-10-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/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/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.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/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/example13.rb

@@ -0,0 +1,88 @@
+require 'rubygems'
+require File.join(File.dirname($0), "..", "lib", "chingu")
+include Gosu
+include Chingu
+
+#
+# Demonstrating Chingus HighScoreList-class
+# I couldn't keep myself from spicying it up some though  :P
+#
+class Game < Chingu::Window
+  def initialize
+    super(640,400)
+    self.input = {:esc => :exit}
+    self.caption = "Example of Chingus HighScore class"
+    
+    PulsatingText.create("HIGH SCORES", :x => $window.width/2, :y => 50, :size => 70)
+    
+    #
+    # Load a list from disk, defaults to "high_score_list.yml"
+    # Argument :size forces list to this size
+    #
+    @high_score_list = HighScoreList.load(:size => 10)
+
+    #
+    # Add some new high scores to the list. :name and :score are required but you can put whatever.
+    # They will mix with the old scores, automatic default sorting on :score
+    #
+    10.times { @high_score_list.add(:name => "NEW", :score => rand(10000)) }
+    
+    #
+    # Iterate through all high scores and create the visual represenation of it
+    #
+    @high_score_list.each_with_index do |high_score, index|
+      y = index * 25 + 100
+      Text.create(high_score[:name], :x => 200, :y => y, :size => 20)
+      Text.create(high_score[:score], :x => 400, :y => y, :size => 20)
+    end
+    
+    5.times do
+      score = rand(20000)
+      puts "position for #{score}: #{@high_score_list.position_by_score(score)}"
+    end
+    
+    # @high_score_list.save  # Uncomment to save list to disk
+  end
+  
+  def update
+    super
+    self.caption = "FPS #{$window.fps} - game objects: #{game_objects.size}"
+  end
+end
+
+#
+# colorful pulsating text...
+#
+class PulsatingText < Text
+  has_trait :timer, :effect
+  @@red = Color.new(0xFFFF0000)
+  @@green = Color.new(0xFF00FF00)
+  @@blue = Color.new(0xFF0000FF)
+  
+  def initialize(text, options = {})
+    super(text, options)
+    
+    options = text  if text.is_a? Hash
+    @pulse = options[:pulse] || false
+    self.rotation_center(:center_center)
+    every(20) { create_pulse }   if @pulse == false
+  end
+  
+  def create_pulse
+    pulse = PulsatingText.create(@text, :x => @x, :y => @y, :height => @height, :pulse => true, :image => @image, :zorder => @zorder+1)
+    colors = [@@red, @@green, @@blue]
+    pulse.color = colors[rand(colors.size)].dup
+    pulse.mode = :additive
+    pulse.alpha -= 150
+    pulse.scale_rate = 0.002
+    pulse.fade_rate = -3 + rand(2)
+    pulse.rotation_rate = rand(2)==0 ? 0.05 : -0.05
+  end
+    
+  def update
+    destroy if self.alpha == 0
+  end
+  
+end
+
+Game.new.show

data/examples/high_score_list.yml

@@ -0,0 +1,21 @@
+--- 
+- :name: ABC
+  :score: 9260
+- :name: ABC
+  :score: 9112
+- :name: ABC
+  :score: 8660
+- :name: ABC
+  :score: 8030
+- :name: ABC
+  :score: 7802
+- :name: ABC
+  :score: 6976
+- :name: ABC
+  :score: 6718
+- :name: ABC
+  :score: 6325
+- :name: ABC
+  :score: 5632
+- :name: ABC
+  :score: 4199

data/lib/chingu.rb

@@ -26,8 +26,7 @@ require 'rubygems' unless RUBY_VERSION =~ /1\.9/
 require 'gosu'
 require File.join(CHINGU_ROOT,"chingu","require_all") # Thanks to http://github.com/tarcieri/require_all !
 require_all "#{CHINGU_ROOT}/chingu"
-#autoload :OpenStruct, "ostruct"
 
 module Chingu
-  VERSION = "0.5.8.1"
+  VERSION = "0.5.8.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
+    attr_accessor :frames, :delay, :step
     
     #
     # Create a new Animation. 
@@ -22,9 +22,10 @@ module Chingu
     #   - height:  width of each frame in the tileanimation
     #   - size: [x,y] specify width/height with 1 argument (an array)
     #   - delay: milliseconds between each frame
+    #   - step: [steps] move animation forward [steps] frames each time we call #next
     #
     def initialize(options)
-      options = {:loop => true, :bounce => false, :width => 32, :height => 32, :index => 0, :delay => 100}.merge(options)
+      options = {:step => 1, :loop => true, :bounce => false, :width => 32, :height => 32, :index => 0, :delay => 100}.merge(options)
       
       @loop = options[:loop]
       @bounce = options[:bounce]
@@ -33,6 +34,7 @@ module Chingu
       @width = options[:width]
       @index = options[:index]
       @delay = options[:delay]
+      @step = options[:step] || 1
       @dt = 0
       
       if options[:size]
@@ -44,7 +46,6 @@ module Chingu
       
       @frame_actions = []
       @frames = Gosu::Image.load_tiles($window, @file, @width, @height, true)
-      @step = 1
     end
     
     #

data/lib/chingu/assets.rb

@@ -9,7 +9,7 @@ module Chingu
   end
   
   def image_path(file)
-    File.join(ROOT, "gfx", file)
+    File.join(ROOT, "images", file)
   end
   
   class Asset
@@ -21,6 +21,9 @@ module Chingu
   end
 end
 
+#
+# Extend GOSU's core classes with NamedResource
+#
 module Gosu
   class Image
     include Chingu::NamedResource
@@ -45,20 +48,5 @@ module Gosu
       (path = find_file(name)) ? Gosu::Sample.new($window, path) : nil
     end
   end
-  Sound = Sample
-	
-  class Tile
-    include Chingu::NamedResource	
-	
-    def self.autoload(name)
-      (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
+  Sound = Sample  # Gosu uses Sample, but Sound makes sense too.
 end

data/lib/chingu/basic_game_object.rb

@@ -62,9 +62,9 @@ module Chingu
     # Use create() instead of new() if you want to keep track of your objects through
     # Chingus "game_objects" which is available in all game states and the main window.
     #
-    def self.create(options = {})
-      instance = self.new(options)
-      
+    #def self.create(options = {})
+    def self.create(*options)
+      instance = self.new(*options)
       
       #
       # Add to parents list of game objects

data/lib/chingu/high_score_list.rb

@@ -0,0 +1,117 @@
+#--
+#
+# 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
+  #
+  # Highscore-class
+  #
+  # - Keeps a local YAML file with highscores, default highscores.yml in root game dir.
+  # - Add, delete, clear highscores
+  # - Iterate through highscores with simple Highscore#each
+  #
+  class HighScoreList
+    attr_reader :file
+    
+    #
+    # Create a new high score list with 0 entries
+    #
+    def initialize(options = {})
+      require 'yaml'
+      @file = options[:file] || "high_score_list.yml"
+      @size = options[:size] || 100
+      @sort_on = options[:sort_on] || :score
+      @high_scores = Array.new
+    end
+    
+    #
+    # Create a new high score list and try to load content from :file-parameter
+    # If no :file is given, HighScoreList tries to load from file "high_score_list.yml"
+    #
+    def self.load(options = {})
+      high_score_list = HighScoreList.new(options)
+      high_score_list.load
+      return high_score_list
+    end
+    
+    #
+    # Add a new high score to list.
+    # 'data' is a hash of key/value-pairs that needs to contain at least the keys :name and :score
+    #
+    def add(data)
+      raise "No :name value in high score!"   if data[:name].nil?
+      raise "No :score value in high score!"  if data[:score].nil?
+      
+      @high_scores.push(data)
+      @high_scores.sort! { |a, b| b[@sort_on] <=> a[@sort_on] }
+      @high_scores = @high_scores[0..@size]
+    end
+    alias << add
+    
+    #
+    # Returns the position 'score' would get in among the high scores:
+    #   @high_score_list.position_by_score(999999999) # most likely returns 1 for the number one spot
+    #   @high_score_list.position_by_score(1)         # most likely returns nil since no placement is found (didn't make it to the high scores)
+    #
+    def position_by_score(score)
+      position = 1
+      @high_scores.each do |high_score|
+        return position   if score > high_score[:score]
+        position += 1
+      end
+      return nil
+    end
+    
+    #
+    # Direct access to invidual high scores
+    #
+    def [](index)
+      @high_scores[index]
+    end
+    
+    #
+    # Iterate through all high scores
+    #
+    def each
+      @high_scores.each { |high_score| yield high_score }
+    end
+    
+    def each_with_index
+      @high_scores.each_with_index { |high_score, index| yield high_score, index }
+    end
+
+    #
+    # Load data from previously specified @file
+    #
+    def load
+      @high_scores = YAML.load_file(@file)  if File.exists?(@file)
+    end
+    
+    #
+    # Save high score data into previously specified @file
+    #
+    def save
+      File.open(@file, 'w') do |out|
+        YAML.dump(@high_scores, out)
+      end
+    end
+    
+  end
+end

data/lib/chingu/text.rb

@@ -27,14 +27,14 @@ module Chingu
   #   @font.draw("A Text", 200, 50, 55, 2.0)
   #
   # Chingu
-  #   @text = Chingu::Text.new(:text => "A Text", :x => 200, :y => 50, :zorder => 55, :factor_x => 2.0)
+  #   @text = Chingu::Text.new("A Text", :x => 200, :y => 50, :zorder => 55, :factor_x => 2.0)
   #   @text.draw  # usually not needed as Text is a GameObject and therefore autodrawn
   #
   # @text comes with a number of changable properties, x,y,zorder,angle,factor_x,color,mode etc.
   #
   class Text < Chingu::GameObject
     attr_accessor :text
-    attr_reader :height, :gosu_font
+    attr_reader :height, :gosu_font, :line_spacing, :align, :max_width
 
     @@size = nil
     @@font = nil
@@ -48,21 +48,47 @@ module Chingu
     
     #
     # Takes the standard GameObject-hash-arguments but also:
-    # - :text             - a string of text
-    # - :font_name|:font  - name of a systemfont (default: "verdana")
-    # - :height|size      - how many pixels high should the text be
+    #   :text               - a string of text
+    #   :font_name|:font    - Name of a system font, or a filename to a TTF file (must contain �/�, does not work on Linux). 
+    #   :height|:size       - Height of the font in pixels. 
+    #   :line_spacing	      - Spacing between two lines of text in pixels. 
+    #   :max_width	        - Width of the bitmap that will be returned. Text will be split into multiple lines to avoid drawing over the right border. When a single word is too long, it will be truncated.
+    #   :align	            - One of :left, :right, :center or :justify. 
     #
-    def initialize(options)
+    # if :max_width is given the text is drawn using :line_spacing, :align and :max_width
+    #
+    def initialize(text, options = {})      
+      if text.is_a? Hash
+        options = text
+        text = nil
+      end
+     
       super(options)
-      @text = options[:text] || "-No text specified-"
+  
+      @text = text || options[:text] || "-No text specified-"
       @font =  options[:font] || @@font || default_font_name()
-      @height = options[:height] || options[:size] || @@size || 15
+      @height = @size = options[:height] || options[:size] || @@size || 15
+      @line_spacing = options[:line_spacing] || 1
+      @align = options[:align] || :left
+      @max_width = options[:max_width]
+    
+      self.rotation_center(:top_left)
       
       @gosu_font = Gosu::Font.new($window, @font, @height)
+      
+      create_image  unless @image
+    end
+    
+    #
+    # Set a new text, a new image is created.
+    #
+    def text=(text)
+      @text = text
+      create_image
     end
     
-    def draw
-      @gosu_font.draw_rot(@text, @x.to_i, @y.to_i, @zorder, @angle, @factor_x, @factor_y, @color, @mode)
+    def size
+      @height
     end
     
     #
@@ -71,7 +97,18 @@ module Chingu
     def width
       @gosu_font.text_width(@text, @factor_x)
     end
-
+    
+    private
+    
+    #
+    # Create the actual image from text and parameters supplied.
+    #
+    def create_image
+      if @max_width
+        @image = Gosu::Image.from_text($window, @text, @font, @height, @line_spacing, @max_width, @align)
+      else
+        @image = Gosu::Image.from_text($window, @text, @font, @height)
+      end
+    end
   end
-  
 end

data/lib/chingu/traits/timer.rb

@@ -40,30 +40,31 @@ module Chingu
         # [start_time, end_time (or nil if one-shot), &block]
         #
         @_timers = Array.new
+        @_repeating_timers = Array.new
         super
       end
 
       def during(time, &block)
-        ms = milliseconds()
+        ms = Gosu::milliseconds()
         @_last_timer = [ms, ms + time, block]
         @_timers << @_last_timer
         self
       end
       
       def after(time, &block)
-        ms = milliseconds()
+        ms = Gosu::milliseconds()
         @_last_timer = [ms + time, nil, block]
         @_timers << @_last_timer
         self
       end
       
       def between(start_time, end_time, &block)
-        ms = milliseconds()
+        ms = Gosu::milliseconds()
         @_last_timer = [ms + start_time, ms + end_time, block]
         @_timers << @_last_timer
         self
       end
-      
+
       def then(&block)
         # ...use one-shots start_time for our trailing "then".
         # ...use durable timers end_time for our trailing "then".
@@ -71,17 +72,29 @@ module Chingu
         @_timers << [start_time, nil, block]
       end
       
+      def every(delay, &block)
+        ms = Gosu::milliseconds()
+        @_repeating_timers << [ms + delay, delay, block]
+      end      
+      
       def update_trait
-        ms = milliseconds()
+        ms = Gosu::milliseconds()
         @_timers.each do |start_time, end_time, block|
-          if ms > start_time && (end_time == nil || ms < end_time)
-            block.call
+          block.call  if ms > start_time && (end_time == nil || ms < end_time)
+        end
+                
+        index = 0
+        @_repeating_timers.each do |start_time, delay, block|
+          if ms > start_time
+            block.call  
+            @_repeating_timers[index] = [ms + delay, delay, block]
           end
+          index += 1
         end
 
         # Remove one-shot timers (only a start_time, no end_time) and all timers which have expired
         @_timers.reject! { |start_time, end_time, block| (ms > start_time && end_time == nil) || (end_time != nil && ms > end_time) }
-        
+      
         super
       end
       

data/lib/chingu/window.rb

@@ -46,11 +46,10 @@ module Chingu
       $window = super(width, height, fullscreen, update_interval)
 			
       @root = File.dirname(File.expand_path($0))
-      Chingu::Asset.autoload_dirs = [".", File.join(@root, "gfx"), File.join(@root, "media"), File.join(@root, "sfx")]
-      Gosu::Image.autoload_dirs = [".", File.join(@root, "gfx"), File.join(@root, "media")]
-      Gosu::Sample.autoload_dirs = [".", File.join(@root, "sound"), File.join(@root, "media")]
-      Gosu::Tile.autoload_dirs = [".", File.join(@root, "gfx"), File.join(@root, "media")]
-      Gosu::Song.autoload_dirs = [".", File.join(@root, "sfx"), File.join(@root, "media")]
+      Chingu::Asset.autoload_dirs = [".", File.join(@root, "assets"), File.join(@root, "media")]
+      Gosu::Image.autoload_dirs = [".", File.join(@root, "images"), File.join(@root, "gfx"), File.join(@root, "media")]
+      Gosu::Sample.autoload_dirs = [".", File.join(@root, "sounds"), File.join(@root, "sfx"), File.join(@root, "media")]
+      Gosu::Song.autoload_dirs = [".", File.join(@root, "songs"), File.join(@root, "sounds"), File.join(@root, "sfx"), File.join(@root, "media")]
 			
       @game_objects = GameObjectList.new
       @input_clients = Array.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: chingu
 version: !ruby/object:Gem::Version 
-  version: 0.5.8.1
+  version: 0.5.8.2
 platform: ruby
 authors: 
 - ippa
@@ -30,7 +30,7 @@ cert_chain:
   hxtMlw==
   -----END CERTIFICATE-----
 
-date: 2009-10-19 00:00:00 +02:00
+date: 2009-10-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,6 +76,7 @@ files:
 - examples/example10.rb
 - examples/example11.rb
 - examples/example12.rb
+- examples/example13.rb
 - examples/example2.rb
 - examples/example3.rb
 - examples/example4.rb
@@ -85,6 +86,7 @@ files:
 - 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
@@ -131,7 +133,7 @@ files:
 - lib/chingu/helpers/input_client.rb
 - lib/chingu/helpers/input_dispatcher.rb
 - lib/chingu/helpers/rotation_center.rb
-- lib/chingu/high_score.rb
+- lib/chingu/high_score_list.rb
 - lib/chingu/inflector.rb
 - lib/chingu/input.rb
 - lib/chingu/named_resource.rb

data/lib/chingu/high_score.rb

@@ -1,60 +0,0 @@
-#--
-#
-# 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
-
-  #
-  # Highscore-class
-  #
-  # - Keeps a local YAML file with highscores, default highscores.yml in root game dir.
-  # - Add, delete, clear highscores
-  # - Iterate through highscores with simple Highscore#each
-  #
-  class HighScore
-    def initialize(options = {})
-      @file = options[:file] || "high_scores.yml"
-      @high_scores = Array.new
-      
-      #OpenStruct.new()
-    end
-    
-    #
-    # 
-    #
-    def add(name, score)
-      
-    end
-    alias << add
-    
-    def each
-      @highscores.each { |highscore| yield highscore }
-    end
-
-    def save
-    end
-  
-    def self.all
-    
-    end
-  end
-
-end