ruby2d 0.10.0 → 0.11.0

data/lib/ruby2d/image.rb

@@ -7,26 +7,34 @@ module Ruby2D
     attr_reader :path
     attr_accessor :x, :y, :width, :height, :rotate, :data
 
-    def initialize(path, opts = {})
+    def self.load_image(path)
       unless File.exist? path
         raise Error, "Cannot find image file `#{path}`"
       end
+
+      ext_load_image(path)
+    end
+
+    def initialize(path, opts = {})
       @path = path
+
+      @texture = Texture.new(*Image.load_image(@path))
+      @width = opts[:width] || @texture.width
+      @height = opts[:height] || @texture.height
+
       @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]
-      unless ext_init(@path)
-        raise Error, "Image `#{@path}` cannot be created"
-      end
+      self.color.opacity = opts[:opacity] if opts[:opacity]
+
       unless opts[:show] == false then add end
     end
 
     def draw(opts = {})
+      Window.render_ready_check
+
       opts[:width] = opts[:width] || @width
       opts[:height] = opts[:height] || @height
       opts[:rotate] = opts[:rotate] || @rotate
@@ -34,20 +42,17 @@ 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[: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(opts[:color]), rotate: opts[:rotate])
     end
 
     private
 
-    def render
-      self.class.ext_draw([
-        self, @x, @y, @width, @height, @rotate,
-        @color.r, @color.g, @color.b, @color.a
-      ])
-    end
+    def render(x: @x, y: @y, width: @width, height: @height, color: @color, rotate: @rotate)
+      vertices = Vertices.new(x, y, width, height, rotate)
 
+      @texture.draw(
+        vertices.coordinates, vertices.texture_coordinates, color
+      )
+    end
   end
 end

data/lib/ruby2d/line.rb

@@ -14,7 +14,7 @@ module Ruby2D
       @z = opts[:z] || 0
       @width = opts[:width] || 2
       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[:x2], opts[:y2], opts[:width],
         opts[:color][0][0], opts[:color][0][1], opts[:color][0][2], opts[:color][0][3],

data/lib/ruby2d/quad.rb

@@ -25,7 +25,7 @@ module Ruby2D
       @y4 = opts[:y4] || 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
 
@@ -49,6 +49,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/rectangle.rb

@@ -10,7 +10,7 @@ module Ruby2D
       @width = opts[:width] || 200
       @height = opts[:height] || 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, @width, @height)
       add
     end

data/lib/ruby2d/renderable.rb

@@ -31,18 +31,6 @@ module Ruby2D
     alias_method :colour, :color
     alias_method :colour=, :color=
 
-    # Allow shortcuts for setting color values
-    def r; self.color.r end
-    def g; self.color.g end
-    def b; self.color.b end
-    def a; self.color.a end
-    def r=(c); self.color.r = c end
-    def g=(c); self.color.g = c end
-    def b=(c); self.color.b = c end
-    def a=(c); self.color.a = c end
-    def opacity; self.color.opacity end
-    def opacity=(val); self.color.opacity = val end
-
     # Add a contains method stub
     def contains?(x, y)
       x >= @x && x <= (@x + @width) && y >= @y && y <= (@y + @height)

data/lib/ruby2d/sound.rb

@@ -26,5 +26,30 @@ module Ruby2D
       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
 
@@ -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
@@ -248,8 +187,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 +200,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,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
+      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 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