graphics 1.0.0b6 → 1.0.0

data/examples/collision.rb

@@ -38,7 +38,7 @@ class Collision < Graphics::Simulation
   attr_accessor :sprites, :cmap, :tank_img
 
   def initialize
-    super 850, 850, 16, "Collision"
+    super 850, 850
 
     self.tank_img = image "resources/images/body.png"
     self.cmap = tank_img.make_collision_map

data/examples/demo.rb

@@ -34,7 +34,7 @@ class Demo < Graphics::Simulation
   attr_accessor :ball, :img, :n
 
   def initialize
-    super 800, 800, 16, "Boid"
+    super 800, 800
     self.ball = Ball.new self
     register_body ball
 

data/examples/editor.rb

@@ -9,7 +9,7 @@ class Editor < Graphics::Simulation
   alias :overlay? :overlay
 
   def initialize
-    super 850, 850, 16, self.class.name
+    super 850, 850
 
     self.overlay = true
     self.s = ""

data/examples/fluid.rb

@@ -203,7 +203,9 @@ class SPH
   end
 end
 
-class SimulationWindow < Graphics::Simulation
+class FluidDynamics < Graphics::Simulation
+  include ShowFPS
+
   WINSIZE = 500
 
   attr_reader :simulation, :s
@@ -211,7 +213,7 @@ class SimulationWindow < Graphics::Simulation
   DELTA_TIME = 0.1
 
   def initialize
-    super WINSIZE, WINSIZE, 16, "Smoothed Particle Hydrodynamics"
+    super WINSIZE, WINSIZE, "Smoothed Particle Hydrodynamics"
     @simulation = SPH.new
     @scale = 15
     @s = WINSIZE.div @scale
@@ -223,7 +225,7 @@ class SimulationWindow < Graphics::Simulation
   end
 
   def draw time
-    clear
+    super
 
     simulation.particles.each do |particle|
       pos = particle.position * s
@@ -236,10 +238,8 @@ class SimulationWindow < Graphics::Simulation
       # Velocity vectors
       p2 = pos + vel
       line(pos.x, pos.y, p2.x, p2.y, :red)
-
-      fps time
     end
   end
 end
 
-SimulationWindow.new.run
+FluidDynamics.new.run

data/examples/fluid2.rb

@@ -125,6 +125,12 @@ class Particle < Graphics::Body
   ######################################################################
   # Helpers
 
+  ##
+  # A weighting function (kernel) for the contribution of each neighbor
+  # to a particle's density. Forms a nice smooth gradient from the center
+  # of a particle to H, where it's 0
+  #
+
   def weight r, h
     len_r = r.magnitude
 
@@ -135,6 +141,12 @@ class Particle < Graphics::Body
     end
   end
 
+  ##
+  # Gradient ( that is, V(dx, dy) ) of a weighting function for
+  # a particle's pressure. This weight function is spiky (not flat or
+  # smooth at x=0) so particles close together repel strongly.
+  #
+
   def gradient_weight_spiky r, h
     len_r = r.magnitude
 
@@ -145,6 +157,11 @@ class Particle < Graphics::Body
     end
   end
 
+  ##
+  # The laplacian of a weighting function that tends towards infinity when
+  # approching 0 (slows down particles moving faster than their neighbors)
+  #
+
   def laplacian_weight_viscosity r, h
     len_r = r.magnitude
 
@@ -162,7 +179,9 @@ class Float
   end
 end
 
-class FluidDynamics < Graphics::Simulation
+class FluidDynamics2 < Graphics::Simulation
+  include ShowFPS
+
   WINSIZE = 500
   SCALE = 15
   S = WINSIZE / SCALE
@@ -170,7 +189,7 @@ class FluidDynamics < Graphics::Simulation
   attr_accessor :particles, :scale
 
   def initialize
-    super WINSIZE, WINSIZE, 16, "Smoothed Particle Hydrodynamics"
+    super WINSIZE, WINSIZE, "Smoothed Particle Hydrodynamics"
 
     self.particles = []
     self.scale = SCALE
@@ -187,12 +206,6 @@ class FluidDynamics < Graphics::Simulation
     register_bodies particles
   end
 
-  def draw n
-    super
-
-    fps n
-  end
-
   def update n
     particles.each(&:clear)
     particles.each(&:calculate_density)
@@ -201,4 +214,4 @@ class FluidDynamics < Graphics::Simulation
   end
 end
 
-FluidDynamics.new.run
+FluidDynamics2.new.run

data/examples/gol.rb

@@ -85,7 +85,7 @@ class LitoGolSimulation < Graphics::Simulation
   SIZE, WIDTH = 10, 64
 
   def initialize
-    super 640, 640, 16, "Conway's Game of Life"
+    super 640, 640, "Conway's Game of Life"
 
     self.gol = LitoGol.new WIDTH
   end

data/examples/gol2.rb

@@ -1,22 +1,13 @@
 #!/usr/bin/ruby -w
 
 require "graphics"
-
-class Array
-  def sorted_include? o
-    a, b = o
-    !!bsearch { |(x, y)|
-      c = a - x
-      c.zero? ? b - y : c
-    }
-  end
-end
+require "set"
 
 class ZenspiderGol
   delta   = [-1, 0, 1]
   same    = [0, 0]
 
-  DELTAS  = (delta.product(delta) - [same]).sort
+  DELTAS  = (delta.product(delta) - [same])
   MIN     = { true => 2, false => 3 }
 
   @@neighbors = Hash.new { |h, k| h[k] = {} }
@@ -25,30 +16,30 @@ class ZenspiderGol
   attr_accessor :cache
 
   def initialize
-    self.cells = []
+    self.cells = Set.new
   end
 
   def randomize n, pct
     m = ((n*n) * pct).to_i
     dimensions = n.times.to_a
-    cells.replace dimensions.product(dimensions).sample(m).sort
+    self.cells = dimensions.product(dimensions).sample(m).to_set
   end
 
   def update
-    cells.replace considered.select { |(x, y)| alive? x, y }.sort
+    cells.replace considered.keep_if { |c| alive? c }
   end
 
   def considered
-    cells.map { |(x, y)| neighbors_for(x, y) }.flatten(1).uniq
+    cells.to_a.map { |c| neighbors_for c }.flatten(1).uniq
   end
 
-  def alive? x, y
-    count = (neighbors_for(x, y) & cells).size
-    min   = MIN[cells.sorted_include? [x, y]]
-    count.between? min, 3
+  def alive? c
+    neighbors_for(c).count { |o| cells.include? o }
+                    .between? MIN[cells.include? c], 3
   end
 
-  def neighbors_for x, y
+  def neighbors_for c
+    x, y = c
     @@neighbors[x][y] ||=
       DELTAS.map { |(dx, dy)| [x+dx, y+dy] }.reject { |(m, n)| m < 0 || n < 0 }
   end
@@ -60,7 +51,7 @@ class ZenspiderGolSimulation < Graphics::Simulation
   SIZE, WIDTH = 10, 64
 
   def initialize
-    super 640, 640, 16, "Conway's Game of Life"
+    super 640, 640, "Conway's Game of Life"
 
     self.gol = ZenspiderGol.new
     gol.randomize WIDTH, 0.15
@@ -69,7 +60,8 @@ class ZenspiderGolSimulation < Graphics::Simulation
   def draw n
     clear
 
-    gol.cells.each do |(x, y)|
+    gol.cells.each do |c|
+      x, y = c
       ellipse x*SIZE, y*SIZE, (SIZE-1)/2, (SIZE-1)/2, :white, :filled
     end
 

data/examples/math.rb

@@ -6,7 +6,7 @@ class MathSimulation < Graphics::Simulation
   CLEAR_COLOR = :white
 
   def initialize
-    super 640, 640, 16, "Math"
+    super 640, 640
   end
 
   def draw n

data/examples/pi_polygon.rb

@@ -27,7 +27,6 @@ class Polygnome < Array
 
     if size > 2
       sort_radar
-      SDL::WM.set_caption compute_pi, ''
     end
   end
 
@@ -65,8 +64,8 @@ class Bouncer < Graphics::Body
     self.trail = Graphics::Trail.new(w, 6, color = :red)
     @s = w
     @r = w.r
-    @x = rand(w.screen.w/4) + w.r
-    @y = rand(w.screen.h/4) + w.r
+    @x = rand(w.renderer.w/4) + w.r
+    @y = rand(w.renderer.h/4) + w.r
     @a = random_angle
     @m = magnitude
   end
@@ -135,6 +134,12 @@ class PiPolygon < Graphics::Simulation
     BALLS.times { @balls << Bouncer.new(self, MAGND) }
   end
 
+  def update n
+    super
+
+    self.renderer.title = poly.compute_pi
+  end
+
   def draw n
     super
     circle @r, @r, @r, :green

data/examples/radar.rb

@@ -2,11 +2,11 @@
 
 require "graphics"
 
-class TargetSimulation < Graphics::Simulation
+class Radar < Graphics::Simulation
   CLEAR_COLOR = :darker_green
 
   def initialize
-    super 640, 640, 16, "Target Practice"
+    super 640, 640
 
     register_color :darker_green,  0, 16,  0
     register_color :dark_green,   64, 96, 64
@@ -30,4 +30,4 @@ class TargetSimulation < Graphics::Simulation
   end
 end
 
-TargetSimulation.new.run
+Radar.new.run

data/examples/rainbow_fluid.rb

@@ -109,6 +109,7 @@ class SPH
   end
 
   def calculate_density
+    # TODO: Switch to partitioning for better speed
     # Calculate fluid density around each particle
     particles.each do |particle|
       particles.each do |neighbor|
@@ -212,7 +213,7 @@ class SimulationWindow < Graphics::Simulation
   DELTA_TIME = 0.1
 
   def initialize
-    super WINSIZE, WINSIZE, 16, "Smoothed Particle Hydrodynamics"
+    super WINSIZE, WINSIZE, "Smoothed Particle Hydrodynamics"
     @simulation = SPH.new
     @scale = 15
     @s = WINSIZE.div @scale
@@ -234,9 +235,9 @@ class SimulationWindow < Graphics::Simulation
 
       # Particles
       circle(pos.x, pos.y, 5, "cubehelix_#{color}".to_sym, true)
-
-      fps time
     end
+
+    fps time
   end
 end
 

data/examples/tank.rb

@@ -106,6 +106,7 @@ class Bullet < Graphics::Body
     self.a = a
     self.m = m + 5
     w.bullets << self
+    w.bullet_snd.play
   end
 
   def update
@@ -121,22 +122,25 @@ class Bullet < Graphics::Body
   end
 end
 
-class TargetSimulation < Graphics::Simulation
+class Tanks < Graphics::Simulation
   attr_accessor :tank, :bullets
   attr_accessor :body_img
   attr_accessor :turret_img
+  attr_accessor :bullet_snd
 
   def initialize
-    super 640, 640, 16, "Target Practice"
+    super 640, 640
 
     self.tank = Tank.new self
     self.bullets = []
 
+    open_mixer 8
     register_body tank
     register_bodies bullets
 
     self.body_img   = image "resources/images/body.png"
     self.turret_img = image "resources/images/turret.png"
+    self.bullet_snd = audio "resources/sounds/bullet.wav"
   end
 
   def initialize_keys
@@ -158,4 +162,4 @@ class TargetSimulation < Graphics::Simulation
   end
 end
 
-TargetSimulation.new.run
+Tanks.new.run

data/examples/tank2.rb

@@ -106,13 +106,13 @@ class Bullet
   end
 end
 
-class TargetSimulation < Graphics::Simulation
+class TankSprites < Graphics::Simulation
   attr_accessor :tank, :bullets
   attr_accessor :body_img
   attr_accessor :turret_img
 
   def initialize
-    super 640, 640, 16, "Target Practice"
+    super 640, 640
 
     self.tank = Tank.new w/2, h/2
     self.bullets = []
@@ -169,4 +169,4 @@ class TargetSimulation < Graphics::Simulation
   end
 end
 
-TargetSimulation.new.run
+TankSprites.new.run

data/examples/targeting.rb

@@ -2,13 +2,13 @@
 
 require "graphics"
 
-class TargetSimulation < Graphics::Simulation
+class Targeting < Graphics::Simulation
   CLEAR_COLOR = :darker_green
 
   attr_accessor :bombs
 
   def initialize
-    super 640, 640, 16, "Target Practice"
+    super 640, 640
 
     self.bombs = []
     register_color :darker_green,  0, 16,  0
@@ -45,4 +45,4 @@ class TargetSimulation < Graphics::Simulation
   end
 end
 
-TargetSimulation.new.run
+Targeting.new.run

data/examples/vants.rb

@@ -15,7 +15,7 @@ class Vant < Graphics::Body
   def initialize w
     super
     self.a = random_angle
-    self.s = w.screen
+    self.s = w.renderer
 
     self.white = w.color[:white]
     self.black = w.color[:black]
@@ -23,10 +23,9 @@ class Vant < Graphics::Body
 
   def update
     move_by a, M
-    mutate
   end
 
-  def mutate
+  def draw
     if s[x, y] == white then
       s[x, y] = black
       turn 270
@@ -43,11 +42,21 @@ class Vants < Graphics::Drawing
   CLEAR_COLOR = :white
 
   def initialize
-    super 850, 850, 16, self.class.name
+    super 850, 850
 
     self.vs = populate Vant
     register_bodies vs
   end
+
+  def draw n
+    draw_on texture do
+      _bodies.each do |a|
+        a.each do |v|
+          v.draw
+        end
+      end
+    end
+  end
 end
 
 Vants.new.run if $0 == __FILE__