chingu 0.8rc2 → 0.8rc3

data/examples/example19_edit_viewport.rb

@@ -33,7 +33,9 @@ class Example19 < GameState
   # 1) map 2) stars 3) player
   # Since we don't give any zorders Chingu automatically increments zorder between each object created, putting player on top
   #
-  def setup
+  def initialize(options = {})
+    super
+    
     self.input = { :escape => :exit, :e => :edit } 
 
     Sound["laser.wav"] # cache sound by accessing it once

data/examples/example1_basics.rb

@@ -30,10 +30,10 @@ class Game < Chingu::Window
 end
 
 class Player < Chingu::GameObject  
-  def move_left;  @x -= 1; end
-  def move_right; @x += 1; end
-  def move_up;    @y -= 1; end
-  def move_down;  @y += 1; end
+  def move_left;  @x -= 3; end
+  def move_right; @x += 3; end
+  def move_up;    @y -= 3; end
+  def move_down;  @y += 3; end
 end
 
 

data/examples/example21.yml

@@ -2,7 +2,7 @@
 - CogWheel: 
     :x: 1088.0
     :y: 352.0
-    :angle: 238.31818883902704
+    :angle: 21.323463353534763
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -930,7 +930,7 @@
 - CogWheel: 
     :x: 1792.0
     :y: 320.0
-    :angle: 205.68237008923398
+    :angle: 62.67709557472743
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -946,7 +946,7 @@
 - CogWheel: 
     :x: 2464.0
     :y: 288.0
-    :angle: 350.97150938554654
+    :angle: 133.9767839000518
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -954,7 +954,7 @@
 - CogWheel: 
     :x: 2460.0
     :y: 960.0
-    :angle: 207.68237008923398
+    :angle: 64.67709557472737
     :zorder: 95
     :factor_x: 1.68525252525252
     :factor_y: 1.68525252525252
@@ -1065,40 +1065,40 @@
     :alpha: 255
 - Saw: 
     :x: 2304.0
-    :y: 42980.3876971599
-    :angle: 41.72555205053806
+    :y: 42982.52618296432
+    :angle: 156.78075709785693
     :zorder: 100
     :factor_x: 0.317794486215539
     :factor_y: 0.320401002506266
     :alpha: 255
 - Saw: 
     :x: 2016.0
-    :y: 32178.4911927486
-    :angle: 72.34574735821182
+    :y: 32179.99471564744
+    :angle: 87.12304982424301
     :zorder: 100
     :factor_x: 0.398395989974937
     :factor_y: 0.401002506265664
     :alpha: 255
 - Saw: 
     :x: 1696.0
-    :y: 14501.1166797636
-    :angle: 226.82001857098814
+    :y: 14501.157370140168
+    :angle: 261.2054788220373
     :zorder: 100
     :factor_x: 0.958395989974934
     :factor_y: 0.961002506265664
     :alpha: 255
 - Saw: 
     :x: 1056.0
-    :y: 24038.686890917
-    :angle: 62.16252750703487
+    :y: 24039.250707326933
+    :angle: 115.75652310590293
     :zorder: 100
     :factor_x: 0.637794486215539
     :factor_y: 0.640401002506266
     :alpha: 255
 - Saw: 
     :x: 1344.0
-    :y: 24038.686890917
-    :angle: 65.16252750703583
+    :y: 24039.250707326933
+    :angle: 118.75652310590394
     :zorder: 100
     :factor_x: 0.637794486215539
     :factor_y: 0.640401002506266
@@ -1353,72 +1353,72 @@
     :alpha: 255
 - Saw: 
     :x: 2176.0
-    :y: 42820.3876971599
-    :angle: 44.725552050538056
+    :y: 42822.52618296432
+    :angle: 159.7807570978569
     :zorder: 100
     :factor_x: 0.317794486215539
     :factor_y: 0.320401002506266
     :alpha: 255
 - Saw: 
     :x: 1280.0
-    :y: 30827.366022672
-    :angle: 300.0776055490816
+    :y: 30828.455270887032
+    :angle: 14.551566069882607
     :zorder: 100
     :factor_x: 0.47739348370927
     :factor_y: 0.48
     :alpha: 255
 - Saw: 
     :x: 1055.0
-    :y: 91497.8070513121
-    :angle: 344.02733176191106
+    :y: 91503.18461541468
+    :angle: 287.05617791584626
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
     :alpha: 255
 - Saw: 
     :x: 960.0
-    :y: 91561.8070513122
-    :angle: 347.02733176190907
+    :y: 91567.18461541476
+    :angle: 290.0561779158443
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
     :alpha: 255
 - Saw: 
     :x: 1120.0
-    :y: 91561.8070513122
-    :angle: 347.02733176190907
+    :y: 91567.18461541476
+    :angle: 290.0561779158443
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
     :alpha: 255
 - Saw: 
     :x: 864.0
-    :y: 91497.8070513121
-    :angle: 350.02733176190907
+    :y: 91503.18461541468
+    :angle: 293.0561779158443
     :zorder: 100
     :factor_x: 0.156390977443606
     :factor_y: 0.158997493734336
     :alpha: 255
 - Saw: 
     :x: 1247.0
-    :y: 27759.2193277261
-    :angle: 320.6743989618843
+    :y: 27760.30945377652
+    :angle: 35.78469307954082
     :zorder: 100
     :factor_x: 0.477192982456137
     :factor_y: 0.479799498746867
     :alpha: 255
 - Saw: 
     :x: 1088.0
-    :y: 54684.0355932234
-    :angle: 146.99443884993184
+    :y: 54687.2512711895
+    :angle: 322.8948625787961
     :zorder: 100
     :factor_x: 0.236591478696738
     :factor_y: 0.239197994987469
     :alpha: 255
 - Saw: 
     :x: 960.0
-    :y: 54684.0355932234
-    :angle: 149.99443884993195
+    :y: 54687.2512711895
+    :angle: 325.89486257879616
     :zorder: 100
     :factor_x: 0.236591478696738
     :factor_y: 0.239197994987469
@@ -1537,88 +1537,88 @@
     :alpha: 255
 - Saw: 
     :x: 2272.0
-    :y: 1362.6472068444905
-    :angle: 237.91947659816137
+    :y: 1465.5598892803227
+    :angle: 252.69677906419255
     :zorder: 100
     :factor_x: 0.398395989974937
     :factor_y: 0.401002506265664
     :alpha: 255
 - Saw: 
     :x: 1792.0
-    :y: 1415.2943760984278
-    :angle: 203.02724077304177
+    :y: 1382.9861913130887
+    :angle: 28.365553602565324
     :zorder: 100
     :factor_x: 0.79859649122807
     :factor_y: 0.801203007518797
     :alpha: 255
 - Saw: 
     :x: 2112.0
-    :y: 1330.7449409780638
-    :angle: 199.5458246302823
+    :y: 1318.1290050590083
+    :angle: 359.9863811226902
     :zorder: 100
     :factor_x: 0.237794486215539
     :factor_y: 0.240401002506266
     :alpha: 255
 - Saw: 
     :x: 1504.0
-    :y: 1551.27092138629
-    :angle: 210.11538461603345
+    :y: 1554.4759087066618
+    :angle: 18.26627219000278
     :zorder: 100
     :factor_x: 0.23719298245614
     :factor_y: 0.239799498746867
     :alpha: 255
 - Saw: 
     :x: 1344.0
-    :y: 1420.697802197812
-    :angle: 213.11538461603647
+    :y: 1424.913778529173
+    :angle: 21.266272190005793
     :zorder: 100
     :factor_x: 0.23719298245614
     :factor_y: 0.239799498746867
     :alpha: 255
 - Saw: 
     :x: 1152.0
-    :y: 1400.550295858002
-    :angle: 216.11538461603348
+    :y: 1404.766272189363
+    :angle: 24.26627219000278
     :zorder: 100
     :factor_x: 0.23719298245614
     :factor_y: 0.239799498746867
     :alpha: 255
 - Saw: 
     :x: 992.0
-    :y: 1373.3390804597661
-    :angle: 223.96232061665756
+    :y: 1379.7088122605323
+    :angle: 149.27841257069542
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
     :alpha: 255
 - Saw: 
     :x: 800.0
-    :y: 1373.3390804597661
-    :angle: 226.96232061665756
+    :y: 1379.7088122605323
+    :angle: 152.27841257069542
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
     :alpha: 255
 - Saw: 
     :x: 1248.0
-    :y: 1452.2977917981073
-    :angle: 77.7519563145171
+    :y: 1404.0892744479506
+    :angle: 192.80716136183597
     :zorder: 100
     :factor_x: 0.317794486215539
     :factor_y: 0.320401002506266
     :alpha: 255
 - Saw: 
     :x: 928.0
-    :y: 1341.641762452114
-    :angle: 229.9623206166576
+    :y: 1348.0114942528803
+    :angle: 155.27841257069545
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
     :alpha: 255
 - Saw: 
     :x: 672.0
-    :y: 1318.3473818646446
-    :angle: 226.96232061665756
+    :y: 1324.7171136654108
+    :angle: 152.27841257069542
     :zorder: 100
     :factor_x: 0.156992481203007
     :factor_y: 0.159598997493734
@@ -2135,3 +2135,11 @@
     :factor_x: 0.071748878923767
     :factor_y: 0.071748878923767
     :alpha: 255
+- Block: 
+    :x: 384.0
+    :y: 352.0
+    :angle: 0
+    :zorder: 100
+    :factor_x: 0.13901345291479816
+    :factor_y: 0.13901345291479816
+    :alpha: 255

data/examples/example21_sidescroller_with_edit.rb

@@ -8,14 +8,15 @@ include Chingu
 #
 # Press 'E' when demo is running to edit the playfield!
 # 
-class Game < Chingu::Window 
+class Game < Chingu::Window
   def initialize
-    super(1000,700)
+    #super(1000,700)
+    super(1024,768, true)
   end
   
   def setup
-    Gosu::enable_undocumented_retrofication
-    switch_game_state(Example21.new)
+    retrofy
+    switch_game_state(Example21)
   end    
 end
 
@@ -25,14 +26,14 @@ end
 class Example21 < GameState
   traits :viewport, :timer
   
-  def setup
+  def initialize(options = {})
+    super
+    
     self.input = { :escape => :exit, :e => :edit }
     self.viewport.game_area = [0, 0, 3500, 2000]    
     
-    @droid = Droid.create(:x => 100, :y => 400)
-    #@droid = Droid.create(:x => 400, :y => 1300)
-    
     load_game_objects
+    @droid = Droid.create(:x => 100, :y => 400)
     
     # Reverse the cog wheels in relation to eachother
     CogWheel.each_collision(CogWheel) do |cog_wheel, cog_wheel_2|
@@ -44,7 +45,7 @@ class Example21 < GameState
   end
   
   def edit
-    push_game_state(GameStates::Edit.new(:grid => [32,32], :classes => [Tube, CogWheel, Block, Saw, Battery]))
+    push_game_state(GameStates::Edit.new(:grid => [32,32], :classes => [Droid, Tube, CogWheel, Block, Saw, Battery]))
   end
   
   def restore_player_position
@@ -58,19 +59,10 @@ class Example21 < GameState
   def update    
     super
     
-    visible_blocks = Block
-    
-    #
-    # Eating a lot of CPU cause our crude collision detection, just kill fireballs after 3 secs instead.
-    #
-    # FireBall.each_collision(visible_blocks) do |fire_ball, block|
-    #   fire_ball.destroy
-    # end
-    
     # Makes all saw pendle up and down between Y-coordinate 1000 - 1500
     # TODO: Not a very flexible sollution, how about setting out circle,rects,lines in editor..
     # .. when then can be used for this kind of stuff?
-    Saw.all.select {|saw| saw.y < 1300 || saw.y > 1550 }.each do |saw|
+    Saw.select {|saw| saw.y < 1300 || saw.y > 1550 }.each do |saw|
       saw.velocity_y = -saw.velocity_y
       saw.y += saw.velocity_y * saw.factor_y 
     end
@@ -124,7 +116,7 @@ class Droid < Chingu::GameObject
   
   def die
     self.collidable = false
-    @color = Color::RED
+    @color = Color::RED.dup
     between(1,600) { self.velocity_y = 0; self.scale += 0.2; self.alpha -= 5; }.then { resurrect }
   end
     
@@ -132,7 +124,7 @@ class Droid < Chingu::GameObject
     self.alpha = 255
     self.factor = 3
     self.collidable = true
-    @color = Color::WHITE
+    @color = Color::WHITE.dup
     game_state.restore_player_position
   end
 

data/examples/example4_gamestates.rb

@@ -157,8 +157,6 @@ class Level < Chingu::GameState
   #
   def setup
     # Destroy all created objects of class Bullet
-    #p Bullet.size
-    #puts Bullet.all
     Bullet.destroy_all
     
     # Place player in a good starting position

data/examples/example7_gfx_helpers.rb

@@ -124,7 +124,7 @@ class Particles < Chingu::GameState
                           :mode => :additive
                         )
 
-    Particle.all.each { |particle| particle.y -= 5; particle.x += 2 - rand(4) }
+    Particle.each { |particle| particle.y -= 5; particle.x += 2 - rand(4) }
     game_objects.destroy_if { |object| object.outside_window? || object.color.alpha == 0 }
     super
   end

data/examples/example8_traits.rb

@@ -63,9 +63,8 @@ class Particles < Chingu::GameState
     Plasma.create(:x => 0, :y => 50 + rand(5), :color => Color.new(0xFF86EFFF), :velocity_x => 14)
     Plasma.create(:x => 0, :y => 100 + rand(5), :color => Color.new(0xFF86EFFF), :velocity_x => 7)
     Plasma.create(:x => 0, :y => 200 + rand(5), :color => Color.new(0xFF86EFFF), :velocity_x => 6)
-    #p pl.mode
         
-    Plasma.all.each do |particle|
+    Plasma.each do |particle|
       #
       # +1 fps
       #

data/examples/example9_collision_detection.rb

@@ -62,7 +62,7 @@ class ParticleState < Chingu::GameState
   def update
     super
     
-    FireCube.all.each do |particle|
+    FireCube.each do |particle|
       if particle.x < 0 || particle.x > $window.width
         particle.velocity_x = -particle.velocity_x
       end