graphics 1.0.0b5 → 1.0.0b6

data/test/test_graphics.rb

@@ -1,10 +1,6 @@
 # -*- coding: utf-8 -*-
 
 require "minitest/autorun"
-
-$: << File.expand_path("~/Work/p4/zss/src/minitest-focus/dev/lib")
-require "minitest/focus"
-
 require "graphics"
 
 class TestBody < Minitest::Test
@@ -105,16 +101,56 @@ class TestBody < Minitest::Test
     assert_in_delta 45, b.m_a[1]
   end
 
-  def test_bounce
+  def test_bounce_east
     b.x = 99
     b.a = 45
 
-    assert_body  99,  50,     10,  45, 0, b
+    assert_body  99,  50, 10, 45, 0, b
+
+    # dist_to_wall_x = w.w - b.x             :: 1
+    # m_over_xy = b.m / Math.sqrt(2)         :: 7.0710678
+    # bounce_x = m_over_xy - dist_to_wall_x  :: 6.0710678
+
+    b.move
+    b.bounce
+
+    assert_body w.w-6.07106, 57.07106, 8, 135, 0, b
+  end
+
+  def test_bounce_west
+    b.x = 1
+    b.a = 135
+
+    assert_body  1,  50, 10, 135, 0, b
+
+    b.move
+    b.bounce
+
+    assert_body 6.07106, w.h-42.929, 8, 45, 0, b
+  end
+
+  def test_bounce_north
+    b.y = 99
+    b.a = 45
+
+    assert_body  50,  99, 10, 45, 0, b
+
+    b.move
+    b.bounce
+
+    assert_body 57.071, w.h-6.071, 8, 315, 0, b
+  end
+
+  def test_bounce_south
+    b.y = 1
+    b.a = 315
+
+    assert_body  50, 1, 10, 315, 0, b
 
     b.move
     b.bounce
 
-    assert_body  100, w.h-42.929,  8, 135, 0, b
+    assert_body 57.071, 6.071, 8, 45, 0, b
   end
 
   def test_clip
@@ -125,7 +161,7 @@ class TestBody < Minitest::Test
     b.move
     b.clip
 
-    assert_body 100, 50, 10, 0, 0, b
+    assert_body 91, 50, 10, 0, 0, b
   end
 
   def test_clip_off_wall
@@ -137,7 +173,7 @@ class TestBody < Minitest::Test
     b.move
     b.clip_off_wall
 
-    assert_body 100, 50, 10, 0, 186, b
+    assert_body 91, 50, 10, 0, 186, b
   end
 
   def test_move

data/test/test_rainbows.rb

@@ -0,0 +1,95 @@
+require 'minitest/autorun'
+require 'graphics'
+require 'graphics/rainbows'
+
+class RainbowsTest < Minitest::Test
+
+  def setup
+    @greyscale = Graphics::Greyscale.new
+    @hue = Graphics::Hue.new
+    @cubehelix = Graphics::Cubehelix.new
+  end
+
+  def test_clamping
+    assert_equal 360, @hue.clamp(10000, 0, 360)
+    assert_equal 0,   @hue.clamp(-20, 0, 360)
+  end
+
+  def test_scaling_clamps_values
+    assert_equal 360, @hue.scale(10000, 0, 360)
+    assert_equal 0,   @hue.scale(-20, 0, 360)
+  end
+
+  def test_scaling
+    # (We use assert_same instead of _equal to make sure we're
+    # really getting integers back)
+    assert_same 0,   @hue.scale(0, 0, 360)
+    assert_same 180, @hue.scale(180, 0, 360)
+    assert_same 360, @hue.scale(360, 0, 360)
+    assert_same 30,  @hue.scale(30, 0, 360)
+    # From smaller ranges
+    assert_same 0,   @hue.scale(0, 180, 360)
+    assert_same 180, @hue.scale(50, 0, 100)
+    # From larger ranges
+    assert_same 180, @hue.scale(400, 100, 900)
+  end
+
+  def test_greyscale
+    assert_equal [0, 0, 0],       @greyscale.color(0)# Black
+    assert_equal [127, 127, 127], @greyscale.color(180) # Mid-grey
+    assert_equal [255, 255, 255], @greyscale.color(360) # White
+  end
+
+  def test_rainbow_start_and_end
+    # Half a greyscale spectrum
+    assert_equal [127, 127, 127], @greyscale.color(50, 0, 100)
+    assert_equal [255, 255, 255], @greyscale.color(1000, 0, 100)
+  end
+
+  def test_hue
+    assert_equal [255, 0, 0],   @hue.color(0)   # Red
+    assert_equal [255, 127, 0], @hue.color(30)  # Orange
+    assert_equal [255, 255, 0], @hue.color(60)  # Yellow
+    assert_equal [0, 255, 0],   @hue.color(120) # Green
+    assert_equal [0, 255, 255], @hue.color(180) # Cyan
+    assert_equal [0, 0, 255],   @hue.color(240) # Blue
+    assert_equal [255, 0, 255], @hue.color(300) # Magenta
+    assert_equal [255, 0, 0],   @hue.color(360) # Red
+  end
+
+  def test_cubehelix
+    # Cubehelix reference values from James Davenport's Python implementation
+    # Using:
+    # start       = 0.5
+    # rotations   = -1.5
+    # saturation  = 1.2
+    # gamma       = 1.0
+    # NOTE(Lito): These values are slightly different from my Ruby
+    # implementation. This could be floating-point error, or because
+    # cubehelix uses a slightly different scale (1-256 vs 0-360).
+    reference_values = [[0.0, 0.0, 0.0],                              # 0
+    [0.052086060929534689, 0.34174526961141383, 0.30658807547214501], # 90
+    [0.65901854013946559, 0.46936557468373608, 0.24845035363356044],  # 180
+    [0.78295958648052344, 0.69774239781785263, 0.96714049479106534],  # 270
+    [1.0, 1.0, 1.0]]                                                  # 360
+    # Move the colors from 0-1 scale to a 0-255 scale
+    rgb_255_reference = reference_values.map do |rgb|
+      rgb.map do |color|
+        (color*255).round
+      end
+    end
+
+    def assert_arr_in_delta exp, act, delta
+      exp.zip(act) do |e, a|
+        assert_in_delta e, a, delta
+      end
+    end
+
+    assert_arr_in_delta rgb_255_reference[0], @cubehelix.color(0),   2
+    assert_arr_in_delta rgb_255_reference[1], @cubehelix.color(90),  2
+    assert_arr_in_delta rgb_255_reference[2], @cubehelix.color(180), 2
+    assert_arr_in_delta rgb_255_reference[3], @cubehelix.color(270), 2
+    assert_arr_in_delta rgb_255_reference[4], @cubehelix.color(360), 2
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphics
 version: !ruby/object:Gem::Version
-  version: 1.0.0b5
+  version: 1.0.0b6
 platform: ruby
 authors:
 - Ryan Davis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDijCCAnKgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE1MDkxOTIwNTEyMloXDTE2MDkxODIwNTEyMlowRTETMBEGA1UE
+  GRYDY29tMB4XDTE2MDkyNjAxNTczNVoXDTE3MDkyNjAxNTczNVowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -20,16 +20,17 @@ cert_chain:
   oOvjtt5P8+GSK9zLzxQP0gVLS/D0FmoE44XuDr3iQkVS2ujU5zZL84mMNqNB1znh
   GiadM9GHRaDiaxuX0cIUBj19T01mVE2iymf9I6bEsiayK/n6QujtyCbTWsAS9Rqt
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
-  gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBBQUAA4IB
-  AQB+Hx8xUgrpZa4P8H8gR8zme5kISwQrG80MbpqJV6/G3/ZicRFhN5sjwu0uHGue
-  bd9Cymf6oIRwHVarJux2M32T6bL07Hmi07w2QaPc3MnMKB/D46SRZ2JSSGPFRBTc
-  SilobMRoGs/7B15uGFUEnNrCB/ltMqhwwSx1r++UQPfeySHEV9uqu03E5Vb7J37O
-  2Er6PLXHRiYsIycD1LkMi6YnixdITRHmrqJYE2rsjaIfpIehiusVAPHkNf7qbpHq
-  qx3h45R1CAsObX0SQDIT+rRbQrtKz1GHIZTOFYvEJjUY1XmRTZupD3CJ8Q7sDqSy
-  NLq5jm1fq6Y9Uolu3RJbmycf
+  gBEfoTEGr7Zii72cx+sCAwEAAaOBhDCBgTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+  sDAdBgNVHQ4EFgQUR8V72Z3+v+2P9abCnL4wjx32T+EwIwYDVR0RBBwwGoEYcnlh
+  bmQtcnVieUB6ZW5zcGlkZXIuY29tMCMGA1UdEgQcMBqBGHJ5YW5kLXJ1YnlAemVu
+  c3BpZGVyLmNvbTANBgkqhkiG9w0BAQUFAAOCAQEAIGzgp0aZ2W9+v96ujmBcQHoC
+  buy0iU68MVj2VlxMyfr1KPZIh1OyhU4UO4zrkREcH8ML70v9cYHNvOd9oynRHnvC
+  l2tj/fD3YJ0AEkJxGrYwRWQmvMfC4bJ02bC1+rVOUIXXKp3+cUmiN4sTniof8VFo
+  bo/YYP4c7erpERa+9hrqygg6WQbJlk2YRlH3JXPFjmu869i2dcbR5ZLOAeEy+axH
+  E4oJcnPkJAr0rw504JGtlZtONZQblwmRJOIdXzolaE3NRGUzGVOUSptZppAKiavY
+  fO6tdKQc/5RfA8oQEkg8hrxA5PQSz4TOFJGLpFvIapEk6tMruQ0bHgkhr9auXg==
   -----END CERTIFICATE-----
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsdl
@@ -45,20 +46,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.1'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -93,14 +80,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.14'
+        version: '3.15'
 description: |-
   Graphics provides a simple framework to implement games and/or
   simulations and is designed to follow mathematical conventions, NOT
@@ -142,7 +129,9 @@ files:
 - examples/logo.rb
 - examples/math.rb
 - examples/maze.rb
+- examples/pi_polygon.rb
 - examples/radar.rb
+- examples/rainbow_fluid.rb
 - examples/tank.rb
 - examples/tank2.rb
 - examples/targeting.rb
@@ -185,13 +174,16 @@ files:
 - graphics_setup.sh
 - lib/graphics.rb
 - lib/graphics/body.rb
+- lib/graphics/decorators.rb
 - lib/graphics/extensions.rb
+- lib/graphics/rainbows.rb
 - lib/graphics/simulation.rb
 - lib/graphics/trail.rb
 - lib/graphics/v.rb
 - resources/images/body.png
 - resources/images/turret.png
 - test/test_graphics.rb
+- test/test_rainbows.rb
 - test/test_sdl.rb
 homepage: https://github.com/zenspider/graphics
 licenses: