graphics 1.0.0b1 → 1.0.0b4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6db37414cb4bf4a73f707c922329202ada329be1
-  data.tar.gz: 57d39f17362848aa3c4e896ca5eee74f10bdac56
+  metadata.gz: 0dc93f577bc8db9cd0a1943285badd63a7a8b993
+  data.tar.gz: c83fbd5e05b5a3e9294e5271f18e17310d7c122e
 SHA512:
-  metadata.gz: 907e6750f1311907d6083bbb09e87b51ad32c401b8990aa47ccb5645bc98c362ab2d9d4d41057b8dfab858a0370b402da7a53ce001647c8ce202f7a9125e1565
-  data.tar.gz: 6f4edf4b031ca928dda681d270c885870ed3be0a536028290c7a0d629edec1d28092a6e2a8db6aa177865632d8bfe2601d51caa370dead3a40887c01ad3a253a
+  metadata.gz: a1a192627f226b8215af1e5b39bead9e16cf06c41937053e5cd2e627f6f35dff581b1d575356dea21f105f1aa46c3d49c26c3e42c9cd8906ea0eaaad50c13e58
+  data.tar.gz: a22e5142715d85c7f1bd254b7ea478ad1ea185c110d7f93a0cfcc3537d8a6586210987ee7ecde9a842c40b66b64e70e75412aa30040e96b0064087de47088acb

data/History.rdoc

@@ -1,3 +1,33 @@
+=== 1.0.0b4 / 2015-09-14
+
+* 1 major enhancement:
+
+  * MAJOR rewrite. Replaced rubysdl with my own C extension.
+    * This unencumbers me from rubysdl, which was incomplete, LGPL, and hasn't had a commit in over a year.
+
+* 11 minor enhancements:
+
+  * Added Body#angle_to
+  * Added Body#distance_to_squared
+  * Added Simulation#iter_per_tick and changed update to run that number of
+  * Added examples/canvas.rb to show drawing coordinate system.
+  * Added maze example from Jamis Buck's Mazes for Programmers.
+  * All blits are antialiased and default to 0deg rotation.
+  * Removed TTF.init
+  * Shift drawing of nearly all things by 1px in y. Makes drawing hline at 0 visible.
+  * Text now uses draw_blended_utf8 for smoother text rendering
+  * Updated rubysdl_setup.sh to be more correct. Not quite complete yet.
+  * Better math. powered by scotch™
+
+* 6 bug fixes:
+
+  * Documented basic attribs of Body.
+  * Fixed drawing at y=0. Off by one, yo.
+  * Fixed fill_rect for y=0
+  * Fixed north/south reporting in clip now that we're in proper q1
+  * Fixed polygon refactor
+  * Fixed project url and got rdoc upload url set up correctly.
+
 === 1.0.0b1 / 2015-08-04
 
 * 1 major enhancement

data/Manifest.txt

@@ -5,26 +5,58 @@ 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
@@ -33,5 +65,5 @@ lib/graphics/trail.rb
 lib/graphics/v.rb
 resources/images/body.png
 resources/images/turret.png
-rubysdl_setup.sh
 test/test_graphics.rb
+test/test_sdl.rb

data/README.rdoc

@@ -1,6 +1,6 @@
 = graphics
 
-home :: https://github.com/seattlerb/graphics
+home :: https://github.com/zenspider/graphics
 rdoc :: http://docs.seattlerb.org/graphics
 
 == DESCRIPTION:
@@ -27,15 +27,59 @@ when implementing your simulation.
 
 == SYNOPSIS:
 
-See examples/*.rb
+    class Ball < Graphics::Body
+      def initialize w
+        super
+
+        # ...
+      end
+
+      def draw
+        w.angle x, y, a, 10+3*m, :red
+        w.circle x, y, 5, :white, :filled
+      end
+
+      def update
+        fall
+        move
+        bounce
+      end
+
+      # ...
+    end
+
+    class BounceSimulation < Graphics::Simulation
+      attr_accessor :bs
+
+      def initialize
+        super 640, 640, 16, "Bounce"
+
+        self.bs = populate Ball
+      end
+
+      def update n
+        bs.each(&:update)
+      end
+
+      def draw n
+        clear
+        bs.each(&:draw)
+        fps n
+      end
+
+      # ...
+    end
+
+    BounceSimulation.new.run
+
+See examples/*.rb for more
 
 == REQUIREMENTS:
 
 * rsdl
-* ruby-sdl
 * libsdl & friends
 
-See and/or run rubysdl_setup.sh. If you're on OSX and have homebrew
+See and/or run graphics_setup.sh. If you're on OSX and have homebrew
 installed, running this will ensure you have a working setup.
 
 You may want to run `brew update` beforehand to ensure you get

data/Rakefile

@@ -7,16 +7,22 @@ Hoe.plugin :isolate
 Hoe.plugin :minitest, :history, :email # Hoe.plugin :seattlerb - :perforce
 Hoe.plugin :rdoc
 Hoe.plugin :git
+Hoe.plugin :compiler
 
 Hoe.spec "graphics" do
   developer "Ryan Davis", "ryand-ruby@zenspider.com"
+
+  extension :sdl
+
   license "MIT"
 
   dependency "rsdl", "~> 0.1"
-  dependency "rubysdl", "~> 2.2"
+
+  base = "/data/www/docs.seattlerb.org"
+  rdoc_locations << "docs-push.seattlerb.org:#{base}/#{remote_rdoc_dir}"
 end
 
-task :demos do
+task :demos => :compile do
   Dir["examples/*.rb"].each do |script|
     puts script
     system "rsdl -Ilib #{script}"

data/examples/boid.rb

@@ -6,8 +6,6 @@ require "graphics"
 class Boid < Graphics::Body
   COUNT = 50
 
-  AA = SDL::Surface::TRANSFORM_AA
-
   PCT_DAMPENER = 0.01
   TOO_CLOSE    = 50
   MAX_VELOCITY = 5
@@ -32,7 +30,7 @@ class Boid < Graphics::Body
   def draw
     # the blit looks HORRIBLE when rotated... dunno why
     w.circle x, y, @@max_distance, :gray if w.visual_debug?
-    w.blit w.body_img, x, y, 0, AA
+    w.blit w.body_img, x, y
     w.angle x, y, a, 3 * m, :red
   end
 
@@ -254,8 +252,6 @@ class Boids < Graphics::Simulation
   def initialize
     super 850, 850, 16, "Boid"
 
-    SDL::Key.enable_key_repeat 500, 250
-
     self.visual_debug = false
 
     self.boids = populate Boid
@@ -265,22 +261,17 @@ class Boids < Graphics::Simulation
     end
   end
 
+  def initialize_keys
+    super
+
+    add_key_handler(:D) { self.visual_debug = ! visual_debug }
+    add_key_handler(:B) { Boid.max_distance += 5 }
+    add_key_handler(:S) { Boid.max_distance -= 5 }
+  end
+
   def update n
     boids.each(&:update)
     self.boids.each(&:wrap)
-    # sleep 0.1
-  end
-
-  def handle_event e, n
-    case e
-    when SDL::Event::KeyDown then
-      self.visual_debug = ! visual_debug if SDL::Key.press? SDL::Key::D
-
-      Boid.max_distance += 5 if SDL::Key.press? SDL::Key::B
-      Boid.max_distance -= 5 if SDL::Key.press? SDL::Key::S
-    else
-      super
-    end
   end
 
   def draw n

data/examples/bounce.rb

@@ -12,11 +12,16 @@ class Ball < Graphics::Body
   def initialize w
     super
 
-    self.a = rand 180
-    self.m = rand 100
+    self.a = random_angle / 2
+    self.m = rand 25
     self.g = G
   end
 
+  def draw
+    w.angle x, y, a, 10+3*m, :red
+    w.circle x, y, 5, :white, :filled
+  end
+
   def update
     fall
     move
@@ -26,18 +31,6 @@ class Ball < Graphics::Body
   def fall
     self.velocity += g
   end
-
-  def label
-    l = "%.1f %.1f" % dx_dy
-    w.text l, x-10, y-40, :white
-  end
-
-  def draw
-    # w.angle x, y, a, 3*m, :red
-    w.angle x, y, a, 50, :red
-    w.circle x, y, 5, :white, :filled
-    # label
-  end
 end
 
 class BounceSimulation < Graphics::Simulation
@@ -49,6 +42,12 @@ class BounceSimulation < Graphics::Simulation
     self.bs = populate Ball
   end
 
+  def initialize_keys
+    super
+    add_key_handler :SPACE, &:randomize
+    add_key_handler :R,     &:reverse
+  end
+
   def update n
     bs.each(&:update)
   end
@@ -56,20 +55,13 @@ class BounceSimulation < Graphics::Simulation
   def draw n
     clear
     bs.each(&:draw)
-    bs.first.label
     fps n
   end
 
-  def handle_keys
-    super
-    randomize if SDL::Key.press? SDL::Key::SPACE
-    reverse if SDL::Key.press? SDL::Key::R
-  end
-
   def randomize
     bs.each do |b|
-      b.m = rand(100)
-      b.a = rand(180)
+      b.m = rand(25)
+      b.a = b.random_angle / 2
     end
   end
 

data/examples/canvas.rb

@@ -0,0 +1,75 @@
+#!/usr/local/bin/ruby -w
+# -*- coding: utf-8 -*-
+
+require "graphics"
+
+class Demo < Graphics::Simulation
+  attr_accessor :woot, :menlo32
+  attr_accessor :rct
+
+  def initialize
+    super 801, 801
+
+    self.font = find_font("Menlo", 16)
+    self.menlo32 = find_font("Menlo", 32)
+
+    self.woot = render_text "woot", :black, menlo32
+
+    self.rct = sprite 50, 25 do
+      rect 0, 0, 49, 24, :blue # TODO: can't be black?!?
+    end
+  end
+
+  def update n
+  end
+
+  L = Math.sqrt(200*200 + 100*100)
+  A = R2D*Math.atan2(200, 100)
+
+  def draw n
+    clear :white
+
+    (0..90).step(30) do |deg|
+      shift = (woot.h*Math.sin(D2R*deg))
+      put woot, 400-shift, 300, deg
+    end
+    text "woot", 400, 300, :red, menlo32
+
+    rect 550, 100, 50, 50, :blue, :filled
+    rect 575, 125, 50, 50, :blue
+
+    ellipse 550, 200, 50, 25, :red
+    ellipse 550, 250, 50, 25, :red, :filled
+
+    angle 50, 50, 90, 25, :blue
+
+    (0..w).step(100) do |x|
+      vline x, :red
+      text x.to_s, x+5, 5, :black
+    end
+
+    (0..h).step(100) do |y|
+      hline y, :green
+      text y.to_s, 5, y+5, :black
+    end
+
+    circle 200, 200, 100, :blue
+    text "circle 200, 200, 100, :blue", 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
+
+    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
+      angle 500, 600, deg, 50, :red
+
+      blit rct, 600, 600, deg
+      angle 600, 600, deg, 50, :red
+    end
+  end
+end
+
+Demo.new.run if $0 == __FILE__

data/examples/collision.rb

@@ -28,21 +28,21 @@ class Sprite < Graphics::Body
   end
 
   def collide_with? other
-    w.cmap.collision_check(x, y, w.cmap, other.x, other.y) != nil
+    w.cmap.check(x, y, w.cmap, other.x, other.y)
   end
 end
 
 class Collision < Graphics::Simulation
-  attr_accessor :sprites, :cmap, :image
+  attr_accessor :sprites, :cmap, :tank_img
 
   def initialize
     super 850, 850, 16, "Collision"
 
-    self.image = SDL::Surface.load "resources/images/body.png"
-    self.cmap = image.make_collision_map
+    self.tank_img = image "resources/images/body.png"
+    self.cmap = tank_img.make_collision_map
 
     self.sprites = populate Sprite do |s|
-      s.image = image
+      s.image = tank_img
     end
   end
 
@@ -50,7 +50,7 @@ class Collision < Graphics::Simulation
     "<Screen ...>"
   end
 
-  def detect_collisions(sprites)
+  def detect_collisions sprites
     collisions = []
     sprites.combination(2).each do |a, b|
       collisions << a << b if a.collide_with? b