ruby2d 0.3.1 → 0.4.0

data/lib/ruby2d/application.rb

@@ -3,47 +3,43 @@
 module Ruby2D::Application
   class << self
     @@window = Ruby2D::Window.new
-    
+
     def get(sym)
       @@window.get(sym)
     end
-    
+
     def set(opts)
       @@window.set(opts)
     end
-    
-    def on(args = {}, &proc)
-      @@window.on(args, &proc)
-    end
-    
-    def on_key(&proc)
-      @@window.on_key(&proc)
+
+    def on(event, &proc)
+      @@window.on(event, &proc)
     end
-    
-    def on_controller(&proc)
-      @@window.on_controller(&proc)
+
+    def off(event_descriptor)
+      @@window.off(event_descriptor)
     end
-    
+
     def add(o)
       @@window.add(o)
     end
-    
+
     def remove(o)
       @@window.remove(o)
     end
-    
+
     def clear
       @@window.clear
     end
-    
+
     def update(&proc)
       @@window.update(&proc)
     end
-    
+
     def show
       @@window.show
     end
-    
+
     def close
       @@window.close
     end

data/lib/ruby2d/color.rb

@@ -2,9 +2,31 @@
 
 module Ruby2D
   class Color
-    
+    # Color::Set represents an array of colors
+    class Set
+      def initialize(colors)
+        @colors = colors.map{|c| Color.new(c)}
+      end
+
+      def [](i)
+        @colors[i]
+      end
+
+      def length
+        @colors.length
+      end
+
+      def opacity; @colors[0].opacity end
+
+      def opacity=(opacity)
+        @colors.each do |color|
+          color.opacity = opacity
+        end
+      end
+    end
+
     attr_reader :r, :g, :b, :a
-    
+
     # Based on clrs.cc
     @@colors = {
       'navy'    => '#001F3F',
@@ -27,7 +49,7 @@ module Ruby2D
       'black'   => '#111111',
       'random'  => ''
     }
-    
+
     def initialize(c)
       if !self.class.is_valid? c
         raise Error, "`#{c}` is not a valid color"
@@ -46,28 +68,44 @@ module Ruby2D
         end
       end
     end
-    
+
     # Check if string is a proper hex value
     def self.is_hex?(s)
       # MRuby doesn't support regex, otherwise we'd do:
       #   !(/^#[0-9A-F]{6}$/i.match(a).nil?)
       s.class == String && s[0] == '#' && s.length == 7
     end
-    
+
     # Check if the color is valid
     def self.is_valid?(c)
       @@colors.key?(c) ||  # keyword
       self.is_hex?(c)  ||  # hexadecimal value
-      
+
       # Array of Floats from 0.0..1.0
       c.class == Array && c.length == 4 &&
       c.all? { |el|
         el.is_a?(Numeric) && (0.0..1.0).include?(el)
       }
     end
-    
+
+    def self.from(input)
+      # If a valid array of colors, return a Color::Set with those colors
+      # Else return single color
+      if input.is_a? Array and input.all? { |el| Color.is_valid? el }
+        Color::Set.new(input)
+      else
+        Color.new(input)
+      end
+    end
+
+    def opacity; @a end
+
+    def opacity=(opacity)
+      @a = opacity
+    end
+
     private
-    
+
     # TODO: Only `Number` supported in JS
     # Convert from Fixnum (0..255) to Float (0.0..1.0)
     def to_f(a)
@@ -77,19 +115,19 @@ module Ruby2D
       end
       return b
     end
-    
+
     # Convert from hex value (e.g. #FFF000) to Float (0.0..1.0)
     def hex_to_f(h)
       h = (h[1..-1]).chars.each_slice(2).map(&:join)
       a = []
-      
+
       h.each do |el|
         a.push(el.to_i(16))
       end
-      
+
       a.push(255)
       return to_f(a)
     end
-    
+
   end
 end

data/lib/ruby2d/dsl.rb

@@ -4,37 +4,33 @@ module Ruby2D::DSL
   def get(sym)
     Application.get(sym)
   end
-  
+
   def set(opts)
     Application.set(opts)
   end
-  
-  def on(args = {}, &proc)
-    Application.on(args, &proc)
-  end
-  
-  def on_key(&proc)
-    Application.on_key(&proc)
+
+  def on(event, &proc)
+    Application.on(event, &proc)
   end
-  
-  def on_controller(&proc)
-    Application.on_controller(&proc)
+
+  def off(event_descriptor)
+    Application.off(event_descriptor)
   end
-  
+
   def update(&proc)
     Application.update(&proc)
   end
-  
+
   def clear
     Application.clear
   end
-  
+
   def show
     Application.show
   end
-  
+
   def close
     Application.close
   end
-  
+
 end

data/lib/ruby2d/exceptions.rb

@@ -2,14 +2,5 @@
 
 module Ruby2D
   class Error < StandardError
-    def colorize(msg, c); "\e[#{c}m#{msg}\e[0m" end
-    def error(msg); colorize(msg, '4;31') end
-    def bold(msg); colorize(msg, '1') end
-    
-    def initialize(msg)
-      super(msg)
-      puts error("\nRuby 2D Error:") << " #{msg}" <<
-      bold("\nOccurred in:\n  #{caller.last}\n")
-    end
   end
 end

data/lib/ruby2d/image.rb

@@ -2,41 +2,38 @@
 
 module Ruby2D
   class Image
-    
+    include Renderable
+
     attr_accessor :x, :y, :width, :height, :data
     attr_reader :path, :color
-    
-    def initialize(x, y, path)
-      
-      # TODO: Check if file exists
-      #   `File.exists?` is not available in MRuby
-      #   Ideally would do:
-      #     unless File.exists? path
-      #       raise Error, "Cannot find image file `#{path}`"
-      #     end
-      
-      @type_id = 3
-      @x, @y, @path = x, y, path
-      @color = Color.new([1, 1, 1, 1])
-      init(path)
+
+    def initialize(opts = {})
+      @path = opts[:path]
+
+      unless RUBY_ENGINE == 'opal'
+        unless File.exists? @path
+          raise Error, "Cannot find image file `#{@path}`"
+        end
+      end
+
+      @x = opts[:x] || 0
+      @y = opts[:y] || 0
+      @z = opts[:x] || 0
+
+      @type_id = 4
+
+      self.color = opts[:color] || 'white'
+
+      ext_image_init(@path)
       add
     end
-    
+
     def color=(c)
       @color = Color.new(c)
     end
-    
-    def add
-      if Module.const_defined? :DSL
-        Application.add(self)
-      end
-    end
-    
-    def remove
-      if Module.const_defined? :DSL
-        Application.remove(self)
-      end
+
+    def contains?(x, y)
+      @x < x and @x + @width > x and @y < y and @y + @height > y
     end
-    
   end
 end

data/lib/ruby2d/line.rb

@@ -0,0 +1,64 @@
+# line.rb
+
+module Ruby2D
+  class Line
+    include Renderable
+    attr_accessor :x1, :x2, :y1, :y2, :color, :width
+
+    def initialize(opts = {})
+      @type_id = 3
+
+      @x1 = opts[:x1] || 0
+      @y1 = opts[:y1] || 0
+      @x2 = opts[:x2] || 100
+      @y2 = opts[:y2] || 100
+      @width = opts[:width] || 2
+      @z = opts[:z] || 0
+      self.color = opts[:color] || 'white'
+
+      add
+    end
+
+    def color=(c)
+      @color = Color.from(c)
+      update_color(@color)
+    end
+
+    def length
+      points_distance(@x1, @y1, @x2, @y2)
+    end
+
+    # Line contains a point if the point is closer than the length of line from both ends
+    # and if the distance from point to line is smaller than half of the width.
+    # Check https://en.wikipedia.org/wiki/Distance_from_a_point_to_a_line for reference
+    def contains?(x, y)
+      points_distance(x1, y1, x, y) < length and
+      points_distance(x2, y2, x, y) < length and
+      (((@y2 - @y1) * x - (@x2 - @x1) * y + @x2 * @y1 - @y2 * @x1).abs / length) < 0.5 * @width
+    end
+
+    private
+
+    def points_distance(x1, y1, x2, y2)
+      Math.sqrt((x1 - x2) ** 2 + (y1 - y2) ** 2)
+    end
+
+    def update_color(c)
+      if c.is_a? Color::Set
+        if c.length == 4
+          @c1 = c[0]
+          @c2 = c[1]
+          @c3 = c[2]
+          @c4 = c[3]
+        else
+          raise ArgumentError, "Lines require 4 colors, one for each vertex. #{c.length} were given."
+        end
+      else
+        @c1 = c
+        @c2 = c
+        @c3 = c
+        @c4 = c
+      end
+    end
+  end
+end

data/lib/ruby2d/music.rb

@@ -2,16 +2,41 @@
 
 module Ruby2D
   class Music
-    
+
     attr_accessor :data, :loop
     attr_reader :path
-    
+
     def initialize(path)
-      # TODO: Check if file exists
-      init(path)
+
+      unless RUBY_ENGINE == 'opal'
+        unless File.exists? path
+          raise Error, "Cannot find audio file `#{path}`"
+        end
+      end
+
       @path = path
       @loop = false
+      ext_music_init(path)
+    end
+
+    def play
+      ext_music_play
+    end
+
+    def pause
+      ext_music_pause
+    end
+
+    def resume
+      ext_music_resume
+    end
+
+    def stop
+      ext_music_stop
+    end
+
+    def fadeout(ms)
+      ext_music_fadeout(ms)
     end
-    
   end
 end

data/lib/ruby2d/quad.rb

@@ -2,6 +2,7 @@
 
 module Ruby2D
   class Quad
+    include Renderable
     # Coordinates in clockwise order, starting at top left:
     # x1,y1 == top left
     # x2,y2 == top right
@@ -11,61 +12,68 @@ module Ruby2D
                   :x2, :y2, :c2,
                   :x3, :y3, :c3,
                   :x4, :y4, :c4
-    
+
     attr_reader :color
-    
-    def initialize(x1=0, y1=0, x2=100, y2=0, x3=100, y3=100, x4=100, y4=100, c='white')
+
+    def initialize(opts = {})
       @type_id = 2
-      @x1, @y1, @x2, @y2, @x3, @y3, @x4, @y4 = x1, y1, x2, y2, x3, y3, x4, y4
-      @color = c
-      update_color(c)
+
+      @x1 = opts[:x1] || 0
+      @y1 = opts[:y1] || 0
+      @x2 = opts[:x2] || 100
+      @y2 = opts[:y2] || 0
+      @x3 = opts[:x3] || 100
+      @y3 = opts[:y3] || 100
+      @x4 = opts[:x4] || 0
+      @y4 = opts[:y4] || 100
+
+      @z = opts[:z] || 0
+
+      self.color = opts[:color] || 'white'
       add
     end
-    
+
     def color=(c)
-      @color = c
-      update_color(c)
-    end
-    
-    def add
-      if Module.const_defined? :DSL
-        Application.add(self)
-      end
+      @color = Color.from(c)
+      update_color(@color)
     end
-    
-    def remove
-      if Module.const_defined? :DSL
-        Application.remove(self)
-      end
+
+    # The logic is the same as for a triangle
+    # See triangle.rb for reference
+    def contains?(x, y)
+      self_area = triangle_area(@x1, @y1, @x2, @y2, @x3, @y3) +
+                  triangle_area(@x1, @y1, @x3, @y3, @x4, @y4)
+
+      questioned_area = triangle_area(@x1, @y1, @x2, @y2, x, y) +
+                        triangle_area(@x2, @y2, @x3, @y3, x, y) +
+                        triangle_area(@x3, @y3, @x4, @y4, x, y) +
+                        triangle_area(@x4, @y4, @x1, @y1, x, y)
+
+      questioned_area <= self_area
     end
-    
+
     private
-    
+
+    def triangle_area(x1, y1, x2, y2, x3, y3)
+      (x1*y2 + x2*y3 + x3*y1 - x3*y2 - x1*y3 - x2*y1).abs / 2
+    end
+
     def update_color(c)
-      
-      # If a valid color, use it for each vertex
-      if Color.is_valid? c
-        @c1 = Color.new(c)
-        @c2 = Color.new(c)
-        @c3 = Color.new(c)
-        @c4 = Color.new(c)
-        
-      elsif c.class == Array && c.length < 4
-        raise Error, "Quads require 4 colors, one for each vertex. Only " <<
-                     "#{c.length} were given."
-        
-      # If a valid array of colors, assign them to each vertex, respectively
-      elsif c.all? { |el| Color.is_valid? el }
-        @c1 = Color.new(c[0])
-        @c2 = Color.new(c[1])
-        @c3 = Color.new(c[2])
-        @c4 = Color.new(c[3])
-        
+      if c.is_a? Color::Set
+        if c.length == 4
+          @c1 = c[0]
+          @c2 = c[1]
+          @c3 = c[2]
+          @c4 = c[3]
+        else
+          raise ArgumentError, "Quads require 4 colors, one for each vertex. #{c.length} were given."
+        end
       else
-        raise Error, "Not a valid color for #{self.class}"
+        @c1 = c
+        @c2 = c
+        @c3 = c
+        @c4 = c
       end
-      
     end
-    
   end
 end

data/lib/ruby2d/rectangle.rb

@@ -2,43 +2,54 @@
 
 module Ruby2D
   class Rectangle < Quad
-    
+
     attr_reader :x, :y, :width, :height
-    
-    def initialize(x=0, y=0, w=200, h=100, c='white')
+
+    def initialize(opts = {})
       @type_id = 2
-      @x, @y, @width, @height, @color = x, y, w, h, c
-      update_coords(x, y, w, h)
-      update_color(c)
+
+      @x      = opts[:x]      || 0
+      @y      = opts[:y]      || 0
+      @z      = opts[:z]      || 0
+      @width  = opts[:width]  || 200
+      @height = opts[:height] || 100
+
+      update_coords(@x, @y, @width, @height)
+
+      self.color = opts[:color] || 'white'
       add
     end
-    
+
     def x=(x)
       @x = @x1 = x
       @x2 = x + @width
       @x3 = x + @width
       @x4 = x
     end
-    
+
     def y=(y)
       @y = @y1 = y
       @y2 = y
       @y3 = y + @height
       @y4 = y + @height
     end
-    
+
     def width=(w)
       @width = w
       update_coords(@x, @y, w, @height)
     end
-    
+
     def height=(h)
       @height = h
       update_coords(@x, @y, @width, h)
     end
-    
+
+    def contains?(x, y)
+      @x < x and @x + @width > x and @y < y and @y + @height > y
+    end
+
     private
-    
+
     def update_coords(x, y, w, h)
       @x1 = x
       @y1 = y
@@ -49,6 +60,6 @@ module Ruby2D
       @x3 = x + w
       @y3 = y + h
     end
-    
+
   end
 end

data/lib/ruby2d/renderable.rb

@@ -0,0 +1,35 @@
+module Ruby2D
+  module Renderable
+    attr_reader :z
+
+    def z=(z)
+      remove
+      @z = z
+      add
+    end
+
+    def add
+      if Module.const_defined? :DSL
+        Application.add(self)
+      end
+    end
+
+    def remove
+      if Module.const_defined? :DSL
+        Application.remove(self)
+      end
+    end
+
+    def opacity
+      self.color.opacity
+    end
+
+    def opacity=(val)
+      self.color.opacity = val
+    end
+
+    def contains?(x, y)
+      raise "Not implemented yet"
+    end
+  end
+end

data/lib/ruby2d/sound.rb

@@ -2,15 +2,25 @@
 
 module Ruby2D
   class Sound
-    
+
     attr_accessor :data
     attr_reader :path
-    
+
     def initialize(path)
-      # TODO: Check if file exists
-      init(path)
+
+      unless RUBY_ENGINE == 'opal'
+        unless File.exists? path
+          raise Error, "Cannot find audio file `#{path}`"
+        end
+      end
+
       @path = path
+      ext_sound_init(path)
     end
-    
+
+    def play
+      ext_sound_play
+    end
+
   end
 end