gosu_android 0.0.4 → 0.0.5

data/examples/tutorial_activity.rb

@@ -0,0 +1,144 @@
+require 'gosu'
+
+module ZOrder
+  Background, Stars, Player, UI = *0..3
+end
+
+class Player
+  attr_reader :score
+
+  def initialize(window)
+    @image = Gosu::Image.new(window, Ruboto::R::drawable::star_fighter, false)
+    @beep = Gosu::Sample.new(window, Ruboto::R::raw::beep)
+    @x = @y = @vel_x = @vel_y = @angle = 0.0
+    @score = 0
+  end
+
+  def warp(x, y)
+    @x, @y = x, y
+  end
+  
+  def turn_left
+    @angle -= 4.5
+  end
+  
+  def turn_right
+    @angle += 4.5
+  end
+  
+  def accelerate
+    @vel_x += Gosu::offset_x(@angle, 0.5)
+    @vel_y += Gosu::offset_y(@angle, 0.5)
+  end
+  
+  def move
+    @x += @vel_x
+    @y += @vel_y
+    @x %= 640
+    @y %= 480
+    
+    @vel_x *= 0.95
+    @vel_y *= 0.95
+  end
+
+  def draw
+    @image.draw_rot(@x, @y, ZOrder::Player, @angle)
+  end
+  
+  def collect_stars(stars)
+    stars.reject! do |star|
+      if Gosu::distance(@x, @y, star.x, star.y) < 35 then
+        @score += 10
+        @beep.play
+        true
+      else
+        false
+      end
+    end
+  end
+end
+
+class Star
+  attr_reader :x, :y
+  
+  def initialize(animation)
+    @animation = animation
+    @color = Gosu::Color.new(0xff000000)
+    @color.red = rand(256 - 40) + 40
+    @color.green = rand(256 - 40) + 40
+    @color.blue = rand(256 - 40) + 40
+    @x = rand * 640
+    @y = rand * 480
+  end
+
+  def draw  
+    img = @animation[Gosu::milliseconds / 100 % @animation.size]
+    img.draw(@x - img.width / 2.0, @y - img.height / 2.0,
+        ZOrder::Stars, 1, 1, @color, :add)
+  end
+end
+
+class GameWindow < Gosu::Window
+  def initialize
+    super(640, 480, false)
+    self.caption = "Gosu Tutorial Game"
+    
+    @background_image = Gosu::Image.new(self, Ruboto::R::drawable::space, true)
+    
+    @player = Player.new(self)
+    @player.warp(320, 240)
+
+    @star_anim = Gosu::Image::load_tiles(self, Ruboto::R::drawable::star, 25, 25, false)
+    @stars = Array.new
+    
+    @font = Gosu::Font.new(self, Gosu::default_font_name, 20)
+  end
+
+  def update
+    if button_down? Gosu::KbA then
+      @player.turn_left
+    end
+    if button_down? Gosu::KbD then
+      @player.turn_right
+    end
+    if button_down? Gosu::KbW then
+      @player.accelerate
+    end
+    @player.move
+    @player.collect_stars(@stars)
+    
+    if rand(100) < 4 and @stars.size < 25 then
+      @stars.push(Star.new(@star_anim))
+    end
+  end
+
+  def draw
+    @background_image.draw(0, 0, ZOrder::Background)
+    @player.draw
+    @stars.each { |star| star.draw }
+    @font.draw("Score: #{@player.score}", 10, 10, ZOrder::UI, 1.0, 1.0, 0xffffff00)
+  end
+
+  def button_down(id)
+    if id == Gosu::KbEscape then
+      close
+    end
+  end
+end
+
+class TutorialActivity
+  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  
+    window.show_soft_keyboard  
+    rescue Exception => e
+      puts "#{ e } (#{ e.class } #{e.message} #{e.backtrace.inspect} )!"    
+  end
+end

data/examples/tutorial_common_activity.rb

@@ -0,0 +1,166 @@
+require 'gosu'
+
+module Resources
+  if defined? Ruboto
+    Resources::STAR_FIGHTER = Ruboto::R::drawable::star_fighter
+    Resources::BEEP = Ruboto::R::raw::beep
+    Resources::SPACE = Ruboto::R::drawable::space
+    Resources::STAR = Ruboto::R::drawable::star
+  else
+    Resources::STAR_FIGHTER = "media/Starfighter.bmp"
+    Resources::BEEP = "media/Beep.wav"
+    Resources::SPACE = "media/Space.png"
+    Resources::STAR = "media/Star.png"    
+  end
+end
+
+module ZOrder
+  Background, Stars, Player, UI = *0..3
+end
+
+class Player
+  attr_reader :score
+
+  def initialize(window)
+    @image = Gosu::Image.new(window, Resources::STAR_FIGHTER, false)
+    @beep = Gosu::Sample.new(window, Resources::BEEP)
+    @x = @y = @vel_x = @vel_y = @angle = 0.0
+    @score = 0
+  end
+
+  def warp(x, y)
+    @x, @y = x, y
+  end
+  
+  def turn_left
+    @angle -= 4.5
+  end
+  
+  def turn_right
+    @angle += 4.5
+  end
+  
+  def accelerate
+    @vel_x += Gosu::offset_x(@angle, 0.5)
+    @vel_y += Gosu::offset_y(@angle, 0.5)
+  end
+  
+  def move
+    @x += @vel_x
+    @y += @vel_y
+    @x %= 640
+    @y %= 480
+    
+    @vel_x *= 0.95
+    @vel_y *= 0.95
+  end
+
+  def draw
+    @image.draw_rot(@x, @y, ZOrder::Player, @angle)
+  end
+  
+  def collect_stars(stars)
+    stars.reject! do |star|
+      if Gosu::distance(@x, @y, star.x, star.y) < 35 then
+        @score += 10
+        @beep.play
+        true
+      else
+        false
+      end
+    end
+  end
+end
+
+class Star
+  attr_reader :x, :y
+  
+  def initialize(animation)
+    @animation = animation
+    @color = Gosu::Color.new(0xff000000)
+    @color.red = rand(256 - 40) + 40
+    @color.green = rand(256 - 40) + 40
+    @color.blue = rand(256 - 40) + 40
+    @x = rand * 640
+    @y = rand * 480
+  end
+
+  def draw  
+    img = @animation[Gosu::milliseconds / 100 % @animation.size]
+    img.draw(@x - img.width / 2.0, @y - img.height / 2.0,
+        ZOrder::Stars, 1, 1, @color, :add)
+  end
+end
+
+class GameWindow < Gosu::Window
+  def initialize
+    super(640, 480, false)
+    self.caption = "Gosu Tutorial Game"
+    
+    @background_image = Gosu::Image.new(self, Resources::SPACE, true)
+    
+    @player = Player.new(self)
+    @player.warp(320, 240)
+
+    @star_anim = Gosu::Image::load_tiles(self, Resources::STAR, 25, 25, false)
+    @stars = Array.new
+    
+    @font = Gosu::Font.new(self, Gosu::default_font_name, 20)
+  end
+
+  def update
+    if button_down? Gosu::KbA then
+      @player.turn_left
+    end
+    if button_down? Gosu::KbD then
+      @player.turn_right
+    end
+    if button_down? Gosu::KbW then
+      @player.accelerate
+    end
+    @player.move
+    @player.collect_stars(@stars)
+    
+    if rand(100) < 4 and @stars.size < 25 then
+      @stars.push(Star.new(@star_anim))
+    end
+  end
+  
+  def touch_moved(touch)
+    @player.warp(touch.x, touch.y)
+  end  
+
+  def draw
+    @background_image.draw(0, 0, ZOrder::Background)
+    @player.draw
+    @stars.each { |star| star.draw }
+    @font.draw("Score: #{@player.score}", 10, 10, ZOrder::UI, 1.0, 1.0, 0xffffff00)
+  end
+
+  def button_down(id)
+    if id == Gosu::KbEscape then
+      close
+    end
+  end
+end
+
+if not defined? Ruboto
+  window = GameWindow.new
+  window.show 
+else
+  class TutorialCommonActivity
+    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  
+end

data/examples/{test_game_activity.rb → tutorial_touch_activity.rb}

@@ -8,8 +8,8 @@ class Player
   attr_reader :score
 
   def initialize(window)
-    @image = Gosu::Image.new(window, "/mnt/sdcard/jruby/media/Starfighter.bmp", false)
-    @beep = Gosu::Sample.new(window, "/mnt/sdcard/jruby/media/Beep.wav")
+    @image = Gosu::Image.new(window, Ruboto::R::drawable::star_fighter, false)
+    @beep = Gosu::Sample.new(window, Ruboto::R::raw::beep)
     @x = @y = @vel_x = @vel_y = @angle = 0.0
     @score = 0
   end
@@ -51,7 +51,7 @@ class Star
   def draw  
     img = @animation[Gosu::milliseconds / 100 % @animation.size]
     img.draw(@x - img.width / 2.0, @y - img.height / 2.0,
-        ZOrder::Stars, 1, 1, @color, Gosu::AM_ADD)
+        ZOrder::Stars, 1, 1, @color, :add)
   end
 end
 
@@ -60,15 +60,15 @@ class GameWindow < Gosu::Window
     super(640, 480, false)
     self.caption = "Gosu Tutorial Game"
     
-    #@background_image = Gosu::Image.new(self, "media/Space.png", true)
+    @background_image = Gosu::Image.new(self, Ruboto::R::drawable::space, true)
     
     @player = Player.new(self)
     @player.warp(320, 240)
 
-    @star_anim = Gosu::Image::load_tiles(self, "/mnt/sdcard/jruby/media/Star.png", 25, 25, false)
+    @star_anim = Gosu::Image::load_tiles(self, Ruboto::R::drawable::star, 25, 25, false)
     @stars = Array.new
     
-    #@font = Gosu::Font.new(self, Gosu::default_font_name, 20)
+    @font = Gosu::Font.new(self, Gosu::default_font_name, 20)
   end
 
   def update
@@ -84,10 +84,10 @@ class GameWindow < Gosu::Window
   end
 
   def draw
-    #@background_image.draw(0, 0, ZOrder::Background)
+    @background_image.draw(0, 0, ZOrder::Background)
     @player.draw
     @stars.each { |star| star.draw }
-    #@font.draw("Score: #{@player.score}", 10, 10, ZOrder::UI, 1.0, 1.0, 0xffffff00)
+    @font.draw("Score: #{@player.score}", 10, 10, ZOrder::UI, 1.0, 1.0, 0xffffff00)
   end
 
   def button_down(id)
@@ -97,7 +97,7 @@ class GameWindow < Gosu::Window
   end
 end
 
-class TestGameActivity
+class TutorialTouchActivity
   def on_create(bundle)
     super(bundle)
     Gosu::AndroidInitializer.instance.start(self)
@@ -111,4 +111,4 @@ class TestGameActivity
     rescue Exception => e
       puts "#{ e } (#{ e.class } #{e.message} #{e.backtrace.inspect} )!"    
   end
-end
+end

data/examples/use_keyboard_activity.rb

@@ -0,0 +1,34 @@
+require 'gosu'
+
+class GameWindow < Gosu::Window
+  def initialize
+    super 600, 480, false, 30
+    self.caption = "Gosu Use Keyboard"
+    @font = Gosu::Font.new(self, Gosu::default_font_name, 20)
+    self.show_soft_keyboard
+  end
+
+  def button_down(id)
+    @key = id
+  end
+  
+  def draw
+    @font.draw("Press a key to see its code: #{@key}", 10, 10, 3, 1.0, 1.0, 0xffffff00)
+  end
+end
+
+class UseKeyboardActivity
+  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/lib/gosu_android/audio/audio.rb

@@ -8,15 +8,45 @@ module Gosu
     end
   end
 
-  class AudioFocusListener
+  #TODO No listener gets ever called, also when a song ends
+  #logcat returns error:
+  # E/MP3Extractor(   95): Unable to resync. Signalling end of stream.
+  class AudioFocusListener < JavaImports::Service 
+    include JavaImports::AudioManager::OnAudioFocusChangeListener
       def onAudioFocusChange focusChange
         puts "In focus change #{focusChange}"
+        return false
+      end
+      
+      def onBind intent
+        return nil
       end
 
       def toString
         self.class.to_s
       end
   end
+  
+  class AudioCompletionListener
+    include JavaImports::MediaPlayer::OnCompletionListener
+      def onCompletion mp
+        return true
+      end
+  end   
+  
+  class AudioErrorListener
+    include JavaImports::MediaPlayer::OnErrorListener
+      def onError(mp, what, extra)
+        return true
+      end
+  end   
+  
+  class AudioInfoListener
+    include JavaImports::MediaPlayer::OnInfoListener
+      def onInfo(mp, what, extra)
+        return true
+      end
+  end  
 
   #TODO ManageAudioFocus, when app loses, stop song
   #TODO Raise a warning is the file could not be loaded
@@ -26,8 +56,6 @@ module Gosu
     #system and loads the sample from a file.
     def initialize(window, filename)
       @window = window
-      #Set finalize
-      ObjectSpace.define_finalizer(self, self.class.method(:finalize).to_proc)
       if not defined? @@pool
         @@pool = JavaImports::SoundPool.new(MAX_SAMPLES, JavaImports::AudioManager::STREAM_MUSIC, 0)
       end
@@ -37,6 +65,8 @@ module Gosu
       else
         @id = @@pool.load(filename, 1)
       end
+      #Set finalize
+      ObjectSpace.define_finalizer(self, self.class.finalize(@id))      
     end
 
     #Plays the sample without panning.
@@ -62,14 +92,14 @@ module Gosu
       end
     end
 
-    def Sample.finalize(id)
-      @@pool.unload(@id)
+    def self.finalize(id)
+      proc { @@pool.unload(id) }
     end
 
   end
 
   #TODO Error on playing several songs, bear in mind mediaplayer states
-  #FIXME Set listener for when the data finished loading asynchronously
+  #TODO Set listener for when the data finished loading asynchronously
   # add some checks play is reached before that
   class Song
     attr_reader :current_song
@@ -81,6 +111,9 @@ module Gosu
         context = @window.activity.getApplicationContext
         @@audio_manager = context.getSystemService(Context::AUDIO_SERVICE)
         focus = @@audio_manager.requestAudioFocus(@@audio_focus_listener, JavaImports::AudioManager::STREAM_MUSIC, JavaImports::AudioManager::AUDIOFOCUS_GAIN)
+        @@media_player.setOnCompletionListener AudioCompletionListener.new
+        @@media_player.setOnErrorListener AudioErrorListener.new
+        @@media_player.setOnInfoListener AudioInfoListener.new
       else
         @@media_player.reset
         focus = @@audio_manager.requestAudioFocus(@@audio_focus_listener, JavaImports::AudioManager::STREAM_MUSIC, JavaImports::AudioManager::AUDIOFOCUS_GAIN)
@@ -153,6 +186,12 @@ module Gosu
       end
       @@current_song = 0
     end
+    
+    def Song.release_resources
+      if defined? @@media_player
+        @@audio_manager.abandonAudioFocus @@audio_focus_listener
+      end
+    end
 
   end