sdl2_ffi 0.0.3 → 0.0.4

data/lib/sdl2/rect.rb

@@ -5,23 +5,27 @@ require 'sdl2/point'
 
 module SDL2
 
-  class Rect < FFI::Struct
+  class Rect < Struct
     layout :x, :int, :y, :int, :w, :int, :h, :int
 
+    member_readers *members
+    member_writers *members
+    
     def empty
-      return ((!self.null?) || (self[:w] <= 0) || (self[:h] <= 0)) ? :true : :false
+      return ((!self.null?) || (self[:w] <= 0) || (self[:h] <= 0))
     end
 
-    def empty?
-      empty == :true
-    end
+    alias_method :empty?, :empty
 
-    def equals(other)
-      if self.null or other.null?
-        return (self.null? and other.null?) ? :true : :false
+    def equals(other)    
+      return false if other.nil?
+      return false unless other.kind_of? Rect
+      
+      if self.null? or other.null? # Either null?
+        return (self.null? and other.null?) # Equal if both are null!      
       else
-        [:x, :y, :w, :h].each do |field|
-          return :false unless self[field] == other[field]
+        members.each do |field| # Compare our fields.
+          return false unless self[field] == other[field]
         end
       end
       return true # if we made it this far

data/lib/sdl2/render.rb

@@ -5,21 +5,37 @@ require 'sdl2/texture'
 require 'sdl2/point'
 
 module SDL2
-  # lines 64~73
-  enum :renderer_flags, [
-    :software, Renderer::SOFTWARE,
-    :accelerated, Renderer::ACCELERATED,
-    :present_vsync, Renderer::PRESENTVSYNC,
-    :target_texture, Renderer::TARGETTEXTURE
-  ]
-  # lines 91~96
-  enum :texture_access, [:static, :streaming, :target]
-  # lines 101~106
-  enum :texture_modulate, [:none, 0x00000000, :color, 0x00000001, :alpha, 0x00000002]
-  # lines 111~116
-  enum :renderer_flip, [:none, 0x00000000, :horizontal, 0x00000001, :vertical, 0x00000002]
+  enum :renderer_flags, RENDERER.flatten_consts
+  
+  # The access pattern allowed for a texture
+  module TEXTUREACCESS
+    include EnumerableConstants
+    STATIC = next_const_value
+    STREAMING = next_const_value
+    TARGET = next_const_value
+  end
+  enum :texture_access, TEXTUREACCESS.flatten_consts  
+       
+  # The texture channel modulation used in #render_copy 
+  module TEXTUREMODULATE
+    include EnumerableConstants
+    NONE = 0x00000000     
+    COLOR = 0x00000001    
+    ALPHA = 0x00000002     
+  end    
+  enum :texture_modulate, TEXTUREMODULATE.flatten_consts
+  
+  # Constants for #render_copy_ex
+  module FLIP
+    include EnumerableConstants
+    NONE = 0x00000000
+    HORIZONTAL = 0x00000001
+    VERTICAL = 0x00000002  
+  end
+  enum :renderer_flip, FLIP.flatten_consts
     
   typedef :int, :render_driver_index
+  
   api :SDL_GetNumRenderDrivers, [], :int
   api :SDL_GetRenderDriverInfo, [:render_driver_index, RendererInfo.by_ref], :int
   api :SDL_CreateWindowAndRenderer, [:int, :int, :window_flags, Window.by_ref, Renderer.by_ref], :int

data/lib/sdl2/renderer.rb

@@ -2,12 +2,19 @@ require 'sdl2'
 require 'sdl2/renderer_info'
 module SDL2
   
-  class Renderer < Struct
-    layout :blank, :uint8 # Ignore Structure?
+  module RENDERER
+    include EnumerableConstants
+    
     SOFTWARE       = 0x00000001         
     ACCELERATED    = 0x00000002      
     PRESENTVSYNC   = 0x00000004     
     TARGETTEXTURE  = 0x00000008
+  end
+  
+  class Renderer < Struct
+    include RENDERER
+    
+    layout :blank, :uint8 # Ignore Structure?    
     
     def self.create(window, driver_idx, flags)
       create_render(window, driver_idx, flags)

data/lib/sdl2/rwops.rb

@@ -10,7 +10,7 @@ module SDL2
   callback :rwops_write, [RWops.by_ref, :pointer, :size_t, :size_t], :size_t
   callback :rwops_close, [RWops.by_ref], :int
 
-  class RWops 
+  class RWops < Struct
     class AndroidIO < Struct
       layout :fileNameRef, :pointer,
         :inputSteramRef, :pointer,
@@ -74,7 +74,11 @@ module SDL2
     # CONSTANTS
     SEEK_SET = 0
     SEEK_CUR = 1
-    SEEK_END = 2
+    SEEK_END = 2       
+    
+    def self.from_file(file_name, mode)
+      SDL2.rw_from_file!(file_name, mode)
+    end
     
     # Read/Write Macros re-implemented: Lines #184~189
     def size
@@ -103,11 +107,11 @@ module SDL2
     
   end
   
-  api :SDL_RWFromFile, [:string, :string], RWops.auto_ptr
-  api :SDL_RWFromFP, [:pointer, :bool], RWops.auto_ptr
-  api :SDL_RWFromMem, [:pointer, :count], RWops.auto_ptr
-  api :SDL_RWFromConstMem, [:pointer, :count], RWops.auto_ptr
-  api :SDL_AllocRW, [], RWops.auto_ptr
+  api :SDL_RWFromFile, [:string, :string], RWops.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+  api :SDL_RWFromFP, [:pointer, :bool], RWops.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+  api :SDL_RWFromMem, [:pointer, :count], RWops.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+  api :SDL_RWFromConstMem, [:pointer, :count], RWops.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+  api :SDL_AllocRW, [], RWops.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
   api :SDL_FreeRW, [RWops.by_ref], :void
   api :SDL_ReadU8, [RWops.by_ref], :uint8
   api :SDL_ReadLE16, [RWops.by_ref], :uint16

data/lib/sdl2/scancode.rb

@@ -1,275 +1,276 @@
 require 'sdl2'
-require 'yinum'
+
 
 module SDL2
   NUM_SCANCODES = 512
+  
+  module SCANCODE
+    include EnumerableConstants
+    A  =  4
+    B  =  5
+    C  =  6
+    D  =  7
+    E  =  8
+    F  =  9
+    G  =  10
+    H  =  11
+    I  =  12
+    J  =  13
+    K  =  14
+    L  =  15
+    M  =  16
+    N  =  17
+    O  =  18
+    P  =  19
+    Q  =  20
+    R  =  21
+    S  =  22
+    T  =  23
+    U  =  24
+    V  =  25
+    W  =  26
+    X  =  27
+    Y  =  28
+    Z  =  29
 
-  Scancode = Enum.new(:SCANCODE, {
-    :A => 4,
-    :B => 5,
-    :C => 6,
-    :D => 7,
-    :E => 8,
-    :F => 9,
-    :G => 10,
-    :H => 11,
-    :I => 12,
-    :J => 13,
-    :K => 14,
-    :L => 15,
-    :M => 16,
-    :N => 17,
-    :O => 18,
-    :P => 19,
-    :Q => 20,
-    :R => 21,
-    :S => 22,
-    :T => 23,
-    :U => 24,
-    :V => 25,
-    :W => 26,
-    :X => 27,
-    :Y => 28,
-    :Z => 29,
-
-    :'1' => 30,
-    :'2' => 31,
-    :'3' => 32,
-    :'4' => 33,
-    :'5' => 34,
-    :'6' => 35,
-    :'7' => 36,
-    :'8' => 37,
-    :'9' => 38,
-    :'0' => 39,
+    N1  =  30
+    N2  =  31
+    N3  =  32
+    N4  =  33
+    N5  =  34
+    N6  =  35
+    N7  =  36
+    N8  =  37
+    N9  =  38
+    N0  =  39
 
-    :RETURN => 40,
-    :ESCAPE => 41,
-    :BACKSPACE => 42,
-    :TAB => 43,
-    :SPACE => 44,
+    RETURN  =  40
+    ESCAPE  =  41
+    BACKSPACE  =  42
+    TAB  =  43
+    SPACE  =  44
 
-    :MINUS => 45,
-    :EQUALS => 46,
-    :LEFTBRACKET => 47,
-    :RIGHTBRACKET => 48,
-    :BACKSLASH => 49,
-    :NONUSHASH => 50,
-    :SEMICOLON => 51,
-    :APOSTROPHE => 52,
-    :GRAVE => 53,
-    :COMMA => 54,
-    :PERIOD => 55,
-    :SLASH => 56,
+    MINUS  =  45
+    EQUALS  =  46
+    LEFTBRACKET  =  47
+    RIGHTBRACKET  =  48
+    BACKSLASH  =  49
+    NONUSHASH  =  50
+    SEMICOLON  =  51
+    APOSTROPHE  =  52
+    GRAVE  =  53
+    COMMA  =  54
+    PERIOD  =  55
+    SLASH  =  56
 
-    :CAPSLOCK => 57,
+    CAPSLOCK  =  57
 
-    :F1 => 58,
-    :F2 => 59,
-    :F3 => 60,
-    :F4 => 61,
-    :F5 => 62,
-    :F6 => 63,
-    :F7 => 64,
-    :F8 => 65,
-    :F9 => 66,
-    :F10 => 67,
-    :F11 => 68,
-    :F12 => 69,
+    F1  =  58
+    F2  =  59
+    F3  =  60
+    F4  =  61
+    F5  =  62
+    F6  =  63
+    F7  =  64
+    F8  =  65
+    F9  =  66
+    F10  =  67
+    F11  =  68
+    F12  =  69
 
-    :PRINTSCREEN => 70,
-    :SCROLLLOCK => 71,
-    :PAUSE => 72,
-    :INSERT => 73,
+    PRINTSCREEN  =  70
+    SCROLLLOCK  =  71
+    PAUSE  =  72
+    INSERT  =  73
 
-    :HOME => 74,
-    :PAGEUP => 75,
-    :DELETE => 76,
-    :END => 77,
-    :PAGEDOWN => 78,
-    :RIGHT => 79,
-    :LEFT => 80,
-    :DOWN => 81,
-    :UP => 82,
+    HOME  =  74
+    PAGEUP  =  75
+    DELETE  =  76
+    END_  =  77
+    PAGEDOWN  =  78
+    RIGHT  =  79
+    LEFT  =  80
+    DOWN  =  81
+    UP  =  82
 
-    :NUMLOCKCLEAR => 83,
+    NUMLOCKCLEAR  =  83
 
-    :KP_DIVIDE => 84,
-    :KP_MULTIPLY => 85,
-    :KP_MINUS => 86,
-    :KP_PLUS => 87,
-    :KP_ENTER => 88,
-    :KP_1 => 89,
-    :KP_2 => 90,
-    :KP_3 => 91,
-    :KP_4 => 92,
-    :KP_5 => 93,
-    :KP_6 => 94,
-    :KP_7 => 95,
-    :KP_8 => 96,
-    :KP_9 => 97,
-    :KP_0 => 98,
-    :KP_PERIOD => 99,
+    KP_DIVIDE  =  84
+    KP_MULTIPLY  =  85
+    KP_MINUS  =  86
+    KP_PLUS  =  87
+    KP_ENTER  =  88
+    KP_1  =  89
+    KP_2  =  90
+    KP_3  =  91
+    KP_4  =  92
+    KP_5  =  93
+    KP_6  =  94
+    KP_7  =  95
+    KP_8  =  96
+    KP_9  =  97
+    KP_0  =  98
+    KP_PERIOD  =  99
 
-    :NONUSBACKSLASH => 100,
+    NONUSBACKSLASH  =  100
 
-    :APPLICATION => 101,
-    :POWER => 102,
+    APPLICATION  =  101
+    POWER  =  102
 
-    :KP_EQUALS => 103,
-    :F13 => 104,
-    :F14 => 105,
-    :F15 => 106,
-    :F16 => 107,
-    :F17 => 108,
-    :F18 => 109,
-    :F19 => 110,
-    :F20 => 111,
-    :F21 => 112,
-    :F22 => 113,
-    :F23 => 114,
-    :F24 => 115,
-    :EXECUTE => 116,
-    :HELP => 117,
-    :MENU => 118,
-    :SELECT => 119,
-    :STOP => 120,
-    :AGAIN => 121,
-    :UNDO => 122,
-    :CUT => 123,
-    :COPY => 124,
-    :PASTE => 125,
-    :FIND => 126,
-    :MUTE => 127,
-    :VOLUMEUP => 128,
-    :VOLUMEDOWN => 129,
+    KP_EQUALS  =  103
+    F13  =  104
+    F14  =  105
+    F15  =  106
+    F16  =  107
+    F17  =  108
+    F18  =  109
+    F19  =  110
+    F20  =  111
+    F21  =  112
+    F22  =  113
+    F23  =  114
+    F24  =  115
+    EXECUTE  =  116
+    HELP  =  117
+    MENU  =  118
+    SELECT  =  119
+    STOP  =  120
+    AGAIN  =  121
+    UNDO  =  122
+    CUT  =  123
+    COPY  =  124
+    PASTE  =  125
+    FIND  =  126
+    MUTE  =  127
+    VOLUMEUP  =  128
+    VOLUMEDOWN  =  129
 
-    :KP_COMMA => 133,
-    :KP_EQUALSAS400 => 134,
+    KP_COMMA  =  133
+    KP_EQUALSAS400  =  134
 
-    :INTERNATIONAL1 => 135,
+    INTERNATIONAL1  =  135
 
-    :INTERNATIONAL2 => 136,
-    :INTERNATIONAL3 => 137,
-    :INTERNATIONAL4 => 138,
-    :INTERNATIONAL5 => 139,
-    :INTERNATIONAL6 => 140,
-    :INTERNATIONAL7 => 141,
-    :INTERNATIONAL8 => 142,
-    :INTERNATIONAL9 => 143,
-    :LANG1 => 144,
-    :LANG2 => 145,
-    :LANG3 => 146,
-    :LANG4 => 147,
-    :LANG5 => 148,
-    :LANG6 => 149,
-    :LANG7 => 150,
-    :LANG8 => 151,
-    :LANG9 => 152,
+    INTERNATIONAL2  =  136
+    INTERNATIONAL3  =  137
+    INTERNATIONAL4  =  138
+    INTERNATIONAL5  =  139
+    INTERNATIONAL6  =  140
+    INTERNATIONAL7  =  141
+    INTERNATIONAL8  =  142
+    INTERNATIONAL9  =  143
+    LANG1  =  144
+    LANG2  =  145
+    LANG3  =  146
+    LANG4  =  147
+    LANG5  =  148
+    LANG6  =  149
+    LANG7  =  150
+    LANG8  =  151
+    LANG9  =  152
 
-    :ALTERASE => 153,
-    :SYSREQ => 154,
-    :CANCEL => 155,
-    :CLEAR => 156,
-    :PRIOR => 157,
-    :RETURN2 => 158,
-    :SEPARATOR => 159,
-    :OUT => 160,
-    :OPER => 161,
-    :CLEARAGAIN => 162,
-    :CRSEL => 163,
-    :EXSEL => 164,
+    ALTERASE  =  153
+    SYSREQ  =  154
+    CANCEL  =  155
+    CLEAR  =  156
+    PRIOR  =  157
+    RETURN2  =  158
+    SEPARATOR  =  159
+    OUT  =  160
+    OPER  =  161
+    CLEARAGAIN  =  162
+    CRSEL  =  163
+    EXSEL  =  164
 
-    :KP_00 => 176,
-    :KP_000 => 177,
-    :THOUSANDSSEPARATOR => 178,
-    :DECIMALSEPARATOR => 179,
-    :CURRENCYUNIT => 180,
-    :CURRENCYSUBUNIT => 181,
-    :KP_LEFTPAREN => 182,
-    :KP_RIGHTPAREN => 183,
-    :KP_LEFTBRACE => 184,
-    :KP_RIGHTBRACE => 185,
-    :KP_TAB => 186,
-    :KP_BACKSPACE => 187,
-    :KP_A => 188,
-    :KP_B => 189,
-    :KP_C => 190,
-    :KP_D => 191,
-    :KP_E => 192,
-    :KP_F => 193,
-    :KP_XOR => 194,
-    :KP_POWER => 195,
-    :KP_PERCENT => 196,
-    :KP_LESS => 197,
-    :KP_GREATER => 198,
-    :KP_AMPERSAND => 199,
-    :KP_DBLAMPERSAND => 200,
-    :KP_VERTICALBAR => 201,
-    :KP_DBLVERTICALBAR => 202,
-    :KP_COLON => 203,
-    :KP_HASH => 204,
-    :KP_SPACE => 205,
-    :KP_AT => 206,
-    :KP_EXCLAM => 207,
-    :KP_MEMSTORE => 208,
-    :KP_MEMRECALL => 209,
-    :KP_MEMCLEAR => 210,
-    :KP_MEMADD => 211,
-    :KP_MEMSUBTRACT => 212,
-    :KP_MEMMULTIPLY => 213,
-    :KP_MEMDIVIDE => 214,
-    :KP_PLUSMINUS => 215,
-    :KP_CLEAR => 216,
-    :KP_CLEARENTRY => 217,
-    :KP_BINARY => 218,
-    :KP_OCTAL => 219,
-    :KP_DECIMAL => 220,
-    :KP_HEXADECIMAL => 221,
+    KP_00  =  176
+    KP_000  =  177
+    THOUSANDSSEPARATOR  =  178
+    DECIMALSEPARATOR  =  179
+    CURRENCYUNIT  =  180
+    CURRENCYSUBUNIT  =  181
+    KP_LEFTPAREN  =  182
+    KP_RIGHTPAREN  =  183
+    KP_LEFTBRACE  =  184
+    KP_RIGHTBRACE  =  185
+    KP_TAB  =  186
+    KP_BACKSPACE  =  187
+    KP_A  =  188
+    KP_B  =  189
+    KP_C  =  190
+    KP_D  =  191
+    KP_E  =  192
+    KP_F  =  193
+    KP_XOR  =  194
+    KP_POWER  =  195
+    KP_PERCENT  =  196
+    KP_LESS  =  197
+    KP_GREATER  =  198
+    KP_AMPERSAND  =  199
+    KP_DBLAMPERSAND  =  200
+    KP_VERTICALBAR  =  201
+    KP_DBLVERTICALBAR  =  202
+    KP_COLON  =  203
+    KP_HASH  =  204
+    KP_SPACE  =  205
+    KP_AT  =  206
+    KP_EXCLAM  =  207
+    KP_MEMSTORE  =  208
+    KP_MEMRECALL  =  209
+    KP_MEMCLEAR  =  210
+    KP_MEMADD  =  211
+    KP_MEMSUBTRACT  =  212
+    KP_MEMMULTIPLY  =  213
+    KP_MEMDIVIDE  =  214
+    KP_PLUSMINUS  =  215
+    KP_CLEAR  =  216
+    KP_CLEARENTRY  =  217
+    KP_BINARY  =  218
+    KP_OCTAL  =  219
+    KP_DECIMAL  =  220
+    KP_HEXADECIMAL  =  221
 
-    :LCTRL => 224,
-    :LSHIFT => 225,
-    :LALT => 226,
-    :LGUI => 227,
-    :RCTRL => 228,
-    :RSHIFT => 229,
-    :RALT => 230,
-    :RGUI => 231,
+    LCTRL  =  224
+    LSHIFT  =  225
+    LALT  =  226
+    LGUI  =  227
+    RCTRL  =  228
+    RSHIFT  =  229
+    RALT  =  230
+    RGUI  =  231
 
-    :MODE => 257,
+    MODE  =  257
 
-    :AUDIONEXT => 258,
-    :AUDIOPREV => 259,
-    :AUDIOSTOP => 260,
-    :AUDIOPLAY => 261,
-    :AUDIOMUTE => 262,
-    :MEDIASELECT => 263,
-    :WWW => 264,
-    :MAIL => 265,
-    :CALCULATOR => 266,
-    :COMPUTER => 267,
-    :AC_SEARCH => 268,
-    :AC_HOME => 269,
-    :AC_BACK => 270,
-    :AC_FORWARD => 271,
-    :AC_STOP => 272,
-    :AC_REFRESH => 273,
-    :AC_BOOKMARKS => 274,
+    AUDIONEXT  =  258
+    AUDIOPREV  =  259
+    AUDIOSTOP  =  260
+    AUDIOPLAY  =  261
+    AUDIOMUTE  =  262
+    MEDIASELECT  =  263
+    WWW  =  264
+    MAIL  =  265
+    CALCULATOR  =  266
+    COMPUTER  =  267
+    AC_SEARCH  =  268
+    AC_HOME  =  269
+    AC_BACK  =  270
+    AC_FORWARD  =  271
+    AC_STOP  =  272
+    AC_REFRESH  =  273
+    AC_BOOKMARKS  =  274
 
-    :BRIGHTNESSDOWN => 275,
-    :BRIGHTNESSUP => 276,
-    :DISPLAYSWITCH => 277,
+    BRIGHTNESSDOWN  =  275
+    BRIGHTNESSUP  =  276
+    DISPLAYSWITCH  =  277
 
-    :KBDILLUMTOGGLE => 278,
-    :KBDILLUMDOWN => 279,
-    :KBDILLUMUP => 280,
-    :EJECT => 281,
-    :SLEEP => 282,
+    KBDILLUMTOGGLE  =  278
+    KBDILLUMDOWN  =  279
+    KBDILLUMUP  =  280
+    EJECT  =  281
+    SLEEP  =  282
 
-    :APP1 => 283,
-    :APP2 => 284
-  })
+    APP1  =  283
+    APP2  =  284
+  end
   
-  enum :scancode, Scancode.by_name
+  enum :scancode, SCANCODE.flatten_consts
 
 end