salamander 0.1.2 → 0.1.3

data/bin/salamander

@@ -7,8 +7,9 @@ class Sketch < Salamander::Actor
   include Salamander::Drawing
 end
 
-screen = Salamander.setup(512, 512)
-Sketch.draw(screen, ARGV[0])
+canvas = Salamander.setup(512, 512)
+Sketch.draw(canvas, ARGV[0])
+canvas.redraw
 
 while true
   event = SDL.WaitEvent

data/lib/salamander.rb

@@ -3,6 +3,7 @@ require 'ruby-sdl-ffi/gfx'
 module Salamander
   require 'salamander/constants'
   require 'salamander/actor'
+  require 'salamander/canvas'
   require 'salamander/drawing'
   
   # Initialize SDL and create a window
@@ -14,6 +15,6 @@ module Salamander
     
     info = SDL.GetVideoInfo
     flags = (info.hw_available) ? SDL::HWSURFACE : SDL::SWSURFACE
-    SDL.SetVideoMode(width, height, info.vfmt.BitsPerPixel, flags)
+    Canvas.new(SDL.SetVideoMode(width, height, info.vfmt.BitsPerPixel, flags))
   end
 end

data/lib/salamander/actor.rb

@@ -3,20 +3,19 @@ module Salamander
     # Executes code within the context of an Actor.
     #
     # If given a filename, reads the contents and evaluates it.
-    def self.draw (screen, filename=nil, &blk)
-      actor = new(screen)
+    def self.draw (canvas, filename=nil, &blk)
+      actor = new(canvas)
       if filename
         actor.instance_eval(File.open(filename).read, filename)
       else
         actor.instance_eval(&blk)
       end
-      SDL.UpdateRect(screen, 0, 0, screen.w, screen.h)
     end
     
-    def initialize (surface)
-      @surface = surface
+    def initialize (canvas)
+      @canvas = canvas
       
-      move_to(surface.w/2, surface.h/2)
+      move_to(canvas.width/2, canvas.height/2)
       face :north
       color "#FFFFFF"
     end
@@ -34,6 +33,7 @@ module Salamander
       else
         theta = angle
       end
+      theta = theta / 180.0 * Math::PI
       x = distance * Math.cos(theta) + @x
       y = distance * Math.sin(theta) + @y
       move_to(x, y)
@@ -45,25 +45,25 @@ module Salamander
     end
     
     
-    # The current angle, in radians.
+    # The current angle, in degrees.
     def angle
       @angle
     end
     
     # Turn towards a new direction.
     #
-    # 'theta' may be :right, :left, :around, or a number of radians. Positive amounts of radians turn right, while negative amounts go to the left.
+    # 'theta' may be :right, :left, :around, or a number of degrees. Positive amounts of degrees turn right, while negative amounts go to the left.
     def turn (theta)
       theta = DIRECTIONS[theta] if theta.is_a? Symbol
       face(theta + angle)
     end
     
-    # Face a specific direction
+    # Face a specific direction.
     #
-    # 'theta' may be :north, :northeast, :east, etc. or a number of radians. 0 radians points east, and increasing amounts go clockwise.
+    # 'theta' may be :north, :northeast, :east, etc. or a number of degrees. 0 degrees points east, and increasing amounts go clockwise.
     def face (theta)
       theta = COMPASS[theta] if theta.is_a? Symbol
-      @angle = theta % (2 * Math::PI)
+      @angle = theta % 360
     end
     
     # Gets or sets the current drawing color in numeric RGBA format.
@@ -86,9 +86,9 @@ module Salamander
     end
     
     
-    # The SDL surface being drawn to
-    def surface
-      @surface
+    # The drawing canvas being used
+    def canvas
+      @canvas
     end
   end
 end

data/lib/salamander/canvas.rb

@@ -0,0 +1,38 @@
+module Salamander
+  class Canvas
+    attr_reader :surface
+    
+    def initialize (surface)
+      @surface = surface
+    end
+    
+    def redraw
+      SDL.UpdateRect(surface, 0, 0, width, height)
+    end
+    
+    def point (x, y, color)
+      SDL::Gfx.pixelColor(surface, x.round, y.round, color)
+    end
+    
+    def line (x1, y1, x2, y2, color)
+      SDL::Gfx.lineColor(surface, x1.round, y1.round, x2.round, y2.round, color)
+    end
+    
+    def arc (x, y, radius, left, right, color)
+      SDL::Gfx.arcColor(surface, x.round, y.round, radius.round, left.round, right.round, color)
+    end
+    
+    def circle (x, y, radius, color)
+      SDL::Gfx.circleColor(surface, x.round, y.round, radius.round, color)
+    end
+    
+    
+    def width
+      surface.w
+    end
+    
+    def height
+      surface.h
+    end
+  end
+end

data/lib/salamander/constants.rb

@@ -4,9 +4,6 @@ module Salamander
     :left => -90,
     :around => 180,
   }
-  DIRECTIONS.each_pair do |k, v|
-    DIRECTIONS[k] = v / 180.0 * Math::PI
-  end
   
   COMPASS = {
     :east => 0,
@@ -18,9 +15,6 @@ module Salamander
     :south => 90,
     :southeast => 45,
   }
-  COMPASS.each_pair do |k, v|
-    COMPASS[k] = v / 180.0 * Math::PI
-  end
   
   COLORS = {
     :red => "#FF0000",

data/lib/salamander/drawing.rb

@@ -1,5 +1,5 @@
 module Salamander::Drawing
-  %w{point line shapes}.each do |mod|
+  %w{point line shapes circle}.each do |mod|
     require "salamander/drawing/#{mod}"
     include Salamander::Drawing.const_get(mod.capitalize)
   end

data/lib/salamander/drawing/circle.rb

@@ -0,0 +1,30 @@
+module Salamander::Drawing
+  module Circle
+    def arc(rotation, radius)
+      direction = (rotation > 0.degrees) ? :right : :left
+      
+      # Enter the center of the arc's circle
+      turn direction  # Turn towards the center point
+      move radius     # Move to the center point
+      turn :around    # Face the first endpoint of the arc
+     
+      # Draw the arc
+      x, y = position
+      if rotation > 0.degrees
+        canvas.arc(x, y, radius, angle, angle+rotation, color)
+      else
+        canvas.arc(x, y, radius, angle+rotation, angle, color)
+      end
+      
+      # Move to the opposite side of the arc
+      turn rotation.degrees
+      move radius
+      turn direction
+    end
+    
+    def circle(radius)
+      x, y = position
+      canvas.circle(x, y, radius, color)
+    end
+  end
+end

data/lib/salamander/drawing/line.rb

@@ -4,7 +4,7 @@ module Salamander::Drawing
     def line_to (x2, y2)
       x1, y1 = position
       move_to(x2, y2)
-      SDL::Gfx.aalineColor(surface, x1.round, y1.round, x2.round, y2.round, color)
+      canvas.line(x1, y1, x2, y2, color)
     end
     
     # Draws a line 'distance' pixels long from the current position in the current drawing color.
@@ -12,7 +12,7 @@ module Salamander::Drawing
       x1, y1 = position
       move distance, direction
       x2, y2 = position
-      SDL::Gfx.aalineColor(surface, x1.round, y1.round, x2.round, y2.round, color)
+      canvas.line(x1, y1, x2, y2, color)
     end
   end
 end

data/lib/salamander/drawing/point.rb

@@ -1,8 +1,8 @@
 module Salamander::Drawing
   module Point
     def point
-      x, y = *position
-      SDL::Gfx.pixelColor(surface, x, y, color)
+      x, y = position
+      canvas.point(x, y, color)
     end
   end
 end

data/lib/salamander/support/radians.rb

@@ -1,11 +1,11 @@
 class Numeric
-  # Does nothing - input is assumed to be radians already
+  # Converts from radians to degrees.
   def radians
-    self
+    self * 180.0 / Math::PI
   end
   
-  # Converts from degrees to radians.
+  # Does nothing - input is assumed to be degrees already
   def degrees
-    self / 180.0 * Math::PI
+    self
   end
 end

data/lib/salamander/version.rb

@@ -1,3 +1,3 @@
 module Salamander
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jonathan Castello
@@ -56,9 +56,11 @@ extra_rdoc_files: []
 
 files: 
 - lib/salamander.rb
+- lib/salamander/canvas.rb
 - lib/salamander/support/radians.rb
 - lib/salamander/constants.rb
 - lib/salamander/actor.rb
+- lib/salamander/drawing/circle.rb
 - lib/salamander/drawing/point.rb
 - lib/salamander/drawing/line.rb
 - lib/salamander/drawing/shapes.rb