graphics 1.0.0b4 → 1.0.0b5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dc93f577bc8db9cd0a1943285badd63a7a8b993
-  data.tar.gz: c83fbd5e05b5a3e9294e5271f18e17310d7c122e
+  metadata.gz: 05606dab0e932b0e2a0244bfda441d75a5e075b4
+  data.tar.gz: adbefb635747458fed5734fd2464578390376a90
 SHA512:
-  metadata.gz: a1a192627f226b8215af1e5b39bead9e16cf06c41937053e5cd2e627f6f35dff581b1d575356dea21f105f1aa46c3d49c26c3e42c9cd8906ea0eaaad50c13e58
-  data.tar.gz: a22e5142715d85c7f1bd254b7ea478ad1ea185c110d7f93a0cfcc3537d8a6586210987ee7ecde9a842c40b66b64e70e75412aa30040e96b0064087de47088acb
+  metadata.gz: ec204d93283fd260d941d1851a2bd4425278754937f36a2495b84e7b319a0b4ee2455ac81b4dea3596819c5e7070add8f5c2e062fde7cacc66be2ce1b0ff31da
+  data.tar.gz: b55da059453df3ab0358cbc278567e3546d389e1811843bf34e30cb9c2ff1424f9a8afb20aabc090c3fdcd4b130e76731a6e35affa1f0dd2110db5893f80d329

data/History.rdoc

@@ -1,3 +1,23 @@
+=== 1.0.0b5 / 2015-10-31
+
+* 10 minor enhancements:
+
+  * Added Simulation#add_keydown_handler.
+  * Added Simulation#keydown_handler, a hash of "key" -> block handlers.
+  * Added logging every N ticks for headless simulations or debugging.
+  * Switched all default key handlers to keydown handlers.
+  * add example: visualization of pi computation
+  * Improved key event handling.
+  * add example: visualization of pi computation
+  * Renamed rubysdl_setup to graphics_setup. rubysdl is out of the picture.
+  * Added example rainbow fluid simulation. (litonico)
+  * Added rainbows in greyscale, rgb-spectrum, and cubehelix. (litonico)
+
+* 2 bug fixes:
+
+  * Fixed build issues with rubygems.
+  * Switched brew install to build universal packages so it can work with stock ruby.
+
 === 1.0.0b4 / 2015-09-14
 
 * 1 major enhancement:

data/examples/bounce.rb

@@ -44,8 +44,8 @@ class BounceSimulation < Graphics::Simulation
 
   def initialize_keys
     super
-    add_key_handler :SPACE, &:randomize
-    add_key_handler :R,     &:reverse
+    add_keydown_handler " ", &:randomize
+    add_keydown_handler "r", &:reverse
   end
 
   def update n
@@ -66,12 +66,15 @@ class BounceSimulation < Graphics::Simulation
   end
 
   def reverse
-    return if @guard
-    @guard = true
     bs.each do |b|
       b.g *= -1
     end
-    @guard = false
+  end
+
+  LOG_INTERVAL = 120
+
+  def log
+    puts bs.map(&:m).inject(&:+)
   end
 end
 

data/graphics_setup.sh

@@ -11,10 +11,10 @@ done
 
 # brew update
 
-brew install sdl
-brew install sdl_mixer --with-smpeg
-brew install sdl_ttf
-brew install sdl_image
+brew install sdl       --universal
+brew install sdl_mixer --universal --with-smpeg
+brew install sdl_ttf   --universal
+brew install sdl_image --universal --without-webp
 
 if [ -f $0 ]; then
     rake clean package

data/lib/graphics.rb

@@ -2,7 +2,7 @@
 # The top-level namespace.
 
 class Graphics
-  VERSION = "1.0.0b4" # :nodoc:
+  VERSION = "1.0.0b5" # :nodoc:
 end
 
 require "graphics/simulation"

data/lib/graphics/simulation.rb

@@ -16,6 +16,9 @@ class Graphics::Simulation
   # radians to degrees
   R2D = 1 / D2R
 
+  # Call +log+ every N ticks, if +log+ is defined.
+  LOG_INTERVAL = 60
+
   # The window the simulation is drawing in.
   attr_accessor :screen
 
@@ -32,7 +35,6 @@ class Graphics::Simulation
   attr_accessor :font
 
   # A hash of color names to their values.
-
   attr_accessor :color
 
   # A hash of color values to their rgb values. For text, apparently. *shrug*
@@ -44,6 +46,9 @@ class Graphics::Simulation
   # Procs registered to handle key events.
   attr_accessor :key_handler
 
+  # Procs registered to handle keydown events.
+  attr_accessor :keydown_handler
+
   ##
   # Create a new simulation of a certain width and height. Optionally,
   # you can set the bits per pixel (0 for current screen settings),
@@ -70,6 +75,7 @@ class Graphics::Simulation
     self.iter_per_tick = 1
 
     self.key_handler = []
+    self.keydown_handler = {}
 
     initialize_keys
     initialize_colors
@@ -79,11 +85,11 @@ class Graphics::Simulation
   # Register default key events. Handles ESC & Q (quit) and P (pause).
 
   def initialize_keys
-    add_key_handler(:ESCAPE) { exit }
-    add_key_handler(:Q)      { exit }
-    add_key_handler(:P)      { self.paused = !paused }
-    add_key_handler(:SLASH)  { self.iter_per_tick += 1 }
-    add_key_handler(:MINUS)  { self.iter_per_tick -= 1; self.iter_per_tick = 1  if iter_per_tick < 1 }
+    add_keydown_handler("\e") { exit }
+    add_keydown_handler("q")  { exit }
+    add_keydown_handler("p")  { self.paused = !paused }
+    add_keydown_handler("/")  { self.iter_per_tick += 1 }
+    add_keydown_handler("-")  { self.iter_per_tick -= 1; self.iter_per_tick = 1  if iter_per_tick < 1 }
   end
 
   def initialize_colors # :nodoc:
@@ -147,11 +153,20 @@ class Graphics::Simulation
   # won't be able to quit.
 
   def handle_event event, n
-    exit if SDL::Event::Quit === event
+    case event
+    when SDL::Event::Quit then
+      exit
+    when SDL::Event::Keydown then
+      c = event.sym.chr rescue nil
+      b = keydown_handler[c]
+      b[self] if b
+    end
   end
 
   ##
-  # Register a block to run for a particular key-press.
+  # Register a block to run for a particular key-press. This allows
+  # you to register multiple blocks for the same key and also to
+  # handle multiple keys down at the same time.
 
   def add_key_handler k, remove = nil, &b
     k = SDL::Key.const_get k
@@ -159,11 +174,20 @@ class Graphics::Simulation
     key_handler.unshift [k, b]
   end
 
+  ##
+  # Register a block to run for a particular keydown event. This is a
+  # single key handler per tick and only on a key-down event.
+
+  def add_keydown_handler k, &b
+    keydown_handler[k] = b
+  end
+
   ##
   # Handle key events by looking through key_handler and running any
   # blocks that match the key(s) being pressed.
 
   def handle_keys
+    SDL::Key.scan
     key_handler.each do |k, blk|
       blk[self] if SDL::Key.press? k
     end
@@ -180,15 +204,19 @@ class Graphics::Simulation
     n = 0
     event = nil
 
+    logger = respond_to? :log
+    log_interval = self.class::LOG_INTERVAL
+
     loop do
       handle_event event, n while event = SDL::Event.poll
-      SDL::Key.scan
       handle_keys
 
       next if paused
 
       iter_per_tick.times { update n; n += 1 }
       draw_and_flip n
+
+      log if logger and n % log_interval == 0
     end
   end
 

data/test/test_graphics.rb

@@ -437,6 +437,21 @@ class TestSimulation < Minitest::Test
   # end
 end
 
+require 'graphics/rainbows'
+class TestGraphics < Minitest::Test
+  def setup
+    @t = Graphics::Simulation.new 100, 100, 16, ""
+  end
+
+  def test_registering_rainbows
+    spectrum = Graphics::Hue.new
+    @t.initialize_rainbow spectrum, "spectrum"
+    assert_equal @t.color[:red], @t.color[:spectrum_0]
+    assert_equal @t.color[:green], @t.color[:spectrum_120]
+    assert_equal @t.color[:blue], @t.color[:spectrum_240]
+  end
+end
+
 # class TestTrail < Minitest::Test
 #   def test_draw
 #     raise NotImplementedError, 'Need to write test_draw'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphics
 version: !ruby/object:Gem::Version
-  version: 1.0.0b4
+  version: 1.0.0b5
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE0MDkxNzIzMDcwN1oXDTE1MDkxNzIzMDcwN1owRTETMBEGA1UE
+  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQAFoDJRokCQdxFfOrmsKX41KOFlU/zjrbDVM9hgB/Ur999M6OXGSi8FitXNtMwY
-  FVjsiAPeU7HaWVVcZkj6IhINelTkXsxgGz/qCzjHy3iUMuZWw36cS0fiWJ5rvH+e
-  hD7uXxJSFuyf1riDGI1aeWbQ74WMwvNstOxLUMiV5a1fzBhlxPqb537ubDjq/M/h
-  zPUFPVYeL5KjDHLCqI2FwIk2sEMOQgjpXHzl+3NlD2LUgUhHDMevmgVua0e2GT1B
-  xJcC6UN6NHMOVMyAXsr2HR0gRRx4ofN1LoP2KhXzSr8UMvQYlwPmE0N5GQv1b5AO
-  VpzF30vNaJK6ZT7xlIsIlwmH
+  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
+  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
+  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
+  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
+  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
+  NLq5jm1fq6Y9Uolu3RJbmycf
   -----END CERTIFICATE-----
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsdl
@@ -117,7 +117,8 @@ description: |-
 email:
 - ryand-ruby@zenspider.com
 executables: []
-extensions: []
+extensions:
+- ext/sdl/extconf.rb
 extra_rdoc_files:
 - History.rdoc
 - Manifest.txt