ruby2d 0.9.4 → 0.11.1

data/lib/ruby2d/cli/build.rb

@@ -25,6 +25,8 @@ require 'fileutils'
   'text',
   'sound',
   'music',
+  'texture',
+  'vertices',
   '../ruby2d'
 ]
 
@@ -96,7 +98,7 @@ def build_native(rb_file)
   end
 
   # Compile to a native executable
-  `cc build/app.c -lmruby \`simple2d --libs\` -o build/app`
+  `cc build/app.c -lmruby -o build/app`
 
   # Clean up
   clean_up unless @debug
@@ -162,12 +164,6 @@ end
 def build_ios_tvos(rb_file, device)
   check_build_src_file(rb_file)
 
-  # Check for Simple 2D framework,
-  unless File.exist?('/usr/local/Frameworks/Simple2D/iOS/Simple2D.framework') && File.exist?('/usr/local/Frameworks/Simple2D/tvOS/Simple2D.framework')
-    puts "#{'Error:'.error} Simple 2D iOS and tvOS frameworks not found. Install them and try again.\n"
-    exit
-  end
-
   # Check if MRuby exists; if not, quit
   if `which mruby`.empty?
     puts "#{'Error:'.error} Can't find MRuby, which is needed to build native Ruby 2D applications.\n"
@@ -197,6 +193,7 @@ def build_ios_tvos(rb_file, device)
     f << File.read("#{@gem_dir}/ext/ruby2d/ruby2d.c")
   end
 
+  # TODO: Need add this functionality to the gem
   # Build the Xcode project
   `simple2d build --#{device} build/#{device}/MyApp.xcodeproj`
 

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

@@ -2,8 +2,22 @@
 
 module Ruby2D
   class Font
+    @@loaded_fonts = {}
+
+    attr_reader :ttf_font
+
+    def initialize(path, size, style=nil)
+      @ttf_font = Font.ext_load(path, size, style.to_s)
+    end
 
     class << self
+      def load(path, size, style=nil)
+        unless File.exist? path
+          raise Error, "Cannot find font file `#{path}`"
+        end
+
+        @@loaded_fonts[[path, size, style]] ||= Font.new(path, size, style)
+      end
 
       # List all fonts, names only
       def all
@@ -50,6 +64,7 @@ module Ruby2D
         macos_font_path   = '/Library/Fonts'
         linux_font_path   = '/usr/share/fonts'
         windows_font_path = 'C:/Windows/Fonts'
+        openbsd_font_path = '/usr/X11R6/lib/X11/fonts'
 
         # If MRI and/or non-Bash shell (like cmd.exe)
         if Object.const_defined? :RUBY_PLATFORM
@@ -60,15 +75,20 @@ module Ruby2D
             linux_font_path
           when /mingw/
             windows_font_path
+          when /openbsd/
+            openbsd_font_path
           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
+          elsif uname.include? 'OpenBSD'
+            openbsd_font_path
           end
         end
       end

data/lib/ruby2d/image.rb

@@ -7,24 +7,52 @@ 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"
+      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
+      unless opts[:color]
+        opts[:color] = [1.0, 1.0, 1.0, 1.0]
       end
-      add
+
+      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(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
 
@@ -38,8 +38,30 @@ module Ruby2D
       (((@y2 - @y1) * x - (@x2 - @x1) * y + @x2 * @y1 - @y2 * @x1).abs / length) <= 0.5 * @width
     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],
+        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

@@ -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
 
@@ -48,8 +48,28 @@ module Ruby2D
       questioned_area <= self_area
     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],
+        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

@@ -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
@@ -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,20 +28,8 @@ module Ruby2D
     end
 
     # Allow British English spelling of color
-    def colour; self.color end
-    def colour=(c); self.color = c end
-
-    # 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
+    alias_method :colour, :color
+    alias_method :colour=, :color=
 
     # Add a contains method stub
     def contains?(x, y)

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=