rubysdl 1.3.1 → 2.0

data/rubysdl_wm.c

@@ -19,53 +19,53 @@
   */
 #include "rubysdl.h"
 
-static VALUE sdl_wm_getCaption(VALUE mod)
+static VALUE WM_s_caption(VALUE mod)
 {
-  char *title,*icon;
-  SDL_WM_GetCaption( &title,&icon );
-  return rb_ary_new3( 2,rb_str_new2(title),rb_str_new2(icon) );
+  char *title, *icon;
+  
+  rb_secure(4);
+  SDL_WM_GetCaption(&title, &icon);
+  return rb_ary_new3(2, rb_str_new2(title), rb_str_new2(icon));
 }
-static VALUE sdl_wm_setCaption(VALUE mod,VALUE title,VALUE icon)
+static VALUE WM_s_setCaption(VALUE mod, VALUE title, VALUE icon)
 {
-  SDL_WM_SetCaption( GETCSTR(title),GETCSTR(icon) );
+  rb_secure(4);
+  SafeStringValue(title);
+  SafeStringValue(icon);
+  
+  SDL_WM_SetCaption(RSTRING_PTR(title), RSTRING_PTR(icon));
   return Qnil;
 }
-static VALUE sdl_wm_setIcon(VALUE mod,VALUE icon)
+static VALUE WM_s_set_icon(VALUE mod, VALUE icon)
 {
-  SDL_Surface *surface;
-  if( ! rb_obj_is_kind_of(icon,cSurface) )
-    rb_raise(rb_eArgError,"type mismatch (expected Surface)");
-  Data_Get_Struct(icon,SDL_Surface,surface);
-  SDL_WM_SetIcon(surface,NULL);
+  rb_secure(4);
+  SDL_WM_SetIcon(Get_SDL_Surface(icon), NULL);
   return Qnil;
 }
-static VALUE sdl_wm_iconifyWindow(VALUE mod)
+static VALUE WM_s_iconify(VALUE mod)
 {
+  rb_secure(4);
   if( ! SDL_WM_IconifyWindow() )
     rb_raise( eSDLError,"iconify failed: %s",SDL_GetError() );
   return Qnil;
 }
 
-static void defineConstForWM()
-{
-  rb_define_const(mWM,"GRAB_QUERY",INT2NUM(SDL_GRAB_QUERY));
-  rb_define_const(mWM,"GRAB_OFF",INT2NUM(SDL_GRAB_OFF));
-  rb_define_const(mWM,"GRAB_ON",INT2NUM(SDL_GRAB_ON));
-}
-
-static VALUE sdl_wm_grabInput(VALUE mod, VALUE flag)
+static VALUE WM_s_grabInput(VALUE mod, VALUE flag)
 {
-   return INT2FIX(SDL_WM_GrabInput(flag));
+  rb_secure(4);
+  return INT2FIX(SDL_WM_GrabInput(flag));
 }
 
-void init_wm()
+void rubysdl_init_WM(VALUE mSDL)
 {
-  mWM=rb_define_module_under(mSDL,"WM");
-  rb_define_module_function(mWM,"caption",sdl_wm_getCaption,0);
-  rb_define_module_function(mWM,"setCaption",sdl_wm_setCaption,2);
-  rb_define_module_function(mWM,"icon=",sdl_wm_setIcon,1);
-  rb_define_module_function(mWM,"iconify",sdl_wm_iconifyWindow,0);
-  rb_define_module_function(mWM,"grabInput",sdl_wm_grabInput,1);
+  VALUE mWM=rb_define_module_under(mSDL, "WM");
+  rb_define_module_function(mWM, "caption", WM_s_caption, 0);
+  rb_define_module_function(mWM, "setCaption", WM_s_setCaption, 2);
+  rb_define_module_function(mWM, "icon=", WM_s_set_icon, 1);
+  rb_define_module_function(mWM, "iconify", WM_s_iconify, 0);
+  rb_define_module_function(mWM, "grabInput", WM_s_grabInput, 1);
 
-  defineConstForWM();
+  rb_define_const(mWM, "GRAB_QUERY", INT2NUM(SDL_GRAB_QUERY));
+  rb_define_const(mWM, "GRAB_OFF", INT2NUM(SDL_GRAB_OFF));
+  rb_define_const(mWM, "GRAB_ON", INT2NUM(SDL_GRAB_ON));
 }

data/sample/aadraw.rb

@@ -1,21 +1,21 @@
 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
 
-Red=screen.format.mapRGB(255,0,0)
-screen.drawAALine(20,20,300,200,Red)
-screen.drawAACircle(100,100,50,[87,87,87])
-screen.drawAAFilledCircle(300,300,30,Red)
-screen.drawAAEllipse(320,240,100,200,[200,255,0])
+Red=screen.format.map_rgb(255,0,0)
+screen.draw_line(20,20,300,200,Red, true)
+screen.draw_circle(100,100,50,[87,87,87], false, true)
+screen.draw_circle(300,300,30,Red, true, true)
+screen.draw_ellipse(320,240,100,200,[200,255,0], false, 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

data/sample/alpha.rb

@@ -1,26 +1,25 @@
 require 'sdl'
 
 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.load_bmp("icon.bmp")
+image.set_color_key( SDL::SRCCOLORKEY ,0)
+image = image.display_format
 
-image = SDL::Surface.loadBMP("icon.bmp")
-image.setColorKey( SDL::SRCCOLORKEY ,0)
-image = image.displayFormat
 
-event=SDL::Event.new
 i=0;
-while true 
-  if  event.poll != 0 then
-    if event.type==SDL::Event::QUIT then
-      break
-    end
-    if event.type==SDL::Event::KEYDOWN then
+black = screen.format.map_rgb(0,0,0)
+while true
+  while event = SDL::Event.poll
+    case event
+    when SDL::Event::Quit, SDL::Event::KeyDown
       exit
     end
   end
-  screen.fillRect(0,0,640,480,0)
+  screen.fillRect(0,0,640,480,black)
 
-  image.setAlpha(SDL::SRCALPHA,i%256)
+  image.set_alpha(SDL::SRCALPHA,i%256)
   screen.put(image,310,195)
     i+=1
   screen.flip

data/sample/alphadraw.rb

@@ -1,22 +1,22 @@
 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
 
-Red=screen.format.mapRGB(255,0,0)
-screen.drawAAFilledCircle(320,240,220,[140,180,0])
-screen.drawAALineAlpha(20,20,300,200,Red,rand(64)+128)
-screen.drawAACircleAlpha(100,100,50,[87,87,87],rand(64)+128)
-screen.drawFilledCircleAlpha(300,170,50,[87,80,0],rand(64)+128)
-screen.drawEllipseAlpha(320,240,100,200,[200,255,0],rand(64)+128)
+Red=screen.format.map_rgb(255,0,0)
+screen.draw_circle(320,240,220,[140,180,0], true, true)
+screen.draw_line(20,20,300,200,Red,true, rand(64)+128)
+screen.draw_circle(100,100,50,[87,87,87],false,true,rand(64)+128)
+screen.draw_circle(300,170,50,[87,80,0],true, false, rand(64)+128)
+screen.draw_ellipse(320,240,100,200,[200,255,0],false, false, rand(64)+128)
 
 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

data/sample/bfont.rb

@@ -1,20 +1,20 @@
 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::BMFont.open("font.bmp",SDL::BMFont::TRANSPARENT)
 
 y = 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
   font.textout(screen,"BitMapFont Testing..",40,y)

data/sample/cdrom.rb

@@ -2,14 +2,21 @@ require 'sdl'
 
 SDL.init( SDL::INIT_CDROM )
 
-print SDL::CD.numDrive,"\n"
-print SDL::CD.indexName(0),"\n"
+num_drive = SDL::CD.num_drive
+if num_drive == 0
+  print "No cdrom drive is detected\n"
+  exit
+else
+  print "#{num_drive} cdrom drives are detected\n"
+end
+
+print SDL::CD.index_name(0),"\n"
 cd=SDL::CD.open(0)
 cd.status
-print cd.numTracks," ",cd.status, "\n"
+print cd.num_tracks," ",cd.status, "\n"
 
 begin
-  cd.playTracks 1,0,1,0
+  cd.play_tracks 1,0,1,0
   sleep 100
 ensure
   cd.stop

data/sample/collision.rb

@@ -1,12 +1,12 @@
 require 'sdl'
 
 SDL.init( SDL::INIT_VIDEO )
-screen = SDL::setVideoMode(640,480,16,SDL::SWSURFACE)
-SDL::WM::setCaption('collision.rb','collision.rb icon')
-$image = SDL::Surface.loadBMP("icon.bmp")
-$image.setColorKey( SDL::SRCCOLORKEY ,0)
-$image = $image.displayFormat
-$cMap = $image.makeCollisionMap
+screen = SDL::Screen.open(640,480,16,SDL::SWSURFACE)
+SDL::WM::set_caption('collision.rb','collision.rb icon')
+$image = SDL::Surface.load_bmp("icon.bmp")
+$image.set_color_key( SDL::SRCCOLORKEY ,0)
+$image = $image.display_format
+$cMap = $image.make_collision_map
 
 class Sprite
 
@@ -21,8 +21,8 @@ class Sprite
   end
   
   def move
-    @x, @dx = moveCoord(@x, @dx, xMax)
-    @y, @dy = moveCoord(@y, @dy, yMax)
+    @x, @dx = move_coord(@x, @dx, xMax)
+    @y, @dy = move_coord(@y, @dy, yMax)
   end
 
   def bounce
@@ -32,16 +32,16 @@ class Sprite
   end
 
   def draw
-    SDL.blitSurface($image,0,0,$image.w,$image.h,@screen,@x,@y)
+    SDL::Surface.blit($image,0,0,$image.w,$image.h,@screen,@x,@y)
   end
   
-  def collidingWith(sprite)
-    $cMap.collisionCheck(@x, @y, $cMap, sprite.x, sprite.y) != nil
+  def collide_with?(sprite)
+    $cMap.collision_check(@x, @y, $cMap, sprite.x, sprite.y) != nil
   end
 
   private
 
-  def moveCoord(coord, delta, max)
+  def move_coord(coord, delta, max)
     coord += delta
     if coord >= max then
       delta *= -1
@@ -64,11 +64,11 @@ class Sprite
   
 end
 
-def detectCollisions(sprites)
+def detect_collisions(sprites)
   collisions = []
   for i in (0 ... sprites.size - 1) do
     for j in (i + 1 ... sprites.size) do
-      if sprites[i].collidingWith(sprites[j])
+      if sprites[i].collide_with?(sprites[j])
         collisions << sprites[i]
         collisions << sprites[j]
       end
@@ -79,19 +79,19 @@ end
 
 sprites = (1..8).collect {Sprite.new(screen)}
 
-
+background = screen.format.map_rgb(64, 64, 64)
 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,screen.mapRGB(64, 64, 64))
+  screen.fill_rect(0,0,640,480,background)
   sprites.each {|i| i.move}
-  detectCollisions(sprites).each {|i| i.bounce}
+  detect_collisions(sprites).each {|i| i.bounce}
   sprites.each {|i| i.draw}
-  screen.updateRect(0,0,0,0)
+  screen.update_rect(0,0,0,0)
 end
 

data/sample/cursor.rb

@@ -1,13 +1,13 @@
 require 'sdl'
 
 SDL.init( SDL::INIT_VIDEO )
-screen = SDL::setVideoMode(640,480,16,SDL::SWSURFACE)
-screen.fillRect 0,0,640,480,[32,240,100]
+screen = SDL::Screen.open(640,480,16,SDL::SWSURFACE)
+screen.fill_rect 0,0,640,480,[32,240,100]
 screen.flip
-SDL::WM::setCaption $0,$0
+SDL::WM::set_caption $0,$0
 
-image=SDL::Surface.loadBMP 'cursor.bmp'
-SDL::Mouse.setCursor image,image[0,0],image[1,1],image[7,0],543
+image=SDL::Surface.load_bmp 'cursor.bmp'
+SDL::Mouse.set_cursor image,image[0,0],image[1,1],image[7,0],543
 
 
 while true

data/sample/ellipses.rb

@@ -3,33 +3,37 @@
 
 require 'sdl'
 
-def show(function)
-  event = SDL::Event.new
-  screen = SDL::setVideoMode(640, 480, 16, SDL::SWSURFACE|SDL::ANYFORMAT)
+def show(fill)
+  screen = SDL::Screen.open(640, 480, 16, SDL::SWSURFACE)
+  format = screen.format
   loop do
-    color = screen.mapRGB(rand(256),rand(256),rand(256))
+    color = format.map_rgb(rand(256),rand(256),rand(256))
     x = rand(screen.w)
     y = rand(screen.h)
     xr = rand(80)
     yr = rand(80)
-    eval("screen.#{function}(x, y, xr, yr, color)")
-    if event.poll != 0 then
-      case event.type
-      when SDL::Event::QUIT
+    screen.draw_ellipse(x, y, xr, yr, color, fill)
+    while event = SDL::Event.poll
+      case event
+      when SDL::Event::Quit
         exit
-      when SDL::Event::MOUSEBUTTONDOWN
-        break
-      when SDL::Event::KEYDOWN
-        exit if event.keySym == SDL::Key::ESCAPE
-        break
+      when SDL::Event::KeyDown
+        if event.sym == SDL::Key::ESCAPE
+          exit
+        else
+          return
+        end
+      when SDL::Event::MouseButtonDown
+        return
       end
     end
-    SDL::Key.scan
     screen.updateRect(0, 0, 0, 0)
+    sleep 0.05
   end
+  screen.destroy
 end
 
 srand
 SDL.init SDL::INIT_VIDEO
-show("drawEllipse")
-show("drawFilledEllipse")
+show(false)
+show(true)

data/sample/event2.rb

@@ -1,32 +1,34 @@
 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
 
 loop do
-  if event=SDL::Event2.poll then
+  while event=SDL::Event.poll 
     case event
-    when SDL::Event2::Active
+    when SDL::Event::Active
       print "Active ", (event.gain)?"gain":"lost","\n"
-    when SDL::Event2::KeyDown
+    when SDL::Event::KeyDown
       print "KeyDown sym:#{event.sym} mod:#{event.mod}","\n"
       if event.sym==SDL::Key::A then
-	e=SDL::Event2::KeyDown.new
+	e=SDL::Event::KeyDown.new
 	e.sym=3333
 	e.mod=3333
 	e.press=true
         e.unicode=200
-	SDL::Event2.push(e)
+	SDL::Event.push(e)
       end
-    when SDL::Event2::KeyUp
+    when SDL::Event::KeyUp
       print "KeyUp sym:#{event.sym} mod:#{event.mod}","\n"
       
-    when SDL::Event2::Quit
+    when SDL::Event::Quit
       exit
       
     end
   end
+
+  sleep 0.05
 end