dxopal 1.4.4 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a6ef6fe288e522e4f0df079be3dad7ee5dc5d0b8a4656662b94508b204607f6
-  data.tar.gz: d06509faff1ce26df9f80cffd5be3b129ed95acfc05d75819c3213db099fd6fb
+  metadata.gz: 8dea35c3a32a9e469abca36a05910228b212f6a5e0af6e83cbb3c7bef4383255
+  data.tar.gz: a146eefca6e94323325273fcb95fa3d07a5786970ec3eee58c46bb09198306c2
 SHA512:
-  metadata.gz: 5de705fc957b99a0c4b307cbdf613be44787e76e4dccf6d799ef7e281fd770e5894349221c7d266ac85c4e28fe30db74facdf28a32776387e02ae0182ccc188b
-  data.tar.gz: 9dfda6d0500db95b733d1274d1806615e1ed54c0f11f63bc052de93bd7e043232976a00891879c516f062f66bbe6debda397bac8781ce9a46b6b0c6911385c22
+  metadata.gz: 6093f9bc46f30044c3606944eeff8651b8e022cc974f5f83e86259b5cce5f70b151da25b4f987b9c98b6c736ad35e48a74e2967eca6add98751e954c319c4245
+  data.tar.gz: e03608f42538fe1ae30ef4a45abef66aab261bcaf08df3d8041b473b930c1c6e4c3987629ab73f8e5df3e027e117bae4fadfe61b763627a041c76ee1cd29bd37

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v1.5.0 (2020-01-31)
+
+- feat: Better error msg (#29)
+- feat: Support Window.fps= (#30)
+- feat: dxopal server prints access log (#31)
+- feat: Default index.html avoids main.rb cache (#32)
+- feat: Add Image.hsl2rgb (#34)
+
 ## v1.4.4 (2020-01-21)
 
 - feat: Multi-touch (#26)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dxopal (1.4.4)
+    dxopal (1.5.0)
       rack (~> 2.0)
       thor (~> 0.20)
 

data/build/dxopal.js

@@ -22774,7 +22774,7 @@ Opal.modules["dxopal/input"] = function(Opal) {
   }
   var self = Opal.top, $nesting = [], nil = Opal.nil, $breaker = Opal.breaker, $slice = Opal.slice, $module = Opal.module, $truthy = Opal.truthy, $send = Opal.send, $hash2 = Opal.hash2, $klass = Opal.klass;
 
-  Opal.add_stubs(['$_init_mouse_events', '$_init_touch_events', '$keyevent_target', '$keyevent_target=', '$-', '$+', '$_update_touch_info', '$key_down?', '$_pressing_keys', '$_move', '$[]', '$new', '$[]=', '$push', '$_released', '$delete_if', '$released?', '$<', '$_released_at', '$attr_reader', '$!', '$released_at', '$id', '$x', '$y', '$inspect', '$data', '$values']);
+  Opal.add_stubs(['$_init_mouse_events', '$_init_touch_events', '$keyevent_target', '$keyevent_target=', '$-', '$+', '$_update_touch_info', '$key_down?', '$_pressing_keys', '$raise', '$_move', '$[]', '$new', '$[]=', '$push', '$_released', '$delete_if', '$released?', '$<', '$_released_at', '$attr_reader', '$!', '$released_at', '$id', '$x', '$y', '$inspect', '$data', '$values']);
   return (function($base, $parent_nesting) {
     var $DXOpal, self = $DXOpal = $module($base, 'DXOpal');
 
@@ -22963,17 +22963,32 @@ Opal.modules["dxopal/input"] = function(Opal) {
       Opal.defs(self, '$mouse_down?', TMP_Input_mouse_down$q_14 = function(mouse_code) {
         var $a, self = this;
 
-        return (($a = $Input.$$cvars['@@pressing_mouse_buttons']) == null ? nil : $a)[mouse_code] > 0
+        
+        if ($truthy(mouse_code)) {
+          } else {
+          self.$raise("missing argument of `mouse_down?'")
+        };
+        return (($a = $Input.$$cvars['@@pressing_mouse_buttons']) == null ? nil : $a)[mouse_code] > 0;
       }, TMP_Input_mouse_down$q_14.$$arity = 1);
       Opal.defs(self, '$mouse_push?', TMP_Input_mouse_push$q_15 = function(mouse_code) {
         var $a, self = this;
 
-        return (($a = $Input.$$cvars['@@pressing_mouse_buttons']) == null ? nil : $a)[mouse_code] == -((($a = $Input.$$cvars['@@tick']) == null ? nil : $a)-1)
+        
+        if ($truthy(mouse_code)) {
+          } else {
+          self.$raise("missing argument of `mouse_push?'")
+        };
+        return (($a = $Input.$$cvars['@@pressing_mouse_buttons']) == null ? nil : $a)[mouse_code] == -((($a = $Input.$$cvars['@@tick']) == null ? nil : $a)-1);
       }, TMP_Input_mouse_push$q_15.$$arity = 1);
       Opal.defs(self, '$mouse_release?', TMP_Input_mouse_release$q_16 = function(mouse_code) {
         var $a, self = this;
 
-        return (($a = $Input.$$cvars['@@pressing_mouse_buttons']) == null ? nil : $a)[mouse_code] == -((($a = $Input.$$cvars['@@tick']) == null ? nil : $a)-1)
+        
+        if ($truthy(mouse_code)) {
+          } else {
+          self.$raise("missing argument of `mouse_release?'")
+        };
+        return (($a = $Input.$$cvars['@@pressing_mouse_buttons']) == null ? nil : $a)[mouse_code] == -((($a = $Input.$$cvars['@@tick']) == null ? nil : $a)-1);
       }, TMP_Input_mouse_release$q_16.$$arity = 1);
       Opal.defs(self, '$_init_touch_events', TMP_Input__init_touch_events_17 = function $$_init_touch_events() {
         var $a, $b, $c, self = this, new_touch = nil, $writer = nil;
@@ -23422,21 +23437,24 @@ if (klass_name == null) klass_name = nil;if (items == null) items = nil;
 
 /* Generated by Opal 0.11.4 */
 Opal.modules["dxopal/image"] = function(Opal) {
-  function $rb_divide(lhs, rhs) {
-    return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs / rhs : lhs['$/'](rhs);
+  function $rb_lt(lhs, rhs) {
+    return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs < rhs : lhs['$<'](rhs);
+  }
+  function $rb_times(lhs, rhs) {
+    return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs * rhs : lhs['$*'](rhs);
   }
   function $rb_plus(lhs, rhs) {
     return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs + rhs : lhs['$+'](rhs);
   }
+  function $rb_divide(lhs, rhs) {
+    return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs / rhs : lhs['$/'](rhs);
+  }
   function $rb_minus(lhs, rhs) {
     return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs - rhs : lhs['$-'](rhs);
   }
-  function $rb_times(lhs, rhs) {
-    return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs * rhs : lhs['$*'](rhs);
-  }
-  var self = Opal.top, $nesting = [], nil = Opal.nil, $breaker = Opal.breaker, $slice = Opal.slice, $module = Opal.module, $klass = Opal.klass, $truthy = Opal.truthy, $hash2 = Opal.hash2, $send = Opal.send;
+  var self = Opal.top, $nesting = [], nil = Opal.nil, $breaker = Opal.breaker, $slice = Opal.slice, $module = Opal.module, $klass = Opal.klass, $truthy = Opal.truthy, $range = Opal.range, $hash2 = Opal.hash2, $send = Opal.send;
 
-  Opal.add_stubs(['$require', '$add_class', '$new', '$attr_accessor', '$loaded', '$load', '$call', '$_resize', '$box_fill', '$attr_reader', '$canvas', '$draw_ex', '$[]', '$/', '$width', '$height', '$+', '$_spec_str', '$_rgba', '$_rgba_ary', '$-', '$fill', '$_image_data', '$_put_image_data', '$flat_map', '$map', '$slice', '$*', '$length', '$===', '$raise', '$inspect', '$join']);
+  Opal.add_stubs(['$require', '$add_class', '$<', '$*', '$+', '$/', '$-', '$===', '$new', '$attr_accessor', '$loaded', '$load', '$call', '$_resize', '$box_fill', '$attr_reader', '$canvas', '$draw_ex', '$[]', '$width', '$height', '$_spec_str', '$_rgba', '$_rgba_ary', '$fill', '$_image_data', '$_put_image_data', '$flat_map', '$map', '$slice', '$length', '$raise', '$inspect', '$join']);
   
   self.$require("dxopal/remote_resource");
   return (function($base, $parent_nesting) {
@@ -23448,12 +23466,33 @@ Opal.modules["dxopal/image"] = function(Opal) {
       function $Image(){};
       var self = $Image = $klass($base, $super, 'Image', $Image);
 
-      var def = self.$$proto, $nesting = [self].concat($parent_nesting), TMP_Image__load_1, TMP_Image_loaded$q_2, TMP_Image_load_3, TMP_Image_load_4, TMP_Image_onload_5, TMP_Image_initialize_6, TMP_Image__resize_7, TMP_Image_draw_8, TMP_Image_draw_scale_9, TMP_Image_draw_rot_10, TMP_Image_draw_ex_11, TMP_Image_draw_font_12, TMP_Image_$$_13, TMP_Image_$$$eq_14, TMP_Image_compare_15, TMP_Image_line_16, TMP_Image_box_17, TMP_Image_box_fill_18, TMP_Image_circle_19, TMP_Image_circle_fill_20, TMP_Image_triangle_21, TMP_Image_triangle_fill_22, TMP_Image_fill_23, TMP_Image_clear_24, TMP_Image_slice_25, TMP_Image_slice_tiles_28, TMP_Image_set_color_key_29, TMP_Image__draw_raw_image_30, TMP_Image__image_data_31, TMP_Image__put_image_data_32, TMP_Image__rgb_33, TMP_Image__rgba_34, TMP_Image__rgba_ary_35;
+      var def = self.$$proto, $nesting = [self].concat($parent_nesting), TMP_Image_hsl2rgb_1, TMP_Image__load_2, TMP_Image_loaded$q_3, TMP_Image_load_4, TMP_Image_load_5, TMP_Image_onload_6, TMP_Image_initialize_7, TMP_Image__resize_8, TMP_Image_draw_9, TMP_Image_draw_scale_10, TMP_Image_draw_rot_11, TMP_Image_draw_ex_12, TMP_Image_draw_font_13, TMP_Image_$$_14, TMP_Image_$$$eq_15, TMP_Image_compare_16, TMP_Image_line_17, TMP_Image_box_18, TMP_Image_box_fill_19, TMP_Image_circle_20, TMP_Image_circle_fill_21, TMP_Image_triangle_22, TMP_Image_triangle_fill_23, TMP_Image_fill_24, TMP_Image_clear_25, TMP_Image_slice_26, TMP_Image_slice_tiles_29, TMP_Image_set_color_key_30, TMP_Image__draw_raw_image_31, TMP_Image__image_data_32, TMP_Image__put_image_data_33, TMP_Image__rgb_34, TMP_Image__rgba_35, TMP_Image__rgba_ary_36;
 
       def.promise = def.canvas = def.width = def.height = def.ctx = nil;
       
       Opal.const_get_relative($nesting, 'RemoteResource').$add_class(Opal.const_get_relative($nesting, 'Image'));
-      Opal.defs(self, '$_load', TMP_Image__load_1 = function $$_load(path_or_url) {
+      Opal.defs(self, '$hsl2rgb', TMP_Image_hsl2rgb_1 = function $$hsl2rgb(h, s, l) {
+        var self = this, max = nil, min = nil, $case = nil;
+
+        
+        if ($truthy($rb_lt(l, 50))) {
+          
+          max = $rb_times(2.55, $rb_plus(l, $rb_times(l, $rb_divide(s, 100.0))));
+          min = $rb_times(2.55, $rb_minus(l, $rb_times(l, $rb_divide(s, 100.0))));
+          } else {
+          
+          max = $rb_times(2.55, $rb_plus(l, $rb_times($rb_minus(100, l), $rb_divide(s, 100.0))));
+          min = $rb_times(2.55, $rb_minus(l, $rb_times($rb_minus(100, l), $rb_divide(s, 100.0))));
+        };
+        return (function() {$case = h;
+        if ($range(0, 60, true)['$===']($case)) {return [max, $rb_plus($rb_times($rb_divide(h, 60.0), $rb_minus(max, min)), min), min]}
+        else if ($range(60, 120, true)['$===']($case)) {return [$rb_plus($rb_times($rb_divide($rb_minus(120, h), 60.0), $rb_minus(max, min)), min), max, min]}
+        else if ($range(120, 180, true)['$===']($case)) {return [min, max, $rb_plus($rb_times($rb_divide($rb_minus(h, 120), 60.0), $rb_minus(max, min)), min)]}
+        else if ($range(180, 240, true)['$===']($case)) {return [min, $rb_plus($rb_times($rb_divide($rb_minus(240, h), 60.0), $rb_minus(max, min)), min), max]}
+        else if ($range(240, 300, true)['$===']($case)) {return [$rb_plus($rb_times($rb_divide($rb_minus(h, 240), 60.0), $rb_minus(max, min)), min), min, max]}
+        else {return [max, min, $rb_plus($rb_times($rb_divide($rb_minus(360, h), 60.0), $rb_minus(max, min)), min)]}})();
+      }, TMP_Image_hsl2rgb_1.$$arity = 3);
+      Opal.defs(self, '$_load', TMP_Image__load_2 = function $$_load(path_or_url) {
         var self = this, raw_img = nil, img_promise = nil, img = nil;
 
         
@@ -23474,21 +23513,21 @@ Opal.modules["dxopal/image"] = function(Opal) {
         });
       ;
         return [img, img_promise];
-      }, TMP_Image__load_1.$$arity = 1);
+      }, TMP_Image__load_2.$$arity = 1);
       self.$attr_accessor("promise", "loaded");
       
-      Opal.defn(self, '$loaded?', TMP_Image_loaded$q_2 = function() {
+      Opal.defn(self, '$loaded?', TMP_Image_loaded$q_3 = function() {
         var self = this;
 
         return self.$loaded()
-      }, TMP_Image_loaded$q_2.$$arity = 0);
-      Opal.defs(self, '$load', TMP_Image_load_3 = function $$load(path_or_url) {
+      }, TMP_Image_loaded$q_3.$$arity = 0);
+      Opal.defs(self, '$load', TMP_Image_load_4 = function $$load(path_or_url) {
         var self = this;
 
         return self.$new(1, 1).$load(path_or_url)
-      }, TMP_Image_load_3.$$arity = 1);
+      }, TMP_Image_load_4.$$arity = 1);
       
-      Opal.defn(self, '$load', TMP_Image_load_4 = function $$load(path_or_url) {
+      Opal.defn(self, '$load', TMP_Image_load_5 = function $$load(path_or_url) {
         var self = this, raw_img = nil;
 
         
@@ -23505,20 +23544,20 @@ Opal.modules["dxopal/image"] = function(Opal) {
         });
       ;
         return self;
-      }, TMP_Image_load_4.$$arity = 1);
+      }, TMP_Image_load_5.$$arity = 1);
       
-      Opal.defn(self, '$onload', TMP_Image_onload_5 = function $$onload() {
-        var self = this, $iter = TMP_Image_onload_5.$$p, block = $iter || nil;
+      Opal.defn(self, '$onload', TMP_Image_onload_6 = function $$onload() {
+        var self = this, $iter = TMP_Image_onload_6.$$p, block = $iter || nil;
 
-        if ($iter) TMP_Image_onload_5.$$p = null;
+        if ($iter) TMP_Image_onload_6.$$p = null;
         
         self.promise.then(function(response){
           block.$call()
         });
       
-      }, TMP_Image_onload_5.$$arity = 0);
+      }, TMP_Image_onload_6.$$arity = 0);
       
-      Opal.defn(self, '$initialize', TMP_Image_initialize_6 = function $$initialize(width, height, $color, $kwargs) {
+      Opal.defn(self, '$initialize', TMP_Image_initialize_7 = function $$initialize(width, height, $color, $kwargs) {
         var $a, self = this, $post_args, canvas, color;
 
         $post_args = Opal.slice.call(arguments, 2, arguments.length);
@@ -23546,10 +23585,10 @@ Opal.modules["dxopal/image"] = function(Opal) {
         self.ctx = self.canvas.getContext('2d');
         self.$_resize(self.width, self.height);
         return self.$box_fill(0, 0, self.width, self.height, color);
-      }, TMP_Image_initialize_6.$$arity = -3);
+      }, TMP_Image_initialize_7.$$arity = -3);
       self.$attr_reader("ctx", "canvas", "width", "height");
       
-      Opal.defn(self, '$_resize', TMP_Image__resize_7 = function $$_resize(w, h) {
+      Opal.defn(self, '$_resize', TMP_Image__resize_8 = function $$_resize(w, h) {
         var $a, self = this;
 
         
@@ -23558,9 +23597,9 @@ Opal.modules["dxopal/image"] = function(Opal) {
         self.canvas.width = w;
         self.canvas.height = h;
       ;
-      }, TMP_Image__resize_7.$$arity = 2);
+      }, TMP_Image__resize_8.$$arity = 2);
       
-      Opal.defn(self, '$draw', TMP_Image_draw_8 = function $$draw(x, y, image) {
+      Opal.defn(self, '$draw', TMP_Image_draw_9 = function $$draw(x, y, image) {
         var self = this;
 
         
@@ -23568,9 +23607,9 @@ Opal.modules["dxopal/image"] = function(Opal) {
         self.ctx.drawImage(image.$canvas(), x, y);
       ;
         return self;
-      }, TMP_Image_draw_8.$$arity = 3);
+      }, TMP_Image_draw_9.$$arity = 3);
       
-      Opal.defn(self, '$draw_scale', TMP_Image_draw_scale_9 = function $$draw_scale(x, y, image, scale_x, scale_y, center_x, center_y) {
+      Opal.defn(self, '$draw_scale', TMP_Image_draw_scale_10 = function $$draw_scale(x, y, image, scale_x, scale_y, center_x, center_y) {
         var self = this;
 
         if (center_x == null) {
@@ -23580,9 +23619,9 @@ Opal.modules["dxopal/image"] = function(Opal) {
           center_y = nil;
         }
         return self.$draw_ex(x, y, image, $hash2(["scale_x", "scale_y", "center_x", "center_y"], {"scale_x": scale_x, "scale_y": scale_y, "center_x": center_x, "center_y": center_y}))
-      }, TMP_Image_draw_scale_9.$$arity = -6);
+      }, TMP_Image_draw_scale_10.$$arity = -6);
       
-      Opal.defn(self, '$draw_rot', TMP_Image_draw_rot_10 = function $$draw_rot(x, y, image, angle, center_x, center_y) {
+      Opal.defn(self, '$draw_rot', TMP_Image_draw_rot_11 = function $$draw_rot(x, y, image, angle, center_x, center_y) {
         var self = this;
 
         if (center_x == null) {
@@ -23592,10 +23631,10 @@ Opal.modules["dxopal/image"] = function(Opal) {
           center_y = nil;
         }
         return self.$draw_ex(x, y, image, $hash2(["angle", "center_x", "center_y"], {"angle": angle, "center_x": center_x, "center_y": center_y}))
-      }, TMP_Image_draw_rot_10.$$arity = -5);
+      }, TMP_Image_draw_rot_11.$$arity = -5);
       Opal.const_set($nesting[0], 'BLEND_TYPES', $hash2(["alpha", "add"], {"alpha": "source-over", "add": "lighter"}));
       
-      Opal.defn(self, '$draw_ex', TMP_Image_draw_ex_11 = function $$draw_ex(x, y, image, options) {
+      Opal.defn(self, '$draw_ex', TMP_Image_draw_ex_12 = function $$draw_ex(x, y, image, options) {
         var $a, self = this, scale_x = nil, scale_y = nil, center_x = nil, center_y = nil, alpha = nil, blend = nil, angle = nil, cx = nil, cy = nil;
 
         if (options == null) {
@@ -23623,9 +23662,9 @@ Opal.modules["dxopal/image"] = function(Opal) {
         self.ctx.setTransform(1, 0, 0, 1, 0, 0); // reset
       ;
         return self;
-      }, TMP_Image_draw_ex_11.$$arity = -4);
+      }, TMP_Image_draw_ex_12.$$arity = -4);
       
-      Opal.defn(self, '$draw_font', TMP_Image_draw_font_12 = function $$draw_font(x, y, string, font, color) {
+      Opal.defn(self, '$draw_font', TMP_Image_draw_font_13 = function $$draw_font(x, y, string, font, color) {
         var self = this, ctx = nil;
 
         if (color == null) {
@@ -23640,9 +23679,9 @@ Opal.modules["dxopal/image"] = function(Opal) {
         ctx.fillText(string, x, y);
       ;
         return self;
-      }, TMP_Image_draw_font_12.$$arity = -5);
+      }, TMP_Image_draw_font_13.$$arity = -5);
       
-      Opal.defn(self, '$[]', TMP_Image_$$_13 = function(x, y) {
+      Opal.defn(self, '$[]', TMP_Image_$$_14 = function(x, y) {
         var self = this, ctx = nil, ret = nil;
 
         
@@ -23654,15 +23693,15 @@ Opal.modules["dxopal/image"] = function(Opal) {
         ret = [rgba[3], rgba[0], rgba[1], rgba[2]];
       ;
         return ret;
-      }, TMP_Image_$$_13.$$arity = 2);
+      }, TMP_Image_$$_14.$$arity = 2);
       
-      Opal.defn(self, '$[]=', TMP_Image_$$$eq_14 = function(x, y, color) {
+      Opal.defn(self, '$[]=', TMP_Image_$$$eq_15 = function(x, y, color) {
         var self = this;
 
         return self.$box_fill(x, y, x, y, color)
-      }, TMP_Image_$$$eq_14.$$arity = 3);
+      }, TMP_Image_$$$eq_15.$$arity = 3);
       
-      Opal.defn(self, '$compare', TMP_Image_compare_15 = function $$compare(x, y, color) {
+      Opal.defn(self, '$compare', TMP_Image_compare_16 = function $$compare(x, y, color) {
         var self = this, ctx = nil, rgba1 = nil, rgba2 = nil, ret = nil;
 
         
@@ -23680,9 +23719,9 @@ Opal.modules["dxopal/image"] = function(Opal) {
               rgba1[3] == rgba2[3]
       ;
         return ret;
-      }, TMP_Image_compare_15.$$arity = 3);
+      }, TMP_Image_compare_16.$$arity = 3);
       
-      Opal.defn(self, '$line', TMP_Image_line_16 = function $$line(x1, y1, x2, y2, color) {
+      Opal.defn(self, '$line', TMP_Image_line_17 = function $$line(x1, y1, x2, y2, color) {
         var self = this, ctx = nil;
 
         
@@ -23695,9 +23734,9 @@ Opal.modules["dxopal/image"] = function(Opal) {
         ctx.stroke(); 
       ;
         return self;
-      }, TMP_Image_line_16.$$arity = 5);
+      }, TMP_Image_line_17.$$arity = 5);
       
-      Opal.defn(self, '$box', TMP_Image_box_17 = function $$box(x1, y1, x2, y2, color) {
+      Opal.defn(self, '$box', TMP_Image_box_18 = function $$box(x1, y1, x2, y2, color) {
         var self = this, ctx = nil;
 
         
@@ -23709,9 +23748,9 @@ Opal.modules["dxopal/image"] = function(Opal) {
         ctx.stroke(); 
       ;
         return self;
-      }, TMP_Image_box_17.$$arity = 5);
+      }, TMP_Image_box_18.$$arity = 5);
       
-      Opal.defn(self, '$box_fill', TMP_Image_box_fill_18 = function $$box_fill(x1, y1, x2, y2, color) {
+      Opal.defn(self, '$box_fill', TMP_Image_box_fill_19 = function $$box_fill(x1, y1, x2, y2, color) {
         var self = this, ctx = nil;
 
         
@@ -23722,9 +23761,9 @@ Opal.modules["dxopal/image"] = function(Opal) {
         ctx.fillRect(x1, y1, x2-x1, y2-y1); 
       ;
         return self;
-      }, TMP_Image_box_fill_18.$$arity = 5);
+      }, TMP_Image_box_fill_19.$$arity = 5);
       
-      Opal.defn(self, '$circle', TMP_Image_circle_19 = function $$circle(x, y, r, color) {
+      Opal.defn(self, '$circle', TMP_Image_circle_20 = function $$circle(x, y, r, color) {
         var self = this, ctx = nil;
 
         
@@ -23736,9 +23775,9 @@ Opal.modules["dxopal/image"] = function(Opal) {
         ctx.stroke();
       ;
         return self;
-      }, TMP_Image_circle_19.$$arity = 4);
+      }, TMP_Image_circle_20.$$arity = 4);
       
-      Opal.defn(self, '$circle_fill', TMP_Image_circle_fill_20 = function $$circle_fill(x, y, r, color) {
+      Opal.defn(self, '$circle_fill', TMP_Image_circle_fill_21 = function $$circle_fill(x, y, r, color) {
         var self = this, ctx = nil;
 
         
@@ -23750,9 +23789,9 @@ Opal.modules["dxopal/image"] = function(Opal) {
         ctx.fill();
       ;
         return self;
-      }, TMP_Image_circle_fill_20.$$arity = 4);
+      }, TMP_Image_circle_fill_21.$$arity = 4);
       
-      Opal.defn(self, '$triangle', TMP_Image_triangle_21 = function $$triangle(x1, y1, x2, y2, x3, y3, color) {
+      Opal.defn(self, '$triangle', TMP_Image_triangle_22 = function $$triangle(x1, y1, x2, y2, x3, y3, color) {
         var self = this, ctx = nil;
 
         
@@ -23767,9 +23806,9 @@ Opal.modules["dxopal/image"] = function(Opal) {
         ctx.stroke();
       ;
         return self;
-      }, TMP_Image_triangle_21.$$arity = 7);
+      }, TMP_Image_triangle_22.$$arity = 7);
       
-      Opal.defn(self, '$triangle_fill', TMP_Image_triangle_fill_22 = function $$triangle_fill(x1, y1, x2, y2, x3, y3, color) {
+      Opal.defn(self, '$triangle_fill', TMP_Image_triangle_fill_23 = function $$triangle_fill(x1, y1, x2, y2, x3, y3, color) {
         var self = this, ctx = nil;
 
         
@@ -23783,21 +23822,21 @@ Opal.modules["dxopal/image"] = function(Opal) {
         ctx.fill();
       ;
         return self;
-      }, TMP_Image_triangle_fill_22.$$arity = 7);
+      }, TMP_Image_triangle_fill_23.$$arity = 7);
       
-      Opal.defn(self, '$fill', TMP_Image_fill_23 = function $$fill(color) {
+      Opal.defn(self, '$fill', TMP_Image_fill_24 = function $$fill(color) {
         var self = this;
 
         return self.$box_fill(0, 0, $rb_minus(self.width, 1), $rb_minus(self.height, 1), color)
-      }, TMP_Image_fill_23.$$arity = 1);
+      }, TMP_Image_fill_24.$$arity = 1);
       
-      Opal.defn(self, '$clear', TMP_Image_clear_24 = function $$clear() {
+      Opal.defn(self, '$clear', TMP_Image_clear_25 = function $$clear() {
         var self = this;
 
         return self.$fill([0, 0, 0, 0])
-      }, TMP_Image_clear_24.$$arity = 0);
+      }, TMP_Image_clear_25.$$arity = 0);
       
-      Opal.defn(self, '$slice', TMP_Image_slice_25 = function $$slice(x, y, width, height) {
+      Opal.defn(self, '$slice', TMP_Image_slice_26 = function $$slice(x, y, width, height) {
         var self = this, newimg = nil, data = nil;
 
         
@@ -23805,22 +23844,22 @@ Opal.modules["dxopal/image"] = function(Opal) {
         data = self.$_image_data(x, y, width, height);
         newimg.$_put_image_data(data);
         return newimg;
-      }, TMP_Image_slice_25.$$arity = 4);
+      }, TMP_Image_slice_26.$$arity = 4);
       
-      Opal.defn(self, '$slice_tiles', TMP_Image_slice_tiles_28 = function $$slice_tiles(xcount, ycount) {
-        var TMP_26, self = this, tile_w = nil, tile_h = nil;
+      Opal.defn(self, '$slice_tiles', TMP_Image_slice_tiles_29 = function $$slice_tiles(xcount, ycount) {
+        var TMP_27, self = this, tile_w = nil, tile_h = nil;
 
         
         tile_w = $rb_divide(self.width, xcount);
         tile_h = $rb_divide(self.height, ycount);
-        return $send(Opal.Range.$new(0,ycount, true), 'flat_map', [], (TMP_26 = function(v){var self = TMP_26.$$s || this, TMP_27;
+        return $send(Opal.Range.$new(0,ycount, true), 'flat_map', [], (TMP_27 = function(v){var self = TMP_27.$$s || this, TMP_28;
 if (v == null) v = nil;
-        return $send(Opal.Range.$new(0,xcount, true), 'map', [], (TMP_27 = function(u){var self = TMP_27.$$s || this;
+        return $send(Opal.Range.$new(0,xcount, true), 'map', [], (TMP_28 = function(u){var self = TMP_28.$$s || this;
 if (u == null) u = nil;
-          return self.$slice($rb_times(tile_w, u), $rb_times(tile_h, v), tile_w, tile_h)}, TMP_27.$$s = self, TMP_27.$$arity = 1, TMP_27))}, TMP_26.$$s = self, TMP_26.$$arity = 1, TMP_26));
-      }, TMP_Image_slice_tiles_28.$$arity = 2);
+          return self.$slice($rb_times(tile_w, u), $rb_times(tile_h, v), tile_w, tile_h)}, TMP_28.$$s = self, TMP_28.$$arity = 1, TMP_28))}, TMP_27.$$s = self, TMP_27.$$arity = 1, TMP_27));
+      }, TMP_Image_slice_tiles_29.$$arity = 2);
       
-      Opal.defn(self, '$set_color_key', TMP_Image_set_color_key_29 = function $$set_color_key(color) {
+      Opal.defn(self, '$set_color_key', TMP_Image_set_color_key_30 = function $$set_color_key(color) {
         var $a, $b, self = this, r = nil, g = nil, b = nil, _ = nil, data = nil;
 
         
@@ -23836,17 +23875,17 @@ if (u == null) u = nil;
         }
       ;
         return self.$_put_image_data(data);
-      }, TMP_Image_set_color_key_29.$$arity = 1);
+      }, TMP_Image_set_color_key_30.$$arity = 1);
       
-      Opal.defn(self, '$_draw_raw_image', TMP_Image__draw_raw_image_30 = function $$_draw_raw_image(x, y, raw_img) {
+      Opal.defn(self, '$_draw_raw_image', TMP_Image__draw_raw_image_31 = function $$_draw_raw_image(x, y, raw_img) {
         var self = this;
 
         
         self.ctx.drawImage(raw_img, x, y);
       
-      }, TMP_Image__draw_raw_image_30.$$arity = 3);
+      }, TMP_Image__draw_raw_image_31.$$arity = 3);
       
-      Opal.defn(self, '$_image_data', TMP_Image__image_data_31 = function $$_image_data(x, y, w, h) {
+      Opal.defn(self, '$_image_data', TMP_Image__image_data_32 = function $$_image_data(x, y, w, h) {
         var self = this;
 
         if (x == null) {
@@ -23862,9 +23901,9 @@ if (u == null) u = nil;
           h = self.height;
         }
         return self.ctx.getImageData(x, y, w, h)
-      }, TMP_Image__image_data_31.$$arity = -1);
+      }, TMP_Image__image_data_32.$$arity = -1);
       
-      Opal.defn(self, '$_put_image_data', TMP_Image__put_image_data_32 = function $$_put_image_data(image_data, x, y) {
+      Opal.defn(self, '$_put_image_data', TMP_Image__put_image_data_33 = function $$_put_image_data(image_data, x, y) {
         var self = this;
 
         if (x == null) {
@@ -23874,9 +23913,9 @@ if (u == null) u = nil;
           y = 0;
         }
         return self.ctx.putImageData(image_data, x, y)
-      }, TMP_Image__put_image_data_32.$$arity = -2);
+      }, TMP_Image__put_image_data_33.$$arity = -2);
       
-      Opal.defn(self, '$_rgb', TMP_Image__rgb_33 = function $$_rgb(color) {
+      Opal.defn(self, '$_rgb', TMP_Image__rgb_34 = function $$_rgb(color) {
         var self = this, $case = nil, rgb = nil;
 
         
@@ -23885,21 +23924,21 @@ if (u == null) u = nil;
         else if ((3)['$===']($case)) {rgb = color}
         else {self.$raise("" + "invalid color: " + (color.$inspect()))};
         return $rb_plus($rb_plus("rgb(", rgb.$join(", ")), ")");
-      }, TMP_Image__rgb_33.$$arity = 1);
+      }, TMP_Image__rgb_34.$$arity = 1);
       
-      Opal.defn(self, '$_rgba', TMP_Image__rgba_34 = function $$_rgba(color) {
+      Opal.defn(self, '$_rgba', TMP_Image__rgba_35 = function $$_rgba(color) {
         var self = this;
 
         return $rb_plus($rb_plus("rgba(", self.$_rgba_ary(color).$join(", ")), ")")
-      }, TMP_Image__rgba_34.$$arity = 1);
-      return (Opal.defn(self, '$_rgba_ary', TMP_Image__rgba_ary_35 = function $$_rgba_ary(color) {
+      }, TMP_Image__rgba_35.$$arity = 1);
+      return (Opal.defn(self, '$_rgba_ary', TMP_Image__rgba_ary_36 = function $$_rgba_ary(color) {
         var self = this, $case = nil;
 
         return (function() {$case = color.$length();
         if ((4)['$===']($case)) {return $rb_plus(color['$[]'](1, 3), [$rb_divide(color['$[]'](0), 255.0)])}
         else if ((3)['$===']($case)) {return $rb_plus(color, [1.0])}
         else {return self.$raise("" + "invalid color: " + (color.$inspect()))}})()
-      }, TMP_Image__rgba_ary_35.$$arity = 1), nil) && '_rgba_ary';
+      }, TMP_Image__rgba_ary_36.$$arity = 1), nil) && '_rgba_ary';
     })($nesting[0], Opal.const_get_relative($nesting, 'RemoteResource'), $nesting)
   })($nesting[0], $nesting);
 };
@@ -25187,8 +25226,8 @@ if (sprite == null) sprite = nil;
 
 /* Generated by Opal 0.11.4 */
 Opal.modules["dxopal/window"] = function(Opal) {
-  function $rb_ge(lhs, rhs) {
-    return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs >= rhs : lhs['$>='](rhs);
+  function $rb_divide(lhs, rhs) {
+    return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs / rhs : lhs['$/'](rhs);
   }
   function $rb_minus(lhs, rhs) {
     return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs - rhs : lhs['$-'](rhs);
@@ -25196,9 +25235,12 @@ Opal.modules["dxopal/window"] = function(Opal) {
   function $rb_plus(lhs, rhs) {
     return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs + rhs : lhs['$+'](rhs);
   }
+  function $rb_ge(lhs, rhs) {
+    return (typeof(lhs) === 'number' && typeof(rhs) === 'number') ? lhs >= rhs : lhs['$>='](rhs);
+  }
   var self = Opal.top, $nesting = [], nil = Opal.nil, $breaker = Opal.breaker, $slice = Opal.slice, $module = Opal.module, $send = Opal.send, $truthy = Opal.truthy, $hash2 = Opal.hash2;
 
-  Opal.add_stubs(['$require', '$now', '$_load_resources', '$dump_error', '$to_proc', '$!', '$_loop', '$clear', '$draw_pause_screen', '$nil?', '$raise', '$loop', '$draw_box_fill', '$width', '$height', '$draw_font', '$default', '$_init', '$>=', '$-', '$+', '$matter_enabled?', '$matter_tick', '$_on_tick', '$box_fill', '$sort', '$==', '$[]', '$<=>', '$each', '$===', '$draw', '$drop', '$draw_rot', '$draw_scale', '$draw_ex', '$[]=', '$line', '$box', '$circle', '$circle_fill', '$triangle', '$triangle_fill', '$width=', '$height=', '$new', '$enqueue_draw', '$push', '$length']);
+  Opal.add_stubs(['$require', '$now', '$_load_resources', '$dump_error', '$to_proc', '$!', '$_loop', '$clear', '$draw_pause_screen', '$nil?', '$raise', '$loop', '$draw_box_fill', '$width', '$height', '$draw_font', '$default', '$_init', '$/', '$-', '$+', '$>=', '$matter_enabled?', '$matter_tick', '$_on_tick', '$box_fill', '$sort', '$==', '$[]', '$<=>', '$each', '$===', '$draw', '$drop', '$draw_rot', '$draw_scale', '$draw_ex', '$[]=', '$line', '$box', '$circle', '$circle_fill', '$triangle', '$triangle_fill', '$width=', '$height=', '$new', '$enqueue_draw', '$push', '$length']);
   
   self.$require("dxopal/constants/colors");
   return (function($base, $parent_nesting) {
@@ -25209,10 +25251,12 @@ Opal.modules["dxopal/window"] = function(Opal) {
     (function($base, $parent_nesting) {
       var $Window, self = $Window = $module($base, 'Window');
 
-      var def = self.$$proto, $nesting = [self].concat($parent_nesting), TMP_Window_load_resources_1, TMP_Window_loop_3, TMP_Window_pause_4, TMP_Window_paused$q_5, TMP_Window_resume_6, TMP_Window_draw_pause_screen_7, TMP_Window__loop_11, TMP_Window__init_12, TMP_Window__img_13, TMP_Window_fps_14, TMP_Window_fps$eq_15, TMP_Window_real_fps_16, TMP_Window_width_17, TMP_Window_width$eq_18, TMP_Window_height_19, TMP_Window_height$eq_20, TMP_Window_bgcolor_21, TMP_Window_bgcolor$eq_22, TMP_Window_draw_23, TMP_Window_draw_scale_24, TMP_Window_draw_rot_25, TMP_Window_draw_ex_26, TMP_Window_draw_font_27, TMP_Window_draw_pixel_28, TMP_Window_draw_line_29, TMP_Window_draw_box_30, TMP_Window_draw_box_fill_31, TMP_Window_draw_circle_32, TMP_Window_draw_circle_fill_33, TMP_Window_draw_triangle_34, TMP_Window_draw_triangle_fill_35, TMP_Window_enqueue_draw_36;
+      var def = self.$$proto, $nesting = [self].concat($parent_nesting), TMP_Window_load_resources_1, TMP_Window_loop_3, TMP_Window_pause_5, TMP_Window_paused$q_6, TMP_Window_resume_7, TMP_Window_draw_pause_screen_8, TMP_Window__loop_13, TMP_Window__init_14, TMP_Window__img_15, TMP_Window_fps_16, TMP_Window_fps$eq_17, TMP_Window_real_fps_18, TMP_Window_width_19, TMP_Window_width$eq_20, TMP_Window_height_21, TMP_Window_height$eq_22, TMP_Window_bgcolor_23, TMP_Window_bgcolor$eq_24, TMP_Window_draw_25, TMP_Window_draw_scale_26, TMP_Window_draw_rot_27, TMP_Window_draw_ex_28, TMP_Window_draw_font_29, TMP_Window_draw_pixel_30, TMP_Window_draw_line_31, TMP_Window_draw_box_32, TMP_Window_draw_box_fill_33, TMP_Window_draw_circle_34, TMP_Window_draw_circle_fill_35, TMP_Window_draw_triangle_36, TMP_Window_draw_triangle_fill_37, TMP_Window_enqueue_draw_38;
 
       
       (Opal.class_variable_set($Window, '@@fps', 60));
+      (Opal.class_variable_set($Window, '@@fps_ts', nil));
+      (Opal.class_variable_set($Window, '@@fps_ct', 0));
       (Opal.class_variable_set($Window, '@@real_fps', 0));
       (Opal.class_variable_set($Window, '@@real_fps_ct', 1));
       (Opal.class_variable_set($Window, '@@real_fps_t', Opal.const_get_relative($nesting, 'Time').$now()));
@@ -25229,32 +25273,32 @@ Opal.modules["dxopal/window"] = function(Opal) {
         return $send(Opal.const_get_relative($nesting, 'DXOpal'), 'dump_error', [], block.$to_proc())}, TMP_2.$$s = self, TMP_2.$$arity = 0, TMP_2))
       }, TMP_Window_load_resources_1.$$arity = 0);
       Opal.defs(self, '$loop', TMP_Window_loop_3 = function $$loop() {
-        var $a, self = this, $iter = TMP_Window_loop_3.$$p, block = $iter || nil, already_running = nil;
+        var $a, TMP_4, self = this, $iter = TMP_Window_loop_3.$$p, block = $iter || nil, already_running = nil;
 
         if ($iter) TMP_Window_loop_3.$$p = null;
         
         already_running = (($a = $Window.$$cvars['@@block']) == null ? nil : $a)['$!']()['$!']();
         (Opal.class_variable_set($Window, '@@block', block));
         if ($truthy(already_running)) {
-          return nil
-          } else {
-          return self.$_loop()
-        };
+          return nil};
+        return (window).requestAnimationFrame((TMP_4 = function(time){var self = TMP_4.$$s || this;
+if (time == null) time = nil;
+        return self.$_loop(time)}, TMP_4.$$s = self, TMP_4.$$arity = 1, TMP_4));
       }, TMP_Window_loop_3.$$arity = 0);
-      Opal.defs(self, '$pause', TMP_Window_pause_4 = function $$pause() {
+      Opal.defs(self, '$pause', TMP_Window_pause_5 = function $$pause() {
         var $a, self = this;
 
         
         (Opal.class_variable_set($Window, '@@paused', true));
         (($a = $Window.$$cvars['@@draw_queue']) == null ? nil : $a).$clear();
         return self.$draw_pause_screen();
-      }, TMP_Window_pause_4.$$arity = 0);
-      Opal.defs(self, '$paused?', TMP_Window_paused$q_5 = function() {
+      }, TMP_Window_pause_5.$$arity = 0);
+      Opal.defs(self, '$paused?', TMP_Window_paused$q_6 = function() {
         var $a, self = this;
 
         return (($a = $Window.$$cvars['@@paused']) == null ? nil : $a)
-      }, TMP_Window_paused$q_5.$$arity = 0);
-      Opal.defs(self, '$resume', TMP_Window_resume_6 = function $$resume() {
+      }, TMP_Window_paused$q_6.$$arity = 0);
+      Opal.defs(self, '$resume', TMP_Window_resume_7 = function $$resume() {
         var $a, self = this;
 
         
@@ -25262,33 +25306,44 @@ Opal.modules["dxopal/window"] = function(Opal) {
           self.$raise("Window.resume is called before Window.loop")};
         (Opal.class_variable_set($Window, '@@paused', false));
         return $send(Opal.const_get_relative($nesting, 'Window'), 'loop', [], (($a = $Window.$$cvars['@@block']) == null ? nil : $a).$to_proc());
-      }, TMP_Window_resume_6.$$arity = 0);
-      Opal.defs(self, '$draw_pause_screen', TMP_Window_draw_pause_screen_7 = function $$draw_pause_screen() {
+      }, TMP_Window_resume_7.$$arity = 0);
+      Opal.defs(self, '$draw_pause_screen', TMP_Window_draw_pause_screen_8 = function $$draw_pause_screen() {
         var self = this;
 
         
         Opal.const_get_relative($nesting, 'Window').$draw_box_fill(0, 0, Opal.const_get_relative($nesting, 'Window').$width(), Opal.const_get_relative($nesting, 'Window').$height(), Opal.const_get_relative($nesting, 'C_BLACK'));
         return Opal.const_get_relative($nesting, 'Window').$draw_font(0, 0, "...PAUSE...", Opal.const_get_relative($nesting, 'Font').$default(), $hash2(["color"], {"color": Opal.const_get_relative($nesting, 'C_WHITE')}));
-      }, TMP_Window_draw_pause_screen_7.$$arity = 0);
-      Opal.defs(self, '$_loop', TMP_Window__loop_11 = function $$_loop(time) {
-        var $a, $b, TMP_8, TMP_9, TMP_10, self = this, t0 = nil, sorted = nil;
+      }, TMP_Window_draw_pause_screen_8.$$arity = 0);
+      Opal.defs(self, '$_loop', TMP_Window__loop_13 = function $$_loop(timestamp) {
+        var $a, $b, TMP_9, TMP_10, TMP_11, TMP_12, self = this, frame_msec = nil, passed_msec = nil, t = nil, sorted = nil;
 
-        if (time == null) {
-          time = 0;
-        }
         
         (Opal.class_variable_set($Window, '@@img', ($truthy($a = (($b = $Window.$$cvars['@@img']) == null ? nil : $b)) ? $a : self.$_init())));
-        t0 = Opal.const_get_relative($nesting, 'Time').$now();
-        if ($truthy($rb_ge($rb_minus(t0, (($a = $Window.$$cvars['@@real_fps_t']) == null ? nil : $a)), 1.0))) {
+        frame_msec = $rb_divide(1000.0, (($a = $Window.$$cvars['@@fps']) == null ? nil : $a));
+        (Opal.class_variable_set($Window, '@@fps_ts', ($truthy($a = (($b = $Window.$$cvars['@@fps_ts']) == null ? nil : $b)) ? $a : timestamp)));
+        passed_msec = $rb_minus(timestamp, (($a = $Window.$$cvars['@@fps_ts']) == null ? nil : $a));
+        (Opal.class_variable_set($Window, '@@fps_ts', timestamp));
+        (Opal.class_variable_set($Window, '@@fps_ct', $rb_plus((($a = $Window.$$cvars['@@fps_ct']) == null ? nil : $a), passed_msec)));
+        if ($truthy($rb_ge((($a = $Window.$$cvars['@@fps_ct']) == null ? nil : $a), frame_msec))) {
+          (Opal.class_variable_set($Window, '@@fps_ct', $rb_minus((($a = $Window.$$cvars['@@fps_ct']) == null ? nil : $a), frame_msec)))
+          } else {
+          
+          (window).requestAnimationFrame((TMP_9 = function(time){var self = TMP_9.$$s || this;
+if (time == null) time = nil;
+          return self.$_loop(time)}, TMP_9.$$s = self, TMP_9.$$arity = 1, TMP_9));
+          return nil;
+        };
+        t = Opal.const_get_relative($nesting, 'Time').$now();
+        if ($truthy($rb_ge($rb_minus(t, (($a = $Window.$$cvars['@@real_fps_t']) == null ? nil : $a)), 1.0))) {
           
           (Opal.class_variable_set($Window, '@@real_fps', (($a = $Window.$$cvars['@@real_fps_ct']) == null ? nil : $a)));
           (Opal.class_variable_set($Window, '@@real_fps_ct', 1));
-          (Opal.class_variable_set($Window, '@@real_fps_t', t0));
+          (Opal.class_variable_set($Window, '@@real_fps_t', t));
           } else {
           (Opal.class_variable_set($Window, '@@real_fps_ct', $rb_plus((($a = $Window.$$cvars['@@real_fps_ct']) == null ? nil : $a), 1)))
         };
         if ($truthy(Opal.const_get_relative($nesting, 'Sprite')['$matter_enabled?']())) {
-          Opal.const_get_relative($nesting, 'Sprite').$matter_tick(time)};
+          Opal.const_get_relative($nesting, 'Sprite').$matter_tick(timestamp)};
         Opal.const_get_relative($nesting, 'Input').$_on_tick();
         (Opal.class_variable_set($Window, '@@draw_queue', []));
         if ($truthy((($a = $Window.$$cvars['@@paused']) == null ? nil : $a))) {
@@ -25297,14 +25352,14 @@ Opal.modules["dxopal/window"] = function(Opal) {
           $send(Opal.const_get_relative($nesting, 'DXOpal'), 'dump_error', [], (($a = $Window.$$cvars['@@block']) == null ? nil : $a).$to_proc())
         };
         (($a = $Window.$$cvars['@@img']) == null ? nil : $a).$box_fill(0, 0, (($a = $Window.$$cvars['@@width']) == null ? nil : $a), (($a = $Window.$$cvars['@@height']) == null ? nil : $a), (($a = $Window.$$cvars['@@bgcolor']) == null ? nil : $a));
-        sorted = $send((($a = $Window.$$cvars['@@draw_queue']) == null ? nil : $a), 'sort', [], (TMP_8 = function(a, b){var self = TMP_8.$$s || this;
+        sorted = $send((($a = $Window.$$cvars['@@draw_queue']) == null ? nil : $a), 'sort', [], (TMP_10 = function(a, b){var self = TMP_10.$$s || this;
 if (a == null) a = nil;if (b == null) b = nil;
         if (a['$[]'](0)['$=='](b['$[]'](0))) {
             return a['$[]'](1)['$<=>'](b['$[]'](1))
             } else {
             return a['$[]'](0)['$<=>'](b['$[]'](0))
-          }}, TMP_8.$$s = self, TMP_8.$$arity = 2, TMP_8));
-        $send(sorted, 'each', [], (TMP_9 = function(item){var self = TMP_9.$$s || this, $c, $case = nil, $writer = nil;
+          }}, TMP_10.$$s = self, TMP_10.$$arity = 2, TMP_10));
+        $send(sorted, 'each', [], (TMP_11 = function(item){var self = TMP_11.$$s || this, $c, $case = nil, $writer = nil;
 if (item == null) item = nil;
         return (function() {$case = item['$[]'](2);
           if ("image"['$===']($case)) {return $send((($c = $Window.$$cvars['@@img']) == null ? nil : $c), 'draw', Opal.to_a(item.$drop(3)))}
@@ -25323,12 +25378,12 @@ if (item == null) item = nil;
           else if ("circle_fill"['$===']($case)) {return $send((($c = $Window.$$cvars['@@img']) == null ? nil : $c), 'circle_fill', Opal.to_a(item.$drop(3)))}
           else if ("triangle"['$===']($case)) {return $send((($c = $Window.$$cvars['@@img']) == null ? nil : $c), 'triangle', Opal.to_a(item.$drop(3)))}
           else if ("triangle_fill"['$===']($case)) {return $send((($c = $Window.$$cvars['@@img']) == null ? nil : $c), 'triangle_fill', Opal.to_a(item.$drop(3)))}
-          else { return nil }})()}, TMP_9.$$s = self, TMP_9.$$arity = 1, TMP_9));
-        return (window).requestAnimationFrame((TMP_10 = function(time){var self = TMP_10.$$s || this;
+          else { return nil }})()}, TMP_11.$$s = self, TMP_11.$$arity = 1, TMP_11));
+        return (window).requestAnimationFrame((TMP_12 = function(time){var self = TMP_12.$$s || this;
 if (time == null) time = nil;
-        return self.$_loop(time)}, TMP_10.$$s = self, TMP_10.$$arity = 1, TMP_10));
-      }, TMP_Window__loop_11.$$arity = -1);
-      Opal.defs(self, '$_init', TMP_Window__init_12 = function $$_init() {
+        return self.$_loop(time)}, TMP_12.$$s = self, TMP_12.$$arity = 1, TMP_12));
+      }, TMP_Window__loop_13.$$arity = 1);
+      Opal.defs(self, '$_init', TMP_Window__init_14 = function $$_init() {
         var $a, self = this, canvas = nil, $writer = nil, img = nil;
 
         
@@ -25344,33 +25399,33 @@ if (time == null) time = nil;
         img = Opal.const_get_relative($nesting, 'Image').$new(self.$width(), self.$height(), $hash2(["canvas"], {"canvas": canvas}));
         Opal.const_get_relative($nesting, 'Input').$_init(canvas);
         return img;
-      }, TMP_Window__init_12.$$arity = 0);
-      Opal.defs(self, '$_img', TMP_Window__img_13 = function $$_img() {
+      }, TMP_Window__init_14.$$arity = 0);
+      Opal.defs(self, '$_img', TMP_Window__img_15 = function $$_img() {
         var $a, self = this;
 
         return (($a = $Window.$$cvars['@@img']) == null ? nil : $a)
-      }, TMP_Window__img_13.$$arity = 0);
-      Opal.defs(self, '$fps', TMP_Window_fps_14 = function $$fps() {
+      }, TMP_Window__img_15.$$arity = 0);
+      Opal.defs(self, '$fps', TMP_Window_fps_16 = function $$fps() {
         var $a, self = this;
 
         return (($a = $Window.$$cvars['@@fps']) == null ? nil : $a)
-      }, TMP_Window_fps_14.$$arity = 0);
-      Opal.defs(self, '$fps=', TMP_Window_fps$eq_15 = function(w) {
+      }, TMP_Window_fps_16.$$arity = 0);
+      Opal.defs(self, '$fps=', TMP_Window_fps$eq_17 = function(w) {
         var self = this;
 
         return (Opal.class_variable_set($Window, '@@fps', w))
-      }, TMP_Window_fps$eq_15.$$arity = 1);
-      Opal.defs(self, '$real_fps', TMP_Window_real_fps_16 = function $$real_fps() {
+      }, TMP_Window_fps$eq_17.$$arity = 1);
+      Opal.defs(self, '$real_fps', TMP_Window_real_fps_18 = function $$real_fps() {
         var $a, self = this;
 
         return (($a = $Window.$$cvars['@@real_fps']) == null ? nil : $a)
-      }, TMP_Window_real_fps_16.$$arity = 0);
-      Opal.defs(self, '$width', TMP_Window_width_17 = function $$width() {
+      }, TMP_Window_real_fps_18.$$arity = 0);
+      Opal.defs(self, '$width', TMP_Window_width_19 = function $$width() {
         var $a, self = this;
 
         return (($a = $Window.$$cvars['@@width']) == null ? nil : $a)
-      }, TMP_Window_width_17.$$arity = 0);
-      Opal.defs(self, '$width=', TMP_Window_width$eq_18 = function(w) {
+      }, TMP_Window_width_19.$$arity = 0);
+      Opal.defs(self, '$width=', TMP_Window_width$eq_20 = function(w) {
         var $a, self = this, canvas = nil;
 
         
@@ -25378,13 +25433,13 @@ if (time == null) time = nil;
         (Opal.class_variable_set($Window, '@@width', ($truthy($a = w) ? $a : window.innerWidth)));
         canvas.width = (($a = $Window.$$cvars['@@width']) == null ? nil : $a);
         return canvas.style.width = (($a = $Window.$$cvars['@@width']) == null ? nil : $a);
-      }, TMP_Window_width$eq_18.$$arity = 1);
-      Opal.defs(self, '$height', TMP_Window_height_19 = function $$height() {
+      }, TMP_Window_width$eq_20.$$arity = 1);
+      Opal.defs(self, '$height', TMP_Window_height_21 = function $$height() {
         var $a, self = this;
 
         return (($a = $Window.$$cvars['@@height']) == null ? nil : $a)
-      }, TMP_Window_height_19.$$arity = 0);
-      Opal.defs(self, '$height=', TMP_Window_height$eq_20 = function(h) {
+      }, TMP_Window_height_21.$$arity = 0);
+      Opal.defs(self, '$height=', TMP_Window_height$eq_22 = function(h) {
         var $a, self = this, canvas = nil;
 
         
@@ -25392,27 +25447,27 @@ if (time == null) time = nil;
         (Opal.class_variable_set($Window, '@@height', ($truthy($a = h) ? $a : window.innerHeight)));
         canvas.height = (($a = $Window.$$cvars['@@height']) == null ? nil : $a);
         return canvas.style.height = (($a = $Window.$$cvars['@@height']) == null ? nil : $a);
-      }, TMP_Window_height$eq_20.$$arity = 1);
+      }, TMP_Window_height$eq_22.$$arity = 1);
       (Opal.class_variable_set($Window, '@@bgcolor', Opal.const_get_qualified(Opal.const_get_qualified(Opal.const_get_relative($nesting, 'Constants'), 'Colors'), 'C_BLACK')));
-      Opal.defs(self, '$bgcolor', TMP_Window_bgcolor_21 = function $$bgcolor() {
+      Opal.defs(self, '$bgcolor', TMP_Window_bgcolor_23 = function $$bgcolor() {
         var $a, self = this;
 
         return (($a = $Window.$$cvars['@@bgcolor']) == null ? nil : $a)
-      }, TMP_Window_bgcolor_21.$$arity = 0);
-      Opal.defs(self, '$bgcolor=', TMP_Window_bgcolor$eq_22 = function(col) {
+      }, TMP_Window_bgcolor_23.$$arity = 0);
+      Opal.defs(self, '$bgcolor=', TMP_Window_bgcolor$eq_24 = function(col) {
         var self = this;
 
         return (Opal.class_variable_set($Window, '@@bgcolor', col))
-      }, TMP_Window_bgcolor$eq_22.$$arity = 1);
-      Opal.defs(self, '$draw', TMP_Window_draw_23 = function $$draw(x, y, image, z) {
+      }, TMP_Window_bgcolor$eq_24.$$arity = 1);
+      Opal.defs(self, '$draw', TMP_Window_draw_25 = function $$draw(x, y, image, z) {
         var self = this;
 
         if (z == null) {
           z = 0;
         }
         return self.$enqueue_draw(z, "image", x, y, image)
-      }, TMP_Window_draw_23.$$arity = -4);
-      Opal.defs(self, '$draw_scale', TMP_Window_draw_scale_24 = function $$draw_scale(x, y, image, scale_x, scale_y, center_x, center_y, z) {
+      }, TMP_Window_draw_25.$$arity = -4);
+      Opal.defs(self, '$draw_scale', TMP_Window_draw_scale_26 = function $$draw_scale(x, y, image, scale_x, scale_y, center_x, center_y, z) {
         var self = this;
 
         if (center_x == null) {
@@ -25425,8 +25480,8 @@ if (time == null) time = nil;
           z = 0;
         }
         return self.$enqueue_draw(z, "image_scale", x, y, image, scale_x, scale_y, center_x, center_y)
-      }, TMP_Window_draw_scale_24.$$arity = -6);
-      Opal.defs(self, '$draw_rot', TMP_Window_draw_rot_25 = function $$draw_rot(x, y, image, angle, center_x, center_y, z) {
+      }, TMP_Window_draw_scale_26.$$arity = -6);
+      Opal.defs(self, '$draw_rot', TMP_Window_draw_rot_27 = function $$draw_rot(x, y, image, angle, center_x, center_y, z) {
         var self = this;
 
         if (center_x == null) {
@@ -25439,16 +25494,16 @@ if (time == null) time = nil;
           z = 0;
         }
         return self.$enqueue_draw(z, "image_rot", x, y, image, angle, center_x, center_y)
-      }, TMP_Window_draw_rot_25.$$arity = -5);
-      Opal.defs(self, '$draw_ex', TMP_Window_draw_ex_26 = function $$draw_ex(x, y, image, options) {
+      }, TMP_Window_draw_rot_27.$$arity = -5);
+      Opal.defs(self, '$draw_ex', TMP_Window_draw_ex_28 = function $$draw_ex(x, y, image, options) {
         var $a, self = this;
 
         if (options == null) {
           options = $hash2([], {});
         }
         return self.$enqueue_draw(($truthy($a = options['$[]']("z")) ? $a : 0), "draw_ex", x, y, image, options)
-      }, TMP_Window_draw_ex_26.$$arity = -4);
-      Opal.defs(self, '$draw_font', TMP_Window_draw_font_27 = function $$draw_font(x, y, string, font, option) {
+      }, TMP_Window_draw_ex_28.$$arity = -4);
+      Opal.defs(self, '$draw_font', TMP_Window_draw_font_29 = function $$draw_font(x, y, string, font, option) {
         var $a, self = this, z = nil, color = nil;
 
         if (option == null) {
@@ -25458,72 +25513,72 @@ if (time == null) time = nil;
         z = ($truthy($a = option['$[]']("z")) ? $a : 0);
         color = ($truthy($a = option['$[]']("color")) ? $a : [255, 255, 255]);
         return self.$enqueue_draw(z, "font", x, y, string, font, color);
-      }, TMP_Window_draw_font_27.$$arity = -5);
-      Opal.defs(self, '$draw_pixel', TMP_Window_draw_pixel_28 = function $$draw_pixel(x, y, color, z) {
+      }, TMP_Window_draw_font_29.$$arity = -5);
+      Opal.defs(self, '$draw_pixel', TMP_Window_draw_pixel_30 = function $$draw_pixel(x, y, color, z) {
         var self = this;
 
         if (z == null) {
           z = 0;
         }
         return self.$enqueue_draw(z, "pixel", x, y, color)
-      }, TMP_Window_draw_pixel_28.$$arity = -4);
-      Opal.defs(self, '$draw_line', TMP_Window_draw_line_29 = function $$draw_line(x1, y1, x2, y2, color, z) {
+      }, TMP_Window_draw_pixel_30.$$arity = -4);
+      Opal.defs(self, '$draw_line', TMP_Window_draw_line_31 = function $$draw_line(x1, y1, x2, y2, color, z) {
         var self = this;
 
         if (z == null) {
           z = 0;
         }
         return self.$enqueue_draw(z, "line", x1, y1, x2, y2, color)
-      }, TMP_Window_draw_line_29.$$arity = -6);
-      Opal.defs(self, '$draw_box', TMP_Window_draw_box_30 = function $$draw_box(x1, y1, x2, y2, color, z) {
+      }, TMP_Window_draw_line_31.$$arity = -6);
+      Opal.defs(self, '$draw_box', TMP_Window_draw_box_32 = function $$draw_box(x1, y1, x2, y2, color, z) {
         var self = this;
 
         if (z == null) {
           z = 0;
         }
         return self.$enqueue_draw(z, "box", x1, y1, x2, y2, color)
-      }, TMP_Window_draw_box_30.$$arity = -6);
-      Opal.defs(self, '$draw_box_fill', TMP_Window_draw_box_fill_31 = function $$draw_box_fill(x1, y1, x2, y2, color, z) {
+      }, TMP_Window_draw_box_32.$$arity = -6);
+      Opal.defs(self, '$draw_box_fill', TMP_Window_draw_box_fill_33 = function $$draw_box_fill(x1, y1, x2, y2, color, z) {
         var self = this;
 
         if (z == null) {
           z = 0;
         }
         return self.$enqueue_draw(z, "box_fill", x1, y1, x2, y2, color)
-      }, TMP_Window_draw_box_fill_31.$$arity = -6);
-      Opal.defs(self, '$draw_circle', TMP_Window_draw_circle_32 = function $$draw_circle(x, y, r, color, z) {
+      }, TMP_Window_draw_box_fill_33.$$arity = -6);
+      Opal.defs(self, '$draw_circle', TMP_Window_draw_circle_34 = function $$draw_circle(x, y, r, color, z) {
         var self = this;
 
         if (z == null) {
           z = 0;
         }
         return self.$enqueue_draw(z, "circle", x, y, r, color)
-      }, TMP_Window_draw_circle_32.$$arity = -5);
-      Opal.defs(self, '$draw_circle_fill', TMP_Window_draw_circle_fill_33 = function $$draw_circle_fill(x, y, r, color, z) {
+      }, TMP_Window_draw_circle_34.$$arity = -5);
+      Opal.defs(self, '$draw_circle_fill', TMP_Window_draw_circle_fill_35 = function $$draw_circle_fill(x, y, r, color, z) {
         var self = this;
 
         if (z == null) {
           z = 0;
         }
         return self.$enqueue_draw(z, "circle_fill", x, y, r, color)
-      }, TMP_Window_draw_circle_fill_33.$$arity = -5);
-      Opal.defs(self, '$draw_triangle', TMP_Window_draw_triangle_34 = function $$draw_triangle(x1, y1, x2, y2, x3, y3, color, z) {
+      }, TMP_Window_draw_circle_fill_35.$$arity = -5);
+      Opal.defs(self, '$draw_triangle', TMP_Window_draw_triangle_36 = function $$draw_triangle(x1, y1, x2, y2, x3, y3, color, z) {
         var self = this;
 
         if (z == null) {
           z = 0;
         }
         return self.$enqueue_draw(z, "triangle", x1, y1, x2, y2, x3, y3, color)
-      }, TMP_Window_draw_triangle_34.$$arity = -8);
-      Opal.defs(self, '$draw_triangle_fill', TMP_Window_draw_triangle_fill_35 = function $$draw_triangle_fill(x1, y1, x2, y2, x3, y3, color, z) {
+      }, TMP_Window_draw_triangle_36.$$arity = -8);
+      Opal.defs(self, '$draw_triangle_fill', TMP_Window_draw_triangle_fill_37 = function $$draw_triangle_fill(x1, y1, x2, y2, x3, y3, color, z) {
         var self = this;
 
         if (z == null) {
           z = 0;
         }
         return self.$enqueue_draw(z, "triangle_fill", x1, y1, x2, y2, x3, y3, color)
-      }, TMP_Window_draw_triangle_fill_35.$$arity = -8);
-      Opal.defs(self, '$enqueue_draw', TMP_Window_enqueue_draw_36 = function $$enqueue_draw(z, $a_rest) {
+      }, TMP_Window_draw_triangle_fill_37.$$arity = -8);
+      Opal.defs(self, '$enqueue_draw', TMP_Window_enqueue_draw_38 = function $$enqueue_draw(z, $a_rest) {
         var $b, self = this, args;
 
         var $args_len = arguments.length, $rest_len = $args_len - 1;
@@ -25533,7 +25588,7 @@ if (time == null) time = nil;
           args[$arg_idx - 1] = arguments[$arg_idx];
         }
         return (($b = $Window.$$cvars['@@draw_queue']) == null ? nil : $b).$push([z, (($b = $Window.$$cvars['@@draw_queue']) == null ? nil : $b).$length()].concat(Opal.to_a(args)))
-      }, TMP_Window_enqueue_draw_36.$$arity = -2);
+      }, TMP_Window_enqueue_draw_38.$$arity = -2);
     })($nesting[0], $nesting)
   })($nesting[0], $nesting);
 };
@@ -25547,7 +25602,7 @@ Opal.modules["dxopal/version"] = function(Opal) {
 
     var def = self.$$proto, $nesting = [self].concat($parent_nesting);
 
-    Opal.const_set($nesting[0], 'VERSION', "1.4.4")
+    Opal.const_set($nesting[0], 'VERSION', "1.5.0")
   })($nesting[0], $nesting)
 };