gosu_android 0.0.4 → 0.0.5

data/README.md

@@ -1,27 +1,36 @@
 Gosu-Android
 ============
-A Gosu implementation for Adroid devices.
+A [Gosu](http://www.libgosu.org/) implementation for Adroid devices.
 
 Installation
 -----------
 
-### Easy way
+Install [ruboto](https://github.com/ruboto/ruboto/) and create a project. 
 
-* Create a file named Gemfile.apk in your ruboto project and add the lines
+### Recomended
+
+With this installation method you will have a clean enviroment (bundler) to make your gosu games.
+
+* Create a file named `Gemfile.apk` in your ruboto project and add the lines:
 
 ```ruby
-  source "http://rubygems.org"
-  gem 'gosu_android'
+source "http://rubygems.org"
+gem 'gosu_android'
 ```
 
-* Create a folder inside `res` folder call `drawable-nodpi` and copy this file https://github.com/neochuky/gosu-android/tree/master/res/drawable-nodpi/character_atlas8.png
-in it.
+* Create a folder inside `res` called `drawable-nodpi` and copy this [file] (https://github.com/neochuky/gosu-android/tree/master/res/drawable-nodpi/character_atlas8.png)
+in it. On linux you can do it easily with: 
+`mkdir res/drawable-nodpi` 
+`wget https://raw.github.com/neochuky/gosu-android/master/res/drawable-nodpi/character_atlas8.png` 
+`mv character_atlas8.png res/drawable-nodpi`
+
+### Alternative
+With this installation method you will have a dirty enviroment (simple file copy) to try the samples.
 
-### Not so easy way 
-`gem install gosu_android`
+* `gem install gosu_android`
 
-As with ruboto, place yourself in the root directory of your app, then execute
-`gosu_android -a` or `gosu_android --add` to automatically copy every gosu_android file to your ruboto project. 
+* As with ruboto, place yourself in the root directory of your app.
+* Then execute `gosu_android -a` or `gosu_android --add` to automatically copy every gosu_android file to your ruboto project. 
 It will also copy all the media files that are use in gosu_android examples.
 
 General Information
@@ -29,7 +38,7 @@ General Information
 * This is still an early effort, so there are a number of features that had not yet been added. 
 * There are some known bugs that I hope to fix soon.
 * In its current status there are some small changes to Gosu Window initialization, check examples.
-* A new object with some basic physics has been added.
+* A new object with some basic physics has been added, check out the [wiki](https://github.com/neochuky/gosu-android/wiki/The-new-gosu-android-physics) to learn more.
 
 Troubleshooting
 -------------------

data/examples/arkanoid_activity.rb

@@ -1,105 +1,232 @@
 require 'gosu'
+require 'chipmunk'
+
+SUBSTEPS = 6
+
+module Resources
+  if defined? Ruboto
+    Resources::BALL = Ruboto::R::drawable::yellow_square
+    Resources::BEEP = Ruboto::R::raw::beep
+    Resources::SONG = Ruboto::R::raw::chriss_onac_tempo_red
+    Resources::BLOCK = Ruboto::R::drawable::bar_hor
+  else
+    Resources::BALL = "media/yellow_square.png"
+    Resources::BEEP = "media/beep.wav"
+    Resources::SONG = "media/chriss_onac_tempo_red.mp3"
+    Resources::BLOCK = "media/bar_hor.png" 
+  end
+end
+
+class Ball
+    attr_reader :shape
+  def initialize window, shape, file_name, x, y, z, size, velocity_x, velocity_y  
+    @shape = shape
+    @shape.body.p = CP::Vec2.new(x, y) # position
+    @shape.body.v = CP::Vec2.new(velocity_x, velocity_y) # velocity   
+    @z = z
+    @image = Gosu::Image.new(window, file_name, false)  
+  end
+      
+  def bounce other_object
+    #Calculate new velocity, after the hit
+    if other_object.type == :vertical
+      @shape.body.v.x = -@shape.body.v.x  
+    else
+      @shape.body.v.y = -@shape.body.v.y  
+    end  
+  end
+  
+  def validate_position
+    #Check that the ball did not go under the screen
+    if @shape.body.p.y > 480
+      @shape.body.p.y = 200
+      @shape.body.v.y = -@shape.body.v.x       
+    end  
+  end
+  
+  def draw
+    @image.draw(@shape.body.p.x, @shape.body.p.y, @z)
+  end
+end
+
+class StillObject
+  attr_reader :type, :shape, :deletable
+  def initialize(window, shape, file_name, x, y, z, type, deletable)
+    @image = Gosu::Image.new(window, file_name)    
+    @z = z
+    @deletable = deletable
+    @type = type
+    @shape = shape
+    @shape.body.p = CP::Vec2.new(x , y ) # position
+    @shape.body.v = CP::Vec2.new(0, 0) # velocity    
+  end
+  
+  def draw
+    @image.draw(@shape.body.p.x, @shape.body.p.y, @z)
+  end  
+end
 
 class GameWindow < Gosu::Window
   def initialize
     super 600, 480, false, 30
     self.caption = "Gosu Arkanoid"
-    self.physics_manager.gravity_y = 0
     @score = 0  
-    @song = Gosu::Song.new(self, Ruboto::R::raw::chriss_onac_tempo_red)
-    @beep = Gosu::Sample.new(self, Ruboto::R::raw::beep)
+    @song = Gosu::Song.new(self, Resources::SONG)
+    @beep = Gosu::Sample.new(self, Resources::BEEP)
     @p1x = 0
-
-    @ball = Gosu::Square.new(self, Ruboto::R::drawable::ball, 100, 200, 0, 50, 20, 100, 100)
-
-    @player_x = 300
-    @player_y = 473    
-    @size = 110
-    # 25 is to compesate square size of the ball
-    @size2 = @size/2 - 25    
-    @player = Gosu::Plane.new(self,Ruboto::R::drawable::bar_hor, [@player_x, @player_y], [@player_x + @size, @player_y],  0)
+    @stillObjects = Array.new
+    # Time increment over which to apply a physics "step" ("delta t")
+    @dt = self.update_interval/(1000.0*SUBSTEPS)
+    @space = CP::Space.new   
+    
+    #Ball body, rguments for body new are mass and inertia
+    ball_body = CP::Body.new(1.0, 150.0)
+    
+    #Shape, we define a square shape
+    ball_shape_array = [CP::Vec2.new(-5.0, -5.0), CP::Vec2.new(-5.0, 5.0), CP::Vec2.new(5.0, 5.0), CP::Vec2.new(5.0, -5.0)]
+    #Arguments are the body, the shape and an offset to be added to each vertex
+    ball_shape = CP::Shape::Poly.new(ball_body, ball_shape_array, CP::Vec2.new(0,0))
+    #Set a name for collisions
+    ball_shape.collision_type = :ball
+    #Add the body and the shape to the space
+    @space.add_body(ball_body)
+    @space.add_shape(ball_shape)    
+    
+    @ball = Ball.new(self, ball_shape, Resources::BALL, 100, 200, 0, 10, 100, 100)
+    
+    #Size of the image we are using for the blocks       
+    @size = 110   
+    new_block_body_shape CP::Vec2.new(1.0, 1.0), CP::Vec2.new(@size, 1.0) 
+    @player = StillObject.new(self, @shape_block, Resources::BLOCK, 300, 473,  0, :horizontal, false)
 
     #Left plane
-    @p1 = Gosu::Plane.new(self, Ruboto::R::drawable::bar, [0, 0], [0, 480], 0)
+    new_block_body_shape CP::Vec2.new(1.0, 1.0), CP::Vec2.new(1.0, 480.0) 
+    @p1 = StillObject.new(self, @shape_block,Resources::BLOCK, 0, 0, 0, :vertical, false)
     #Top plane
-    @p2 = Gosu::Plane.new(self, Ruboto::R::drawable::bar, [600, 0], [0, 0], 0)
+    new_block_body_shape CP::Vec2.new(1.0, 1.0), CP::Vec2.new(600.0, 1.0) 
+    @p2 = StillObject.new(self, @shape_block,Resources::BLOCK, 0, 0, 0, :horizontal, false)
     #Right plane
-    @p3 = Gosu::Plane.new(self,Ruboto::R::drawable::bar, [600, 480], [600, 0], 0)
+    new_block_body_shape CP::Vec2.new(1.0, 1.0), CP::Vec2.new(1.0, 480.0) 
+    @p3 = StillObject.new(self, @shape_block,Resources::BLOCK, 600, 0 , 0, :vertical, false)
     
     @blocks = []
     @blocks_position = []
     block_x = 150
     block_y = 120
-    img = Ruboto::R::drawable::bar_hor
+    img = Resources::BLOCK
     2.times do |i|
       3.times do |j|
-        @blocks.push Gosu::Plane.new(self, img, [block_x + (@size + 30)*i , block_y + 30*j ], [block_x + (@size + 30)*(i + 1), block_y + 30*j ],  0)
-        @blocks_position.push [block_x + (@size + 30)*i, block_y + 30*j]
+        new_block_body_shape CP::Vec2.new(1.0, 1.0), CP::Vec2.new(@size, 1.0) 
+        @blocks.push StillObject.new(self, @shape_block, img, block_x + (@size + 30)*i, block_y + 30*j ,  0, :horizontal, true)
+        @stillObjects.push @blocks.last
       end
     end
     
-    6.times do |i|
-      self.apply_physics @blocks[i]
-    end
-    
-    self.apply_physics @ball
-    self.apply_physics @player
-    self.apply_physics @p1
-    self.apply_physics @p2
-    self.apply_physics @p3
+    @stillObjects.push @p1, @p2, @p3, @player
     @font = Gosu::Font.new(self, Gosu::default_font_name, 20)
     @song.play true
+    
+    @remove_shapes = []
+    @space.add_collision_func(:ball, :block) do |ball_shape, block_shape|
+      #Search block_shape in stills obects, if is not found it means that the
+      #ball already hit it and should be gone, but chipmunk was faster and it
+      #generated another collision before it could be erased. 
+      index = @stillObjects.index{|obj| obj.shape==block_shape}
+      if(index != nil )  
+        @beep.play
+        @ball.bounce @stillObjects[index]        
+        if(@stillObjects[index].deletable )  
+          @score += 10  
+          #Bodies and shapes cannot be deleted here so we mark them for later
+          @remove_shapes << block_shape
+          @blocks.delete @stillObjects[index] 
+          @stillObjects.delete_at index                           
+        end    
+      end    
+    end        
   end
-
+  
+  #Creates a new body and shape for a block
+  def new_block_body_shape pos0, pos1
+    #Arguments for body new are mass and inertia
+    @body_block = CP::Body.new(10.0, 150.0)
+    @shape_block = CP::Shape::Segment.new(@body_block, pos0, pos1, 0)
+    
+    @shape_block.collision_type = :block   
+    @space.add_body(@body_block)
+    @space.add_shape(@shape_block)      
+  end
+  
   def update
-    if @ball.center[1] > 480
-        @ball.position[1] = 200
-        @ball.velocity[1] = -@ball.velocity[0]
-        @beep.play      
-    end
+      
+    SUBSTEPS.times do
+      #Delete the block body and shape from the space
+      @remove_shapes.each do |shape|
+        @space.remove_body(shape.body)
+        @space.remove_shape(shape)
+      end     
+      
+      @remove_shapes.clear  
+      #Check the ball current position    
+      @ball.validate_position      
+      #Move the objects in the world one dt
+      @space.step(@dt)          
+    end  
+
+    if button_down? Gosu::KbA then
+      if @player.shape.body.p.x > 0
+        @player.shape.body.p.x -= 10
+      end  
+    end  
+
+    if button_down? Gosu::KbD then
+      if @player.shape.body.p.x + @size < 600
+        @player.shape.body.p.x += 10
+      end
+    end 
+    
   end
  
-  def object_collided( x, y, other_object ) 
-    if(@blocks.include? other_object )      
-      @score += 1
-      self.stop_physics other_object
-      @blocks_position.delete_at(@blocks.index other_object)
-      @blocks.delete other_object
-    end
-    @beep.play
-  end 
-
   def touch_moved(touch)
-    touch.y = touch.y - @size2
-    @player_x = touch.x
-    @player.bottom_limit[0] = @player_x 
-    @player.top_limit[0] = @player_x + @size
+    #On a touch interface translate directly the player's position
+    @player.shape.body.p.x = touch.x
   end
   
+  def button_down(id) 
+    if id == Gosu::KbEscape then
+      close
+    end
+  end  
+  
   def draw
     @blocks.each_index do |i|
-      @blocks[i].draw(@blocks_position[i][0], @blocks_position[i][1], 0)
+      @blocks[i].draw
     end
     
     @ball.draw
-    @player.draw(@player_x, @player_y, 0)
+    @player.draw
     @font.draw("Score: #{@score}", 10, 10, 3, 1.0, 1.0, 0xffffff00)
   end
  
 end
 
-class ArkanoidActivity
-  def on_create(bundle)
-    super(bundle)
-    Gosu::AndroidInitializer.instance.start(self)
-    rescue Exception => e
-      puts "#{ e } (#{ e.class } #{e.message} #{e.backtrace.inspect} )!"    
+if not defined? Ruboto
+  window = GameWindow.new
+  window.show 
+else
+  class ArkanoidActivity
+    def on_create(bundle)
+      super(bundle)
+      Gosu::AndroidInitializer.instance.start(self)
+      rescue Exception => e
+        puts "#{ e } (#{ e.class } #{e.message} #{e.backtrace.inspect} )!"    
+    end  
+    
+    def on_ready
+      window = GameWindow.new
+      window.show   
+      rescue Exception => e
+        puts "#{ e } (#{ e.class } #{e.message} #{e.backtrace.inspect} )!"    
+    end
   end  
-  
-  def on_ready
-    window = GameWindow.new
-    window.show    
-    rescue Exception => e
-      puts "#{ e } (#{ e.class } #{e.message} #{e.backtrace.inspect} )!"    
-  end
 end

data/examples/load_image_activity.rb

@@ -0,0 +1,29 @@
+require 'gosu'
+
+class GameWindow < Gosu::Window
+  def initialize
+    super 600, 480, false, 30
+    self.caption = "Gosu Load Image"
+    @image = Gosu::Image.new(self, Ruboto::R::drawable::ship)
+  end
+  
+  def draw
+    @image.draw(0, 0, 0)
+  end
+end
+
+class LoadImageActivity
+  def on_create(bundle)
+    super(bundle)
+    Gosu::AndroidInitializer.instance.start(self)
+    rescue Exception => e
+      puts "#{ e } (#{ e.class } #{e.message} #{e.backtrace.inspect} )!"    
+  end  
+  
+  def on_ready
+    window = GameWindow.new
+    window.show  
+    rescue Exception => e
+      puts "#{ e } (#{ e.class } #{e.message} #{e.backtrace.inspect} )!"    
+  end
+end

data/examples/pong_activity.rb

@@ -1,83 +1,151 @@
 require 'gosu'
 
+class Ball
+    attr_accessor :velocity
+    attr_reader :position, :center
+  def initialize window, file_name, x, y, z, size, velocity_x, velocity_y
+    @position = [x,y]
+    @size = size / 2
+    @center = [@position[0] + @size, @position[1] + @size]
+    @z = z
+    @velocity = [velocity_x, velocity_y]
+    @image = Gosu::Image.new(window, file_name, false)
+    @dt = window.update_interval/1000.0
+  end
+  
+  def update
+    @position[0] += @velocity[0]*@dt
+    @position[1] += @velocity[1]*@dt
+    @center[0] = @position[0] + @size
+    @center[1] = @position[1] + @size
+  end
+  
+  def generate_contact other_object
+    if @center[0] - @size < other_object.top_limit[0] and other_object.bottom_limit[0] < @center[0] + @size and
+      @center[1] - @size < other_object.bottom_limit[1] and other_object.top_limit[1] < @center[1] + @size
+      #Calculate new velocity, after the hit
+      if other_object.type == :vertical
+        @velocity[0] -= 2 * @velocity[0]
+      else
+        @velocity[1] -= 2 * @velocity[1]
+      end
+      return true
+    end
+    return false
+  end
+  
+  def draw
+    @image.draw(@position[0], @position[1], @z)
+  end
+end
+
+class StillObject
+  attr_accessor :bottom_limit, :top_limit
+  attr_reader :type
+  def initialize(window, file_name, p0, p1, z)
+    @image = Gosu::Image.new(window, file_name)
+    @z = z
+    @top_limit = Array.new p0
+    @bottom_limit = Array.new p1
+  
+    if(@bottom_limit[0] > @top_limit[0] or @bottom_limit[1] < @top_limit[1])
+      @top_limit, @bottom_limit = @bottom_limit, @top_limit
+    end
+  
+    if @bottom_limit[0] == @top_limit[0]
+      @type = :vertical
+    elsif @bottom_limit[1] == @top_limit[1]
+      @type = :horizontal
+    end
+  
+  end
+
+  def draw(x,y,z = @z)
+    @image.draw(x,y,z)
+  end
+end
+
 class GameWindow < Gosu::Window
   def initialize
     super 600, 480, false, 50
     self.caption = "Gosu Pong Game"
-    self.physics_manager.gravity_y = 0
-    @p1score = 0
-    @p2score = 0  
+    @player1_score = 0
+    @player2_score = 0  
     @song = Gosu::Song.new(self, Ruboto::R::raw::chriss_onac_tempo_red)
     @beep = Gosu::Sample.new(self, Ruboto::R::raw::beep)
-    @p1x = 0
+    @player1_x = 0
     # 25 is to compesate square size of the ball
-    @p1y = 250 + 25
-    @p3x = 593
-    @p3y = 100 + 25
+    @player1_y = 250 + 25
+    @player2_x = 593
+    @player2_y = 100 + 25
     @size = 110
     @size2 = @size/2 - 25
-    @squ = Gosu::Square.new(self, Ruboto::R::drawable::ball, 100, 200, 0, 50, 20, 100, 100)
-    #Left plane
-    @p1 = Gosu::Plane.new(self, Ruboto::R::drawable::bar, [@p1x,@p1y], [@p1x, @p1y + @size] ,0)
+    @ball = Ball.new(self, Ruboto::R::drawable::ball, 100, 200, 0, 50, 100, 100)
+    @stillObjects = Array.new
+    #Left player
+    @player1 = StillObject.new(self, Ruboto::R::drawable::bar, [@player1_x, @player1_y], [@player1_x, @player1_y + @size] ,0)
+    #Right player
+    @player2 = StillObject.new(self, Ruboto::R::drawable::bar, [@player2_x,@player2_y + @size], [@player2_x,@player2_y], 0)    
     #Top plane
-    @p2 = Gosu::Plane.new(self, Ruboto::R::drawable::bar, [600,0], [0,0], 0 )
-    #Right plane
-    @p3 = Gosu::Plane.new(self,Ruboto::R::drawable::bar, [@p3x,@p3y + @size], [@p3x,@p3y], 0)
+    @top_plane = StillObject.new(self, Ruboto::R::drawable::bar, [600,0], [0,0], 0 )    
     #Bottom plane
-    @p4 = Gosu::Plane.new(self,Ruboto::R::drawable::bar, [0,480], [600,480],  0)
-    self.apply_physics @squ
-    self.apply_physics @p1
-    self.apply_physics @p2
-    self.apply_physics @p3
-    self.apply_physics @p4
+    @bottom_plane = StillObject.new(self, Ruboto::R::drawable::bar, [0,480], [600,480],  0)
+
+    @stillObjects.push @player1, @player2, @top_plane, @bottom_plane
+
     @font = Gosu::Font.new(self, Gosu::default_font_name, 20)
     @song.play true
   end
 
   def update
-    if @squ.center[0] < 0
+    
+    @stillObjects.each do |obj|
+      if @ball.generate_contact obj
+        @beep.play 
+      end
+    end
+    
+    @ball.update
+    
+    if @ball.center[0] < 0
       #Player 1 lost
-      @p1score += 1
+      @player1_score += 1
       #Reset the ball
-      @squ.position[0] = 300
-      @squ.velocity[0] = -@squ.velocity[0]
+      @ball.position[0] = 300
+      @ball.velocity[0] = -@ball.velocity[0]
       @beep.play
     else
-      if @squ.center[0] > 600
+      if @ball.center[0] > 600
         #Player2 lost
-        @p2score += 1
+        @player2_score += 1
         #Reset the ball
-        @squ.position[0] = 300
-        @squ.velocity[0] = -@squ.velocity[0]
+        @ball.position[0] = 300
+        @ball.velocity[0] = -@ball.velocity[0]
         @beep.play
       end
     end  
   end
   
-  def object_collided( x, y, other_object ) 
-    @beep.play
-  end 
-
   def touch_moved(touch)
     touch.y = touch.y - @size2
     if touch.x < 300
       #Player1
-      @p1y = touch.y
-      @p1.bottom_limit[1] = @p1y + @size
-      @p1.top_limit[1] = @p1y  
+      @player1_y = touch.y
+      @player1.bottom_limit[1] = @player1_y + @size
+      @player1.top_limit[1] = @player1_y  
     else
       #Player2
-      @p3y = touch.y
-      @p3.bottom_limit[1] = @p3y + @size  
-      @p3.top_limit[1] =  @p3y     
+      @player2_y = touch.y
+      @player2.bottom_limit[1] = @player2_y + @size  
+      @player2.top_limit[1] =  @player2_y     
     end
   end
   
   def draw
-    @squ.draw
-    @p1.draw(@p1x,@p1y,0)
-    @p3.draw(@p3x,@p3y,0)
-    @font.draw("Score: A #{@p1score} B #{@p2score} ", 10, 10, 3, 1.0, 1.0, 0xffffff00)
+    @ball.draw
+    @player1.draw(@player1_x,@player1_y,0)
+    @player2.draw(@player2_x,@player2_y,0)
+    @font.draw("Score: A #{@player1_score} B #{@player2_score} ", 10, 10, 3, 1.0, 1.0, 0xffffff00)
   end
  
 end