dxopal 1.2.0 → 1.3.0

data/doc/api/top-level-namespace.html

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.9.12
+    &mdash; Documentation by YARD 0.9.16
   
 </title>
 
@@ -100,9 +100,9 @@
 </div>
 
       <div id="footer">
-  Generated on Wed May 16 19:58:23 2018 by
+  Generated on Sat Sep 29 15:56:47 2018 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.12 (ruby-2.4.2).
+  0.9.16 (ruby-2.5.1).
 </div>
 
     </div>

data/dxopal.gemspec

@@ -23,12 +23,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "opal", "~> 0.11.0"
   spec.add_runtime_dependency "thor", "~> 0.19.1"
   spec.add_runtime_dependency "rack", "~> 2.0"
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "yard", "~> 0.9.12"
-  spec.add_development_dependency "puma", "~> 3.11.2"
-  spec.add_development_dependency "opal-sprockets", "~> 0.4.1"
 end

data/opal/dxopal.rb

@@ -15,17 +15,6 @@ require 'dxopal/version'
 # without even install Ruby)
 require 'opal-parser'
 
-# Patch to opal-parser
-def require_remote(url)
-  %x{
-    var r = new XMLHttpRequest();
-    r.overrideMimeType("text/plain"); // Patch for Firefox + file://
-    r.open("GET", url, false);
-    r.send('');
-  }
-  eval `r.responseText`
-end
-
 # These opal stdlibs will be embedded in dxopal.js.
 require 'singleton'
 require 'delegate'
@@ -35,6 +24,9 @@ require 'promise'
 require 'set'
 require 'time'
 
+# Patches
+require 'dxopal/patches/require_remote'
+
 module DXOpal
   include DXOpal::Constants::Colors
   include DXOpal::Input::KeyCodes

data/opal/dxopal/image.rb

@@ -70,13 +70,18 @@ module DXOpal
       draw_ex(x, y, image, angle: angle, center_x: center_x, center_y: center_y)
     end
 
+    BLEND_TYPES = {
+      alpha: "source-over", # A over B (Default)
+      add:   "lighter"      # A + B
+    }
+
     def draw_ex(x, y, image, options={})
       scale_x = options[:scale_x] || 1
       scale_y = options[:scale_y] || 1
       center_x = options[:center_x] || image.width/2
       center_y = options[:center_y] || image.height/2 
-      # TODO: alpha
-      # TODO: blend
+      alpha = options[:alpha] || 255
+      blend = options[:blend] || :alpha
       angle = options[:angle] || 0
 
       cx = x + center_x
@@ -85,7 +90,11 @@ module DXOpal
         #{@ctx}.translate(cx, cy);
         #{@ctx}.rotate(angle * Math.PI / 180.0);
         #{@ctx}.scale(scale_x, scale_y);
+        #{@ctx}.save();
+        #{@ctx}.globalAlpha = alpha / 255;
+        #{@ctx}.globalCompositeOperation = #{BLEND_TYPES[blend]};
         #{@ctx}.drawImage(#{image.canvas}, x-cx, y-cy);
+        #{@ctx}.restore();
         #{@ctx}.setTransform(1, 0, 0, 1, 0, 0); // reset
       }
       return self

data/opal/dxopal/patches/require_remote.rb

@@ -0,0 +1,10 @@
+require 'opal-parser'
+def require_remote(url)
+  %x{
+    var r = new XMLHttpRequest();
+    r.overrideMimeType("text/plain"); // https://github.com/yhara/dxopal/issues/12
+    r.open("GET", url, false);
+    r.send('');
+  }
+  eval `r.responseText`
+end

data/opal/dxopal/sprite.rb

@@ -53,6 +53,11 @@ module DXOpal
     attr_accessor :scale_x, :scale_y
     # Set rotation center (default: center of `image`)
     attr_accessor :center_x, :center_y
+    # Set alpha (0~255, default: nil)
+    attr_accessor :alpha
+    # Set blend type (Any of :alpha(default), :add)
+    # (:none, :add2 and :sub are not implemented yet; Pull request is welcome)
+    attr_accessor :blend
 
     attr_reader :x, :y
 
@@ -88,6 +93,7 @@ module DXOpal
 
       Window.draw_ex(@x, @y, @image,
                      scale_x: @scale_x, scale_y: @scale_y,
+                     alpha: @alpha, blend: @blend,
                      angle: @angle, center_x: @center_x, center_y: @center_y)
     end
   end

data/opal/dxopal/version.rb

@@ -1,3 +1,3 @@
 module DXOpal
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: dxopal
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Yutaka HARA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-09-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: opal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -52,76 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.14'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.12
-- !ruby/object:Gem::Dependency
-  name: puma
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.11.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.11.2
-- !ruby/object:Gem::Dependency
-  name: opal-sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.1
 description: 
 email:
 - yutaka.hara+github@gmail.com
@@ -180,6 +96,7 @@ files:
 - opal/dxopal/image.rb
 - opal/dxopal/input.rb
 - opal/dxopal/input/key_codes.rb
+- opal/dxopal/patches/require_remote.rb
 - opal/dxopal/remote_resource.rb
 - opal/dxopal/sound.rb
 - opal/dxopal/sound_effect.rb