ruby2d 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: befe5ad5a05dfdab4e9da310b4a016b138692dbd372f68b0fb9e5fa2c8836e78
-  data.tar.gz: 89523d76e354169eff325ea485b3afde30b085a1a9431d9b6135ef90eadee53a
+  metadata.gz: daade2a60f6c1e24974a8ca77aafb4cd83e1c59cdf4aff49b8178ee7c880f0f1
+  data.tar.gz: d07549d541ebe08e984b48373b96b890848dcf98373cc565b146c9d97fdcdb5a
 SHA512:
-  metadata.gz: 6e47726fb332a184bc026898f5b50d67f7463f0cc57350a37200e71f74d35e66902aaae6c61704a8ef467de461f7c8335c59feb890dcd319de2ac000ddfa265a
-  data.tar.gz: eb887567fc2c23d9ea7d10c12b79b6392f1e572da82d2fdc0e1bb791298de33b5a1c942c125965b3cf002d6bffdbb1dd0f150023919b300503aaf577e0dbbbc1
+  metadata.gz: 379a8eee502d3599654094b625c8e3ca8039982f3d9a1857bf5783e3627b10b1bc9ccc4d31efeb1a13c00234cd35762f0d658890797ed8fc5242ba7f52395e99
+  data.tar.gz: bb7683a054c5e6e9848f2f791dc3e3f5bbb33266a2f798a4e06b3f1df299919cd248c1d4f19e5c31d0fabe4518fadf9cc7f5e8d7e975f49c79fff53e001e9390

data/bin/ruby2d

@@ -1,296 +1,38 @@
 #!/usr/bin/env ruby
+
 require 'ruby2d/colorize'
 require 'ruby2d/version'
-require 'fileutils'
-
-# The installed gem directory
-@gem_dir = "#{Gem::Specification.find_by_name('ruby2d').gem_dir}"
-
-# The Ruby 2D library files
-@lib_files = [
-  'renderable',
-  'exceptions',
-  'color',
-  'window',
-  'dsl',
-  'quad',
-  'line',
-  'circle',
-  'rectangle',
-  'square',
-  'triangle',
-  'image',
-  'sprite',
-  'font',
-  'text',
-  'sound',
-  '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"
-    exit
-  elsif !File.exists? rb_file
-    puts "Can't find file: #{rb_file}"
-    exit
-  end
-end
-
-
-# Assemble the Ruby 2D library in one `.rb` file
-def make_lib
-  FileUtils.mkdir_p 'build'
-
-  lib_dir = "#{@gem_dir}/lib/ruby2d/"
-
-  lib = ""
-  @lib_files.each do |f|
-    lib << File.read("#{lib_dir + f}.rb") + "\n\n"
-  end
-
-  lib << "
-include Ruby2D
-extend  Ruby2D::DSL\n"
-
-  File.write('build/lib.rb', lib)
-end
-
-
-# Remove `require 'ruby2d'` from source file
-def strip_require(file)
-  output = ''
-  File.foreach(file) do |line|
-    output << line unless line =~ /require ('|")ruby2d('|")/
-  end
-  return output
-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?
-    puts "#{'Error:'.error} Can't find MRuby, which is needed to build native Ruby 2D applications.\n"
-    exit
-  end
-
-  # Add debugging information to produce backtrace
-  if @debug then debug_flag = '-g' end
-
-  # Assemble the Ruby 2D library in one `.rb` file and compile to bytecode
-  make_lib
-  `mrbc #{debug_flag} -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 #{debug_flag} -Bruby2d_app -obuild/src.c build/src.rb`
-
-  # Combine contents of C source files and bytecode into one file
-  open('build/app.c', 'w') do |f|
-    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
-
-  # 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
-
-
-# Build a web-based version of the provided Ruby application
-def build_web(rb_file)
-  puts "Warning: ".warn + "This feature is currently disabled while it's being upgraded."
-  return
-
-  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') { |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`
-
-  # Combine contents of JS source files and compiled JS into one file
-  open('build/app.js', 'w') do |f|
-    f << File.read("#{@gem_dir}/assets/simple2d.js") << "\n\n"
-    f << File.read("#{@gem_dir}/assets/opal.js") << "\n\n"
-    f << File.read("build/lib.js") << "\n\n"
-    f << File.read("build/ruby2d-opal.js") << "\n\n"
-    f << File.read("build/src.js") << "\n\n"
-  end
-
-  # 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 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
-
-  # Add debugging information to produce backtrace
-  if @debug then debug_flag = '-g' end
-
-  # Assemble the Ruby 2D library in one `.rb` file and compile to bytecode
-  make_lib
-  `mrbc #{debug_flag} -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 #{debug_flag} -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(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 XR" &&
-          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 4K" &&
-          simple2d simulator --install "build/tvos/build/Release-appletvsimulator/MyApp.app" &&
-          simple2d simulator --launch "Ruby2D.MyApp"`
-  end
-end
-
-
-# Check Command-line Arguments #################################################
+# Usage ########################################################################
 
 usage = "Ruby 2D: Make cross-platform 2D applications in Ruby".bold + "\n
 Usage: ruby2d <command> <options>
               [-v|--version]
 
 Summary of commands and options:
+  console       Run script in an interactive console
   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.
+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>
-  #{"Warning:".warn} #{"This feature is currently disabled while it's being upgraded.".bold}
+  #{'Warning:'.warn} #{"This feature is currently disabled while it's being upgraded.".bold}
+
+To build a macOS app bundle, use:
+  build --macos <ruby_file>
 
-To build an iOS or tvOS app, use the following:
+To build an iOS or tvOS app, use:
   build --ios <ruby_file>
   build --tvos <ruby_file>
 
@@ -300,11 +42,11 @@ To build for every platform supported by the current system, use:
 To clean up the build directory, use:
   build --clean
 
-Add the #{"--debug".bold} option to print debugging info
+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.
+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
@@ -313,7 +55,7 @@ Choose one of the following options to select the kind of app to run:
   --tvos\n\n"
 
 usage_simulator = "
-Choose an option with the #{"simulator".bold} command:
+Choose an option with the #{'simulator'.bold} command:
 
   --list      List available devices
   --booted    Show currently booted devices
@@ -330,29 +72,37 @@ Choose an option with the #{"simulator".bold} command:
   --log <app>     Stream log for the app only, given the app name
   --log-errors    Stream log containing only error messages\n\n"
 
+# Check Command-line Arguments #################################################
+
 case ARGV[0]
+when 'console'
+  require 'ruby2d/cli/console'
 when 'build'
+  require 'ruby2d/cli/build'
   if ARGV.delete '--debug' then @debug = true end
   case ARGV[1]
   when '--native'
     build_native(ARGV[2])
   when '--web'
     build_web(ARGV[2])
+  when '--macos'
+    build_macos(ARGV[2])
   when '--ios'
-    build_apple(ARGV[2], 'ios')
+    build_ios_tvos(ARGV[2], 'ios')
   when '--tvos'
-    build_apple(ARGV[2], 'tvos')
+    build_ios_tvos(ARGV[2], 'tvos')
   when '--all'
     build_native(ARGV[2])
     build_web(ARGV[2])
-    build_apple(ARGV[2], 'ios')
-    build_apple(ARGV[2], 'tvos')
+    build_ios_tvos(ARGV[2], 'ios')
+    build_ios_tvos(ARGV[2], 'tvos')
   when '--clean'
     clean_up(:all)
   else
     puts usage_build
   end
 when 'launch'
+  require 'ruby2d/cli/launch'
   case ARGV[1]
   when '--native'
     launch_native

data/ext/ruby2d/extconf.rb

@@ -1,7 +1,7 @@
 require 'mkmf'
 require_relative '../../lib/ruby2d/colorize'
 
-S2D_VERSION = '1.0.1'  # Simple 2D minimum version required
+S2D_VERSION = '1.1.0'  # Simple 2D minimum version required
 $errors = []
 
 def print_errors

data/ext/ruby2d/ruby2d.c

@@ -154,6 +154,33 @@ double normalize_controller_axis(int val) {
 }
 
 
+/*
+ * Ruby2D#self.ext_base_path
+ */
+#if MRUBY
+static R_VAL ruby2d_ext_base_path(mrb_state* mrb, R_VAL self) {
+#else
+static R_VAL ruby2d_ext_base_path(R_VAL self) {
+#endif
+  return r_str_new(SDL_GetBasePath());
+}
+
+
+/*
+ * 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
  */
@@ -429,6 +456,12 @@ static R_VAL ruby2d_sprite_ext_render(R_VAL self) {
 
   S2D_RotateSprite(spr, NUM2DBL(r_iv_get(self, "@rotate")), S2D_CENTER);
 
+  R_VAL c = r_iv_get(self, "@color");
+  spr->color.r = NUM2DBL(r_iv_get(c, "@r"));
+  spr->color.g = NUM2DBL(r_iv_get(c, "@g"));
+  spr->color.b = NUM2DBL(r_iv_get(c, "@b"));
+  spr->color.a = NUM2DBL(r_iv_get(c, "@a"));
+
   S2D_ClipSprite(
     spr,
     NUM2INT(r_iv_get(self, "@clip_x")),
@@ -672,17 +705,29 @@ static R_VAL ruby2d_music_ext_stop(R_VAL self) {
 
 
 /*
- * Ruby2D::Music#ext_volume
+ * Ruby2D::Music#ext_get_volume
+ */
+#if MRUBY
+static R_VAL ruby2d_music_ext_get_volume(mrb_state* mrb, R_VAL self) {
+#else
+static R_VAL ruby2d_music_ext_get_volume(R_VAL self) {
+#endif
+  return INT2NUM(S2D_GetMusicVolume());
+}
+
+
+/*
+ * Ruby2D::Music#ext_set_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);
+static R_VAL ruby2d_music_ext_set_volume(mrb_state* mrb, R_VAL self) {
+  mrb_value volume;
+  mrb_get_args(mrb, "o", &volume);
 #else
-static R_VAL ruby2d_music_ext_volume(R_VAL self, R_VAL vol) {
+static R_VAL ruby2d_music_ext_set_volume(R_VAL self, R_VAL volume) {
 #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));
+  S2D_SetMusicVolume(NUM2INT(volume));
+  return R_NIL;
 }
 
 
@@ -1069,6 +1114,9 @@ void Init_ruby2d() {
   // Ruby2D
   R_CLASS ruby2d_module = r_define_module("Ruby2D");
 
+  // Ruby2D#self.ext_base_path
+  r_define_class_method(ruby2d_module, "ext_base_path", ruby2d_ext_base_path, r_args_none);
+
   // Ruby2D::Triangle
   R_CLASS ruby2d_triangle_class = r_define_class(ruby2d_module, "Triangle");
 
@@ -1150,8 +1198,11 @@ 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#self.ext_get_volume
+  r_define_class_method(ruby2d_music_class, "ext_get_volume", ruby2d_music_ext_get_volume, r_args_none);
+
+  // Ruby2D::Music#self.ext_set_volume
+  r_define_class_method(ruby2d_music_class, "ext_set_volume", ruby2d_music_ext_set_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));
@@ -1168,6 +1219,9 @@ void Init_ruby2d() {
   // Ruby2D::Window#ext_show
   r_define_method(ruby2d_window_class, "ext_show", ruby2d_window_ext_show, r_args_none);
 
+  // Ruby2D::Window#ext_screenshot
+  r_define_method(ruby2d_window_class, "ext_screenshot", ruby2d_ext_screenshot, r_args_req(1));
+
   // Ruby2D::Window#ext_close
   r_define_method(ruby2d_window_class, "ext_close", ruby2d_window_ext_close, r_args_none);