sdl2_ffi 0.0.6 → 0.0.7

data/lib/sdl2/gem_version.rb

@@ -1,4 +1,4 @@
 
 module SDL2
-  GEM_VERSION = "0.0.6"
+  GEM_VERSION = "0.0.7"
 end

data/lib/sdl2/haptic.rb

@@ -444,7 +444,7 @@ module SDL2
 	api :SDL_HapticName, [:int], :string
   ##
 	#
-	api :SDL_HapticOpen, [:int], Haptic.auto_ptr
+	api :SDL_HapticOpen, [:int], Haptic.ptr
   ##
 	#
 	api :SDL_HapticOpened, [:int], :int
@@ -456,13 +456,13 @@ module SDL2
 	api :SDL_MouseIsHaptic, [], :int
   ##
 	#
-	api :SDL_HapticOpenFromMouse, [], Haptic.auto_ptr
+	api :SDL_HapticOpenFromMouse, [], Haptic.ptr
   ##
 	#
 	api :SDL_JoystickIsHaptic, [Joystick.by_ref], :int
   ##
 	#
-	api :SDL_HapticOpenFromJoystick, [Joystick.by_ref], Haptic.auto_ptr
+	api :SDL_HapticOpenFromJoystick, [Joystick.by_ref], Haptic.ptr
   ##
 	#
 	api :SDL_HapticClose, [Haptic.by_ref], :void

data/lib/sdl2/hints.rb

@@ -7,6 +7,7 @@ module SDL2
     FRAMEBUFFER_ACCELERATION     = "SDL_FRAMEBUFFER_ACCELERATION"
     RENDER_DRIVER                = "SDL_RENDER_DRIVER"
     RENDER_OPENGL_SHADERS        = "SDL_RENDER_OPENGL_SHADERS"
+    RENDER_DIRECT3D_THREADSAFE   = "SDL_RENDER_DIRECT3D_THREADSAFE"
     RENDER_SCALE_QUALITY         = "SDL_RENDER_SCALE_QUALITY"
     RENDER_VSYNC                 = "SDL_RENDER_VSYNC"
     VIDEO_X11_XVIDMODE           = "SDL_VIDEO_X11_XVIDMODE"
@@ -23,6 +24,7 @@ module SDL2
     JOYSTICK_ALLOW_BACKGROUND_EVENTS = "SDL_JOYSTICK_ALLOW_BACKGROUND_EVENTS"
     ALLOW_TOPMOST                    = "SDL_ALLOW_TOPMOST"
     TIMER_RESOLUTION                 = "SDL_TIMER_RESOLUTION"
+    VIDEO_HIGHDPI_DISABLED           = "SDL_VIDEO_HIGHDPI_DISABLED"
   end
   
   enum :hint_priority, [:default, :normal, :override]
@@ -64,4 +66,4 @@ module SDL2
 	#
 	api :SDL_SetHintWithPriority, [:string, :string, :hint_priority], :bool
 
-end
+end

data/lib/sdl2/image.rb

@@ -23,19 +23,19 @@ module SDL2
     # Loads dynamic libraries and prepares them for use.  Flags should be
     # one or more flags from IMG_InitFlags OR'd together.
     # It returns the flags successfully initialized, or 0 on failure.
-    api :IMG_Init, [:init_flags], :int, {error: true, filter: TRUE_WHEN_NOT_ZERO}
+    api :IMG_Init, [:init_flags], :int, {error: true, filter: OK_WHEN_NOT_ZERO}
     ##
     #
     api :IMG_Quit, [], :void
     ##
     #
-    api :IMG_LoadTyped_RW, [RWops.by_ref, :int, :string], Surface.auto_ptr
+    api :IMG_LoadTyped_RW, [RWops.by_ref, :int, :string], Surface.ptr
     ##
     #
-    api :IMG_Load, [:string], Surface.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL }
+    api :IMG_Load, [:string], Surface.ptr, {error: true, filter: OK_WHEN_NOT_NULL }
     ##
     #
-    api :IMG_Load_RW, [RWops.by_ref, :int], Surface.auto_ptr
+    api :IMG_Load_RW, [RWops.by_ref, :int], Surface.ptr
 
     ##
     #
@@ -82,53 +82,53 @@ module SDL2
 
     ##
     #
-    api :IMG_LoadICO_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadICO_RW, [RWops.by_ref], Surface.ptr
     ##
     #
-    api :IMG_LoadCUR_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadCUR_RW, [RWops.by_ref], Surface.ptr
     ##
     #
-    api :IMG_LoadBMP_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadBMP_RW, [RWops.by_ref], Surface.ptr
     ##
     #
-    api :IMG_LoadGIF_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadGIF_RW, [RWops.by_ref], Surface.ptr
     ##
     #
-    api :IMG_LoadJPG_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadJPG_RW, [RWops.by_ref], Surface.ptr
     ##
     #
-    api :IMG_LoadLBM_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadLBM_RW, [RWops.by_ref], Surface.ptr
     ##
     #
-    api :IMG_LoadPCX_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadPCX_RW, [RWops.by_ref], Surface.ptr
     ##
     #
-    api :IMG_LoadPNG_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadPNG_RW, [RWops.by_ref], Surface.ptr
     ##
     #
-    api :IMG_LoadPNM_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadPNM_RW, [RWops.by_ref], Surface.ptr
     ##
     #
-    api :IMG_LoadTGA_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadTGA_RW, [RWops.by_ref], Surface.ptr
     ##
     #
-    api :IMG_LoadTIF_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadTIF_RW, [RWops.by_ref], Surface.ptr, method_name: :load_TIF_rw
     ##
     #
-    api :IMG_LoadXCF_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadXCF_RW, [RWops.by_ref], Surface.ptr, method_name: :load_XCF_rw
     ##
     #
-    api :IMG_LoadXPM_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadXPM_RW, [RWops.by_ref], Surface.ptr, method_name: :load_XPM_rw
     ##
     #
-    api :IMG_LoadXV_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadXV_RW, [RWops.by_ref], Surface.ptr, method_name: :load_XV_rw
     ##
     #
-    api :IMG_LoadWEBP_RW, [RWops.by_ref], Surface.auto_ptr
+    api :IMG_LoadWEBP_RW, [RWops.by_ref], Surface.ptr
 
     ##
     #
-    api :IMG_ReadXPMFromArray, [:pointer], Surface.auto_ptr
+    api :IMG_ReadXPMFromArray, [:pointer], Surface.ptr
 
     ##
     #

data/lib/sdl2/init.rb

@@ -2,7 +2,6 @@ require 'sdl2'
 require 'sdl2/error'
 
 module SDL2
-
   # Enumeration of valid initialization flags.
   module INIT
     include EnumerableConstants
@@ -17,14 +16,12 @@ module SDL2
     NOPARACHUTE    = 0x00100000
     EVERYTHING     = TIMER | AUDIO | VIDEO | EVENTS | JOYSTICK | HAPTIC | GAMECONTROLLER
 
-  end
-  
+  end  
   enum :init_flag, INIT.flatten_consts
   
-
-  ##
-	#
-	api :SDL_Init, [:init_flag], :int, {error: true}
+  
+  
+  api :SDL_Init, [:init_flag], :int, {error: true}
 
 
   ##
@@ -42,7 +39,7 @@ module SDL2
 	#
 	api :SDL_WasInit, [:init_flag], :uint32
     
-  boolean? :was_init, TRUE_WHEN_NOT_ZERO
+  boolean? :was_init, OK_WHEN_NOT_ZERO
 
   ##
 	#

data/lib/sdl2/joystick.rb

@@ -1,17 +1,85 @@
 require 'sdl2'
 
 module SDL2
-
-  # Joystick structure used to internally identify a joystick
-  class Joystick < Struct
-
+  ##
+  # TODO: == Joystick Overview ==
+  class Joystick < Struct    
     # TODO: Review if the Joystick layout should be hidden.
     layout :hidden, :uint8
-
     def self.release(pointer)
       SDL2.joystick_close(pointer)
+    end    
+    ##
+    # Returns the number of attached joysticks on success or a
+    # exception on failure
+    def self.num
+      SDL2.num_joysticks!
+    end    
+    ##
+    # Returns a joystick identifier or raises exception on error    
+    def self.open(idx)      
+      SDL2.joystick_open!(idx)
     end
-
+    ##
+    # Returns the name of a joystick
+    def self.name(idx)
+      SDL2.joystick_name_for_index!(idx)
+    end    
+    ##
+    # update the current state of open joysticks
+    def self.update()
+      SDL2.joystick_update()
+    end    
+    ##
+    # Returns the name of the joystick
+    def name()
+      SDL2.joystick_name(self)
+    end        
+    ##
+    # Enumerator for Axes
+    def axes
+      @axes ||= Axes.new(self)
+    end
+    autoload(:Axes, 'sdl2/joystick/axes')    
+    ##
+    # Enumerator for balls
+    def balls
+      @balls ||= Balls.new(self)
+    end
+    autoload(:Balls, 'sdl2/joystick/balls')    
+    ##
+    # Enumerator for buttons
+    def buttons
+      @buttons ||= Buttons.new(self)
+    end
+    autoload(:Buttons, 'sdl2/joystick/buttons')    
+    ##
+    # Enumerator for hats
+    def hats
+      @hats ||= Hats.new(self)
+    end
+    autoload(:Hats, 'sdl2/joystick/hats')
+    ##
+    # Get the device index of an opened joystick
+    def instance_id()
+      SDL2.joystick_instance_id!(self)
+    end    
+    ##
+    # Get the GUID
+    def get_guid()
+      SDL2.joystick_get_guid!(self)
+    end
+    ##
+    # Event state
+    # @param - state 
+    #   == SDL2::Event::STATE::QUERY [default]: Returns current state
+    #   == SDL2::Event::STATE::IGNORE : Disables event dispatching
+    #   == SDL2::Event::STATE::ENABLE : Enables event dispatching
+    # @returns - true if events enabled
+    def event_state(state = SDL2::Event::STATE::QUERY)
+      SDL2.joystick_event_state(state)
+    end    
+    
   end
 
   # A structure that encodes the stable unique id for a joystick device
@@ -22,82 +90,40 @@ module SDL2
   typedef :int32, :joystick_id
   typedef :int32, :joystick_index # Dunno
 
-  ##
-	#
-	api :SDL_NumJoysticks, [], :int
-  ##
-	#
-	api :SDL_JoystickNameForIndex, [:int], :string
-  ##
-	#
-	api :SDL_JoystickOpen, [:int], Joystick.auto_ptr
-  ##
-	#
-	api :SDL_JoystickName, [Joystick.by_ref], :string
-  ##
-	#
-	api :SDL_JoystickGetDeviceGUID, [:int], JoystickGUID
-  ##
-	#
-	api :SDL_JoystickGetGUID, [Joystick.by_ref], JoystickGUID
-  ##
-	#
-	api :SDL_JoystickGetGUIDString, [JoystickGUID.by_value, :pointer, :int], :void
-  ##
-	#
-	api :SDL_JoystickGetGUIDFromString, [:string], JoystickGUID
-  ##
-	#
-	api :SDL_JoystickGetAttached, [Joystick.by_ref], :bool
-  ##
-	#
-	api :SDL_JoystickInstanceID, [Joystick.by_ref], :joystick_id
-  ##
-	#
-	api :SDL_JoystickNumAxes, [Joystick.by_ref], :int
-  ##
-	#
-	api :SDL_JoystickNumBalls, [Joystick.by_ref], :int
-  ##
-	#
-	api :SDL_JoystickNumHats, [Joystick.by_ref], :int
-  ##
-	#
-	api :SDL_JoystickNumButtons, [Joystick.by_ref], :int
-  ##
-	#
-	api :SDL_JoystickUpdate, [], :void
-  ##
-	#
-	api :SDL_JoystickEventState, [:int], :int
-  ##
-	#
-	api :SDL_JoystickGetAxis, [Joystick.by_ref, :int], :int16
+  api :SDL_NumJoysticks, [], :int, {error: true, filter: OK_WHEN_GTE_ZERO}
+  api :SDL_JoystickNameForIndex, [:int], :string, {error: true, filter: OK_WHEN_NOT_NULL}
+  api :SDL_JoystickOpen, [:int], Joystick.ptr, {error: true, filter: OK_WHEN_NOT_NULL}
+  api :SDL_JoystickName, [Joystick.by_ref], :string
+  api :SDL_JoystickGetDeviceGUID, [:int], JoystickGUID.ptr
+  api :SDL_JoystickGetGUID, [Joystick.by_ref], JoystickGUID.ptr, {error: true, filter: OK_WHEN_NOT_NULL}
+  api :SDL_JoystickGetGUIDString, [JoystickGUID.by_value, :pointer, :int], :void
+  api :SDL_JoystickGetGUIDFromString, [:string], JoystickGUID.ptr
+  api :SDL_JoystickGetAttached, [Joystick.by_ref], :bool
+  api :SDL_JoystickInstanceID, [Joystick.by_ref], :joystick_id, {error: true, filter: OK_WHEN_GTE_ZERO}
+  api :SDL_JoystickNumAxes, [Joystick.by_ref], :int, {error: true, filter: OK_WHEN_GTE_ZERO}
+  api :SDL_JoystickNumBalls, [Joystick.by_ref], :int, {error: true, filter: OK_WHEN_GTE_ZERO}
+  api :SDL_JoystickNumHats, [Joystick.by_ref], :int, {error: true, filter: OK_WHEN_GTE_ZERO}
+  api :SDL_JoystickNumButtons, [Joystick.by_ref], :int, {error: true, filter: OK_WHEN_GTE_ZERO}
+  api :SDL_JoystickUpdate, [], :void
+  api :SDL_JoystickEventState, [:int], :bool
+  api :SDL_JoystickGetAxis, [Joystick.by_ref, :int], :int16, {error: true, filter: OK_WHEN_NOT_ZERO}
 
   # Hat positions
   module HAT
     include EnumerableConstants
-    CENTERED = 0x00
-    UP = 0x01
-    RIGHT =  0x02
-    DOWN = 0x04
-    LEFT = 0x08
-    RIGHTUP = RIGHT | UP
-    RIGHTDOWN = RIGHT | DOWN
-    LEFTUP = LEFT | UP
-    LEFTDOWN = LEFT | DOWN
+    CENTERED    = 0x00
+    UP          = 0x01
+    RIGHT       = 0x02
+    DOWN        = 0x04
+    LEFT        = 0x08
+    RIGHTUP     = RIGHT |  UP
+    RIGHTDOWN   = RIGHT | DOWN
+    LEFTUP      = LEFT  |  UP
+    LEFTDOWN    = LEFT  | DOWN
   end
 
-  ##
-	#
-	api :SDL_JoystickGetHat, [Joystick.by_ref, :int], :uint8
-  ##
-	#
-	api :SDL_JoystickGetBall, [Joystick.by_ref, :int, IntStruct.by_ref, IntStruct.by_ref], :int
-  ##
-	#
-	api :SDL_JoystickGetButton, [Joystick.by_ref, :int], :uint8
-  ##
-	#
-	api :SDL_JoystickClose, [Joystick.by_ref], :void
+  api :SDL_JoystickGetHat, [Joystick.by_ref, :int], :uint8
+  api :SDL_JoystickGetBall, [Joystick.by_ref, :int, TypedPointer::Int.by_ref, TypedPointer::Int.by_ref], :int, {error: true, filter: OK_WHEN_ZERO}
+  api :SDL_JoystickGetButton, [Joystick.by_ref, :int], :uint8
+  api :SDL_JoystickClose, [Joystick.by_ref], :void
 end

data/lib/sdl2/joystick/axes.rb

@@ -0,0 +1,22 @@
+require 'sdl2/joystick/components'
+module SDL2
+  ##
+  # A joystick may have many Axes
+  class Joystick
+    ##
+    # Enumerates axes on a joystick.
+    class Axes < Components
+      ##
+      # How many Axes are there?
+      def count
+        SDL2::joystick_num_axes(@joystick)
+      end
+      ##
+      # Axis accessor via index
+      # @returns Integer -32768...32767
+      def [](idx)
+        SDL2::joystick_get_axis(@joystick,idx)       
+      end            
+    end
+  end
+end

data/lib/sdl2/joystick/balls.rb

@@ -0,0 +1,24 @@
+require 'sdl2/joystick/components'
+module SDL2
+  ##
+  # A Joystick may have many balls.
+  class Joystick
+    ##
+    # Enumerates buttons on a joystick.
+    class Balls < Components
+      ##
+      # How many buttons are there?
+      def count
+        SDL2::joystick_num_balls(@joystick)
+      end
+      ##
+      # Button accessor via index
+      # @returns [DeltaX, DeltaY] integers
+      def [](idx)
+        dx, dy = SDL2::TypedPointer::Int.new, SDL2::TypedPointer::Int.new                
+        SDL2::joystick_get_ball(@joystick,idx, dx, dy)
+        [dx.value, dy.value]       
+      end
+    end
+  end
+end

data/lib/sdl2/joystick/buttons.rb

@@ -0,0 +1,22 @@
+require 'sdl2/joystick/components'
+module SDL2
+  ##
+  # A Joystick may have many buttons.
+  class Joystick
+    ##
+    # Enumerates buttons on a joystick.
+    class Buttons < Components
+      ##
+      # How many buttons are there?
+      def count
+        SDL2::joystick_num_buttons(@joystick)
+      end
+      ##
+      # Button accessor via index
+      # @returns Integer {0=>RELEASED,1=>PRESSED}
+      def [](idx)
+        SDL2::joystick_get_button(@joystick,idx)       
+      end
+    end
+  end
+end