ruby2d 0.3.1 → 0.4.0

data/bin/ruby2d

@@ -14,12 +14,14 @@ end
 
 # The Ruby 2D library files
 @lib_files = [
+  'renderable',
   'exceptions',
   'color',
   'window',
   'application',
   'dsl',
   'quad',
+  'line',
   'rectangle',
   'square',
   'triangle',
@@ -46,18 +48,18 @@ 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
 
@@ -74,25 +76,25 @@ 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 "#{'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') do |file|
     file << strip_require(rb_file)
   end
-  
+
   `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"
@@ -100,10 +102,10 @@ def build_native(rb_file)
     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
@@ -111,22 +113,22 @@ 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"
@@ -135,10 +137,10 @@ def build_web(rb_file)
     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`"
@@ -148,13 +150,13 @@ 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">
@@ -175,7 +177,7 @@ def build_package
 </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`."

data/ext/ruby2d/extconf.rb

@@ -1,6 +1,6 @@
 require 'mkmf'
 
-S2D_VERSION = '0.5.1'  # Simple 2D minimum version required
+S2D_VERSION = '0.6.0'  # Simple 2D minimum version required
 $errors = []
 
 class String
@@ -32,10 +32,10 @@ case RUBY_PLATFORM
 
 # macOS
 when /darwin/
-  
+
   # Simple 2D not installed
   if `which simple2d`.empty?
-    
+
     # Homebrew not installed
     if `which brew`.empty?
       $errors << "Ruby 2D uses a native library called Simple 2D." <<
@@ -46,7 +46,7 @@ when /darwin/
                  "  brew install simple2d".bold
       print_errors
       exit
-      
+
     # Homebrew installed, instruct to install Simple 2D
     else
       $errors << "Ruby 2D uses a native library called Simple 2D." <<
@@ -57,10 +57,10 @@ when /darwin/
       exit
     end
   end
-  
+
 # Linux and Windows / MinGW
 when /linux|mingw/
-  
+
   # Simple 2D not installed
   if `which simple2d`.empty?
     $errors << "Ruby 2D uses a native library called Simple 2D.\n" <<

data/ext/ruby2d/ruby2d-opal.rb

@@ -12,30 +12,75 @@ $R2D_WINDOW = nil
 // @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;
+const $R2D_LINE     = 3;
+const $R2D_IMAGE    = 4;
+const $R2D_SPRITE   = 5;
+const $R2D_TEXT     = 6;
 
 
-function on_key(e, key) {
-  switch (e) {
-    case S2D.KEYDOWN:
-      #{$R2D_WINDOW.key_down_callback(`key`)};
+function on_key(e) {
+
+  switch (e.type) {
+    case S2D.KEY_DOWN:
+      #{type = :down};
       break;
-    
-    case S2D.KEY:
-      #{$R2D_WINDOW.key_callback(`key`)};
+    case S2D.KEY_HELD:
+      #{type = :held};
       break;
-    
-    case S2D.KEYUP:
-      #{$R2D_WINDOW.key_up_callback(`key`)};
+    case S2D.KEY_UP:
+      #{type = :up};
       break;
   }
+
+  #{$R2D_WINDOW.key_callback(type, `e.key`)};
 }
 
 
-function on_mouse(x, y) {
-  #{$R2D_WINDOW.mouse_callback("any", `x`, `y`)};
+function on_mouse(e) {
+
+  #{direction = nil}
+  #{button    = nil}
+
+  switch (e.type) {
+    case S2D.MOUSE_DOWN:
+      #{type = :down};
+      break;
+    case S2D.MOUSE_UP:
+      #{type = :up};
+      break;
+    case S2D.MOUSE_SCROLL:
+      #{type = :scroll};
+      #{direction} = e.direction == S2D.MOUSE_SCROLL_NORMAL ? #{:normal} : #{:inverted};
+      break;
+    case S2D.MOUSE_MOVE:
+      #{type = :move};
+      break;
+  }
+
+  if (e.type == S2D.MOUSE_DOWN || e.type == S2D.MOUSE_UP) {
+    switch (e.button) {
+      case S2D.MOUSE_LEFT:
+        #{button = :left};
+        break;
+      case S2D.MOUSE_MIDDLE:
+        #{button = :middle};
+        break;
+      case S2D.MOUSE_RIGHT:
+        #{button = :right};
+        break;
+      case S2D.MOUSE_X1:
+        #{button = :x1};
+        break;
+      case S2D.MOUSE_X2:
+        #{button = :x2};
+        break;
+    }
+  }
+
+  #{$R2D_WINDOW.mouse_callback(
+    type, button, direction,
+    `e.x`, `e.y`, `e.delta_x`, `e.delta_y`
+  )};
 }
 
 
@@ -49,30 +94,30 @@ function update() {
 
 
 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,
@@ -81,26 +126,36 @@ function render() {
           el.x4, el.y4, el.c4.r, el.c4.g, el.c4.b, el.c4.a
         );
         break;
-      
+
+      case $R2D_LINE:
+        S2D.DrawLine(
+          el.x1, el.y1, el.x2, el.y2, el.width,
+          el.c1.r, el.c1.g, el.c1.b, el.c1.a,
+          el.c2.r, el.c2.g, el.c2.b, el.c2.a,
+          el.c3.r, el.c3.g, el.c3.b, el.c3.a,
+          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,
@@ -108,111 +163,120 @@ function render() {
           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);`
+    def ext_image_init(path)
+      `#{self}.data = S2D.CreateImage(path, function() {
+        if (#{@width} == Opal.nil) {
+          #{@width} = #{self}.data.width;
+        }
+        if (#{@height} == Opal.nil) {
+          #{@height} = #{self}.data.height;
+        }
+      });`
     end
   end
-  
+
   class Sprite
-    def init(path)
+    def ext_sprite_init(path)
       `#{self}.data = S2D.CreateSprite(path);`
     end
   end
-  
+
   class Text
-    def init
+    def ext_text_init
       `#{self}.data = S2D.CreateText(#{self}.font, #{self}.text, #{self}.size);`
+      @width  = `#{self}.data.width;`
+      @height = `#{self}.data.height;`
     end
-    
-    def text=(t)
-      @text = t
-      `S2D.SetText(#{self}.data, #{self}.text);`
+
+    def ext_text_set(msg)
+      `S2D.SetText(#{self}.data, #{msg});`
+      @width  = `#{self}.data.width;`
+      @height = `#{self}.data.height;`
     end
   end
-  
+
   class Sound
-    def init(path)
+    def ext_sound_init(path)
       `#{self}.data = S2D.CreateSound(path);`
     end
-    
-    def play
+
+    def ext_sound_play
       `S2D.PlaySound(#{self}.data);`
     end
   end
-  
+
   class Music
-    def init(path)
+    def ext_music_init(path)
       `#{self}.data = S2D.CreateMusic(path);`
     end
-    
-    def play
+
+    def ext_music_play
       `S2D.PlayMusic(#{self}.data, #{self}.loop);`
     end
-    
-    def pause
+
+    def ext_music_pause
       `S2D.PauseMusic();`
     end
-    
-    def resume
+
+    def ext_music_resume
       `S2D.ResumeMusic();`
     end
-    
-    def stop
+
+    def ext_music_stop
       `S2D.StopMusic();`
     end
-    
-    def fadeout(ms)
+
+    def ext_music_fadeout(ms)
       `S2D.FadeOutMusic(ms);`
     end
   end
-  
+
   class Window
-    def show
+    def ext_window_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