doomfire 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67bdf9fa995a19a70b46f2707adc899ee31780968ffb9f1d0fe4544f6f225313
-  data.tar.gz: 9d1234e1894955dd50614b9bbf85edcb0a2665980baac220fb23696568e27792
+  metadata.gz: 89b6b146226294362b53ab49479381e4fd58ebba7481ecfd1c8f2106ad8e1714
+  data.tar.gz: 9141d2f4f5ffcf4be8b4a3447db05a8b08158b916c9914184d3a48a4e26e4b21
 SHA512:
-  metadata.gz: e596f6b9b137e0343a106a2ee6d9371389ad88c0877ebbe7f72a919ecd60488c0012afb71ee63fa6b3dc226607d37ca32ffeafe139114e14e328f6df37a0fb66
-  data.tar.gz: f9e5d75205b31479ffffdb22014e2f965223dd58c9aa0fab17b5e7b5581b8ba2f5d2d932d3af3daa31b7892ad67563733e18ffc876276926403071f0273b253c
+  metadata.gz: 45a8f024ba820a3aca42ae5a64e6bef4a2cb2388f17a2f7174da05d4aa56cda344dcbea2b802275569969e6110f53097d5a1d3b8fa82d1c41da405812cdcd623
+  data.tar.gz: 16362cf09982cc961aab53e7034c2f0060a0272539300db4a08f6583635a1030e26d9047cd723033dd13027ad869697bb3f98c675bae5b17eba7d3ff80afacdb

data/CHANGELOG.md

@@ -1,8 +1,14 @@
+# 0.3.1
+
+- [x] Updated documentation
+- [x] Switched SDL window to 320x240
+- [x] Don't explode if there's no libsDL2 installed
+
 # 0.3.0
 
-- [ ] SDL output in progress.
-- [ ] Improve SDL performance
-- [ ] https://stackoverflow.com/questions/20753726/rendering-pixels-from-array-of-rgb-values-in-sdl-1-2/36504803#36504803
+- [x] SDL output in progress.
+- [x] Improve SDL performance
+- [x] Fixed accidental bug breaking terminal/spinner output
 
 # 0.2.0
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    doomfire (0.3.0)
+    doomfire (0.3.1)
       paint
 
 GEM

data/README.md

@@ -55,6 +55,20 @@ end
 
 This will run the fire in a separate thread while your rake tasks works in the main thread, and at the end of the task it will gracefully extinguish the fire and clear the terminal.
 
+## SDL
+
+Now with actual pixel manipulation! You can set the output to use the SDL2 library, which will put the output in a graphical window. It's a bit restricted right now to a small window and sometimes blows up, so I consider it a bit of an experiment.
+
+You need [libSDL2](http://www.libsdl.org/download-2.0.php) installed on your system (most likely through Homebrew, apt or whatever your system uses). The doomfire executable script will complain if you don't have it.
+
+    $ brew install sdl2
+
+Then you can run the executable:
+
+    $ doomfire --sdl
+
+And the output should be shown in a separate window. Closing the window will end the program after a few seconds of the ending animation.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/marcinruszkiewicz/doomfire.

data/exe/doomfire

@@ -21,4 +21,14 @@ OptionParser.new do |opts|
   end
 end.parse!
 
-options[:sdl] ? Doomfire::SDL.new.run : Doomfire::Terminal.new.run
+if options[:sdl]
+  begin
+    require 'doomfire/ffi_sdl'
+    require 'doomfire/sdl'
+    Doomfire::SDL.new.run
+  rescue Fiddle::DLError
+    puts 'You need to install libSDL2 to use the SDL output.'
+  end
+else
+  Doomfire::Terminal.new.run
+end

data/lib/doomfire.rb

@@ -3,7 +3,5 @@
 require 'doomfire/base'
 require 'doomfire/terminal'
 require 'doomfire/spinner'
-require 'doomfire/ffi_sdl'
-require 'doomfire/sdl'
 require 'doomfire/version'
 require 'doomfire/window_size'

data/lib/doomfire/ffi_sdl.rb

@@ -21,7 +21,6 @@ module Doomfire
     SDL_QUIT = 0x100
     SDL_KEYDOWN = 0x300
     SDL_PIXELFORMAT_ARGB8888 = 372_645_892
-    SDL_TEXTUREACCESS_STATIC = 0
     SDL_TEXTUREACCESS_STREAMING = 1
 
     SDL_Event = union [

data/lib/doomfire/sdl.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'pry'
-
 module Doomfire
   # Output to a separate SDL window
   class SDL < Base
@@ -89,14 +87,14 @@ module Doomfire
     end
 
     def prepare_output
-      @fire_width = 640
-      @fire_height = 480
+      @fire_width = 320
+      @fire_height = 240
 
       FFI_SDL.SDL_Init(FFI_SDL::SDL_INIT_VIDEO)
       @window = FFI_SDL.SDL_CreateWindow(
         'Doomfire.rb',
-        FFI_SDL::SDL_WINDOWPOS_UNDEFINED,
-        FFI_SDL::SDL_WINDOWPOS_UNDEFINED,
+        FFI_SDL::SDL_WINDOWPOS_CENTERED,
+        FFI_SDL::SDL_WINDOWPOS_CENTERED,
         @fire_width,
         @fire_height,
         FFI_SDL::SDL_WINDOW_OPENGL

data/lib/doomfire/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Doomfire
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doomfire
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Marcin Ruszkiewicz