graphics 1.0.0b1 → 1.0.0b4

data/test/test_graphics.rb

@@ -190,6 +190,42 @@ class TestBody < Minitest::Test
 
     assert_body   0, 50, 10, 0, 0, b # TODO: maybe should be 9?
   end
+
+  def test_angle_to
+    # b is at 50, 50
+
+    b2 = Graphics::Body.new w
+
+    b2.x, b2.y = 60, 50
+    assert_in_epsilon 0, b.angle_to(b2)
+
+    b2.x, b2.y = 50, 40
+    assert_in_epsilon 270, b.angle_to(b2)
+
+    b2.x, b2.y = 60, 60
+    assert_in_epsilon 45, b.angle_to(b2)
+
+    b2.x, b2.y = 0, 0
+    assert_in_epsilon 225, b.angle_to(b2)
+  end
+
+  def test_distance_to_squared
+    # b is at 50, 50
+
+    b2 = Graphics::Body.new w
+
+    b2.x, b2.y = 60, 50
+    assert_in_epsilon 100, b.distance_to_squared(b2)
+
+    b2.x, b2.y = 50, 40
+    assert_in_epsilon 100, b.distance_to_squared(b2)
+
+    b2.x, b2.y = 60, 60
+    assert_in_epsilon((10*Math.sqrt(2))**2, b.distance_to_squared(b2))
+
+    b2.x, b2.y = 0, 0
+    assert_in_epsilon((50*Math.sqrt(2))**2, b.distance_to_squared(b2))
+  end
 end
 
 class TestInteger < Minitest::Test
@@ -234,7 +270,7 @@ class TestSimulation < Minitest::Test
 
       s = []
 
-      def s.method_missing(*a)
+      def s.method_missing *a
         @data ||= []
         @data << a
       end
@@ -244,7 +280,6 @@ class TestSimulation < Minitest::Test
       end
 
       self.screen = s
-
     end
   end
 
@@ -257,21 +292,23 @@ class TestSimulation < Minitest::Test
   end
 
   def test_angle
+    h = t.h-1
+
     t.angle 50, 50, 0, 10, :white
-    exp << [:draw_line, 50, 50, 60.0, 50.0, white, :antialiased]
+    exp << [:draw_line, 50, h-50, 60.0, h-50.0, white]
 
     t.angle 50, 50, 90, 10, :white
-    exp << [:draw_line, 50, 50, 50.0, 40.0, white, :antialiased]
+    exp << [:draw_line, 50, 49, 50.0, h-60.0, white]
 
     t.angle 50, 50, 180, 10, :white
-    exp << [:draw_line, 50, 50, 40.0, 50.0, white, :antialiased]
+    exp << [:draw_line, 50, h-50, 40.0, h-50.0, white]
 
     t.angle 50, 50, 270, 10, :white
-    exp << [:draw_line, 50, 50, 50.0, 60.0, white, :antialiased]
+    exp << [:draw_line, 50, h-50, 50.0, h-40.0, white]
 
     t.angle 50, 50, 45, 10, :white
     d45 = 10 * Math.sqrt(2) / 2
-    exp << [:draw_line, 50, 50, 50+d45, 50-d45, white, :antialiased]
+    exp << [:draw_line, 50, h-50, 50+d45, h-50-d45, white]
 
     assert_equal exp, t.screen.data
   end
@@ -306,7 +343,9 @@ class TestSimulation < Minitest::Test
 
   def test_ellipse
     t.ellipse 0, 0, 25, 25, :white
-    exp << [:draw_ellipse, 0, t.h-0, 25, 25, t.color[:white], false, :antialiased]
+
+    h = t.h-1
+    exp << [:draw_ellipse, 0, h, 25, 25, t.color[:white]]
 
     assert_equal exp, t.screen.data
   end
@@ -329,8 +368,8 @@ class TestSimulation < Minitest::Test
 
   def test_hline
     t.hline 42, :white
-    h = t.h
-    exp << [:draw_line, 0, h-42, 100, h-42, t.color[:white], :antialiased]
+    h = t.h - 1
+    exp << [:draw_line, 0, h-42, 100, h-42, t.color[:white]]
 
     assert_equal exp, t.screen.data
   end
@@ -341,13 +380,14 @@ class TestSimulation < Minitest::Test
 
   def test_line
     t.line 0, 0, 25, 25, :white
-    h = t.h
-    exp << [:draw_line, 0, h-0, 25, h-25, t.color[:white], :antialiased]
+    h = t.h - 1
+    exp << [:draw_line, 0, h, 25, h-25, t.color[:white]]
 
     assert_equal exp, t.screen.data
   end
 
   def test_point
+    skip "not yet"
     t.point 2, 10, :white
 
     exp = [nil, nil, t.color[:white]]

data/test/test_sdl.rb

@@ -0,0 +1 @@
+# TODO

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: graphics
 version: !ruby/object:Gem::Version
-  version: 1.0.0b1
+  version: 1.0.0b4
 platform: ruby
 authors:
 - Ryan Davis
@@ -29,7 +29,7 @@ cert_chain:
   xJcC6UN6NHMOVMyAXsr2HR0gRRx4ofN1LoP2KhXzSr8UMvQYlwPmE0N5GQv1b5AO
   VpzF30vNaJK6ZT7xlIsIlwmH
   -----END CERTIFICATE-----
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsdl
@@ -46,61 +46,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rubysdl
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
+        version: '5.8'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.6'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: |-
   Graphics provides a simple framework to implement games and/or
   simulations and is designed to follow mathematical conventions, NOT
@@ -124,33 +124,64 @@ extra_rdoc_files:
 - README.rdoc
 files:
 - .autotest
-- .gemtest
 - History.rdoc
 - Manifest.txt
 - README.rdoc
 - Rakefile
 - examples/boid.rb
 - examples/bounce.rb
+- examples/canvas.rb
 - examples/collision.rb
 - examples/demo.rb
 - examples/editor.rb
 - examples/fluid.rb
 - examples/fluid2.rb
-- examples/lito.rb
-- examples/lito2.rb
+- examples/gol.rb
+- examples/gol2.rb
 - examples/logo.rb
 - examples/math.rb
+- examples/maze.rb
 - examples/radar.rb
 - examples/tank.rb
 - examples/tank2.rb
 - examples/targeting.rb
 - examples/vants.rb
 - examples/walker.rb
-- examples/zenspider1.rb
-- examples/zenspider2.rb
-- examples/zenspider3.rb
-- examples/zenspider4.rb
+- examples/walker2.rb
 - examples/zombies.rb
+- ext/sdl/extconf.rb
+- ext/sdl/sdl.c
+- ext/sdl/sge/INSTALL
+- ext/sdl/sge/LICENSE
+- ext/sdl/sge/Makefile
+- ext/sdl/sge/Makefile.conf
+- ext/sdl/sge/README
+- ext/sdl/sge/Todo
+- ext/sdl/sge/WhatsNew
+- ext/sdl/sge/sge.h
+- ext/sdl/sge/sge_blib.cpp
+- ext/sdl/sge/sge_blib.h
+- ext/sdl/sge/sge_bm_text.cpp
+- ext/sdl/sge/sge_bm_text.h
+- ext/sdl/sge/sge_collision.cpp
+- ext/sdl/sge/sge_collision.h
+- ext/sdl/sge/sge_config.h
+- ext/sdl/sge/sge_internal.h
+- ext/sdl/sge/sge_misc.cpp
+- ext/sdl/sge/sge_misc.h
+- ext/sdl/sge/sge_primitives.cpp
+- ext/sdl/sge/sge_primitives.h
+- ext/sdl/sge/sge_rotation.cpp
+- ext/sdl/sge/sge_rotation.h
+- ext/sdl/sge/sge_shape.cpp
+- ext/sdl/sge/sge_shape.h
+- ext/sdl/sge/sge_surface.cpp
+- ext/sdl/sge/sge_surface.h
+- ext/sdl/sge/sge_textpp.cpp
+- ext/sdl/sge/sge_textpp.h
+- ext/sdl/sge/sge_tt_text.cpp
+- ext/sdl/sge/sge_tt_text.h
+- graphics_setup.sh
 - lib/graphics.rb
 - lib/graphics/body.rb
 - lib/graphics/extensions.rb
@@ -159,9 +190,9 @@ files:
 - lib/graphics/v.rb
 - resources/images/body.png
 - resources/images/turret.png
-- rubysdl_setup.sh
 - test/test_graphics.rb
-homepage: https://github.com/seattlerb/graphics
+- test/test_sdl.rb
+homepage: https://github.com/zenspider/graphics
 licenses:
 - MIT
 metadata: {}

data/examples/lito.rb

@@ -1,108 +0,0 @@
-require 'matrix'
-
-class Matrix
-  def rotate x, y
-    # I can't find a neat matrix-math solution for
-    # this, so let's do it with regular 'ol `map`.
-    Matrix[ *self.to_a.rotate(y).map {|row| row.rotate x} ]
-  end
-
-  # Pad or shrink a matrix
-  def take x, y
-    Matrix.build(y, x){|i, j| if self[i, j].nil? then 0 else self[i, j] end }
-  end
-
-  # Bitwise operations on boolean matrices
-  def & other
-    Matrix.Raise ErrDimensionMismatch unless
-      self.row_count == other.row_count and
-      self.column_count == other.column_count
-
-    Matrix.build(self.row_count){|i, j| self[i, j] & other[i, j] }
-  end
-
-  def | other
-    Matrix.Raise ErrDimensionMismatch unless
-      self.row_count == other.row_count and
-      self.column_count == other.column_count
-
-    Matrix.build(self.row_count){|i, j| self[i, j] | other[i, j] }
-  end
-end
-
-def sum l
-  l.reduce :+
-end
-
-def twos grid
-  grid.map{|i| if i == 2 then 1 else 0 end}
-end
-
-def threes grid
-  grid.map{|i| if i == 3 then 1 else 0 end}
-end
-
-AROUND = [-1, 0, 1].product([-1, 0, 1])
-
-def neighbors grid
-  sum(AROUND.map{|x, y| grid.rotate x, y } ) - grid
-end
-
-def life grid
-  ((twos neighbors grid) & grid) | (threes neighbors grid)
-end
-
-size, width, count = 10, 64, 256
-
-require "sdl"
-
-SDL.init SDL::INIT_VIDEO
-SDL::WM::set_caption "Conway's Game of Life", "Conway's Game of Life"
-
-screen = SDL::Screen.open 640, 640, 16, SDL::HWSURFACE|SDL::DOUBLEBUF
-
-black = screen.format.map_rgb   0,   0,   0
-white = screen.format.map_rgb 255, 255, 255
-
-w, h = screen.w, screen.h
-
-matrix = Matrix[[1, 1, 1],
-                [0, 0, 1],
-                [1, 1, 1]].take(width, width).rotate(-(width/2), -(width/2))
-
-paused = false
-step = false
-(1..(1.0/0)).each do |n|
-  puts n if n % 100 == 0
-
-  screen.fill_rect 0, 0, w, h, black
-
-  matrix.to_a.each_with_index do |row, y|
-    row.each_with_index do |c, x|
-      if c == 1 then
-        screen.fill_rect x*size, y*size, size-1, size-1, white
-      end
-    end
-  end
-
-  screen.flip
-
-  while event = SDL::Event.poll
-    case event
-    when SDL::Event::KeyDown then
-      c = event.sym.chr
-      exit if c == "q" or c == "Q" or c == "\e"
-      step = true if c == " "
-      puts n
-      paused = ! paused
-    when SDL::Event::Quit then
-      exit
-    end
-  end
-
-  matrix = life matrix unless paused
-  if step then
-    paused = true
-    step = false
-  end
-end

data/examples/zenspider1.rb

@@ -1,93 +0,0 @@
-#!/usr/bin/ruby -w
-
-srand 42
-
-class GameOfLife
-  attr_accessor :cells
-  attr_accessor :cache
-
-  def initialize
-    self.cells = []
-  end
-
-  def randomize n, m
-    dimensions = n.times.to_a
-    cells.replace dimensions.product(dimensions).sample(m).sort
-  end
-
-  def run max = 1.0 / 0
-    (1..max).each do |n|
-      yield n
-      update
-    end
-  end
-
-  def update
-    cells.replace considered.select { |(x, y)| alive? x, y }.sort
-  end
-
-  def considered
-    cells.map { |(x, y)| neighbors_for(x, y) }.flatten(1).uniq
-  end
-
-  MIN = { true => 2, false => 3 }
-
-  def alive? x, y
-    count = (neighbors_for(x, y) & cells).size
-    min   = MIN[cells.include? [x, y]]
-    count.between? min, 3
-  end
-
-  delta  = [-1, 0, 1]
-  same   = [0, 0]
-  DELTAS = (delta.product(delta) - [same])
-
-  @@neighbors = Hash.new { |h, k| h[k] = {} }
-
-  def neighbors_for x, y
-    DELTAS.map { |(dx, dy)| [x+dx, y+dy] }.reject { |(m, n)| m < 0 || n < 0 }
-  end
-end
-
-size, width, count = 20, 32, 512
-
-gol = GameOfLife.new
-gol.randomize width, count
-
-if ARGV.first == "prof" then
-  gol.run 50 do |n|
-    $stderr.print "."
-  end
-  warn "done"
-else
-  require "sdl"
-
-  SDL.init SDL::INIT_VIDEO
-  SDL::WM::set_caption "Conway's Game of Life", "Conway's Game of Life"
-
-  screen = SDL::Screen.open 640, 640, 16, SDL::DOUBLEBUF
-
-  black = screen.format.map_rgb   0,   0,   0
-  white = screen.format.map_rgb 255, 255, 255
-
-  w, h = screen.w, screen.h
-
-  gol.run do
-    screen.fill_rect 0, 0, w, h, black
-
-    gol.cells.each do |(x, y)|
-      screen.fill_rect x*size, y*size, size-1, size-1, white
-    end
-
-    screen.flip
-
-    while event = SDL::Event.poll
-      case event
-      when SDL::Event::KeyDown,  SDL::Event::Quit
-        exit
-      end
-    end
-
-    gol.update
-  end
-end