chingu 0.7.6.6 → 0.7.6.7

data/examples/example21_sidescroller_with_edit.rb

@@ -26,11 +26,10 @@ class Example21 < GameState
   
   def setup
     self.input = { :escape => :exit, :e => :edit }
-    self.viewport.game_area = [0, 0, 3000, 1000]    
+    self.viewport.game_area = [0, 0, 3500, 2000]    
     
-    @droid = Droid.create(:x => 100, :y => 300)
-    #@droid = Droid.create(:x => 2500, :y => 1200)
-    #@droid = Droid.create(:x => 500, :y => 1500)
+    @droid = Droid.create(:x => 100, :y => 400)
+    #@droid = Droid.create(:x => 400, :y => 1300)
     
     load_game_objects
     
@@ -58,11 +57,14 @@ class Example21 < GameState
   def update    
     super
     
-    visible_blocks = Block.inside_viewport
+    visible_blocks = Block
     
-    FireBall.each_collision(visible_blocks) do |fire_ball, block|
-      fire_ball.destroy
-    end
+    #
+    # 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..
@@ -78,9 +80,7 @@ class Example21 < GameState
       
     @droid.each_collision(Battery) do |player, battery|
       battery.die
-      #after(3000) { push_game_state(GameFinished) }
     end
-  
         
     self.viewport.center_around(@droid)
         
@@ -153,15 +153,19 @@ class Droid < Chingu::GameObject
   end
   
   def move(x,y)
-    @x += x
-    self.each_collision(Block.inside_viewport) do |me, stone_wall|
-      me.x = previous_x
+    self.x += x
+    self.each_collision(Block) do |me, stone_wall|
+      self.x = previous_x
+      break
     end
+    
+    self.y += y
   end
   
-  def update    
+  def update 
     @image = @animation.next
-    self.each_collision(Block.inside_viewport) do |me, stone_wall|
+    
+    self.each_collision(Block) do |me, stone_wall|
       if self.velocity_y < 0  # Hitting the ceiling
         me.y = stone_wall.bb.bottom + me.image.height * self.factor_y
         self.velocity_y = 0
@@ -217,7 +221,7 @@ end
 # A FIREBALL
 #
 class FireBall < GameObject
-  traits :velocity, :collision_detection
+  traits :velocity, :collision_detection, :timer
   trait :bounding_circle, :scale => 0.7
   
   def setup
@@ -228,6 +232,7 @@ class FireBall < GameObject
     self.velocity_y = 1
     self.zorder = 200
     self.rotation_center = :center
+    after(3000) { self.destroy }
   end
   
   def update
@@ -288,6 +293,7 @@ class Block < GameObject
 
   def setup
     @image = Image["black_block.png"]
+    @color = Color.new(0xff808080)
   end
 end
 

data/examples/example22_text.rb

@@ -29,7 +29,11 @@ class Woff < GameState
     
     #
     # TODO: More text examples!
-    # 
+    #
+    
+    t = Text.create("Scaletest", :x => 10, :y => 100)
+    t.factor_x = 2
+    t.factor_y = 1
   end
   
   def draw

data/examples/example23_chipmunk.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require File.join(File.dirname($0), "..", "lib", "chingu")
+include Gosu
+include Chingu
+
+
+class Game < Chingu::Window
+  def initialize
+    super(640,480,false)              # leave it blank and it will be 800,600,non fullscreen
+    self.input = { :escape => :exit } # exits example on Escape    
+    
+    Player.create(:x => 0, :y => 0, :rotation_center => :top_left)
+  end  
+end
+
+class Player < BasicGameObject
+  trait :sprite, :image => "spaceship.png"
+  
+  def setup
+  end  
+end
+
+
+Game.new.show

data/examples/example3_parallax.rb

@@ -16,6 +16,7 @@ class Game < Chingu::Window
 end
 
 class Scroller < Chingu::GameState
+  
   def initialize(options)
     super
     @text_color = Color.new(0xFF000000)

data/examples/example4_gamestates.rb

@@ -114,12 +114,17 @@ class Level < Chingu::GameState
     super
     @title = Chingu::Text.create(:text=>"Level #{options[:level].to_s}. P: pause R:restart", :x=>20, :y=>10, :size=>30)
     @player = Player.create
-    @player.input = { :holding_left => :move_left, 
-                      :holding_right => :move_right, 
-                      :holding_up => :move_up, 
-                      :holding_down => :move_down, 
-                      :space => :fire}
     
+    #
+    # The below code can mostly be replaced with the use of method "holding?" in Level#update
+    # Using holding? in update could be good if you need fine grained controll over when input is dispatched.
+    # 
+    @player.input = {  :holding_left => :move_left, 
+                       :holding_right => :move_right, 
+                       :holding_up => :move_up, 
+                       :holding_down => :move_down, 
+                       :space => :fire }
+
     #
     # The input-handler understands gamestates. P is pressed --> push_gamegate(Pause)
     # You can also give it Procs/Lambdas which it will execute when key is pressed.
@@ -129,6 +134,16 @@ class Level < Chingu::GameState
   
   def update
     super
+    
+    #
+    # Another way of checking input
+    #
+    # @player.move_left   if holding?(:left, :a)
+    # @player.move_right  if holding?(:right, :d)
+    # @player.move_up     if holding?(:up, :w)
+    # @player.move_down   if holding?(:down, :s)
+    # @player.fire        if holding?(:space)
+
     Bullet.destroy_if {|bullet| bullet.outside_window? }
     $window.caption = "FPS: #{$window.fps} - GameObjects: #{game_objects.size} - Bullets: #{Bullet.size}"
   end

data/examples/game1.rb

@@ -1,27 +1,21 @@
 #!/usr/bin/env ruby
 #
 #
-# A "full" simple game in Chingu, using GameState, GameObject, Paralaxx, has_traits etc
+# A simple game in Chingu, using GameState, GameObject, Paralaxx, has_traits etc
 # 
-# TODO: clean up code as Chingu moves along :). Comments. Get it working ;).
-#
 #
 require 'rubygems'
 require File.join(File.dirname($0), "..", "lib", "chingu")
 require 'texplay'     # adds Image#get_pixel
-#require 'opengl'     # adds raw gl stuff so Image#retrofy works (in some setups this seems to be 'gl')
 
 include Gosu
 include Chingu
 
-class Game < Chingu::Window
-  #attr_reader :factor
-  
+class Game < Chingu::Window  
   def initialize
     super(1000,400,false)
     self.input = { :escape => :exit }
-    self.factor = 1
-		Gosu::enable_undocumented_retrofication
+		retrofy
     switch_game_state(Level)
   end
 end
@@ -37,12 +31,8 @@ class Level < Chingu::GameState
     super
     
     @parallax = Parallax.create(:rotation_center => :top_left)
-		#@parallax = Parallax.create(:rotation_center => :center)
-    @parallax << { :image => "city2.png", :damping => 2}#, :factor => $window.factor }
-    @parallax << { :image => "city1.png", :damping => 1}#, :factor => $window.factor }
-		#@parallax.x = $window.width / 2
-		#@parallax.y = $window.height / 2
-		
+    @parallax << { :image => "city2.png", :damping => 2}
+    @parallax << { :image => "city1.png", :damping => 1}	
     @player = Player.create(:x => 30, :y => 10)
     
     @bg1 = Color.new(0xFFCE28FF)
@@ -71,13 +61,8 @@ class Level < Chingu::GameState
   # The foremost layer in our parallax scroller is the collidable terrain
   #
   def solid_pixel_at?(x, y)
-    begin
-      #pixel = @parallax.layers.last.get_pixel(x/$window.factor, y/$window.factor)
-      #return false  if  pixel.nil?
-      #return 
-      
-      @parallax.layers.last.get_pixel(x * $window.factor, y * $window.factor)[3] != 0
-			#@parallax.layers.last.get_pixel(x, y)[3] != 0
+    begin     
+      @parallax.layers.last.get_pixel(x, y)[3] != 0
     rescue
       puts "Error in get_pixel(#{x}, #{y})"
     end
@@ -96,7 +81,7 @@ class Level < Chingu::GameState
     Bullet.all.select { |o| solid_pixel_at?(o.x, o.y)}.each { |o| o.die }
         
     # Collide player with terrain
-    #push_game_state(GameOver) if solid_pixel_at?(@player.x, @player.y)
+    push_game_state(GameOver) if solid_pixel_at?(@player.x, @player.y)
     
     # Collide player with enemies and enemy bullets
     @player.each_bounding_circle_collision(Enemy) do |player, enemy|
@@ -117,9 +102,7 @@ class Level < Chingu::GameState
       Enemy.create(:x => $window.width, :y => rand(300))
       @total_ticks = 0
     end
-    
-    #push_game_state(Done.new(:score => @player.score)) if @game_steps == 1
-    
+        
     $window.caption = "City Battle! Player x/y: #{@player.x}/#{@player.y} - Score: #{@player.score} - FPS: #{$window.fps} - game objects: #{game_objects.size}"
   end
   
@@ -134,14 +117,13 @@ end
 #
 class Player < GameObject
   has_traits :velocity, :collision_detection, :timer
-  has_trait :bounding_circle, :scale => 0.50, :debug => true 
+  has_trait :bounding_circle, :scale => 0.50, :debug => false
   attr_accessor :score
   
   def setup
     @image = Image["plane.png"]
-    #self.factor = $window.factor
     
-    self.input = { 
+    self.input = {
       :holding_left => :left, 
       :holding_right => :right, 
       :holding_up => :up, 
@@ -179,8 +161,8 @@ class Player < GameObject
     self.velocity_y *= 0.6
     self.velocity_x *= 0.6
     
-    @x = @last_x  if @x < 0 || @x > $window.width#/$window.factor
-    @y = @last_y  if @y < 0 || @y > $window.height#/$window.factor
+    @x = @last_x  if @x < 0 || @x > $window.width
+    @y = @last_y  if @y < 0 || @y > $window.height
     @last_x, @last_y = @x, @y
   end
   
@@ -195,7 +177,6 @@ class Bullet < GameObject
   
   def setup
     @image = Image["bullet.png"]
-    #self.factor = $window.factor
     self.velocity_x = 10
     @status = :default
     @radius = 3
@@ -208,10 +189,6 @@ class Bullet < GameObject
     during(50) { @factor_x += 1; @factor_y += 1; @x -= 1; }.then { self.destroy }
   end
   
-  #def update
-    #return if @status == :dying
-    #@x += self.velocity_x
-  #end
 end
 
 #
@@ -238,7 +215,6 @@ class Explosion < GameObject
     @image = @@image.dup  if @image.nil?
     
     self.rotation_center = :center
-    #self.factor = options[:factor] ? options[:factor] : $window.factor
     during(100) { self.alpha -= 30}.then { destroy }
   end
   
@@ -262,7 +238,6 @@ class Shrapnel < GameObject
     self.velocity_y = 4 - rand(10)
     self.acceleration_y = 0.2 # gravity = downards acceleration
     self.rotation_center = :center
-    #self.factor = $window.factor
     @status = :default
   end
   
@@ -297,10 +272,8 @@ class Enemy < GameObject
     @health = options[:health] || 100
     
     @anim = Animation.new(:file => "media/saucer.png", :size => [32,13], :delay => 100)
-    #  @anim.retrofy
     @image = @anim.first
       
-    #self.factor = $window.factor
     @radius = 5
     @black = Color.new(0xFF000000)
     @status == :default

data/lib/chingu.rb

@@ -33,8 +33,9 @@ require_all "#{CHINGU_ROOT}/chingu/traits"
 require_all "#{CHINGU_ROOT}/chingu"
 
 module Chingu
-  VERSION = "0.7.6.6"
+  VERSION = "0.7.6.7"
   
   DEBUG_COLOR = Gosu::Color.new(0xFFFF0000)
   DEBUG_ZORDER = 9999
+  INFINITY = 1.0 / 0
 end

data/lib/chingu/assets.rb

@@ -33,7 +33,7 @@ module Gosu
     include Chingu::NamedResource
     
     def self.autoload(name)
-      ret = (path = find_file(name)) ? Gosu::Image.new($window, path, true) : nil
+      ret = (path = find_file(name)) ? Gosu::Image.new($window, path, false) : nil
       raise "Can't load image \"#{name}\"" if ret.nil?
       return ret
     end
@@ -55,4 +55,4 @@ module Gosu
     end
   end
   Sound = Sample  # Gosu uses Sample, but Sound makes sense too.
-end
+end

data/lib/chingu/basic_game_object.rb

@@ -133,34 +133,13 @@ module Chingu
       @paused = false
     end
     
-    #
-    # Disable automatic calling of draw and draw_trait each game loop
-    #
-    def hide!
-      @visible = false
-    end
-    
-    #
-    # Enable automatic calling of draw and draw_trait each game loop
-    #
-    def show!
-      @visible = true
-    end
-
     #
     # Returns true if paused
     #
     def paused?
       @paused == true
     end
-
-    #
-    # Returns true if visible (not hidden)
-    #
-    def visible?
-      @visible == true
-    end
-
+    
     #
     # Empty placeholders to be overridden
     #
@@ -171,7 +150,6 @@ module Chingu
     def draw_trait; end    
     def update; end
     def draw; end
-    
         
     #
     # Returns an array with all objects of current class.

data/lib/chingu/game_object.rb

@@ -189,6 +189,27 @@ module Chingu
       @angle = value
     end
 
+    #
+    # Disable automatic calling of draw and draw_trait each game loop
+    #
+    def hide!
+      @visible = false
+    end
+    
+    #
+    # Enable automatic calling of draw and draw_trait each game loop
+    #
+    def show!
+      @visible = true
+    end
+    
+    #
+    # Returns true if visible (not hidden)
+    #
+    def visible?
+      @visible == true
+    end    
+
 
     # Returns true if object is inside the game window, false if outside
     def inside_window?(x = @x, y = @y)

data/lib/chingu/game_object_map.rb

@@ -0,0 +1,96 @@
+#--
+#
+# 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
+  #
+  # ** This class is under heavy development, API will most likely change! **
+  #
+  # GameObjectMap can convert any set of game objects into a 2D-array for fast lookup
+  # You can set any gridsize with :grid, defaults to [32,32]. The smaller the grid the more memory it will eat.
+  #
+  # Basic usage:
+  #   @map = GameObjectMap.new(:game_objects => TerrainObject.all, :grid => [32, 32])
+  #   @map.at(100, 100)         # returns one TerrainObject at x/y: 100/100
+  #   @map.game_object(player)  # returns one TerrainObject which collides with player.bounding_box
+  #
+  # ** This class is under heavy development, API will most likely change! **
+  #
+  class GameObjectMap
+    attr_reader :map
+    
+    def initialize(options = {})
+      @game_objects = options[:game_objects]
+      @grid = options[:grid] || [32,32]
+      @debug = options[:debug]
+      create_map
+    end
+    
+    #
+    # Creates a "tilemap" of game objects using @grid and @game_objects
+    # Useful for faster collision detection on a grid-based freeform map created with the Edit game state.
+    #
+    def create_map
+      @map = []
+      @game_objects.each do |game_object|
+        puts "#{game_object.class} @ #{game_object.x} / #{game_object.y}" if @debug
+        
+        start_x = (game_object.bb.left / @grid[0]).to_i
+        stop_x =  (game_object.bb.right / @grid[0]).to_i
+          
+        (start_x .. stop_x).each do |x|
+          start_y = (game_object.bb.top / @grid[1]).to_i
+          stop_y =  (game_object.bb.bottom / @grid[1]).to_i
+          
+          @map[x] ||= []
+          (start_y .. stop_y).each do |y|
+            @map[x][y] = game_object
+          end
+        end
+      end
+    end
+    
+    #
+    # Gets a game object from the array-map on a certain X/Y
+    #
+    def at(x, y)
+      lookup_x = (x / @grid[0]).to_i
+      lookup_y = (y / @grid[1]).to_i
+      @map[lookup_x][lookup_y]  rescue nil
+    end
+
+    def from_game_object(game_object)
+      start_x = (game_object.bb.left / @grid[0]).to_i
+      stop_x =  (game_object.bb.right / @grid[0]).to_i
+      
+      (start_x .. stop_x).each do |x|
+        start_y = (game_object.bb.top / @grid[1]).to_i
+        stop_y =  (game_object.bb.bottom / @grid[1]).to_i
+          
+        (start_y .. stop_y).each do |y|
+          return @map[x][y]   if @map[x] && @map[x][y]
+        end
+        
+      end
+      return nil
+    end
+
+  end
+end