rubysdl 1.3.1 → 2.0

data/doc/wm.rsd

@@ -79,8 +79,8 @@ iconify
 
 DESC
 ������ɥ����������Ķ��ǥ��ץꥱ������󤬼¹Ԥ���Ƥ����硢
-SDL �ϥ��ץꥱ�������򥢥�����/�Ǿ������뤳�Ȥ��ߤޤ���
-�⤷��������С����ץꥱ�������� @[Event2::APPACTIVE] �򼺤ʤä�
+Ruby/SDL �ϥ��ץꥱ�������򥢥�����/�Ǿ������뤳�Ȥ��ߤޤ���
+�⤷��������С����ץꥱ�������� @[Event::APPACTIVE] �򼺤ʤä�
 ���٥�Ȥ�������Ǥ��礦��
 
 EXCEPTION *

data/extconf.rb

@@ -43,10 +43,6 @@ if enable_config("static-libs",false) then
   have_library("SDL")
 end
 
-if enable_config("event2",true) then
-  $CFLAGS+= " -D DEF_EVENT2"
-end
-
 if have_library("smpeg","SMPEG_new") then
   $CFLAGS+= " -D HAVE_SMPEG "
 end
@@ -76,10 +72,7 @@ end
 if enable_config("opengl",true) then
   dir_config('x11','/usr/X11R6')
   
-  $CFLAGS+= " -D DEF_OPENGL "
-  if arg_config("--linkoglmodule",false) then
-    $CFLAGS+= " -D INIT_OGLMODULE_FROM_SDL "
-  end
+  $CFLAGS+= " -D ENABLE_OPENGL "
 
   if /linux/ =~ CONFIG["arch"] then
     have_library("GL","glVertex3d")

data/lib/rubysdl_aliases.rb

@@ -1,5 +1,4 @@
-class <<SDL  
-  alias init init
+class << SDL
   alias inited_system initedSystem
 end
 
@@ -11,29 +10,26 @@ module SDL
     alias flip flip
     alias toggle_fullscreen toggleFullScreen
   end
-end
-
-class << SDL
-  alias get_video_surface getVideoSurface
-  alias blit_surface blitSurface
-  alias set_video_mode setVideoMode
-  alias check_video_mode checkVideoMode
-  alias list_modes listModes
-  alias set_gamma setGamma
-  alias get_gamma_ramp getGammaRamp
-  alias set_gamma_ramp setGammaRamp
-  alias video_info videoInfo
+  class << Screen
+    alias check_mode checkMode
+    alias list_modes listModes
+    alias set_gamma setGamma
+    alias get_gamma_ramp getGammaRamp
+    alias set_gamma_ramp setGammaRamp
+    alias driver_name driverName
+  end
 end
 
 module SDL
-  
   class << Surface
-#   alias new new
     alias load_bmp loadBMP
     alias load_bmp_from_io loadBMPFromIO
+    alias load_bmp_from_string loadBMPFromString
   end
 
   class Surface
+    alias get_pixel getPixel
+    alias put_pixel putPixel
     alias display_format displayFormat
     alias display_format_alpha displayFormatAlpha
     alias set_color_key setColorKey
@@ -42,143 +38,55 @@ module SDL
     alias get_clip_rect getClipRect
     alias set_alpha setAlpha
     alias save_bmp saveBMP
-#   alias h h
-#   alias w w
-#   alias flags flags
     alias set_palette setPalette
     alias set_colors setColors
-    alias get_palette getPalette
     alias must_lock? mustLock?
-#   alias lock lock
-#   alias unlock unlock
+    alias copy_rect copyRect
+
+  end
+
+  class PixelFormat
     alias map_rgb mapRGB
     alias map_rgba mapRGBA
     alias get_rgb getRGB
     alias get_rgba getRGBA
-#   alias bpp bpp
-#   alias colorkey colorkey
-#   alias alpha alpha
-    alias copy_rect copyRect
-    alias bytes_per_pixel BytesPerPixel
+    alias bytes_per_pixel bytesPerPixel
   end
 end
 
-# rubysdl_event.c
-class << SDL::Event
-# alias new new
-  alias app_state appState
-end
 
+# rubysdl_event.c
 module SDL
-  class <<Event
+  class << Event
+    alias app_state appState
     alias enable_unicode enableUNICODE
     alias disable_unicode disableUNICODE
     alias enable_unicode? enableUNICODE?
   end
-  
-  class Event
-# alias poll poll
-# alias wait wait
-# alias type type
-    alias key_press? keyPress?
-    alias key_sym keySym
-    alias key_mod keyMod
-# alias gain? gain?
-    alias app_state appState
-    alias mouse_x mouseX
-    alias mouse_y mouseY
-    alias mouse_xrel mouseXrel
-    alias mouse_yrel mouseYrel
-    alias mouse_button mouseButton
-    alias mouse_press? mousePress?
-# alias info info
-  end
 end
 
-# rubysdl_event2.c
-module SDL
-  if defined?(Event2) then
-    class << Event2
-#     alias poll poll
-#     alias wait wait
-#     alias new new
-#     alias push push
-      alias app_state appState
-      alias enable_unicode enableUNICODE
-      alias disable_unicode disableUNICODE
-      alias enable_unicode? enableUNICODE?
-    end
-  end
-end
-
-#rubysdl_mouse.c
-#alias state state
-#alias warp warp
-#alias set_cursor_imp setCursor_imp
-#alias show show
-#alias hide hide
-
 # rubysdl_sge_video.c
-class << SDL
-  if method_defined?(:autoLock)
-    alias auto_lock autoLock
-    alias auto_lock? autoLock?
-    alias auto_lock= autoLock=
-    alias auto_lock_on autoLockON 
-    alias auto_lock_off autoLockOFF
-    alias rotate_scaled_blit rotateScaledBlit
-    alias rotate_xy_scaled rotateXYScaled
-#   alias transform transform
-  end
-end
-
-
 module SDL
-  class Surface
-    # shared with rubysdl_sge_video.c and rubysdl_pixel.c
-    alias get_pixel getPixel
-    alias put_pixel putPixel
-    if method_defined?(:drawLine) then
-      #  alias [] []
-      #  alias []= []=
+  if defined?(CollisionMap) then
+    class << Surface
+      alias auto_lock? autoLock?
+      alias auto_lock_on autoLockON 
+      alias auto_lock_off autoLockOFF
+      alias transform_draw transformDraw
+      alias transform_blit transformBlit
+    end
+  
+    class Surface
       alias draw_line drawLine
       alias draw_rect drawRect
       alias draw_circle drawCircle
-      alias draw_filled_circle drawFilledCircle
-      alias draw_ellispe drawEllispe # typo
       alias draw_ellipse drawEllipse
-      alias draw_filled_ellispe drawFilledEllispe # typo 
-      alias draw_filled_ellipse drawFilledEllipse
-      alias rotate_scaled_surface rotateScaledSurface
+      
+      #alias rotate_scaled_surface rotateScaledSurface
       alias transform_surface transformSurface
       alias make_collision_map makeCollisionMap
-
-      alias draw_aa_line drawAALine
-      alias draw_aa_circle drawAACircle
-      alias draw_aa_filled_circle drawAAFilledCircle
-      alias draw_aa_ellipse drawAAEllipse
-
-      alias draw_line_alpha drawLineAlpha
-      alias draw_rect_alpha drawRectAlpha
-      alias draw_filled_rect_alpha drawFilledRectAlpha
-      alias draw_circle_alpha drawCircleAlpha
-      alias draw_filled_circle_alpha drawFilledCircleAlpha
-      alias draw_ellipse_alpha drawEllipseAlpha
-      alias draw_filled_ellipse_alpha drawFilledEllipseAlpha
-
-      alias draw_aa_line_alpha drawAALineAlpha
-      alias draw_aa_circle_alpha drawAACircleAlpha
-      alias draw_aa_ellipse_alpha drawAAEllipseAlpha
-
-      alias draw_bezier drawBezier
-      alias draw_aa_bezier drawAABezier
-      alias draw_bezier_alpha drawBezierAlpha
-      alias draw_aa_bezier_alpha drawAABezierAlpha
     end
-  end
-
-  if defined?(CollisionMap) then
-
+    
     class CollisionMap
       alias collision_check collisionCheck
       alias bounding_box_check boundingBoxCheck
@@ -188,15 +96,13 @@ module SDL
       alias bounding_box_check boundingBoxCheck
     end
     
-  end
-
-  if defined?(BMFont) then
     class BMFont
       alias set_color setColor
       alias text_size textSize
     end
   end
 
+  # rubysdl_kanji.c
   if defined?(Kanji) then
     class Kanji
       alias set_coding_system setCodingSystem
@@ -209,27 +115,19 @@ end
 # rubysdl_time.c
 class << SDL
   alias get_ticks getTicks
-  alias delay delay
 end
 
-module SDL
 # rubysdl_cdrom.c
+module SDL
   class << CD
     alias num_drive numDrive
     alias index_name indexName
     alias frames_to_msf framesToMSF
     alias msf_to_frames MSFToFrames
-# alias open open
   end
 
   class CD
-# alias status status
-# alias play play
     alias play_tracks playTracks
-    alias pause pause
-# alias resume resume
-# alias stop stop
-# alias eject eject
     alias num_tracks numTracks
     alias current_track currentTrack
     alias current_frame currentFrame
@@ -238,36 +136,31 @@ module SDL
   end
 end
 
+# rubysdl_mouse.c
+module SDL
+  class << Mouse
+    alias set_cursor setCursor
+  end
+end
+
 # rubysdl_joystick.c
 module SDL
   class << Joystick
-#  alias poll poll
-#  alias poll= poll=
-# alias num num
     alias index_name indexName
-# alias open open
-# alias open? open?
     alias update_all updateAll
   end
 
   class Joystick
-# alias index index
     alias num_axes numAxes
     alias num_balls numBalls
     alias num_hats numHats
     alias num_buttons numButtons
-# alias axis axis
-# alias hat hat
-# alias button button
-# alias ball ball
   end
 end
 
 # rubysdl_event_key.c
 module SDL
   class << Key
-# alias scan scan
-# alias press? press?
     alias mod_state modState
     alias enable_key_repeat enableKeyRepeat
     alias disable_key_repeat disableKeyRepeat
@@ -277,10 +170,7 @@ end
 
 # rubysdl_wm.c
 class << SDL::WM
-# alias caption caption
   alias set_caption setCaption
-# alias icon= icon=
-# alias iconify iconify
   alias grab_input grabInput
 end
 
@@ -288,21 +178,15 @@ end
 module SDL
   if defined?(Mixer) then
     class << Mixer
-#     alias open open
-#     alias spec spec
       alias driver_name driverName
       alias play_channel playChannel
       alias play_channel_timed playChannelTimed
       alias fade_in_channel fadeInChannel
       alias fade_in_channel_timed fadeInChannelTimed
-#     alias play? play?
       alias set_volume setVolume
       alias allocate_channels allocateChannels
-#     alias halt halt
-#     alias pause pause
-#     alias resume resume
-#     alias pause? pause?
       alias fade_out fadeOut
+      alias playing_channels playingChannels
       alias play_music playMusic
       alias fade_in_music fadeInMusic
       alias set_volume_music setVolumeMusic
@@ -320,6 +204,7 @@ module SDL
       class Wave
         class << self
           alias load_from_io loadFromIO
+          alias load_from_string loadFromString
         end
 	alias set_volume setVolume
       end
@@ -338,6 +223,7 @@ module SDL
   class Surface
     if method_defined?(:load)
       alias load_from_io loadFromIO
+      alias load_from_string loadFromString
     end
   end
 end
@@ -345,14 +231,8 @@ end
 # rubysdl_ttf.c
 module SDL
   if defined?(TTF) then
-    #alias init init
-    #alias open open
-
     class TTF
-#     alias style style
-#     alias style= style=
       alias text_size textSize
-#     alias faces faces
       alias fixed_width? fixedWidth?
       alias family_name familyName
       alias style_name styleName
@@ -398,35 +278,17 @@ module SDL
 end
 
 # rubysdl_opengl.c
-class <<  SDL
-  if method_defined?(:getGLAttr)
-    alias get_GL_attr getGLAttr
-    alias set_GL_attr setGLAttr
-    alias GL_swap_buffers GLSwapBuffers
-  end
-end
-
-# sdl.rb
-
 module SDL
-  class Surface
-    if method_defined?(:rotateScaledSurface) then
-      alias rotate_scaled_surface rotateScaledSurface
-      alias rotate_surface rotateSurface
+  if defined?(GL)
+    class << GL
+      alias set_attr setAttr
+      alias get_attr getAttr
+      alias swap_buffers swapBuffers
     end
   end
 end
 
-class << SDL
-  if method_defined?(:rotateScaled) then
-    alias rotate_scaled rotateScaled 
-#   alias rotate
-    alias rotate_blit rotateBlit
-  end
-
-  if method_defined?(:transform) then
-    alias transform_blit transformBlit
-  end
 
+class << SDL
   alias blit_surface2 blitSurface2
 end

data/lib/rubysdl_compatible_ver1.rb

@@ -0,0 +1,243 @@
+
+module SDL
+  # compatible method definition
+  module_function
+  def blitSurface(*args)
+    SDL::Surface.blit(*args)
+  end
+
+  def getVideoSurface
+    SDL::Screen.get
+  end
+
+  def setVideoMode(*args)
+    SDL::Screen.open(*args)
+  end
+  
+  def checkVideoMode(*args)
+    SDL::Screen.checkMode(*args)
+  end
+
+  def listModes(*args)
+    SDL::Screen.listModes(*args)
+  end
+
+  def setGamma(*args)
+    SDL::Screen.setGamma(*args)
+  end
+
+  def getGammaRamp(*args)
+    SDL::Screen.getGammaRamp(*args)
+  end
+
+  def setGammaRamp(*args)
+    SDL::Screen.setGammaRamp(*args)
+  end
+
+  def videoDriverName
+    SDL::Screen.driverName
+  end
+  
+  def videoInfo
+    SDL::Screen.info
+  end
+  
+  def getGLAttr(arg)
+    GL.getAttr(arg)
+  end
+
+  def setGLAttr(*args)
+    GL.setAttr(*args)
+  end
+
+  def GLSwapBuffers
+    GL.swap_buffers
+  end
+  
+  GL_RED_SIZE = GL::RED_SIZE
+  GL_GREEN_SIZE = GL::GREEN_SIZE
+  GL_BLUE_SIZE = GL::BLUE_SIZE
+  GL_ALPHA_SIZE = GL::ALPHA_SIZE
+  GL_BUFFER_SIZE = GL::BUFFER_SIZE
+  GL_DOUBLEBUFFER = GL::DOUBLEBUFFER
+  GL_DEPTH_SIZE = GL::DEPTH_SIZE
+  GL_STENCIL_SIZE = GL::STENCIL_SIZE
+  GL_ACCUM_RED_SIZE = GL::ACCUM_RED_SIZE
+  GL_ACCUM_GREEN_SIZE = GL::ACCUM_GREEN_SIZE
+  GL_ACCUM_BLUE_SIZE = GL::ACCUM_BLUE_SIZE
+  GL_ACCUM_ALPHA_SIZE = GL::ACCUM_ALPHA_SIZE
+  
+  class Surface
+    extend Forwardable
+
+    def_delegators(:format,
+                   :alpha, :colorkey, :mapRGB, :mapRGBA,
+                   :getRGB, :getRGBA, :bpp, :bytesPerPixel,
+                   :Rmask, :Gmask, :Bmask, :Amask,
+                   :Rloss, :Gloss, :Bloss, :Aloss,
+                   :Rshift, :Gshift, :Bshift, :Ashift)
+    
+    def getPalette
+      format.palette
+    end
+  end
+
+  Event2 = Event
+
+  if defined?(CollisionMap)
+    class Surface
+      def drawAALine(x1, y1, x2, y2, col)
+        drawLine(x1, y1, x2, y2, col, true)
+      end
+      def drawAALineAlpha(x1, y1, x2, y2, col, alpha)
+        drawLine(x1, y1, x2, y2, col, true, alpha)
+      end
+      def drawLineAlpha(x1, y1, x2, y2, col, alpha)
+        drawLine(x1, y1, x2, y2, col, false, alpha)
+      end
+
+      def drawAACircle(x, y, r, color)
+        drawCircle(x, y, r, color, false, true)
+      end
+      def drawAAFilledCircle(x, y, r, color)
+        drawCircle(x, y, r, color, true, true)
+      end
+      def drawAACircleAlpha(x, y, r, color, alpha)
+        drawCircle(x, y, r, color, false, true, alpha)
+      end
+      def drawCircleAlpha(x, y, r, color, alpha)
+        drawCircle(x, y, r, color, false, false, alpha)
+      end
+      def drawAACircleAlpha(x, y, r, color, alpha)
+        drawCircle(x, y, r, color, false, true, alpha)
+      end
+      def drawFilledCircleAlpha(x, y, r, color, alpha)
+        drawCircle(x, y, r, color, true, false, alpha)
+      end
+      def drawFilledCircle(x, y, r, color)
+        drawCircle(x, y, r, color, true)
+      end
+      
+
+      def drawRectAlpha(x1, y1, x2, y2, color, alpha)
+        drawRect(x1, y1, x2, y2, color, false, alpha)
+      end
+      def drawFilledRectAlpha(x1, y1, x2, y2, color, alpha)
+        drawRect(x1, y1, x2, y2, color, true, alpha)
+      end
+
+      def drawFilledEllipse(x, y, rx, ry, color)
+        drawEllipse(x, y, rx, ry, color, true)
+      end
+      def drawAAFilledEllipse(x, y, rx, ry, color)
+        drawEllipse(x, y, rx, ry, color, true, true)
+      end
+      def drawFilledEllipseAlpha(x, y, rx, ry, color, alpha)
+        drawEllipse(x, y, rx, ry, color, true, false, alpha)
+      end
+
+      def drawAAEllipse(x, y, rx, ry, color)
+        drawEllipse(x, y, rx, ry, color, false, true)
+      end
+      def drawAAEllipseAlpha(x, y, rx, ry, color, alpha)
+        drawEllipse(x, y, rx, ry, color, false, true, alpha)
+      end
+      def drawEllipseAlpha(x, y, rx, ry, color, alpha)
+        drawEllipse(x, y, rx, ry, color, false, false, alpha)
+      end
+
+      def drawAABezier(x1,y1,x2,y2,x3,y3,x4,y4,level,color)
+        drawBezier(x1,y1,x2,y2,x3,y3,x4,y4,level,color,true)
+      end
+      def drawBezierAlpha(x1,y1,x2,y2,x3,y3,x4,y4,level,color,alpha)
+        drawBezier(x1,y1,x2,y2,x3,y3,x4,y4,level,color,false,alpha)
+      end
+      def drawAABezierAlpha(x1,y1,x2,y2,x3,y3,x4,y4,level,color,alpha)
+        drawBezier(x1,y1,x2,y2,x3,y3,x4,y4,level,color,true,alpha)
+      end
+
+    end
+
+    def autoLock?; Surface.autoLock?; end
+    def autoLock; Surface.autoLock?; end
+    def autoLockON; Surface.autoLockON; end
+    def autoLockOFF; Surface.autoLockOFF; end
+    def autoLock=(val)
+      if val then autoLockON else autoLockOFF end
+    end
+    def transform(src,dst,angle,xscale,yscale,px,py,qx,qy,flags)
+      Surface.transformDraw(src,dst,angle,xscale,yscale,px,py,qx,qy,flags)
+    end
+    def transformBlit(src,dst,angle,xscale,yscale,px,py,qx,qy,flags)
+      Surface.transformBlit(src,dst,angle,xscale,yscale,px,py,qx,qy,flags)
+    end
+  end
+
+  # aliases
+
+  class << self
+    alias get_video_surface getVideoSurface
+    alias blit_surface blitSurface
+    alias set_video_mode setVideoMode
+    alias check_video_mode checkVideoMode
+    alias list_modes listModes
+    alias set_gamma setGamma
+    alias get_gamma_ramp getGammaRamp
+    alias set_gamma_ramp setGammaRamp
+    alias video_info videoInfo
+    alias video_driver_name videoDriverName
+  end
+
+  class Surface
+    alias map_rgb mapRGB
+    alias map_rgba mapRGBA
+    alias get_rgb getRGB
+    alias get_rgba getRGBA
+    alias get_palette getPalette
+  end
+
+  if defined?(CollisionMap)
+    class << self
+      alias auto_lock? autoLock?
+      alias auto_lock_on autoLockON 
+      alias auto_lock_off autoLockOFF
+      alias auto_lock autoLock
+      alias auto_lock= autoLock=
+      alias transform_blit transformBlit
+    end
+
+    class Surface
+      alias draw_filled_circle drawFilledCircle
+      alias draw_aa_line drawAALine
+      alias draw_aa_circle drawAACircle
+      alias draw_aa_filled_circle drawAAFilledCircle
+      alias draw_aa_ellipse drawAAEllipse
+      
+      alias draw_line_alpha drawLineAlpha
+      alias draw_rect_alpha drawRectAlpha
+      alias draw_filled_rect_alpha drawFilledRectAlpha
+      alias draw_circle_alpha drawCircleAlpha
+      alias draw_filled_circle_alpha drawFilledCircleAlpha
+      alias draw_ellipse_alpha drawEllipseAlpha
+      alias draw_filled_ellipse_alpha drawFilledEllipseAlpha
+      alias draw_filled_ellipse drawFilledEllipse
+      
+      alias draw_aa_line_alpha drawAALineAlpha
+      alias draw_aa_circle_alpha drawAACircleAlpha
+      alias draw_aa_ellipse_alpha drawAAEllipseAlpha
+
+      alias draw_bezier drawBezier
+      alias draw_aa_bezier drawAABezier
+      alias draw_bezier_alpha drawBezierAlpha
+      alias draw_aa_bezier_alpha drawAABezierAlpha
+    end
+  end
+
+  if defined?(GL)
+    class << self
+      alias set_GL_attr setGLAttr
+      alias get_GL_attr getGLAttr
+      alias GL_swap_buffers GLSwapBuffers 
+    end
+  end
+end