ruby2d 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aba47e3b04390bdf27cf2480419d09173683eca948a494790c5bc5c617b9ffbf
-  data.tar.gz: 8dff61a42195fdcb9d87bbfa35981c80a91ad4b4e0a61d72b9821fac479dc913
+  metadata.gz: befe5ad5a05dfdab4e9da310b4a016b138692dbd372f68b0fb9e5fa2c8836e78
+  data.tar.gz: 89523d76e354169eff325ea485b3afde30b085a1a9431d9b6135ef90eadee53a
 SHA512:
-  metadata.gz: 87e61972f9877759df9623c3e5cd4d5141ccb8fd743f59de30359be9c4be37fbf4158a72e8b641f17847af135d5df4d523f28607341ea694a695e5566adb9906
-  data.tar.gz: 301dae8cf14f3b85eb5c9fe0bf6925d058330cbaa9d1ee33dd6b4272cf948b2cf4ecc845c188b0e95e342bd253bea02a07afcc265656ef9657992a8d47dbab35
+  metadata.gz: 6e47726fb332a184bc026898f5b50d67f7463f0cc57350a37200e71f74d35e66902aaae6c61704a8ef467de461f7c8335c59feb890dcd319de2ac000ddfa265a
+  data.tar.gz: eb887567fc2c23d9ea7d10c12b79b6392f1e572da82d2fdc0e1bb791298de33b5a1c942c125965b3cf002d6bffdbb1dd0f150023919b300503aaf577e0dbbbc1

data/bin/ruby2d

@@ -1,15 +1,8 @@
 #!/usr/bin/env ruby
+require 'ruby2d/colorize'
 require 'ruby2d/version'
 require 'fileutils'
 
-# Extending `String` to include some fancy colors
-class String
-  def colorize(c); "\e[#{c}m#{self}\e[0m" end
-  def bold;  colorize('1')    end
-  def warn;  colorize('1;33') end
-  def error; colorize('1;31') end
-end
-
 # The installed gem directory
 @gem_dir = "#{Gem::Specification.find_by_name('ruby2d').gem_dir}"
 

data/ext/ruby2d/extconf.rb

@@ -1,17 +1,12 @@
 require 'mkmf'
+require_relative '../../lib/ruby2d/colorize'
 
 S2D_VERSION = '1.0.1'  # Simple 2D minimum version required
 $errors = []
 
-class String
-  def colorize(c); "\e[#{c}m#{self}\e[0m" end
-  def bold; colorize('1')    end
-  def red;  colorize('1;31') end
-end
-
 def print_errors
   puts "
-#{"== #{"Ruby 2D Installation Errors".red} =======================================\n"}
+#{"== #{"Ruby 2D Installation Errors".error} =======================================\n"}
   #{$errors.join("\n  ")}\n
 #{"======================================================================="}"
 end

data/ext/ruby2d/ruby2d.c

@@ -65,6 +65,7 @@
   #define r_define_module(name)  mrb_define_module(mrb, name)
   #define r_define_class(module, name)  mrb_define_class_under(mrb, module, name, mrb->object_class)
   #define r_define_method(class, name, function, args)  mrb_define_method(mrb, class, name, function, args)
+  #define r_define_class_method(class, name, function, args)  mrb_define_class_method(mrb, class, name, function, args)
   #define r_args_none  (MRB_ARGS_NONE())
   #define r_args_req(n)  MRB_ARGS_REQ(n)
   // Helpers
@@ -87,6 +88,7 @@
   #define r_define_module(name)  rb_define_module(name)
   #define r_define_class(module, name)  rb_define_class_under(module, name, rb_cObject)
   #define r_define_method(class, name, function, args)  rb_define_method(class, name, function, args)
+  #define r_define_class_method(class, name, function, args)  rb_define_singleton_method(class, name, function, args)
   #define r_args_none  0
   #define r_args_req(n)  n
   // Helpers
@@ -466,6 +468,12 @@ 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");
+    mrb_str_resize(mrb, s, RSTRING_LEN(s));
+  #endif
+
   S2D_Text *txt = S2D_CreateText(
     RSTRING_PTR(r_iv_get(self, "@font")),
     RSTRING_PTR(r_iv_get(self, "@text")),
@@ -663,6 +671,21 @@ static R_VAL ruby2d_music_ext_stop(R_VAL self) {
 }
 
 
+/*
+ * Ruby2D::Music#ext_volume
+ */
+#if MRUBY
+static R_VAL ruby2d_music_ext_volume(mrb_state* mrb, R_VAL self) {
+  mrb_value vol;
+  mrb_get_args(mrb, "o", &vol);
+#else
+static R_VAL ruby2d_music_ext_volume(R_VAL self, R_VAL vol) {
+#endif
+  int mix_vol = NUM2INT(vol) == -1 ? -1 : MIX_MAX_VOLUME * NUM2INT(vol) / 100.0;
+  return INT2NUM(ceil(Mix_VolumeMusic(mix_vol) * 100.0 / MIX_MAX_VOLUME));
+}
+
+
 /*
  * Ruby2D::Music#ext_fadeout
  */
@@ -1127,6 +1150,9 @@ void Init_ruby2d() {
   // Ruby2D::Music#ext_stop
   r_define_method(ruby2d_music_class, "ext_stop", ruby2d_music_ext_stop, r_args_none);
 
+  // Ruby2D::Music#self.ext_volume
+  r_define_class_method(ruby2d_music_class, "ext_volume", ruby2d_music_ext_volume, r_args_req(1));
+
   // Ruby2D::Music#ext_fadeout
   r_define_method(ruby2d_music_class, "ext_fadeout", ruby2d_music_ext_fadeout, r_args_req(1));
 

data/lib/ruby2d.rb

@@ -1,7 +1,8 @@
 # Ruby2D module and native extension loader, adds DSL
 
-require 'ruby2d/renderable'
+require 'ruby2d/colorize'
 require 'ruby2d/exceptions'
+require 'ruby2d/renderable'
 require 'ruby2d/color'
 require 'ruby2d/window'
 require 'ruby2d/dsl'

data/lib/ruby2d/colorize.rb

@@ -0,0 +1,10 @@
+# String#colorize
+
+# Extend `String` to include some fancy colors
+class String
+  def colorize(c); "\e[#{c}m#{self}\e[0m" end
+  def bold;  colorize('1')    end
+  def info;  colorize('1;34') end
+  def warn;  colorize('1;33') end
+  def error; colorize('1;31') end
+end

data/lib/ruby2d/font.rb

@@ -40,11 +40,11 @@ module Ruby2D
       # Get the fonts directory for the current platform
       def directory
         if `uname`.include? 'Darwin'  # macOS
-            "/Library/Fonts"
+          '/Library/Fonts'
         elsif `uname`.include? 'Linux'
-            "/usr/share/fonts/truetype"
+          '/usr/share/fonts'
         elsif `uname`.include? 'MINGW'
-            "C:/Windows/Fonts"
+          'C:/Windows/Fonts'
         end
       end
 

data/lib/ruby2d/image.rb

@@ -7,8 +7,8 @@ module Ruby2D
     attr_reader :path, :color
     attr_accessor :x, :y, :width, :height, :rotate, :data
 
-    def initialize(opts = {})
-      @path = opts[:path]
+    def initialize(path, opts = {})
+      @path = path
 
       unless RUBY_ENGINE == 'opal'
         unless File.exists? @path

data/lib/ruby2d/music.rb

@@ -39,6 +39,22 @@ module Ruby2D
       ext_stop
     end
 
+    # Returns the previous volume setting, in percentage
+    def self.volume
+      self.ext_volume(-1)
+    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)
+    end
+
+    # Alias instance methods to class methods
+    def volume; Music.volume end
+    def volume=(v); Music.volume=(v) end
+
     # Fade out music over provided milliseconds
     def fadeout(ms)
       ext_fadeout(ms)

data/lib/ruby2d/sprite.rb

@@ -4,7 +4,7 @@ module Ruby2D
   class Sprite
     include Renderable
 
-    attr_reader   :x, :y, :width, :height
+    attr_reader :x, :y, :width, :height
     attr_accessor :rotate, :loop, :clip_x, :clip_y, :clip_width, :clip_height, :data
 
     def initialize(path, opts = {})
@@ -78,7 +78,7 @@ module Ruby2D
     # Set the x coordinate
     def x=(x)
       @x = @flip_x = x
-      if @flip == :flip_h || @flip == :flip_hv
+      if @flip == :horizontal || @flip == :both
         @flip_x = x + @width
       end
     end
@@ -86,7 +86,7 @@ module Ruby2D
     # Set the y coordinate
     def y=(y)
       @y = @flip_y = y
-      if @flip == :flip_v || @flip == :flip_hv
+      if @flip == :vertical || @flip == :both
         @flip_y = y + @height
       end
     end
@@ -94,7 +94,7 @@ module Ruby2D
     # Set the width
     def width=(width)
       @width = @flip_width = width
-      if @flip == :flip_h || @flip == :flip_hv
+      if @flip == :horizontal || @flip == :both
         @flip_width = -width
       end
     end
@@ -102,13 +102,18 @@ module Ruby2D
     # Set the height
     def height=(height)
       @height = @flip_height = height
-      if @flip == :flip_v || @flip == :flip_hv
+      if @flip == :vertical || @flip == :both
         @flip_height = -height
       end
     end
 
     # Play an animation
-    def play(animation = nil, loop = nil, flip = nil, &done_proc)
+    def play(opts = {}, &done_proc)
+
+      animation = opts[:animation]
+      loop = opts[:loop]
+      flip = opts[:flip]
+
       if !@playing || (animation != @playing_animation && animation != nil) || flip != @flip
 
         @playing = true
@@ -127,11 +132,11 @@ module Ruby2D
         when Array
           @first_frame   = 0
           @current_frame = 0
-          @last_frame = frames.length - 1
+          @last_frame    = frames.length - 1
         end
 
         # Set looping
-        @loop = loop == :loop || @defaults[:loop] ? true : false
+        @loop = loop == true || @defaults[:loop] ? true : false
 
         set_frame
         restart_time
@@ -151,8 +156,12 @@ module Ruby2D
     # Flip the sprite
     def flip_sprite(flip)
 
-      # A width and height must be set for the sprite for this to work
-      unless @width && @height then return end
+      # The sprite width and height must be set for it to be flipped correctly
+      if (!@width || !@height) && flip
+        raise Error,
+         "Sprite width and height must be set in order to flip; " +
+         "occured playing animation `:#{@playing_animation}` with image `#{@path}`"
+      end
 
       @flip = flip
 
@@ -163,13 +172,13 @@ module Ruby2D
       @flip_height = @height
 
       case flip
-      when :flip_h   # horizontal
+      when :horizontal
         @flip_x      = @x + @width
         @flip_width  = -@width
-      when :flip_v   # vertical
+      when :vertical
         @flip_y      = @y + @height
         @flip_height = -@height
-      when :flip_hv  # horizontal and vertical
+      when :both     # horizontal and vertical
         @flip_x      = @x + @width
         @flip_width  = -@width
         @flip_y      = @y + @height

data/lib/ruby2d/text.rb

@@ -7,11 +7,11 @@ module Ruby2D
     attr_reader :text, :size, :width, :height, :font, :color
     attr_accessor :x, :y, :rotate, :data
 
-    def initialize(opts = {})
+    def initialize(text, opts = {})
       @x = opts[:x] || 0
       @y = opts[:y] || 0
       @z = opts[:z] || 0
-      @text = (opts[:text] || "Hello Ruby!").to_s
+      @text = text.to_s
       @size = opts[:size] || 20
       @rotate = opts[:rotate] || 0
       @font = opts[:font] || Font.default
@@ -40,22 +40,5 @@ module Ruby2D
       @x < x and @x + @width > x and @y < y and @y + @height > y
     end
 
-    private
-
-    def resolve_path(font)
-      if RUBY_PLATFORM =~ /darwin/
-        font_path = "/Library/Fonts/#{font}.ttf"
-      else
-        # Linux
-        font_path = "/usr/share/fonts/truetype/#{font}.ttf"
-      end
-
-      unless File.exists? font_path
-        raise Error, "Cannot find system font"
-      else
-        font_path
-      end
-    end
-
   end
 end

data/lib/ruby2d/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2d
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Tom Black
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-05 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -153,6 +153,7 @@ files:
 - lib/ruby2d.rb
 - lib/ruby2d/circle.rb
 - lib/ruby2d/color.rb
+- lib/ruby2d/colorize.rb
 - lib/ruby2d/dsl.rb
 - lib/ruby2d/exceptions.rb
 - lib/ruby2d/font.rb