dxopal 1.3.0 → 1.4.2

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

@@ -6,15 +6,15 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.9.16
+    &mdash; Documentation by YARD 0.9.24
   
 </title>
 
-  <link rel="stylesheet" href="css/style.css" type="text/css" charset="utf-8" />
+  <link rel="stylesheet" href="css/style.css" type="text/css" />
 
-  <link rel="stylesheet" href="css/common.css" type="text/css" charset="utf-8" />
+  <link rel="stylesheet" href="css/common.css" type="text/css" />
 
-<script type="text/javascript" charset="utf-8">
+<script type="text/javascript">
   pathId = "";
   relpath = '';
 </script>
@@ -78,16 +78,6 @@
   
 </div>
 
-<h2>Defined Under Namespace</h2>
-<p class="children">
-  
-    
-      <strong class="modules">Modules:</strong> <span class='object_link'><a href="DXOpal.html" title="DXOpal (module)">DXOpal</a></span>
-    
-  
-    
-  
-</p>
 
 
 
@@ -100,9 +90,9 @@
 </div>
 
       <div id="footer">
-  Generated on Sat Sep 29 15:56:47 2018 by
+  Generated on Sat Jan 18 14:57:06 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.16 (ruby-2.5.1).
+  0.9.24 (ruby-2.5.5).
 </div>
 
     </div>

data/doc/en/index.html

@@ -49,9 +49,8 @@
         <h3>If you have Ruby installed:</h3>
         <p>
         <pre><code>$ gem install dxopal
-$ mkdir game1
+$ dxopal new game1
 $ cd game1
-$ dxopal init
 $ dxopal server</code></pre>
         </p>
         <p>
@@ -61,6 +60,7 @@ $ dxopal server</code></pre>
         Then edit main.rb and reload browser.
         </p>
 
+        <!--
         <h3>If you don't want to install Ruby:</h3>
         <p>
         If you have Git command, clone <a href='https://github.com/yhara/dxopal-starter-kit'>yhara/dxopal-starter-kit</a>.
@@ -72,6 +72,7 @@ $ dxopal server</code></pre>
         <p>
         Then edit main.rb and reload the browser tab.
         </p>
+        -->
 
         <h2>Resources</h2>
         <ul>

data/doc/ja/index.html

@@ -49,9 +49,8 @@
         <h3>Rubyがインストール済みのとき</h3>
         <p>
         <pre><code>$ gem install dxopal
-$ mkdir game1
+$ dxopal new game1
 $ cd game1
-$ dxopal init
 $ dxopal server</code></pre>
         </p>
         <p>
@@ -61,6 +60,7 @@ $ dxopal server</code></pre>
         main.rbを編集してブラウザをリロードすると動くはずです。
         </p>
 
+        <!--
         <h3>Rubyをインストールしたくないとき</h3>
         <p>
         Gitコマンドが使える場合は<a href='https://github.com/yhara/dxopal-starter-kit'>yhara/dxopal-starter-kit</a>をgit cloneしてください。そうでない場合は<a href='https://github.com/yhara/dxopal-starter-kit/releases'>releases</a>から最新のzipをダウンロードして展開してください。
@@ -71,6 +71,7 @@ $ dxopal server</code></pre>
         <p>
         main.rbを編集してブラウザをリロードすると動くはずです。
         </p>
+        -->
 
         <h2>リンク</h2>
         <ul>

data/dxopal.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require_relative 'opal/dxopal/version.rb'
+require_relative 'lib/dxopal/version.rb'
 
 Gem::Specification.new do |spec|
   spec.name          = "dxopal"
@@ -23,6 +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 "thor", "~> 0.19.1"
+  spec.add_runtime_dependency "thor", "~> 0.20"
   spec.add_runtime_dependency "rack", "~> 2.0"
 end

data/exe/dxopal

@@ -2,12 +2,24 @@
 require 'fileutils'
 require 'rack'
 require 'thor'
-require_relative '../opal/dxopal/version' # Import DXOpal::VERSION
+require_relative '../lib/dxopal/version' # Import DXOpal::VERSION
 
 module DXOpal
   class Cli < Thor
     GEM_ROOT = "#{__dir__}/../"
 
+    desc "new APP_PATH", "Create a DXOpal project"
+    def new(app_path)
+      if File.exist?(app_path)
+        puts "Already exists: #{app_path}"
+        return
+      end
+      FileUtils.mkdir_p(app_path)
+      Dir.chdir(app_path) do
+        init
+      end
+    end
+
     desc "init", "Copy template files into this directory" 
     def init
       FileUtils.cp("#{GEM_ROOT}/template/index.html", Dir.pwd)

data/{opal → lib}/dxopal.rb

@@ -26,6 +26,7 @@ require 'time'
 
 # Patches
 require 'dxopal/patches/require_remote'
+require 'dxopal/patches/require_dxopal'
 
 module DXOpal
   include DXOpal::Constants::Colors

data/{opal → lib}/dxopal/font.rb

@@ -14,6 +14,11 @@ module DXOpal
     def size; @size; end
     def fontname; @orig_fontname; end
 
+    def get_width(string)
+      canvas = Native(`document.getElementById('dxopal-canvas')`)
+      canvas.getContext('2d').measureText(string).width
+    end
+
     # Return a string like "48px serif"
     def _spec_str
       "#{@size}px #{@fontname}"

data/{opal → lib}/dxopal/image.rb

@@ -28,6 +28,37 @@ module DXOpal
       return img, img_promise
     end
 
+    attr_accessor :promise, :loaded
+    def loaded?; loaded; end
+
+    def self.load(path_or_url)
+      return new(1, 1).load(path_or_url)
+    end
+
+    def load(path_or_url)
+      raw_img = `new Image()`
+      @promise = %x{
+        new Promise(function(resolve, reject) {
+          raw_img.onload = function() {
+            self.$_resize(raw_img.width, raw_img.height);
+            self.$_draw_raw_image(0, 0, raw_img);
+            self.loaded = #{true};
+            resolve();
+          };
+          raw_img.src = path_or_url;
+        });
+      }
+      return self
+    end
+
+    def onload(&block)
+      %x{
+        #{@promise}.then(function(response){
+          #{block.call()}
+        });
+      }
+    end
+
     # Create an instance of Image
     def initialize(width, height, color=C_DEFAULT, canvas: nil)
       @width, @height = width, height
@@ -153,8 +184,8 @@ module DXOpal
       %x{
         ctx.beginPath();
         ctx.strokeStyle = #{_rgba(color)};
-        ctx.moveTo(x1, y1); 
-        ctx.lineTo(x2, y2); 
+        ctx.moveTo(x1+0.5, y1+0.5); 
+        ctx.lineTo(x2+0.5, y2+0.5); 
         ctx.stroke(); 
       }
       return self
@@ -166,7 +197,7 @@ module DXOpal
       %x{
         ctx.beginPath();
         ctx.strokeStyle = #{_rgba(color)};
-        ctx.rect(x1, y1, x2-x1+1, y2-y1+1); 
+        ctx.rect(x1+0.5, y1+0.5, x2-x1, y2-y1); 
         ctx.stroke(); 
       }
       return self
@@ -178,7 +209,7 @@ module DXOpal
       %x{
         ctx.beginPath();
         ctx.fillStyle = #{_rgba(color)};
-        ctx.fillRect(x1, y1, x2-x1+1, y2-y1+1); 
+        ctx.fillRect(x1, y1, x2-x1, y2-y1); 
       }
       return self
     end
@@ -189,7 +220,7 @@ module DXOpal
       %x{
         ctx.beginPath();
         ctx.strokeStyle = #{_rgba(color)};
-        ctx.arc(x, y, r, 0, Math.PI*2, false)
+        ctx.arc(x+0.5, y+0.5, r, 0, Math.PI*2, false)
         ctx.stroke();
       }
       return self
@@ -213,10 +244,10 @@ module DXOpal
       %x{
         ctx.beginPath();
         ctx.strokeStyle = #{_rgba(color)};
-        ctx.moveTo(x1, y1);
-        ctx.lineTo(x2, y2);
-        ctx.lineTo(x3, y3);
-        ctx.lineTo(x1, y1);
+        ctx.moveTo(x1+0.5, y1+0.5);
+        ctx.lineTo(x2+0.5, y2+0.5);
+        ctx.lineTo(x3+0.5, y3+0.5);
+        ctx.lineTo(x1+0.5, y1+0.5);
         ctx.stroke();
       }
       return self

data/{opal → lib}/dxopal/input.rb

@@ -17,12 +17,15 @@ module DXOpal
       @@pressing_keys = `new Object()`
       @@mouse_info = `{x: 0, y: 0}`
       @@pressing_mouse_buttons = `new Object()`
+      @@touch_info = `{x: 0, y: 0}`
+      @@pressing_touch = `new Object()`
 
       rect = `canvas.getBoundingClientRect()`
       @@canvas_x = `rect.left + window.pageXOffset`
       @@canvas_y = `rect.top  + window.pageYOffset`
 
       self._init_mouse_events
+      self._init_touch_events
       self.keyevent_target = `window` unless Input.keyevent_target
     end
     
@@ -166,5 +169,57 @@ module DXOpal
     def self.mouse_release?(mouse_code)
       return `#{@@pressing_mouse_buttons}[mouse_code] == -(#{@@tick}-1)`
     end
+
+    #
+    # Touch
+    #
+
+    # (internal) initialize touch events
+    def self._init_touch_events
+      %x{
+        document.addEventListener('touchmove', function(ev){
+          #{@@touch_info}.x = ev.changedTouches[0].pageX - #{@@canvas_x};
+          #{@@touch_info}.y = ev.changedTouches[0].pageY - #{@@canvas_y};
+        });
+        document.addEventListener('touchstart', function(ev){
+          #{@@touch_info}.x = ev.changedTouches[0].pageX - #{@@canvas_x};
+          #{@@touch_info}.y = ev.changedTouches[0].pageY - #{@@canvas_y};
+          #{@@pressing_touch}[0] = #{@@tick};
+        });
+        document.addEventListener('touchend', function(ev){
+          #{@@touch_info}.x = ev.changedTouches[0].pageX - #{@@canvas_x};
+          #{@@touch_info}.y = ev.changedTouches[0].pageY - #{@@canvas_y};
+          #{@@pressing_touch}[0] = -#{@@tick};
+        });
+      }
+    end
+
+    # Return position of touch
+    # (0, 0) is the top-left corner of the canvas
+    def self.touch_x
+      return `#{@@touch_info}.x`
+    end
+    def self.touch_y
+      return `#{@@touch_info}.y`
+    end
+    class << self
+      alias touch_pos_x touch_x
+      alias touch_pos_y touch_y
+    end
+
+    # Return true if the touch is being pressed
+    def self.touch_down?
+      return `#{@@pressing_touch}[0] > 0`
+    end
+
+    # Return true if the touch is pressed in the last tick
+    def self.touch_push?
+      return `#{@@pressing_touch}[0] == -(#{@@tick}-1)`
+    end
+
+    # Return true if the touch is released in the last tick
+    def self.touch_release?
+      return `#{@@pressing_touch}[0] == -(#{@@tick}-1)`
+    end
   end
 end

data/{opal → lib}/dxopal/input/key_codes.rb

@@ -3,9 +3,7 @@ module DXOpal
     # List of key codes (event.code)
     # https://developer.mozilla.org/ja/docs/Web/API/KeyboardEvent
     module KeyCodes
-      # TODO: add more keycodes (pull request welcome)
-      # especially keypads and us-keyboards
-
+      # TODO: add event.code for those commented out (pull request welcome)
       K_ESCAPE = 'Escape'
       K_1 = 'Digit1'
       K_2 = 'Digit2'
@@ -47,7 +45,7 @@ module DXOpal
       K_L = 'KeyL'
       K_SEMICOLON = 'Semicolon'
       K_APOSTROPHE = 'Quote'  # '
-      #K_GRAVE = "`"
+      K_GRAVE = "Backquote"   # `
       K_LSHIFT = 'ShiftLeft'
       K_BACKSLASH = 'BackSlash'  # Note: different to K_YEN
       K_Z = 'KeyZ'
@@ -61,45 +59,45 @@ module DXOpal
       K_PERIOD = 'Period'
       K_SLASH = 'Slash'
       K_RSHIFT = 'ShiftRight'
-      #K_MULTIPLY = "*"
+      K_MULTIPLY = "NumpadMultiply"
       #K_LMENU Alt
       K_SPACE = 'Space'
       #K_CAPITAL
-      K_F1 = 112
-      K_F2 = 113
-      K_F3 = 114
-      K_F4 = 115
-      K_F5 = 116
-      K_F6 = 117
-      K_F7 = 118
-      K_F8 = 119
-      K_F9 = 120
-      K_F10 = 121
-      #K_NUMLOCK = "NumLock"
-      #K_SCROLL = "ScrollLock"
-      #K_NUMPAD7 7 *3
-      #K_NUMPAD8 8 *3
-      #K_NUMPAD9 9 *3
-      #K_SUBTRACT  - *3
-      #K_NUMPAD4 4 *3
-      #K_NUMPAD5 5 *3
-      #K_NUMPAD6 6 *3
-      #K_ADD + *3
-      #K_NUMPAD1 1 *3
-      #K_NUMPAD2 2 *3
-      #K_NUMPAD3 3 *3
-      #K_NUMPAD0 0 *3
-      #K_DECIMAL . *3
+      K_F1  = "F1"
+      K_F2  = "F2"
+      K_F3  = "F3"
+      K_F4  = "F4"
+      K_F5  = "F5"
+      K_F6  = "F6"
+      K_F7  = "F7"
+      K_F8  = "F8"
+      K_F9  = "F9"
+      K_F10 = "F10"
+      K_NUMLOCK = "NumLock"
+      K_SCROLL = "ScrollLock"
+      K_NUMPAD7 = "Numpad7"
+      K_NUMPAD8 = "Numpad8"
+      K_NUMPAD9 = "Numpad9"
+      K_SUBTRACT = "NumpadSubtract"
+      K_NUMPAD4 = "Numpad4"
+      K_NUMPAD5 = "Numpad5"
+      K_NUMPAD6 = "Numpad6"
+      K_ADD = "NumpadAdd"
+      K_NUMPAD1 = "Numpad1"
+      K_NUMPAD2 = "Numpad2"
+      K_NUMPAD3 = "Numpad3"
+      K_NUMPAD0 = "Numpad0"
+      K_DECIMAL = "NumpadDecimal"
       #K_OEM_102 
-      K_F11 = 122
-      K_F12 = 123
-      K_F13 = 124
-      K_F14 = 125
-      K_F15 = 126
-      #K_KANA 
+      K_F11 = "F11"
+      K_F12 = "F12"
+      K_F13 = "F13"
+      K_F14 = "F14"
+      K_F15 = "F15"
+      K_KANA = "KanaMode"
       #K_ABNT_C1 
-      #K_CONVERT 
-      #K_NOCONVERT
+      K_CONVERT = "Convert"
+      K_NOCONVERT = "NonConvert"
       K_YEN = 'IntlYen'
       #K_ABNT_C2 
       #K_NUMPADEQUALS  = *3 *1
@@ -112,60 +110,60 @@ module DXOpal
       #K_AX
       #K_UNLABELED
       #K_NEXTTRACK
-      #K_NUMPADENTER Enter *3
+      K_NUMPADENTER = "NumpadEnter"
       K_RCONTROL = 'ControlRight'
-      #K_MUTE
+      K_MUTE = "VolumeMute"
       #K_CALCULATOR
       #K_PLAYPAUSE
       #K_MEDIASTOP
-      #K_VOLUMEDOWN
-      #K_VOLUMEUP
-      #K_WEBHOME
+      K_VOLUMEDOWN = "VolumeDown"
+      K_VOLUMEUP = "VolumeUp"
+      K_WEBHOME = "BrowserHome"
       #K_NUMPADCOMMA , *3 *1
-      #K_DIVIDE  / *3
+      K_DIVIDE = "NumpadDivide"
       #K_SYSRQ
       #K_RMENU Alt
-      #K_PAUSE = "Pause"
-      #K_HOME "Home"
+      K_PAUSE = "Pause"
+      K_HOME = "Home"
       K_UP = 'ArrowUp'
       #K_PRIOR
       K_LEFT = 'ArrowLeft'
       K_RIGHT = 'ArrowRight'
-      #K_END = "End"
+      K_END = "End"
       K_DOWN = 'ArrowDown'
       #K_NEXT
-      #K_INSERT = "Insert"
-      #K_DELETE = "Delete"
-      #K_LWIN  Windows
-      #K_RWIN  Windows
+      K_INSERT = "Insert"
+      K_DELETE = "Delete"
+      #K_LWIN
+      #K_RWIN
       #K_APPS
       #K_POWER
       #K_SLEEP
       #K_WAKE
-      #K_WEBSEARCH
-      #K_WEBFAVORITES
-      #K_WEBREFRESH
-      #K_WEBSTOP
-      #K_WEBFORWARD
-      #K_WEBBACK
+      K_WEBSEARCH = "BrowserSearch"
+      K_WEBFAVORITES = "BrowserFavorites"
+      K_WEBREFRESH = "BrowserRefresh"
+      K_WEBSTOP = "BrowserStop"
+      K_WEBFORWARD = "BrowserForward"
+      K_WEBBACK = "BrowserBack"
       #K_MYCOMPUTER
       #K_MAIL
       #K_MEDIASELECT
       K_BACKSPACE = 'Backspace'
-      #K_NUMPADSTAR  * *3
-      #K_LALT  Alt
+      K_NUMPADSTAR = "NumpadMultiply"
+      K_LALT = "AltLeft"
       K_CAPSLOCK = 'CapsLock'
-      #K_NUMPADMINUS - *3
-      #K_NUMPADPLUS  + *3
-      #K_NUMPADPERIOD  . *3
-      #K_NUMPADSLASH / *3
-      #K_RALT  Alt
+      K_NUMPADMINUS = "NumpadSubtract"
+      K_NUMPADPLUS = "NumpadAdd"
+      K_NUMPADPERIOD = "NumpadDecimal"
+      K_NUMPADSLASH = "NumpadDivide"
+      K_RALT = "AltRight"
       K_UPARROW = 'ArrowUp'
-      #K_PGUP = "PageUp"
+      K_PGUP = "PageUp"
       K_LEFTARROW = 'ArrowLeft'
       K_RIGHTARROW = 'ArrowRight'
       K_DOWNARROW = 'ArrowDown'
-      #K_PGDN = "PageDown"
+      K_PGDN = "PageDown"
     end
   end
 end