ruby2d 0.2.1 → 0.3.0

data/lib/ruby2d.rb

@@ -1,17 +1,20 @@
 # ruby2d.rb
 
+require 'ruby2d/exceptions'
+require 'ruby2d/color'
 require 'ruby2d/window'
 require 'ruby2d/application'
-require 'ruby2d/color'
+require 'ruby2d/dsl'
 require 'ruby2d/quad'
 require 'ruby2d/rectangle'
 require 'ruby2d/square'
 require 'ruby2d/triangle'
 require 'ruby2d/image'
+require 'ruby2d/sprite'
 require 'ruby2d/text'
-require 'ruby2d/dsl'
-require 'ruby2d/exceptions'
+require 'ruby2d/sound'
+require 'ruby2d/music'
 require 'ruby2d/ruby2d'  # load native extension
 
-include Ruby2D::DSL
 include Ruby2D
+extend  Ruby2D::DSL

data/lib/ruby2d/application.rb

@@ -12,8 +12,16 @@ module Ruby2D::Application
       @@window.set(opts)
     end
     
-    def on(mouse: nil, key: nil, key_down: nil, controller: nil, &proc)
-      @@window.on(mouse: mouse, key: key, key_down: key_down, controller: controller, &proc)
+    def on(args = {}, &proc)
+      @@window.on(args, &proc)
+    end
+    
+    def on_key(&proc)
+      @@window.on_key(&proc)
+    end
+    
+    def on_controller(&proc)
+      @@window.on_controller(&proc)
     end
     
     def add(o)
@@ -35,5 +43,9 @@ module Ruby2D::Application
     def show
       @@window.show
     end
+    
+    def close
+      @@window.close
+    end
   end
 end

data/lib/ruby2d/color.rb

@@ -5,26 +5,27 @@ module Ruby2D
     
     attr_reader :r, :g, :b, :a
     
+    # Based on clrs.cc
     @@colors = {
-      'black'   => [  0,   0,   0, 255],
-      'gray'    => [170, 170, 170, 255],
-      'silver'  => [221, 221, 221, 255],
-      'white'   => [255, 255, 255, 255],
-      'navy'    => [  0,  31,  63, 255],
-      'blue'    => [  0, 116, 217, 255],
-      'aqua'    => [127, 219, 255, 255],
-      'teal'    => [ 57, 204, 204, 255],
-      'olive'   => [ 61, 153, 112, 255],
-      'green'   => [ 46, 204,  64, 255],
-      'lime'    => [  1, 255, 112, 255],
-      'yellow'  => [255, 220,   0, 255],
-      'orange'  => [255, 133,  27, 255],
-      'red'     => [255,  65,  54, 255],
-      'maroon'  => [133,  20,  75, 255],
-      'fuchsia' => [240,  18, 190, 255],
-      'purple'  => [177,  13, 201, 255],
-      'brown'   => [102,  51,   0, 255],
-      'random'  => []
+      'navy'    => '#001F3F',
+      'blue'    => '#0074D9',
+      'aqua'    => '#7FDBFF',
+      'teal'    => '#39CCCC',
+      'olive'   => '#3D9970',
+      'green'   => '#2ECC40',
+      'lime'    => '#01FF70',
+      'yellow'  => '#FFDC00',
+      'orange'  => '#FF851B',
+      'red'     => '#FF4136',
+      'brown'   => '#663300',
+      'fuchsia' => '#F012BE',
+      'purple'  => '#B10DC9',
+      'maroon'  => '#85144B',
+      'white'   => '#FFFFFF',
+      'silver'  => '#DDDDDD',
+      'gray'    => '#AAAAAA',
+      'black'   => '#111111',
+      'random'  => ''
     }
     
     def initialize(c)
@@ -34,39 +35,61 @@ module Ruby2D
         case c
         when String
           if c == 'random'
-            @r, @g, @b, @a = rand(0..1.0), rand(0..1.0), rand(0..1.0), 1.0
+            @r, @g, @b, @a = rand, rand, rand, 1.0
+          elsif self.class.is_hex?(c)
+            @r, @g, @b, @a = hex_to_f(c)
           else
-            @r, @g, @b, @a = to_f(@@colors[c])
+            @r, @g, @b, @a = hex_to_f(@@colors[c])
           end
         when Array
-          @r, @g, @b, @a = to_f([c[0], c[1], c[2], c[3]])
+          @r, @g, @b, @a = [c[0], c[1], c[2], c[3]]
         end
       end
     end
     
-    # Color must be String, like 'red', or Array, like [1.0, 0, 0, 1.0]
+    # 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)
-      (c.class == String && @@colors.key?(c)) ||
-      (c.class == Array && c.length == 4 &&
-       c.all? { |el| el.is_a? Numeric } &&
-       c.all? { |el| el.class == Fixnum && (0..255).include?(el) ||
-                     el.class == Float  && (0.0..1.0).include?(el) })
+      @@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
     
     private
     
+    # TODO: Only `Number` supported in JS
     # Convert from Fixnum (0..255) to Float (0.0..1.0)
     def to_f(a)
       b = []
       a.each do |n|
-        if n.class == Fixnum
-          b.push(n / 255.0)
-        else
-          b.push(n)
-        end
+        b.push(n / 255.0)
       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

@@ -1,31 +1,40 @@
 # dsl.rb
 
 module Ruby2D::DSL
-  def hello
-    puts "hi"
-  end
-  
   def get(sym)
-    Ruby2D::Application.get(sym)
+    Application.get(sym)
   end
   
   def set(opts)
-    Ruby2D::Application.set(opts)
+    Application.set(opts)
+  end
+  
+  def on(args = {}, &proc)
+    Application.on(args, &proc)
+  end
+  
+  def on_key(&proc)
+    Application.on_key(&proc)
   end
   
-  def on(mouse: nil, key: nil, key_down: nil, controller: nil, &proc)
-    Ruby2D::Application.on(mouse: mouse, key: key, key_down: key_down, controller: controller, &proc)
+  def on_controller(&proc)
+    Application.on_controller(&proc)
   end
   
   def update(&proc)
-    Ruby2D::Application.update(&proc)
+    Application.update(&proc)
+  end
+  
+  def clear
+    Application.clear
   end
   
   def show
-    Ruby2D::Application.show
+    Application.show
   end
   
-  def clear
-    Ruby2D::Application.clear
+  def close
+    Application.close
   end
+  
 end

data/lib/ruby2d/exceptions.rb

@@ -8,9 +8,8 @@ module Ruby2D
     
     def initialize(msg)
       super(msg)
-      puts error("\nRuby 2D Error:") << " " << msg
-      puts bold("Occurred in:")
-      puts bold("  " + caller.last), "\n"
+      puts error("\nRuby 2D Error:") << " #{msg}" <<
+      bold("\nOccurred in:\n  #{caller.last}\n")
     end
   end
 end

data/lib/ruby2d/image.rb

@@ -3,25 +3,38 @@
 module Ruby2D
   class Image
     
-    attr_accessor :x, :y
+    attr_accessor :x, :y, :width, :height, :data
+    attr_reader :path, :color
     
     def initialize(x, y, path)
       
-      unless File.exists? path
-        raise Error, "Cannot find image file `#{path}`"
-      end
+      # 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
-      
-      if defined? Ruby2D::DSL
-        Ruby2D::Application.add(self)
+      @color = Color.new([1, 1, 1, 1])
+      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 defined? Ruby2D::DSL
-        Ruby2D::Application.remove(self)
+      if Module.const_defined? :DSL
+        Application.remove(self)
       end
     end
     

data/lib/ruby2d/music.rb

@@ -0,0 +1,17 @@
+# music.rb
+
+module Ruby2D
+  class Music
+    
+    attr_accessor :data, :loop
+    attr_reader :path
+    
+    def initialize(path)
+      # TODO: Check if file exists
+      init(path)
+      @path = path
+      @loop = false
+    end
+    
+  end
+end

data/lib/ruby2d/quad.rb

@@ -19,10 +19,7 @@ module Ruby2D
       @x1, @y1, @x2, @y2, @x3, @y3, @x4, @y4 = x1, y1, x2, y2, x3, y3, x4, y4
       @color = c
       update_color(c)
-      
-      if defined? Ruby2D::DSL
-        Ruby2D::Application.add(self)
-      end
+      add
     end
     
     def color=(c)
@@ -30,9 +27,15 @@ module Ruby2D
       update_color(c)
     end
     
+    def add
+      if Module.const_defined? :DSL
+        Application.add(self)
+      end
+    end
+    
     def remove
-      if defined? Ruby2D::DSL
-        Ruby2D::Application.remove(self)
+      if Module.const_defined? :DSL
+        Application.remove(self)
       end
     end
     
@@ -42,21 +45,27 @@ module Ruby2D
       
       # If a valid color, use it for each vertex
       if Color.is_valid? c
-        @c1 = Ruby2D::Color.new(c)
-        @c2 = Ruby2D::Color.new(c)
-        @c3 = Ruby2D::Color.new(c)
-        @c4 = Ruby2D::Color.new(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 = Ruby2D::Color.new(c[0])
-        @c2 = Ruby2D::Color.new(c[1])
-        @c3 = Ruby2D::Color.new(c[2])
-        @c4 = Ruby2D::Color.new(c[3])
+        @c1 = Color.new(c[0])
+        @c2 = Color.new(c[1])
+        @c3 = Color.new(c[2])
+        @c4 = Color.new(c[3])
+        
       else
         raise Error, "Not a valid color for #{self.class}"
       end
       
     end
+    
   end
 end

data/lib/ruby2d/rectangle.rb

@@ -1,7 +1,7 @@
 # rectangle.rb
 
 module Ruby2D
-  class Rectangle < Ruby2D::Quad
+  class Rectangle < Quad
     
     attr_reader :x, :y, :width, :height
     
@@ -10,10 +10,7 @@ module Ruby2D
       @x, @y, @width, @height, @color = x, y, w, h, c
       update_coords(x, y, w, h)
       update_color(c)
-      
-      if defined? Ruby2D::DSL
-        Ruby2D::Application.add(self)
-      end
+      add
     end
     
     def x=(x)

data/lib/ruby2d/sound.rb

@@ -3,16 +3,13 @@
 module Ruby2D
   class Sound
     
-    def initialize(window, path)
-      unless File.exists? path
-        raise Error, "Cannot find sound file!"
-      end
-      window.create_audio(self, path)
-      @window, @path = window, path
-    end
+    attr_accessor :data
+    attr_reader :path
     
-    def play
-      @window.play_audio(self)
+    def initialize(path)
+      # TODO: Check if file exists
+      init(path)
+      @path = path
     end
     
   end

data/lib/ruby2d/sprite.rb

@@ -0,0 +1,91 @@
+# sprite.rb
+
+module Ruby2D
+  class Sprite
+    
+    attr_accessor :x, :y, :clip_x, :clip_y, :clip_w, :clip_h, :data
+    
+    def initialize(x, y, path)
+      
+      # unless File.exists? path
+      #   raise Error, "Cannot find image file `#{path}`"
+      # end
+      
+      @type_id = 4
+      @x, @y, @path = x, y, path
+      @clip_x, @clip_y, @clip_w, @clip_h = 0, 0, 0, 0
+      @default = nil
+      @animations = {}
+      @current_animation = nil
+      @current_frame = 0
+      @current_frame_time = 0
+      
+      init(path)
+      if Module.const_defined? :DSL
+        Application.add(self)
+      end
+    end
+    
+    def start(x, y, w, h)
+      @default = [x, y, w, h]
+      clip(x, y, w, h)
+    end
+    
+    def add(animations)
+      @animations.merge!(animations)
+    end
+    
+    def animate(animation)
+      if @current_animation != animation
+        @current_frame      = 0
+        @current_frame_time = 0
+        @current_animation  = animation
+      end
+      animate_frames(@animations[animation])
+    end
+    
+    def reset
+      clip(@default[0], @default[1], @default[2], @default[3])
+      @current_animation = nil
+    end
+    
+    # TODO: Sprite already has an `add` method, have to reconsile
+    # def add
+    #   if Module.const_defined? :DSL
+    #     Application.add(self)
+    #   end
+    # end
+    
+    def remove
+      if Module.const_defined? :DSL
+        Application.remove(self)
+      end
+    end
+    
+    private
+    
+    def clip(x, y, w, h)
+      @clip_x, @clip_y, @clip_w, @clip_h = x, y, w, h
+    end
+    
+    def animate_frames(frames)
+      if @current_frame_time < frames[@current_frame][4]
+        clip_with_current_frame(frames)
+        @current_frame_time += 1
+      else
+        @current_frame += 1
+        if @current_frame == frames.length
+          @current_frame = 0
+        end
+        clip_with_current_frame(frames)
+        @current_frame_time = 0
+      end
+    end
+    
+    def clip_with_current_frame(frames)
+      clip(frames[@current_frame][0], frames[@current_frame][1],
+           frames[@current_frame][2], frames[@current_frame][3])
+    end
+    
+  end
+end