ruby2d 0.9.2 → 0.10.0

data/lib/ruby2d/cli/colorize.rb

@@ -0,0 +1,10 @@
+# String#ruby2d_colorize
+
+# Extend `String` to include some fancy colors
+class String
+  def ruby2d_colorize(c); "\e[#{c}m#{self}\e[0m" end
+  def bold;  ruby2d_colorize('1')    end
+  def info;  ruby2d_colorize('1;34') end
+  def warn;  ruby2d_colorize('1;33') end
+  def error; ruby2d_colorize('1;31') end
+end

data/lib/ruby2d/dsl.rb

@@ -2,38 +2,45 @@
 
 module Ruby2D::DSL
 
-  Ruby2D::Window.new
+  @window = Ruby2D::Window.new
+
+  def self.window; @window end
+  def self.window=(w); @window = w end
 
   def get(sym, opts = nil)
-    Window.get(sym, opts)
+    DSL.window.get(sym, opts)
   end
 
   def set(opts)
-    Window.set(opts)
+    DSL.window.set(opts)
   end
 
   def on(event, &proc)
-    Window.on(event, &proc)
+    DSL.window.on(event, &proc)
   end
 
   def off(event_descriptor)
-    Window.off(event_descriptor)
+    DSL.window.off(event_descriptor)
   end
 
   def update(&proc)
-    Window.update(&proc)
+    DSL.window.update(&proc)
+  end
+
+  def render(&proc)
+    DSL.window.render(&proc)
   end
 
   def clear
-    Window.clear
+    DSL.window.clear
   end
 
   def show
-    Window.show
+    DSL.window.show
   end
 
   def close
-    Window.close
+    DSL.window.close
   end
 
 end

data/lib/ruby2d/entity.rb

@@ -0,0 +1,17 @@
+# Ruby2D::Entity
+
+module Ruby2D
+  class Entity
+
+    # Add the entity to the window
+    def add
+      Window.add(self)
+    end
+
+    # Remove the entity from the window
+    def remove
+      Window.remove(self)
+    end
+
+  end
+end

data/lib/ruby2d/font.rb

@@ -63,11 +63,12 @@ module Ruby2D
           end
         # If MRuby
         else
-          if `uname`.include? 'Darwin'  # macOS
+          uname = `uname`
+          if uname.include? 'Darwin' # macOS
             macos_font_path
-          elsif `uname`.include? 'Linux'
+          elsif uname.include? 'Linux'
             linux_font_path
-          elsif `uname`.include? 'MINGW'
+          elsif uname.include? 'MINGW'
             windows_font_path
           end
         end

data/lib/ruby2d/image.rb

@@ -23,7 +23,30 @@ module Ruby2D
       unless ext_init(@path)
         raise Error, "Image `#{@path}` cannot be created"
       end
-      add
+      unless opts[:show] == false then add end
+    end
+
+    def draw(opts = {})
+      opts[:width] = opts[:width] || @width
+      opts[:height] = opts[:height] || @height
+      opts[:rotate] = opts[:rotate] || @rotate
+      unless opts[:color]
+        opts[:color] = [1.0, 1.0, 1.0, 1.0]
+      end
+
+      self.class.ext_draw([
+        self, opts[:x], opts[:y], opts[:width], opts[:height], opts[:rotate],
+        opts[:color][0], opts[:color][1], opts[:color][2], opts[:color][3]
+      ])
+    end
+
+    private
+
+    def render
+      self.class.ext_draw([
+        self, @x, @y, @width, @height, @rotate,
+        @color.r, @color.g, @color.b, @color.a
+      ])
     end
 
   end

data/lib/ruby2d/line.rb

@@ -38,8 +38,28 @@ module Ruby2D
       (((@y2 - @y1) * x - (@x2 - @x1) * y + @x2 * @y1 - @y2 * @x1).abs / length) <= 0.5 * @width
     end
 
+    def self.draw(opts = {})
+      ext_draw([
+        opts[:x1], opts[:y1], opts[:x2], opts[:y2], opts[:width],
+        opts[:color][0][0], opts[:color][0][1], opts[:color][0][2], opts[:color][0][3],
+        opts[:color][1][0], opts[:color][1][1], opts[:color][1][2], opts[:color][1][3],
+        opts[:color][2][0], opts[:color][2][1], opts[:color][2][2], opts[:color][2][3],
+        opts[:color][3][0], opts[:color][3][1], opts[:color][3][2], opts[:color][3][3]
+      ])
+    end
+
     private
 
+    def render
+      self.class.ext_draw([
+        @x1, @y1, @x2, @y2, @width,
+        @c1.r, @c1.g, @c1.b, @c1.a,
+        @c2.r, @c2.g, @c2.b, @c2.a,
+        @c3.r, @c3.g, @c3.b, @c3.a,
+        @c4.r, @c4.g, @c4.b, @c4.a
+      ])
+    end
+
     # Calculate the distance between two points
     def points_distance(x1, y1, x2, y2)
       Math.sqrt((x1 - x2) ** 2 + (y1 - y2) ** 2)

data/lib/ruby2d/music.rb

@@ -58,5 +58,10 @@ module Ruby2D
       ext_fadeout(ms)
     end
 
+    # Returns the length in seconds
+    def length
+      ext_length
+    end
+
   end
 end

data/lib/ruby2d/pixel.rb

@@ -0,0 +1,17 @@
+# Ruby2D::Pixel
+
+module Ruby2D
+  class Pixel
+
+    def self.draw(opts = {})
+      ext_draw([
+        opts[:x]              , opts[:y],
+        opts[:x] + opts[:size], opts[:y],
+        opts[:x] + opts[:size], opts[:y] + opts[:size],
+        opts[:x]              , opts[:y] + opts[:size],
+        opts[:color][0], opts[:color][1], opts[:color][2], opts[:color][3]
+      ])
+    end
+
+  end
+end

data/lib/ruby2d/quad.rb

@@ -48,8 +48,26 @@ module Ruby2D
       questioned_area <= self_area
     end
 
+    def self.draw(opts = {})
+      ext_draw([
+        opts[:x1], opts[:y1], opts[:color][0][0], opts[:color][0][1], opts[:color][0][2], opts[:color][0][3],
+        opts[:x2], opts[:y2], opts[:color][1][0], opts[:color][1][1], opts[:color][1][2], opts[:color][1][3],
+        opts[:x3], opts[:y3], opts[:color][2][0], opts[:color][2][1], opts[:color][2][2], opts[:color][2][3],
+        opts[:x4], opts[:y4], opts[:color][3][0], opts[:color][3][1], opts[:color][3][2], opts[:color][3][3]
+      ])
+    end
+
     private
 
+    def render
+      self.class.ext_draw([
+        @x1, @y1, @c1.r, @c1.g, @c1.b, @c1.a,
+        @x2, @y2, @c2.r, @c2.g, @c2.b, @c2.a,
+        @x3, @y3, @c3.r, @c3.g, @c3.b, @c3.a,
+        @x4, @y4, @c4.r, @c4.g, @c4.b, @c4.a
+      ])
+    end
+
     def triangle_area(x1, y1, x2, y2, x3, y3)
       (x1*y2 + x2*y3 + x3*y1 - x3*y2 - x1*y3 - x2*y1).abs / 2
     end

data/lib/ruby2d/rectangle.rb

@@ -39,6 +39,15 @@ module Ruby2D
       update_coords(@x, @y, @width, h)
     end
 
+    def self.draw(opts = {})
+      ext_draw([
+        opts[:x]               , opts[:y]                , opts[:color][0][0], opts[:color][0][1], opts[:color][0][2], opts[:color][0][3],
+        opts[:x] + opts[:width], opts[:y]                , opts[:color][1][0], opts[:color][1][1], opts[:color][1][2], opts[:color][1][3],
+        opts[:x] + opts[:width], opts[:y] + opts[:height], opts[:color][2][0], opts[:color][2][1], opts[:color][2][2], opts[:color][2][3],
+        opts[:x]               , opts[:y] + opts[:height], opts[:color][3][0], opts[:color][3][1], opts[:color][3][2], opts[:color][3][3]
+      ])
+    end
+
     private
 
     def update_coords(x, y, w, h)
@@ -46,10 +55,10 @@ module Ruby2D
       @y1 = y
       @x2 = x + w
       @y2 = y
-      @x4 = x
-      @y4 = y + h
       @x3 = x + w
       @y3 = y + h
+      @x4 = x
+      @y4 = y + h
     end
 
   end

data/lib/ruby2d/renderable.rb

@@ -14,16 +14,12 @@ module Ruby2D
 
     # Add the object to the window
     def add
-      if Module.const_defined? :DSL
-        Window.add(self)
-      end
+      Window.add(self)
     end
 
     # Remove the object from the window
     def remove
-      if Module.const_defined? :DSL
-        Window.remove(self)
-      end
+      Window.remove(self)
     end
 
     # Set the color value
@@ -32,8 +28,8 @@ module Ruby2D
     end
 
     # Allow British English spelling of color
-    def colour; self.color end
-    def colour=(c); self.color = c end
+    alias_method :colour, :color
+    alias_method :colour=, :color=
 
     # Allow shortcuts for setting color values
     def r; self.color.r end

data/lib/ruby2d/sound.rb

@@ -21,5 +21,10 @@ module Ruby2D
       ext_play
     end
 
+    # Returns the length in seconds
+    def length
+      ext_length
+    end
+
   end
 end

data/lib/ruby2d/sprite.rb

@@ -42,7 +42,7 @@ module Ruby2D
       @last_frame = 0
       @done_proc = nil
 
-      # The sprite image size set by the native extension `ext_init()`
+      # The sprite image size set by the native extension `ext_init`
       @img_width = nil; @img_height = nil
 
       # Initialize the sprite
@@ -72,7 +72,7 @@ module Ruby2D
       }
 
       # Add the sprite to the window
-      add
+      unless opts[:show] == false then add end
     end
 
     # Set the x coordinate
@@ -141,6 +141,7 @@ module Ruby2D
         set_frame
         restart_time
       end
+      self
     end
 
     # Stop the current animation and set to the default frame
@@ -221,7 +222,7 @@ module Ruby2D
       @start_time = Time.now.to_f
     end
 
-    # Update the sprite animation, called by `Sprite#ext_render`
+    # Update the sprite animation, called by `render`
     def update
       if @playing
 
@@ -246,5 +247,36 @@ module Ruby2D
       end
     end
 
+    def draw(opts = {})
+      opts[:width] = opts[:width] || @flip_width
+      opts[:height] = opts[:height] || @flip_height
+      opts[:rotate] = opts[:rotate] || @rotate
+      opts[:clip_x] = opts[:clip_x] || @clip_x
+      opts[:clip_y] = opts[:clip_y] || @clip_y
+      opts[:clip_width] = opts[:clip_width] || @clip_width
+      opts[:clip_height] = opts[:clip_height] || @clip_height
+      unless opts[:color]
+        opts[:color] = [1.0, 1.0, 1.0, 1.0]
+      end
+
+      self.class.ext_draw([
+        self, opts[:x], opts[:y], opts[:width], opts[:height], opts[:rotate],
+        opts[:clip_x], opts[:clip_y], opts[:clip_width], opts[:clip_height],
+        opts[:color][0], opts[:color][1], opts[:color][2], opts[:color][3]
+      ])
+    end
+
+    private
+
+    def render
+      update
+      self.class.ext_draw([
+        self, @flip_x, @flip_y, @flip_width, @flip_height, @rotate,
+        @clip_x, @clip_y, @clip_width, @clip_height,
+        @color.r, @color.g, @color.b, @color.a
+      ])
+    end
+
+
   end
 end

data/lib/ruby2d/square.rb

@@ -21,6 +21,15 @@ module Ruby2D
       self.width = self.height = @size = s
     end
 
+    def self.draw(opts = {})
+      ext_draw([
+        opts[:x]              , opts[:y]              , opts[:color][0][0], opts[:color][0][1], opts[:color][0][2], opts[:color][0][3],
+        opts[:x] + opts[:size], opts[:y]              , opts[:color][1][0], opts[:color][1][1], opts[:color][1][2], opts[:color][1][3],
+        opts[:x] + opts[:size], opts[:y] + opts[:size], opts[:color][2][0], opts[:color][2][1], opts[:color][2][2], opts[:color][2][3],
+        opts[:x]              , opts[:y] + opts[:size], opts[:color][3][0], opts[:color][3][1], opts[:color][3][2], opts[:color][3][3]
+      ])
+    end
+
     # Make the inherited width and height attribute accessors private
     private :width=, :height=
 

data/lib/ruby2d/text.rb

@@ -23,7 +23,7 @@ module Ruby2D
       unless ext_init
         raise Error, "Text `#{@text}` cannot be created"
       end
-      add
+      unless opts[:show] == false then add end
     end
 
     def text=(msg)
@@ -31,5 +31,26 @@ module Ruby2D
       ext_set(@text)
     end
 
+    def draw(opts = {})
+      opts[:rotate] = opts[:rotate] || @rotate
+      unless opts[:color]
+        opts[:color] = [1.0, 1.0, 1.0, 1.0]
+      end
+
+      self.class.ext_draw([
+        self, opts[:x], opts[:y], opts[:rotate],
+        opts[:color][0], opts[:color][1], opts[:color][2], opts[:color][3]
+      ])
+    end
+
+    private
+
+    def render
+      self.class.ext_draw([
+        self, @x, @y, @rotate,
+        @color.r, @color.g, @color.b, @color.a
+      ])
+    end
+
   end
 end

data/lib/ruby2d/tileset.rb

@@ -0,0 +1,69 @@
+# Ruby2D::Tileset
+
+module Ruby2D
+  class Tileset
+    include Renderable
+
+    def initialize(path, opts = {})
+      unless File.exist? path
+        raise Error, "Cannot find tileset image file `#{path}`"
+      end
+      @path = path
+      @tiles = []
+      @defined_tiles = {}
+      @padding = opts[:padding] || 0
+      @spacing = opts[:spacing] || 0
+      @tile_width = opts[:tile_width]
+      @tile_height = opts[:tile_height]
+
+      unless ext_init(@path)
+        raise Error, "Tileset `#{@path}` cannot be created"
+      end
+
+      unless opts[:show] == false then add end
+    end
+
+    def define_tile(name, x, y)
+      @defined_tiles[name] = { x: x, y: y }
+    end
+
+    def set_tile(name, coordinates)
+      tile = @defined_tiles.fetch(name)
+
+      coordinates.each do |coordinate|
+        @tiles.push({
+          tile_x: tile.fetch(:x), 
+          tile_y: tile.fetch(:y), 
+          x: coordinate.fetch(:x),
+          y: coordinate.fetch(:y)
+        })
+      end
+    end
+
+    def clear_tiles
+      @tiles = []
+    end
+  end
+
+  def draw(opts = {})
+    render(opts)
+  end
+
+  private
+
+  def render(opts = {})
+    opts[:tile_width] = opts[:tile_width] || @tile_width
+    opts[:tile_height] = opts[:tile_height] || @tile_height
+    opts[:padding] = opts[:padding] || @padding
+    opts[:spacing] = opts[:spacing] || @spacing
+
+    @tiles.each do |tile|
+      self.class.ext_draw(
+        [
+          self, opts[:tile_width], opts[:tile_height], opts[:padding], opts[:spacing],
+          tile.fetch(:tile_x), tile.fetch(:tile_y), tile.fetch(:x),
+          tile.fetch(:y)
+        ])
+    end
+  end
+end