dxopal 1.4.2 → 1.5.2

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

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.9.24
+    &mdash; Documentation by YARD 0.9.26
   
 </title>
 
@@ -78,21 +78,172 @@
   
 </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>, <span class='object_link'><a href="Kernel.html" title="Kernel (module)">Kernel</a></span>
+    
+  
+    
+  
+</p>
+
+
+
+
+
+
+
+  
+    <h2>
+      Instance Method Summary
+      <small><a href="#" class="summary_toggle">collapse</a></small>
+    </h2>
+
+    <ul class="summary">
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="top-level-namespace.html#require-instance_method" title="#require (instance method)">#<strong>require</strong>(*args)  &#x21d2; Object </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'></div></span>
+  
+</li>
+
+      
+        <li class="public ">
+  <span class="summary_signature">
+    
+      <a href="top-level-namespace.html#require_remote-instance_method" title="#require_remote (instance method)">#<strong>require_remote</strong>(url)  &#x21d2; Object </a>
+    
+
+    
+  </span>
+  
+  
+  
+  
+  
+  
+  
+
+  
+    <span class="summary_desc"><div class='inline'></div></span>
+  
+</li>
+
+      
+    </ul>
+  
 
 
 
+  <div id="instance_method_details" class="method_details_list">
+    <h2>Instance Method Details</h2>
+
+    
+      <div class="method_details first">
+  <h3 class="signature first" id="require-instance_method">
+  
+    #<strong>require</strong>(*args)  &#x21d2; <tt>Object</tt> 
+  
 
+  
 
+  
+</h3><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
 
 
+24
+25
+26
+27
+28
+29
+30</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/dxopal/patches/require_dxopal.rb', line 24</span>
 
+<span class='kw'>def</span> <span class='id identifier rubyid_require'>require</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='rparen'>)</span>
+  <span class='kw'>if</span> <span class='id identifier rubyid_args'>args</span> <span class='op'>==</span> <span class='lbracket'>[</span><span class='tstring'><span class='tstring_beg'>&#39;</span><span class='tstring_content'>dxopal</span><span class='tstring_end'>&#39;</span></span><span class='rbracket'>]</span>
+    <span class='comment'># Do nothing, because DXOpal is already loaded and you don&#39;t need to find it
+</span>  <span class='kw'>else</span>
+    <span class='id identifier rubyid_dxopal_orig_require'>dxopal_orig_require</span><span class='lparen'>(</span><span class='op'>*</span><span class='id identifier rubyid_args'>args</span><span class='rparen'>)</span>
+  <span class='kw'>end</span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
+</div>
+    
+      <div class="method_details ">
+  <h3 class="signature " id="require_remote-instance_method">
+  
+    #<strong>require_remote</strong>(url)  &#x21d2; <tt>Object</tt> 
+  
+
+  
+
+  
+</h3><table class="source_code">
+  <tr>
+    <td>
+      <pre class="lines">
+
+
+2
+3
+4
+5
+6
+7
+8
+9
+10</pre>
+    </td>
+    <td>
+      <pre class="code"><span class="info file"># File 'lib/dxopal/patches/require_remote.rb', line 2</span>
+
+<span class='kw'>def</span> <span class='id identifier rubyid_require_remote'>require_remote</span><span class='lparen'>(</span><span class='id identifier rubyid_url'>url</span><span class='rparen'>)</span>
+  <span class='backtick'>%x{</span><span class='tstring_content'>
+    var r = new XMLHttpRequest();
+    r.overrideMimeType(&quot;text/plain&quot;); // https://github.com/yhara/dxopal/issues/12
+    r.open(&quot;GET&quot;, url, false);
+    r.send(&#39;&#39;);
+  </span><span class='tstring_end'>}</span></span>
+  <span class='id identifier rubyid_eval'>eval</span> <span class='backtick'>`</span><span class='tstring_content'>r.responseText</span><span class='tstring_end'>`</span></span>
+<span class='kw'>end</span></pre>
+    </td>
+  </tr>
+</table>
+</div>
+    
+  </div>
 
 </div>
 
       <div id="footer">
-  Generated on Sat Jan 18 14:57:06 2020 by
+  Generated on Tue Dec 29 11:37:22 2020 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.9.24 (ruby-2.5.5).
+  0.9.26 (ruby-2.7.0).
 </div>
 
     </div>

data/doc/en/index.html

@@ -34,6 +34,9 @@
           <li>
             <a href="../../examples/apple_catcher/index.html">Apple Catcher</a>
           </li>
+          <li>
+            <a href="../../examples/multi_touch/index.html">Multi touch</a>
+          </li>
           <li>
             <a href="../../examples/collision/index.html">Collision detection</a>
           </li>

data/doc/ja/index.html

@@ -34,6 +34,9 @@
           <li>
             <a href="../../examples/apple_catcher/index.html">Apple Catcher</a>
           </li>
+          <li>
+            <a href="../../examples/multi_touch/index.html">Multi touch</a>
+          </li>
           <li>
             <a href="../../examples/collision/index.html">Collision detection</a>
           </li>

data/exe/dxopal

@@ -48,7 +48,7 @@ module DXOpal
       puts "Starting DXOpal Server"
       puts "(Open http://localhost:#{options[:port]}/index.html in the browser)"
       puts "---"
-      app = Rack::Directory.new(Dir.pwd)
+      app = Rack::CommonLogger.new(Rack::Directory.new(Dir.pwd))
       Rack::Server.start(app: app, Port: options[:port])
     end
   end

data/lib/dxopal/image.rb

@@ -6,6 +6,34 @@ module DXOpal
   class Image < RemoteResource
     RemoteResource.add_class(Image)
 
+    # Convert HSL to RGB (DXOpal original; not in DXRuby)
+    # h: 0-359
+    # s: 0-100
+    # l: 0-100
+    def self.hsl2rgb(h, s, l)
+      if l < 50
+        max = 2.55 * (l + l*(s/100.0))
+        min = 2.55 * (l - l*(s/100.0))
+      else
+        max = 2.55 * (l + (100-l)*(s/100.0))
+        min = 2.55 * (l - (100-l)*(s/100.0))
+      end
+      case h
+      when 0...60
+        [max, (h/60.0)*(max-min) + min, min]
+      when 60...120
+        [((120-h)/60.0)*(max-min) + min, max, min]
+      when 120...180
+        [min, max, ((h-120)/60.0)*(max-min) + min]
+      when 180...240
+        [min, ((240-h)/60.0)*(max-min) + min, max]
+      when 240...300
+        [((h-240)/60.0)*(max-min) + min, min, max]
+      else
+        [max, min, ((360-h)/60.0)*(max-min) + min]
+      end
+    end
+
     # Load remote image (called via Window.load_resources)
     def self._load(path_or_url)
       raw_img = `new Image()`
@@ -157,7 +185,7 @@ module DXOpal
 
     # Put a pixel on this image
     def []=(x, y, color)
-      box_fill(x, y, x, y, color)
+      box_fill(x, y, x+1, y+1, color)
     end
 
     # Return true if the pixel at `(x, y)` has the `color`

data/lib/dxopal/input.rb

@@ -20,6 +20,7 @@ module DXOpal
       @@touch_info = `{x: 0, y: 0}`
       @@pressing_touch = `new Object()`
 
+      @@canvas = canvas
       rect = `canvas.getBoundingClientRect()`
       @@canvas_x = `rect.left + window.pageXOffset`
       @@canvas_y = `rect.top  + window.pageYOffset`
@@ -32,6 +33,7 @@ module DXOpal
     # Called on every frame from Window
     def self._on_tick
       @@tick += 1
+      self._update_touch_info
     end
 
     # Return 1 if 'right', -1 if 'left'
@@ -133,9 +135,11 @@ module DXOpal
         document.addEventListener('mouseup', function(ev){
           #{@@mouse_info}.x = ev.pageX - #{@@canvas_x};
           #{@@mouse_info}.y = ev.pageY - #{@@canvas_y};
+          // ev.button => ev.buttons
+          table = { 0: 1, 1: 4, 2: 2, 3: 8, 4: 16 };
           for (var k=1; k<=16; k<<=1) {
-            if ((ev.buttons & k) == 0 && #{@@pressing_mouse_buttons}[k]) {
-              #{@@pressing_mouse_buttons}[k] = -#{@@tick};
+            if (#{@@pressing_mouse_buttons}[k]) {
+              #{@@pressing_mouse_buttons}[table[ev.button]] = -#{@@tick};
             }
           }
         });
@@ -157,16 +161,19 @@ module DXOpal
 
     # Return true if the mouse button is being pressed
     def self.mouse_down?(mouse_code)
+      raise "missing argument of `mouse_down?'" unless mouse_code
       return `#{@@pressing_mouse_buttons}[mouse_code] > 0`
     end
 
     # Return true if the mouse button is pressed in the last tick
     def self.mouse_push?(mouse_code)
+      raise "missing argument of `mouse_push?'" unless mouse_code
       return `#{@@pressing_mouse_buttons}[mouse_code] == -(#{@@tick}-1)`
     end
 
     # Return true if the mouse button is released in the last tick
     def self.mouse_release?(mouse_code)
+      raise "missing argument of `mouse_release?'" unless mouse_code
       return `#{@@pressing_mouse_buttons}[mouse_code] == -(#{@@tick}-1)`
     end
 
@@ -176,24 +183,61 @@ module DXOpal
 
     # (internal) initialize touch events
     def self._init_touch_events
+      @@touches = {}
+      @@new_touches = []
       %x{
-        document.addEventListener('touchmove', function(ev){
+        #{@@canvas}.addEventListener('touchmove', function(ev){
+          ev.preventDefault();
+          ev.stopPropagation();
           #{@@touch_info}.x = ev.changedTouches[0].pageX - #{@@canvas_x};
           #{@@touch_info}.y = ev.changedTouches[0].pageY - #{@@canvas_y};
+          for (var touch of ev.changedTouches) {
+            const id = touch.identifier;
+            const x = touch.pageX - #{@@canvas_x};
+            const y = touch.pageY - #{@@canvas_y};
+            #{@@touches[`id`]&._move(`x`, `y`)}
+          }
         });
-        document.addEventListener('touchstart', function(ev){
+        #{@@canvas}.addEventListener('touchstart', function(ev){
+          ev.preventDefault();
+          ev.stopPropagation();
           #{@@touch_info}.x = ev.changedTouches[0].pageX - #{@@canvas_x};
           #{@@touch_info}.y = ev.changedTouches[0].pageY - #{@@canvas_y};
           #{@@pressing_touch}[0] = #{@@tick};
+          for (var touch of ev.changedTouches) {
+            const id = touch.identifier;
+            const x = touch.pageX - #{@@canvas_x};
+            const y = touch.pageY - #{@@canvas_y};
+            #{
+              new_touch = Touch.new(`id`, `x`, `y`)
+              @@touches[`id`] = new_touch
+              @@new_touches.push(new_touch)
+            }
+          }
         });
-        document.addEventListener('touchend', function(ev){
+        #{@@canvas}.addEventListener('touchend', function(ev){
+          ev.preventDefault();
+          ev.stopPropagation();
           #{@@touch_info}.x = ev.changedTouches[0].pageX - #{@@canvas_x};
           #{@@touch_info}.y = ev.changedTouches[0].pageY - #{@@canvas_y};
           #{@@pressing_touch}[0] = -#{@@tick};
+          for (var touch of ev.changedTouches) {
+            const id = touch.identifier;
+            #{@@touches[`id`]&._released(@@tick)}
+          }
         });
       }
     end
 
+    def self._update_touch_info
+      # Clear old data
+      @@touches.delete_if{|id, t| t.released? && t._released_at < @@tick-1}
+    end
+
+    #
+    # Single touch
+    #
+
     # Return position of touch
     # (0, 0) is the top-left corner of the canvas
     def self.touch_x
@@ -221,5 +265,51 @@ module DXOpal
     def self.touch_release?
       return `#{@@pressing_touch}[0] == -(#{@@tick}-1)`
     end
+
+    #
+    # Multi touches
+    #
+    
+    # Represents a touch
+    class Touch
+      def initialize(id, x, y)
+        @id = id
+        _move(x, y)
+        @_released_at = nil
+        @data = {}
+      end
+      attr_reader :id, :x, :y, :data, :_released_at
+
+      # Return true if this touch is released in the last tick
+      def released?
+        !!@_released_at
+      end
+
+      def inspect
+        rel = (released_at ? " released_at=#{released_at}" : "")
+        "#<DXOpal::Touch id=#{id} x=#{x} y=#{y} data=#{data.inspect}#{rel}>"
+      end
+
+      def _move(x, y)
+        @x = x
+        @y = y
+      end
+
+      def _released(tick)
+        @_released_at = tick
+      end
+    end
+
+    # Returns current touches as an array of Input::Touch
+    def self.touches
+      @@touches.values
+    end
+
+    # Returns newly created touches
+    def self.new_touches
+      ret = @@new_touches
+      @@new_touches = []
+      ret
+    end
   end
 end

data/lib/dxopal/version.rb

@@ -1,3 +1,3 @@
 module DXOpal
-  VERSION = "1.4.2"
+  VERSION = "1.5.2"
 end

data/lib/dxopal/window.rb

@@ -3,6 +3,8 @@ require 'dxopal/constants/colors'
 module DXOpal
   module Window
     @@fps = 60
+    @@fps_ts = nil
+    @@fps_ct = 0
     @@real_fps = 0
     @@real_fps_ct = 1
     @@real_fps_t = Time.now
@@ -26,7 +28,8 @@ module DXOpal
     def self.loop(&block)
       already_running = !!@@block
       @@block = block
-      _loop unless already_running
+      return if already_running
+      `window`.JS.requestAnimationFrame{|time| _loop(time) }
     end
 
     # (DXOpal original) Pause & resume
@@ -46,21 +49,34 @@ module DXOpal
     end
 
     # (internal) call @@block periodically
-    def self._loop(time=0)
-      @@img ||= _init(@@width, @@height)
-      t0 = Time.now
+    def self._loop(timestamp)
+      @@img ||= _init
 
       # Calculate fps
-      if t0 - @@real_fps_t >= 1.0
+      frame_msec = 1000.0 / @@fps
+      @@fps_ts ||= timestamp
+      passed_msec = timestamp - @@fps_ts
+      @@fps_ts = timestamp
+      @@fps_ct += passed_msec
+      if @@fps_ct >= frame_msec
+        @@fps_ct -= frame_msec
+      else
+        `window`.JS.requestAnimationFrame{|time| _loop(time) }
+        return
+      end
+
+      # Calculate real_fps
+      t = Time.now
+      if t - @@real_fps_t >= 1.0
         @@real_fps = @@real_fps_ct
         @@real_fps_ct = 1
-        @@real_fps_t = t0
+        @@real_fps_t = t
       else
         @@real_fps_ct += 1
       end
 
       # Update physics
-      Sprite.matter_tick(time) if Sprite.matter_enabled?
+      Sprite.matter_tick(timestamp) if Sprite.matter_enabled?
 
       # Detect inputs
       Input._on_tick
@@ -97,11 +113,12 @@ module DXOpal
       `window`.JS.requestAnimationFrame{|time| _loop(time) }
     end
 
-    def self._init(w, h)
+    def self._init
       canvas = `document.getElementById("dxopal-canvas")`
-      `canvas.width = w`
-      `canvas.height = h`
-      img = Image.new(w, h, canvas: canvas)
+      # If user did not change Window.width/Window.height, set the canvas size here
+      self.width = @@width
+      self.height = @@height
+      img = Image.new(self.width, self.height, canvas: canvas)
       Input._init(canvas)
       return img
     end
@@ -113,9 +130,23 @@ module DXOpal
     def self.fps=(w); @@fps = w; end
     def self.real_fps; @@real_fps; end
     def self.width; @@width; end
-    def self.width=(w); @@width = w; end
+    # Set window width and resize the canvas
+    # Set `nil` to maximize canvas
+    def self.width=(w)
+      canvas = `document.getElementById("dxopal-canvas")`
+      @@width = w || `window.innerWidth`
+      `canvas.width = #{@@width}`
+      `canvas.style.width = #{@@width}`
+    end
     def self.height; @@height; end
-    def self.height=(h); @@height = h; end
+    # Set window height and resize the canvas
+    # Set `nil` to maximize canvas
+    def self.height=(h)
+      canvas = `document.getElementById("dxopal-canvas")`
+      @@height = h || `window.innerHeight`
+      `canvas.height = #{@@height}`
+      `canvas.style.height = #{@@height}`
+    end
     @@bgcolor = Constants::Colors::C_BLACK
     def self.bgcolor; @@bgcolor; end
     def self.bgcolor=(col); @@bgcolor = col; end