rubysdl 1.3.1 → 2.0

data/sample/font.rb

@@ -2,19 +2,19 @@ require 'sdl'
 
 SDL.init( SDL::INIT_VIDEO )
 
-screen = SDL::setVideoMode(640,480,16,SDL::SWSURFACE)
-SDL::WM::setCaption($0,$0)
+screen = SDL::Screen.open(640,480,16,SDL::SWSURFACE)
+SDL::WM::set_caption($0,$0)
 
 SDL::TTF.init
 
 font = SDL::TTF.open('sample.ttf',24)
 font.style = SDL::TTF::STYLE_NORMAL
 
-font.drawSolidUTF8(screen,'test SDL_ttf',300,150,255,255,255)
+font.draw_solid_utf8(screen,'test SDL_ttf',300,150,255,255,255)
 
 screen.flip
 
-while true
+loop do
   while event = SDL::Event2.poll
     case event
     when SDL::Event2::KeyDown, SDL::Event2::Quit

data/sample/fpstimer.rb

@@ -56,7 +56,7 @@ class FPSTimerSample
   end
 
   def get_ticks
-    SDL.getTicks / 1000.0
+    SDL.get_ticks / 1000.0
   end
 
   def calc_real_fps
@@ -117,7 +117,7 @@ class FPSTimerLight
 
   private
   def get_ticks
-    SDL.getTicks * N
+    SDL.get_ticks * N
   end
   
   def wait(nxt)
@@ -163,7 +163,7 @@ if __FILE__ == $0
   log = []
   
   timer.reset
-  old = SDL.getTicks
+  old = SDL.get_ticks
   300.times do
     sleep 0.005 if rand(5) == 0
     timer.wait_frame do

data/sample/joy2.rb

@@ -10,40 +10,40 @@ White = [255,255,255]
 
 def print_joystick_info
   for i in 0..SDL::Joystick.num-1
-    print i,":",SDL::Joystick.indexName(0),"\n"
+    print i,":",SDL::Joystick.index_name(0),"\n"
   end
 end
 
 def display_button_state ( screen, joy )
-  for i in 0..joy.numButtons-1
+  for i in 0..joy.num_buttons-1
     if joy.button(i) then
-      screen.fillRect( i*30+30, 50, 10, 10, [0,0,128] )
+      screen.fill_rect( i*30+30, 50, 10, 10, [0,0,128] )
     else
-      screen.fillRect( i*30+30, 50, 10, 10, White )
+      screen.fill_rect( i*30+30, 50, 10, 10, White )
     end
   end
 end
 
 def display_hat_state ( screen, joy )
   # display the state of only first hat  
-  if joy.numHats > 0 then
+  if joy.num_hats > 0 then
     x = y = 0
     x = 1 if  ( joy.hat(0) & SDL::Joystick::HAT_RIGHT ) != 0
     x = -1 if ( joy.hat(0) & SDL::Joystick::HAT_LEFT ) != 0
     y = 1 if ( joy.hat(0) & SDL::Joystick::HAT_DOWN ) != 0
     y = -1 if ( joy.hat(0) & SDL::Joystick::HAT_UP ) != 0
-    screen.fillRect( 450 + x*40, 200 + y*40, 10, 10, White )
+    screen.fill_rect( 450 + x*40, 200 + y*40, 10, 10, White )
   end
 end
 
 def display_axis_state ( screen, joy )
-  for i in 0..joy.numAxes-1
-    screen.fillRect( i*30+130, joy.axis(i)*100/32768+200, 20, 20, White )
+  for i in 0..joy.num_axes-1
+    screen.fill_rect( i*30+130, joy.axis(i)*100/32768+200, 20, 20, White )
   end
 end
 
 SDL.init( SDL::INIT_VIDEO|SDL::INIT_JOYSTICK )
-screen = SDL::setVideoMode(640, 480, 16, SDL::SWSURFACE)
+screen = SDL::Screen.open(640, 480, 16, SDL::SWSURFACE)
 
 if SDL::Joystick.num == 0 then
   print "No joystick available\n"
@@ -66,16 +66,16 @@ joy=SDL::Joystick.open(joynum)
 
 while true
 
-  while event = SDL::Event2.poll
+  while event = SDL::Event.poll
     case event
-    when SDL::Event2::KeyDown, SDL::Event2::Quit
+    when SDL::Event::KeyDown, SDL::Event::Quit
       exit
     end
   end
-  SDL::Joystick.updateAll
-  screen.fillRect(0,0,640,480,0)
+  SDL::Joystick.update_all
+  screen.fill_rect(0,0,640,480,[0,0,0])
   display_button_state screen, joy
   display_hat_state screen, joy
   display_axis_state screen, joy
-  screen.updateRect(0, 0, 0, 0)
+  screen.update_rect(0, 0, 0, 0)
 end

data/sample/kanji.rb

@@ -7,30 +7,30 @@
 require 'sdl'
 
 SDL.init( SDL::INIT_VIDEO )
-screen = SDL::setVideoMode(640,480,16,SDL::SWSURFACE)
+screen = SDL::Screen.open(640,480,16,SDL::SWSURFACE)
 
 font = SDL::Kanji.open("8x16.bdf",16)
 font.add("jiskan16.bdf")
-font.setCodingSystem(SDL::Kanji::EUC)
+font.set_coding_system(SDL::Kanji::EUC)
 
 y = 0
 x = 0
 
 while true
-  while event = SDL::Event2.poll
+  while event = SDL::Event.poll
     case event
-    when SDL::Event2::KeyDown, SDL::Event2::Quit
+    when SDL::Event::KeyDown, SDL::Event::Quit
       exit
     end
   end
-  screen.fillRect(0,0,640,480,0)
+  screen.fill_rect(0,0,640,480,0)
 
   y = (y + 1) % 480
   x = (x + 1) % 640
   
   font.put(screen,"SDL Kanji�Υƥ�����",40,y,128,128,0)
-  font.putTate(screen,"�Ľ񤭤�Ǥ��ޤ���",x,60,128,128,0)
+  font.put_tate(screen,"�Ľ񤭤�Ǥ��ޤ���",x,60,128,128,0)
                
-  screen.updateRect(0,0,0,0)
+  screen.update_rect(0,0,0,0)
   sleep 0.005
 end

data/sample/load_from_io.rb

@@ -0,0 +1,44 @@
+#
+# Test for rwops
+#
+# This sample needs
+#   track01.ogg: Ogg Vorbis file
+
+require 'sdl'
+require 'stringio'
+require 'zlib'
+
+SDL.init( SDL::INIT_VIDEO|SDL::INIT_AUDIO )
+SDL::Mixer.open(22050)
+
+screen = SDL::setVideoMode(640,480,16,SDL::SWSURFACE)
+SDL::WM::setCaption('from_str.rb','from_str.rb')
+
+str = File.read("icon.bmp")
+img = SDL::Surface.loadBMPFromIO(StringIO.new(str))
+img2 = File.open("icon.bmp"){|f| SDL::Surface.loadBMPFromIO(f) }
+img3 = Zlib::GzipReader.open("icon.bmp.gz"){|f| SDL::Surface.loadBMPFromIO(f) }
+img4 = File.open("icon.png"){|f| SDL::Surface.loadFromIO(f) }
+
+mus = SDL::Mixer::Music.loadFromString(File.read("track01.ogg"))
+wav = File.open('sample.wav'){|f| SDL::Mixer::Wave.loadFromIO(f) }
+
+SDL.blitSurface(img,0,0,32,32,screen,100,100)
+SDL.blitSurface(img2,0,0,32,32,screen,200,100)
+SDL.blitSurface(img3,0,0,32,32,screen,300,100)
+SDL.blitSurface(img4,0,0,32,32,screen,400,100)
+screen.updateRect(0, 0, 0, 0)
+
+SDL::Mixer.playMusic(mus, -1)
+SDL::Mixer.playChannel(0, wav, 0)
+
+while true
+  while event = SDL::Event2.poll
+    case event
+    when SDL::Event2::KeyDown, SDL::Event2::Quit
+      exit
+    end
+  end
+
+  sleep 0.1
+end

data/sample/movesp.rb

@@ -1,12 +1,12 @@
 require 'sdl'
 
-SDL.init( SDL::INIT_VIDEO )
+SDL.init(SDL::INIT_VIDEO)
 
-screen = SDL::setVideoMode(640,480,16,SDL::SWSURFACE)
+screen = SDL::Screen.open(640,480,16,SDL::SWSURFACE)
 
-image = SDL::Surface.loadBMP("icon.bmp")
-image.setColorKey( SDL::SRCCOLORKEY || SDL::RLEACCEL ,0)
-$image = image.displayFormat
+image = SDL::Surface.load_bmp("icon.bmp")
+image.set_color_key( SDL::SRCCOLORKEY || SDL::RLEACCEL ,0)
+$image = image.display_format
 
 
 class Sprite
@@ -40,7 +40,7 @@ class Sprite
   end
   
   def draw(screen)
-    SDL.blitSurface($image,0,0,32,32,screen,@x,@y)
+    SDL::Surface.blit($image,0,0,32,32,screen,@x,@y)
   end
   
 end
@@ -64,30 +64,31 @@ class MovableSp
   end
   
   def draw(screen)
-    SDL.blitSurface($image,0,0,32,32,screen,300+@lr*50,200+@ud*50)
+    SDL::Surface.blit($image,0,0,32,32,screen,300+@lr*50,200+@ud*50)
   end
 end
 
 sprites << MovableSp.new
+black = screen.format.map_rgb(0, 0, 0)
 
 while true
-  while event = SDL::Event2.poll
+  while event = SDL::Event.poll
     case event
-    when SDL::Event2::Quit
+    when SDL::Event::Quit
       exit
-    when SDL::Event2::KeyDown
+    when SDL::Event::KeyDown
       exit if event.sym == SDL::Key::ESCAPE
     end
   end
   
-  screen.fillRect(0,0,640,480,0)
+  screen.fill_rect(0,0,640,480,black)
   SDL::Key.scan
   
   sprites.each {|i|
     i.move
     i.draw(screen)
   }
-  screen.updateRect(0,0,0,0)
+  screen.update_rect(0,0,0,0)
 end
 
 

data/sample/playmod.rb

@@ -4,11 +4,10 @@ require 'sdl'
 SDL::init(SDL::INIT_AUDIO)
 
 SDL::Mixer.open(22050)
-SDL::Mixer::playMusic?
 music = SDL::Mixer::Music.load("sample.it")
 
-SDL::Mixer.playMusic(music,0)
+SDL::Mixer.play_music(music,0)
 
-while SDL::Mixer::playMusic?
+while SDL::Mixer::play_music?
   sleep 1
 end

data/sample/plaympeg.rb

@@ -4,7 +4,7 @@ require 'sdl'
 SDL.init( SDL::INIT_VIDEO|SDL::INIT_AUDIO )
 SDL::Mixer.open
 
-screen = SDL.setVideoMode( 320, 240, 16, SDL::SWSURFACE )
+screen = SDL::Screen.open( 320, 240, 16, SDL::SWSURFACE )
 
 mpeg = SDL::MPEG.load( 'sample.mpg' )
 
@@ -12,20 +12,20 @@ info = mpeg.info
 
 p(info)
 
-mpeg.enableAudio true
-mpeg.enableVideo true
+mpeg.enable_audio true
+mpeg.enable_video true
 
-mpeg.setDisplay(screen)
-mpeg.setDisplayRegion( 0, 0, screen.w, screen.h )
+mpeg.set_display(screen)
+mpeg.set_display_region( 0, 0, screen.w, screen.h )
 mpeg.play
 
 loop do
 
-  case event = SDL::Event2.poll
-  when SDL::Event2::Quit
+  case event = SDL::Event.poll
+  when SDL::Event::Quit
     mpeg.stop
     exit
-  when SDL::Event2::KeyDown
+  when SDL::Event::KeyDown
     case event.sym
     when SDL::Key::S
       mpeg.stop

data/sample/playwave.rb

@@ -1,15 +1,14 @@
 # This sample needs a wave file `sample.wav', please prepare.
 require 'sdl'
 
-SDL::init(SDL::INIT_AUDIO|SDL::INIT_VIDEO)
-SDL.setVideoMode(640,480,16,SDL::SWSURFACE)
+SDL::init(SDL::INIT_AUDIO)
 
-SDL::Mixer.open
-wave=SDL::Mixer::Wave.load("sample.wav")
+SDL::Mixer.open(22050, SDL::Mixer::DEFAULT_FORMAT, 2, 512)
+wave = SDL::Mixer::Wave.load("sample.wav")
 
-SDL::Mixer.playChannel(0,wave,0)
+SDL::Mixer.play_channel(0, wave, 0)
 
-while SDL::Mixer::play?(0)
+while SDL::Mixer.play?(0)
   sleep 1
 end
 

data/sample/sdlskk.rb

@@ -17,7 +17,7 @@ use_minibuffer = (ARGV[0]=='-m')
   
 SDL.init( SDL::INIT_VIDEO )
 SDL::TTF.init
-SDL::Event2.enableUNICODE
+SDL::Event.enableUNICODE
 
 font = SDL::TTF.open( 'nihongo.ttf', 14 )
 
@@ -29,17 +29,17 @@ bind.set_default_key
 
 context = SDL::SKK::Context.new( dict, table, bind, use_minibuffer )
 
-screen = SDL::setVideoMode( 640, 480, 16, SDL::SWSURFACE )
-SDL::WM.setCaption( $0, $0 )
+screen = SDL::Screen.open( 640, 480, 16, SDL::SWSURFACE )
+SDL::WM.set_caption( $0, $0 )
 
-BLACK = screen.mapRGB( 0, 0, 0 )
+BLACK = screen.format.map_rgb( 0, 0, 0 )
 loop do
 
-  while event = SDL::Event2.poll do
+  while event = SDL::Event.poll do
     case event
-    when SDL::Event2::Quit
+    when SDL::Event::Quit
       exit
-    when SDL::Event2::KeyDown
+    when SDL::Event::KeyDown
       if event.sym == SDL::Key::ESCAPE then
 	exit
       end
@@ -53,17 +53,17 @@ loop do
 
   text_surface = context.render_str( font, 255, 0, 255 )
 
-  screen.fillRect( 0, 0, 640, 480, BLACK )
-  SDL.blitSurface( text_surface, 0, 0, 0, 0, screen, 0, 0 )
+  screen.fill_rect( 0, 0, 640, 480, BLACK )
+  SDL::Surface.blit( text_surface, 0, 0, 0, 0, screen, 0, 0 )
 
   if use_minibuffer then
     minibuffer_surface = context.render_minibuffer_str( font, 255, 0, 255 )
     if minibuffer_surface then
-      SDL.blitSurface( minibuffer_surface, 0, 0, 0, 0, screen, 0, 40 )
+      SDL::Surface.blit( minibuffer_surface, 0, 0, 0, 0, screen, 0, 40 )
     end
   end
   
-  screen.updateRect( 0, 0, 0, 0 )
+  screen.update_rect( 0, 0, 0, 0 )
 
   sleep 0.05
   

data/sample/sgetest.rb

@@ -1,28 +1,30 @@
 require 'sdl'
 
 SDL.init( SDL::INIT_VIDEO )
-screen = SDL::setVideoMode(640,480,16,SDL::SWSURFACE)
-SDL::WM::setCaption $0, $0
+screen = SDL::Screen.open(640,480,16,SDL::SWSURFACE)
+SDL::WM.set_caption $0, $0
 
+format = screen.format
 # draw red pixel at (200,200)
-screen[200,200]= screen.format.mapRGB(255,0,0)
+screen[200,200]= format.map_rgb(255,0,0)
 # draw green pixel at (250,200)
-screen[250,200]= screen.format.mapRGB(0,255,0)
+screen[250,200]= format.map_rgb(0,255,0)
 # draw blue pixel at (200,200)
-screen[300,200]= screen.format.mapRGB(0,0,255)
+screen[300,200]= format.map_rgb(0,0,255)
 
-Red=screen.format.mapRGB(255,0,0)
-screen.drawLine(20,20,300,200,Red)
-screen.drawRect(49,59,80,80,Red)
-screen.drawCircle(100,100,50,[87,87,87])
-screen.drawFilledCircle(300,300,30,Red)
+Red=format.map_rgb(255,0,0)
+screen.draw_line(20,20,300,200,Red)
+screen.draw_rect(49,59,80,80,Red)
+screen.draw_circle(100,100,50,[87,87,87])
+screen.draw_circle(300,300,30,Red, true)
+screen.draw_circle(230, 300, 30, Red, true, true)
 
 screen.flip
 
 while true
-  while event = SDL::Event2.poll
+  while event = SDL::Event.poll
     case event
-    when SDL::Event2::KeyDown, SDL::Event2::Quit
+    when SDL::Event::KeyDown, SDL::Event::Quit
       exit
     end
   end