chingu 0.8rc1 → 0.8rc2

data/examples/example21.yml

@@ -2,7 +2,7 @@
 - CogWheel: 
     :x: 1088.0
     :y: 352.0
-    :angle: 315.8679371008313
+    :angle: 238.31818883902704
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -930,7 +930,7 @@
 - CogWheel: 
     :x: 1792.0
     :y: 320.0
-    :angle: 128.13262182742972
+    :angle: 205.68237008923398
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -946,7 +946,7 @@
 - CogWheel: 
     :x: 2464.0
     :y: 288.0
-    :angle: 68.52125764734936
+    :angle: 350.97150938554654
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -954,7 +954,7 @@
 - CogWheel: 
     :x: 2460.0
     :y: 960.0
-    :angle: 130.13262182742972
+    :angle: 207.68237008923398
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -1066,7 +1066,7 @@
 - Saw: 
     :x: 2304.0
     :y: 42980.3876971599
-    :angle: 228.2555205047959
+    :angle: 41.72555205053806
     :zorder: 100
     :factor_x: 0.317794486215539
     :factor_y: 0.320401002506266
@@ -1074,7 +1074,7 @@
 - Saw: 
     :x: 2016.0
     :y: 32178.4911927486
-    :angle: 87.97232008090542
+    :angle: 72.34574735821182
     :zorder: 100
     :factor_x: 0.398395989974937
     :factor_y: 0.401002506265664
@@ -1082,7 +1082,7 @@
 - Saw: 
     :x: 1696.0
     :y: 14501.1166797636
-    :angle: 176.83047882202797
+    :angle: 226.82001857098814
     :zorder: 100
     :factor_x: 0.958395989974934
     :factor_y: 0.961002506265664
@@ -1090,7 +1090,7 @@
 - Saw: 
     :x: 1056.0
     :y: 24038.686890917
-    :angle: 343.19679346113764
+    :angle: 62.16252750703487
     :zorder: 100
     :factor_x: 0.637794486215539
     :factor_y: 0.640401002506266
@@ -1098,7 +1098,7 @@
 - Saw: 
     :x: 1344.0
     :y: 24038.686890917
-    :angle: 346.1967934611386
+    :angle: 65.16252750703583
     :zorder: 100
     :factor_x: 0.637794486215539
     :factor_y: 0.640401002506266
@@ -1354,7 +1354,7 @@
 - Saw: 
     :x: 2176.0
     :y: 42820.3876971599
-    :angle: 231.2555205047959
+    :angle: 44.725552050538056
     :zorder: 100
     :factor_x: 0.317794486215539
     :factor_y: 0.320401002506266
@@ -1362,7 +1362,7 @@
 - Saw: 
     :x: 1280.0
     :y: 30827.366022672
-    :angle: 188.83443041256217
+    :angle: 300.0776055490816
     :zorder: 100
     :factor_x: 0.47739348370927
     :factor_y: 0.48
@@ -1370,7 +1370,7 @@
 - Saw: 
     :x: 1055.0
     :y: 91497.8070513121
-    :angle: 213.06579330019684
+    :angle: 344.02733176191106
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
@@ -1378,7 +1378,7 @@
 - Saw: 
     :x: 960.0
     :y: 91561.8070513122
-    :angle: 216.06579330019485
+    :angle: 347.02733176190907
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
@@ -1386,7 +1386,7 @@
 - Saw: 
     :x: 1120.0
     :y: 91561.8070513122
-    :angle: 216.06579330019485
+    :angle: 347.02733176190907
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
@@ -1394,7 +1394,7 @@
 - Saw: 
     :x: 864.0
     :y: 91497.8070513121
-    :angle: 219.06579330019485
+    :angle: 350.02733176190907
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
@@ -1402,7 +1402,7 @@
 - Saw: 
     :x: 1247.0
     :y: 27759.2193277261
-    :angle: 208.1743989618656
+    :angle: 320.6743989618843
     :zorder: 100
     :factor_x: 0.477192982456137
     :factor_y: 0.479799498746867
@@ -1410,7 +1410,7 @@
 - Saw: 
     :x: 1088.0
     :y: 54684.0355932234
-    :angle: 231.27409986678097
+    :angle: 146.99443884993184
     :zorder: 100
     :factor_x: 0.236591478696738
     :factor_y: 0.239197994987469
@@ -1418,7 +1418,7 @@
 - Saw: 
     :x: 960.0
     :y: 54684.0355932234
-    :angle: 234.27409986678109
+    :angle: 149.99443884993195
     :zorder: 100
     :factor_x: 0.236591478696738
     :factor_y: 0.239197994987469
@@ -1537,24 +1537,24 @@
     :alpha: 255
 - Saw: 
     :x: 2272.0
-    :y: 1549.3985908404632
-    :angle: 253.54604932085496
+    :y: 1362.6472068444905
+    :angle: 237.91947659816137
     :zorder: 100
     :factor_x: 0.398395989974937
     :factor_y: 0.401002506265664
     :alpha: 255
 - Saw: 
     :x: 1792.0
-    :y: 1320.1274165202165
-    :angle: 214.89015817199083
+    :y: 1415.2943760984278
+    :angle: 203.02724077304177
     :zorder: 100
     :factor_x: 0.79859649122807
     :factor_y: 0.801203007518797
     :alpha: 255
 - Saw: 
     :x: 2112.0
-    :y: 1381.2086846542861
-    :angle: 314.3603271598003
+    :y: 1330.7449409780638
+    :angle: 199.5458246302823
     :zorder: 100
     :factor_x: 0.237794486215539
     :factor_y: 0.240401002506266
@@ -1562,63 +1562,63 @@
 - Saw: 
     :x: 1504.0
     :y: 1551.27092138629
-    :angle: 309.7011834325921
+    :angle: 210.11538461603345
     :zorder: 100
     :factor_x: 0.23719298245614
     :factor_y: 0.239799498746867
     :alpha: 255
 - Saw: 
     :x: 1344.0
-    :y: 1437.5617075232558
-    :angle: 312.70118343259503
+    :y: 1420.697802197812
+    :angle: 213.11538461603647
     :zorder: 100
     :factor_x: 0.23719298245614
     :factor_y: 0.239799498746867
     :alpha: 255
 - Saw: 
     :x: 1152.0
-    :y: 1417.4142011834458
-    :angle: 315.7011834325921
+    :y: 1400.550295858002
+    :angle: 216.11538461603348
     :zorder: 100
     :factor_x: 0.23719298245614
     :factor_y: 0.239799498746867
     :alpha: 255
 - Saw: 
     :x: 992.0
-    :y: 1398.818007662831
-    :angle: 127.98530912237518
+    :y: 1373.3390804597661
+    :angle: 223.96232061665756
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
     :alpha: 255
 - Saw: 
     :x: 800.0
-    :y: 1398.818007662831
-    :angle: 130.98530912237518
+    :y: 1373.3390804597661
+    :angle: 226.96232061665756
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
     :alpha: 255
 - Saw: 
     :x: 1248.0
-    :y: 1483.7646687697154
-    :angle: 264.28192476877496
+    :y: 1452.2977917981073
+    :angle: 77.7519563145171
     :zorder: 100
     :factor_x: 0.317794486215539
     :factor_y: 0.320401002506266
     :alpha: 255
 - Saw: 
     :x: 928.0
-    :y: 1367.120689655179
-    :angle: 133.9853091223752
+    :y: 1341.641762452114
+    :angle: 229.9623206166576
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
     :alpha: 255
 - Saw: 
     :x: 672.0
-    :y: 1343.8263090677094
-    :angle: 130.98530912237518
+    :y: 1318.3473818646446
+    :angle: 226.96232061665756
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734

data/examples/example26_splash_screen.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+require 'rubygems' rescue nil
+$LOAD_PATH.unshift File.join(File.expand_path(__FILE__), "..", "..", "lib")
+require 'chingu'
+include Gosu
+
+#
+# Creates a window, then lets the user change to another one. Use this to change resolution or change to/from
+# full-screen mode
+#
+class SplashScreen < Chingu::Window
+  def initialize
+    super(400,200,false)
+    self.input = { :escape => :close, :return => :load } # exits example on Escape
+
+    Chingu::GameObject.create(:x => 200, :y => 100, :image => Image["spaceship.png"])
+    Chingu::Text.create("Press <return> to load game", :y => 100)
+  end
+
+  def update
+    super
+    self.caption = "FPS: #{self.fps} milliseconds_since_last_tick: #{self.milliseconds_since_last_tick}"
+  end
+
+  def load
+    # MUST close current window before we open the new one!
+    close
+    MainGame.new.show
+  end
+end
+
+class MainGame < Chingu::Window
+  def initialize
+    super(640,480,false)
+    self.input = { :escape => :close } # exits example on Escape
+
+    Chingu::GameObject.create(:x => 200, :y => 200, :image => Image["spaceship.png"])
+    Chingu::Text.create("Main game loaded", :y => 100)
+  end
+
+  def update
+    super
+    self.caption = "FPS: #{self.fps} milliseconds_since_last_tick: #{self.milliseconds_since_last_tick}"
+  end
+end
+
+
+SplashScreen.new.show

data/examples/example3_parallax.rb

@@ -18,21 +18,18 @@ end
 
 class Scroller < Chingu::GameState
   
-  def initialize(options)
-    super
+  def initialize(options = {})
+    super(options)
     @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,
                     :space => :next_game_state,
                     :escape => :exit
-                  }
+                  }    
   end
-  
+    
   def next_game_state
     if current_game_state.class == Wood
       switch_game_state(Jungle)
@@ -63,9 +60,8 @@ class Scroller < Chingu::GameState
 end
 
 class Wood < Scroller
-  def initialize(options = {})
-    super
-    @parallax = Chingu::Parallax.create(:x => 0, :y => 0, :rotation_center => :top_left)
+  def setup
+    @parallax = Chingu::Parallax.create(:x => 150, :y => 150, :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

data/examples/game1.rb

@@ -31,9 +31,9 @@ class Level < Chingu::GameState
   def initialize(options = {})
     super
     
-    @parallax = Parallax.create(:rotation_center => :top_left)
-    @parallax << { :image => "city2.png", :damping => 2}
-    @parallax << { :image => "city1.png", :damping => 1}	
+    @parallax = Parallax.create(:rotation_center => :top_left, :zorder => 200)
+    @parallax << { :image => "city2.png", :damping => 2, :zorder => 200}
+    @parallax << { :image => "city1.png", :damping => 1, :zorder => 200}	
     @player = Player.create(:x => 30, :y => 10)
     
     @bg1 = Color.new(0xFFCE28FF)
@@ -109,6 +109,7 @@ class Level < Chingu::GameState
   
   def draw
     fill_gradient(:from => @bg2, :to => @bg1)
+    @parallax.draw
     super    
   end
 end

data/examples/game_of_life.rb

@@ -16,8 +16,8 @@ class Main < Chingu::Window
     push_game_state(GameOfLife)
   end
   def draw
-    super
     fill_rect([0,0,640,480], 0xffffffff, -2)
+    super
   end
 end
 
@@ -85,14 +85,7 @@ class GameOfLife < Chingu::GameState
   
   def update
     super
-    
-    if @painting
-      draw_pattern_at_mouse(@pattern, true)
-      @painting = false if  @running           # Only put out pattern Once if game is running
-    else
-      draw_pattern_at_mouse(@pattern)
-    end
-    
+        
     update_grid if @running
     
     $window.caption = "Conway Generation #{@@tick}. Start/Stop with 'Space'. Run 1 generation with 'N'. Reset with 'Z'."
@@ -100,7 +93,16 @@ class GameOfLife < Chingu::GameState
 
   def draw
     super
+    
     draw_grid
+    
+    if @painting
+      draw_pattern_at_mouse(@pattern, true)
+      @painting = false if  @running           # Only put out pattern Once if game is running
+    else
+      draw_pattern_at_mouse(@pattern)
+    end
+    
   end
   
   private

data/examples/{example24_input_codes.rb → tool1_input_codes.rb}

@@ -18,7 +18,7 @@ class Game < Chingu::Window
     @gosu_inputs = input_names.inject({}) {|hash, name| hash[Gosu.const_get name] = name; hash }
 
     # Get all possible key codes.
-    @key_codes = (Gosu::KbRangeBegin..Gosu::KbRangeEnd).to_a# + (Gosu::GpRangeBegin..Gosu::GpRangeEnd).to_a + (Gosu::MsRangeBegin..Gosu::MsRangeEnd).to_a
+    @key_codes = (Gosu::KbRangeBegin..Gosu::KbRangeEnd).to_a + (Gosu::GpRangeBegin..Gosu::GpRangeEnd).to_a + (Gosu::MsRangeBegin..Gosu::MsRangeEnd).to_a
   end
 
   def update

data/lib/chingu.rb

@@ -38,7 +38,7 @@ require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
   # VERSION = "0.7.7.5"
-  VERSION = "0.8rc1"
+  VERSION = "0.8rc2"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999

data/lib/chingu/assets.rb

@@ -39,6 +39,64 @@ module Gosu
     end
   end
 
+  class Font
+    # Font is a special case, since it has both a name and a size.
+    include Chingu::NamedResource
+
+    # Load a font with the given name and size.
+    # @param [String] name Name of the font (or path to TTF font)
+    # @param [Number] size Size of the font.
+    def self.autoload(name, size)
+      font_name = if path = find_file(name)
+        path # Use the full path, found in the autoload dirs.
+      else
+        name # Font not found in the path. Assume it is an OS font.
+      end
+
+      return Gosu::Font.new($window, font_name, size)
+    end
+
+    # @overload self.[](name, size)
+    #   Get a font with the given name and size.
+    #   @param [String] name Name of the font (or path to TTF font)
+    #   @param [Number] size Size of the font.
+    #
+    # @overload self.[](size)
+    #   Get a font of a given size using the Gosu.default_font_name.
+    #   @param [Number] size Size of the font.
+    def self.[]( *args )
+      case args.size
+      when 1
+        name = Gosu.default_font_name
+        size = args[0]
+      when 2
+        name, size = args
+      else
+        raise ArgumentError, "wrong number of arguments (#{args.size} for 1 or 2)"
+      end
+
+      result = @resources[[name, size]]
+
+      if result.nil?
+        result = autoload(name, size)
+        if result
+          self[name, size] = result
+          result.name = name
+        end
+      end
+
+      return result
+    end
+
+    # Save a font with the given name and size.
+    # @param [String] name Name of the font (or path to TTF font)
+    # @param [Number] size Size of the font.
+    # @param [Gosu::Font] font Font object to save.
+    def self.[]=( name, size, font )
+      @resources[[name, size]] = font
+    end
+  end
+
   class Song
     include Chingu::NamedResource