ruby2d 0.7.0 → 0.8.0

data/lib/ruby2d/dsl.rb

@@ -4,8 +4,8 @@ module Ruby2D::DSL
 
   Ruby2D::Window.new
 
-  def get(sym)
-    Window.get(sym)
+  def get(sym, opts = nil)
+    Window.get(sym, opts)
   end
 
   def set(opts)

data/lib/ruby2d/image.rb

@@ -4,18 +4,14 @@ module Ruby2D
   class Image
     include Renderable
 
-    attr_reader :path, :color
+    attr_reader :path
     attr_accessor :x, :y, :width, :height, :rotate, :data
 
     def initialize(path, opts = {})
-      @path = path
-
-      unless RUBY_ENGINE == 'opal'
-        unless File.exists? @path
-          raise Error, "Cannot find image file `#{@path}`"
-        end
+      unless File.exist? path
+        raise Error, "Cannot find image file `#{path}`"
       end
-
+      @path = path
       @x = opts[:x] || 0
       @y = opts[:y] || 0
       @z = opts[:z] || 0
@@ -23,18 +19,10 @@ module Ruby2D
       @height = opts[:height] || nil
       @rotate = opts[:rotate] || 0
       self.color = opts[:color] || 'white'
-
+      self.opacity = opts[:opacity] if opts[:opacity]
       ext_init(@path)
       add
     end
 
-    def color=(c)
-      @color = Color.new(c)
-    end
-
-    def contains?(x, y)
-      @x < x and @x + @width > x and @y < y and @y + @height > y
-    end
-
   end
 end

data/lib/ruby2d/line.rb

@@ -4,7 +4,7 @@ module Ruby2D
   class Line
     include Renderable
 
-    attr_accessor :x1, :x2, :y1, :y2, :color, :width
+    attr_accessor :x1, :x2, :y1, :y2
 
     def initialize(opts = {})
       @x1 = opts[:x1] || 0
@@ -14,11 +14,12 @@ module Ruby2D
       @width = opts[:width] || 2
       @z = opts[:z] || 0
       self.color = opts[:color] || 'white'
+      self.opacity = opts[:opacity] if opts[:opacity]
       add
     end
 
     def color=(c)
-      @color = Color.from(c)
+      @color = Color.set(c)
       update_color(@color)
     end
 
@@ -32,9 +33,9 @@ module Ruby2D
     # the width. For reference:
     #   https://en.wikipedia.org/wiki/Distance_from_a_point_to_a_line
     def contains?(x, y)
-      points_distance(x1, y1, x, y) < length and
-      points_distance(x2, y2, x, y) < length and
-      (((@y2 - @y1) * x - (@x2 - @x1) * y + @x2 * @y1 - @y2 * @x1).abs / length) < 0.5 * @width
+      points_distance(x1, y1, x, y) <= length &&
+      points_distance(x2, y2, x, y) <= length &&
+      (((@y2 - @y1) * x - (@x2 - @x1) * y + @x2 * @y1 - @y2 * @x1).abs / length) <= 0.5 * @width
     end
 
     private

data/lib/ruby2d/music.rb

@@ -7,13 +7,9 @@ module Ruby2D
     attr_accessor :loop, :data
 
     def initialize(path)
-
-      unless RUBY_ENGINE == 'opal'
-        unless File.exists? path
-          raise Error, "Cannot find audio file `#{path}`"
-        end
+      unless File.exist? path
+        raise Error, "Cannot find audio file `#{path}`"
       end
-
       @path = path
       @loop = false
       ext_init(path)
@@ -39,16 +35,16 @@ module Ruby2D
       ext_stop
     end
 
-    # Returns the previous volume setting, in percentage
+    # Returns the volume, in percentage
     def self.volume
-      self.ext_volume(-1)
+      self.ext_get_volume
     end
 
     # Set music volume, 0 to 100%
     def self.volume=(v)
       # If a negative value, volume will be 0
       if v < 0 then v = 0 end
-      self.ext_volume(v)
+      self.ext_set_volume(v)
     end
 
     # Alias instance methods to class methods

data/lib/ruby2d/quad.rb

@@ -4,8 +4,6 @@ module Ruby2D
   class Quad
     include Renderable
 
-    attr_reader :color
-
     # Coordinates in clockwise order, starting at top left:
     # x1,y1 == top left
     # x2,y2 == top right
@@ -27,11 +25,12 @@ module Ruby2D
       @y4 = opts[:y4] || 100
       @z  = opts[:z]  || 0
       self.color = opts[:color] || 'white'
+      self.opacity = opts[:opacity] if opts[:opacity]
       add
     end
 
     def color=(c)
-      @color = Color.from(c)
+      @color = Color.set(c)
       update_color(@color)
     end
 

data/lib/ruby2d/rectangle.rb

@@ -3,8 +3,6 @@
 module Ruby2D
   class Rectangle < Quad
 
-    attr_reader :x, :y, :width, :height
-
     def initialize(opts = {})
       @x = opts[:x] || 0
       @y = opts[:y] || 0
@@ -12,6 +10,7 @@ module Ruby2D
       @width = opts[:width] || 200
       @height = opts[:height] || 100
       self.color = opts[:color] || 'white'
+      self.opacity = opts[:opacity] if opts[:opacity]
       update_coords(@x, @y, @width, @height)
       add
     end
@@ -40,10 +39,6 @@ module Ruby2D
       update_coords(@x, @y, @width, h)
     end
 
-    def contains?(x, y)
-      @x < x and @x + @width > x and @y < y and @y + @height > y
-    end
-
     private
 
     def update_coords(x, y, w, h)

data/lib/ruby2d/renderable.rb

@@ -3,7 +3,7 @@
 module Ruby2D
   module Renderable
 
-    attr_reader :z
+    attr_reader :x, :y, :z, :width, :height, :color
 
     # Set the z position (depth) of the object
     def z=(z)
@@ -26,6 +26,15 @@ module Ruby2D
       end
     end
 
+    # Set the color value
+    def color=(c)
+      @color = Color.new(c)
+    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
@@ -38,13 +47,9 @@ module Ruby2D
     def opacity; self.color.opacity end
     def opacity=(val); self.color.opacity = val end
 
-    # Allow British English spelling of color
-    def colour; self.color end
-    def colour=(c); self.color = c end
-
     # Add a contains method stub
     def contains?(x, y)
-      raise Error, "\`#contains?\` not implemented for this class yet"
+      x > @x && x < (@x + @width) && y > @y && y < (@y + @height)
     end
 
   end

data/lib/ruby2d/sound.rb

@@ -7,13 +7,9 @@ module Ruby2D
     attr_accessor :data
 
     def initialize(path)
-
-      unless RUBY_ENGINE == 'opal'
-        unless File.exists? path
-          raise Error, "Cannot find audio file `#{path}`"
-        end
+      unless File.exist? path
+        raise Error, "Cannot find audio file `#{path}`"
       end
-
       @path = path
       ext_init(path)
     end

data/lib/ruby2d/sprite.rb

@@ -4,16 +4,11 @@ module Ruby2D
   class Sprite
     include Renderable
 
-    attr_reader :x, :y, :width, :height
     attr_accessor :rotate, :loop, :clip_x, :clip_y, :clip_width, :clip_height, :data
 
     def initialize(path, opts = {})
-
-      # Check if sprite file exists, unless running on the web
-      unless RUBY_ENGINE == 'opal'
-        unless File.exists? path
-          raise Error, "Cannot find sprite image file `#{path}`"
-        end
+      unless File.exist? path
+        raise Error, "Cannot find sprite image file `#{path}`"
       end
 
       # Sprite image file path
@@ -26,6 +21,8 @@ module Ruby2D
       @width  = opts[:width]  || nil
       @height = opts[:height] || nil
       @rotate = opts[:rotate] || 0
+      self.color = opts[:color] || 'white'
+      self.opacity = opts[:opacity] if opts[:opacity]
 
       # Flipping status, coordinates, and size, used internally
       @flip = nil

data/lib/ruby2d/square.rb

@@ -11,6 +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]
       update_coords(@x, @y, @size, @size)
       add
     end

data/lib/ruby2d/text.rb

@@ -4,7 +4,7 @@ module Ruby2D
   class Text
     include Renderable
 
-    attr_reader :text, :size, :width, :height, :font, :color
+    attr_reader :text, :size, :font
     attr_accessor :x, :y, :rotate, :data
 
     def initialize(text, opts = {})
@@ -14,15 +14,12 @@ module Ruby2D
       @text = text.to_s
       @size = opts[:size] || 20
       @rotate = opts[:rotate] || 0
+      self.color = opts[:color] || 'white'
+      self.opacity = opts[:opacity] if opts[:opacity]
       @font = opts[:font] || Font.default
-
-      unless RUBY_ENGINE == 'opal'
-        unless File.exists? @font
-          raise Error, "Cannot find font file `#{@font}`"
-        end
+      unless File.exist? @font
+        raise Error, "Cannot find font file `#{@font}`"
       end
-
-      self.color = opts[:color] || 'white'
       ext_init
       add
     end
@@ -32,13 +29,5 @@ module Ruby2D
       ext_set(@text)
     end
 
-    def color=(c)
-      @color = Color.new(c)
-    end
-
-    def contains?(x, y)
-      @x < x and @x + @width > x and @y < y and @y + @height > y
-    end
-
   end
 end

data/lib/ruby2d/triangle.rb

@@ -4,7 +4,6 @@ module Ruby2D
   class Triangle
     include Renderable
 
-    attr_reader :color
     attr_accessor :x1, :y1, :c1,
                   :x2, :y2, :c2,
                   :x3, :y3, :c3
@@ -18,11 +17,12 @@ module Ruby2D
       @y3 = opts[:y3] || 100
       @z  = opts[:z]  || 0
       self.color = opts[:color] || 'white'
+      self.opacity = opts[:opacity] if opts[:opacity]
       add
     end
 
     def color=(c)
-      @color = Color.from(c)
+      @color = Color.set(c)
       update_color(@color)
     end
 

data/lib/ruby2d/version.rb

@@ -1,5 +1,5 @@
 # Ruby2D::VERSION
 
 module Ruby2D
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

data/lib/ruby2d/window.rb

@@ -85,6 +85,9 @@ module Ruby2D
 
       # Whether diagnostic messages should be printed
       @diagnostics = false
+
+      # Console mode, enabled at command line
+      @console = $ruby2d_console_mode || false
     end
 
     # Class methods for convenient access to properties
@@ -108,9 +111,10 @@ module Ruby2D
       def mouse_x;         get(:mouse_x)         end
       def mouse_y;         get(:mouse_y)         end
       def diagnostics;     get(:diagnostics)     end
+      def screenshot(opts = nil); get(:screenshot, opts) end
 
-      def get(sym)
-        @@window.get(sym)
+      def get(sym, opts = nil)
+        @@window.get(sym, opts)
       end
 
       def set(opts)
@@ -153,7 +157,7 @@ module Ruby2D
     # Public instance methods
 
     # Retrieve an attribute of the window
-    def get(sym)
+    def get(sym, opts = nil)
       case sym
       when :window;          self
       when :title;           @title
@@ -179,6 +183,7 @@ module Ruby2D
       when :mouse_x;         @mouse_x
       when :mouse_y;         @mouse_y
       when :diagnostics;     @diagnostics
+      when :screenshot;      screenshot(opts)
       end
     end
 
@@ -320,10 +325,8 @@ module Ruby2D
 
     # Add controller mappings from file
     def add_controller_mappings
-      unless RUBY_ENGINE == 'opal'
-        if File.exists? @controller_mappings
-          ext_add_controller_mappings(@controller_mappings)
-        end
+      if File.exist? @controller_mappings
+        ext_add_controller_mappings(@controller_mappings)
       end
     end
 
@@ -356,6 +359,25 @@ module Ruby2D
     # Update callback method, called by the native and web extentions
     def update_callback
       @update_proc.call
+
+      # Accept and eval commands if in console mode
+      if @console
+        if STDIN.ready?
+          cmd = STDIN.gets
+          begin
+            res = eval(cmd, TOPLEVEL_BINDING)
+            STDOUT.puts "=> #{res.inspect}"
+            STDOUT.flush
+          rescue SyntaxError => se
+            STDOUT.puts se
+            STDOUT.flush
+          rescue Exception => e
+            STDOUT.puts e
+            STDOUT.flush
+          end
+        end
+      end
+
     end
 
     # Show the window
@@ -363,6 +385,20 @@ module Ruby2D
       ext_show
     end
 
+    # Take screenshot
+    def screenshot(path)
+      if path
+        ext_screenshot(path)
+      else
+        if RUBY_ENGINE == 'ruby'
+          time = Time.now.utc.strftime '%Y-%m-%d--%H-%M-%S'
+        else
+          time = Time.now.utc.to_i
+        end
+        ext_screenshot("./screenshot-#{time}.png")
+      end
+    end
+
     # Close the window
     def close
       ext_close

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ruby2d
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Tom Black
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2019-01-05 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: opal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -148,10 +134,13 @@ files:
 - assets/tvos/main.c
 - bin/ruby2d
 - ext/ruby2d/extconf.rb
-- ext/ruby2d/ruby2d-opal.rb
 - ext/ruby2d/ruby2d.c
 - lib/ruby2d.rb
 - lib/ruby2d/circle.rb
+- lib/ruby2d/cli/build.rb
+- lib/ruby2d/cli/console.rb
+- lib/ruby2d/cli/enable_console.rb
+- lib/ruby2d/cli/launch.rb
 - lib/ruby2d/color.rb
 - lib/ruby2d/colorize.rb
 - lib/ruby2d/dsl.rb
@@ -189,8 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Ruby 2D