ruby2d 0.4.2 → 0.5.0

data/assets/tvos/MyApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:MyApp.xcodeproj">
+   </FileRef>
+</Workspace>

data/assets/tvos/MyApp.xcodeproj/project.xcworkspace/xcshareddata/MyApp.xcscmblueprint

@@ -0,0 +1,30 @@
+{
+  "DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "C1BCA8F4805490F8BF8CC1BE1EB3C264D4847762",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {
+
+  },
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
+    "B56F7D52CF2ADA04A9756A36E4DD34AF636EFA07" : 9223372036854775807,
+    "C1BCA8F4805490F8BF8CC1BE1EB3C264D4847762" : 9223372036854775807
+  },
+  "DVTSourceControlWorkspaceBlueprintIdentifierKey" : "A80DF1FC-28C2-438B-80A2-328C4DF456FB",
+  "DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
+    "B56F7D52CF2ADA04A9756A36E4DD34AF636EFA07" : "",
+    "C1BCA8F4805490F8BF8CC1BE1EB3C264D4847762" : "deps\/"
+  },
+  "DVTSourceControlWorkspaceBlueprintNameKey" : "MyApp",
+  "DVTSourceControlWorkspaceBlueprintVersion" : 204,
+  "DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "xcode\/tvos\/MyApp.xcodeproj",
+  "DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/simple2d\/simple2d.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "B56F7D52CF2ADA04A9756A36E4DD34AF636EFA07"
+    },
+    {
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/simple2d\/deps.git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
+      "DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "C1BCA8F4805490F8BF8CC1BE1EB3C264D4847762"
+    }
+  ]
+}

data/assets/tvos/main.c

@@ -0,0 +1 @@
+// Your Ruby 2D app here

data/bin/ruby2d

@@ -6,7 +6,7 @@ require 'fileutils'
 class String
   def colorize(c); "\e[#{c}m#{self}\e[0m" end
   def bold;  colorize('1')    end
-  def error; colorize('4;31') end
+  def error; colorize('1;31') end
 end
 
 # The installed gem directory
@@ -32,11 +32,14 @@ end
   'music'
 ]
 
+# Debugging command-line flag
+@debug = false
+
 
 # Check if source file provided is good
 def check_build_src_file(rb_file)
   if !rb_file
-    puts "Please provide a Ruby file to build."
+    puts "Please provide a Ruby file to build"
     exit
   elsif !File.exists? rb_file
     puts "Can't find file: #{rb_file}"
@@ -76,6 +79,7 @@ end
 
 # Build a native version of the provided Ruby application
 def build_native(rb_file)
+  check_build_src_file(rb_file)
 
   # Check if MRuby exists; if not, quit
   if `which mruby`.empty?
@@ -88,11 +92,7 @@ def build_native(rb_file)
   `mrbc -Bruby2d_lib -obuild/lib.c build/lib.rb`
 
   # Read the provided Ruby source file, copy to build dir and compile to bytecode
-
-  File.open('build/src.rb', 'w') do |file|
-    file << strip_require(rb_file)
-  end
-
+  File.open('build/src.rb', 'w') { |file| file << strip_require(rb_file) }
   `mrbc -Bruby2d_app -obuild/src.c build/src.rb`
 
   # Combine contents of C source files and bytecode into one file
@@ -103,9 +103,12 @@ def build_native(rb_file)
     f << File.read("#{@gem_dir}/ext/ruby2d/ruby2d.c")
   end
 
-  # Compile to native executable
+  # Compile to a native executable
   `cc build/app.c -lmruby \`simple2d --libs\` -o build/app`
 
+  # Clean up
+  clean_up unless @debug
+
   # Success!
   puts "Native app created at `build/app`"
 end
@@ -113,19 +116,15 @@ end
 
 # Build a web-based version of the provided Ruby application
 def build_web(rb_file)
+  check_build_src_file(rb_file)
 
   # Assemble the Ruby 2D library in one `.rb` file and compile to JS
   make_lib
   `opal --compile --no-opal build/lib.rb > build/lib.js`
 
   # Read the provided Ruby source file, copy to build dir, and compile to JS
-
-  File.open('build/src.rb', 'w') do |file|
-    file << strip_require(rb_file)
-  end
-
+  File.open('build/src.rb', 'w') { |file| file << strip_require(rb_file) }
   `opal --compile --no-opal build/src.rb > build/src.js`
-
   FileUtils.cp "#{@gem_dir}/ext/ruby2d/ruby2d-opal.rb", "build/"
   `opal --compile --no-opal build/ruby2d-opal.rb > build/ruby2d-opal.js`
 
@@ -141,56 +140,127 @@ def build_web(rb_file)
   # Copy over HTML template
   FileUtils.cp "#{@gem_dir}/assets/template.html", "build/app.html"
 
+  # Clean up
+  clean_up unless @debug
+
   # Success!
   puts "Web app created at `build/app.js`",
        "  Run by opening `build/app.html`"
 end
 
 
-# Build an application package for the current platform
-def build_package
-  require 'fileutils'
-
-  icon_path = "#{@gem_dir}/assets/app.icns"
-
-  FileUtils.mkpath "build/App.app/Contents/MacOS"
-  FileUtils.mkpath "build/App.app/Contents/Resources"
-  FileUtils.cp icon_path, "build/App.app/Contents/Resources"
-
-  info_plist = %(
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>CFBundleExecutable</key>
-  <string>app</string>
-  <key>CFBundleIconFile</key>
-  <string>app.icns</string>
-  <key>CFBundleInfoDictionaryVersion</key>
-  <string>1.0</string>
-  <key>CFBundlePackageType</key>
-  <string>APPL</string>
-  <key>CFBundleSignature</key>
-  <string>????</string>
-  <key>CFBundleVersion</key>
-  <string>1.0</string>
-</dict>
-</plist>
-)
-
-  File.open("build/App.app/Contents/Info.plist", 'w') { |f| f.write(info_plist) }
-  FileUtils.cp "build/app", "build/App.app/Contents/MacOS/"
-  puts "App written to `build/App.app`."
+# Build an iOS or tvOS app
+def build_apple(rb_file, device)
+  check_build_src_file(rb_file)
+
+  # Check for Simple 2D framework,
+  unless File.exists?('/usr/local/Frameworks/Simple2D/iOS/Simple2D.framework') && File.exists?('/usr/local/Frameworks/Simple2D/tvOS/Simple2D.framework')
+    puts "#{'Error:'.error} Simple 2D iOS and tvOS frameworks not found. Install them and try again.\n"
+    exit
+  end
+
+  # Check if MRuby exists; if not, quit
+  if `which mruby`.empty?
+    puts "#{'Error:'.error} Can't find MRuby, which is needed to build native Ruby 2D applications.\n"
+    exit
+  end
+
+  # Assemble the Ruby 2D library in one `.rb` file and compile to bytecode
+  make_lib
+  `mrbc -Bruby2d_lib -obuild/lib.c build/lib.rb`
+
+  # Read the provided Ruby source file, copy to build dir and compile to bytecode
+  File.open('build/src.rb', 'w') { |file| file << strip_require(rb_file) }
+  `mrbc -Bruby2d_app -obuild/src.c build/src.rb`
+
+  # Copy over iOS project
+  FileUtils.cp_r "#{@gem_dir}/assets/#{device}", "build"
+
+  # Combine contents of C source files and bytecode into one file
+  File.open("build/#{device}/main.c", 'w') do |f|
+    f << "#define RUBY2D_IOS_TVOS 1" << "\n\n"
+    f << "#define MRUBY 1" << "\n\n"
+    f << File.read("build/lib.c") << "\n\n"
+    f << File.read("build/src.c") << "\n\n"
+    f << File.read("#{@gem_dir}/ext/ruby2d/ruby2d.c")
+  end
+
+  # Build the Xcode project
+  `simple2d build --#{device} build/#{device}/MyApp.xcodeproj`
+
+  # Clean up
+  clean_up unless @debug
+
+  # Success!
+  puts "App created at `build/#{device}`"
 end
 
 
 # Clean up unneeded build files
-def clean_up
+def clean_up(cmd = nil)
   FileUtils.rm(
     Dir.glob('build/{src,lib}.{rb,c,js}') +
     Dir.glob('build/ruby2d-opal.{rb,js}') +
     Dir.glob('build/app.c')
   )
+  if cmd == :all
+    puts "cleaning up..."
+    FileUtils.rm_f 'build/app'
+    FileUtils.rm_f 'build/app.js'
+    FileUtils.rm_f 'build/app.html'
+    FileUtils.rm_rf 'build/ios'
+    FileUtils.rm_rf 'build/tvos'
+  end
+end
+
+
+# Launch a native app
+def launch_native
+  if !File.exists? 'build/app'
+    puts "No native app built!"
+    exit
+  end
+  `( cd build && ./app )`
+end
+
+
+# Launch a web app
+def launch_web
+  if !File.exists? 'build/app.html'
+    puts "No web app built!"
+    exit
+  end
+  open_cmd = 'open'
+  case RUBY_PLATFORM
+  when /linux/
+    open_cmd = "xdg-#{open_cmd}"
+  when /mingw/
+    open_cmd = "start"
+  end
+  system "#{open_cmd} build/app.html"
+end
+
+
+# Launch an iOS or tvOS app in a simulator
+def launch_apple(device)
+  case device
+  when 'ios'
+    if !File.exists? 'build/ios/build/Release-iphonesimulator/MyApp.app'
+      puts "No iOS app built!"
+      exit
+    end
+    puts `simple2d simulator --open "iPhone 8" &&
+          simple2d simulator --install "build/ios/build/Release-iphonesimulator/MyApp.app" &&
+          simple2d simulator --launch "Ruby2D.MyApp"`
+  when 'tvos'
+    if !File.exists? 'build/tvos/build/Release-appletvsimulator/MyApp.app'
+      puts "No tvOS app built!"
+      exit
+    end
+    puts `simple2d simulator --open "Apple TV" &&
+          simple2d simulator --install "build/tvos/build/Release-appletvsimulator/MyApp.app" &&
+          simple2d simulator --launch "Ruby2D.MyApp"`
+  end
 end
 
 
@@ -201,31 +271,116 @@ Usage: ruby2d <command> <options>
               [-v|--version]
 
 Summary of commands and options:
-  build         Build the application both natively and for the web
-    --native      Build only native
-    --web         Build only web
-    --debug       Build native and web, keeping all intermediate files
-  package       Create application package for distribution (experimental)
+  build         Build a Ruby source file
+  launch        Launch a built Ruby 2D application
+  simulator     Interact with iOS and tvOS simulators
   -v|--version  Prints the installed version\n\n"
 
+usage_build = "
+Use the #{"build".bold} command to compile or build Ruby 2D apps.
+
+To compile and create a native executable, use:
+  build --native <ruby_file>
+
+To build for the web, creating a JavaScript and HTML package, use:
+  build --web <ruby_file>
+
+To build an iOS or tvOS app, use the following:
+  build --ios <ruby_file>
+  build --tvos <ruby_file>
+
+To build for every platform supported by the current system, use:
+  build --all <ruby_file>
+
+To clean up the build directory, use:
+  build --clean
+
+Add the #{"--debug".bold} option to print debugging info
+and keep all intermediate files generated.\n\n"
+
+usage_launch = "
+Use the #{"launch".bold} command to run a Ruby 2D app that has been built.
+Choose one of the following options to select the kind of app to run:
+
+  --native
+  --web
+  --ios
+  --tvos\n\n"
+
+usage_simulator = "
+Choose an option with the #{"simulator".bold} command:
+
+  --list      List available devices
+  --booted    Show currently booted devices
+
+  --open <device_name>    Open a simulator device with a given device name
+
+  --install <app_file>    Install an app on the booted simulator given the path
+                          to the app e.g. \"Release-iphonesimulator/MyApp.app\"
+
+  --launch <bundle_id>    Launch an app given the app bundle's identifier,
+                          e.g. \"Ruby2D.MyApp\"
+
+  --log           Stream log of the booted simulator
+  --log <app>     Stream log for the app only, given the app name
+  --log-errors    Stream log containing only error messages\n\n"
+
+# puts ARGV.inspect
+
 case ARGV[0]
 when 'build'
-  puts "Building..."
+  if ARGV.delete '--debug' then @debug = true end
   case ARGV[1]
   when '--native'
     build_native(ARGV[2])
   when '--web'
     build_web(ARGV[2])
+  when '--ios'
+    build_apple(ARGV[2], 'ios')
+  when '--tvos'
+    build_apple(ARGV[2], 'tvos')
+  when '--all'
+    build_native(ARGV[2])
+    build_web(ARGV[2])
+    build_apple(ARGV[2], 'ios')
+    build_apple(ARGV[2], 'tvos')
+  when '--clean'
+    clean_up(:all)
+  else
+    puts usage_build
+  end
+when 'launch'
+  case ARGV[1]
+  when '--native'
+    launch_native
+  when '--web'
+    launch_web
+  when '--ios'
+    launch_apple('ios')
+  when '--tvos'
+    launch_apple('tvos')
   else
-    if ARGV[2]; puts usage; exit end
-    check_build_src_file(ARGV[1])
-    build_native(ARGV[1])
-    build_web(ARGV[1])
-  end
-  unless ARGV.include? '--debug'; clean_up end
-when 'package'
-  puts "Running package..."
-  build_package
+    puts usage_launch
+  end
+when 'simulator'
+  case ARGV[1]
+  when '--list'
+    puts `simple2d simulator --list`
+  when '--booted'
+    puts `simple2d simulator --booted`
+  when '--open'
+    puts `simple2d simulator --open "#{ARGV[2]}"`
+  when '--install'
+    puts `simple2d simulator --install "#{ARGV[2]}"`
+  when '--launch'
+    puts `simple2d simulator --launch "#{ARGV[2]}"`
+  when '--log'
+    puts `simple2d simulator --log`
+  when '--log-errors'
+    puts `simple2d simulator --log-errors`
+  else
+    puts usage_simulator
+  end
 when '-v', '--version'
   puts Ruby2D::VERSION
 else

data/ext/ruby2d/extconf.rb

@@ -1,6 +1,6 @@
 require 'mkmf'
 
-S2D_VERSION = '0.7.0'  # Simple 2D minimum version required
+S2D_VERSION = '0.8.0'  # Simple 2D minimum version required
 $errors = []
 
 class String

data/ext/ruby2d/ruby2d.c

@@ -1,7 +1,11 @@
 // ruby2d.c – Native C extension for Ruby and MRuby
 
 // Simple 2D includes
-#include <simple2d.h>
+#if RUBY2D_IOS_TVOS
+  #include <Simple2D/simple2d.h>
+#else
+  #include <simple2d.h>
+#endif
 
 // Ruby includes
 #if MRUBY
@@ -64,7 +68,7 @@
   #define r_args_none  (MRB_ARGS_NONE())
   #define r_args_req(n)  MRB_ARGS_REQ(n)
   // Helpers
-  #define r_char_to_sym(str)  mrb_check_intern_cstr(mrb, str)
+  #define r_char_to_sym(str)  mrb_symbol_value(mrb_intern_cstr(mrb, str))
 #else
   // Ruby
   #define R_VAL  VALUE
@@ -140,6 +144,14 @@ static void free_window() {
 }
 
 
+/*
+ * Normalize controller axis values to 0.0...1.0
+ */
+double normalize_controller_axis(int val) {
+  return val > 0 ? val / 32767.0 : val / 32768.0;
+}
+
+
 /*
  * File#exists? for MRuby
  */
@@ -692,7 +704,7 @@ void on_mouse(S2D_Event e) {
       // type, direction, delta_x, delta_y
       type = r_char_to_sym("scroll");
       direction = e.direction == S2D_MOUSE_SCROLL_NORMAL ?
-        r_str_new("normal") : r_str_new("inverted");
+        r_char_to_sym("normal") : r_char_to_sym("inverted");
       break;
     case S2D_MOUSE_MOVE:
       // type, x, y, delta_x, delta_y
@@ -703,26 +715,23 @@ void on_mouse(S2D_Event e) {
   if (e.type == S2D_MOUSE_DOWN || e.type == S2D_MOUSE_UP) {
     switch (e.button) {
       case S2D_MOUSE_LEFT:
-        button = r_str_new("left");
+        button = r_char_to_sym("left");
         break;
       case S2D_MOUSE_MIDDLE:
-        button = r_str_new("middle");
+        button = r_char_to_sym("middle");
         break;
       case S2D_MOUSE_RIGHT:
-        button = r_str_new("right");
+        button = r_char_to_sym("right");
         break;
       case S2D_MOUSE_X1:
-        button = r_str_new("x1");
+        button = r_char_to_sym("x1");
         break;
       case S2D_MOUSE_X2:
-        button = r_str_new("x2");
+        button = r_char_to_sym("x2");
         break;
     }
   }
 
-  // Bug in MRuby: If `button` or `direction` are symbols (created with
-  // r_char_to_sym), they will always both be `nil`. Use `r_str_new` for now.
-
   r_funcall(
     ruby2d_window, "mouse_callback", 7, type, button, direction,
     INT2NUM(e.x), INT2NUM(e.y), INT2NUM(e.delta_x), INT2NUM(e.delta_y)
@@ -735,23 +744,93 @@ void on_mouse(S2D_Event e) {
  */
 static void on_controller(S2D_Event e) {
 
-  R_VAL type = R_NIL;
+  R_VAL type = R_NIL; R_VAL axis = R_NIL; R_VAL button = R_NIL;
 
   switch (e.type) {
     case S2D_AXIS:
       type = r_char_to_sym("axis");
+      switch (e.axis) {
+        case S2D_AXIS_LEFTX:
+          axis = r_char_to_sym("left_x");
+          break;
+        case S2D_AXIS_LEFTY:
+          axis = r_char_to_sym("left_y");
+          break;
+        case S2D_AXIS_RIGHTX:
+          axis = r_char_to_sym("right_x");
+          break;
+        case S2D_AXIS_RIGHTY:
+          axis = r_char_to_sym("right_y");
+          break;
+        case S2D_AXIS_TRIGGERLEFT:
+          axis = r_char_to_sym("trigger_left");
+          break;
+        case S2D_AXIS_TRIGGERRIGHT:
+          axis = r_char_to_sym("trigger_right");
+          break;
+        case S2D_AXIS_INVALID:
+          axis = r_char_to_sym("invalid");
+          break;
+      }
       break;
-    case S2D_BUTTON_DOWN:
-      type = r_char_to_sym("button_down");
-      break;
-    case S2D_BUTTON_UP:
-      type = r_char_to_sym("button_up");
+    case S2D_BUTTON_DOWN: case S2D_BUTTON_UP:
+      type = e.type == S2D_BUTTON_DOWN ? r_char_to_sym("button_down") : r_char_to_sym("button_up");
+      switch (e.button) {
+        case S2D_BUTTON_A:
+          button = r_char_to_sym("a");
+          break;
+        case S2D_BUTTON_B:
+          button = r_char_to_sym("b");
+          break;
+        case S2D_BUTTON_X:
+          button = r_char_to_sym("x");
+          break;
+        case S2D_BUTTON_Y:
+          button = r_char_to_sym("y");
+          break;
+        case S2D_BUTTON_BACK:
+          button = r_char_to_sym("back");
+          break;
+        case S2D_BUTTON_GUIDE:
+          button = r_char_to_sym("guide");
+          break;
+        case S2D_BUTTON_START:
+          button = r_char_to_sym("start");
+          break;
+        case S2D_BUTTON_LEFTSTICK:
+          button = r_char_to_sym("left_stick");
+          break;
+        case S2D_BUTTON_RIGHTSTICK:
+          button = r_char_to_sym("right_stick");
+          break;
+        case S2D_BUTTON_LEFTSHOULDER:
+          button = r_char_to_sym("left_shoulder");
+          break;
+        case S2D_BUTTON_RIGHTSHOULDER:
+          button = r_char_to_sym("right_shoulder");
+          break;
+        case S2D_BUTTON_DPAD_UP:
+          button = r_char_to_sym("up");
+          break;
+        case S2D_BUTTON_DPAD_DOWN:
+          button = r_char_to_sym("down");
+          break;
+        case S2D_BUTTON_DPAD_LEFT:
+          button = r_char_to_sym("left");
+          break;
+        case S2D_BUTTON_DPAD_RIGHT:
+          button = r_char_to_sym("right");
+          break;
+        case S2D_BUTTON_INVALID:
+          button = r_char_to_sym("invalid");
+          break;
+      }
       break;
   }
 
   r_funcall(
-    ruby2d_window, "controller_callback", 5, INT2NUM(e.which), type,
-    INT2NUM(e.axis), INT2NUM(e.value), INT2NUM(e.button)
+    ruby2d_window, "controller_callback", 5, INT2NUM(e.which),
+    type, axis, DBL2NUM(normalize_controller_axis(e.value)), button
   );
 }
 
@@ -800,6 +879,22 @@ static void render() {
 }
 
 
+/*
+ * Ruby2D::Window#ext_get_display_dimensions
+ */
+#if MRUBY
+static R_VAL ruby2d_window_ext_get_display_dimensions(mrb_state* mrb, R_VAL self) {
+#else
+static R_VAL ruby2d_window_ext_get_display_dimensions(R_VAL self) {
+#endif
+  int w; int h;
+  S2D_GetDisplayDimensions(&w, &h);
+  r_iv_set(self, "@display_width" , INT2NUM(w));
+  r_iv_set(self, "@display_height", INT2NUM(h));
+  return R_NIL;
+}
+
+
 /*
  * Ruby2D::Window#ext_show
  */
@@ -977,6 +1072,9 @@ void Init_ruby2d() {
   // Ruby2D::Window
   R_CLASS ruby2d_window_class = r_define_class(ruby2d_module, "Window");
 
+  // 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);
+
   // Ruby2D::Window#ext_show
   r_define_method(ruby2d_window_class, "ext_show", ruby2d_window_ext_show, r_args_none);