graphics 1.0.0b6 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 37f59baac9923c3919719668065ee0c6371ea524
-  data.tar.gz: bd576413810e63a2e8e51f12669c42f5d8ba0dbb
+SHA256:
+  metadata.gz: 1d70424b07430bd3cf210e11d8bf76ec15b41231d5e1e46e8de07eaebd686e6b
+  data.tar.gz: 79b1367d8689c604560bdd1089f6a8ac98291bb7ee5240b3b2c10d48076e8d27
 SHA512:
-  metadata.gz: 4519bbe92fc69ab4c4024cd3251afb68e87aa6f6100103d4b052c2d536b662b79448f392ff57a97e8a2f889aef5da414feb8196f65624195e28437d5ff52c476
-  data.tar.gz: 1a921bf4a04063aef66d0f8eb829405a61659df355dbc6c1f2258558541dd779eabfcc39760ee10524846cf65e6793b6098f54f58975d04e7e7676e0cba33b6e
+  metadata.gz: a8ffd685c237b1b7481f984359193c744949f6a9f30b6c57495a8fbfd5a06ef10310a607112f48ce0ad5ee83d860489cd0582c213468d67c5e7b41af85324074
+  data.tar.gz: 26f3cbc67a707e7ac646e1f43066806ccf8915e7313ca7d0d2bcdfd40697b4a356796bc988ca67c5100f153ac38cac7ec7b75413c605eb3f8826c27a10305d98

data/History.rdoc

@@ -1,3 +1,91 @@
+=== 1.0.0 / 2018-11-13
+
+* 4 major enhancements:
+
+  * Everything is passing around Renderer instances now.
+  * Moved all drawing primitives to Renderer.
+  * Removed rsdl dependency. Plain ruby seems to work fine now.
+  * Updated to work with SDL2. This will break some things, but mostly works.
+
+* 58 minor enhancements:
+
+  * #bezier now takes an array of any number (> 4) of points.
+  * #blit and #put now do everything in one call. Should be more performant.
+  * #blit and #put now use the clear color of their class for the background.
+  * #clear will now warn and skip if color isn't known.
+  * #fps now takes an optional color
+  * #transform/put now explicitly rotate on their bottom-left corner. Shifting x is no longer necessary.
+  * AbstractRenderer#initialize clears and presents so frame 0 is correct color.
+  * Added DEBUG_COLOR and use it in #debug. Reversed in WhiteBackground.
+  * Added Graphics::Drawing#draw_on(texture).
+  * Added Renderer#copy_texture.
+  * Added Renderer#h and #w to return the output size.
+  * Added Renderer#new_texture
+  * Added Renderer#target and Renderer#target=
+  * Added Renderer_index to read pixels. Painfully slow in comparison.
+  * Added SDL::Screen::H & SDL::Screen::W and made available to your #initialize.
+  * Added Screen#title=.
+  * Added Surface#blit.
+  * Added Surface#clear.
+  * Added Surface.color_key.
+  * Added Window#title and Renderer#title.
+  * Added Window#update ? Do I need this?
+  * Added caching to texture in Renderer#blit. Massively speeds up boids & walker.
+  * Added default (empty) Body#update.
+  * Added unary negation to V.
+  * Alpha blending is massively improved. Black on white is black.
+  * Blit now ensures blending is on.
+  * Check for done before paused so `esc` can quit while paused.
+  * Extended Renderer#point to optionally read or write a pixel.
+  * Improved default window naming to add spaces to the classname.
+  * Moved Screen#flip to Renderer#present.
+  * Moved Screen#set_title to Window#set_title.
+  * Moving everything out of Screen class. Will remove or leave just for constants.
+  * Removed KeyEvent#unicode.
+  * Removed PixelFormat#colorkey and #alpha.
+  * Removed SDL::WM and set_caption. Set titles via screen.title=
+  * Removed Screen#update.
+  * Removed Simulation#alpha, now built into pixels directly.
+  * Removed Surface#color_key and Surface#set_color_key.
+  * Removed Surface#flags and Surface#set_alpha.
+  * Removed Surface.blit class method.
+  * Removed Surface.new. You only create surfaces via Font.render_text and #sprite.
+  * Removed bpp argument to AbstractSimulation#initialize.
+  * Removed/changed a lot of constants, mostly around KeyEvent handling.
+  * Renamed AbstractSimulation#rgb to #rgba. I think this should probably just go?
+  * Renamed PixelFormat.get_rgb to get_rgba.
+  * Renderer#fast_rect now just calls Renderer#draw_rect w/ true for filled.
+  * SDL2 properly supports RGBA. Switched to it entirely.
+  * Screen#open now stores off a renderer, window, and texture in the Surface.
+  * Screen.open no longer creates or stores a surface. Saves off its own PixelFormat.
+  * Search Ubuntu font directories in #find_font. (phiggins)
+  * Simulation now defaults to half-width and half-height. No more required args to super.
+  * Surface#save now saves off PNG.
+  * Switched Renderer and Window to subclass Data, not Surface.
+  * Switching to SDL2_gfx for primitive drawing and rotozoom.
+  * Transforms now default to anti-aliased rotations.
+  * Updated graphics_setup.sh to remove SDL1 and install SDL2 (on OSX).
+  * V#magnitude is now cached.
+  * graphics_setup.sh will install hoe if necessary.
+
+* 15 bug fixes:
+
+  * Cleaned some off-by-one drawing bugs. I think it is more pixel perfect now?
+  * Cleaned up Numeric#degrees.
+  * Finished getting to 100% rdoc coverage.
+  * Fixed a memory leak in PixelFormat. Might remove it entirely.
+  * Fixed a memory leak in collision maps.
+  * Fixed an off-by-one in blitting.
+  * Fixed bugs in hline and vline not using correct defaults. (joshcheek)
+  * Fixed circle and ellipse. Filled + anti-aliased wasn't actually anti-aliased.
+  * Fixed examples/boid.rb to rotate bodies again.
+  * Fixed examples/canvas.rb to draw in black again.
+  * Fixed fps drawing bug in rainbow_fluid.rb
+  * Fixed graphics_setup.sh and Rakefile for linux.
+  * Functional GoL: use Set vs. Array for faster search. (sotoseattle)
+  * Minor fix to examples/bounce.rb for older ruby versions.
+  * Removed Graphics::Surface::VideoMemoryLost.
+
 === 1.0.0b6 / 2016-11-17
 
 I'm still not happy with the color system. I'd love some help to make it more usable.

data/Manifest.txt

@@ -69,6 +69,8 @@ lib/graphics/trail.rb
 lib/graphics/v.rb
 resources/images/body.png
 resources/images/turret.png
+resources/sounds/attribution.txt
+resources/sounds/bullet.wav
 test/test_graphics.rb
 test/test_rainbows.rb
 test/test_sdl.rb

data/Rakefile

@@ -4,7 +4,7 @@ require "rubygems"
 require "hoe"
 
 Hoe.plugin :isolate
-Hoe.plugin :minitest, :history, :email # Hoe.plugin :seattlerb - :perforce
+Hoe.plugin :seattlerb
 Hoe.plugin :rdoc
 Hoe.plugin :git
 Hoe.plugin :compiler
@@ -17,18 +17,17 @@ Hoe.spec "graphics" do
   extension :sdl
 
   license "MIT"
-
-  dependency "rsdl", "~> 0.1"
-
-  base = "/data/www/docs.seattlerb.org"
-  rdoc_locations << "docs-push.seattlerb.org:#{base}/#{remote_rdoc_dir}"
 end
 
 task :demos => :compile do
-  Dir["examples/*.rb"].each do |script|
+  Dir["examples/*.rb"].sort.each do |script|
     puts script
-    system "rsdl -Ilib #{script}"
+    system "ruby -Ilib #{script}"
   end
 end
 
+task :sanity => :compile do
+  sh %[ruby -Ilib -rgraphics -e 'Class.new(Graphics::Simulation) { def draw n; clear :white; text "hit escape to quit", 100, 100, :black; end; }.new(500, 250, "Working!").run']
+end
+
 # vim: syntax=ruby

data/examples/boid.rb

@@ -39,18 +39,16 @@ class Boid < Graphics::Body
 
     self.velocity += v1 + v2 + v3
     limit_velocity
-    self.position += self.velocity
 
+    move
     wrap
-
-    @nearby = nil
   end
 
   def nearby
-    @nearby ||= begin
-                  p = self.position
-                  w.boids.find_all { |b| (b.position - p).magnitude.abs < @@max_distance }
-                end
+    p = self.position
+    w.boids.find_all { |b|
+      b != self && (b.position - p).magnitude < Boid.max_distance
+    }
   end
 
   def limit_velocity
@@ -60,20 +58,11 @@ class Boid < Graphics::Body
   end
 
   def center_mass
-    pos = V::ZERO
-    nearby.each do |b|
-      next if self == b
-
-      pos += b.position
-    end
-
-    size = nearby.size - 1
-
-    return self.position if size == 0
+    nearby = self.nearby
 
-    pos /= size
+    return position if nearby.empty?
 
-    pos
+    nearby.avg(V::ZERO, &:position)
   end
 
   ##
@@ -180,21 +169,17 @@ class Boid < Graphics::Body
   # enough apart for our liking.
 
   def rule2
-    c = V::ZERO
-
-    hits = 0
-
-    nearby.each do |b|
-      next if self == b
+    too_close = nearby.filter_map { |b|
       diff = b.position - self.position
-      next unless diff.magnitude.abs < TOO_CLOSE
-      hits += 1
-      c -= diff if diff.magnitude.abs < TOO_CLOSE
+      next unless diff.magnitude < TOO_CLOSE
+      diff
+    }
+
+    if too_close.empty? then
+      V::ZERO
+    else
+      -too_close.avg(V::ZERO) / 8
     end
-
-    c /= hits unless hits == 0 # average it out so they don't overdo it
-
-    c / 8
   end
 
   ##
@@ -221,21 +206,14 @@ class Boid < Graphics::Body
   #
   #   END PROCEDURE
 
-  def rule3
-    v = V::ZERO
+  def rule3 # alignment
+    nearby = self.nearby
 
-    nearby.each do |b|
-      next if self == b
-      v += b.velocity
-    end
-
-    size = nearby.size - 1
-
-    return self.velocity if size == 0
+    return velocity if nearby.empty?
 
-    v /= size unless size == 0
+    v = nearby.avg(V::ZERO, &:velocity)
 
-    (v - self.velocity) / 4
+    (v - velocity) / 4
   end
 
   class View
@@ -243,8 +221,8 @@ class Boid < Graphics::Body
       x, y, a, m = b.x, b.y, b.a, b.m
 
       w.circle x, y, Boid.max_distance, :gray if w.visual_debug?
-      w.blit w.body_img, x, y # the blit looks HORRIBLE when rotated... dunno why
       w.angle x, y, a, 3 * m, :red
+      w.blit w.body_img, x, y, a
     end
   end
 end
@@ -255,7 +233,7 @@ class Boids < Graphics::Simulation
   alias :visual_debug? :visual_debug
 
   def initialize
-    super 850, 850, 16, "Boid"
+    super 850, 850
 
     self.visual_debug = false
 
@@ -263,7 +241,7 @@ class Boids < Graphics::Simulation
     register_bodies boids
 
     self.body_img = sprite 20, 20 do
-      circle 10, 10, 5, :white, :filled
+      circle 10, 10, 5, :white, :filled, :aa
     end
   end
 
@@ -283,14 +261,18 @@ class Boids < Graphics::Simulation
   end
 end
 
-if $0 == __FILE__
-  if ARGV.first == "test"
-    require "minitest/autorun"
-  else
-    Boids.new.run
+module Enumerable
+  def filter_map &block
+    map(&block).select(&:itself)
+  end
+
+  def avg init=0, &block
+    sum(init, &block) / length
   end
 end
 
+Boids.new.run
+
 # Further tweaks
 #
 # The three boids rules sufficiently demonstrate a complex emergent
@@ -310,8 +292,8 @@ end
 #                         v1 = rule1(b)
 #                         v2 = rule2(b)
 #                         v3 = rule3(b)
-#       v4 = rule4(b)
-#          .
+#                         v4 = rule4(b)
+#                            .
 #                            .
 #                            .
 #
@@ -473,19 +455,18 @@ end
 #         PROCEDURE move_all_boids_to_new_positions()
 #
 #                 Vector v1, v2, v3, ...
-#     Boid b
+#                 Boid b
 #
 #                 FOR EACH BOID b
 #
 #                         IF b.perching THEN
-#         IF b.perch_timer > 0 THEN
-#           b.perch_timer = b.perch_timer - 1
-#           NEXT
-#         ELSE
-#           b.perching = FALSE
-#         END IF
-#       END IF
-#
+#                           IF b.perch_timer > 0 THEN
+#                             b.perch_timer = b.perch_timer - 1
+#                             NEXT
+#                           ELSE
+#                             b.perching = FALSE
+#                           END IF
+#                         END IF
 #
 #                         v1 = rule1(b)
 #                         v2 = rule2(b)

data/examples/bounce.rb

@@ -29,8 +29,8 @@ class Ball < Graphics::Body
 
   class View
     def self.draw w, b
-      w.angle b.x, b.y, b.a, 10+3*b.m, :red
-      w.circle b.x, b.y, 5, :white, :filled
+      w.angle  b.x, b.y, b.a, 10+3*b.m, :red
+      w.circle b.x, b.y, 5,             :white,   :filled
     end
   end
 end
@@ -39,7 +39,7 @@ class BounceSimulation < Graphics::Simulation
   attr_accessor :bs
 
   def initialize
-    super 640, 640, 16, "Bounce"
+    super
 
     self.bs = populate Ball
     register_bodies bs
@@ -72,7 +72,7 @@ class BounceSimulation < Graphics::Simulation
   LOG_INTERVAL = 120
 
   def log
-    puts bs.map(&:m).inject(&:+)
+    puts "%.1f" % bs.inject(0) { |ms, o| ms + o.m }
   end
 end
 

data/examples/canvas.rb

@@ -6,19 +6,19 @@ require "graphics"
 class Demo < Graphics::Simulation
   CLEAR_COLOR = :white
 
-  attr_accessor :woot, :menlo32
+  attr_accessor :woot, :big_font
   attr_accessor :rct
 
   def initialize
     super 801, 801
 
-    self.font = find_font("Menlo", 16)
-    self.menlo32 = find_font("Menlo", 32)
+    self.font = find_font(DEFAULT_FONT, 16)
+    self.big_font = find_font(DEFAULT_FONT, 32)
 
-    self.woot = render_text "woot", :black, menlo32
+    self.woot = render_text "woot", :black, big_font
 
     self.rct = sprite 50, 25 do
-      rect 0, 0, 49, 24, :blue # TODO: can't be black?!?
+      rect 0, 0, 49, 24, :black
     end
   end
 
@@ -32,18 +32,17 @@ class Demo < Graphics::Simulation
     clear
 
     (0..90).step(30) do |deg|
-      shift = (woot.h*Math.sin(D2R*deg))
-      put woot, 400-shift, 300, deg
+      put woot, 400, 300, deg
     end
-    text "woot", 400, 300, :red, menlo32
+    text "woot", 400, 300, :red, big_font
 
-    rect 550, 100, 50, 50, :blue, :filled
-    rect 575, 125, 50, 50, :blue
+    rect 550, 100, 50, 50, :black, :filled
+    rect 575, 125, 50, 50, :black
 
     ellipse 550, 200, 50, 25, :red
     ellipse 550, 250, 50, 25, :red, :filled
 
-    angle 50, 50, 90, 25, :blue
+    angle 50, 50, 90, 25, :black
 
     (0..w).step(100) do |x|
       vline x, :red
@@ -55,22 +54,24 @@ class Demo < Graphics::Simulation
       text y.to_s, 5, y+5, :black
     end
 
-    circle 200, 200, 100, :blue
-    text "circle 200, 200, 100, :blue", 100, 200, :black
+    circle 200, 200, 100, :black
+    text "circle 200, 200, 100, :black", 100, 200, :black
 
-    bezier 400, 400, 450, 700, 550, 300, 600, 600, :blue
-    text "bezier 400, 400, 450, 700, 550, 300, 600, 600, :blue", 200, 400, :black
+    bezier 400, 400, 450, 700, 550, 300, 600, 600, :black
+    text "bezier 400, 400, 450, 700, 550, 300, 600, 600, :black", 200, 400, :black
 
     angle 200, 500, A, L, :black
     text "angle 200, 500, %.2f, %.2f, :black" % [A, L], 100, 500, :black
 
     (0..90).step(30).each do |deg|
-      put rct, 500-(rct.h*Math.sin(D2R*deg)), 600, deg
+      put rct, 500, 600, deg
       angle 500, 600, deg, 50, :red
 
       blit rct, 600, 600, deg
       angle 600, 600, deg, 50, :red
     end
+    text "put  rct, 500, 600, deg", 500, 600-30, :black
+    text "blit rct, 600, 600, deg", 600, 600-60, :black
   end
 end