ruby2d 0.9.3 → 0.11.0

data/lib/ruby2d/sound.rb

@@ -21,5 +21,35 @@ module Ruby2D
       ext_play
     end
 
+    # Returns the length in seconds
+    def length
+      ext_length
+    end
+
+    # Get the volume of the sound
+    def volume
+      ext_get_volume
+    end
+
+    # Set the volume of the sound
+    def volume=(v)
+      # Clamp value to between 0-100
+      if v < 0 then v = 0 end
+      if v > 100 then v = 100 end
+      ext_set_volume(v)
+    end
+
+    # Get the volume of the sound mixer
+    def self.mix_volume
+      ext_get_mix_volume
+    end
+
+    # Set the volume of the sound mixer
+    def self.mix_volume=(v)
+      # Clamp value to between 0-100
+      if v < 0 then v = 0 end
+      if v > 100 then v = 100 end
+      ext_set_mix_volume(v)
+    end
   end
 end

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
 
@@ -72,39 +63,7 @@ module Ruby2D
       }
 
       # Add the sprite to the window
-      add
-    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
+      unless opts[:show] == false then add end
     end
 
     # Play an animation
@@ -141,6 +100,7 @@ module Ruby2D
         set_frame
         restart_time
       end
+      self
     end
 
     # Stop the current animation and set to the default frame
@@ -164,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
@@ -221,7 +161,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 +186,47 @@ module Ruby2D
       end
     end
 
+    def draw(opts = {})
+      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
+      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
+
+      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(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
+
+      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
@@ -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

@@ -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,22 +14,65 @@ 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
-      add
+      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
+
+      render(x: opts[:x], y: opts[:y], color: Color.new(opts[:color]), rotate: opts[:rotate])
+    end
+
+    private
+
+    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 defined?(@texture)
+        @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::Text
+
+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

@@ -0,0 +1,87 @@
+# Ruby2D::Tileset
+
+module Ruby2D
+  class Tileset
+    include Renderable
+
+    def initialize(path, opts = {})
+      @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]
+      @scale = opts[:scale] || 1
+
+      unless opts[:show] == false then add end
+    end
+
+    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)
+      tile = @defined_tiles.fetch(name)
+
+      coordinates.each do |coordinate|
+        @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)
+        })
+      end
+    end
+
+    def clear_tiles
+      @tiles = []
+    end
+  end
+
+  def draw
+    Window.render_ready_check
+
+    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 : Color.new([1.0, 1.0, 1.0, 1.0])
+
+      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