ruby2d 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daade2a60f6c1e24974a8ca77aafb4cd83e1c59cdf4aff49b8178ee7c880f0f1
-  data.tar.gz: d07549d541ebe08e984b48373b96b890848dcf98373cc565b146c9d97fdcdb5a
+  metadata.gz: e0d000122e993678b9da511dd2dd84a53c2e2762cb9aec666c2410b89c0848b3
+  data.tar.gz: 7cdbf45866165115566642aae3af535b222cfe05a3aeec82f7cc565f4b8f1179
 SHA512:
-  metadata.gz: 379a8eee502d3599654094b625c8e3ca8039982f3d9a1857bf5783e3627b10b1bc9ccc4d31efeb1a13c00234cd35762f0d658890797ed8fc5242ba7f52395e99
-  data.tar.gz: bb7683a054c5e6e9848f2f791dc3e3f5bbb33266a2f798a4e06b3f1df299919cd248c1d4f19e5c31d0fabe4518fadf9cc7f5e8d7e975f49c79fff53e001e9390
+  metadata.gz: 62aae16a50902e30da1647ea49b545aaa164cae20ac85d6b74eb9f18071eafa712b1b5460550413371cc9485cb1888fec2f9b4757c86b58f2ad15ce5d092775b
+  data.tar.gz: 98741f6e78b577d64fb8b63ab98a938d3388dae0d3d9389cd0793dc48611fc95c753f0d3b37ae35ce671f326fb246df9866c2e7e8788e9be46dd758c8bbaa0f7

data/ext/ruby2d/ruby2d.c

@@ -166,21 +166,6 @@ static R_VAL ruby2d_ext_base_path(R_VAL self) {
 }
 
 
-/*
- * Ruby2D#self.ext_screenshot
- */
-#if MRUBY
-static R_VAL ruby2d_ext_screenshot(mrb_state* mrb, R_VAL self) {
-  mrb_value path;
-  mrb_get_args(mrb, "o", &path);
-#else
-static R_VAL ruby2d_ext_screenshot(R_VAL self, R_VAL path) {
-#endif
-  S2D_Screenshot(window, RSTRING_PTR(path));
-  return R_NIL;
-}
-
-
 /*
  * Ruby2D::Triangle#ext_render
  */
@@ -348,8 +333,8 @@ static R_VAL ruby2d_image_ext_init(mrb_state* mrb, R_VAL self) {
 #else
 static R_VAL ruby2d_image_ext_init(R_VAL self, R_VAL path) {
 #endif
-  S2D_Log(S2D_INFO, "Init image: %s", RSTRING_PTR(path));
   S2D_Image *img = S2D_CreateImage(RSTRING_PTR(path));
+  if (!img) return R_FALSE;
 
   // Get width and height from Ruby class. If set, use it, else choose the
   // native dimensions of the image.
@@ -357,9 +342,9 @@ static R_VAL ruby2d_image_ext_init(R_VAL self, R_VAL path) {
   R_VAL h = r_iv_get(self, "@height");
   r_iv_set(self, "@width" , r_test(w) ? w : INT2NUM(img->width));
   r_iv_set(self, "@height", r_test(h) ? h : INT2NUM(img->height));
-
   r_iv_set(self, "@data", r_data_wrap_struct(image, img));
-  return R_NIL;
+
+  return R_TRUE;
 }
 
 
@@ -405,7 +390,6 @@ static void free_image(mrb_state *mrb, void *p_) {
 #else
 static void free_image(S2D_Image *img) {
 #endif
-  S2D_Log(S2D_INFO, "Free image `%s` at %i, %i", img->path, img->x, img->y);
   S2D_FreeImage(img);
 }
 
@@ -421,14 +405,14 @@ static R_VAL ruby2d_sprite_ext_init(mrb_state* mrb, R_VAL self) {
 #else
 static R_VAL ruby2d_sprite_ext_init(R_VAL self, R_VAL path) {
 #endif
-  S2D_Log(S2D_INFO, "Init sprite: %s", RSTRING_PTR(path));
   S2D_Sprite *spr = S2D_CreateSprite(RSTRING_PTR(path));
+  if (!spr) return R_FALSE;
 
   r_iv_set(self, "@img_width" , INT2NUM(spr->width));
   r_iv_set(self, "@img_height", INT2NUM(spr->height));
   r_iv_set(self, "@data", r_data_wrap_struct(sprite, spr));
 
-  return R_NIL;
+  return R_TRUE;
 }
 
 
@@ -485,7 +469,6 @@ static void free_sprite(mrb_state *mrb, void *p_) {
 #else
 static void free_sprite(S2D_Sprite *spr) {
 #endif
-  S2D_Log(S2D_INFO, "Free sprite `%s` at %i, %i", spr->path, spr->x, spr->y);
   S2D_FreeSprite(spr);
 }
 
@@ -499,8 +482,6 @@ static R_VAL ruby2d_text_ext_init(mrb_state* mrb, R_VAL self) {
 #else
 static R_VAL ruby2d_text_ext_init(R_VAL self) {
 #endif
-  S2D_Log(S2D_INFO, "Init text: %s", RSTRING_PTR(r_iv_get(self, "@text")));
-
   // Trim the font file string to its actual length on MRuby
   #if MRUBY
     mrb_value s = r_iv_get(self, "@font");
@@ -512,12 +493,13 @@ static R_VAL ruby2d_text_ext_init(R_VAL self) {
     RSTRING_PTR(r_iv_get(self, "@text")),
     NUM2DBL(r_iv_get(self, "@size"))
   );
+  if (!txt) return R_FALSE;
 
   r_iv_set(self, "@width", INT2NUM(txt->width));
   r_iv_set(self, "@height", INT2NUM(txt->height));
-
   r_iv_set(self, "@data", r_data_wrap_struct(text, txt));
-  return R_NIL;
+
+  return R_TRUE;
 }
 
 
@@ -580,7 +562,6 @@ static void free_text(mrb_state *mrb, void *p_) {
 #else
 static void free_text(S2D_Text *txt) {
 #endif
-  S2D_Log(S2D_INFO, "Free text \"%s\" with font `%s`", txt->msg, txt->font);
   S2D_FreeText(txt);
 }
 
@@ -596,10 +577,10 @@ static R_VAL ruby2d_sound_ext_init(mrb_state* mrb, R_VAL self) {
 #else
 static R_VAL ruby2d_sound_ext_init(R_VAL self, R_VAL path) {
 #endif
-  S2D_Log(S2D_INFO, "Init sound: %s", RSTRING_PTR(path));
   S2D_Sound *snd = S2D_CreateSound(RSTRING_PTR(path));
+  if (!snd) return R_FALSE;
   r_iv_set(self, "@data", r_data_wrap_struct(sound, snd));
-  return R_NIL;
+  return R_TRUE;
 }
 
 
@@ -627,7 +608,6 @@ static void free_sound(mrb_state *mrb, void *p_) {
 #else
 static void free_sound(S2D_Sound *snd) {
 #endif
-  S2D_Log(S2D_INFO, "Free sound `%s`", snd->path);
   S2D_FreeSound(snd);
 }
 
@@ -643,10 +623,10 @@ static R_VAL ruby2d_music_ext_init(mrb_state* mrb, R_VAL self) {
 #else
 static R_VAL ruby2d_music_ext_init(R_VAL self, R_VAL path) {
 #endif
-  S2D_Log(S2D_INFO, "Init music: %s", RSTRING_PTR(path));
   S2D_Music *mus = S2D_CreateMusic(RSTRING_PTR(path));
+  if (!mus) return R_FALSE;
   r_iv_set(self, "@data", r_data_wrap_struct(music, mus));
-  return R_NIL;
+  return R_TRUE;
 }
 
 
@@ -755,7 +735,6 @@ static void free_music(mrb_state *mrb, void *p_) {
 #else
 static void free_music(S2D_Music *mus) {
 #endif
-  S2D_Log(S2D_INFO, "Free music `%s`", mus->path);
   S2D_FreeMusic(mus);
 }
 
@@ -978,6 +957,22 @@ static void render() {
 }
 
 
+/*
+ * Ruby2D::Window#ext_diagnostics
+ */
+#if MRUBY
+static R_VAL ruby2d_ext_diagnostics(mrb_state* mrb, R_VAL self) {
+  mrb_value enable;
+  mrb_get_args(mrb, "o", &enable);
+#else
+static R_VAL ruby2d_ext_diagnostics(R_VAL self, R_VAL enable) {
+#endif
+  // Set Simple 2D diagnostics
+  S2D_Diagnostics(r_test(enable));
+  return R_TRUE;
+}
+
+
 /*
  * Ruby2D::Window#ext_get_display_dimensions
  */
@@ -1020,11 +1015,6 @@ static R_VAL ruby2d_window_ext_show(R_VAL self) {
 #endif
   ruby2d_window = self;
 
-  // Set Simple 2D diagnostics
-  if (r_test(r_iv_get(self, "@diagnostics"))) {
-    S2D_Diagnostics(true);
-  }
-
   // Add controller mappings from file
   r_funcall(self, "add_controller_mappings", 0);
 
@@ -1083,6 +1073,26 @@ static R_VAL ruby2d_window_ext_show(R_VAL self) {
 }
 
 
+/*
+ * Ruby2D::Window#ext_screenshot
+ */
+#if MRUBY
+static R_VAL ruby2d_ext_screenshot(mrb_state* mrb, R_VAL self) {
+  mrb_value path;
+  mrb_get_args(mrb, "o", &path);
+#else
+static R_VAL ruby2d_ext_screenshot(R_VAL self, R_VAL path) {
+#endif
+  if (window) {
+    S2D_Screenshot(window, RSTRING_PTR(path));
+    return path;
+  } else {
+    S2D_Log(S2D_WARN, "Cannot take screenshot before window is shown");
+    return R_FALSE;
+  }
+}
+
+
 /*
  * Ruby2D::Window#ext_close
  */
@@ -1210,6 +1220,9 @@ void Init_ruby2d() {
   // Ruby2D::Window
   R_CLASS ruby2d_window_class = r_define_class(ruby2d_module, "Window");
 
+  // Ruby2D::Window#ext_diagnostics
+  r_define_method(ruby2d_window_class, "ext_diagnostics", ruby2d_ext_diagnostics, r_args_req(1));
+
   // Ruby2D::Window#ext_get_display_dimensions
   r_define_method(ruby2d_window_class, "ext_get_display_dimensions", ruby2d_window_ext_get_display_dimensions, r_args_none);
 

data/lib/ruby2d/circle.rb

@@ -4,7 +4,7 @@ module Ruby2D
   class Circle
     include Renderable
 
-    attr_accessor :radius, :sectors
+    attr_accessor :x, :y, :radius, :sectors
 
     def initialize(opts = {})
       @x = opts[:x] || 25

data/lib/ruby2d/cli/console.rb

@@ -1,3 +1,6 @@
+# Interactive Ruby 2D console
+
+# Save the Ruby file from the command-line arguments
 rb_file = ARGV[1]
 
 # Check if source file provided is good
@@ -14,11 +17,12 @@ require 'open3'
 require 'readline'
 require 'io/wait'
 
-line = 1  # the current line number, to be incremented
+line = 1  # the current line number
 
-# Open a new process for the  Ruby file
+# Open a new process for the Ruby file
 stdin, stdout, stderr, wait_thr = Open3.popen3("ruby -r 'ruby2d/cli/enable_console' #{rb_file}")
 
+# Request input and send commands
 loop do
 
   # Read the next command
@@ -31,19 +35,31 @@ loop do
     exit
   end
 
-  # Skip if command is an empty string
-  unless cmd.empty?
+  # Try sending commands
+  begin
+
+    # Skip if command is an empty string
+    unless cmd.empty?
 
-    # Send command to the Ruby file
-    stdin.puts cmd
+      # Send command to the Ruby file
+      stdin.puts cmd
 
-    # Read and print output from the Ruby file
-    puts stdout.gets
-    while stdout.ready? do
+      # Read and print output from the Ruby file
       puts stdout.gets
+      while stdout.ready? do
+        puts stdout.gets
+      end
+
     end
+
+    # Increment the line number
+    line += 1
+
+  # Rescue exception if can't send commands to the Ruby 2D window
+  rescue Errno::EPIPE
+    puts "Can't connect to the window (was it closed?)",
+         "For help, see: ruby2d.com/learn/console"
+    exit 1
   end
 
-  # Advance to next line
-  line += 1
 end

data/lib/ruby2d/image.rb

@@ -20,7 +20,9 @@ module Ruby2D
       @rotate = opts[:rotate] || 0
       self.color = opts[:color] || 'white'
       self.opacity = opts[:opacity] if opts[:opacity]
-      ext_init(@path)
+      unless ext_init(@path)
+        raise Error, "Image `#{@path}` cannot be created"
+      end
       add
     end
 

data/lib/ruby2d/line.rb

@@ -4,15 +4,15 @@ module Ruby2D
   class Line
     include Renderable
 
-    attr_accessor :x1, :x2, :y1, :y2
+    attr_accessor :x1, :x2, :y1, :y2, :width
 
     def initialize(opts = {})
       @x1 = opts[:x1] || 0
       @y1 = opts[:y1] || 0
       @x2 = opts[:x2] || 100
       @y2 = opts[:y2] || 100
-      @width = opts[:width] || 2
       @z = opts[:z] || 0
+      @width = opts[:width] || 2
       self.color = opts[:color] || 'white'
       self.opacity = opts[:opacity] if opts[:opacity]
       add
@@ -53,7 +53,7 @@ module Ruby2D
           @c3 = c[2]
           @c4 = c[3]
         else
-          raise ArgumentError, "Lines require 4 colors, one for each vertex. #{c.length} were given."
+          raise ArgumentError, "`#{self.class}` requires 4 colors, one for each vertex. #{c.length} were given."
         end
       else
         @c1 = c

data/lib/ruby2d/music.rb

@@ -6,13 +6,15 @@ module Ruby2D
     attr_reader :path
     attr_accessor :loop, :data
 
-    def initialize(path)
+    def initialize(path, opts = {})
       unless File.exist? path
         raise Error, "Cannot find audio file `#{path}`"
       end
       @path = path
-      @loop = false
-      ext_init(path)
+      @loop = opts[:loop] || false
+      unless ext_init(@path)
+        raise Error, "Music `#{@path}` cannot be created"
+      end
     end
 
     # Play the music

data/lib/ruby2d/quad.rb

@@ -62,7 +62,7 @@ module Ruby2D
           @c3 = c[2]
           @c4 = c[3]
         else
-          raise ArgumentError, "Quads require 4 colors, one for each vertex. #{c.length} were given."
+          raise ArgumentError, "`#{self.class}` requires 4 colors, one for each vertex. #{c.length} were given."
         end
       else
         @c1 = c

data/lib/ruby2d/renderable.rb

@@ -49,7 +49,7 @@ module Ruby2D
 
     # Add a contains method stub
     def contains?(x, y)
-      x > @x && x < (@x + @width) && y > @y && y < (@y + @height)
+      x >= @x && x <= (@x + @width) && y >= @y && y <= (@y + @height)
     end
 
   end

data/lib/ruby2d/sound.rb

@@ -11,7 +11,9 @@ module Ruby2D
         raise Error, "Cannot find audio file `#{path}`"
       end
       @path = path
-      ext_init(path)
+      unless ext_init(@path)
+        raise Error, "Sound `#{@path}` cannot be created"
+      end
     end
 
     # Play the sound

data/lib/ruby2d/sprite.rb

@@ -4,6 +4,7 @@ module Ruby2D
   class Sprite
     include Renderable
 
+    attr_reader :path
     attr_accessor :rotate, :loop, :clip_x, :clip_y, :clip_width, :clip_height, :data
 
     def initialize(path, opts = {})
@@ -45,7 +46,9 @@ module Ruby2D
       @img_width = nil; @img_height = nil
 
       # Initialize the sprite
-      ext_init(@path)
+      unless ext_init(@path)
+        raise Error, "Sprite image `#{@path}` cannot be created"
+      end
 
       # The clipping rectangle
       @clip_x = opts[:clip_x] || 0

data/lib/ruby2d/text.rb

@@ -4,8 +4,8 @@ module Ruby2D
   class Text
     include Renderable
 
-    attr_reader :text, :size, :font
-    attr_accessor :x, :y, :rotate, :data
+    attr_reader :text, :font
+    attr_accessor :x, :y, :size, :rotate, :data
 
     def initialize(text, opts = {})
       @x = opts[:x] || 0
@@ -20,7 +20,9 @@ module Ruby2D
       unless File.exist? @font
         raise Error, "Cannot find font file `#{@font}`"
       end
-      ext_init
+      unless ext_init
+        raise Error, "Text `#{@text}` cannot be created"
+      end
       add
     end
 

data/lib/ruby2d/triangle.rb

@@ -26,9 +26,8 @@ module Ruby2D
       update_color(@color)
     end
 
-    # Point is inside a triangle if
-    # the area of 3 triangles, constructed from triangle sides and that point
-    # is equal to the area of triangle.
+    # A point is inside a triangle if the area of 3 triangles, constructed from
+    # triangle sides and the given point, is equal to the area of triangle.
     def contains?(x, y)
       self_area = triangle_area(@x1, @y1, @x2, @y2, @x3, @y3)
       questioned_area =
@@ -52,7 +51,7 @@ module Ruby2D
           @c2 = c[1]
           @c3 = c[2]
         else
-          raise ArgumentError, "Triangles require 3 colors, one for each vertex. #{c.length} were given."
+          raise ArgumentError, "`#{self.class}` requires 3 colors, one for each vertex. #{c.length} were given."
         end
       else
         @c1 = c

data/lib/ruby2d/version.rb

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

data/lib/ruby2d/window.rb

@@ -87,7 +87,11 @@ module Ruby2D
       @diagnostics = false
 
       # Console mode, enabled at command line
-      @console = $ruby2d_console_mode || false
+      if RUBY_ENGINE == 'ruby'
+        @console = defined?($ruby2d_console_mode) ? true : false
+      else
+        @console = false
+      end
     end
 
     # Class methods for convenient access to properties
@@ -204,7 +208,10 @@ module Ruby2D
       @borderless      = opts[:borderless]      || @borderless
       @fullscreen      = opts[:fullscreen]      || @fullscreen
       @highdpi         = opts[:highdpi]         || @highdpi
-      @diagnostics     = opts[:diagnostics]     || @diagnostics
+      unless opts[:diagnostics].nil?
+        @diagnostics = opts[:diagnostics]
+        ext_diagnostics(@diagnostics)
+      end
     end
 
     # Add an object to the window

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2d
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Tom Black
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-05 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec