sdl2_ffi 0.0.2 → 0.0.3

data/lib/sdl2/render.rb

@@ -50,7 +50,7 @@ module SDL2
   api :SDL_RenderSetClipRect, [Renderer.by_ref, Rect.by_ref], :int
   api :SDL_RenderGetClipRect, [Renderer.by_ref, Rect.by_ref], :int
   api :SDL_RenderSetScale, [Renderer.by_ref, :float, :float], :int
-  api :SDL_RenderGetScale, [Renderer.by_ref, FloatStruct.by_ref, FloatStruct.by_ref], :int
+  api :SDL_RenderGetScale, [Renderer.by_ref, FloatPointer.by_ref, FloatPointer.by_ref], :int
   api :SDL_SetRenderDrawColor, [Renderer.by_ref, :uint8, :uint8, :uint8, :uint8], :int
   api :SDL_GetRenderDrawColor, [Renderer.by_ref, UInt8Struct.by_ref,UInt8Struct.by_ref,UInt8Struct.by_ref,UInt8Struct.by_ref], :int
   api :SDL_SetRenderDrawBlendMode, [Renderer.by_ref, :blend_mode], :int
@@ -70,7 +70,7 @@ module SDL2
   api :SDL_RenderPresent, [Renderer.by_ref], :void
   api :SDL_DestroyTexture, [Texture.by_ref], :void
   api :SDL_DestroyRenderer, [Renderer.by_ref], :void
-  api :SDL_GL_BindTexture, [Texture.by_ref, FloatStruct.by_ref, FloatStruct.by_ref], :int
+  api :SDL_GL_BindTexture, [Texture.by_ref, FloatPointer.by_ref, FloatPointer.by_ref], :int
   api :SDL_GL_UnbindTexture, [Texture.by_ref], :int
   
 

data/lib/sdl2/surface.rb

@@ -1,83 +1,183 @@
-require 'sdl2'
+require 'sdl2/error'
 require 'sdl2/rwops'
 require 'sdl2/pixels'
 require 'sdl2/rect'
+require 'sdl2/palette'
+require 'yinum'
+
 #require 'sdl2/pixel_format'
 
 module SDL2
   typedef :uint32, :surface_flags
+
+  #\brief A collection of pixels used in software blitting.
+  #
+  #\note  This structure should be treated as read-only, except for \c pixels,
+  #       which, if not NULL, contains the raw pixel data for the surface.
   class Surface < FFI::Struct
+
+    private :[]
+
     layout :flags, :surface_flags,
-      :format, PixelFormat.by_ref,
-      :w, :int,
-      :h, :int,
-      :pixels, :pointer,
-      :userdata, :pointer,
-      :locked, :int,
-      :lock_data, :pointer,
-      :clip_rect, Rect,
-      :map, :pointer,
-      :refcount, :int      
-      
+    :format, PixelFormat.by_ref,
+    :w, :int,
+    :h, :int,
+    :pixels, :pointer,
+    :userdata, :pointer,
+    :locked, :int,
+    :lock_data, :pointer,
+    :clip_rect, Rect,
+    :map, :pointer,
+    :refcount, :int
+
+    [:flags, :format, :w, :h, :pixels, :userdata, :locked, :lock_data, :clip_rect, :map, :refcount].each do |field|
+      define_method field do
+        self[field]
+      end
+    end
+
     def self.release(pointer)
       SDL2.free_surface(pointer)
     end
-      
-    # Surface Flags, Used internally but maybe useful
+
+    # Allocate and free an RGB surface
+    # If depth is 4 or 8 bits, an empty palette is allocated for the surface.
+    # If depth is > 8 bits, the pixel format is set using the flag masks.
+    # If the function runs out of memory, it will return NULL.
+    def self.create_rgb(flags, width, height, depth, rmask = 0, gmask = 0, bmask = 0, amask = 0)
+      SDL2.create_rgb_surface!(flags, width, height, depth, rmask, gmask, bmask, amask)
+    end
+
+    def self.create_rgb_from(pixels, width, height, depth, pitch, rmask, gmask, bmask, amask)
+      SDL2.create_rgb_surface_from!(pixels, width, height, depth, pitch, rmask, gmask, bmask, amask)
+    end
+
+    def self.load_bmp_rw(rwops, freesrc = 0)
+      SDL2.load_bmp_rw!(rwops, freesrc)
+    end
+
+    def self.load_bmp(file)
+      SDL2.load_bmp!(file)
+    end
+
+    def save_bmp_rw(rwops, freedst = 0)
+      SDL2.save_bmp_rw!(self, rwops, freedst)
+    end
+
+    def save_bmp(file)
+      SDL2.save_bmp!(self, file)
+    end
+
+    def free
+      SDL2.free_surface(self)
+    end
+
+    def set_palette(palette)
+      SDL2.set_surface_palette!(self, palette)
+    end
+
+    def get_palette()
+      #SDL2.get_surface_palette!(self)
+      format.palette
+    end
+
+    alias_method :palette=, :set_palette
+    alias_method :palette, :get_palette
+
+    def lock()
+      SDL2.lock_surface(self)
+    end
+
+    def unlock()
+      SDL2.unlock_surface(self)
+    end
+
+    # Surface Flags
     SWSURFACE = 0
     PREALLOC  = 0x00000001
     RLEACCEL  = 0x00000002
     DONTFREE  = 0x00000004
-    
+
     # Macro, redefined here for use.
     def mustlock?
       self[:flags] & RLEACCEL != 0
     end
-  
+
+    def blit_from(src, src_rect, dst_rect)
+      SDL2.blit!(src, src_rect, self, dst_rect)
+    end
+
+    def blit_to(src_rect, dst, dst_rect)
+      SDL2.blit!(self, src_rect, dst, dst_rect)
+    end
+
+    def set_rle(flag)
+      SDL2.set_surface_rle!(self, flag)
+    end
+
+    alias_method :rle=, :set_rle
+
+    def set_color_key(flag, key)
+      SDL2.set_color_key(self, flag, key)
+    end
+
+    def get_color_key()
+      key_s = UInt32Struct.new
+      SDL2.get_color_key!(self, key_s)
+      return key_s[:value]
+    end
   end
-  
+
   callback :blit, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int
-  
-  
-  api :SDL_CreateRGBSurface, [:surface_flags, :int, :int, :int, :uint32, :uint32, :uint32, :uint32], Surface.auto_ptr
+
+  api :SDL_CreateRGBSurface, [:surface_flags, :int, :int, :int, :uint32, :uint32, :uint32, :uint32], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
   api :SDL_FreeSurface, [Surface.by_ref], :void
-  api :SDL_SetSurfacePalette, [Surface.by_ref, Palette.by_ref], :int
+  api :SDL_SetSurfacePalette, [Surface.by_ref, Palette.by_ref], :int, {error: true}
   api :SDL_LockSurface, [Surface.by_ref], :int
   api :SDL_UnlockSurface, [Surface.by_ref], :void
   api :SDL_LoadBMP_RW, [RWops.by_ref, :int], Surface.auto_ptr
+
   # Redefine SDL_LoadBMP macro:
   def self.load_bmp(file)
     SDL2.load_bmp_rw(RWops.from_file(file, 'rb'), 1)
   end
+
   api :SDL_SaveBMP_RW, [Surface.by_ref, RWops.by_ref, :int], :int
-  
+
   def self.save_bmp(file)
     SDL2.save_bmp_rw(RWops.from_file(file, 'wb'), 1)
   end
-  
+
   api :SDL_SetSurfaceRLE, [Surface.by_ref, :int], :int
   api :SDL_SetColorKey, [Surface.by_ref, :int, :uint32], :int
   api :SDL_GetColorKey, [Surface.by_ref, UInt32Struct.by_ref], :int
   api :SDL_SetSurfaceColorMod, [Surface.by_ref, :uint8, :uint8, :uint8], :int
   api :SDL_GetSurfaceColorMod, [Surface.by_ref, UInt8Struct.by_ref,UInt8Struct.by_ref,UInt8Struct.by_ref], :int
-  api :SDL_SetSurfaceAlphaMod, [Surface.by_ref, :uint8], :int
-  api :SDL_GetSurfaceAlphaMod, [Surface.by_ref,UInt8Struct.by_ref], :int
-  api :SDL_SetSurfaceBlendMode, [Surface.by_ref, :blend_mode], :int
-  api :SDL_GetSurfaceBlendMode, [Surface.by_ref, BlendModeStruct.by_ref], :int
-  api :SDL_SetClipRect, [Surface.by_ref, Rect.by_ref], :int
-  api :SDL_GetClipRect, [Surface.by_ref, Rect.by_ref], :int
+  api :SDL_SetSurfaceAlphaMod, [Surface.by_ref, :uint8], :int, {error: true}
+  api :SDL_GetSurfaceAlphaMod, [Surface.by_ref,UInt8Struct.by_ref], :int, {error: true}
+  api :SDL_SetSurfaceBlendMode, [Surface.by_ref, :blend_mode], :int, {error: true}
+  api :SDL_GetSurfaceBlendMode, [Surface.by_ref, BlendModeStruct.by_ref], :int, {error: true}
+  api :SDL_SetClipRect, [Surface.by_ref, Rect.by_ref], :int, {error: true}
+  api :SDL_GetClipRect, [Surface.by_ref, Rect.by_ref], :int, {error: true}
   api :SDL_ConvertSurface, [Surface.by_ref, PixelFormat.by_ref, :surface_flags], Surface.auto_ptr
   api :SDL_ConvertSurfaceFormat, [Surface.by_ref, :pixel_format, :surface_flags], Surface.auto_ptr
-  api :SDL_ConvertPixels, [:int, :int, :pixel_format, :pointer, :int, :pixel_format, :pointer, :int], :int
-  api :SDL_FillRect, [Surface.by_ref, Rect.by_ref, :uint32], :int
-  api :SDL_FillRects, [Surface.by_ref, Rect.by_ref, :count, :uint32], :int
-  api :SDL_UpperBlit, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int
-  #alias_method :blit_surface, :upper_blit # TODO: Review if this is what line 447 means.
-  #alias_class_method :blit_surface, :upper_blit
+  api :SDL_ConvertPixels, [:int, :int, :pixel_format, :pointer, :int, :pixel_format, :pointer, :int], :int, {error: true}
+  api :SDL_FillRect, [Surface.by_ref, Rect.by_ref, :uint32], :int, {error: true}
+  api :SDL_FillRects, [Surface.by_ref, Rect.by_ref, :count, :uint32], :int, {error: true}
+  api :SDL_UpperBlit, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int, {error: true}
+
+  def self.blit_surface(src, srcrect, dst, dstrect)
+    upper_blit(src, srcrect, dst, dstrect)
+  end
+
   api :SDL_LowerBlit, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int
   api :SDL_SoftStretch, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int
   api :SDL_UpperBlitScaled, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int
-  alias_method :blit_scaled, :upper_blit_scaled
+
+  def self.blit_scaled(src, srcrect, dst, dstrect)
+    upper_blit_scaled(src, srcrect, dst, dstrect)
+  end
+
   api :SDL_LowerBlitScaled, [Surface.by_ref, Rect.by_ref, Surface.by_ref, Rect.by_ref], :int
-    
+
 end

data/lib/sdl2/ttf.rb

@@ -0,0 +1,125 @@
+require 'sdl2'
+require 'sdl2/version'
+require 'sdl2/ttf/sdl_ttf_module'
+require 'active_support/inflector'
+require 'yinum'
+
+module SDL2
+  
+  module TTF
+    
+    extend FFI::Library
+    ffi_lib SDL_TTF_MODULE
+    
+    def self.api(func_name, args, type)
+      camelCaseName = func_name.to_s.gsub('TTF_','')
+      methodName = ActiveSupport::Inflector.underscore(camelCaseName).to_sym
+      self.attach_function methodName, func_name, args, type
+      return methodName
+    end
+    
+    api :TTF_Linked_Version, [], Version.auto_ptr
+    
+    UNICODE_BOM_NATIVE = 0xFEFF
+    UNICODE_BOM_SWAPPED = 0xFFFE
+    
+    api :TTF_ByteSwappedUNICODE, [:int], :void
+    
+    class Font < Struct
+      
+      def self.release(pointer)
+        close_font(pointer)
+      end
+      
+    end
+    
+    api :TTF_Init, [], :int
+    api :TTF_OpenFont, [:string, :int], Font.auto_ptr
+    api :TTF_OpenFontIndex, [:string, :int, :long], Font.auto_ptr
+    api :TTF_OpenFontRW, [RWops.by_ref, :int, :int], Font.auto_ptr
+    api :TTF_OpenFontIndexRW, [RWops.by_ref, :int, :int, :long], Font.auto_ptr
+    
+    STYLE = Enum.new(:STYLE, {
+      NORMAL: 0x00,
+      BOLD: 0x01,
+      ITALIC: 0x02,
+      UNDERLINE: 0x04,
+      STRIKETHROUGH: 0x08
+    })
+    
+    enum :font_style, STYLE.by_name
+    
+    api :TTF_GetFontStyle, [Font.by_ref], :int
+    api :TTF_SetFontStyle, [Font.by_ref, :int], :void
+    api :TTF_GetFontOutline, [Font.by_ref], :int
+    api :TTF_SetFontOutline, [Font.by_ref, :int], :void
+    
+    HINTING = Enum.new(:HINTING, {
+      NORMAL: 0,
+      LIGHT: 1,
+      MONO: 2,
+      NONE: 3
+    })
+    enum :hinting, HINTING.by_name
+   
+    api :TTF_GetFontHinting, [Font.by_ref], :int
+    api :TTF_SetFontHinting, [Font.by_ref, :int], :void
+    
+    api :TTF_FontHeight, [Font.by_ref], :int
+    api :TTF_FontAscent, [Font.by_ref], :int
+    api :TTF_FontDescent, [Font.by_ref], :int
+    api :TTF_FontLineSkip, [Font.by_ref], :int
+    api :TTF_GetFontKerning, [Font.by_ref], :int
+    api :TTF_SetFontKerning, [Font.by_ref], :int
+    api :TTF_FontFaces, [Font.by_ref], :long
+    api :TTF_FontFaceIsFixedWidth, [Font.by_ref], :int
+    api :TTF_FontFaceFamilyName, [Font.by_ref], :string
+    api :TTF_FontFaceStyleName, [Font.by_ref], :string
+    
+    api :TTF_GlyphIsProvided, [Font.by_ref, :uint16], :int
+    
+    api :TTF_GlyphMetrics, [
+      Font.by_ref, 
+      :uint16, 
+      IntStruct.by_ref, 
+      IntStruct.by_ref, 
+      IntStruct.by_ref, 
+      IntStruct.by_ref, 
+      IntStruct.by_ref
+    ], :int 
+    
+    
+    api :TTF_SizeText, [Font.by_ref, :string, IntStruct.by_ref, IntStruct.by_ref], :int
+    api :TTF_SizeUTF8, [Font.by_ref, :string, IntStruct.by_ref, IntStruct.by_ref], :int
+    api :TTF_SizeUNICODE, [Font.by_ref, :string, IntStruct.by_ref, IntStruct.by_ref], :int
+    
+    api :TTF_RenderText_Solid, [Font.by_ref, :string, Color], Surface.auto_ptr
+    api :TTF_RenderUTF8_Solid, [Font.by_ref, :string, Color], Surface.auto_ptr
+    api :TTF_RenderUNICODE_Solid, [Font.by_ref, :string, Color], Surface.auto_ptr
+    
+    api :TTF_RenderGlyph_Solid, [Font.by_ref, :uint16, Color], Surface.auto_ptr
+    
+    api :TTF_RenderText_Shaded, [Font.by_ref, :string, Color, Color], Surface.auto_ptr
+    api :TTF_RenderUTF8_Shaded, [Font.by_ref, :string, Color, Color], Surface.auto_ptr
+    api :TTF_RenderUNICODE_Shaded, [Font.by_ref, :string, Color, Color], Surface.auto_ptr
+    
+    api :TTF_RenderGlyph_Shaded, [Font.by_ref, :uint16, Color, Color], Surface.auto_ptr
+    
+    api :TTF_RenderText_Blended, [Font.by_ref, :string, Color], Surface.auto_ptr
+    api :TTF_RenderUTF8_Blended, [Font.by_ref, :string, Color], Surface.auto_ptr
+    api :TTF_RenderUNICODE_Blended, [Font.by_ref, :string, Color], Surface.auto_ptr
+    
+    api :TTF_RenderText_Blended_Wrapped, [Font.by_ref, :string, Color, :uint32], Surface.auto_ptr
+    api :TTF_RenderUTF8_Blended_Wrapped, [Font.by_ref, :string, Color, :uint32], Surface.auto_ptr
+    api :TTF_RenderUNICODE_Blended_Wrapped, [Font.by_ref, :string, Color, :uint32], Surface.auto_ptr
+    
+    api :TTF_RenderGlyph_Blended, [Font.by_ref, :uint16, Color], Surface.auto_ptr
+    
+    api :TTF_CloseFont, [Font.by_ref], :void
+    api :TTF_Quit, [], :void
+    api :TTF_WasInit, [], :int
+    api :TTF_GetFontKerningSize, [Font.by_ref, :int, :int], :int
+    
+  end
+  
+end

data/lib/sdl2/ttf/sdl_ttf_module.rb

@@ -0,0 +1,5 @@
+module SDL2
+  module TTF
+    SDL_TTF_MODULE = ['libSDL2_ttf', '/usr/local/lib/libSDL2_ttf.so']
+  end
+end

data/lib/sdl2/version.rb

@@ -7,6 +7,10 @@ module SDL2
       :minor, :uint8,
       :patch, :uint8
       
+    def self.release(pointer)
+      pointer.free
+    end
+      
     def major
       self[:major]
     end
@@ -22,6 +26,8 @@ module SDL2
     def to_s
       "SDL v#{major}.#{minor}.#{patch}"
     end
+    
+    
   end
   
   api :SDL_GetRevision, [], :string

data/lib/sdl2/window.rb

@@ -198,7 +198,7 @@ module SDL2
     end
     
     def update_surface!()      
-      SDL2.throw_error_unless update_surface == 0
+      SDL2.raise_error_unless update_surface == 0
       return 0
     end
 

data/test/test_helper.rb

@@ -1,2 +1,4 @@
 require 'minitest/autorun'
+require 'pry'
 
+FIXTURE_DIR = File.expand_path('../fixtures/',__FILE__)

data/test/unit/sdl2/test_hints.rb

@@ -5,9 +5,9 @@ require 'sdl2/hints'
 describe SDL2 do
   
   it 'has hints' do
-    assert SDL2.respond_to? :clear_hints
-    assert SDL2.respond_to? :get_hint
-    assert SDL2.respond_to? :set_hint
+    assert_respond_to SDL2, :clear_hints
+    assert_respond_to SDL2, :get_hint
+    assert_respond_to SDL2, :set_hint
     
     assert_equal 'constant', defined?(SDL2::HINT_FRAMEBUFFER_ACCELERATION)
     assert_equal 'constant', defined?(SDL2::HINT_IDLE_TIMER_DISABLED)

data/test/unit/sdl2/test_image.rb

@@ -0,0 +1,9 @@
+require 'sdl2/image'
+
+describe SDL2::Image do
+  
+  it 'has the SDL_image.h API' do
+    skip "Not yet implemented"
+  end
+  
+end

data/test/unit/sdl2/test_palette.rb

@@ -0,0 +1,26 @@
+require_relative '../../test_helper'
+
+require 'sdl2/pixels' #defines SDL_Palette
+
+describe SDL2::Palette do
+  
+  before do
+    @palette = SDL2::Palette.create(32)
+  end
+  
+  after do
+    SDL2::Palette.release(@palette)
+  end
+  
+  it 'can be created' do
+    refute @palette.null?
+  end
+  
+  it 'can set colors from a ruby array of arrays' do    
+    @palette.set_colors([[255,0,0],[0,255,0],[0,0,255]])
+  end
+  
+  
+  
+  
+end