RubyGems - ruby2d - Versions diffs - 0.2.1 → 0.3.0 - Mend

ruby2d 0.2.1 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

data/assets/template.html ADDED Viewed

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Ruby 2D App</title>
+    <style>
+      body { background-color: #ccc }
+      canvas {
+        display: block;
+        margin: auto;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="ruby2d-app"></div>
+    <script src="app.js"></script>
+  </body>
+</html>

data/bin/ruby2d CHANGED Viewed

@@ -1,48 +1,155 @@
 #!/usr/bin/env ruby
 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 error; colorize('1;31') end
-  def bold; colorize('1') end
+  def bold;  colorize('1')    end
+  def error; colorize('4;31') end
 end
+# The installed gem directory
+@gem_dir = "#{Gem::Specification.find_by_name('ruby2d').gem_dir}"
+# The Ruby 2D library files
+@lib_files = [
+  'exceptions',
+  'color',
+  'window',
+  'application',
+  'dsl',
+  'quad',
+  'rectangle',
+  'square',
+  'triangle',
+  'image',
+  'sprite',
+  'text',
+  'sound',
+  'music'
+]
+# 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::DSL
+include Ruby2D\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 if MRuby exists; if not, quit
   if `which mruby`.empty?
-    puts "",
-         "  mruby not found!".error, "",
-         "  mruby is needed to build a native Ruby 2D applications.".bold, "",
-         "  Install using Homebrew on OS X:",
-         "    brew install mruby", ""
+    puts "#{'Error:'.error} Can't find MRuby, which is needed to build native Ruby 2D applications.\n"
     exit
   end
-  `mkdir -p build`
-  `mrbc -Bruby2d_app_symbol -obuild/app.c #{rb_file}`
-  open('build/app.c', 'a') do |f|
-    f << %(
-#include "mruby.h"
-#include "mruby/irep.h"
-int main(void) {
-  mrb_state *mrb = mrb_open();
-  if (!mrb) { /* handle error */ }
-  mrb_load_irep(mrb, ruby2d_app_symbol);
-  mrb_close(mrb);
-}
-    )
+  # 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') do |file|
+    file << strip_require(rb_file)
   end
-  `cc -std=c99 -lmruby build/app.c -o build/app`
+  `mrbc -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 native executable
+  `cc build/app.c -lmruby \`simple2d --libs\` -o build/app`
+  # Success!
+  puts "Native app created at `build/app`"
 end
+# Build a web-based version of the provided Ruby application
+def build_web(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
+  `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"
+  # 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::Specification.find_by_name('ruby2d').gem_dir}/assets/app.icns"
+  icon_path = "#{@gem_dir}/assets/app.icns"
   FileUtils.mkpath "build/App.app/Contents/MacOS"
   FileUtils.mkpath "build/App.app/Contents/Resources"
@@ -70,40 +177,50 @@ def build_package
 )
   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`."
 end
-# Command line usage and tree ##################################################
+# Clean up unneeded build files
+def clean_up
+  FileUtils.rm(
+    Dir.glob('build/{src,lib}.{rb,c,js}') +
+    Dir.glob('build/ruby2d-opal.{rb,js}') +
+    Dir.glob('build/app.c')
+  )
+end
-usage = "
-Usage: ruby2d [-v|--version]
-              <command> <options>
-Summary of commands and options:
-  build         Build the application...
-    native        ...compile with mruby.
-    web           ...for web platform.
-  package       Create application package.
-  -v|--version  Prints the installed version.
+# Check Command-line Arguments #################################################
-"
+usage = "Ruby 2D: Make cross-platform 2D applications in Ruby".bold + "\n
+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)
+  -v|--version  Prints the installed version\n\n"
 case ARGV[0]
 when 'build'
-  puts "Running build..."
+  puts "Building..."
   case ARGV[1]
-  when 'native'
-    puts "Running build native..."
-    build_native ARGV[2]
-  when 'web'
-    puts "Running build web..."
+  when '--native'
+    build_native(ARGV[2])
+  when '--web'
+    build_web(ARGV[2])
   else
-    puts usage
+    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
@@ -112,5 +229,3 @@ when '-v', '--version'
 else
   puts usage
 end
-exit

data/ext/ruby2d/extconf.rb CHANGED Viewed

@@ -1,12 +1,12 @@
 require 'mkmf'
-S2D_VERSION = '0.2.1'  # Minimum Simple 2D version required
+S2D_VERSION = '0.5.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
+  def bold; colorize('1')    end
+  def red;  colorize('1;31') end
 end
 def print_errors
@@ -69,15 +69,24 @@ elsif RUBY_PLATFORM =~ /linux/
     exit
   end
-  $CFLAGS << ' -std=c99'
+  $CFLAGS << ' -std=c11'
+# Windows / MinGW
+elsif RUBY_PLATFORM =~ /mingw/
+  # Add flags
+  $CFLAGS  << ' -std=c11 -I/usr/local/include'
+  $LDFLAGS << ' -Dmain=SDL_main -L/usr/local/lib -lmingw32 -lsimple2d -lSDL2main -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lopengl32 -lglew32 -mwindows'
 end
-# Simple 2D installed, check version
-check_s2d_version
+unless RUBY_PLATFORM =~ /mingw/
+  # Simple 2D installed, check version
+  check_s2d_version
+  # Add flags
+  $LDFLAGS << ' ' << `simple2d --libs`
+end
-# Configure Simple 2D and create Makefile
-$LDFLAGS << ' ' << `simple2d --libs`
 $LDFLAGS.gsub!(/\n/, ' ')  # Remove newlines in flags, they cause problems
 create_makefile('ruby2d/ruby2d')

data/ext/ruby2d/ruby2d-opal.rb ADDED Viewed

@@ -0,0 +1,219 @@
+# ruby2d-opal.rb
+# Ruby 2D window
+$R2D_WINDOW = nil
+# Simple 2D window
+`var win;`
+`// ruby2d.js
+// @type_id values for rendering
+const $R2D_TRIANGLE = 1;
+const $R2D_QUAD     = 2;
+const $R2D_IMAGE    = 3;
+const $R2D_SPRITE   = 4;
+const $R2D_TEXT     = 5;
+function on_key(e, key) {
+  switch (e) {
+    case S2D.KEYDOWN:
+      #{$R2D_WINDOW.key_down_callback(`key`)};
+      break;
+    case S2D.KEY:
+      #{$R2D_WINDOW.key_callback(`key`)};
+      break;
+    case S2D.KEYUP:
+      #{$R2D_WINDOW.key_up_callback(`key`)};
+      break;
+  }
+}
+function on_mouse(x, y) {
+  #{$R2D_WINDOW.mouse_callback("any", `x`, `y`)};
+}
+function update() {
+  #{$R2D_WINDOW.mouse_x = `win.mouse.x`};
+  #{$R2D_WINDOW.mouse_y = `win.mouse.y`};
+  #{$R2D_WINDOW.frames  = `win.frames`};
+  #{$R2D_WINDOW.fps     = `win.fps`};
+  #{$R2D_WINDOW.update_callback};
+}
+function render() {
+  // Set background color
+  win.background.r = #{$R2D_WINDOW.get(:background).r};
+  win.background.g = #{$R2D_WINDOW.get(:background).g};
+  win.background.b = #{$R2D_WINDOW.get(:background).b};
+  win.background.a = #{$R2D_WINDOW.get(:background).a};
+  var objects = #{$R2D_WINDOW.objects};
+  for (var i = 0; i < objects.length; i++) {
+    var el = objects[i];
+    switch (el.type_id) {
+      case $R2D_TRIANGLE:
+        S2D.DrawTriangle(
+          el.x1, el.y1, el.c1.r, el.c1.g, el.c1.b, el.c1.a,
+          el.x2, el.y2, el.c2.r, el.c2.g, el.c2.b, el.c2.a,
+          el.x3, el.y3, el.c3.r, el.c3.g, el.c3.b, el.c3.a
+        );
+        break;
+      case $R2D_QUAD:
+        S2D.DrawQuad(
+          el.x1, el.y1, el.c1.r, el.c1.g, el.c1.b, el.c1.a,
+          el.x2, el.y2, el.c2.r, el.c2.g, el.c2.b, el.c2.a,
+          el.x3, el.y3, el.c3.r, el.c3.g, el.c3.b, el.c3.a,
+          el.x4, el.y4, el.c4.r, el.c4.g, el.c4.b, el.c4.a
+        );
+        break;
+      case $R2D_IMAGE:
+        el.data.x = el.x;
+        el.data.y = el.y;
+        if (el.width  != Opal.nil) el.data.width  = el.width;
+        if (el.height != Opal.nil) el.data.height = el.height;
+        el.data.color.r = el.color.r;
+        el.data.color.g = el.color.g;
+        el.data.color.b = el.color.b;
+        el.data.color.a = el.color.a;
+        S2D.DrawImage(el.data);
+        break;
+      case $R2D_SPRITE:
+        el.data.x = el.x;
+        el.data.y = el.y;
+        S2D.ClipSprite(
+          el.data,
+          el.clip_x,
+          el.clip_y,
+          el.clip_w,
+          el.clip_h
+        );
+        S2D.DrawSprite(el.data);
+        break;
+      case $R2D_TEXT:
+        el.data.x = el.x;
+        el.data.y = el.y;
+        el.data.color.r = el.color.r;
+        el.data.color.g = el.color.g;
+        el.data.color.b = el.color.b;
+        el.data.color.a = el.color.a;
+        S2D.DrawText(el.data);
+        break;
+    }
+  }
+}`
+module Ruby2D
+  class Image
+    def init(path)
+      `#{self}.data = S2D.CreateImage(path);`
+    end
+  end
+  class Sprite
+    def init(path)
+      `#{self}.data = S2D.CreateSprite(path);`
+    end
+  end
+  class Text
+    def init
+      `#{self}.data = S2D.CreateText(#{self}.font, #{self}.text, #{self}.size);`
+    end
+    def text=(t)
+      @text = t
+      `S2D.SetText(#{self}.data, #{self}.text);`
+    end
+  end
+  class Sound
+    def init(path)
+      `#{self}.data = S2D.CreateSound(path);`
+    end
+    def play
+      `S2D.PlaySound(#{self}.data);`
+    end
+  end
+  class Music
+    def init(path)
+      `#{self}.data = S2D.CreateMusic(path);`
+    end
+    def play
+      `S2D.PlayMusic(#{self}.data, #{self}.loop);`
+    end
+    def pause
+      `S2D.PauseMusic();`
+    end
+    def resume
+      `S2D.ResumeMusic();`
+    end
+    def stop
+      `S2D.StopMusic();`
+    end
+    def fadeout(ms)
+      `S2D.FadeOutMusic(ms);`
+    end
+  end
+  class Window
+    def show
+      $R2D_WINDOW = self
+      `
+      var width  = #{$R2D_WINDOW.get(:width)};
+      var height = #{$R2D_WINDOW.get(:height)};
+      var vp_w = #{$R2D_WINDOW.get(:viewport_width)};
+      var viewport_width = vp_w != Opal.nil ? vp_w : width;
+      var vp_h = #{$R2D_WINDOW.get(:viewport_height)};
+      var viewport_height = vp_h != Opal.nil ? vp_h : height;
+      win = S2D.CreateWindow(
+        #{$R2D_WINDOW.get(:title)}, width, height, update, render, "ruby2d-app", {}
+      );
+      win.viewport.width  = viewport_width;
+      win.viewport.height = viewport_height;
+      win.on_key          = on_key;
+      win.on_mouse        = on_mouse;
+      S2D.Show(win);`
+    end
+  end
+end