sdl2_ffi 0.0.5 → 0.0.6

data/lib/sdl2/ttf/font.rb

@@ -84,26 +84,42 @@ module SDL2
       end
       
       alias_method :free, :close
-
-      def render_text_solid(text, color = [255,255,255])
+      
+      def self.default_fg=(color)
+        @@default_fg = Color.cast(color)
+      end
+      
+      def self.default_fg
+        @@default_fg ||= Color.cast([255,255,255, ALPHA_OPAQUE])
+      end
+      
+      def self.default_bg=(color)
+        @@default_bg = Color.cast(color)
+      end
+      
+      def self.default_bg
+        @@default_bg ||= Color.cast([0,0,0,ALPHA_OPAQUE])
+      end
+      
+      def render_text_solid(text, color = Font::default_fg)
         color = Color.cast(color)
         TTF.render_text_solid!(self, text, color)
       end
 
-      def render_text_shaded(text, fg = [255,255,255,255], bg = [0,0,0,0] )
+      def render_text_shaded(text, fg = Font::default_fg, bg = Font::default_bg )
         fg = Color.cast(fg)
         bg = Color.cast(bg)
         TTF.render_text_shaded!(self, text, fg, bg)
       end
 
-      def render_text_blended(text, fg = [255, 255, 255, 255])
+      def render_text_blended(text, fg = Font::default_fg)
         #binding.pry
         fg = Color.cast(fg)
         #binding.pry
         TTF.render_text_blended!(self, text, fg)
       end
       
-      def render_text_blended_wrapped(text, width, fg = [255,255,255,255])
+      def render_text_blended_wrapped(text, width, fg = default_fg)
         fg = Color.cast(fg)
         TTF.render_text_blended_wrapped!(self, text, fg, width)
       end

data/lib/sdl2/version.rb

@@ -36,7 +36,13 @@ module SDL2
     
   end
   
-  api :SDL_GetRevision, [], :string
-  api :SDL_GetRevisionNumber, [], :int
-  api :SDL_GetVersion, [Version.by_ref], :void
+  ##
+	#
+	api :SDL_GetRevision, [], :string
+  ##
+	#
+	api :SDL_GetRevisionNumber, [], :int
+  ##
+	#
+	api :SDL_GetVersion, [Version.by_ref], :void
 end

data/lib/sdl2/video.rb

@@ -72,74 +72,214 @@ module SDL2
 
   # This interface represents SDL_video.h function prototypes, lines 208~
   
-  api :SDL_GetNumVideoDrivers, [], :int  
-  api :SDL_GetVideoDriver, [:int], :string
-  api :SDL_VideoInit, [:string], :int
-  api :SDL_VideoQuit, [], :void
-  api :SDL_GetCurrentVideoDriver, [], :string
-  api :SDL_GetNumVideoDisplays, [], :int
-  api :SDL_GetDisplayName, [:display_index], :string
-  api :SDL_GetDisplayBounds, [:int, Rect.by_ref], :int
-  api :SDL_GetNumDisplayModes, [:int], :int
-  api :SDL_GetDisplayMode, [:int, :int, Display::Mode.by_ref], :int
-  api :SDL_GetDesktopDisplayMode, [:int, Display::Mode.by_ref], :int
-  api :SDL_GetCurrentDisplayMode, [:int, Display::Mode.by_ref], :int
-  api :SDL_GetClosestDisplayMode,  [:display_index, Display::Mode.by_ref, Display::Mode.by_ref], Display::Mode.by_ref
-  api :SDL_GetWindowDisplayIndex, [Window.by_ref], :int
-  api :SDL_SetWindowDisplayMode, [Window.by_ref, :uint32], :int
-  api :SDL_GetWindowDisplayMode, [Window.by_ref, Display::Mode.by_ref], :int
-  api :SDL_GetWindowPixelFormat, [Window.by_ref], :uint32
-  api :SDL_CreateWindow, [:string, :int, :int, :int, :int, :window_flags], Window.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
-  api :SDL_CreateWindowFrom, [:pointer], Window.auto_ptr
-  api :SDL_GetWindowFromID, [:uint32], Window.by_ref
-  api :SDL_GetWindowID, [Window.by_ref], :uint32
-  api :SDL_GetWindowFlags, [Window.by_ref], :uint32
-  api :SDL_GetWindowTitle, [Window.by_ref], :string
-  api :SDL_SetWindowTitle, [Window.by_ref, :string], :void
-  api :SDL_SetWindowIcon, [Window.by_ref, Surface.by_ref], :void
-  api :SDL_SetWindowData, [Window.by_ref, :string, :pointer], :pointer
-  api :SDL_GetWindowData, [Window.by_ref, :string], :pointer
-  api :SDL_SetWindowPosition, [Window.by_ref, :int, :int], :void
-  api :SDL_GetWindowPosition, [Window.by_ref, IntStruct.by_ref, IntStruct.by_ref], :void
-  api :SDL_SetWindowSize, [Window.by_ref, :int, :int], :void
-  api :SDL_GetWindowSize, [Window.by_ref, IntStruct.by_ref, IntStruct.by_ref], :void
-  api :SDL_SetWindowMaximumSize, [Window.by_ref, :int, :int], :void
-  api :SDL_GetWindowMaximumSize, [Window.by_ref, IntStruct.by_ref, IntStruct.by_ref], :void
-  api :SDL_SetWindowMinimumSize, [Window.by_ref, :int, :int], :void
-  api :SDL_GetWindowMinimumSize, [Window.by_ref, IntStruct.by_ref, IntStruct.by_ref], :void
-  api :SDL_SetWindowBordered, [Window.by_ref, :bool], :void
-  api :SDL_ShowWindow, [Window.by_ref], :void
-  api :SDL_HideWindow, [Window.by_ref], :void
-  api :SDL_RaiseWindow, [Window.by_ref], :void
-  api :SDL_MaximizeWindow, [Window.by_ref], :void
-  api :SDL_MinimizeWindow, [Window.by_ref], :void
-  api :SDL_RestoreWindow, [Window.by_ref], :void
-  api :SDL_SetWindowFullscreen, [Window.by_ref, :uint32], :int
-  api :SDL_GetWindowSurface, [Window.by_ref], Surface.by_ref
-  api :SDL_UpdateWindowSurface, [Window.by_ref], :int, {error: true}
-  api :SDL_UpdateWindowSurfaceRects, [Window.by_ref, Rect.by_ref, :int], :int, {error: true}
-  api :SDL_GetWindowGrab, [Window.by_ref], :bool
-  api :SDL_SetWindowGrab, [Window.by_ref, :bool], :void
-  api :SDL_GetWindowBrightness, [Window.by_ref], :float
-  api :SDL_SetWindowBrightness, [Window.by_ref, :float], :int
-  api :SDL_GetWindowGammaRamp, [Window.by_ref, UInt16Struct.by_ref, UInt16Struct.by_ref, UInt16Struct.by_ref], :int
-  api :SDL_SetWindowGammaRamp, [Window.by_ref, UInt16Struct.by_ref, UInt16Struct.by_ref, UInt16Struct.by_ref], :int
-  api :SDL_DestroyWindow, [Window.by_ref], :void
-  api :SDL_IsScreenSaverEnabled, [], :bool
-  api :SDL_DisableScreenSaver, [], :void
-  api :SDL_EnableScreenSaver, [], :void
-  api :SDL_GL_LoadLibrary, [:string], :int
-  api :SDL_GL_GetProcAddress, [:string], :pointer
-  api :SDL_GL_UnloadLibrary, [], :void
-  api :SDL_GL_ExtensionSupported, [:string], :bool
-  api :SDL_GL_SetAttribute, [:gl_attr, IntStruct], :int
-  api :SDL_GL_GetAttribute, [:gl_attr, IntStruct.by_ref], :int
-  api :SDL_GL_CreateContext, [Window.by_ref], :gl_context
-  api :SDL_GL_MakeCurrent, [Window.by_ref, :gl_context], :int
-  api :SDL_GL_GetCurrentWindow, [], Window.by_ref
-  api :SDL_GL_GetCurrentContext, [], :gl_context
-  api :SDL_GL_SetSwapInterval, [:int], :int
-  api :SDL_GL_GetSwapInterval, [], :int
-  api :SDL_GL_DeleteContext, [:gl_context], :void
-  api :SDL_GL_SwapWindow, [Window.by_ref], :void
+  ##
+	#
+	api :SDL_GetNumVideoDrivers, [], :int  
+  ##
+	#
+	api :SDL_GetVideoDriver, [:int], :string
+  ##
+	#
+	api :SDL_VideoInit, [:string], :int
+  ##
+	#
+	api :SDL_VideoQuit, [], :void
+  ##
+	#
+	api :SDL_GetCurrentVideoDriver, [], :string
+  ##
+	#
+	api :SDL_GetNumVideoDisplays, [], :int
+  ##
+	#
+	api :SDL_GetDisplayName, [:display_index], :string
+  ##
+	#
+	api :SDL_GetDisplayBounds, [:int, Rect.by_ref], :int
+  ##
+	#
+	api :SDL_GetNumDisplayModes, [:int], :int
+  ##
+	#
+	api :SDL_GetDisplayMode, [:int, :int, Display::Mode.by_ref], :int
+  ##
+	#
+	api :SDL_GetDesktopDisplayMode, [:int, Display::Mode.by_ref], :int
+  ##
+	#
+	api :SDL_GetCurrentDisplayMode, [:int, Display::Mode.by_ref], :int
+  ##
+	#
+	api :SDL_GetClosestDisplayMode,  [:display_index, Display::Mode.by_ref, Display::Mode.by_ref], Display::Mode.by_ref
+  ##
+	#
+	api :SDL_GetWindowDisplayIndex, [Window.by_ref], :int
+  ##
+	#
+	api :SDL_SetWindowDisplayMode, [Window.by_ref, :uint32], :int
+  ##
+	#
+	api :SDL_GetWindowDisplayMode, [Window.by_ref, Display::Mode.by_ref], :int
+  ##
+	#
+	api :SDL_GetWindowPixelFormat, [Window.by_ref], :uint32
+  ##
+	#
+	api :SDL_CreateWindow, [:string, :int, :int, :int, :int, :window_flags], Window.auto_ptr, {error: true, filter: TRUE_WHEN_NOT_NULL}
+  ##
+	#
+	api :SDL_CreateWindowFrom, [:pointer], Window.auto_ptr
+  ##
+	#
+	api :SDL_GetWindowFromID, [:uint32], Window.by_ref
+  ##
+	#
+	api :SDL_GetWindowID, [Window.by_ref], :uint32
+  ##
+	#
+	api :SDL_GetWindowFlags, [Window.by_ref], :uint32
+  ##
+	#
+	api :SDL_GetWindowTitle, [Window.by_ref], :string
+  ##
+	#
+	api :SDL_SetWindowTitle, [Window.by_ref, :string], :void
+  ##
+	#
+	api :SDL_SetWindowIcon, [Window.by_ref, Surface.by_ref], :void
+  ##
+	#
+	api :SDL_SetWindowData, [Window.by_ref, :string, :pointer], :pointer
+  ##
+	#
+	api :SDL_GetWindowData, [Window.by_ref, :string], :pointer
+  ##
+	#
+	api :SDL_SetWindowPosition, [Window.by_ref, :int, :int], :void
+  ##
+	#
+	api :SDL_GetWindowPosition, [Window.by_ref, IntStruct.by_ref, IntStruct.by_ref], :void
+  ##
+	#
+	api :SDL_SetWindowSize, [Window.by_ref, :int, :int], :void
+  ##
+	#
+	api :SDL_GetWindowSize, [Window.by_ref, IntStruct.by_ref, IntStruct.by_ref], :void
+  ##
+	#
+	api :SDL_SetWindowMaximumSize, [Window.by_ref, :int, :int], :void
+  ##
+	#
+	api :SDL_GetWindowMaximumSize, [Window.by_ref, IntStruct.by_ref, IntStruct.by_ref], :void
+  ##
+	#
+	api :SDL_SetWindowMinimumSize, [Window.by_ref, :int, :int], :void
+  ##
+	#
+	api :SDL_GetWindowMinimumSize, [Window.by_ref, IntStruct.by_ref, IntStruct.by_ref], :void
+  ##
+	#
+	api :SDL_SetWindowBordered, [Window.by_ref, :bool], :void
+  ##
+	#
+	api :SDL_ShowWindow, [Window.by_ref], :void
+  ##
+	#
+	api :SDL_HideWindow, [Window.by_ref], :void
+  ##
+	#
+	api :SDL_RaiseWindow, [Window.by_ref], :void
+  ##
+	#
+	api :SDL_MaximizeWindow, [Window.by_ref], :void
+  ##
+	#
+	api :SDL_MinimizeWindow, [Window.by_ref], :void
+  ##
+	#
+	api :SDL_RestoreWindow, [Window.by_ref], :void
+  ##
+	#
+	api :SDL_SetWindowFullscreen, [Window.by_ref, :uint32], :int
+  ##
+	#
+	api :SDL_GetWindowSurface, [Window.by_ref], Surface.by_ref
+  ##
+	#
+	api :SDL_UpdateWindowSurface, [Window.by_ref], :int, {error: true}
+  ##
+	#
+	api :SDL_UpdateWindowSurfaceRects, [Window.by_ref, Rect.by_ref, :int], :int, {error: true}
+  ##
+	#
+	api :SDL_GetWindowGrab, [Window.by_ref], :bool
+  ##
+	#
+	api :SDL_SetWindowGrab, [Window.by_ref, :bool], :void
+  ##
+	#
+	api :SDL_GetWindowBrightness, [Window.by_ref], :float
+  ##
+	#
+	api :SDL_SetWindowBrightness, [Window.by_ref, :float], :int
+  ##
+	#
+	api :SDL_GetWindowGammaRamp, [Window.by_ref, UInt16Struct.by_ref, UInt16Struct.by_ref, UInt16Struct.by_ref], :int
+  ##
+	#
+	api :SDL_SetWindowGammaRamp, [Window.by_ref, UInt16Struct.by_ref, UInt16Struct.by_ref, UInt16Struct.by_ref], :int
+  ##
+	#
+	api :SDL_DestroyWindow, [Window.by_ref], :void
+  ##
+	#
+	api :SDL_IsScreenSaverEnabled, [], :bool
+  ##
+	#
+	api :SDL_DisableScreenSaver, [], :void
+  ##
+	#
+	api :SDL_EnableScreenSaver, [], :void
+  ##
+	#
+	api :SDL_GL_LoadLibrary, [:string], :int
+  ##
+	#
+	api :SDL_GL_GetProcAddress, [:string], :pointer
+  ##
+	#
+	api :SDL_GL_UnloadLibrary, [], :void
+  ##
+	#
+	api :SDL_GL_ExtensionSupported, [:string], :bool
+  ##
+	#
+	api :SDL_GL_SetAttribute, [:gl_attr, IntStruct], :int
+  ##
+	#
+	api :SDL_GL_GetAttribute, [:gl_attr, IntStruct.by_ref], :int
+  ##
+	#
+	api :SDL_GL_CreateContext, [Window.by_ref], :gl_context
+  ##
+	#
+	api :SDL_GL_MakeCurrent, [Window.by_ref, :gl_context], :int
+  ##
+	#
+	api :SDL_GL_GetCurrentWindow, [], Window.by_ref
+  ##
+	#
+	api :SDL_GL_GetCurrentContext, [], :gl_context
+  ##
+	#
+	api :SDL_GL_SetSwapInterval, [:int], :int
+  ##
+	#
+	api :SDL_GL_GetSwapInterval, [], :int
+  ##
+	#
+	api :SDL_GL_DeleteContext, [:gl_context], :void
+  ##
+	#
+	api :SDL_GL_SwapWindow, [Window.by_ref], :void
 end

data/lib/sdl2/window.rb

@@ -182,8 +182,14 @@ module SDL2
 
     # Release memory utilized by structure
     def self.release(pointer)
-      destroy_window(pointer)
+      destroy_window(self.new pointer)
     end
+        
+    def destroy
+      destroy_window(self)
+    end
+    
+    alias_method :destroy, :free
 
     # Return the brightness level
     def brightness
@@ -288,7 +294,7 @@ module SDL2
 
     # Update the window's surface
     def update_surface()
-      SDL2.update_window_surface!(self)
+      SDL2.update_window_surface!(self)      
     end
 
     # Get the window's current size
@@ -342,7 +348,7 @@ module SDL2
       position = [IntStruct.new, IntStruct.new]
       SDL2::get_window_position(self, position[0], position[1])
       x, y = position[0][:value], position[1][:value]
-      position.each{|struct|struct.pointer.free}
+      position.each(&:free)
       [x, y]
     end
 

data/spec/functional/lazy_foo_tutorial/lazy_foo_01_hello_world_spec.rb

@@ -1,25 +1,31 @@
 require_relative 'lazy_foo_helper'
 
+require 'sdl2/ttf'
+
+
 # ORIGINAL: http://lazyfoo.net/SDL_tutorials/lesson01/index2.php
 # Adapted for Ruby & SDL 2.0 as functional test by BadQuanta
 describe "LazyFoo.net: Lesson 01: Hello World" do
 
   before do
-    expect(init(:EVERYTHING)).to eq(0)
+    #expect(init(:EVERYTHING)).to eq(0)
 
     @window = Window.create(subject, :CENTERED, :CENTERED, 640, 480, :SHOWN)
 
     @screen = @window.surface
+    @screen.fill_rect(@screen.rect, [0,0,0,SDL2::ALPHA_OPAQUE])
 
     @hello = @screen.convert(SDL2.load_bmp!(img_path('hello.bmp')))
     @screen.blit_in(@hello)
+    @hello.blit_out(@screen)
     @window.update_surface
     # If you want to see it, uncomment the following:
     #delay(2000)
   end
 
   it 'loaded and optimizes hello bitmap' do
-    verify(){@hello}
+    #binding.pry
+    verify(format: :png){@hello}
   end
 
   it 'created a window surface' do
@@ -28,6 +34,7 @@ describe "LazyFoo.net: Lesson 01: Hello World" do
   end
 
   it 'draws hello to the window surface' do
+    #binding.pry
     verify(format: :png){@screen}
   end
 

data/spec/functional/lazy_foo_tutorial/lazy_foo_03_extension_libraries_spec.rb

@@ -11,6 +11,7 @@ describe "LazyFoo.net: Lesson 03: Extension Libraries" do
     @window = Window.create(subject, :CENTERED, :CENTERED, 640, 480)
     
     @screen = @window.surface
+    @screen.fill_rect(@screen.rect, [0,0,0,SDL2::ALPHA_OPAQUE])
         
     a_png = @screen.convert(Image.load!(img_path('an_example.png')))