ruby2d 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3248849ba536b5f8b806a92b6020c9177feb4b8415241cc5579240b9d25f771
-  data.tar.gz: f934d3eaef436fd21de2a120fc4ec392e670f3e123865b3aea251d2b5f1f4459
+  metadata.gz: '083de7264ef6e1144cd11683c383edf8fbac309d9cd648637301ce3bfcc804a8'
+  data.tar.gz: c0b437bd8f4dfe93994645308a44ea299dfd72259d2d00b67a162cdc2cefb758
 SHA512:
-  metadata.gz: f844b95a670393b87a606bfd098b9abbd2f2758a3e255e30527339202e46affc2cc9caedc8c3fcdd4a486cdefd06d4cab7af579cacdc9a38e86fcb8e97d8a603
-  data.tar.gz: ed7598cce5629acf38a346b95feb86e1c9b402cc380448f2f031b4f2c6c4c0ed8eb3ac633e8c1e4a0caf1d8ef003ec3ac8b50b387154e075287ac02c5f9459ff
+  metadata.gz: 17010953aceed980d3c6c01856a375c98e964f11eebf53eccf4fef7b6244cb4797e0bb8bc5202ccee16882f9d1e3fce55d741b78a15f28ba780dd69715e90332
+  data.tar.gz: 324e529ed71ce795ce8c86d281a245e569e8f1fd491f25d011089a8ed8fb1734b4abc288008355d6bbbd4548bbb231ff01e4711c9f10600f93a90ea4f383c69a

data/ext/ruby2d/extconf.rb

@@ -1,6 +1,6 @@
 require 'mkmf'
 
-S2D_VERSION = '0.8.0'  # Simple 2D minimum version required
+S2D_VERSION = '0.9.0'  # Simple 2D minimum version required
 $errors = []
 
 class String
@@ -11,9 +11,9 @@ end
 
 def print_errors
   puts "
-#{"== #{"Ruby 2D Installation Errors".red} =====================================\n"}
+#{"== #{"Ruby 2D Installation Errors".red} =======================================\n"}
   #{$errors.join("\n  ")}\n
-#{"===================================================================="}"
+#{"======================================================================="}"
 end
 
 def check_s2d_version
@@ -38,8 +38,8 @@ when /darwin/
 
     # Homebrew not installed
     if `which brew`.empty?
-      $errors << "Ruby 2D uses a native library called Simple 2D." <<
-                 "On OS X, this can be installed using Homebrew.\n" <<
+      $errors << "Ruby 2D uses a native library called Simple 2D, which was not found." <<
+                 "On macOS, it can be installed using Homebrew.\n" <<
                  "First, install #{"Homebrew".bold}. See instructions at #{"http://brew.sh".bold}" <<
                  "Then, run the following:\n" <<
                  "  brew tap simple2d/tap".bold <<
@@ -49,8 +49,8 @@ when /darwin/
 
     # Homebrew installed, instruct to install Simple 2D
     else
-      $errors << "Ruby 2D uses a native library called Simple 2D." <<
-                 "Install with Homebrew using:\n" <<
+      $errors << "Ruby 2D uses a native library called Simple 2D, which was not found." <<
+                 "Install it with Homebrew using:\n" <<
                  "  brew tap simple2d/tap".bold <<
                  "  brew install simple2d".bold
       print_errors
@@ -63,9 +63,8 @@ when /linux|mingw/
 
   # Simple 2D not installed
   if `which simple2d`.empty?
-    $errors << "Ruby 2D uses a native library called Simple 2D.\n" <<
-               "To install Simple 2D, follow the instructions in the README:" <<
-               "  #{"https://github.com/simple2d/simple2d".bold}"
+    $errors << "Ruby 2D uses a native library called Simple 2D, which was not found." <<
+    "To install, follow the instructions at #{"ruby2d.com/learn".bold}"
     print_errors
     exit
   end

data/ext/ruby2d/ruby2d.c

@@ -909,6 +909,12 @@ static R_VAL ruby2d_window_ext_show(R_VAL self) {
     S2D_Diagnostics(true);
   }
 
+  // Load controller mappings, if DB file exists
+  char *controller_mappings_path = RSTRING_PTR(r_iv_get(self, "@controller_mappings_path"));
+  if (S2D_FileExists(controller_mappings_path)) {
+    S2D_LoadControllerMappingsFromFile(controller_mappings_path);
+  }
+
   // Get window attributes
   char *title = RSTRING_PTR(r_iv_get(self, "@title"));
   int width   = NUM2INT(r_iv_get(self, "@width"));

data/lib/ruby2d.rb

@@ -16,6 +16,18 @@ require 'ruby2d/sprite'
 require 'ruby2d/text'
 require 'ruby2d/sound'
 require 'ruby2d/music'
+
+if RUBY_PLATFORM =~ /mingw/
+  # When using the Windows CI AppVeyor
+  if ENV['APPVEYOR']
+    s2d_dll_path = 'C:\msys64\usr\local\bin'
+  # When in a standard MinGW shell
+  else
+    s2d_dll_path = '~/../../usr/local/bin'
+  end
+  RubyInstaller::Runtime.add_dll_directory(File.expand_path(s2d_dll_path))
+end
+
 require 'ruby2d/ruby2d'  # load native extension
 
 include Ruby2D

data/lib/ruby2d/sprite.rb

@@ -8,9 +8,11 @@ module Ruby2D
 
     def initialize(x, y, path, z=0)
 
-      # unless File.exists? path
-      #   raise Error, "Cannot find image file `#{path}`"
-      # end
+      unless RUBY_ENGINE == 'opal'
+        unless File.exists? path
+          raise Error, "Cannot find sprite image file `#{path}`"
+        end
+      end
 
       @x, @y, @path = x, y, path
       @clip_x, @clip_y, @clip_w, @clip_h = 0, 0, 0, 0
@@ -63,6 +65,14 @@ module Ruby2D
       end
     end
 
+    def width
+      @current_animation ? @animations[@current_animation][@current_frame][2] : @default[2]
+    end
+
+    def height
+      @current_animation ? @animations[@current_animation][@current_frame][3] : @default[3]
+    end
+
     private
 
     def clip(x, y, w, h)

data/lib/ruby2d/version.rb

@@ -1,5 +1,5 @@
 # version.rb
 
 module Ruby2D
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

data/lib/ruby2d/window.rb

@@ -48,6 +48,7 @@ module Ruby2D
       }
       @update_proc = Proc.new {}
       @diagnostics = false
+      @controller_mappings_path = File.join(Dir.home, ".ruby2d", "controllers.txt")
     end
 
     def new_event_key

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2d
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Tom Black
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Ruby 2D