ruby2d 0.4.2 → 0.5.0

data/lib/ruby2d/color.rb

@@ -84,7 +84,7 @@ module Ruby2D
       # Array of Floats from 0.0..1.0
       c.class == Array && c.length == 4 &&
       c.all? { |el|
-        el.is_a?(Numeric) && (0.0..1.0).include?(el)
+        el.is_a?(Numeric)
       }
     end
 

data/lib/ruby2d/version.rb

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

data/lib/ruby2d/window.rb

@@ -6,10 +6,12 @@ module Ruby2D
     attr_reader :objects
     attr_accessor :mouse_x, :mouse_y, :frames, :fps
 
-    MouseEvent      = Struct.new(:type, :button, :direction, :x, :y, :delta_x, :delta_y)
-    KeyEvent        = Struct.new(:type, :key)
-    ControllerEvent = Struct.new(:which, :type, :axis, :value, :button)
     EventDescriptor = Struct.new(:type, :id)
+    MouseEvent = Struct.new(:type, :button, :direction, :x, :y, :delta_x, :delta_y)
+    KeyEvent   = Struct.new(:type, :key)
+    ControllerEvent = Struct.new(:which, :type, :axis, :value, :button)
+    ControllerAxisEvent   = Struct.new(:which, :axis, :value)
+    ControllerButtonEvent = Struct.new(:which, :button)
 
     def initialize(args = {})
       @title      = args[:title]  || "Ruby 2D"
@@ -17,6 +19,7 @@ module Ruby2D
       @width      = args[:width]  || 640
       @height     = args[:height] || 480
       @viewport_width, @viewport_height = nil, nil
+      @display_width, @display_height = nil, nil
       @resizable  = false
       @borderless = false
       @fullscreen = false
@@ -60,6 +63,13 @@ module Ruby2D
       when :height;          @height
       when :viewport_width;  @viewport_width
       when :viewport_height; @viewport_height
+      when :display_width, :display_height
+        ext_get_display_dimensions
+        if sym == :display_width
+          @display_width
+        else
+          @display_height
+        end
       when :resizable;       @resizable
       when :borderless;      @borderless
       when :fullscreen;      @fullscreen
@@ -165,10 +175,6 @@ module Ruby2D
     end
 
     def mouse_callback(type, button, direction, x, y, delta_x, delta_y)
-      # Convert to symbols (see MRuby bug in native extension)
-      button    = button.to_sym    unless button    == nil
-      direction = direction.to_sym unless direction == nil
-
       # All mouse events
       @events[:mouse].each do |id, e|
         e.call(MouseEvent.new(type, button, direction, x, y, delta_x, delta_y))
@@ -208,17 +214,17 @@ module Ruby2D
       # When controller axis motion, like analog sticks
       when :axis
         @events[:controller_axis].each do |id, e|
-          e.call(ControllerEvent.new(which, type, axis, value, nil))
+          e.call(ControllerAxisEvent.new(which, axis, value))
         end
       # When controller button is pressed
       when :button_down
         @events[:controller_button_down].each do |id, e|
-          e.call(ControllerEvent.new(which, type, nil, nil, button))
+          e.call(ControllerButtonEvent.new(which, button))
         end
       # When controller button is released
       when :button_up
         @events[:controller_button_up].each do |id, e|
-          e.call(ControllerEvent.new(which, type, nil, nil, button))
+          e.call(ControllerButtonEvent.new(which, button))
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby2d
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Tom Black
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
 description: Make cross-platform 2D applications in Ruby
 email: tom@blacktm.com
 executables:
@@ -48,9 +48,106 @@ extra_rdoc_files: []
 files:
 - assets/README.md
 - assets/app.icns
+- assets/ios/Assets.xcassets/AppIcon.appiconset/Contents.json
+- assets/ios/Assets.xcassets/Contents.json
+- assets/ios/Base.lproj/LaunchScreen.storyboard
+- assets/ios/Info.plist
+- assets/ios/MRuby.framework/Headers/mrbconf.h
+- assets/ios/MRuby.framework/Headers/mruby.h
+- assets/ios/MRuby.framework/Headers/mruby/array.h
+- assets/ios/MRuby.framework/Headers/mruby/boxing_nan.h
+- assets/ios/MRuby.framework/Headers/mruby/boxing_no.h
+- assets/ios/MRuby.framework/Headers/mruby/boxing_word.h
+- assets/ios/MRuby.framework/Headers/mruby/class.h
+- assets/ios/MRuby.framework/Headers/mruby/common.h
+- assets/ios/MRuby.framework/Headers/mruby/compile.h
+- assets/ios/MRuby.framework/Headers/mruby/data.h
+- assets/ios/MRuby.framework/Headers/mruby/debug.h
+- assets/ios/MRuby.framework/Headers/mruby/dump.h
+- assets/ios/MRuby.framework/Headers/mruby/error.h
+- assets/ios/MRuby.framework/Headers/mruby/gc.h
+- assets/ios/MRuby.framework/Headers/mruby/hash.h
+- assets/ios/MRuby.framework/Headers/mruby/irep.h
+- assets/ios/MRuby.framework/Headers/mruby/istruct.h
+- assets/ios/MRuby.framework/Headers/mruby/khash.h
+- assets/ios/MRuby.framework/Headers/mruby/numeric.h
+- assets/ios/MRuby.framework/Headers/mruby/object.h
+- assets/ios/MRuby.framework/Headers/mruby/opcode.h
+- assets/ios/MRuby.framework/Headers/mruby/proc.h
+- assets/ios/MRuby.framework/Headers/mruby/range.h
+- assets/ios/MRuby.framework/Headers/mruby/re.h
+- assets/ios/MRuby.framework/Headers/mruby/string.h
+- assets/ios/MRuby.framework/Headers/mruby/throw.h
+- assets/ios/MRuby.framework/Headers/mruby/value.h
+- assets/ios/MRuby.framework/Headers/mruby/variable.h
+- assets/ios/MRuby.framework/Headers/mruby/version.h
+- assets/ios/MRuby.framework/Info.plist
+- assets/ios/MRuby.framework/MRuby
+- assets/ios/MyApp.xcodeproj/project.pbxproj
+- assets/ios/MyApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+- assets/ios/MyApp.xcodeproj/project.xcworkspace/xcshareddata/MyApp.xcscmblueprint
+- assets/ios/MyApp.xcodeproj/project.xcworkspace/xcuserdata/Tom.xcuserdatad/UserInterfaceState.xcuserstate
+- assets/ios/MyApp.xcodeproj/xcuserdata/Tom.xcuserdatad/xcschemes/xcschememanagement.plist
+- assets/ios/main.c
 - assets/opal.js
 - assets/simple2d.js
 - assets/template.html
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Back.imagestacklayer/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Front.imagestacklayer/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Large.imagestack/Middle.imagestacklayer/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Content.imageset/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Back.imagestacklayer/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Content.imageset/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Front.imagestacklayer/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Content.imageset/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - Small.imagestack/Middle.imagestacklayer/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image
+  Wide.imageset/Contents.json
+- assets/tvos/Assets.xcassets/App Icon & Top Shelf Image.brandassets/Top Shelf Image.imageset/Contents.json
+- assets/tvos/Assets.xcassets/Contents.json
+- assets/tvos/Assets.xcassets/LaunchImage.launchimage/Contents.json
+- assets/tvos/Info.plist
+- assets/tvos/MRuby.framework/Headers/mrbconf.h
+- assets/tvos/MRuby.framework/Headers/mruby.h
+- assets/tvos/MRuby.framework/Headers/mruby/array.h
+- assets/tvos/MRuby.framework/Headers/mruby/boxing_nan.h
+- assets/tvos/MRuby.framework/Headers/mruby/boxing_no.h
+- assets/tvos/MRuby.framework/Headers/mruby/boxing_word.h
+- assets/tvos/MRuby.framework/Headers/mruby/class.h
+- assets/tvos/MRuby.framework/Headers/mruby/common.h
+- assets/tvos/MRuby.framework/Headers/mruby/compile.h
+- assets/tvos/MRuby.framework/Headers/mruby/data.h
+- assets/tvos/MRuby.framework/Headers/mruby/debug.h
+- assets/tvos/MRuby.framework/Headers/mruby/dump.h
+- assets/tvos/MRuby.framework/Headers/mruby/error.h
+- assets/tvos/MRuby.framework/Headers/mruby/gc.h
+- assets/tvos/MRuby.framework/Headers/mruby/hash.h
+- assets/tvos/MRuby.framework/Headers/mruby/irep.h
+- assets/tvos/MRuby.framework/Headers/mruby/istruct.h
+- assets/tvos/MRuby.framework/Headers/mruby/khash.h
+- assets/tvos/MRuby.framework/Headers/mruby/numeric.h
+- assets/tvos/MRuby.framework/Headers/mruby/object.h
+- assets/tvos/MRuby.framework/Headers/mruby/opcode.h
+- assets/tvos/MRuby.framework/Headers/mruby/proc.h
+- assets/tvos/MRuby.framework/Headers/mruby/range.h
+- assets/tvos/MRuby.framework/Headers/mruby/re.h
+- assets/tvos/MRuby.framework/Headers/mruby/string.h
+- assets/tvos/MRuby.framework/Headers/mruby/throw.h
+- assets/tvos/MRuby.framework/Headers/mruby/value.h
+- assets/tvos/MRuby.framework/Headers/mruby/variable.h
+- assets/tvos/MRuby.framework/Headers/mruby/version.h
+- assets/tvos/MRuby.framework/Info.plist
+- assets/tvos/MRuby.framework/MRuby
+- assets/tvos/MyApp.xcodeproj/project.pbxproj
+- assets/tvos/MyApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+- assets/tvos/MyApp.xcodeproj/project.xcworkspace/xcshareddata/MyApp.xcscmblueprint
+- assets/tvos/main.c
 - bin/ruby2d
 - ext/ruby2d/extconf.rb
 - ext/ruby2d/ruby2d-opal.rb
@@ -93,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Ruby 2D