Merge branch 'develop'

README.md

@@ -22,11 +22,12 @@ Or point to the ZIP file of a  [specific release](https://github.com/Insality/dr
 
 For **Druid** to work requires next input bindings:
 
--   Mouse trigger - `Button 1` -> `touch` _For basic input components_
--   Key trigger - `Backspace` -> `key_backspace`  _For back_handler component, input component_
--   Key trigger - `Back` -> `key_back`  _For back_handler component, Android back button, input component_
+- Mouse trigger - `Button 1` -> `touch` _For basic input components_
+- Key trigger - `Backspace` -> `key_backspace`  _For back_handler component, input component_
+- Key trigger - `Back` -> `key_back`  _For back_handler component, Android back button, input component_
 - Key trigger - `Enter` -> `key_enter` _For input component, optional_
 - Key trigger - `Esc` -> `key_esc` _For input component, optional_
+- Touch triggers - `Touch multi` -> `multitouch` _For scroll component_
 
 ![](media/input_binding_2.png)
 ![](media/input_binding_1.png)
@@ -61,7 +62,7 @@ druid.set_default_style(your_style)
 
 -- Call this function on language changing in the game,
 -- to retranslate all lang_text components:
-druid.on_languge_change()
+druid.on_language_change()
 
 -- Call this function on layout changing in the game,
 -- to reapply layouts
@@ -109,6 +110,8 @@ druid.on_window_callback(event)
 
 - **[Swipe](https://github.com/Insality/druid/blob/master/docs_md/01-components.md#swipe)** - System Druid component, handle swipe gestures on node
 
+- **[Drag](https://github.com/Insality/druid/blob/master/docs_md/01-components.md#drag)** - System Druid component, handle drag input on node 
+
 Full info see on _[components.md](https://github.com/Insality/druid/blob/master/docs_md/01-components.md)_
 
 
@@ -183,7 +186,7 @@ end
 
 - *on_input* used for almost all basic druid components
 - *update* used for progress bar, scroll and timer base components
-- *on_message* used for specific druid events, like language change or layout change (TODO: in future)
+- *on_message* used for specific druid events, like language change or layout change
 - *final* used for custom components, what have to do several action before destroy
 
 Recommended is fully integrate al druid lifecycles functions
@@ -223,13 +226,11 @@ _Will fill later_
 
 ## License
 
-Original created by [AGulev](https://github.com/AGulev)
-
-Developed and supporting by [Insality](https://github.com/Insality)
-
-Assets from [Kenney](http://www.kenney.nl/)
+- Original created by [AGulev](https://github.com/AGulev)
+- Developed and supporting by [Insality](https://github.com/Insality)
+- Assets from [Kenney](http://www.kenney.nl/)
 
-MIT License
+**MIT** License
 
 
 ## Issues and suggestions

docs/druid/archive/archive_files.json

@@ -1 +1 @@
-{"content":[{"name":"game.projectc","size":2725,"pieces":[{"name":"game.projectc0","offset":0}]},{"name":"game.arci","size":4928,"pieces":[{"name":"game.arci0","offset":0}]},{"name":"game.arcd","size":276790,"pieces":[{"name":"game.arcd0","offset":0}]},{"name":"game.dmanifest","size":10701,"pieces":[{"name":"game.dmanifest0","offset":0}]},{"name":"game.public.der","size":162,"pieces":[{"name":"game.public.der0","offset":0}]}]}
+{"content":[{"name":"game.projectc","size":2838,"pieces":[{"name":"game.projectc0","offset":0}]},{"name":"game.arci","size":5008,"pieces":[{"name":"game.arci0","offset":0}]},{"name":"game.arcd","size":279217,"pieces":[{"name":"game.arcd0","offset":0}]},{"name":"game.dmanifest","size":10936,"pieces":[{"name":"game.dmanifest0","offset":0}]},{"name":"game.public.der","size":162,"pieces":[{"name":"game.public.der0","offset":0}]}]}

docs/druid/archive/game.projectc0

@@ -1,6 +1,6 @@
 [project]
 title = druid
-version = 0.2.0
+version = 0.4.0
 write_log = 0
 compress_archive = 1
 
@@ -14,7 +14,12 @@ update_frequency = 0
 vsync = 1
 display_profiles = /builtins/render/default.display_profilesc
 dynamic_orientation = 0
-clear_color = 0
+
+[render]
+clear_color_red = 0
+clear_color_green = 0
+clear_color_blue = 0
+clear_color_alpha = 0
 
 [physics]
 type = 2D
@@ -154,6 +159,9 @@ settings = /liveupdate.settings
 max_count = 16
 max_tile_count = 2048
 
+[engine]
+run_while_iconified = 0
+
 [druid]
 no_auto_input = 0
 

docs/druid/dmloader.js

@@ -23,6 +23,7 @@ var Combine = {
     _onAllTargetsBuilt:[],      // signature: void
     _onDownloadProgress: [],    // signature: downloaded, total
 
+    _currentDownloadBytes: 0,
     _totalDownloadBytes: 0,
 
     _retry_time: 0,             // pause before retry file loading after error
@@ -31,7 +32,7 @@ var Combine = {
 
     _archiveLocationFilter: function(path) { return "split" + path; },
 
-    can_not_download_file: function(file) { 
+    can_not_download_file: function(file) {
         if (typeof Combine._can_not_download_file_callback === 'function') {
             Combine._can_not_download_file_callback(file);
         }
@@ -91,13 +92,15 @@ var Combine = {
         this._onAllTargetsBuilt = [];
         this._onDownloadProgress = [];
 
+        this._currentDownloadBytes = 0;
         this._totalDownloadBytes = 0;
     },
 
     onReceiveDescription: function(xhr) {
         var json = JSON.parse(xhr.responseText);
         this._targets = json.content;
         this._totalDownloadBytes = 0;
+        this._currentDownloadBytes = 0;
 
         var targets = this._targets;
         for(var i=0; i<targets.length; ++i) {
@@ -129,58 +132,58 @@ var Combine = {
             throw "Request out of order";
         }
 
+        var item = target.pieces[index];
         target.lastRequestedPiece = index;
-        target.progress = {};
 
-        var item = target.pieces[index];
+        var total = 0;
+        var downloaded = 0;
         var xhr = new XMLHttpRequest();
-        xhr.open('GET', this._archiveLocationFilter('/' + item.name), true);
+        var url = this._archiveLocationFilter('/' + item.name);
+        xhr.open('GET', url, true);
         xhr.responseType = 'arraybuffer';
+        // called periodically with information about the transaction
         xhr.onprogress = function(evt) {
-           target.progress[item.name] = {total: 0, downloaded: 0};
             if (evt.total && evt.lengthComputable) {
-                target.progress[item.name].total = evt.total;
+                total = evt.total;
             }
             if (evt.loaded && evt.lengthComputable) {
-                target.progress[item.name].downloaded = evt.loaded;
+                var delta = evt.loaded - downloaded;
+                downloaded = evt.loaded;
+                Combine._currentDownloadBytes += delta;
                 Combine.updateProgress(target);
             }
         };
+        // called when the transaction completes successfully
         xhr.onload = function(evt) {
             item.data = new Uint8Array(xhr.response);
             item.dataLength = item.data.length;
-            target.progress[item.name].total = item.dataLength;
-            target.progress[item.name].downloaded = item.dataLength;
+            total = item.dataLength;
+            downloaded = item.dataLength;
             Combine.copyData(target, item);
             Combine.onPieceLoaded(target, item);
             Combine.updateProgress(target);
             item.data = undefined;
         };
+        // called when the transaction fails
         xhr.onerror = function(evt) {
-            if (target.progress[item.name]) {
-                target.progress[item.name].downloaded = 0;
-                Combine.updateProgress(target);
-            }
+            downloaded = 0;
+            Combine.updateProgress(target);
             attempt_count += 1;
             if (attempt_count < Combine._max_retry_count) {
                 console.warn("Can't download file '" + item.name + "' . Next try in " + Combine._retry_time + " sec.");
                 setTimeout(function() {
                     Combine.requestPiece(target, index, attempt_count);
                 }, Combine._retry_time * 1000);
             } else {
-                    Combine.can_not_download_file(item.name);
+                Combine.can_not_download_file(item.name);
             }
         };
         xhr.send(null);
     },
 
     updateProgress: function(target) {
-        var total_downloaded = 0;
-        for (var p in target.progress) {
-            total_downloaded += target.progress[p].downloaded;
-        }
         for(i = 0; i<this._onDownloadProgress.length; ++i) {
-            this._onDownloadProgress[i](total_downloaded, this._totalDownloadBytes);
+            this._onDownloadProgress[i](this._currentDownloadBytes, this._totalDownloadBytes);
         }
     },
 
@@ -477,7 +480,7 @@ var Module = {
             persistent_storage: true,
             custom_heap_size: undefined,
             disable_context_menu: true,
-            retry_time: 1, 
+            retry_time: 1,
             retry_count: 10,
             can_not_download_file_callback: undefined,
         };
@@ -697,5 +700,3 @@ window.onerror = function(err, url, line, column, errObj) {
         if (text) Module.printErr('[post-exception status] ' + text);
     };
 };
-
-

docs/druid/index.html

@@ -7,7 +7,7 @@
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<!-- The above 4 meta tags *must* come first in the head; any other head content must come *after* these tags -->
 
-	<title>druid 0.2.0</title>
+	<title>druid 0.4.0</title>
 	<style type='text/css'>
 	/* Disable user selection to avoid strange bug in Chrome on Windows:
 	* Selecting a text outside the canvas, then clicking+draging would
@@ -111,8 +111,7 @@
 	.canvas-app-canvas {
 		background-repeat:no-repeat;
 		background-position: center center;
-		background-size: 70%;
-		background-image: url("data:image/svg+xml,%3C%3Fxml version='1.0' encoding='utf-8'%3F%3E%3Csvg version='1.1' id='Layer_1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' width='300px' height='64px' viewBox='-2467.5 2469 300 64' style='enable-background:new -2467.5 2469 300 64;' xml:space='preserve'%3E%3Cstyle type='text/css'%3E .st0%7Bfill:%2315244A;%7D .st1%7Bfill:url(%23SVGID_1_);%7D .st2%7Bfill:url(%23SVGID_2_);%7D%0A%3C/style%3E%3Ctitle%3Edefold-logo-html5-splash%3C/title%3E%3Cpolygon class='st0' points='-2177,2482.9 -2175.5,2482.9 -2175.5,2486.7 -2174.4,2486.7 -2174.4,2482.9 -2173.2,2482.9 -2173.2,2481.9 -2177,2481.9 '/%3E%3Cpolygon class='st0' points='-2169.8,2484.1 -2171,2482.1 -2172.1,2482.1 -2172.1,2486.7 -2171,2486.7 -2171,2483.5 -2169.7,2485.6 -2169.7,2485.6 -2168.5,2483.5 -2168.5,2486.7 -2167.5,2486.7 -2167.5,2482.1 -2168.6,2482.1 '/%3E%3Cpath class='st0' d='M-2376,2482h-13.8v38h13.6c6.6,0,12.2-1.9,16.1-5.5c3.8-3.5,5.8-8.5,5.7-13.7v-0.1 C-2354.5,2489.3-2362.9,2482-2376,2482z M-2364,2501.2c0,6.7-4.5,10.9-11.8,10.9h-4.7v-22h4.7c7.3,0,11.8,4.2,11.8,10.9 L-2364,2501.2z'/%3E%3Cpolygon class='st0' points='-2340.9,2505 -2325.1,2505 -2325.1,2497.4 -2340.9,2497.4 -2340.9,2489.6 -2322.4,2489.6 -2322.4,2481.9 -2350.1,2481.9 -2350.1,2520 -2322.2,2520 -2322.2,2512.4 -2340.9,2512.4 '/%3E%3Cpolygon class='st0' points='-2317.1,2481.9 -2317.1,2520 -2307.9,2520 -2307.9,2505.9 -2293,2505.9 -2293,2498.4 -2307.9,2498.4 -2307.9,2489.9 -2289.6,2489.9 -2289.6,2481.9 '/%3E%3Cpolygon class='st0' points='-2233,2482.1 -2242.2,2482.1 -2242.2,2520 -2216.3,2520 -2216.3,2512.2 -2233,2512.2 '/%3E%3Cpath class='st0' d='M-2197.1,2482h-13.7v38h13.5c6.7,0,12.2-1.9,16.1-5.5c3.8-3.5,5.8-8.5,5.7-13.7v-0.1 C-2175.5,2489.3-2184,2482-2197.1,2482z M-2185.1,2501.2c0,6.7-4.5,10.9-11.8,10.9h-4.7v-22h4.7c7.3,0,11.8,4.2,11.8,10.9V2501.2z' /%3E%3Cpath class='st0' d='M-2267.5,2481.7c-10.8,0-19.6,8.8-19.6,19.7c0,10.8,8.8,19.6,19.7,19.6c10.8,0,19.6-8.8,19.6-19.6l0,0 C-2247.8,2490.5-2256.6,2481.7-2267.5,2481.7C-2267.5,2481.7-2267.5,2481.7-2267.5,2481.7z M-2258,2507.9l-8.8,5.1 c-0.5,0.3-1.2,0.3-1.8,0l-8.8-5.1c-0.5-0.3-0.9-0.9-0.9-1.5v-10.2c0-0.6,0.3-1.2,0.9-1.5l8.8-5.1c0.5-0.3,1.2-0.3,1.8,0l8.8,5.1 c0.5,0.3,0.9,0.9,0.9,1.5v10.2C-2257.1,2507-2257.4,2507.6-2258,2507.9z'/%3E%3Cpath class='st0' d='M-2423.2,2494.6l-11.1,6.4l-11.1-6.4l11.1-6.4L-2423.2,2494.6z M-2412.1,2501v12.8l11.1-6.4L-2412.1,2501z M-2467.5,2507.4l11.1,6.4V2501L-2467.5,2507.4z M-2434.3,2526.6l11.1,6.4l11.1-6.4l-11.1-6.4l11.1-6.4l-11.1-6.4l-11.1,6.4 l-11.1-6.4l-11.1,6.4l11.1,6.4l-11.1,6.4l11.1,6.4L-2434.3,2526.6z'/%3E%3ClinearGradient id='SVGID_1_' gradientUnits='userSpaceOnUse' x1='-2451.2178' y1='2525.4604' x2='-2406.2178' y2='2499.6304' gradientTransform='matrix(1 0 0 -1 0 5004)'%3E%3Cstop offset='0' style='stop-color:%231C68EC'/%3E%3Cstop offset='1' style='stop-color:%2300E9DF'/%3E%3C/linearGradient%3E%3Cpath class='st1' d='M-2412.1,2513.8v12.8l-11.1-6.4L-2412.1,2513.8z M-2434.3,2513.8V2501l-11.1-6.4v12.8L-2434.3,2513.8z M-2445.4,2469v12.8l11.1-6.4L-2445.4,2469z M-2412.1,2488.2L-2412.1,2488.2 M-2423.2,2507.4l11.1,6.4V2501l11.1,6.4v-12.8 l-11.1-6.4v-12.8l0,0l-11.1-6.4v12.8l-11.1-6.4v12.8l11.1,6.4V2507.4z'/%3E%3ClinearGradient id='SVGID_2_' gradientUnits='userSpaceOnUse' x1='-2465.9385' y1='2521.2493' x2='-2423.5085' y2='2496.7893' gradientTransform='matrix(1 0 0 -1 0 5004)'%3E%3Cstop offset='0' style='stop-color:%23FF3C2A'/%3E%3Cstop offset='1' style='stop-color:%23FFD215'/%3E%3C/linearGradient%3E%3Cpath class='st2' d='M-2434.3,2513.8V2501l11.1-6.4v12.8L-2434.3,2513.8z M-2434.3,2475.4l11.1,6.4V2469L-2434.3,2475.4z M-2456.5,2488.2L-2456.5,2488.2 M-2445.4,2494.6l11.1-6.4v-12.8l-11.1,6.4V2469l-11.1,6.4l0,0v12.8l-11.1,6.4v12.8l11.1-6.4v12.8 l11.1-6.4V2494.6z M-2456.5,2513.8v12.8l11.1-6.4L-2456.5,2513.8z'/%3E%3C/svg%3E%0A");
+		background-image: url("druid_logo.png");
 	}
 	</style>
 </head>

docs/index.html

@@ -36,6 +36,7 @@ <h2>Modules</h2>
   <li><a href="modules/druid.button.html">druid.button</a></li>
   <li><a href="modules/druid.checkbox.html">druid.checkbox</a></li>
   <li><a href="modules/druid.checkbox_group.html">druid.checkbox_group</a></li>
+  <li><a href="modules/druid.drag.html">druid.drag</a></li>
   <li><a href="modules/druid.grid.html">druid.grid</a></li>
   <li><a href="modules/druid.hover.html">druid.hover</a></li>
   <li><a href="modules/druid.input.html">druid.input</a></li>
@@ -93,6 +94,10 @@ <h2>Modules</h2>
 		<td class="name"  nowrap><a href="modules/druid.checkbox_group.html">druid.checkbox_group</a></td>
 		<td class="summary">Checkbox group module</td>
 	</tr>
+	<tr>
+		<td class="name"  nowrap><a href="modules/druid.drag.html">druid.drag</a></td>
+		<td class="summary">Component to handle drag action on node.</td>
+	</tr>
 	<tr>
 		<td class="name"  nowrap><a href="modules/druid.grid.html">druid.grid</a></td>
 		<td class="summary">Component to handle placing components by row and columns.</td>
@@ -195,7 +200,7 @@ <h2>Topics</h2>
 </div> <!-- id="main" -->
 <div id="about">
 <i>generated by <a href="http://github.com/stevedonovan/LDoc">LDoc 1.4.6</a></i>
-<i style="float:right;">Last updated 2020-04-18 14:39:17 </i>
+<i style="float:right;">Last updated 2020-05-09 16:07:15 </i>
 </div> <!-- id="about" -->
 </div> <!-- id="container" -->
 </body>