sdl2_ffi 0.0.6 → 0.0.7

data/spec/functional/lazy_foo_tutorial/lazy_foo_01_hello_world_spec.rb

@@ -8,14 +8,13 @@ require 'sdl2/ttf'
 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)
+    @window = Window.create(title: subject, width: 640, height: 480, flags: :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')))
+    @hello = @screen.convert(SDL2::Image.load!(img_path('hello.bmp')))
     @screen.blit_in(@hello)
     @hello.blit_out(@screen)
     @window.update_surface
@@ -30,7 +29,7 @@ describe "LazyFoo.net: Lesson 01: Hello World" do
 
   it 'created a window surface' do
     expect(@window).to be_a(Window)
-    expect(@window.null?).to be_false
+    expect(@window.null?).to be_falsey
   end
 
   it 'draws hello to the window surface' do
@@ -39,7 +38,6 @@ describe "LazyFoo.net: Lesson 01: Hello World" do
   end
 
   after do
-    @hello.free
     quit()
   end
 

data/spec/functional/lazy_foo_tutorial/lazy_foo_02_optimized_images_spec.rb

@@ -12,11 +12,12 @@ describe "LazyFoo.net: Lesson 02: Optimized Images" do
   HEIGHT = 480
   # BPP = 32 #  TODO: Is this still needed?
   before do
-    @window = Window.create(subject, :CENTERED, :CENTERED, WIDTH, HEIGHT, :SHOWN)
+    init(:VIDEO)
+    @window = Window.create(title: subject, width: WIDTH, height: HEIGHT, flags: :SHOWN)
     @screen = @window.surface
     
     def load_image(file)
-      @screen.convert(SDL2.load_bmp!(file))
+      @screen.convert(SDL2::Image.load!(file))
     end
     
     @background = load_image(img_path('background.bmp'))
@@ -33,8 +34,6 @@ describe "LazyFoo.net: Lesson 02: Optimized Images" do
   
   after do
 
-    @background.free
-    @message.free
     
     quit
     

data/spec/functional/lazy_foo_tutorial/lazy_foo_03_extension_libraries_spec.rb

@@ -8,7 +8,7 @@ describe "LazyFoo.net: Lesson 03: Extension Libraries" do
   
   before do
     SDL2.init!(:EVERYTHING)
-    @window = Window.create(subject, :CENTERED, :CENTERED, 640, 480)
+    @window = Window.create(title: subject, width: 640, height: 480)
     
     @screen = @window.surface
     @screen.fill_rect(@screen.rect, [0,0,0,SDL2::ALPHA_OPAQUE])
@@ -26,7 +26,7 @@ describe "LazyFoo.net: Lesson 03: Extension Libraries" do
   end
   
   after do
-    
+    quit
   end
   
 end

data/spec/functional/lazy_foo_tutorial/lazy_foo_04_event_driven_programming_spec.rb

@@ -9,7 +9,7 @@ describe "LazyFoo.net: Lesson 04: Event Driven Programming" do
   before do
     SDL2.init!(:EVERYTHING)
 
-    @window = Window.create(subject, :CENTERED, :CENTERED, 640, 480)
+    @window = Window.create(title: subject, width: 640, height: 480)
 
     @screen = @window.surface
     @screen.fill_rect(@screen.rect, [0,0,0,SDL2::ALPHA_OPAQUE])
@@ -29,7 +29,7 @@ describe "LazyFoo.net: Lesson 04: Event Driven Programming" do
         end
       end
 
-      my_quit_event = Event.cast(QuitEvent.cast(type: :QUIT))
+      my_quit_event = Event.cast(Event::Quit.cast(type: :QUIT))
       
 
       SDL2.push_event!(my_quit_event)
@@ -45,7 +45,7 @@ describe "LazyFoo.net: Lesson 04: Event Driven Programming" do
   end
 
   it 'set the quit flag' do
-    expect(@quit).to be_true
+    expect(@quit).to be_truthy
   end
 
   after do

data/spec/functional/lazy_foo_tutorial/lazy_foo_05_color_keying_spec.rb

@@ -8,7 +8,7 @@ describe "LazyFoo.net: Lesson 05: Color Keying" do
   
   before do
     SDL2::init!(:EVERYTHING)
-    @window = Window.create(subject, :CENTERED, :CENTERED, 640, 480)
+    @window = Window.create(title: subject, width: 640, height: 480)
     @screen = @window.surface
     
     @background = @screen.convert(Image.load!(img_path('background.jpg')))

data/spec/functional/lazy_foo_tutorial/lazy_foo_06_clip_blitting_and_sprite_sheets_spec.rb

@@ -5,7 +5,7 @@ require_relative 'lazy_foo_helper'
 describe "LazyFoo.net: Lesson 06: Clip Blitting and Sprite Sheets" do
   before do
     SDL2.init!(:EVERYTHING)
-    @window = Window.create(subject, :CENTERED, :CENTERED, 640, 480)
+    @window = Window.create(title: subject, width: 640, height: 480)
     @screen = @window.surface
     @screen.fill_rect(@screen.rect, [0,0,0,ALPHA_OPAQUE])
 

data/spec/functional/lazy_foo_tutorial/lazy_foo_07_true_type_fonts_spec.rb

@@ -10,7 +10,7 @@ describe "LazyFoo.net: Lesson 07: True Type Fonts" do
     
     #binding.pry
     SDL2.init!(:EVERYTHING)
-    @window = Window.create(subject, :CENTERED, :CENTERED, 640, 480)
+    @window = Window.create(title: subject, width: 640, height: 480)
     @screen = @window.surface
     TTF.init!
     
@@ -40,11 +40,12 @@ describe "LazyFoo.net: Lesson 07: True Type Fonts" do
     @background.free
     @message.free
     @font.free
+    TTF.quit
     quit()
   end
 
   it "loads a true type font" do
-    expect(@font).to be_a SDL2::TTF::Font
+    expect(@font).to be_a(SDL2::TTF::Font)
   end
     
   it "writes a message to a surface" do

data/spec/functional/lazy_foo_tutorial/lazy_foo_08_key_presses_spec.rb

@@ -8,7 +8,8 @@ describe "LazyFoo.net: Lesson 08: Key Presses" do
 
   before do
     SDL2.init!(:EVERYTHING)
-    @window = Window.create(subject, :CENTERED, :CENTERED, 640, 480)
+    SDL2::TTF.init
+    @window = Window.create(title: subject, width: 640, height: 480)
     @screen = @window.surface
 
     @background = @screen.convert(Image.load!(img_path('background.png')))
@@ -23,11 +24,11 @@ describe "LazyFoo.net: Lesson 08: Key Presses" do
 
     # Simulated user events.  If you don't want to simulate, comment line:77
     @events = [
-      SDL2::KeyboardEvent.cast(type: :KEYDOWN, keysym: Keysym.cast(sym: :UP)),
-      SDL2::KeyboardEvent.cast(type: :KEYDOWN, keysym: Keysym.cast(sym: :DOWN)),
-      SDL2::KeyboardEvent.cast(type: :KEYDOWN, keysym: Keysym.cast(sym: :LEFT)),
-      SDL2::KeyboardEvent.cast(type: :KEYDOWN, keysym: Keysym.cast(sym: :RIGHT)),
-      SDL2::QuitEvent.cast(type: :QUIT)
+      SDL2::Event::Keyboard.cast(type: :KEYDOWN, keysym: Keysym.cast(sym: :UP)),
+      SDL2::Event::Keyboard.cast(type: :KEYDOWN, keysym: Keysym.cast(sym: :DOWN)),
+      SDL2::Event::Keyboard.cast(type: :KEYDOWN, keysym: Keysym.cast(sym: :LEFT)),
+      SDL2::Event::Keyboard.cast(type: :KEYDOWN, keysym: Keysym.cast(sym: :RIGHT)),
+      SDL2::Event::Quit.cast(type: :QUIT)
     
     ]
 
@@ -102,7 +103,8 @@ describe "LazyFoo.net: Lesson 08: Key Presses" do
 
 
   after do
-    quit()
+    SDL2.quit()
+    SDL2::TTF.quit
   end
 
 end

data/spec/functional/lazy_foo_tutorial/lazy_foo_09_mouse_events_spec.rb

@@ -1,8 +1,9 @@
 require_relative 'lazy_foo_helper'
 
-require 'sdl2/application'
+require 'bad_sdl/application'
+require 'bad_sdl/engine'
 
-class ButtonEngine < Engine
+class ButtonEngine < BadSdl::Engine
   OVER = 0
   OUT = 1
   DOWN = 2
@@ -23,10 +24,10 @@ class ButtonEngine < Engine
 
       offset = Point.cast([event.motion.x, event.motion.y])
       if @box.enclose_points(offset)
-        puts "Mouse OVER"if SDL2::PrintDebug
-        @clip = @clips[OVER]if SDL2::PrintDebug
+        SDL2::Debug.log(self){"Mouse OVER"}
+        @clip = @clips[OVER]
       else
-        puts "Mouse OUT" if SDL2::PrintDebug
+        SDL2::Debug.log(self){"Mouse OUT"}
         @clip = @clips[OUT]
       end
     end#on :MOUSEMOTION
@@ -51,7 +52,7 @@ class ButtonEngine < Engine
 
   def paint_to(surface)
     if @clip
-      puts "Painting"if SDL2::PrintDebug
+      SDL2::Debug.log(self){"Painting"}
 
       @button_sheet.blit_out(surface, @box, @clip) if @clip
       @clip = nil
@@ -69,15 +70,17 @@ end#ButtonEngine
 describe "LazyFoo.net: Lesson 09: Mouse Events" do
 
   before do
-    @application = Application.new()
+    SDL2.init!(:EVERYTHING)
+    @application = BadSdl::Application.new()
     @application.window.title = subject
     @button = ButtonEngine.new(x: 170, y: 120, w: 320, h: 240)
     @application.engines << @button
-    @application.loop(1) #Prime it
+    @application.loop(5) #Prime it
   end
 
   after do
     @application.quit()
+    SDL2.quit
   end
 
   it 'has a button sheet' do

data/spec/functional/lazy_foo_tutorial/lazy_foo_10_key_states_spec.rb

@@ -1,6 +1,6 @@
 require_relative 'lazy_foo_helper'
 
-require 'sdl2/application'
+require 'bad_sdl/application'
 
 #ORIGINAL: http://lazyfoo.net/SDL_tutorials/lesson10/index.php
 # Adapted for Ruby & SDL 2.0 as functional test by BadQuanta
@@ -8,8 +8,8 @@ require 'sdl2/application'
 describe "LazyFoo.net: Lesson 10: Key States" do
   
   before do
-    
-    @application = Application.new
+    SDL2.init!(:EVERYTHING)
+    @application = BadSdl::Application.new
     
     
     #binding.pry
@@ -17,10 +17,11 @@ describe "LazyFoo.net: Lesson 10: Key States" do
   
   after do
     @application.quit
-    
+    SDL2.quit()
   end
   
   it "can get the key states" do
+    skip "TODO: SDL2::Keyboard#get_state"
     @state = Keyboard.get_state
     expect(@state.count).to eq(512)    
   end

data/spec/functional/lazy_foo_tutorial/lazy_foo_11_playing_sounds_spec.rb

@@ -1,7 +1,7 @@
 require_relative 'lazy_foo_helper'
 
 require 'sdl2/mixer'
-require 'sdl2/application'
+require 'bad_sdl/application'
 require 'sdl2/ttf'
 
 #ORIGINAL: http://lazyfoo.net/SDL_tutorials/lesson11/index.php
@@ -9,7 +9,7 @@ require 'sdl2/ttf'
 
 describe "LazyFoo.net: Lesson 11: Playing sounds" do
 
-  class PlayingSoundsEngine < SDL2::Engine
+  class PlayingSoundsEngine < BadSdl::Engine
 
     def initialize(opts = {})
       # Initialize our engine
@@ -24,7 +24,7 @@ describe "LazyFoo.net: Lesson 11: Playing sounds" do
       @background = Image.load!(img_path('background.png'))
 
       @font = TTF::Font.open(fixture('fonts/GaroaHackerClubeBold.otf'), 30)
-
+            
       @music = Mixer::Music.load(fixture('music/beat.wav'))
 
       @scratch = Mixer::Chunk.load_wav(fixture('sounds/scratch.wav'))
@@ -77,6 +77,14 @@ describe "LazyFoo.net: Lesson 11: Playing sounds" do
         Mix::halt_music!()
         true
       end
+      
+      # Quit the program
+      on({type: :KEYDOWN, key: {keysym: {sym: :Q}}}) do |event|
+        puts "Quit the program."
+        # Emit a QUIT Signal
+        Event.push(SDL2::QuitEvent.cast({type: :QUIT}))
+      end
+        
     end#initialize
 
     def paint_to(surface)
@@ -88,10 +96,10 @@ describe "LazyFoo.net: Lesson 11: Playing sounds" do
   end
 
   before do
-
-    @app = Application.new(title: subject)
+    SDL2.init!(:EVERYTHING)
+    @app = BadSdl::Application.new(title: subject)
     @app.engines << PlayingSoundsEngine.new()
-    @screen = @app.window.surface
+    
     @app.window.title = "Monitor Music"
 
   end
@@ -105,12 +113,12 @@ describe "LazyFoo.net: Lesson 11: Playing sounds" do
     #TTF::quit()
 
     #SDL2::quit()
-
+    SDL2.quit()
   end
 
   it 'loads' do
-    #@app.loop(nil, delay: 100)
-    pending "Don't know how to test this."
+    #@app.loop(nil, delay: 1000)
+    skip "Don't know how to test this."
   end
 
 end

data/spec/functional/lazy_foo_tutorial/lazy_foo_12_timing_spec.rb

@@ -1,19 +1,20 @@
 require_relative 'lazy_foo_helper'
 
 require 'sdl2/ttf'
-require 'sdl2/application'
+require 'bad_sdl/application'
 #binding.pry
-require 'sdl2/engine/block_engine'
+require 'bad_sdl/engine/block_engine'
 
 #ORIGINAL: http://lazyfoo.net/SDL_tutorials/lesson12/index.php
 # Adapted for Ruby & SDL 2.0 as functional test by BadQuanta
 
-describe "LazyFoo.net: Lesson 11: Playing sounds" do
+describe "LazyFoo.net: Lesson 12: Timing" do
 
   before do
-    @app = SDL2::Application.new()
+    SDL2.init!(:EVERYTHING)
+    @app = BadSdl::Application.new()
 
-    @app.engines << @engine = SDL2::Engine::BlockEngine.new
+    @app.engines << @engine = BadSdl::Engine::BlockEngine.new
 
     @running = true
     @start = SDL2::get_ticks()
@@ -46,11 +47,11 @@ describe "LazyFoo.net: Lesson 11: Playing sounds" do
   end
 
   after do
-
+    SDL2.quit
   end
 
   it "works" do
-    pending "don't know how I should test this..."
+    skip "don't know how I should test this..."
     @app.loop(nil, delay: 1000)
   end
 

data/spec/functional/lazy_foo_tutorial/lazy_foo_13_advanced_timers_spec.rb

@@ -0,0 +1,85 @@
+require_relative 'lazy_foo_helper'
+require_relative 'timer'
+
+require 'bad_sdl/application'
+require 'bad_sdl/engine/block_engine'
+require 'sdl2/ttf'
+
+#ORIGINAL: http://lazyfoo.net/SDL_tutorials/lesson13/index.php
+# Adapted for Ruby & SDL 2.0 as functional test by BadQuanta
+
+
+describe "LazyFoo.net: Lesson 03: Advanced Timers" do
+
+  before do
+    SDL2.init(:EVERYTHING)
+    @app = BadSdl::Application.new title: subject
+    @engine = BadSdl::Engine::BlockEngine.new
+    @app.engines << @engine
+      
+    TTF::init!
+
+    @font = TTF::Font.open(FONT_PATH, 18)
+    @big_font = TTF::Font.open(FONT_PATH, 64)
+
+    @my_timmer = Timer.new
+    @msg_start_stop = @font.render_text_blended("Press S to start or stop the timer.")
+    @msg_pause = @font.render_text_blended("Press P to pause or unpause the timer")
+
+    @my_timer = Timer.new
+
+    @my_timer.start()
+
+    @app.on({type: :KEYDOWN, key: {keysym: {sym: :S}}}) do
+      if @my_timer.started?
+        @my_timer.stop
+      else
+        @my_timer.start
+      end
+    end
+
+    @app.on({type: :KEYDOWN, key: {keysym: {sym: :P}}}) do
+      if @my_timer.paused?
+        @my_timer.unpause
+      else
+        @my_timer.pause
+      end
+    end
+    
+    @engine.painter = Proc.new() do |surface|
+      time = @my_timer.get_ticks / 1000.0
+      @msg_seconds = @big_font.render_text_blended(time.to_s)
+      
+      surface.fill_rect(surface.rect, [0,0,0])
+      
+      @msg_seconds.blit_out(surface, {
+        x: (surface.w - @msg_seconds.w)/2,
+        y: 0
+      })
+      
+      @msg_pause.blit_out(surface, {
+        x: 0, y: (surface.h - @msg_pause.h)
+      })
+      
+      @msg_start_stop.blit_out(surface, {
+        x: (surface.w - @msg_start_stop.w),
+        y: (surface.h - @msg_start_stop.h)
+      })
+      true
+    end
+
+  end
+
+  after do
+
+    @app.quit()
+    SDL2.quit
+  end
+
+  it "works" do
+    skip "Don't know how to test this."
+    @app.loop(nil)
+
+  end
+
+end