ruby2d 0.10.0 → 0.11.2

data/lib/ruby2d/sprite.rb

@@ -5,32 +5,27 @@ module Ruby2D
     include Renderable
 
     attr_reader :path
-    attr_accessor :rotate, :loop, :clip_x, :clip_y, :clip_width, :clip_height, :data
+    attr_accessor :rotate, :loop, :clip_x, :clip_y, :clip_width, :clip_height, :data, :x, :y, :width, :height
 
     def initialize(path, opts = {})
-      unless File.exist? path
-        raise Error, "Cannot find sprite image file `#{path}`"
-      end
-
       # Sprite image file path
       @path = path
 
+      # Initialize the sprite texture
+      @texture = Texture.new(*Image.load_image(@path))
+      @img_width = @texture.width
+      @img_height = @texture.height
+
       # Coordinates, size, and rotation of the sprite
       @x = opts[:x] || 0
       @y = opts[:y] || 0
       @z = opts[:z] || 0
-      @width  = opts[:width]  || nil
-      @height = opts[:height] || nil
       @rotate = opts[:rotate] || 0
       self.color = opts[:color] || 'white'
-      self.opacity = opts[:opacity] if opts[:opacity]
+      self.color.opacity = opts[:opacity] if opts[:opacity]
 
-      # Flipping status, coordinates, and size, used internally
+      # Flipping status
       @flip = nil
-      @flip_x = @x
-      @flip_y = @y
-      @flip_width  = @width
-      @flip_height = @height
 
       # Animation attributes
       @start_time = 0.0
@@ -42,20 +37,16 @@ module Ruby2D
       @last_frame = 0
       @done_proc = nil
 
-      # The sprite image size set by the native extension `ext_init`
-      @img_width = nil; @img_height = nil
-
-      # Initialize the sprite
-      unless ext_init(@path)
-        raise Error, "Sprite image `#{@path}` cannot be created"
-      end
-
       # The clipping rectangle
       @clip_x = opts[:clip_x] || 0
       @clip_y = opts[:clip_y] || 0
       @clip_width  = opts[:clip_width]  || @img_width
       @clip_height = opts[:clip_height] || @img_height
 
+      # Dimensions
+      @width  = opts[:width]  || nil
+      @height = opts[:height] || nil
+
       # Set the default animation
       @animations[:default] = 0..(@img_width / @clip_width) - 1
 
@@ -75,38 +66,6 @@ module Ruby2D
       unless opts[:show] == false then add end
     end
 
-    # Set the x coordinate
-    def x=(x)
-      @x = @flip_x = x
-      if @flip == :horizontal || @flip == :both
-        @flip_x = x + @width
-      end
-    end
-
-    # Set the y coordinate
-    def y=(y)
-      @y = @flip_y = y
-      if @flip == :vertical || @flip == :both
-        @flip_y = y + @height
-      end
-    end
-
-    # Set the width
-    def width=(width)
-      @width = @flip_width = width
-      if @flip == :horizontal || @flip == :both
-        @flip_width = -width
-      end
-    end
-
-    # Set the height
-    def height=(height)
-      @height = @flip_height = height
-      if @flip == :vertical || @flip == :both
-        @flip_height = -height
-      end
-    end
-
     # Play an animation
     def play(opts = {}, &done_proc)
 
@@ -165,26 +124,6 @@ module Ruby2D
       end
 
       @flip = flip
-
-      # Reset flip values
-      @flip_x      = @x
-      @flip_y      = @y
-      @flip_width  = @width
-      @flip_height = @height
-
-      case flip
-      when :horizontal
-        @flip_x      = @x + @width
-        @flip_width  = -@width
-      when :vertical
-        @flip_y      = @y + @height
-        @flip_height = -@height
-      when :both     # horizontal and vertical
-        @flip_x      = @x + @width
-        @flip_width  = -@width
-        @flip_y      = @y + @height
-        @flip_height = -@height
-      end
     end
 
     # Reset frame to defaults
@@ -238,8 +177,13 @@ module Ruby2D
           unless @loop
             # Stop animation and play block, if provided
             stop
-            if @done_proc then @done_proc.call end
-            @done_proc = nil
+            if @done_proc
+              # allow proc to make nested `play/do` calls to sequence multiple
+              # animations by clearing `@done_proc` before the call
+              kept_done_proc = @done_proc
+              @done_proc = nil
+              kept_done_proc.call
+            end
           end
         end
 
@@ -248,8 +192,10 @@ module Ruby2D
     end
 
     def draw(opts = {})
-      opts[:width] = opts[:width] || @flip_width
-      opts[:height] = opts[:height] || @flip_height
+      Window.render_ready_check
+
+      opts[:width] = opts[:width] || (@width || @clip_width)
+      opts[:height] = opts[:height] || (@height || @clip_height)
       opts[:rotate] = opts[:rotate] || @rotate
       opts[:clip_x] = opts[:clip_x] || @clip_x
       opts[:clip_y] = opts[:clip_y] || @clip_y
@@ -259,24 +205,33 @@ module Ruby2D
         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]
-      ])
+      render(x: opts[:x], y: opts[:y], width: opts[:width], height: opts[:height], color: Color.new(color), rotate: opts[:rotate], crop: {
+        x: opts[:clip_x],
+        y: opts[:clip_y],
+        width: opts[:clip_width],
+        height: opts[:clip_height],
+        image_width: @img_width,
+        image_height: @img_height,
+      })
     end
 
     private
 
-    def render
+    def render(x: @x, y: @y, width: (@width || @clip_width), height: (@height || @clip_height) , color: @color, rotate: @rotate, flip: @flip, crop: {
+      x: @clip_x,
+      y: @clip_y,
+      width: @clip_width,
+      height: @clip_height,
+      image_width: @img_width,
+      image_height: @img_height,
+    })
       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
 
+      vertices = Vertices.new(x, y, width, height, rotate, crop: crop, flip: flip)
 
+      @texture.draw(
+        vertices.coordinates, vertices.texture_coordinates, color
+      )
+    end
   end
 end

data/lib/ruby2d/square.rb

@@ -11,7 +11,7 @@ module Ruby2D
       @z = opts[:z] || 0
       @width = @height = @size = opts[:size] || 100
       self.color = opts[:color] || 'white'
-      self.opacity = opts[:opacity] if opts[:opacity]
+      self.color.opacity = opts[:opacity] if opts[:opacity]
       update_coords(@x, @y, @size, @size)
       add
     end

data/lib/ruby2d/text.rb

@@ -4,8 +4,8 @@ module Ruby2D
   class Text
     include Renderable
 
-    attr_reader :text, :font
-    attr_accessor :x, :y, :size, :rotate, :data
+    attr_reader :text, :size
+    attr_accessor :x, :y, :rotate, :data
 
     def initialize(text, opts = {})
       @x = opts[:x] || 0
@@ -14,43 +14,63 @@ module Ruby2D
       @text = text.to_s
       @size = opts[:size] || 20
       @rotate = opts[:rotate] || 0
+      @style = opts[:style]
       self.color = opts[:color] || 'white'
-      self.opacity = opts[:opacity] if opts[:opacity]
-      @font = opts[:font] || Font.default
-      unless File.exist? @font
-        raise Error, "Cannot find font file `#{@font}`"
-      end
-      unless ext_init
-        raise Error, "Text `#{@text}` cannot be created"
-      end
+      self.color.opacity = opts[:opacity] if opts[:opacity]
+      @font_path = opts[:font] || Font.default
+      create_font
+      create_texture
+
       unless opts[:show] == false then add end
     end
 
+    # Returns the path of the font as a string
+    def font
+      @font_path
+    end
+
     def text=(msg)
       @text = msg.to_s
-      ext_set(@text)
+      create_texture
+    end
+
+    def size=(size)
+      @size = size
+      create_font
+      create_texture
     end
 
     def draw(opts = {})
+      Window.render_ready_check
+
       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]
-      ])
+      render(x: opts[:x], y: opts[:y], color: Color.new(opts[:color]), rotate: opts[:rotate])
     end
 
     private
 
-    def render
-      self.class.ext_draw([
-        self, @x, @y, @rotate,
-        @color.r, @color.g, @color.b, @color.a
-      ])
+    def render(x: @x, y: @y, color: @color, rotate: @rotate)
+      vertices = Vertices.new(x, y, @width, @height, rotate)
+
+      @texture.draw(
+        vertices.coordinates, vertices.texture_coordinates, color
+      )
+    end
+
+    def create_font
+      @font = Font.load(@font_path, @size, @style)
     end
 
+    def create_texture
+      if @texture then @texture.delete end
+
+      @texture = Texture.new(*Text.ext_load_text(@font.ttf_font, @text))
+      @width = @texture.width
+      @height = @texture.height
+    end
   end
 end

data/lib/ruby2d/texture.rb

@@ -0,0 +1,28 @@
+# Ruby2D::Texture
+
+module Ruby2D
+  class Texture
+    attr_reader :width, :height, :texture_id
+
+    def initialize(pixel_data, width, height)
+      @pixel_data = pixel_data
+      @width = width
+      @height = height
+      @texture_id = 0
+    end
+
+    def draw(coordinates, texture_coordinates, color)
+      if @texture_id == 0
+        @texture_id = ext_create(@pixel_data, @width, @height)
+        @pixel_data = nil
+      end
+
+      color = [color.r, color.g, color.b, color.a]
+      ext_draw(coordinates, texture_coordinates, color, @texture_id)
+    end
+
+    def delete
+      ext_delete(@texture_id)
+    end
+  end
+end

data/lib/ruby2d/tileset.rb

@@ -2,29 +2,32 @@
 
 module Ruby2D
   class Tileset
+    DEFAULT_COLOR = Color.new([1.0, 1.0, 1.0, 1.0])
+
     include Renderable
 
     def initialize(path, opts = {})
-      unless File.exist? path
-        raise Error, "Cannot find tileset image file `#{path}`"
-      end
       @path = path
+
+      # Initialize the tileset texture
+      @texture = Texture.new(*Image.load_image(@path))
+      @width = opts[:width] || @texture.width
+      @height = opts[:height] || @texture.height
+      @z = opts[:z] || 0
+
       @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
+      @scale = opts[:scale] || 1
 
       unless opts[:show] == false then add end
     end
 
-    def define_tile(name, x, y)
-      @defined_tiles[name] = { x: x, y: y }
+    def define_tile(name, x, y, rotate: 0, flip: nil)
+      @defined_tiles[name] = { x: x, y: y , rotate: rotate, flip: flip }
     end
 
     def set_tile(name, coordinates)
@@ -34,6 +37,8 @@ module Ruby2D
         @tiles.push({
           tile_x: tile.fetch(:x), 
           tile_y: tile.fetch(:y), 
+          tile_rotate: tile.fetch(:rotate),
+          tile_flip: tile.fetch(:flip),
           x: coordinate.fetch(:x),
           y: coordinate.fetch(:y)
         })
@@ -43,27 +48,41 @@ module Ruby2D
     def clear_tiles
       @tiles = []
     end
-  end
 
-  def draw(opts = {})
-    render(opts)
-  end
+    def draw
+      Window.render_ready_check
 
-  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)
-        ])
+      render
+    end
+
+    private
+
+    def render
+      scaled_padding = @padding * @scale
+      scaled_spacing = @spacing * @scale
+      scaled_tile_width = @tile_width * @scale
+      scaled_tile_height = @tile_height * @scale
+      scaled_width = @width * @scale
+      scaled_height = @height * @scale
+
+      @tiles.each do |tile|
+        crop = {
+          x: scaled_padding + (tile.fetch(:tile_x) * (scaled_spacing + scaled_tile_width)),
+          y: scaled_padding + (tile.fetch(:tile_y) * (scaled_spacing + scaled_tile_height)),
+          width: scaled_tile_width,
+          height: scaled_tile_height,
+          image_width: scaled_width,
+          image_height: scaled_height,
+        }
+
+        color = defined?(@color) ? @color : DEFAULT_COLOR
+
+        vertices = Vertices.new(tile.fetch(:x), tile.fetch(:y), scaled_tile_width, scaled_tile_height, tile.fetch(:tile_rotate), crop: crop, flip: tile.fetch(:tile_flip))
+
+        @texture.draw(
+          vertices.coordinates, vertices.texture_coordinates, color
+        )
+      end
     end
   end
 end

data/lib/ruby2d/triangle.rb

@@ -17,7 +17,7 @@ module Ruby2D
       @y3 = opts[:y3] || 100
       @z  = opts[:z]  || 0
       self.color = opts[:color] || 'white'
-      self.opacity = opts[:opacity] if opts[:opacity]
+      self.color.opacity = opts[:opacity] if opts[:opacity]
       add
     end
 
@@ -39,6 +39,8 @@ module Ruby2D
     end
 
     def self.draw(opts = {})
+      Window.render_ready_check
+
       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],

data/lib/ruby2d/version.rb

@@ -1,5 +1,5 @@
 # Ruby2D::VERSION
 
 module Ruby2D
-  VERSION = '0.10.0'
+  VERSION = '0.11.2'
 end

data/lib/ruby2d/vertices.rb

@@ -0,0 +1,89 @@
+# Ruby2D::Vertices
+
+# This class generates a vertices array which are passed to the openGL rendering code.
+# The vertices array is split up into 4 groups (1 - top left, 2 - top right, 3 - bottom right, 4 - bottom left)
+# This class is responsible for transforming textures, it can scale / crop / rotate and flip textures
+
+module Ruby2D
+  class Vertices
+    def initialize(x, y, width, height, rotate, crop: nil, flip: nil)
+      @flip = flip
+      @x = x
+      @y = y
+      @width = width.to_f
+      @height = height.to_f
+
+      if @flip == :horizontal || @flip == :both
+        @x = @x + @width
+        @width = -@width
+      end
+
+      if @flip == :vertical || @flip == :both
+        @y = y + @height
+        @height = -@height
+      end
+
+      @rotate = rotate
+      @rx = @x + (@width / 2.0)
+      @ry = @y + (@height / 2.0)
+      @crop = crop
+    end
+
+    def coordinates
+      if @rotate == 0
+        x1, y1 = @x,          @y;           # Top left
+        x2, y2 = @x + @width, @y;           # Top right
+        x3, y3 = @x + @width, @y + @height; # Bottom right
+        x4, y4 = @x,          @y + @height; # Bottom left
+      else
+        x1, y1 = rotate(@x,          @y);           # Top left
+        x2, y2 = rotate(@x + @width, @y);           # Top right
+        x3, y3 = rotate(@x + @width, @y + @height); # Bottom right
+        x4, y4 = rotate(@x,          @y + @height); # Bottom left
+      end
+
+      [ x1, y1, x2, y2, x3, y3, x4, y4 ]
+    end
+
+    def texture_coordinates
+      if @crop.nil?
+        tx1 = 0.0; ty1 = 0.0 # Top left
+        tx2 = 1.0; ty2 = 0.0 # Top right
+        tx3 = 1.0; ty3 = 1.0 # Bottom right
+        tx4 = 0.0; ty4 = 1.0 # Bottom left
+      else
+        tx1 = @crop[:x] / @crop[:image_width].to_f; ty1 = @crop[:y] / @crop[:image_height].to_f # Top left
+        tx2 = tx1 + (@crop[:width] / @crop[:image_width].to_f); ty2 = ty1                       # Top right
+        tx3 = tx2; ty3 = ty1 + (@crop[:height] / @crop[:image_height].to_f)                     # Botttom right
+        tx4 = tx1; ty4 = ty3                                                                    # Bottom left
+      end
+
+      [ tx1, ty1, tx2, ty2, tx3, ty3, tx4, ty4 ]
+    end
+
+    private
+
+    def rotate(x, y)
+      # Convert from degrees to radians
+      angle = @rotate * Math::PI / 180.0
+
+      # Get the sine and cosine of the angle
+      sa = Math.sin(angle)
+      ca = Math.cos(angle)
+
+      # Translate point to origin
+      x -= @rx
+      y -= @ry
+
+      # Rotate point
+      xnew = x * ca - y * sa;
+      ynew = x * sa + y * ca;
+
+      # Translate point back
+      x = xnew + @rx;
+      y = ynew + @ry;
+
+      [x, y]
+    end
+  end
+end

data/lib/ruby2d/window.rb

@@ -4,6 +4,7 @@
 
 module Ruby2D
   class Window
+    @@open_window = false
 
     # Event structures
     EventDescriptor       = Struct.new(:type, :id)
@@ -109,9 +110,7 @@ module Ruby2D
       @render_proc = Proc.new {}
 
       # Detect if window is being used through the DSL or as a class instance
-      unless method(:update).parameters.empty? || method(:render).parameters.empty?
-        @using_dsl = true
-      end
+      @using_dsl = !(method(:update).parameters.empty? || method(:render).parameters.empty?)
 
       # Whether diagnostic messages should be printed
       @diagnostics = false
@@ -190,6 +189,12 @@ module Ruby2D
       def close
         DSL.window.close
       end
+
+      def render_ready_check
+        unless @@open_window
+          raise Error, "Attempting to draw before the window is ready. Please put calls to draw() inside of a render block."
+        end
+      end
     end
 
     # Public instance methods
@@ -616,6 +621,11 @@ module Ruby2D
 
     # Show the window
     def show
+      if @@open_window
+        raise Error, "Window#show called multiple times, Ruby2D only supports a single open window"
+      end
+
+      @@open_window = true
       ext_show
     end
 

data/lib/ruby2d.rb

@@ -22,35 +22,31 @@ unless RUBY_ENGINE == 'mruby'
   require 'ruby2d/text'
   require 'ruby2d/sound'
   require 'ruby2d/music'
-
-  if defined?(RubyInstaller)
-    s2d_dll_path = Gem::Specification.find_by_name('ruby2d').gem_dir + '/assets/mingw/bin'
-    RubyInstaller::Runtime.add_dll_directory(File.expand_path(s2d_dll_path))
-  end
-
+  require 'ruby2d/texture'
+  require 'ruby2d/vertices'
   require 'ruby2d/ruby2d'  # load native extension
 end
 
 
 module Ruby2D
-
-  @assets = nil
-
-  class << self
-    def assets
-      unless @assets
-        if RUBY_ENGINE == 'mruby'
-          @assets = Ruby2D.ext_base_path + 'assets'
-        else
-          @assets = './assets'
-        end
-      end
-      @assets
+  def self.gem_dir
+    # mruby doesn't define `Gem`
+    if RUBY_ENGINE == 'mruby'
+      `ruby -e "print Gem::Specification.find_by_name('ruby2d').gem_dir"`
+    else
+      Gem::Specification.find_by_name('ruby2d').gem_dir
     end
+  end
+
+  def self.assets
+    "#{gem_dir}/assets"
+  end
 
-    def assets=(path); @assets = path end
+  def self.test_media
+    "#{gem_dir}/assets/test_media"
   end
 end
 
+
 include Ruby2D
 extend  Ruby2D::DSL