From dd8bb6e67e6aa1095b848bef6cdf9bf933ac1ef4 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Thu, 11 Jul 2019 16:27:42 +0300
Subject: [PATCH 001/108] load BMF

---
 headers/enduro2d/high/_all.hpp                |   1 +
 headers/enduro2d/high/_high.hpp               |   2 +
 headers/enduro2d/high/assets/bmfont_asset.hpp |  21 +++
 headers/enduro2d/high/bmfont.hpp              |  96 ++++++++++
 sources/enduro2d/high/assets/bmfont_asset.cpp |  37 ++++
 sources/enduro2d/high/bmfont.cpp              | 178 ++++++++++++++++++
 6 files changed, 335 insertions(+)
 create mode 100644 headers/enduro2d/high/assets/bmfont_asset.hpp
 create mode 100644 headers/enduro2d/high/bmfont.hpp
 create mode 100644 sources/enduro2d/high/assets/bmfont_asset.cpp
 create mode 100644 sources/enduro2d/high/bmfont.cpp

diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index 4c8246a6..8e3cac51 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -24,6 +24,7 @@
 #include "assets/text_asset.hpp"
 #include "assets/texture_asset.hpp"
 #include "assets/xml_asset.hpp"
+#include "assets/bmfont_asset.hpp"
 
 #include "components/actor.hpp"
 #include "components/camera.hpp"
diff --git a/headers/enduro2d/high/_high.hpp b/headers/enduro2d/high/_high.hpp
index 0cc13c2f..81356c1e 100644
--- a/headers/enduro2d/high/_high.hpp
+++ b/headers/enduro2d/high/_high.hpp
@@ -36,6 +36,7 @@ namespace e2d
     class text_asset;
     class texture_asset;
     class xml_asset;
+    class bmfont_asset;
 
     class actor;
     class camera;
@@ -68,4 +69,5 @@ namespace e2d
     class sprite;
     class starter;
     class world;
+    class bmfont;
 }
diff --git a/headers/enduro2d/high/assets/bmfont_asset.hpp b/headers/enduro2d/high/assets/bmfont_asset.hpp
new file mode 100644
index 00000000..0dc1bff6
--- /dev/null
+++ b/headers/enduro2d/high/assets/bmfont_asset.hpp
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include "../_high.hpp"
+
+#include "../library.hpp"
+#include "../bmfont.hpp"
+
+namespace e2d
+{
+    class bmfont_asset final : public content_asset<bmfont_asset, bmfont_ptr> {
+    public:
+        static const char* type_name() noexcept { return "bmfont_asset"; }
+        static load_async_result load_async(const library& library, str_view address);
+    };
+}
diff --git a/headers/enduro2d/high/bmfont.hpp b/headers/enduro2d/high/bmfont.hpp
new file mode 100644
index 00000000..780f40e7
--- /dev/null
+++ b/headers/enduro2d/high/bmfont.hpp
@@ -0,0 +1,96 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include "_high.hpp"
+
+//#include "assets/texture_asset.hpp"
+
+namespace e2d
+{
+    class bmfont;
+
+    using bmfont_ptr = std::shared_ptr<bmfont>;
+
+    class bad_bmfont_access final : public exception {
+    public:
+        const char* what() const noexcept final {
+            return "bad bmfont access";
+        }
+    };
+
+    class bmfont final {
+    public:
+        struct char_data {
+            u32 id;
+            rect<i16> rect;
+            i16 xoffset;
+            i16 yoffset;
+            i16 xadvance;
+            i16 page;
+            i16 chnl;
+        };
+
+        struct info_data {
+            struct spacing_data {
+                i32 horizontal;
+                i32 vertical;
+            };
+
+            struct padding_data {
+                i16 up;
+                i16 right;
+                i16 down;
+                i16 left;
+            };
+
+//            str face;    //This is the name of the true type font.
+            u32 size;    //The size of the true type font.
+//            bool bold;    //The font is bold.
+//            bool italic;    //The font is italic.
+//            str charset;    //The name of the OEM charset used (when not unicode).
+//            bool unicode;    //Set to 1 if it is the unicode charset.
+//            u32 stretchH;    //The font height stretch in percentage. 100% means no stretch.
+//            bool smooth;    //Set to 1 if smoothing was turned on.
+//            u32 aa;    //The supersampling level used. 1 means no supersampling was used.
+            padding_data padding;    //The padding for each character (up, right, down, left). TODOPA
+//            spacing_data spacing;    //The spacing for each character (horizontal, vertical).
+//            u32 outline;    //The outline thickness for the characters.
+        };
+
+        struct kerning_data {
+            u32 first;  // The first character id.
+            u32 second; // The second character id.
+            i32 amount; // How much the x position should be adjusted when drawing the second character immediately following the first.
+        };
+
+        struct common_data {
+            u32 lineHeight;    //This is the distance in pixels between each line of text.
+//            u32 base;    //The number of pixels from the absolute top of the line to the base of the characters.
+//            u32 scaleW;    //The width of the texture, normally used to scale the x pos of the character image.
+//            u32 scaleH;    //The height of the texture, normally used to scale the y pos of the character image.
+            u32 pages;    //The number of texture pages included in the font.
+//            u32 packed;    //Set to 1 if the monochrome characters have been packed into each of the texture channels. In this case alphaChnl describes what is stored in each channel.
+//            u32 alphaChnl;    //Set to 0 if the channel holds the glyph data, 1 if it holds the outline, 2 if it holds the glyph and the outline, 3 if its set to zero, and 4 if its set to one.
+//            u32 redChnl;    //Set to 0 if the channel holds the glyph data, 1 if it holds the outline, 2 if it holds the glyph and the outline, 3 if its set to zero, and 4 if its set to one.
+//            u32 greenChnl;    //Set to 0 if the channel holds the glyph data, 1 if it holds the outline, 2 if it holds the glyph and the outline, 3 if its set to zero, and 4 if its set to one.
+//            u32 blueChnl;    //Set to 0 if the channel holds the glyph data, 1 if it holds the outline, 2 if it holds the glyph and the outline, 3 if its set to zero, and 4 if its set to one.
+        };
+
+        bmfont() = default;
+        ~bmfont() noexcept = default;
+
+        static bmfont_ptr create (str_view content);
+
+    protected:
+        info_data info_;
+        common_data common_;
+        std::vector<std::string> pages_;
+        std::vector<char_data> chars_;
+        std::vector<kerning_data> kerning_;
+    };
+}
diff --git a/sources/enduro2d/high/assets/bmfont_asset.cpp b/sources/enduro2d/high/assets/bmfont_asset.cpp
new file mode 100644
index 00000000..6c233eef
--- /dev/null
+++ b/sources/enduro2d/high/assets/bmfont_asset.cpp
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/assets/bmfont_asset.hpp>
+#include <enduro2d/high/assets/text_asset.hpp>
+
+namespace
+{
+    using namespace e2d;
+
+    class bmfont_asset_loading_exception final : public asset_loading_exception {
+        const char* what() const noexcept final {
+            return "shader asset loading exception";
+        }
+    };
+}
+
+namespace e2d
+{
+    bmfont_asset::load_async_result bmfont_asset::load_async(
+        const library& library, str_view address)
+    {
+        return library.load_asset_async<text_asset>(address)
+        .then([](const text_asset::load_result& text_data){
+            return the<deferrer>().do_in_main_thread([text_data](){
+                auto font = bmfont::create(text_data->content());
+                if ( !font ) {
+                    throw bmfont_asset_loading_exception();
+                }
+                return bmfont_asset::create(font);
+            });
+        });
+    }
+}
diff --git a/sources/enduro2d/high/bmfont.cpp b/sources/enduro2d/high/bmfont.cpp
new file mode 100644
index 00000000..fd91a18d
--- /dev/null
+++ b/sources/enduro2d/high/bmfont.cpp
@@ -0,0 +1,178 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/bmfont.hpp>
+//#include <regex>
+#include <sstream>
+
+namespace e2d
+{
+    bmfont_ptr bmfont::create (str_view content) {
+        bmfont_ptr b = std::make_shared<bmfont>();
+        std::string s{content.data()};
+        std::replace(s.begin(), s.end(), '=', ' ');
+        std::replace(s.begin(), s.end(), ',', ' ');
+
+        std::string tag;
+        std::string line;
+        std::stringstream data_stream(s);
+        std::vector<char_data> chars(120);
+        std::vector<kerning_data> kerning(120);
+        int chars_counter = 0;
+        int kerning_counter = 0;
+        while (getline(data_stream, line, '\n'))
+        {
+            std::stringstream line_stream(line);
+            line_stream >> tag;
+            if (tag == "info") {
+                //info face="Arial-Black" size=32 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=2,2
+                line_stream >> tag;
+                while (!line_stream.eof()) {
+                    if (tag == "size") {
+                        line_stream >>  b->info_.size;
+                    } else if (tag == "padding") {
+                        line_stream >>  b->info_.padding.up;
+                        line_stream >>  b->info_.padding.right;
+                        line_stream >>  b->info_.padding.down;
+                        line_stream >>  b->info_.padding.left;
+                    }
+
+//                    if (tag == "face") {
+//                        line_stream >>  b->info_.face;
+//                    } else if (tag == "size") {
+//                        line_stream >>  b->info_.size;
+//                    } else if (tag == "bold") {
+//                        line_stream >>  b->info_.bold;
+//                    } else if (tag == "italic") {
+//                        line_stream >>  b->info_.italic;
+//                    } else if (tag == "charset") {
+//                        line_stream >>  b->info_.charset;
+//                    } else if (tag == "unicode") {
+//                        line_stream >>  b->info_.unicode;
+//                    } else if (tag == "stretchH") {
+//                        line_stream >>  b->info_.stretchH;
+//                    } else if (tag == "smooth") {
+//                        line_stream >>  b->info_.smooth;
+//                    } else if (tag == "aa") {
+//                        line_stream >>  b->info_.aa;
+//                    } else if (tag == "padding") {
+//                        line_stream >>  b->info_.padding.up
+//                                    >>  b->info_.padding.right
+//                                    >>  b->info_.padding.down
+//                                    >>  b->info_.padding.left;
+//                    } else if (tag == "spacing") {
+//                        line_stream >>  b->info_.spacing.horizontal
+//                                    >>  b->info_.spacing.vertical;
+//                    }
+                    line_stream >> tag;
+                }
+            } else if (tag == "common") {
+                //common lineHeight=54 base=35 scaleW=512 scaleH=512 pages=1 packed=0
+                line_stream >> tag;
+                while (!line_stream.eof()) {
+                    if (tag == "lineHeight") {
+                        line_stream >>  b->common_.lineHeight;
+                    } else if (tag == "pages") {
+                        line_stream >>  b->common_.pages;
+                         b->pages_.resize( b->common_.pages);
+                    }
+                    line_stream >> tag;
+                }
+            } else if (tag == "page") {
+                //page id=0 file="boundsTestFont.png"
+                line_stream >> tag;
+                i32 id{-1};
+                while (!line_stream.eof()) {
+                    if (tag == "id") {
+                        line_stream >> id;
+                    } else if (tag == "file") {
+                        std::string file;
+                        line_stream >> file;
+                        //remove ""
+                        file.erase(file.begin());
+                        file.pop_back();
+                        b->pages_[id] = file;
+                    }
+                    line_stream >> tag;
+                }
+            } else if (tag == "chars") {
+                //chars count=95
+                //this field may not exist!
+                while (!line_stream.eof()) {
+                    if (tag == "count") {
+                        size_t count;
+                        line_stream >> count;
+                        if ( count > chars.size() ) {
+                            chars.resize(count);
+                        }
+                    }
+                    line_stream >> tag;
+                }
+            } else if (tag == "char") {
+                //char id=123 x=2 y=2 width=38 height=54 xoffset=0 yoffset=-3 xadvance=12 page=0 chnl=0 letter="{"
+                line_stream >> tag;
+                i32 id{-1};
+                char_data c;
+                while (!line_stream.eof()) {
+                    if (tag == "id") {
+                        line_stream >> id;
+                    } else if (tag == "x") {
+                        line_stream >> c.rect.position.x;
+                    } else if (tag == "y") {
+                        line_stream >> c.rect.position.y;
+                    } else if (tag == "widht") {
+                        line_stream >> c.rect.size.x;
+                    } else if (tag == "height") {
+                        line_stream >> c.rect.size.y;
+                    } else if (tag == "xoffset") {
+                        line_stream >> c.xoffset;
+                    } else if (tag == "yoffset") {
+                        line_stream >> c.yoffset;
+                    } else if (tag == "xadvance") {
+                        line_stream >> c.xadvance;
+                    } else if (tag == "page") {
+                        line_stream >> c.page;
+                    }
+                    line_stream >> tag;
+                }
+                chars[chars_counter++] = c;
+            } else if (tag == "kernings") {
+                //kernings count=243
+                //this field may not exist!
+                while (!line_stream.eof()) {
+                    if (tag == "count") {
+                        size_t count;
+                        line_stream >> count;
+                        if ( count > kerning.size() ) {
+                            kerning.resize(count);
+                        }
+                    }
+                    line_stream >> tag;
+                }
+            } else if (tag == "kerning") {
+                //kerning first=86 second=101 amount=-2
+                line_stream >> tag;
+                kerning_data k;
+                while (!line_stream.eof()) {
+                    if (tag == "first") {
+                        line_stream >> k.first;
+                    } else if (tag == "second") {
+                        line_stream >> k.second;
+                    } else if (tag == "amount") {
+                        line_stream >> k.amount;
+                    }
+                    line_stream >> tag;
+                }
+                kerning[kerning_counter++] = k;
+            }
+        }
+
+         b->chars_.insert(b->chars_.begin(), chars.begin(), chars.begin()+chars_counter);
+         b->kerning_.insert(b->kerning_.begin(), kerning.begin(), kerning.begin()+kerning_counter);
+
+        return b;
+    }
+}

From 1e8c5d710b1e4c40a195f292369646cc65d2eb45 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Thu, 11 Jul 2019 17:49:53 +0300
Subject: [PATCH 002/108] clean code

---
 headers/enduro2d/high/bmfont.hpp | 56 +++++++-------------------------
 sources/enduro2d/high/bmfont.cpp | 53 +++++++-----------------------
 2 files changed, 23 insertions(+), 86 deletions(-)

diff --git a/headers/enduro2d/high/bmfont.hpp b/headers/enduro2d/high/bmfont.hpp
index 780f40e7..e5825288 100644
--- a/headers/enduro2d/high/bmfont.hpp
+++ b/headers/enduro2d/high/bmfont.hpp
@@ -8,21 +8,12 @@
 
 #include "_high.hpp"
 
-//#include "assets/texture_asset.hpp"
-
 namespace e2d
 {
     class bmfont;
 
     using bmfont_ptr = std::shared_ptr<bmfont>;
 
-    class bad_bmfont_access final : public exception {
-    public:
-        const char* what() const noexcept final {
-            return "bad bmfont access";
-        }
-    };
-
     class bmfont final {
     public:
         struct char_data {
@@ -36,11 +27,6 @@ namespace e2d
         };
 
         struct info_data {
-            struct spacing_data {
-                i32 horizontal;
-                i32 vertical;
-            };
-
             struct padding_data {
                 i16 up;
                 i16 right;
@@ -48,49 +34,31 @@ namespace e2d
                 i16 left;
             };
 
-//            str face;    //This is the name of the true type font.
-            u32 size;    //The size of the true type font.
-//            bool bold;    //The font is bold.
-//            bool italic;    //The font is italic.
-//            str charset;    //The name of the OEM charset used (when not unicode).
-//            bool unicode;    //Set to 1 if it is the unicode charset.
-//            u32 stretchH;    //The font height stretch in percentage. 100% means no stretch.
-//            bool smooth;    //Set to 1 if smoothing was turned on.
-//            u32 aa;    //The supersampling level used. 1 means no supersampling was used.
-            padding_data padding;    //The padding for each character (up, right, down, left). TODOPA
-//            spacing_data spacing;    //The spacing for each character (horizontal, vertical).
-//            u32 outline;    //The outline thickness for the characters.
+            u32 size;
+            padding_data padding;
         };
 
         struct kerning_data {
-            u32 first;  // The first character id.
-            u32 second; // The second character id.
-            i32 amount; // How much the x position should be adjusted when drawing the second character immediately following the first.
+            u32 first;
+            u32 second;
+            i32 amount;
         };
 
         struct common_data {
-            u32 lineHeight;    //This is the distance in pixels between each line of text.
-//            u32 base;    //The number of pixels from the absolute top of the line to the base of the characters.
-//            u32 scaleW;    //The width of the texture, normally used to scale the x pos of the character image.
-//            u32 scaleH;    //The height of the texture, normally used to scale the y pos of the character image.
-            u32 pages;    //The number of texture pages included in the font.
-//            u32 packed;    //Set to 1 if the monochrome characters have been packed into each of the texture channels. In this case alphaChnl describes what is stored in each channel.
-//            u32 alphaChnl;    //Set to 0 if the channel holds the glyph data, 1 if it holds the outline, 2 if it holds the glyph and the outline, 3 if its set to zero, and 4 if its set to one.
-//            u32 redChnl;    //Set to 0 if the channel holds the glyph data, 1 if it holds the outline, 2 if it holds the glyph and the outline, 3 if its set to zero, and 4 if its set to one.
-//            u32 greenChnl;    //Set to 0 if the channel holds the glyph data, 1 if it holds the outline, 2 if it holds the glyph and the outline, 3 if its set to zero, and 4 if its set to one.
-//            u32 blueChnl;    //Set to 0 if the channel holds the glyph data, 1 if it holds the outline, 2 if it holds the glyph and the outline, 3 if its set to zero, and 4 if its set to one.
+            u32 line_height;
+            u32 pages;
         };
 
         bmfont() = default;
         ~bmfont() noexcept = default;
 
-        static bmfont_ptr create (str_view content);
+        static bmfont_ptr create(str_view content);
 
-    protected:
+    private:
         info_data info_;
         common_data common_;
-        std::vector<std::string> pages_;
-        std::vector<char_data> chars_;
-        std::vector<kerning_data> kerning_;
+        vector<str> pages_;
+        vector<char_data> chars_;
+        vector<kerning_data> kerning_;
     };
 }
diff --git a/sources/enduro2d/high/bmfont.cpp b/sources/enduro2d/high/bmfont.cpp
index fd91a18d..dc5c74ba 100644
--- a/sources/enduro2d/high/bmfont.cpp
+++ b/sources/enduro2d/high/bmfont.cpp
@@ -5,22 +5,21 @@
  ******************************************************************************/
 
 #include <enduro2d/high/bmfont.hpp>
-//#include <regex>
 #include <sstream>
 
 namespace e2d
 {
     bmfont_ptr bmfont::create (str_view content) {
         bmfont_ptr b = std::make_shared<bmfont>();
-        std::string s{content.data()};
+        str s{content.data()};
         std::replace(s.begin(), s.end(), '=', ' ');
         std::replace(s.begin(), s.end(), ',', ' ');
 
-        std::string tag;
-        std::string line;
+        str tag;
+        str line;
         std::stringstream data_stream(s);
-        std::vector<char_data> chars(120);
-        std::vector<kerning_data> kerning(120);
+        vector<char_data> chars(120);
+        vector<kerning_data> kerning(120);
         int chars_counter = 0;
         int kerning_counter = 0;
         while (getline(data_stream, line, '\n'))
@@ -39,34 +38,6 @@ namespace e2d
                         line_stream >>  b->info_.padding.down;
                         line_stream >>  b->info_.padding.left;
                     }
-
-//                    if (tag == "face") {
-//                        line_stream >>  b->info_.face;
-//                    } else if (tag == "size") {
-//                        line_stream >>  b->info_.size;
-//                    } else if (tag == "bold") {
-//                        line_stream >>  b->info_.bold;
-//                    } else if (tag == "italic") {
-//                        line_stream >>  b->info_.italic;
-//                    } else if (tag == "charset") {
-//                        line_stream >>  b->info_.charset;
-//                    } else if (tag == "unicode") {
-//                        line_stream >>  b->info_.unicode;
-//                    } else if (tag == "stretchH") {
-//                        line_stream >>  b->info_.stretchH;
-//                    } else if (tag == "smooth") {
-//                        line_stream >>  b->info_.smooth;
-//                    } else if (tag == "aa") {
-//                        line_stream >>  b->info_.aa;
-//                    } else if (tag == "padding") {
-//                        line_stream >>  b->info_.padding.up
-//                                    >>  b->info_.padding.right
-//                                    >>  b->info_.padding.down
-//                                    >>  b->info_.padding.left;
-//                    } else if (tag == "spacing") {
-//                        line_stream >>  b->info_.spacing.horizontal
-//                                    >>  b->info_.spacing.vertical;
-//                    }
                     line_stream >> tag;
                 }
             } else if (tag == "common") {
@@ -74,7 +45,7 @@ namespace e2d
                 line_stream >> tag;
                 while (!line_stream.eof()) {
                     if (tag == "lineHeight") {
-                        line_stream >>  b->common_.lineHeight;
+                        line_stream >>  b->common_.line_height;
                     } else if (tag == "pages") {
                         line_stream >>  b->common_.pages;
                          b->pages_.resize( b->common_.pages);
@@ -89,7 +60,7 @@ namespace e2d
                     if (tag == "id") {
                         line_stream >> id;
                     } else if (tag == "file") {
-                        std::string file;
+                        str file;
                         line_stream >> file;
                         //remove ""
                         file.erase(file.begin());
@@ -114,11 +85,10 @@ namespace e2d
             } else if (tag == "char") {
                 //char id=123 x=2 y=2 width=38 height=54 xoffset=0 yoffset=-3 xadvance=12 page=0 chnl=0 letter="{"
                 line_stream >> tag;
-                i32 id{-1};
-                char_data c;
+                char_data& c = chars[chars_counter++];
                 while (!line_stream.eof()) {
                     if (tag == "id") {
-                        line_stream >> id;
+                        line_stream >> c.id;
                     } else if (tag == "x") {
                         line_stream >> c.rect.position.x;
                     } else if (tag == "y") {
@@ -127,6 +97,7 @@ namespace e2d
                         line_stream >> c.rect.size.x;
                     } else if (tag == "height") {
                         line_stream >> c.rect.size.y;
+                        c.rect.position.y -= c.rect.size.y;
                     } else if (tag == "xoffset") {
                         line_stream >> c.xoffset;
                     } else if (tag == "yoffset") {
@@ -138,7 +109,6 @@ namespace e2d
                     }
                     line_stream >> tag;
                 }
-                chars[chars_counter++] = c;
             } else if (tag == "kernings") {
                 //kernings count=243
                 //this field may not exist!
@@ -155,7 +125,7 @@ namespace e2d
             } else if (tag == "kerning") {
                 //kerning first=86 second=101 amount=-2
                 line_stream >> tag;
-                kerning_data k;
+                kerning_data& k = kerning[kerning_counter++];
                 while (!line_stream.eof()) {
                     if (tag == "first") {
                         line_stream >> k.first;
@@ -166,7 +136,6 @@ namespace e2d
                     }
                     line_stream >> tag;
                 }
-                kerning[kerning_counter++] = k;
             }
         }
 

From 1f0e25db91e92003199d81f54c2d7de4c2ff02fe Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Fri, 12 Jul 2019 11:53:33 +0300
Subject: [PATCH 003/108] added default value

---
 headers/enduro2d/high/bmfont.hpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/headers/enduro2d/high/bmfont.hpp b/headers/enduro2d/high/bmfont.hpp
index e5825288..023b30e7 100644
--- a/headers/enduro2d/high/bmfont.hpp
+++ b/headers/enduro2d/high/bmfont.hpp
@@ -17,36 +17,36 @@ namespace e2d
     class bmfont final {
     public:
         struct char_data {
-            u32 id;
+            u32 id{0};
             rect<i16> rect;
-            i16 xoffset;
-            i16 yoffset;
-            i16 xadvance;
-            i16 page;
-            i16 chnl;
+            i16 xoffset{0};
+            i16 yoffset{0};
+            i16 xadvance{0};
+            i16 page{0};
+            i16 chnl{0};
         };
 
         struct info_data {
             struct padding_data {
-                i16 up;
-                i16 right;
-                i16 down;
-                i16 left;
+                i16 up{0};
+                i16 right{0};
+                i16 down{0};
+                i16 left{0};
             };
 
-            u32 size;
+            u32 size{0};
             padding_data padding;
         };
 
         struct kerning_data {
-            u32 first;
-            u32 second;
-            i32 amount;
+            u32 first{0};
+            u32 second{0};
+            i32 amount{0};
         };
 
         struct common_data {
-            u32 line_height;
-            u32 pages;
+            u32 line_height{0};
+            u32 pages{0};
         };
 
         bmfont() = default;

From 30331350bd79c38b78708d67ab1523953c294dae Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Tue, 16 Jul 2019 18:14:24 +0300
Subject: [PATCH 004/108] draw bm font

---
 headers/enduro2d/high/_all.hpp                |   4 +-
 headers/enduro2d/high/_high.hpp               |   5 +-
 .../{bmfont_asset.hpp => font_asset.hpp}      |   3 +-
 headers/enduro2d/high/components/label.hpp    |  85 ++++++++++++
 .../enduro2d/high/systems/label_system.hpp    |  22 +++
 headers/enduro2d/utils/_all.hpp               |   1 +
 headers/enduro2d/utils/_utils.hpp             |   1 +
 .../{high/bmfont.hpp => utils/font.hpp}       |  24 ++--
 samples/CMakeLists.txt                        |   2 +
 samples/bin/library/font_material.json        |  21 +++
 samples/sources/sample_07/sample_07.cpp       | 127 ++++++++++++++++++
 .../{bmfont_asset.cpp => font_asset.cpp}      |   8 +-
 sources/enduro2d/high/components/label.cpp    |  52 +++++++
 .../enduro2d/high/systems/label_system.cpp    | 125 +++++++++++++++++
 .../{high/bmfont.cpp => utils/font.cpp}       |  54 +++++++-
 15 files changed, 509 insertions(+), 25 deletions(-)
 rename headers/enduro2d/high/assets/{bmfont_asset.hpp => font_asset.hpp} (85%)
 create mode 100644 headers/enduro2d/high/components/label.hpp
 create mode 100644 headers/enduro2d/high/systems/label_system.hpp
 rename headers/enduro2d/{high/bmfont.hpp => utils/font.hpp} (69%)
 create mode 100644 samples/bin/library/font_material.json
 create mode 100644 samples/sources/sample_07/sample_07.cpp
 rename sources/enduro2d/high/assets/{bmfont_asset.cpp => font_asset.cpp} (82%)
 create mode 100644 sources/enduro2d/high/components/label.cpp
 create mode 100644 sources/enduro2d/high/systems/label_system.cpp
 rename sources/enduro2d/{high/bmfont.cpp => utils/font.cpp} (75%)

diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index 8e3cac51..a67813d7 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -24,7 +24,7 @@
 #include "assets/text_asset.hpp"
 #include "assets/texture_asset.hpp"
 #include "assets/xml_asset.hpp"
-#include "assets/bmfont_asset.hpp"
+#include "assets/font_asset.hpp"
 
 #include "components/actor.hpp"
 #include "components/camera.hpp"
@@ -34,9 +34,11 @@
 #include "components/renderer.hpp"
 #include "components/scene.hpp"
 #include "components/sprite_renderer.hpp"
+#include "components/label.hpp"
 
 #include "systems/flipbook_system.hpp"
 #include "systems/render_system.hpp"
+#include "systems/label_system.hpp"
 
 #include "address.hpp"
 #include "asset.hpp"
diff --git a/headers/enduro2d/high/_high.hpp b/headers/enduro2d/high/_high.hpp
index 81356c1e..35662531 100644
--- a/headers/enduro2d/high/_high.hpp
+++ b/headers/enduro2d/high/_high.hpp
@@ -36,7 +36,7 @@ namespace e2d
     class text_asset;
     class texture_asset;
     class xml_asset;
-    class bmfont_asset;
+    class font_asset;
 
     class actor;
     class camera;
@@ -46,9 +46,11 @@ namespace e2d
     class renderer;
     class scene;
     class sprite_renderer;
+    class label;
 
     class flipbook_system;
     class render_system;
+    class label_system;
 
     template < typename Asset, typename Content >
     class content_asset;
@@ -69,5 +71,4 @@ namespace e2d
     class sprite;
     class starter;
     class world;
-    class bmfont;
 }
diff --git a/headers/enduro2d/high/assets/bmfont_asset.hpp b/headers/enduro2d/high/assets/font_asset.hpp
similarity index 85%
rename from headers/enduro2d/high/assets/bmfont_asset.hpp
rename to headers/enduro2d/high/assets/font_asset.hpp
index 0dc1bff6..b85e895f 100644
--- a/headers/enduro2d/high/assets/bmfont_asset.hpp
+++ b/headers/enduro2d/high/assets/font_asset.hpp
@@ -9,11 +9,10 @@
 #include "../_high.hpp"
 
 #include "../library.hpp"
-#include "../bmfont.hpp"
 
 namespace e2d
 {
-    class bmfont_asset final : public content_asset<bmfont_asset, bmfont_ptr> {
+    class font_asset final : public content_asset<font_asset, font_ptr> {
     public:
         static const char* type_name() noexcept { return "bmfont_asset"; }
         static load_async_result load_async(const library& library, str_view address);
diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
new file mode 100644
index 00000000..0495292d
--- /dev/null
+++ b/headers/enduro2d/high/components/label.hpp
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include "../_high.hpp"
+
+#include "../factory.hpp"
+#include "../assets/font_asset.hpp"
+
+namespace e2d
+{
+    class label final {
+    public:
+        label() = default;
+        label(const str_view text);
+
+        label& text(const str_view text) noexcept;
+        const str& text() const noexcept;
+
+        label& dirty(bool dirty) noexcept;
+        bool dirty() const noexcept;
+
+        label& font(const font_asset::ptr& font) noexcept;
+        const font_asset::ptr&  font() const noexcept;
+    private:
+        bool dirty_ = false;
+        str text_;
+        font_asset::ptr font_;
+    };
+
+    template <>
+    class factory_loader<label> final : factory_loader<> {
+    public:
+        static const char* schema_source;
+
+        bool operator()(
+            label& component,
+            const fill_context& ctx) const;
+
+        bool operator()(
+            asset_dependencies& dependencies,
+            const collect_context& ctx) const;
+    };
+}
+
+namespace e2d
+{
+    inline label::label(const str_view text)
+    : text_(text),
+    dirty_(false)
+    {}
+
+    inline label& label::text(const str_view text) noexcept {
+        text_ = text;
+        dirty_ = true;
+        return *this;
+    }
+
+    inline const str& label::text() const noexcept {
+        return text_;
+    }
+
+    inline label& label::dirty(bool dirty) noexcept {
+        dirty_ = dirty;
+        return *this;
+    }
+
+    inline bool label::dirty() const noexcept {
+        return dirty_;
+    }
+
+    inline label& label::font(const font_asset::ptr& font) noexcept {
+        font_ = font;
+        dirty_ = true;
+        return *this;
+    }
+
+    inline const font_asset::ptr& label::font() const noexcept {
+        return font_;
+    }
+}
diff --git a/headers/enduro2d/high/systems/label_system.hpp b/headers/enduro2d/high/systems/label_system.hpp
new file mode 100644
index 00000000..89928a5e
--- /dev/null
+++ b/headers/enduro2d/high/systems/label_system.hpp
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include "../_high.hpp"
+
+namespace e2d
+{
+    class label_system final : public ecs::system {
+    public:
+        label_system();
+        ~label_system() noexcept final;
+        void process(ecs::registry& owner) override;
+    private:
+        class internal_state;
+        std::unique_ptr<internal_state> state_;
+    };
+}
diff --git a/headers/enduro2d/utils/_all.hpp b/headers/enduro2d/utils/_all.hpp
index 4c0362f4..b658815c 100644
--- a/headers/enduro2d/utils/_all.hpp
+++ b/headers/enduro2d/utils/_all.hpp
@@ -30,3 +30,4 @@
 #include "time.hpp"
 #include "url.hpp"
 #include "xml_utils.hpp"
+#include "font.hpp"
diff --git a/headers/enduro2d/utils/_utils.hpp b/headers/enduro2d/utils/_utils.hpp
index 510b9fd1..574d578f 100644
--- a/headers/enduro2d/utils/_utils.hpp
+++ b/headers/enduro2d/utils/_utils.hpp
@@ -25,6 +25,7 @@ namespace e2d
     class input_sequence;
     class output_sequence;
     class url;
+    class font;
 
     template < typename T >
     class module;
diff --git a/headers/enduro2d/high/bmfont.hpp b/headers/enduro2d/utils/font.hpp
similarity index 69%
rename from headers/enduro2d/high/bmfont.hpp
rename to headers/enduro2d/utils/font.hpp
index 023b30e7..29aa73c0 100644
--- a/headers/enduro2d/high/bmfont.hpp
+++ b/headers/enduro2d/utils/font.hpp
@@ -6,15 +6,15 @@
 
 #pragma once
 
-#include "_high.hpp"
+#include "_utils.hpp"
 
 namespace e2d
 {
-    class bmfont;
+    class font;
 
-    using bmfont_ptr = std::shared_ptr<bmfont>;
+    using font_ptr = std::shared_ptr<font>;
 
-    class bmfont final {
+    class font final {
     public:
         struct char_data {
             u32 id{0};
@@ -39,26 +39,32 @@ namespace e2d
         };
 
         struct kerning_data {
-            u32 first{0};
+            u64 first{0};
             u32 second{0};
             i32 amount{0};
         };
 
         struct common_data {
             u32 line_height{0};
+            u32 base{0};
             u32 pages{0};
+            u32 atlas_width{0};
+            u32 atlas_height{0};
         };
 
-        bmfont() = default;
-        ~bmfont() noexcept = default;
+        font() = default;
+        ~font() noexcept = default;
 
-        static bmfont_ptr create(str_view content);
+        static font_ptr create(str_view content);
+        char_data data (u32 charId) const noexcept;
+        common_data common() const noexcept;
 
+        i32 kerning (u32 first, u32 second) const noexcept;
     private:
         info_data info_;
         common_data common_;
         vector<str> pages_;
         vector<char_data> chars_;
-        vector<kerning_data> kerning_;
+        flat_map<u64,i32> kerning_;
     };
 }
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 107ae51d..3cac8bb9 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -36,3 +36,5 @@ add_e2d_sample(02)
 add_e2d_sample(03)
 add_e2d_sample(04)
 add_e2d_sample(05)
+add_e2d_sample(07)
+
diff --git a/samples/bin/library/font_material.json b/samples/bin/library/font_material.json
new file mode 100644
index 00000000..5d7f1d7d
--- /dev/null
+++ b/samples/bin/library/font_material.json
@@ -0,0 +1,21 @@
+{
+    "passes" : [{
+        "shader" : "model_shader.json",
+        "state_block" : {
+            "capabilities_state" : {
+                "depth_test" : false,
+                "blending" : true
+            },
+            "blending_state" : {
+                "src_factor" : "src_alpha",
+                "dst_factor" : "one_minus_src_alpha"
+            }
+        }
+    }],
+    "property_block" : {
+        "samplers" : [{
+            "name" : "u_texture",
+            "texture" : "boundsTestFont.png"
+        }]
+    }
+}
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
new file mode 100644
index 00000000..1e7c2148
--- /dev/null
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -0,0 +1,127 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include "../common.hpp"
+
+
+using namespace e2d;
+
+namespace
+{
+    struct rotator {
+        v3f axis;
+    };
+
+    class game_system final : public ecs::system {
+    public:
+        void process(ecs::registry& owner) override {
+            E2D_UNUSED(owner);
+            const keyboard& k = the<input>().keyboard();
+
+            if ( k.is_key_just_released(keyboard_key::f12) ) {
+                the<dbgui>().toggle_visible(!the<dbgui>().visible());
+            }
+
+            if ( k.is_key_just_released(keyboard_key::escape) ) {
+                the<window>().set_should_close(true);
+            }
+
+            if ( k.is_key_pressed(keyboard_key::lsuper) && k.is_key_just_released(keyboard_key::enter) ) {
+                the<window>().toggle_fullscreen(!the<window>().fullscreen());
+            }
+        }
+    };
+
+    class camera_system final : public ecs::system {
+    public:
+        void process(ecs::registry& owner) override {
+            owner.for_joined_components<camera>(
+            [](const ecs::const_entity&, camera& cam){
+                if ( !cam.target() ) {
+                    cam.viewport(
+                        the<window>().real_size());
+                    cam.projection(math::make_orthogonal_lh_matrix4(
+                        the<window>().real_size().cast_to<f32>(), 0.f, 1000.f));
+                }
+            });
+        }
+    };
+
+    class game final : public starter::application {
+    public:
+        bool initialize() final {
+            return create_scene()
+                && create_camera()
+                && create_systems();
+        }
+    private:
+        bool create_scene() {
+            auto model_res = the<library>().load_asset<model_asset>("gnome_model.json");
+            auto font_mat = the<library>().load_asset<material_asset>("font_material.json");
+            auto bmfont_res = the<library>().load_asset<font_asset>("boundsTestFont.fnt");
+//            auto bmfont_res = the<library>().load_asset<font_asset>("bmfont.fnt");
+
+            if ( !model_res || !font_mat || !bmfont_res ) {
+                return false;
+            }
+
+            auto scene_i = the<world>().instantiate();
+
+            scene_i->entity_filler()
+                .component<scene>()
+                .component<actor>(node::create(scene_i));
+
+            node_iptr scene_r = scene_i->get_component<actor>().get().node();
+
+            {
+                auto label_i = the<world>().instantiate();
+
+                label l;
+                l.font(bmfont_res);
+                l.text("Enduro2d\nis the best\ngame engine\nin the World!");
+
+                label_i->entity_filler()
+                .component<actor>(node::create(label_i, scene_r))
+                .component<label>(l)
+                .component<renderer>(renderer()
+                                     .materials({font_mat}))
+                .component<model_renderer>(model_res);
+
+                node_iptr label_n = label_i->get_component<actor>().get().node();
+                label_n->translation(v3f{-300.f,0.f,0.f});
+            }
+
+            return true;
+        }
+
+        bool create_camera() {
+            auto camera_i = the<world>().instantiate();
+            camera_i->entity_filler()
+                .component<camera>(camera()
+                    .background({1.f, 0.4f, 0.f, 1.f}))
+                .component<actor>(node::create(camera_i));
+            return true;
+        }
+
+        bool create_systems() {
+            ecs::registry_filler(the<world>().registry())
+                .system<game_system>(world::priority_update)
+                .system<label_system>(world::priority_update)
+                .system<camera_system>(world::priority_pre_render);
+            return true;
+        }
+    };
+}
+
+int e2d_main(int argc, char *argv[]) {
+    const auto starter_params = starter::parameters(
+        engine::parameters("sample_07", "enduro2d")
+            .timer_params(engine::timer_parameters()
+                .maximal_framerate(100)));
+    modules::initialize<starter>(argc, argv, starter_params).start<game>();
+    modules::shutdown<starter>();
+    return 0;
+}
diff --git a/sources/enduro2d/high/assets/bmfont_asset.cpp b/sources/enduro2d/high/assets/font_asset.cpp
similarity index 82%
rename from sources/enduro2d/high/assets/bmfont_asset.cpp
rename to sources/enduro2d/high/assets/font_asset.cpp
index 6c233eef..fe6e0a60 100644
--- a/sources/enduro2d/high/assets/bmfont_asset.cpp
+++ b/sources/enduro2d/high/assets/font_asset.cpp
@@ -4,7 +4,7 @@
  * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
  ******************************************************************************/
 
-#include <enduro2d/high/assets/bmfont_asset.hpp>
+#include <enduro2d/high/assets/font_asset.hpp>
 #include <enduro2d/high/assets/text_asset.hpp>
 
 namespace
@@ -20,17 +20,17 @@ namespace
 
 namespace e2d
 {
-    bmfont_asset::load_async_result bmfont_asset::load_async(
+    font_asset::load_async_result font_asset::load_async(
         const library& library, str_view address)
     {
         return library.load_asset_async<text_asset>(address)
         .then([](const text_asset::load_result& text_data){
             return the<deferrer>().do_in_main_thread([text_data](){
-                auto font = bmfont::create(text_data->content());
+                auto font = font::create(text_data->content());
                 if ( !font ) {
                     throw bmfont_asset_loading_exception();
                 }
-                return bmfont_asset::create(font);
+                return font_asset::create(font);
             });
         });
     }
diff --git a/sources/enduro2d/high/components/label.cpp b/sources/enduro2d/high/components/label.cpp
new file mode 100644
index 00000000..18e01e1c
--- /dev/null
+++ b/sources/enduro2d/high/components/label.cpp
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/components/label.hpp>
+
+namespace e2d
+{
+    const char* factory_loader<label>::schema_source = R"json({
+        "type" : "object",
+        "required" : [],
+        "additionalProperties" : false,
+        "properties" : {
+            "model" : { "$ref": "#/common_definitions/address" }
+        }
+    })json";
+
+    bool factory_loader<label>::operator()(
+        label& component,
+        const fill_context& ctx) const
+    {
+        if ( ctx.root.HasMember("label") ) {
+//            auto model = ctx.dependencies.find_asset<model_asset>(
+//                path::combine(ctx.parent_address, ctx.root["model"].GetString()));
+//            if ( !model ) {
+//                the<debug>().error("label: Dependency 'model' is not found:\n"
+//                    "--> Parent address: %0\n"
+//                    "--> Dependency address: %1",
+//                    ctx.parent_address,
+//                    ctx.root["model"].GetString());
+//                return false;
+//            }
+//            component.label(model);
+        }
+
+        return true;;
+    }
+
+    bool factory_loader<label>::operator()(
+        asset_dependencies& dependencies,
+        const collect_context& ctx) const
+    {
+        if ( ctx.root.HasMember("model") ) {
+//            dependencies.add_dependency<model_asset>(
+//                path::combine(ctx.parent_address, ctx.root["model"].GetString()));
+        }
+
+        return true;
+    }
+}
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
new file mode 100644
index 00000000..f0897e11
--- /dev/null
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -0,0 +1,125 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/systems/label_system.hpp>
+
+
+#include <enduro2d/high/components/label.hpp>
+#include <enduro2d/utils/font.hpp>
+#include <enduro2d/high/components/model_renderer.hpp>
+
+
+namespace e2d
+{
+    //
+    // label_system::internal_state
+    //
+
+    class label_system::internal_state final : private noncopyable {
+    public:
+        internal_state() = default;
+        ~internal_state() noexcept = default;
+
+        void process(ecs::registry& owner) {
+            owner.for_joined_components<label, model_renderer>([](
+                const ecs::const_entity&,
+                label& l,
+                model_renderer& mr)
+            {
+                if (l.dirty()) {
+                    vector<v3f> vertices;
+                    vector<u32> indices;
+                    vector<v2f> uvs;
+                    vector<v3f> normals;
+                    f32 xoffset{0};
+                    f32 yoffset{0};
+                    str text = l.text();
+                    const auto& f = l.font()->content();
+                    auto common = f->common();
+                    v2f texture_size;
+                    texture_size.x = common.atlas_width;
+                    texture_size.y = common.atlas_height;
+
+                    vertices.resize(text.size() * 4);
+                    uvs.resize(vertices.size());
+                    indices.resize(text.size() * 6);
+                    f32 x_pos{0};
+                    f32 y_pos{0};
+                    u32 prev_char{0};
+                    for (size_t i = 0; i < text.size(); i++) {
+                        if ( text[i] == '\n' ) {
+                            y_pos -= f->common().line_height;
+                            x_pos = 0;
+                            prev_char = 0;
+                            continue;
+                        }
+                        auto data = f->data(text[i]);
+                        xoffset = 0;
+                        yoffset = data.yoffset;
+                        if ( prev_char != 0 ) {
+                            xoffset = f->kerning(prev_char, data.id);
+                        }
+                        prev_char = data.id;
+                        size_t start_vertices = i * 4;
+                        vertices[start_vertices    ] = v3f(x_pos + xoffset,
+                                                           y_pos + yoffset, 0);
+                        vertices[start_vertices + 1] = v3f(x_pos + xoffset,
+                                                           y_pos + data.rect.size.y + yoffset, 0);
+                        vertices[start_vertices + 2] = v3f(x_pos + data.rect.size.x + xoffset,
+                                                           y_pos + data.rect.size.y + yoffset, 0);
+                        vertices[start_vertices + 3] = v3f(x_pos + data.rect.size.x + xoffset,
+                                                           y_pos + yoffset, 0);
+
+                        uvs[start_vertices    ] = v2f(data.rect.position.x / texture_size.x,
+                                                 data.rect.position.y / texture_size.y);
+                        uvs[start_vertices + 1] = v2f(data.rect.position.x / texture_size.x,
+                                                 (data.rect.position.y + data.rect.size.y) / texture_size.y);
+                        uvs[start_vertices + 2] = v2f((data.rect.position.x + data.rect.size.x) / texture_size.x,
+                                                 (data.rect.position.y + data.rect.size.y) / texture_size.y);
+                        uvs[start_vertices + 3] = v2f((data.rect.position.x + data.rect.size.x) / texture_size.x,
+                                                 data.rect.position.y / texture_size.y);
+
+                        size_t start_indices = i * 6;
+                        indices[start_indices]     = start_vertices;
+                        indices[start_indices + 1] = start_vertices + 1;
+                        indices[start_indices + 2] = start_vertices + 2;
+                        indices[start_indices + 3] = start_vertices + 2;
+                        indices[start_indices + 4] = start_vertices + 3;
+                        indices[start_indices + 5] = start_vertices;
+
+                        x_pos += data.xadvance + xoffset;
+                    }
+
+                    mesh m;
+                    m.set_vertices(std::move(vertices));
+                    m.set_indices(0, std::move(indices));
+                    m.set_uvs(0, std::move(uvs));
+
+                    model content;
+                    content.set_mesh(mesh_asset::create(m));
+                    content.regenerate_geometry(the<render>());
+                    mr.model()->fill(content);
+                    l.dirty(false);
+
+                    const model& mod = mr.model()->content();
+                    (const_cast<model*>(&mod))->regenerate_geometry(the<render>());//TODO: const cast
+                }
+            });
+        }
+    };
+
+    //
+    // label_system
+    //
+
+    label_system::label_system()
+    : state_(new internal_state()) {}
+    label_system::~label_system() noexcept = default;
+
+    void label_system::process(ecs::registry& owner) {
+        state_->process(owner);
+    }
+}
diff --git a/sources/enduro2d/high/bmfont.cpp b/sources/enduro2d/utils/font.cpp
similarity index 75%
rename from sources/enduro2d/high/bmfont.cpp
rename to sources/enduro2d/utils/font.cpp
index dc5c74ba..99bef6fc 100644
--- a/sources/enduro2d/high/bmfont.cpp
+++ b/sources/enduro2d/utils/font.cpp
@@ -4,13 +4,17 @@
  * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
  ******************************************************************************/
 
-#include <enduro2d/high/bmfont.hpp>
+#include <enduro2d/utils/font.hpp>
 #include <sstream>
 
 namespace e2d
 {
-    bmfont_ptr bmfont::create (str_view content) {
-        bmfont_ptr b = std::make_shared<bmfont>();
+    u64 makeKerningKey (u32 first, u32 second) noexcept {
+        return (static_cast<u64>(first) << 32) | static_cast<u64>(second);
+    }
+
+    font_ptr font::create (str_view content) {
+        font_ptr b = std::make_shared<font>();
         str s{content.data()};
         std::replace(s.begin(), s.end(), '=', ' ');
         std::replace(s.begin(), s.end(), ',', ' ');
@@ -46,9 +50,15 @@ namespace e2d
                 while (!line_stream.eof()) {
                     if (tag == "lineHeight") {
                         line_stream >>  b->common_.line_height;
+                    } else if (tag == "base") {
+                        line_stream >>  b->common_.base;
                     } else if (tag == "pages") {
                         line_stream >>  b->common_.pages;
                          b->pages_.resize( b->common_.pages);
+                    } else if (tag == "scaleW") {
+                        line_stream >>  b->common_.atlas_width;
+                    } else if (tag == "scaleH") {
+                        line_stream >>  b->common_.atlas_height;
                     }
                     line_stream >> tag;
                 }
@@ -93,15 +103,17 @@ namespace e2d
                         line_stream >> c.rect.position.x;
                     } else if (tag == "y") {
                         line_stream >> c.rect.position.y;
-                    } else if (tag == "widht") {
+                    } else if (tag == "width") {
                         line_stream >> c.rect.size.x;
                     } else if (tag == "height") {
                         line_stream >> c.rect.size.y;
-                        c.rect.position.y -= c.rect.size.y;
+                        c.rect.position.y = b->common_.atlas_height - c.rect.position.y - c.rect.size.y;
                     } else if (tag == "xoffset") {
                         line_stream >> c.xoffset;
                     } else if (tag == "yoffset") {
                         line_stream >> c.yoffset;
+                        c.yoffset = b->common_.base - c.yoffset - c.rect.size.y;
+//                        c.yoffset = -(b->common_.line_height - c.yoffset);
                     } else if (tag == "xadvance") {
                         line_stream >> c.xadvance;
                     } else if (tag == "page") {
@@ -139,9 +151,37 @@ namespace e2d
             }
         }
 
-         b->chars_.insert(b->chars_.begin(), chars.begin(), chars.begin()+chars_counter);
-         b->kerning_.insert(b->kerning_.begin(), kerning.begin(), kerning.begin()+kerning_counter);
+        b->chars_.insert(b->chars_.begin(), chars.begin(), chars.begin()+chars_counter);
+        b->kerning_.reserve(kerning_counter);
+        u64 key{0};
+        for ( int i = 0; i < kerning_counter; i++ ) {
+            b->kerning_.insert_or_assign(makeKerningKey(kerning[i].first,kerning[i].second),
+                                         kerning[i].amount);
+        }
 
         return b;
     }
+
+    font::char_data font::data (u32 charId) const noexcept {
+        for ( auto& c: chars_ ) {
+            if (c.id == charId) {
+                return c;
+            }
+        }
+
+        return font::char_data();
+    }
+
+    font::common_data font::common() const noexcept {
+        return common_;
+    }
+
+    i32 font::kerning (u32 first, u32 second) const noexcept {
+        auto it = kerning_.find(makeKerningKey(first,second));
+        if (it != kerning_.end()) {
+            return it->second;
+        }
+
+        return 0;
+    }
 }

From f1997890e530c692b5b8fc06746863d69ba4be5d Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Wed, 17 Jul 2019 17:35:34 +0300
Subject: [PATCH 005/108] update label

---
 headers/enduro2d/high/assets/font_asset.hpp   |   2 +-
 headers/enduro2d/high/components/label.hpp    |  34 ++++--
 headers/enduro2d/utils/font.hpp               |  10 +-
 samples/bin/library/font_material.json        |   4 +-
 samples/bin/library/font_shader.frag          |  11 ++
 samples/bin/library/font_shader.json          |   4 +
 samples/bin/library/font_shader.vert          |  17 +++
 samples/sources/sample_07/sample_07.cpp       |   5 +-
 sources/enduro2d/high/assets/font_asset.cpp   |   7 +-
 .../enduro2d/high/systems/label_system.cpp    | 100 +++++++++++-------
 sources/enduro2d/utils/font.cpp               |  60 ++++++-----
 11 files changed, 158 insertions(+), 96 deletions(-)
 create mode 100644 samples/bin/library/font_shader.frag
 create mode 100644 samples/bin/library/font_shader.json
 create mode 100644 samples/bin/library/font_shader.vert

diff --git a/headers/enduro2d/high/assets/font_asset.hpp b/headers/enduro2d/high/assets/font_asset.hpp
index b85e895f..b263fe6b 100644
--- a/headers/enduro2d/high/assets/font_asset.hpp
+++ b/headers/enduro2d/high/assets/font_asset.hpp
@@ -12,7 +12,7 @@
 
 namespace e2d
 {
-    class font_asset final : public content_asset<font_asset, font_ptr> {
+    class font_asset final : public content_asset<font_asset, font> {
     public:
         static const char* type_name() noexcept { return "bmfont_asset"; }
         static load_async_result load_async(const library& library, str_view address);
diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
index 0495292d..404ddd23 100644
--- a/headers/enduro2d/high/components/label.hpp
+++ b/headers/enduro2d/high/components/label.hpp
@@ -16,20 +16,24 @@ namespace e2d
     class label final {
     public:
         label() = default;
-        label(const str_view text);
+        label(str32_view text);
 
-        label& text(const str_view text) noexcept;
-        const str& text() const noexcept;
+        label& text(str32_view text);
+        const str32& text() const noexcept;
 
         label& dirty(bool dirty) noexcept;
         bool dirty() const noexcept;
 
         label& font(const font_asset::ptr& font) noexcept;
         const font_asset::ptr&  font() const noexcept;
+
+        label& tint(const color32& value) noexcept;
+        const color32& tint() const noexcept;
     private:
         bool dirty_ = false;
-        str text_;
+        str32 text_;
         font_asset::ptr font_;
+        color32 tint_ = color32::white();
     };
 
     template <>
@@ -49,18 +53,19 @@ namespace e2d
 
 namespace e2d
 {
-    inline label::label(const str_view text)
-    : text_(text),
-    dirty_(false)
-    {}
+    inline label::label(str32_view text)
+    : dirty_(false)
+    {
+        text_ = make_utf32(text);
+    }
 
-    inline label& label::text(const str_view text) noexcept {
+    inline label& label::text(str32_view text) {
         text_ = text;
         dirty_ = true;
         return *this;
     }
 
-    inline const str& label::text() const noexcept {
+    inline const str32& label::text() const noexcept {
         return text_;
     }
 
@@ -82,4 +87,13 @@ namespace e2d
     inline const font_asset::ptr& label::font() const noexcept {
         return font_;
     }
+
+    inline label& label::tint(const color32& value) noexcept {
+        tint_ = value;
+        return *this;
+    }
+
+    inline const color32& label::tint() const noexcept {
+        return tint_;
+    }
 }
diff --git a/headers/enduro2d/utils/font.hpp b/headers/enduro2d/utils/font.hpp
index 29aa73c0..0bee6b24 100644
--- a/headers/enduro2d/utils/font.hpp
+++ b/headers/enduro2d/utils/font.hpp
@@ -12,13 +12,11 @@ namespace e2d
 {
     class font;
 
-    using font_ptr = std::shared_ptr<font>;
-
     class font final {
     public:
         struct char_data {
             u32 id{0};
-            rect<i16> rect;
+            b2hi rect;
             i16 xoffset{0};
             i16 yoffset{0};
             i16 xadvance{0};
@@ -55,11 +53,11 @@ namespace e2d
         font() = default;
         ~font() noexcept = default;
 
-        static font_ptr create(str_view content);
-        char_data data (u32 charId) const noexcept;
+        static font create(str_view content);
+        const char_data* find_char(u32 charId) const noexcept;
         common_data common() const noexcept;
 
-        i32 kerning (u32 first, u32 second) const noexcept;
+        i32 find_kerning(u32 first, u32 second) const noexcept;
     private:
         info_data info_;
         common_data common_;
diff --git a/samples/bin/library/font_material.json b/samples/bin/library/font_material.json
index 5d7f1d7d..d16987f8 100644
--- a/samples/bin/library/font_material.json
+++ b/samples/bin/library/font_material.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "model_shader.json",
+        "shader" : "font_shader.json",
         "state_block" : {
             "capabilities_state" : {
                 "depth_test" : false,
@@ -15,7 +15,7 @@
     "property_block" : {
         "samplers" : [{
             "name" : "u_texture",
-            "texture" : "boundsTestFont.png"
+            "texture" : "bmruen.png"
         }]
     }
 }
diff --git a/samples/bin/library/font_shader.frag b/samples/bin/library/font_shader.frag
new file mode 100644
index 00000000..a04c8752
--- /dev/null
+++ b/samples/bin/library/font_shader.frag
@@ -0,0 +1,11 @@
+#version 120
+
+uniform sampler2D u_texture;
+
+varying vec2 v_st0;
+varying vec4 v_color;
+
+void main() {
+    vec2 st = vec2(v_st0.s, 1.0 - v_st0.t);
+    gl_FragColor = texture2D(u_texture, st) * v_color;
+}
diff --git a/samples/bin/library/font_shader.json b/samples/bin/library/font_shader.json
new file mode 100644
index 00000000..bd0f6615
--- /dev/null
+++ b/samples/bin/library/font_shader.json
@@ -0,0 +1,4 @@
+{
+    "vertex" : "font_shader.vert",
+    "fragment" : "font_shader.frag"
+}
diff --git a/samples/bin/library/font_shader.vert b/samples/bin/library/font_shader.vert
new file mode 100644
index 00000000..0e2e9922
--- /dev/null
+++ b/samples/bin/library/font_shader.vert
@@ -0,0 +1,17 @@
+#version 120
+
+uniform mat4 u_matrix_m;
+uniform mat4 u_matrix_vp;
+
+attribute vec3 a_vertex;
+attribute vec2 a_st0;
+attribute vec4 a_color0;
+
+varying vec2 v_st0;
+varying vec4 v_color;
+
+void main() {
+    v_st0 = a_st0;
+    v_color = a_color0;
+    gl_Position = vec4(a_vertex, 1.0) * u_matrix_m * u_matrix_vp;
+}
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index 1e7c2148..fdee18da 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -61,8 +61,7 @@ namespace
         bool create_scene() {
             auto model_res = the<library>().load_asset<model_asset>("gnome_model.json");
             auto font_mat = the<library>().load_asset<material_asset>("font_material.json");
-            auto bmfont_res = the<library>().load_asset<font_asset>("boundsTestFont.fnt");
-//            auto bmfont_res = the<library>().load_asset<font_asset>("bmfont.fnt");
+            auto bmfont_res = the<library>().load_asset<font_asset>("bmruen.fnt");
 
             if ( !model_res || !font_mat || !bmfont_res ) {
                 return false;
@@ -81,7 +80,7 @@ namespace
 
                 label l;
                 l.font(bmfont_res);
-                l.text("Enduro2d\nis the best\ngame engine\nin the World!");
+                l.text(make_utf32("{Съешь же ещё\nthis мягких french\nбулок, да drink tea!}"));
 
                 label_i->entity_filler()
                 .component<actor>(node::create(label_i, scene_r))
diff --git a/sources/enduro2d/high/assets/font_asset.cpp b/sources/enduro2d/high/assets/font_asset.cpp
index fe6e0a60..515ceb1d 100644
--- a/sources/enduro2d/high/assets/font_asset.cpp
+++ b/sources/enduro2d/high/assets/font_asset.cpp
@@ -26,11 +26,8 @@ namespace e2d
         return library.load_asset_async<text_asset>(address)
         .then([](const text_asset::load_result& text_data){
             return the<deferrer>().do_in_main_thread([text_data](){
-                auto font = font::create(text_data->content());
-                if ( !font ) {
-                    throw bmfont_asset_loading_exception();
-                }
-                return font_asset::create(font);
+                auto f = font::create(text_data->content());
+                return font_asset::create(f);
             });
         });
     }
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index f0897e11..134d6283 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -8,7 +8,6 @@
 
 
 #include <enduro2d/high/components/label.hpp>
-#include <enduro2d/utils/font.hpp>
 #include <enduro2d/high/components/model_renderer.hpp>
 
 
@@ -34,78 +33,97 @@ namespace e2d
                     vector<u32> indices;
                     vector<v2f> uvs;
                     vector<v3f> normals;
+                    vector<color32> colors;
                     f32 xoffset{0};
                     f32 yoffset{0};
-                    str text = l.text();
+                    str32 text = l.text();
                     const auto& f = l.font()->content();
-                    auto common = f->common();
+                    auto common = f.common();
                     v2f texture_size;
                     texture_size.x = common.atlas_width;
                     texture_size.y = common.atlas_height;
 
                     vertices.resize(text.size() * 4);
                     uvs.resize(vertices.size());
+                    colors.resize(vertices.size());
                     indices.resize(text.size() * 6);
                     f32 x_pos{0};
                     f32 y_pos{0};
                     u32 prev_char{0};
                     for (size_t i = 0; i < text.size(); i++) {
                         if ( text[i] == '\n' ) {
-                            y_pos -= f->common().line_height;
+                            y_pos -= f.common().line_height;
                             x_pos = 0;
                             prev_char = 0;
                             continue;
                         }
-                        auto data = f->data(text[i]);
-                        xoffset = 0;
-                        yoffset = data.yoffset;
-                        if ( prev_char != 0 ) {
-                            xoffset = f->kerning(prev_char, data.id);
+                        auto data = f.find_char(text[i]);
+                        if ( data ) {
+                            yoffset = data->yoffset;
+                            xoffset = 0;
+                            if ( prev_char != 0 ) {
+                                xoffset = f.find_kerning(prev_char, data->id);
+                            }
+                            prev_char = data->id;
+                            size_t start_vertices = i * 4;
+                            vertices[start_vertices] = v3f(
+                                x_pos + xoffset,
+                                y_pos + yoffset,
+                                0);
+                            vertices[start_vertices + 1] = v3f(
+                                x_pos + xoffset,
+                                y_pos + data->rect.size.y + yoffset,
+                                0);
+                            vertices[start_vertices + 2] = v3f(
+                                x_pos + data->rect.size.x + xoffset,
+                                y_pos + data->rect.size.y + yoffset,
+                                0);
+                            vertices[start_vertices + 3] = v3f(
+                                x_pos + data->rect.size.x + xoffset,
+                                y_pos + yoffset,
+                                0);
+
+                            uvs[start_vertices] = v2f(
+                                data->rect.position.x / texture_size.x,
+                                data->rect.position.y / texture_size.y);
+                            uvs[start_vertices + 1] = v2f(
+                                data->rect.position.x / texture_size.x,
+                                (data->rect.position.y + data->rect.size.y) / texture_size.y);
+                            uvs[start_vertices + 2] = v2f(
+                                (data->rect.position.x + data->rect.size.x) / texture_size.x,
+                                (data->rect.position.y + data->rect.size.y) / texture_size.y);
+                            uvs[start_vertices + 3] = v2f(
+                                (data->rect.position.x + data->rect.size.x) / texture_size.x,
+                                data->rect.position.y / texture_size.y);
+
+                            colors[start_vertices]     = l.tint();
+                            colors[start_vertices + 1] = l.tint();
+                            colors[start_vertices + 2] = l.tint();
+                            colors[start_vertices + 3] = l.tint();
+
+                            size_t start_indices = i * 6;
+                            indices[start_indices]     = start_vertices;
+                            indices[start_indices + 1] = start_vertices + 1;
+                            indices[start_indices + 2] = start_vertices + 2;
+                            indices[start_indices + 3] = start_vertices + 2;
+                            indices[start_indices + 4] = start_vertices + 3;
+                            indices[start_indices + 5] = start_vertices;
+
+                            x_pos += data->xadvance + xoffset;
                         }
-                        prev_char = data.id;
-                        size_t start_vertices = i * 4;
-                        vertices[start_vertices    ] = v3f(x_pos + xoffset,
-                                                           y_pos + yoffset, 0);
-                        vertices[start_vertices + 1] = v3f(x_pos + xoffset,
-                                                           y_pos + data.rect.size.y + yoffset, 0);
-                        vertices[start_vertices + 2] = v3f(x_pos + data.rect.size.x + xoffset,
-                                                           y_pos + data.rect.size.y + yoffset, 0);
-                        vertices[start_vertices + 3] = v3f(x_pos + data.rect.size.x + xoffset,
-                                                           y_pos + yoffset, 0);
-
-                        uvs[start_vertices    ] = v2f(data.rect.position.x / texture_size.x,
-                                                 data.rect.position.y / texture_size.y);
-                        uvs[start_vertices + 1] = v2f(data.rect.position.x / texture_size.x,
-                                                 (data.rect.position.y + data.rect.size.y) / texture_size.y);
-                        uvs[start_vertices + 2] = v2f((data.rect.position.x + data.rect.size.x) / texture_size.x,
-                                                 (data.rect.position.y + data.rect.size.y) / texture_size.y);
-                        uvs[start_vertices + 3] = v2f((data.rect.position.x + data.rect.size.x) / texture_size.x,
-                                                 data.rect.position.y / texture_size.y);
-
-                        size_t start_indices = i * 6;
-                        indices[start_indices]     = start_vertices;
-                        indices[start_indices + 1] = start_vertices + 1;
-                        indices[start_indices + 2] = start_vertices + 2;
-                        indices[start_indices + 3] = start_vertices + 2;
-                        indices[start_indices + 4] = start_vertices + 3;
-                        indices[start_indices + 5] = start_vertices;
-
-                        x_pos += data.xadvance + xoffset;
                     }
 
                     mesh m;
                     m.set_vertices(std::move(vertices));
                     m.set_indices(0, std::move(indices));
                     m.set_uvs(0, std::move(uvs));
+                    m.set_colors(0, std::move(colors));
 
                     model content;
                     content.set_mesh(mesh_asset::create(m));
                     content.regenerate_geometry(the<render>());
                     mr.model()->fill(content);
                     l.dirty(false);
-
-                    const model& mod = mr.model()->content();
-                    (const_cast<model*>(&mod))->regenerate_geometry(the<render>());//TODO: const cast
                 }
             });
         }
diff --git a/sources/enduro2d/utils/font.cpp b/sources/enduro2d/utils/font.cpp
index 99bef6fc..7a412775 100644
--- a/sources/enduro2d/utils/font.cpp
+++ b/sources/enduro2d/utils/font.cpp
@@ -7,14 +7,19 @@
 #include <enduro2d/utils/font.hpp>
 #include <sstream>
 
-namespace e2d
+namespace
 {
-    u64 makeKerningKey (u32 first, u32 second) noexcept {
+    using namespace e2d;
+
+    u64 make_kerning_key(u32 first, u32 second) noexcept {
         return (static_cast<u64>(first) << 32) | static_cast<u64>(second);
     }
+}
 
-    font_ptr font::create (str_view content) {
-        font_ptr b = std::make_shared<font>();
+namespace e2d
+{
+    font font::create(str_view content) {
+        font b;
         str s{content.data()};
         std::replace(s.begin(), s.end(), '=', ' ');
         std::replace(s.begin(), s.end(), ',', ' ');
@@ -35,12 +40,12 @@ namespace e2d
                 line_stream >> tag;
                 while (!line_stream.eof()) {
                     if (tag == "size") {
-                        line_stream >>  b->info_.size;
+                        line_stream >>  b.info_.size;
                     } else if (tag == "padding") {
-                        line_stream >>  b->info_.padding.up;
-                        line_stream >>  b->info_.padding.right;
-                        line_stream >>  b->info_.padding.down;
-                        line_stream >>  b->info_.padding.left;
+                        line_stream >>  b.info_.padding.up;
+                        line_stream >>  b.info_.padding.right;
+                        line_stream >>  b.info_.padding.down;
+                        line_stream >>  b.info_.padding.left;
                     }
                     line_stream >> tag;
                 }
@@ -49,16 +54,16 @@ namespace e2d
                 line_stream >> tag;
                 while (!line_stream.eof()) {
                     if (tag == "lineHeight") {
-                        line_stream >>  b->common_.line_height;
+                        line_stream >>  b.common_.line_height;
                     } else if (tag == "base") {
-                        line_stream >>  b->common_.base;
+                        line_stream >>  b.common_.base;
                     } else if (tag == "pages") {
-                        line_stream >>  b->common_.pages;
-                         b->pages_.resize( b->common_.pages);
+                        line_stream >>  b.common_.pages;
+                         b.pages_.resize( b.common_.pages);
                     } else if (tag == "scaleW") {
-                        line_stream >>  b->common_.atlas_width;
+                        line_stream >>  b.common_.atlas_width;
                     } else if (tag == "scaleH") {
-                        line_stream >>  b->common_.atlas_height;
+                        line_stream >>  b.common_.atlas_height;
                     }
                     line_stream >> tag;
                 }
@@ -75,7 +80,7 @@ namespace e2d
                         //remove ""
                         file.erase(file.begin());
                         file.pop_back();
-                        b->pages_[id] = file;
+                        b.pages_[id] = file;
                     }
                     line_stream >> tag;
                 }
@@ -107,13 +112,13 @@ namespace e2d
                         line_stream >> c.rect.size.x;
                     } else if (tag == "height") {
                         line_stream >> c.rect.size.y;
-                        c.rect.position.y = b->common_.atlas_height - c.rect.position.y - c.rect.size.y;
+                        c.rect.position.y = b.common_.atlas_height - c.rect.position.y - c.rect.size.y;
                     } else if (tag == "xoffset") {
                         line_stream >> c.xoffset;
                     } else if (tag == "yoffset") {
                         line_stream >> c.yoffset;
-                        c.yoffset = b->common_.base - c.yoffset - c.rect.size.y;
-//                        c.yoffset = -(b->common_.line_height - c.yoffset);
+                        c.yoffset = b.common_.base - c.yoffset - c.rect.size.y;
+//                        c.yoffset = -(b.common_.line_height - c.yoffset);
                     } else if (tag == "xadvance") {
                         line_stream >> c.xadvance;
                     } else if (tag == "page") {
@@ -151,33 +156,32 @@ namespace e2d
             }
         }
 
-        b->chars_.insert(b->chars_.begin(), chars.begin(), chars.begin()+chars_counter);
-        b->kerning_.reserve(kerning_counter);
-        u64 key{0};
+        b.chars_.insert(b.chars_.begin(), chars.begin(), chars.begin()+chars_counter);
+        b.kerning_.reserve(kerning_counter);
         for ( int i = 0; i < kerning_counter; i++ ) {
-            b->kerning_.insert_or_assign(makeKerningKey(kerning[i].first,kerning[i].second),
+            b.kerning_.insert_or_assign(make_kerning_key(kerning[i].first,kerning[i].second),
                                          kerning[i].amount);
         }
 
         return b;
     }
 
-    font::char_data font::data (u32 charId) const noexcept {
+    const font::char_data* font::find_char(u32 charId) const noexcept {
         for ( auto& c: chars_ ) {
             if (c.id == charId) {
-                return c;
+                return &c;
             }
         }
 
-        return font::char_data();
+        return 0;
     }
 
     font::common_data font::common() const noexcept {
         return common_;
     }
 
-    i32 font::kerning (u32 first, u32 second) const noexcept {
-        auto it = kerning_.find(makeKerningKey(first,second));
+    i32 font::find_kerning(u32 first, u32 second) const noexcept {
+        auto it = kerning_.find(make_kerning_key(first,second));
         if (it != kerning_.end()) {
             return it->second;
         }

From 58d12be5486668b15a8e68ebf8e35a822610f5d5 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Wed, 17 Jul 2019 18:42:08 +0300
Subject: [PATCH 006/108] fix kerning

---
 sources/enduro2d/high/systems/label_system.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index 134d6283..faab93f4 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -49,6 +49,7 @@ namespace e2d
                     indices.resize(text.size() * 6);
                     f32 x_pos{0};
                     f32 y_pos{0};
+                    f32 kerning{0};
                     u32 prev_char{0};
                     for (size_t i = 0; i < text.size(); i++) {
                         if ( text[i] == '\n' ) {
@@ -60,10 +61,13 @@ namespace e2d
                         auto data = f.find_char(text[i]);
                         if ( data ) {
                             yoffset = data->yoffset;
-                            xoffset = 0;
+                            xoffset = data->xoffset;
                             if ( prev_char != 0 ) {
-                                xoffset = f.find_kerning(prev_char, data->id);
+                                kerning = f.find_kerning(prev_char, data->id);
+                            } else {
+                                kerning = 0;
                             }
+                            xoffset += kerning;
                             prev_char = data->id;
                             size_t start_vertices = i * 4;
                             vertices[start_vertices] = v3f(
@@ -109,7 +113,7 @@ namespace e2d
                             indices[start_indices + 4] = start_vertices + 3;
                             indices[start_indices + 5] = start_vertices;
 
-                            x_pos += data->xadvance + xoffset;
+                            x_pos += data->xadvance + kerning;
                         }
                     }
 

From 0813c05fd233aa1b14806b04b1557267d94b3ce0 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Wed, 17 Jul 2019 20:10:26 +0300
Subject: [PATCH 007/108] added standart functions to label

---
 headers/enduro2d/high/components/label.hpp | 16 ++++++
 sources/enduro2d/high/components/label.cpp | 67 ++++++++++++++++++++++
 2 files changed, 83 insertions(+)

diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
index 404ddd23..46966450 100644
--- a/headers/enduro2d/high/components/label.hpp
+++ b/headers/enduro2d/high/components/label.hpp
@@ -18,6 +18,22 @@ namespace e2d
         label() = default;
         label(str32_view text);
 
+        label(label&& other) noexcept;
+        label& operator=(label&& other) noexcept;
+
+        label(const label& other);
+        label& operator=(const label& other);
+
+        label(str32_view text, font_asset::ptr font, color32 tint);
+
+        label& assign(label&& other) noexcept;
+        label& assign(const label& other);
+        label& assign(str32_view text, font_asset::ptr font, color32 tint);
+
+        void swap(label& other) noexcept;
+        void clear() noexcept;
+        bool empty() const noexcept;
+
         label& text(str32_view text);
         const str32& text() const noexcept;
 
diff --git a/sources/enduro2d/high/components/label.cpp b/sources/enduro2d/high/components/label.cpp
index 18e01e1c..0a4b74d1 100644
--- a/sources/enduro2d/high/components/label.cpp
+++ b/sources/enduro2d/high/components/label.cpp
@@ -50,3 +50,70 @@ namespace e2d
         return true;
     }
 }
+
+namespace e2d
+{
+    label::label(label&& other) noexcept {
+        assign(std::move(other));
+    }
+
+    label& label::operator=(label&& other) noexcept {
+        return assign(std::move(other));
+    }
+
+    label::label(const label& other) {
+        assign(other);
+    }
+
+    label& label::operator=(const label& other) {
+        return assign(other);
+    }
+
+    label::label(str32_view text, font_asset::ptr font, color32 tint) {
+        assign(text, font, tint);
+    }
+
+    label& label::assign(label&& other) noexcept {
+        if ( this != &other ) {
+            swap(other);
+            other.clear();
+        }
+        return *this;
+    }
+
+    label& label::assign(const label& other) {
+        if ( this != &other ) {
+            dirty_ = true;
+            text_ = other.text_;
+            font_ = other.font_;
+            tint_ = other.tint_;
+        }
+        return *this;
+    }
+
+    label& label::assign(str32_view text, font_asset::ptr font, color32 tint) {
+        dirty_ = false;
+        text_ = text;
+        font_ = font;
+        tint_ = tint;
+    }
+
+    void label::swap(label& other) noexcept {
+        using std::swap;
+        swap(dirty_, other.dirty_);
+        swap(text_, other.text_);
+        swap(font_, other.font_);
+        swap(tint_, other.tint_);
+    }
+
+    void label::clear() noexcept {
+        dirty_ = true;
+        text_.clear();
+        font_ = nullptr;
+        tint_ = color32::white();
+    }
+
+    bool label::empty() const noexcept {
+        return text_.empty();
+    }
+}

From d434472666815c54ac4cb8cca80cd9d5567ca9d5 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Fri, 19 Jul 2019 01:06:45 +0700
Subject: [PATCH 008/108] update ecs.hpp submodule

---
 headers/3rdparty/ecs.hpp/ecs.hpp | 23 +++++++++++++++++++++++
 modules/ecs.hpp                  |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/headers/3rdparty/ecs.hpp/ecs.hpp b/headers/3rdparty/ecs.hpp/ecs.hpp
index 48835fb9..faa1969b 100644
--- a/headers/3rdparty/ecs.hpp/ecs.hpp
+++ b/headers/3rdparty/ecs.hpp/ecs.hpp
@@ -679,6 +679,12 @@ namespace ecs_hpp
                 return components_.unordered_erase(id);
             }
 
+            std::size_t remove_all() noexcept {
+                const std::size_t count = components_.size();
+                components_.clear();
+                return count;
+            }
+
             T* find(entity_id id) noexcept {
                 return components_.find(id);
             }
@@ -744,6 +750,12 @@ namespace ecs_hpp
                 return components_.unordered_erase(id);
             }
 
+            std::size_t remove_all() noexcept {
+                const std::size_t count = components_.size();
+                components_.clear();
+                return count;
+            }
+
             T* find(entity_id id) noexcept {
                 return components_.has(id)
                     ? &empty_value_
@@ -1260,6 +1272,9 @@ namespace ecs_hpp
 
         std::size_t remove_all_components(const uentity& ent) noexcept;
 
+        template < typename T >
+        std::size_t remove_all_components() noexcept;
+
         template < typename T >
         T& get_component(const uentity& ent);
         template < typename T >
@@ -2190,6 +2205,14 @@ namespace ecs_hpp
         return removed_count;
     }
 
+    template < typename T >
+    std::size_t registry::remove_all_components() noexcept {
+        detail::component_storage<T>* storage = find_storage_<T>();
+        return storage
+            ? storage->remove_all()
+            : 0u;
+    }
+
     template < typename T >
     T& registry::get_component(const uentity& ent) {
         assert(valid_entity(ent));
diff --git a/modules/ecs.hpp b/modules/ecs.hpp
index 0a5ea673..ebbb5bf3 160000
--- a/modules/ecs.hpp
+++ b/modules/ecs.hpp
@@ -1 +1 @@
-Subproject commit 0a5ea673ea2b895a04e905868e18ad200d38ce37
+Subproject commit ebbb5bf30ddfcbe8e5828e7ea43b430f777c9b0f

From e74f11394809df70e03da47de55f3912d9f7e457 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Mon, 22 Jul 2019 10:52:14 +0300
Subject: [PATCH 009/108] add label:dirty component

---
 headers/enduro2d/high/components/label.hpp    |  42 +---
 samples/sources/sample_07/sample_07.cpp       |  11 +-
 sources/enduro2d/high/components/label.cpp    |  67 ------
 .../enduro2d/high/systems/label_system.cpp    | 194 +++++++++---------
 4 files changed, 106 insertions(+), 208 deletions(-)

diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
index 46966450..acb14624 100644
--- a/headers/enduro2d/high/components/label.hpp
+++ b/headers/enduro2d/high/components/label.hpp
@@ -15,38 +15,19 @@ namespace e2d
 {
     class label final {
     public:
+        class dirty final {};
+
         label() = default;
-        label(str32_view text);
-
-        label(label&& other) noexcept;
-        label& operator=(label&& other) noexcept;
-
-        label(const label& other);
-        label& operator=(const label& other);
-
-        label(str32_view text, font_asset::ptr font, color32 tint);
-
-        label& assign(label&& other) noexcept;
-        label& assign(const label& other);
-        label& assign(str32_view text, font_asset::ptr font, color32 tint);
-
-        void swap(label& other) noexcept;
-        void clear() noexcept;
-        bool empty() const noexcept;
-
+        
         label& text(str32_view text);
         const str32& text() const noexcept;
 
-        label& dirty(bool dirty) noexcept;
-        bool dirty() const noexcept;
-
         label& font(const font_asset::ptr& font) noexcept;
         const font_asset::ptr&  font() const noexcept;
 
         label& tint(const color32& value) noexcept;
         const color32& tint() const noexcept;
     private:
-        bool dirty_ = false;
         str32 text_;
         font_asset::ptr font_;
         color32 tint_ = color32::white();
@@ -69,15 +50,8 @@ namespace e2d
 
 namespace e2d
 {
-    inline label::label(str32_view text)
-    : dirty_(false)
-    {
-        text_ = make_utf32(text);
-    }
-
     inline label& label::text(str32_view text) {
         text_ = text;
-        dirty_ = true;
         return *this;
     }
 
@@ -85,18 +59,8 @@ namespace e2d
         return text_;
     }
 
-    inline label& label::dirty(bool dirty) noexcept {
-        dirty_ = dirty;
-        return *this;
-    }
-
-    inline bool label::dirty() const noexcept {
-        return dirty_;
-    }
-
     inline label& label::font(const font_asset::ptr& font) noexcept {
         font_ = font;
-        dirty_ = true;
         return *this;
     }
 
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index fdee18da..8e510592 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -83,11 +83,12 @@ namespace
                 l.text(make_utf32("{Съешь же ещё\nthis мягких french\nбулок, да drink tea!}"));
 
                 label_i->entity_filler()
-                .component<actor>(node::create(label_i, scene_r))
-                .component<label>(l)
-                .component<renderer>(renderer()
-                                     .materials({font_mat}))
-                .component<model_renderer>(model_res);
+                    .component<actor>(node::create(label_i, scene_r))
+                    .component<label>(l)
+                    .component<label::dirty>(label::dirty())
+                    .component<renderer>(renderer()
+                                         .materials({font_mat}))
+                    .component<model_renderer>(model_res);
 
                 node_iptr label_n = label_i->get_component<actor>().get().node();
                 label_n->translation(v3f{-300.f,0.f,0.f});
diff --git a/sources/enduro2d/high/components/label.cpp b/sources/enduro2d/high/components/label.cpp
index 0a4b74d1..18e01e1c 100644
--- a/sources/enduro2d/high/components/label.cpp
+++ b/sources/enduro2d/high/components/label.cpp
@@ -50,70 +50,3 @@ namespace e2d
         return true;
     }
 }
-
-namespace e2d
-{
-    label::label(label&& other) noexcept {
-        assign(std::move(other));
-    }
-
-    label& label::operator=(label&& other) noexcept {
-        return assign(std::move(other));
-    }
-
-    label::label(const label& other) {
-        assign(other);
-    }
-
-    label& label::operator=(const label& other) {
-        return assign(other);
-    }
-
-    label::label(str32_view text, font_asset::ptr font, color32 tint) {
-        assign(text, font, tint);
-    }
-
-    label& label::assign(label&& other) noexcept {
-        if ( this != &other ) {
-            swap(other);
-            other.clear();
-        }
-        return *this;
-    }
-
-    label& label::assign(const label& other) {
-        if ( this != &other ) {
-            dirty_ = true;
-            text_ = other.text_;
-            font_ = other.font_;
-            tint_ = other.tint_;
-        }
-        return *this;
-    }
-
-    label& label::assign(str32_view text, font_asset::ptr font, color32 tint) {
-        dirty_ = false;
-        text_ = text;
-        font_ = font;
-        tint_ = tint;
-    }
-
-    void label::swap(label& other) noexcept {
-        using std::swap;
-        swap(dirty_, other.dirty_);
-        swap(text_, other.text_);
-        swap(font_, other.font_);
-        swap(tint_, other.tint_);
-    }
-
-    void label::clear() noexcept {
-        dirty_ = true;
-        text_.clear();
-        font_ = nullptr;
-        tint_ = color32::white();
-    }
-
-    bool label::empty() const noexcept {
-        return text_.empty();
-    }
-}
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index faab93f4..a92c2d5b 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -23,113 +23,113 @@ namespace e2d
         ~internal_state() noexcept = default;
 
         void process(ecs::registry& owner) {
-            owner.for_joined_components<label, model_renderer>([](
+            owner.for_joined_components<label, label::dirty, model_renderer>([](
                 const ecs::const_entity&,
                 label& l,
+                label::dirty&,
                 model_renderer& mr)
             {
-                if (l.dirty()) {
-                    vector<v3f> vertices;
-                    vector<u32> indices;
-                    vector<v2f> uvs;
-                    vector<v3f> normals;
-                    vector<color32> colors;
-                    f32 xoffset{0};
-                    f32 yoffset{0};
-                    str32 text = l.text();
-                    const auto& f = l.font()->content();
-                    auto common = f.common();
-                    v2f texture_size;
-                    texture_size.x = common.atlas_width;
-                    texture_size.y = common.atlas_height;
+                vector<v3f> vertices;
+                vector<u32> indices;
+                vector<v2f> uvs;
+                vector<v3f> normals;
+                vector<color32> colors;
+                f32 xoffset{0};
+                f32 yoffset{0};
+                str32 text = l.text();
+                const auto& f = l.font()->content();
+                auto common = f.common();
+                v2f texture_size;
+                texture_size.x = common.atlas_width;
+                texture_size.y = common.atlas_height;
 
-                    vertices.resize(text.size() * 4);
-                    uvs.resize(vertices.size());
-                    colors.resize(vertices.size());
-                    indices.resize(text.size() * 6);
-                    f32 x_pos{0};
-                    f32 y_pos{0};
-                    f32 kerning{0};
-                    u32 prev_char{0};
-                    for (size_t i = 0; i < text.size(); i++) {
-                        if ( text[i] == '\n' ) {
-                            y_pos -= f.common().line_height;
-                            x_pos = 0;
-                            prev_char = 0;
-                            continue;
-                        }
-                        auto data = f.find_char(text[i]);
-                        if ( data ) {
-                            yoffset = data->yoffset;
-                            xoffset = data->xoffset;
-                            if ( prev_char != 0 ) {
-                                kerning = f.find_kerning(prev_char, data->id);
-                            } else {
-                                kerning = 0;
-                            }
-                            xoffset += kerning;
-                            prev_char = data->id;
-                            size_t start_vertices = i * 4;
-                            vertices[start_vertices] = v3f(
-                                x_pos + xoffset,
-                                y_pos + yoffset,
-                                0);
-                            vertices[start_vertices + 1] = v3f(
-                                x_pos + xoffset,
-                                y_pos + data->rect.size.y + yoffset,
-                                0);
-                            vertices[start_vertices + 2] = v3f(
-                                x_pos + data->rect.size.x + xoffset,
-                                y_pos + data->rect.size.y + yoffset,
-                                0);
-                            vertices[start_vertices + 3] = v3f(
-                                x_pos + data->rect.size.x + xoffset,
-                                y_pos + yoffset,
-                                0);
-
-                            uvs[start_vertices] = v2f(
-                                data->rect.position.x / texture_size.x,
-                                data->rect.position.y / texture_size.y);
-                            uvs[start_vertices + 1] = v2f(
-                                data->rect.position.x / texture_size.x,
-                                (data->rect.position.y + data->rect.size.y) / texture_size.y);
-                            uvs[start_vertices + 2] = v2f(
-                                (data->rect.position.x + data->rect.size.x) / texture_size.x,
-                                (data->rect.position.y + data->rect.size.y) / texture_size.y);
-                            uvs[start_vertices + 3] = v2f(
-                                (data->rect.position.x + data->rect.size.x) / texture_size.x,
-                                data->rect.position.y / texture_size.y);
-
-                            colors[start_vertices]     = l.tint();
-                            colors[start_vertices + 1] = l.tint();
-                            colors[start_vertices + 2] = l.tint();
-                            colors[start_vertices + 3] = l.tint();
-
-                            size_t start_indices = i * 6;
-                            indices[start_indices]     = start_vertices;
-                            indices[start_indices + 1] = start_vertices + 1;
-                            indices[start_indices + 2] = start_vertices + 2;
-                            indices[start_indices + 3] = start_vertices + 2;
-                            indices[start_indices + 4] = start_vertices + 3;
-                            indices[start_indices + 5] = start_vertices;
-
-                            x_pos += data->xadvance + kerning;
-                        }
+                vertices.resize(text.size() * 4);
+                uvs.resize(vertices.size());
+                colors.resize(vertices.size());
+                indices.resize(text.size() * 6);
+                f32 x_pos{0};
+                f32 y_pos{0};
+                f32 kerning{0};
+                u32 prev_char{0};
+                for (size_t i = 0; i < text.size(); i++) {
+                    if ( text[i] == '\n' ) {
+                        y_pos -= f.common().line_height;
+                        x_pos = 0;
+                        prev_char = 0;
+                        continue;
                     }
+                    auto data = f.find_char(text[i]);
+                    if ( data ) {
+                        yoffset = data->yoffset;
+                        xoffset = data->xoffset;
+                        if ( prev_char != 0 ) {
+                            kerning = f.find_kerning(prev_char, data->id);
+                        } else {
+                            kerning = 0;
+                        }
+                        xoffset += kerning;
+                        prev_char = data->id;
+                        size_t start_vertices = i * 4;
+                        vertices[start_vertices] = v3f(
+                            x_pos + xoffset,
+                            y_pos + yoffset,
+                            0);
+                        vertices[start_vertices + 1] = v3f(
+                            x_pos + xoffset,
+                            y_pos + data->rect.size.y + yoffset,
+                            0);
+                        vertices[start_vertices + 2] = v3f(
+                            x_pos + data->rect.size.x + xoffset,
+                            y_pos + data->rect.size.y + yoffset,
+                            0);
+                        vertices[start_vertices + 3] = v3f(
+                            x_pos + data->rect.size.x + xoffset,
+                            y_pos + yoffset,
+                            0);
 
-                    mesh m;
-                    m.set_vertices(std::move(vertices));
-                    m.set_indices(0, std::move(indices));
-                    m.set_uvs(0, std::move(uvs));
-                    m.set_colors(0, std::move(colors));
+                        uvs[start_vertices] = v2f(
+                            data->rect.position.x / texture_size.x,
+                            data->rect.position.y / texture_size.y);
+                        uvs[start_vertices + 1] = v2f(
+                            data->rect.position.x / texture_size.x,
+                            (data->rect.position.y + data->rect.size.y) / texture_size.y);
+                        uvs[start_vertices + 2] = v2f(
+                            (data->rect.position.x + data->rect.size.x) / texture_size.x,
+                            (data->rect.position.y + data->rect.size.y) / texture_size.y);
+                        uvs[start_vertices + 3] = v2f(
+                            (data->rect.position.x + data->rect.size.x) / texture_size.x,
+                            data->rect.position.y / texture_size.y);
 
-                    model content;
-                    content.set_mesh(mesh_asset::create(m));
-                    content.regenerate_geometry(the<render>());
-                    mr.model()->fill(content);
-                    l.dirty(false);
+                        colors[start_vertices]     = l.tint();
+                        colors[start_vertices + 1] = l.tint();
+                        colors[start_vertices + 2] = l.tint();
+                        colors[start_vertices + 3] = l.tint();
+
+                        size_t start_indices = i * 6;
+                        indices[start_indices]     = start_vertices;
+                        indices[start_indices + 1] = start_vertices + 1;
+                        indices[start_indices + 2] = start_vertices + 2;
+                        indices[start_indices + 3] = start_vertices + 2;
+                        indices[start_indices + 4] = start_vertices + 3;
+                        indices[start_indices + 5] = start_vertices;
+
+                        x_pos += data->xadvance + kerning;
+                    }
                 }
+
+                mesh m;
+                m.set_vertices(std::move(vertices));
+                m.set_indices(0, std::move(indices));
+                m.set_uvs(0, std::move(uvs));
+                m.set_colors(0, std::move(colors));
+
+                model content;
+                content.set_mesh(mesh_asset::create(m));
+                content.regenerate_geometry(the<render>());
+                mr.model()->fill(content);
             });
+
+            owner.remove_all_components<label::dirty>();
         }
     };
 

From 2501993dbd7309eb6ec3fcc7d2f0dc205d44a9dd Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Mon, 22 Jul 2019 10:53:29 +0300
Subject: [PATCH 010/108] add standart functions to font

---
 headers/enduro2d/utils/font.hpp |  64 ++++++++++--
 sources/enduro2d/utils/font.cpp | 173 ++++++++++++++++++++++++++++++--
 2 files changed, 218 insertions(+), 19 deletions(-)

diff --git a/headers/enduro2d/utils/font.hpp b/headers/enduro2d/utils/font.hpp
index 0bee6b24..a37d3751 100644
--- a/headers/enduro2d/utils/font.hpp
+++ b/headers/enduro2d/utils/font.hpp
@@ -25,15 +25,7 @@ namespace e2d
         };
 
         struct info_data {
-            struct padding_data {
-                i16 up{0};
-                i16 right{0};
-                i16 down{0};
-                i16 left{0};
-            };
-
             u32 size{0};
-            padding_data padding;
         };
 
         struct kerning_data {
@@ -53,9 +45,55 @@ namespace e2d
         font() = default;
         ~font() noexcept = default;
 
+        font(font&& other) noexcept;
+        font& operator=(font&& other) noexcept;
+
+        font(const font& other);
+        font& operator=(const font& other);
+
+        font(
+             info_data&& info,
+             common_data&& common,
+             vector<str>&& pages,
+             vector<char_data>&& chars,
+             flat_map<u64,i32>&& kerning) noexcept;
+
+        font(
+             const info_data& info,
+             const common_data& common,
+             const vector<str>& pages,
+             const vector<char_data>& chars,
+             const flat_map<u64,i32>& kerning);
+
+        font& assign(font&& other) noexcept;
+        font& assign(const font& other);
+
+        font& assign(
+             info_data&& info,
+             common_data&& common,
+             vector<str>&& pages,
+             vector<char_data>&& chars,
+             flat_map<u64,i32>&& kerning) noexcept;
+
+        font& assign(
+             const info_data& info,
+             const common_data& common,
+             const vector<str>& pages,
+             const vector<char_data>& chars,
+             const flat_map<u64,i32>& kerning);
+
+        void swap(font& other) noexcept;
+        void clear() noexcept;
+        bool empty() const noexcept;
+
+        const info_data& info() const noexcept;
+        const common_data& common() const noexcept;
+        const vector<str>& pages() const noexcept;
+        const vector<char_data>& chars() const noexcept;
+        const flat_map<u64,i32>& kerning() const noexcept;
+
         static font create(str_view content);
         const char_data* find_char(u32 charId) const noexcept;
-        common_data common() const noexcept;
 
         i32 find_kerning(u32 first, u32 second) const noexcept;
     private:
@@ -65,4 +103,12 @@ namespace e2d
         vector<char_data> chars_;
         flat_map<u64,i32> kerning_;
     };
+
+    bool operator==(const font::info_data& l, const font::info_data& r) noexcept;
+    bool operator==(const font::common_data& l, const font::common_data& r) noexcept;
+    bool operator==(const font::char_data& l, const font::char_data& r) noexcept;
+
+    void swap(font& l, font& r) noexcept;
+    bool operator==(const font& l, const font& r) noexcept;
+    bool operator!=(const font& l, const font& r) noexcept;
 }
diff --git a/sources/enduro2d/utils/font.cpp b/sources/enduro2d/utils/font.cpp
index 7a412775..4e2575d1 100644
--- a/sources/enduro2d/utils/font.cpp
+++ b/sources/enduro2d/utils/font.cpp
@@ -18,6 +18,126 @@ namespace
 
 namespace e2d
 {
+    font::font(font&& other) noexcept {
+        assign(std::move(other));
+    }
+
+    font& font::operator=(font&& other) noexcept {
+        return assign(std::move(other));
+    }
+
+    font::font(const font& other) {
+        assign(other);
+    }
+
+    font& font::operator=(const font& other) {
+        return assign(other);
+    }
+
+    font::font(
+        font::info_data&& info,
+        font::common_data&& common,
+        vector<str>&& pages,
+        vector<font::char_data>&& chars,
+        flat_map<u64,i32>&& kerning) noexcept {
+        assign(info, common, pages, chars, kerning);
+    }
+
+    font::font(
+        const font::info_data& info,
+        const font::common_data& common,
+        const vector<str>& pages,
+        const vector<font::char_data>& chars,
+        const flat_map<u64,i32>& kerning) {
+        assign(info, common, pages, chars, kerning);
+    }
+
+    font& font::assign(font&& other) noexcept {
+        if ( this != &other ) {
+            swap(other);
+            other.clear();
+        }
+        return *this;
+    }
+
+    font& font::assign(const font& other) {
+        if ( this != &other ) {
+            info_ = other.info_;
+            common_ = other.common_;
+            pages_ = other.pages_;
+            chars_ = other.chars_;
+            kerning_ = other.kerning_;
+        }
+        return *this;
+    }
+
+    font& font::assign(
+        font::info_data&& info,
+        font::common_data&& common,
+        vector<str>&& pages,
+        vector<font::char_data>&& chars,
+        flat_map<u64,i32>&& kerning) noexcept {
+        info_ = std::move(info);
+        common_ = std::move(common);
+        pages_ = std::move(pages);
+        chars_ = std::move(chars);
+        kerning_ = std::move(kerning);
+        return *this;
+    }
+
+    font& font::assign(
+        const font::info_data& info,
+        const font::common_data& common,
+        const vector<str>& pages,
+        const vector<font::char_data>& chars,
+        const flat_map<u64,i32>& kerning) {
+        info_ = info;
+        common_ = common;
+        pages_ = pages;
+        chars_ = chars;
+        kerning_ = kerning;
+        return *this;
+    }
+
+    void font::swap(font& other) noexcept {
+        using std::swap;
+        swap(info_, other.info_);
+        swap(common_, other.common_);
+        swap(pages_, other.pages_);
+        swap(chars_, other.chars_);
+        swap(kerning_, other.kerning_);
+    }
+
+    void font::clear() noexcept {
+        pages_.clear();
+        chars_.clear();
+        kerning_.clear();
+    }
+
+    bool font::empty() const noexcept {
+        return pages_.empty();
+    }
+
+    const font::info_data& font::info() const noexcept {
+        return info_;
+    }
+
+    const font::common_data& font::common() const noexcept {
+        return common_;
+    }
+
+    const vector<str>& font::pages() const noexcept {
+        return pages_;
+    }
+
+    const vector<font::char_data>& font::chars() const noexcept {
+        return chars_;
+    }
+
+    const flat_map<u64,i32>& font::kerning() const noexcept {
+        return kerning_;
+    }
+
     font font::create(str_view content) {
         font b;
         str s{content.data()};
@@ -41,11 +161,6 @@ namespace e2d
                 while (!line_stream.eof()) {
                     if (tag == "size") {
                         line_stream >>  b.info_.size;
-                    } else if (tag == "padding") {
-                        line_stream >>  b.info_.padding.up;
-                        line_stream >>  b.info_.padding.right;
-                        line_stream >>  b.info_.padding.down;
-                        line_stream >>  b.info_.padding.left;
                     }
                     line_stream >> tag;
                 }
@@ -118,7 +233,6 @@ namespace e2d
                     } else if (tag == "yoffset") {
                         line_stream >> c.yoffset;
                         c.yoffset = b.common_.base - c.yoffset - c.rect.size.y;
-//                        c.yoffset = -(b.common_.line_height - c.yoffset);
                     } else if (tag == "xadvance") {
                         line_stream >> c.xadvance;
                     } else if (tag == "page") {
@@ -176,10 +290,6 @@ namespace e2d
         return 0;
     }
 
-    font::common_data font::common() const noexcept {
-        return common_;
-    }
-
     i32 font::find_kerning(u32 first, u32 second) const noexcept {
         auto it = kerning_.find(make_kerning_key(first,second));
         if (it != kerning_.end()) {
@@ -189,3 +299,46 @@ namespace e2d
         return 0;
     }
 }
+
+
+namespace e2d
+{
+    bool operator==(const font::info_data& l, const font::info_data& r) noexcept {
+        return l.size == r.size;
+    }
+
+    bool operator==(const font::common_data& l, const font::common_data& r) noexcept {
+        return l.line_height == r.line_height
+        && l.base == r.base
+        && l.pages == r.pages
+        && l.atlas_width == r.atlas_width
+        && l.atlas_height == r.atlas_height;
+    }
+
+    bool operator==(const font::char_data& l, const font::char_data& r) noexcept {
+        return l.id == r.id
+        && l.rect == r.rect
+        && l.xoffset == r.xoffset
+        && l.yoffset == r.yoffset
+        && l.xadvance == r.xadvance
+        && l.page == r.page
+        && l.chnl == r.chnl;
+    }
+
+
+    void swap(font& l, font& r) noexcept {
+        l.swap(r);
+    }
+
+    bool operator==(const font& l, const font& r) noexcept {
+        return l.info() == r.info()
+        && l.common() == r.common()
+        && l.pages() == r.pages()
+        && l.chars() == r.chars()
+        && l.kerning() == r.kerning();
+    }
+
+    bool operator!=(const font& l, const font& r) noexcept {
+        return !(l == r);
+    }
+}

From 04eece6bb80db4ddb4114afa965ebbc88fe5ae2f Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Mon, 22 Jul 2019 12:09:43 +0300
Subject: [PATCH 011/108] added spine submodule

---
 .gitmodules    | 3 +++
 CMakeLists.txt | 4 ++++
 modules/spine  | 1 +
 3 files changed, 8 insertions(+)
 create mode 160000 modules/spine

diff --git a/.gitmodules b/.gitmodules
index 717fa46f..d7707813 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -40,3 +40,6 @@
 [submodule "modules/curly.hpp"]
 	path = modules/curly.hpp
 	url = https://github.com/BlackMATov/curly.hpp
+[submodule "modules/spine"]
+	path = modules/spine
+	url = https://github.com/EsotericSoftware/spine-runtimes.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5754e92d..83c4226a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -171,6 +171,9 @@ set(glew-cmake_BUILD_MULTI_CONTEXT OFF CACHE INTERNAL "" FORCE)
 add_subdirectory(modules/glew)
 set_target_properties(libglew_static PROPERTIES FOLDER modules)
 
+add_subdirectory(modules/spine/spine-c)
+set_target_properties(spine-c PROPERTIES FOLDER modules)
+
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
     if(CMAKE_SIZEOF_VOID_P EQUAL 4)
         add_library(bass SHARED IMPORTED)
@@ -262,6 +265,7 @@ target_link_libraries(${PROJECT_NAME}
     PRIVATE bass
     PRIVATE glfw
     PRIVATE libglew_static
+    PRIVATE spine-c
     PRIVATE $<$<CXX_COMPILER_ID:MSVC>:winmm.lib>)
 
 target_include_directories(${PROJECT_NAME}
diff --git a/modules/spine b/modules/spine
new file mode 160000
index 00000000..3432d163
--- /dev/null
+++ b/modules/spine
@@ -0,0 +1 @@
+Subproject commit 3432d16374e3c857b33462f2793a4bc40d04d60c

From 7f53bee4ccc6e660d9a9bd298c355a803455a510 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Tue, 23 Jul 2019 15:15:39 +0300
Subject: [PATCH 012/108] label loaded from json

---
 headers/enduro2d/high/components/label.hpp    | 41 +++++++--
 sources/enduro2d/high/assets/font_asset.cpp   |  4 +-
 sources/enduro2d/high/components/label.cpp    | 92 +++++++++++++++----
 sources/enduro2d/high/starter.cpp             |  3 +
 .../enduro2d/high/systems/label_system.cpp    | 16 ++--
 5 files changed, 123 insertions(+), 33 deletions(-)

diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
index acb14624..9d6ee4ff 100644
--- a/headers/enduro2d/high/components/label.hpp
+++ b/headers/enduro2d/high/components/label.hpp
@@ -15,19 +15,23 @@ namespace e2d
 {
     class label final {
     public:
-        class dirty final {};
+        class label_dirty final {};
 
         label() = default;
         
         label& text(str32_view text);
-        const str32& text() const noexcept;
+        [[nodiscard]] const str32& text() const noexcept;
 
         label& font(const font_asset::ptr& font) noexcept;
-        const font_asset::ptr&  font() const noexcept;
+        [[nodiscard]] const font_asset::ptr&  font() const noexcept;
 
         label& tint(const color32& value) noexcept;
-        const color32& tint() const noexcept;
+        [[nodiscard]] const color32& tint() const noexcept;
+
+        label& pivot(const v2f& pivot) noexcept;
+        [[nodiscard]] const v2f& pivot() const noexcept;
     private:
+        v2f pivot_ = v2f::zero();
         str32 text_;
         font_asset::ptr font_;
         color32 tint_ = color32::white();
@@ -46,6 +50,20 @@ namespace e2d
             asset_dependencies& dependencies,
             const collect_context& ctx) const;
     };
+
+    template <>
+    class factory_loader<label::label_dirty> final : factory_loader<> {
+    public:
+        static const char* schema_source;
+
+        bool operator()(
+            label::label_dirty& component,
+            const fill_context& ctx) const;
+
+        bool operator()(
+            asset_dependencies& dependencies,
+            const collect_context& ctx) const;
+    };
 }
 
 namespace e2d
@@ -55,7 +73,7 @@ namespace e2d
         return *this;
     }
 
-    inline const str32& label::text() const noexcept {
+    [[nodiscard]] inline const str32& label::text() const noexcept {
         return text_;
     }
 
@@ -64,7 +82,7 @@ namespace e2d
         return *this;
     }
 
-    inline const font_asset::ptr& label::font() const noexcept {
+    [[nodiscard]] inline const font_asset::ptr& label::font() const noexcept {
         return font_;
     }
 
@@ -73,7 +91,16 @@ namespace e2d
         return *this;
     }
 
-    inline const color32& label::tint() const noexcept {
+    [[nodiscard]] inline const color32& label::tint() const noexcept {
         return tint_;
     }
+
+    inline label& label::pivot(const v2f& pivot) noexcept {
+        pivot_ = pivot;
+        return *this;
+    }
+
+    [[nodiscard]] inline const v2f& label::pivot() const noexcept {
+        return pivot_;
+    }
 }
diff --git a/sources/enduro2d/high/assets/font_asset.cpp b/sources/enduro2d/high/assets/font_asset.cpp
index 515ceb1d..7de09b67 100644
--- a/sources/enduro2d/high/assets/font_asset.cpp
+++ b/sources/enduro2d/high/assets/font_asset.cpp
@@ -11,9 +11,9 @@ namespace
 {
     using namespace e2d;
 
-    class bmfont_asset_loading_exception final : public asset_loading_exception {
+    class font_asset_loading_exception final : public asset_loading_exception {
         const char* what() const noexcept final {
-            return "shader asset loading exception";
+            return "font asset loading exception";
         }
     };
 }
diff --git a/sources/enduro2d/high/components/label.cpp b/sources/enduro2d/high/components/label.cpp
index 18e01e1c..8a64571e 100644
--- a/sources/enduro2d/high/components/label.cpp
+++ b/sources/enduro2d/high/components/label.cpp
@@ -13,7 +13,10 @@ namespace e2d
         "required" : [],
         "additionalProperties" : false,
         "properties" : {
-            "model" : { "$ref": "#/common_definitions/address" }
+            "font" : { "$ref": "#/common_definitions/address" },
+            "text" : { "type" : "string" },
+            "pivot" : { "$ref": "#/common_definitions/v2" },
+            "tint" : { "$ref": "#/common_definitions/color" }
         }
     })json";
 
@@ -21,30 +24,85 @@ namespace e2d
         label& component,
         const fill_context& ctx) const
     {
-        if ( ctx.root.HasMember("label") ) {
-//            auto model = ctx.dependencies.find_asset<model_asset>(
-//                path::combine(ctx.parent_address, ctx.root["model"].GetString()));
-//            if ( !model ) {
-//                the<debug>().error("label: Dependency 'model' is not found:\n"
-//                    "--> Parent address: %0\n"
-//                    "--> Dependency address: %1",
-//                    ctx.parent_address,
-//                    ctx.root["model"].GetString());
-//                return false;
-//            }
-//            component.label(model);
+        i32 member_count = ctx.root.MemberCount();
+        if ( ctx.root.HasMember("font") ) {
+            auto font = ctx.dependencies.find_asset<font_asset>(
+                path::combine(ctx.parent_address, ctx.root["font"].GetString()));
+            if ( !font ) {
+                the<debug>().error("LABEL: Dependency 'font' is not found:\n"
+                                   "--> Parent address: %0\n"
+                                   "--> Dependency address: %1",
+                                   ctx.parent_address,
+                                   ctx.root["font"].GetString());
+                return false;
+            }
+            component.font(font);
         }
 
-        return true;;
+        if ( ctx.root.HasMember("text") ) {
+            str32 text;
+            if ( !json_utils::try_parse_value(ctx.root["text"], text) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'text' property");
+                return false;
+            }
+            component.text(text);
+        }
+
+        if ( ctx.root.HasMember("pivot") ) {
+            v2f pivot;
+            if ( !json_utils::try_parse_value(ctx.root["pivot"], pivot) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'pivot' property");
+                return false;
+            }
+            component.pivot(pivot);
+        }
+
+        if ( ctx.root.HasMember("tint") ) {
+            auto tint = component.tint();
+            if ( !json_utils::try_parse_value(ctx.root["tint"], tint) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'tint' property");
+                return false;
+            }
+            component.tint(tint);
+        }
+
+        return true;
     }
 
     bool factory_loader<label>::operator()(
         asset_dependencies& dependencies,
         const collect_context& ctx) const
     {
-        if ( ctx.root.HasMember("model") ) {
-//            dependencies.add_dependency<model_asset>(
-//                path::combine(ctx.parent_address, ctx.root["model"].GetString()));
+        if ( ctx.root.HasMember("font") ) {
+            dependencies.add_dependency<font_asset>(
+                path::combine(ctx.parent_address, ctx.root["font"].GetString()));
+        }
+
+        return true;
+    }
+
+    
+    const char* factory_loader<label::label_dirty>::schema_source = R"json({
+    "type" : "object",
+    "required" : [],
+    "additionalProperties" : false,
+    "properties" : {}
+    })json";
+
+    bool factory_loader<label::label_dirty>::operator()(
+                                           label::label_dirty& component,
+                                           const fill_context& ctx) const
+    {
+        return true;
+    }
+
+    bool factory_loader<label::label_dirty>::operator()(
+                                           asset_dependencies& dependencies,
+                                           const collect_context& ctx) const
+    {
+        if ( ctx.root.HasMember("font") ) {
+            dependencies.add_dependency<font_asset>(
+                path::combine(ctx.parent_address, ctx.root["font"].GetString()));
         }
 
         return true;
diff --git a/sources/enduro2d/high/starter.cpp b/sources/enduro2d/high/starter.cpp
index a923837f..2d1bd2d4 100644
--- a/sources/enduro2d/high/starter.cpp
+++ b/sources/enduro2d/high/starter.cpp
@@ -18,6 +18,7 @@
 #include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/scene.hpp>
 #include <enduro2d/high/components/sprite_renderer.hpp>
+#include <enduro2d/high/components/label.hpp>
 
 #include <enduro2d/high/systems/flipbook_system.hpp>
 #include <enduro2d/high/systems/render_system.hpp>
@@ -130,6 +131,8 @@ namespace e2d
             .register_component<camera>("camera")
             .register_component<flipbook_player>("flipbook_player")
             .register_component<flipbook_source>("flipbook_source")
+            .register_component<label>("label")
+            .register_component<label::label_dirty>("label_dirty")
             .register_component<model_renderer>("model_renderer")
             .register_component<renderer>("renderer")
             .register_component<scene>("scene")
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index a92c2d5b..b5a1051a 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -7,6 +7,7 @@
 #include <enduro2d/high/systems/label_system.hpp>
 
 
+#include <enduro2d/high/components/actor.hpp>
 #include <enduro2d/high/components/label.hpp>
 #include <enduro2d/high/components/model_renderer.hpp>
 
@@ -23,10 +24,11 @@ namespace e2d
         ~internal_state() noexcept = default;
 
         void process(ecs::registry& owner) {
-            owner.for_joined_components<label, label::dirty, model_renderer>([](
+
+            owner.for_joined_components<label, label::label_dirty, model_renderer>([](
                 const ecs::const_entity&,
                 label& l,
-                label::dirty&,
+                label::label_dirty&,
                 model_renderer& mr)
             {
                 vector<v3f> vertices;
@@ -47,14 +49,14 @@ namespace e2d
                 uvs.resize(vertices.size());
                 colors.resize(vertices.size());
                 indices.resize(text.size() * 6);
-                f32 x_pos{0};
-                f32 y_pos{0};
+                f32 x_pos{-l.pivot().x};
+                f32 y_pos{-l.pivot().y};
                 f32 kerning{0};
                 u32 prev_char{0};
-                for (size_t i = 0; i < text.size(); i++) {
+                for ( size_t i = 0; i < text.size(); i++ ) {
                     if ( text[i] == '\n' ) {
                         y_pos -= f.common().line_height;
-                        x_pos = 0;
+                        x_pos = -l.pivot().x;
                         prev_char = 0;
                         continue;
                     }
@@ -129,7 +131,7 @@ namespace e2d
                 mr.model()->fill(content);
             });
 
-            owner.remove_all_components<label::dirty>();
+            owner.remove_all_components<label::label_dirty>();
         }
     };
 

From 11af7b306c6730be29f3fabd58786f70ba1e6558 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Tue, 23 Jul 2019 16:26:54 +0300
Subject: [PATCH 013/108] fix bug with line break

---
 samples/sources/sample_07/sample_07.cpp       | 41 +++----------------
 sources/enduro2d/high/components/label.cpp    | 16 ++++----
 .../enduro2d/high/systems/label_system.cpp    | 15 +++++--
 3 files changed, 24 insertions(+), 48 deletions(-)

diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index 8e510592..aa531055 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -59,42 +59,11 @@ namespace
         }
     private:
         bool create_scene() {
-            auto model_res = the<library>().load_asset<model_asset>("gnome_model.json");
-            auto font_mat = the<library>().load_asset<material_asset>("font_material.json");
-            auto bmfont_res = the<library>().load_asset<font_asset>("bmruen.fnt");
-
-            if ( !model_res || !font_mat || !bmfont_res ) {
-                return false;
-            }
-
-            auto scene_i = the<world>().instantiate();
-
-            scene_i->entity_filler()
-                .component<scene>()
-                .component<actor>(node::create(scene_i));
-
-            node_iptr scene_r = scene_i->get_component<actor>().get().node();
-
-            {
-                auto label_i = the<world>().instantiate();
-
-                label l;
-                l.font(bmfont_res);
-                l.text(make_utf32("{Съешь же ещё\nthis мягких french\nбулок, да drink tea!}"));
-
-                label_i->entity_filler()
-                    .component<actor>(node::create(label_i, scene_r))
-                    .component<label>(l)
-                    .component<label::dirty>(label::dirty())
-                    .component<renderer>(renderer()
-                                         .materials({font_mat}))
-                    .component<model_renderer>(model_res);
-
-                node_iptr label_n = label_i->get_component<actor>().get().node();
-                label_n->translation(v3f{-300.f,0.f,0.f});
-            }
-
-            return true;
+            auto scene_prefab_res = the<library>().load_asset<prefab_asset>("scene_bmf_prefab.json");
+            auto scene_go = scene_prefab_res
+            ? the<world>().instantiate(scene_prefab_res->content())
+            : nullptr;
+            return !!scene_go;
         }
 
         bool create_camera() {
diff --git a/sources/enduro2d/high/components/label.cpp b/sources/enduro2d/high/components/label.cpp
index 8a64571e..ebc0927a 100644
--- a/sources/enduro2d/high/components/label.cpp
+++ b/sources/enduro2d/high/components/label.cpp
@@ -83,22 +83,22 @@ namespace e2d
 
     
     const char* factory_loader<label::label_dirty>::schema_source = R"json({
-    "type" : "object",
-    "required" : [],
-    "additionalProperties" : false,
-    "properties" : {}
+        "type" : "object",
+        "required" : [],
+        "additionalProperties" : false,
+        "properties" : {}
     })json";
 
     bool factory_loader<label::label_dirty>::operator()(
-                                           label::label_dirty& component,
-                                           const fill_context& ctx) const
+        label::label_dirty& component,
+        const fill_context& ctx) const
     {
         return true;
     }
 
     bool factory_loader<label::label_dirty>::operator()(
-                                           asset_dependencies& dependencies,
-                                           const collect_context& ctx) const
+        asset_dependencies& dependencies,
+        const collect_context& ctx) const
     {
         if ( ctx.root.HasMember("font") ) {
             dependencies.add_dependency<font_asset>(
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index b5a1051a..df86d4a8 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -7,7 +7,6 @@
 #include <enduro2d/high/systems/label_system.hpp>
 
 
-#include <enduro2d/high/components/actor.hpp>
 #include <enduro2d/high/components/label.hpp>
 #include <enduro2d/high/components/model_renderer.hpp>
 
@@ -24,7 +23,6 @@ namespace e2d
         ~internal_state() noexcept = default;
 
         void process(ecs::registry& owner) {
-
             owner.for_joined_components<label, label::label_dirty, model_renderer>([](
                 const ecs::const_entity&,
                 label& l,
@@ -45,7 +43,14 @@ namespace e2d
                 texture_size.x = common.atlas_width;
                 texture_size.y = common.atlas_height;
 
-                vertices.resize(text.size() * 4);
+                size_t letters_size = text.size();
+                for ( size_t i = 0; i < text.size(); i++ ) {
+                    if ( text[i] == '\n' ) {
+                        letters_size--;
+                    }
+                }
+
+                vertices.resize(letters_size * 4);
                 uvs.resize(vertices.size());
                 colors.resize(vertices.size());
                 indices.resize(text.size() * 6);
@@ -53,6 +58,7 @@ namespace e2d
                 f32 y_pos{-l.pivot().y};
                 f32 kerning{0};
                 u32 prev_char{0};
+                u32 letters_counter{0};
                 for ( size_t i = 0; i < text.size(); i++ ) {
                     if ( text[i] == '\n' ) {
                         y_pos -= f.common().line_height;
@@ -71,7 +77,7 @@ namespace e2d
                         }
                         xoffset += kerning;
                         prev_char = data->id;
-                        size_t start_vertices = i * 4;
+                        size_t start_vertices = letters_counter * 4;
                         vertices[start_vertices] = v3f(
                             x_pos + xoffset,
                             y_pos + yoffset,
@@ -116,6 +122,7 @@ namespace e2d
                         indices[start_indices + 5] = start_vertices;
 
                         x_pos += data->xadvance + kerning;
+                        letters_counter++;
                     }
                 }
 

From ba92155606a286fe6619c74acc0fd4a73aa3bb35 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 25 Jul 2019 01:42:58 +0700
Subject: [PATCH 014/108] fix order of includes, add label_system to the engine
 start

---
 headers/enduro2d/high/_all.hpp          | 6 +++---
 headers/enduro2d/high/_high.hpp         | 6 +++---
 headers/enduro2d/utils/_all.hpp         | 2 +-
 headers/enduro2d/utils/_utils.hpp       | 4 ++--
 samples/sources/sample_07/sample_07.cpp | 7 -------
 sources/enduro2d/high/starter.cpp       | 4 +++-
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index a67813d7..d927f2d1 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -11,6 +11,7 @@
 #include "assets/atlas_asset.hpp"
 #include "assets/binary_asset.hpp"
 #include "assets/flipbook_asset.hpp"
+#include "assets/font_asset.hpp"
 #include "assets/image_asset.hpp"
 #include "assets/json_asset.hpp"
 #include "assets/material_asset.hpp"
@@ -24,21 +25,20 @@
 #include "assets/text_asset.hpp"
 #include "assets/texture_asset.hpp"
 #include "assets/xml_asset.hpp"
-#include "assets/font_asset.hpp"
 
 #include "components/actor.hpp"
 #include "components/camera.hpp"
 #include "components/flipbook_player.hpp"
 #include "components/flipbook_source.hpp"
+#include "components/label.hpp"
 #include "components/model_renderer.hpp"
 #include "components/renderer.hpp"
 #include "components/scene.hpp"
 #include "components/sprite_renderer.hpp"
-#include "components/label.hpp"
 
 #include "systems/flipbook_system.hpp"
-#include "systems/render_system.hpp"
 #include "systems/label_system.hpp"
+#include "systems/render_system.hpp"
 
 #include "address.hpp"
 #include "asset.hpp"
diff --git a/headers/enduro2d/high/_high.hpp b/headers/enduro2d/high/_high.hpp
index 35662531..271aa9f3 100644
--- a/headers/enduro2d/high/_high.hpp
+++ b/headers/enduro2d/high/_high.hpp
@@ -23,6 +23,7 @@ namespace e2d
     class atlas_asset;
     class binary_asset;
     class flipbook_asset;
+    class font_asset;
     class image_asset;
     class json_asset;
     class material_asset;
@@ -36,21 +37,20 @@ namespace e2d
     class text_asset;
     class texture_asset;
     class xml_asset;
-    class font_asset;
 
     class actor;
     class camera;
     class flipbook_player;
     class flipbook_source;
+    class label;
     class model_renderer;
     class renderer;
     class scene;
     class sprite_renderer;
-    class label;
 
     class flipbook_system;
-    class render_system;
     class label_system;
+    class render_system;
 
     template < typename Asset, typename Content >
     class content_asset;
diff --git a/headers/enduro2d/utils/_all.hpp b/headers/enduro2d/utils/_all.hpp
index b658815c..8dee9602 100644
--- a/headers/enduro2d/utils/_all.hpp
+++ b/headers/enduro2d/utils/_all.hpp
@@ -14,6 +14,7 @@
 #include "color32.hpp"
 #include "filesystem.hpp"
 #include "filesystem.inl"
+#include "font.hpp"
 #include "image.hpp"
 #include "intrusive_list.hpp"
 #include "intrusive_ptr.hpp"
@@ -30,4 +31,3 @@
 #include "time.hpp"
 #include "url.hpp"
 #include "xml_utils.hpp"
-#include "font.hpp"
diff --git a/headers/enduro2d/utils/_utils.hpp b/headers/enduro2d/utils/_utils.hpp
index 574d578f..b2ffdd5b 100644
--- a/headers/enduro2d/utils/_utils.hpp
+++ b/headers/enduro2d/utils/_utils.hpp
@@ -17,6 +17,7 @@ namespace e2d
     class color32;
     class read_file;
     class write_file;
+    class font;
     class image;
     class mesh;
     class shape;
@@ -25,7 +26,6 @@ namespace e2d
     class input_sequence;
     class output_sequence;
     class url;
-    class font;
 
     template < typename T >
     class module;
@@ -67,7 +67,7 @@ namespace e2d
     using milliseconds = unit<T, milliseconds_tag>;
     template < typename T >
     using microseconds = unit<T, microseconds_tag>;
-    
+
     using secf = seconds<f32>;
 }
 
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index aa531055..c9085b8b 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -5,16 +5,10 @@
  ******************************************************************************/
 
 #include "../common.hpp"
-
-
 using namespace e2d;
 
 namespace
 {
-    struct rotator {
-        v3f axis;
-    };
-
     class game_system final : public ecs::system {
     public:
         void process(ecs::registry& owner) override {
@@ -78,7 +72,6 @@ namespace
         bool create_systems() {
             ecs::registry_filler(the<world>().registry())
                 .system<game_system>(world::priority_update)
-                .system<label_system>(world::priority_update)
                 .system<camera_system>(world::priority_pre_render);
             return true;
         }
diff --git a/sources/enduro2d/high/starter.cpp b/sources/enduro2d/high/starter.cpp
index 2d1bd2d4..22e4ee2d 100644
--- a/sources/enduro2d/high/starter.cpp
+++ b/sources/enduro2d/high/starter.cpp
@@ -14,13 +14,14 @@
 #include <enduro2d/high/components/camera.hpp>
 #include <enduro2d/high/components/flipbook_player.hpp>
 #include <enduro2d/high/components/flipbook_source.hpp>
+#include <enduro2d/high/components/label.hpp>
 #include <enduro2d/high/components/model_renderer.hpp>
 #include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/scene.hpp>
 #include <enduro2d/high/components/sprite_renderer.hpp>
-#include <enduro2d/high/components/label.hpp>
 
 #include <enduro2d/high/systems/flipbook_system.hpp>
+#include <enduro2d/high/systems/label_system.hpp>
 #include <enduro2d/high/systems/render_system.hpp>
 
 namespace
@@ -42,6 +43,7 @@ namespace
         bool initialize() final {
             ecs::registry_filler(the<world>().registry())
                 .system<flipbook_system>(world::priority_update)
+                .system<label_system>(world::priority_update)
                 .system<render_system>(world::priority_render);
             return !application_ || application_->initialize();
         }

From 50bc6b97cba9089c39f3383166f0f7b76770f207 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 25 Jul 2019 05:20:28 +0700
Subject: [PATCH 015/108] add new label properties (unimplemented yet)

---
 headers/enduro2d/high/components/label.hpp    |  99 +++++++---
 sources/enduro2d/high/components/label.cpp    | 175 ++++++++++++------
 sources/enduro2d/high/starter.cpp             |   2 +-
 .../enduro2d/high/systems/label_system.cpp    |  21 ++-
 4 files changed, 214 insertions(+), 83 deletions(-)

diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
index 9d6ee4ff..47de759d 100644
--- a/headers/enduro2d/high/components/label.hpp
+++ b/headers/enduro2d/high/components/label.hpp
@@ -15,26 +15,53 @@ namespace e2d
 {
     class label final {
     public:
-        class label_dirty final {};
+        class dirty final {
+        };
+    public:
+        enum class haligns {
+            left,
+            center,
+            right
+        };
 
+        enum class valigns {
+            top,
+            center,
+            bottom,
+            baseline
+        };
+    public:
         label() = default;
-        
-        label& text(str32_view text);
+        label(const font_asset::ptr& font);
+
+        label& text(str32 value) noexcept;
         [[nodiscard]] const str32& text() const noexcept;
 
-        label& font(const font_asset::ptr& font) noexcept;
-        [[nodiscard]] const font_asset::ptr&  font() const noexcept;
+        label& font(const font_asset::ptr& value) noexcept;
+        [[nodiscard]] const font_asset::ptr& font() const noexcept;
 
         label& tint(const color32& value) noexcept;
         [[nodiscard]] const color32& tint() const noexcept;
 
-        label& pivot(const v2f& pivot) noexcept;
-        [[nodiscard]] const v2f& pivot() const noexcept;
+        label& width(f32 value) noexcept;
+        [[nodiscard]] f32 width() const noexcept;
+
+        label& haligh(haligns value) noexcept;
+        [[nodiscard]] haligns halign() const noexcept;
+
+        label& valigh(valigns value) noexcept;
+        [[nodiscard]] valigns valign() const noexcept;
+
+        label& filtering(bool value) noexcept;
+        bool filtering() const noexcept;
     private:
-        v2f pivot_ = v2f::zero();
         str32 text_;
         font_asset::ptr font_;
         color32 tint_ = color32::white();
+        f32 width_ = 0.f;
+        haligns haligh_ = haligns::left;
+        valigns valign_ = valigns::baseline;
+        bool filtering_ = true;
     };
 
     template <>
@@ -52,12 +79,12 @@ namespace e2d
     };
 
     template <>
-    class factory_loader<label::label_dirty> final : factory_loader<> {
+    class factory_loader<label::dirty> final : factory_loader<> {
     public:
         static const char* schema_source;
 
         bool operator()(
-            label::label_dirty& component,
+            label::dirty& component,
             const fill_context& ctx) const;
 
         bool operator()(
@@ -68,21 +95,24 @@ namespace e2d
 
 namespace e2d
 {
-    inline label& label::text(str32_view text) {
-        text_ = text;
+    inline label::label(const font_asset::ptr& value)
+    : font_(value) {}
+
+    inline label& label::text(str32 value) noexcept {
+        text_ = std::move(value);
         return *this;
     }
 
-    [[nodiscard]] inline const str32& label::text() const noexcept {
+    inline const str32& label::text() const noexcept {
         return text_;
     }
 
-    inline label& label::font(const font_asset::ptr& font) noexcept {
-        font_ = font;
+    inline label& label::font(const font_asset::ptr& value) noexcept {
+        font_ = value;
         return *this;
     }
 
-    [[nodiscard]] inline const font_asset::ptr& label::font() const noexcept {
+    inline const font_asset::ptr& label::font() const noexcept {
         return font_;
     }
 
@@ -91,16 +121,43 @@ namespace e2d
         return *this;
     }
 
-    [[nodiscard]] inline const color32& label::tint() const noexcept {
+    inline const color32& label::tint() const noexcept {
         return tint_;
     }
 
-    inline label& label::pivot(const v2f& pivot) noexcept {
-        pivot_ = pivot;
+    inline label& label::width(f32 value) noexcept {
+        width_ = value;
         return *this;
     }
 
-    [[nodiscard]] inline const v2f& label::pivot() const noexcept {
-        return pivot_;
+    inline f32 label::width() const noexcept {
+        return width_;
+    }
+
+    inline label& label::haligh(haligns value) noexcept {
+        haligh_ = value;
+        return *this;
+    }
+
+    inline label::haligns label::halign() const noexcept {
+        return haligh_;
+    }
+
+    inline label& label::valigh(valigns value) noexcept {
+        valign_ = value;
+        return *this;
+    }
+
+    inline label::valigns label::valign() const noexcept {
+        return valign_;
+    }
+
+    inline label& label::filtering(bool value) noexcept {
+        filtering_ = value;
+        return *this;
+    }
+
+    inline bool label::filtering() const noexcept {
+        return filtering_;
     }
 }
diff --git a/sources/enduro2d/high/components/label.cpp b/sources/enduro2d/high/components/label.cpp
index ebc0927a..6347e1bd 100644
--- a/sources/enduro2d/high/components/label.cpp
+++ b/sources/enduro2d/high/components/label.cpp
@@ -6,6 +6,30 @@
 
 #include <enduro2d/high/components/label.hpp>
 
+namespace
+{
+    using namespace e2d;
+
+    bool parse_halign(str_view str, label::haligns& align) noexcept {
+    #define DEFINE_IF(x) if ( str == #x ) { align = label::haligns::x; return true; }
+        DEFINE_IF(left);
+        DEFINE_IF(center);
+        DEFINE_IF(right);
+    #undef DEFINE_IF
+        return false;
+    }
+
+    bool parse_valign(str_view str, label::valigns& align) noexcept {
+    #define DEFINE_IF(x) if ( str == #x ) { align = label::valigns::x; return true; }
+        DEFINE_IF(top);
+        DEFINE_IF(center);
+        DEFINE_IF(bottom);
+        DEFINE_IF(baseline);
+    #undef DEFINE_IF
+        return false;
+    }
+}
+
 namespace e2d
 {
     const char* factory_loader<label>::schema_source = R"json({
@@ -13,10 +37,32 @@ namespace e2d
         "required" : [],
         "additionalProperties" : false,
         "properties" : {
-            "font" : { "$ref": "#/common_definitions/address" },
             "text" : { "type" : "string" },
-            "pivot" : { "$ref": "#/common_definitions/v2" },
-            "tint" : { "$ref": "#/common_definitions/color" }
+            "font" : { "$ref": "#/common_definitions/address" },
+            "tint" : { "$ref": "#/common_definitions/color" },
+            "width" : { "type" : "number" },
+            "halign" : { "$ref": "#/definitions/haligns" },
+            "valign" : { "$ref": "#/definitions/valigns" },
+            "filtering" : { "type" : "boolean" }
+        },
+        "definitions" : {
+            "haligns" : {
+                "type" : "string",
+                "enum" : [
+                    "left",
+                    "center",
+                    "right"
+                ]
+            },
+            "valigns" : {
+                "type" : "string",
+                "enum" : [
+                    "top",
+                    "center",
+                    "bottom",
+                    "baseline"
+                ]
+            }
         }
     })json";
 
@@ -24,41 +70,31 @@ namespace e2d
         label& component,
         const fill_context& ctx) const
     {
-        i32 member_count = ctx.root.MemberCount();
+        if ( ctx.root.HasMember("text") ) {
+            str32 text = component.text();
+            if ( !json_utils::try_parse_value(ctx.root["text"], text) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'text' property");
+                return false;
+            }
+            component.text(std::move(text));
+        }
+
         if ( ctx.root.HasMember("font") ) {
             auto font = ctx.dependencies.find_asset<font_asset>(
                 path::combine(ctx.parent_address, ctx.root["font"].GetString()));
             if ( !font ) {
                 the<debug>().error("LABEL: Dependency 'font' is not found:\n"
-                                   "--> Parent address: %0\n"
-                                   "--> Dependency address: %1",
-                                   ctx.parent_address,
-                                   ctx.root["font"].GetString());
+                    "--> Parent address: %0\n"
+                    "--> Dependency address: %1",
+                    ctx.parent_address,
+                    ctx.root["font"].GetString());
                 return false;
             }
             component.font(font);
         }
 
-        if ( ctx.root.HasMember("text") ) {
-            str32 text;
-            if ( !json_utils::try_parse_value(ctx.root["text"], text) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'text' property");
-                return false;
-            }
-            component.text(text);
-        }
-
-        if ( ctx.root.HasMember("pivot") ) {
-            v2f pivot;
-            if ( !json_utils::try_parse_value(ctx.root["pivot"], pivot) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'pivot' property");
-                return false;
-            }
-            component.pivot(pivot);
-        }
-
         if ( ctx.root.HasMember("tint") ) {
-            auto tint = component.tint();
+            color32 tint = component.tint();
             if ( !json_utils::try_parse_value(ctx.root["tint"], tint) ) {
                 the<debug>().error("LABEL: Incorrect formatting of 'tint' property");
                 return false;
@@ -66,37 +102,46 @@ namespace e2d
             component.tint(tint);
         }
 
-        return true;
-    }
+        if ( ctx.root.HasMember("width") ) {
+            f32 width = component.width();
+            if ( !json_utils::try_parse_value(ctx.root["width"], width) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'width' property");
+                return false;
+            }
+            component.width(width);
+        }
 
-    bool factory_loader<label>::operator()(
-        asset_dependencies& dependencies,
-        const collect_context& ctx) const
-    {
-        if ( ctx.root.HasMember("font") ) {
-            dependencies.add_dependency<font_asset>(
-                path::combine(ctx.parent_address, ctx.root["font"].GetString()));
+        if ( ctx.root.HasMember("halign") ) {
+            label::haligns halign = component.halign();
+            if ( !parse_halign(ctx.root["halign"].GetString(), halign) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'halign' property");
+                return false;
+            }
+            component.haligh(halign);
+        }
+
+        if ( ctx.root.HasMember("valign") ) {
+            label::valigns valign = component.valign();
+            if ( !parse_valign(ctx.root["valign"].GetString(), valign) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'valign' property");
+                return false;
+            }
+            component.valigh(valign);
+        }
+
+        if ( ctx.root.HasMember("filtering") ) {
+            bool filtering = component.filtering();
+            if ( !json_utils::try_parse_value(ctx.root["filtering"], filtering) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'filtering' property");
+                return false;
+            }
+            component.filtering(filtering);
         }
 
         return true;
     }
 
-    
-    const char* factory_loader<label::label_dirty>::schema_source = R"json({
-        "type" : "object",
-        "required" : [],
-        "additionalProperties" : false,
-        "properties" : {}
-    })json";
-
-    bool factory_loader<label::label_dirty>::operator()(
-        label::label_dirty& component,
-        const fill_context& ctx) const
-    {
-        return true;
-    }
-
-    bool factory_loader<label::label_dirty>::operator()(
+    bool factory_loader<label>::operator()(
         asset_dependencies& dependencies,
         const collect_context& ctx) const
     {
@@ -108,3 +153,29 @@ namespace e2d
         return true;
     }
 }
+
+namespace e2d
+{
+    const char* factory_loader<label::dirty>::schema_source = R"json({
+        "type" : "object",
+        "required" : [],
+        "additionalProperties" : false,
+        "properties" : {}
+    })json";
+
+    bool factory_loader<label::dirty>::operator()(
+        label::dirty& component,
+        const fill_context& ctx) const
+    {
+        E2D_UNUSED(component, ctx);
+        return true;
+    }
+
+    bool factory_loader<label::dirty>::operator()(
+        asset_dependencies& dependencies,
+        const collect_context& ctx) const
+    {
+        E2D_UNUSED(dependencies, ctx);
+        return true;
+    }
+}
diff --git a/sources/enduro2d/high/starter.cpp b/sources/enduro2d/high/starter.cpp
index 22e4ee2d..dfb7be39 100644
--- a/sources/enduro2d/high/starter.cpp
+++ b/sources/enduro2d/high/starter.cpp
@@ -134,7 +134,7 @@ namespace e2d
             .register_component<flipbook_player>("flipbook_player")
             .register_component<flipbook_source>("flipbook_source")
             .register_component<label>("label")
-            .register_component<label::label_dirty>("label_dirty")
+            .register_component<label::dirty>("label.dirty")
             .register_component<model_renderer>("model_renderer")
             .register_component<renderer>("renderer")
             .register_component<scene>("scene")
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index df86d4a8..4e5e40a1 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -6,11 +6,9 @@
 
 #include <enduro2d/high/systems/label_system.hpp>
 
-
 #include <enduro2d/high/components/label.hpp>
 #include <enduro2d/high/components/model_renderer.hpp>
 
-
 namespace e2d
 {
     //
@@ -23,10 +21,10 @@ namespace e2d
         ~internal_state() noexcept = default;
 
         void process(ecs::registry& owner) {
-            owner.for_joined_components<label, label::label_dirty, model_renderer>([](
+            owner.for_joined_components<label::dirty, label, model_renderer>([](
                 const ecs::const_entity&,
+                label::dirty&,
                 label& l,
-                label::label_dirty&,
                 model_renderer& mr)
             {
                 vector<v3f> vertices;
@@ -54,15 +52,15 @@ namespace e2d
                 uvs.resize(vertices.size());
                 colors.resize(vertices.size());
                 indices.resize(text.size() * 6);
-                f32 x_pos{-l.pivot().x};
-                f32 y_pos{-l.pivot().y};
+                f32 x_pos{0.f};
+                f32 y_pos{0.f};
                 f32 kerning{0};
                 u32 prev_char{0};
                 u32 letters_counter{0};
                 for ( size_t i = 0; i < text.size(); i++ ) {
                     if ( text[i] == '\n' ) {
                         y_pos -= f.common().line_height;
-                        x_pos = -l.pivot().x;
+                        x_pos = 0.f;
                         prev_char = 0;
                         continue;
                     }
@@ -135,10 +133,15 @@ namespace e2d
                 model content;
                 content.set_mesh(mesh_asset::create(m));
                 content.regenerate_geometry(the<render>());
-                mr.model()->fill(content);
+
+                if ( !mr.model() ) {
+                    mr.model(model_asset::create(content));
+                } else {
+                    mr.model()->fill(content);
+                }
             });
 
-            owner.remove_all_components<label::label_dirty>();
+            owner.remove_all_components<label::dirty>();
         }
     };
 

From 67801491cb5057099f395e2f8d7ce10e5284bd92 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 25 Jul 2019 10:49:09 +0700
Subject: [PATCH 016/108] font loading fixes

---
 headers/enduro2d/base/_base.hpp               |   1 +
 headers/enduro2d/utils/font.hpp               | 137 ++---
 sources/enduro2d/high/assets/font_asset.cpp   |  15 +-
 .../enduro2d/high/systems/label_system.cpp    |  34 +-
 sources/enduro2d/utils/font.cpp               | 514 +++++++++---------
 5 files changed, 368 insertions(+), 333 deletions(-)

diff --git a/headers/enduro2d/base/_base.hpp b/headers/enduro2d/base/_base.hpp
index fb668246..9265b1c5 100644
--- a/headers/enduro2d/base/_base.hpp
+++ b/headers/enduro2d/base/_base.hpp
@@ -32,6 +32,7 @@
 #include <chrono>
 #include <memory>
 #include <limits>
+#include <sstream>
 #include <numeric>
 #include <utility>
 #include <iterator>
diff --git a/headers/enduro2d/utils/font.hpp b/headers/enduro2d/utils/font.hpp
index a37d3751..625d8f86 100644
--- a/headers/enduro2d/utils/font.hpp
+++ b/headers/enduro2d/utils/font.hpp
@@ -8,42 +8,53 @@
 
 #include "_utils.hpp"
 
+#include "buffer.hpp"
+#include "streams.hpp"
+
 namespace e2d
 {
-    class font;
-
     class font final {
     public:
-        struct char_data {
-            u32 id{0};
-            b2hi rect;
-            i16 xoffset{0};
-            i16 yoffset{0};
-            i16 xadvance{0};
-            i16 page{0};
-            i16 chnl{0};
-        };
-
         struct info_data {
+            str face;
             u32 size{0};
         };
 
+        struct common_data {
+            u32 line{0};
+            u32 base{0};
+            u32 pages{0};
+            v2u atlas_size;
+        };
+
+        struct page_data {
+            u32 id{0};
+            str file;
+        };
+
+        struct char_data {
+            u32 id{0};
+            b2hi rect;
+            v2hi offset;
+            i16 advance{0};
+            u16 page{0};
+            u16 chnl{0};
+        };
+
         struct kerning_data {
-            u64 first{0};
-            u32 second{0};
+            std::pair<u32,u32> chars{0,0};
             i32 amount{0};
         };
 
-        struct common_data {
-            u32 line_height{0};
-            u32 base{0};
-            u32 pages{0};
-            u32 atlas_width{0};
-            u32 atlas_height{0};
+        struct data {
+            info_data info;
+            common_data common;
+            flat_set<page_data> pages;
+            flat_set<char_data> chars;
+            flat_set<kerning_data> kernings;
         };
-
+    public:
         font() = default;
-        ~font() noexcept = default;
 
         font(font&& other) noexcept;
         font& operator=(font&& other) noexcept;
@@ -51,36 +62,14 @@ namespace e2d
         font(const font& other);
         font& operator=(const font& other);
 
-        font(
-             info_data&& info,
-             common_data&& common,
-             vector<str>&& pages,
-             vector<char_data>&& chars,
-             flat_map<u64,i32>&& kerning) noexcept;
-
-        font(
-             const info_data& info,
-             const common_data& common,
-             const vector<str>& pages,
-             const vector<char_data>& chars,
-             const flat_map<u64,i32>& kerning);
+        font(data&& data) noexcept;
+        font(const data& data);
 
         font& assign(font&& other) noexcept;
         font& assign(const font& other);
 
-        font& assign(
-             info_data&& info,
-             common_data&& common,
-             vector<str>&& pages,
-             vector<char_data>&& chars,
-             flat_map<u64,i32>&& kerning) noexcept;
-
-        font& assign(
-             const info_data& info,
-             const common_data& common,
-             const vector<str>& pages,
-             const vector<char_data>& chars,
-             const flat_map<u64,i32>& kerning);
+        font& assign(data&& data) noexcept;
+        font& assign(const data& data);
 
         void swap(font& other) noexcept;
         void clear() noexcept;
@@ -88,27 +77,47 @@ namespace e2d
 
         const info_data& info() const noexcept;
         const common_data& common() const noexcept;
-        const vector<str>& pages() const noexcept;
-        const vector<char_data>& chars() const noexcept;
-        const flat_map<u64,i32>& kerning() const noexcept;
+        const flat_set<page_data>& pages() const noexcept;
+        const flat_set<char_data>& chars() const noexcept;
+        const flat_set<kerning_data>& kernings() const noexcept;
 
-        static font create(str_view content);
-        const char_data* find_char(u32 charId) const noexcept;
-
-        i32 find_kerning(u32 first, u32 second) const noexcept;
+        const page_data* find_page(u32 id) const noexcept;
+        const char_data* find_char(u32 id) const noexcept;
+        i32 get_kerning(u32 first, u32 second) const noexcept;
     private:
-        info_data info_;
-        common_data common_;
-        vector<str> pages_;
-        vector<char_data> chars_;
-        flat_map<u64,i32> kerning_;
+        data data_;
     };
 
-    bool operator==(const font::info_data& l, const font::info_data& r) noexcept;
-    bool operator==(const font::common_data& l, const font::common_data& r) noexcept;
-    bool operator==(const font::char_data& l, const font::char_data& r) noexcept;
-
     void swap(font& l, font& r) noexcept;
     bool operator==(const font& l, const font& r) noexcept;
     bool operator!=(const font& l, const font& r) noexcept;
+
+    bool operator<(u32 l, const font::page_data& r) noexcept;
+    bool operator<(const font::page_data& l, u32 r) noexcept;
+    bool operator<(const font::page_data& l, const font::page_data& r) noexcept;
+
+    bool operator<(u32 l, const font::char_data& r) noexcept;
+    bool operator<(const font::char_data& l, u32 r) noexcept;
+    bool operator<(const font::char_data& l, const font::char_data& r) noexcept;
+
+    bool operator<(const std::pair<u32,u32>& l, const font::kerning_data& r) noexcept;
+    bool operator<(const font::kerning_data& l, const std::pair<u32,u32>& r) noexcept;
+    bool operator<(const font::kerning_data& l, const font::kerning_data& r) noexcept;
+
+    bool operator==(const font::info_data& l, const font::info_data& r) noexcept;
+    bool operator==(const font::common_data& l, const font::common_data& r) noexcept;
+    bool operator==(const font::page_data& l, const font::page_data& r) noexcept;
+    bool operator==(const font::char_data& l, const font::char_data& r) noexcept;
+    bool operator==(const font::kerning_data& l, const font::kerning_data& r) noexcept;
+}
+
+namespace e2d::fonts
+{
+    bool try_load_font(
+        font& dst,
+        const buffer& src) noexcept;
+
+    bool try_load_font(
+        font& dst,
+        const input_stream_uptr& src) noexcept;
 }
diff --git a/sources/enduro2d/high/assets/font_asset.cpp b/sources/enduro2d/high/assets/font_asset.cpp
index 7de09b67..603a2c6a 100644
--- a/sources/enduro2d/high/assets/font_asset.cpp
+++ b/sources/enduro2d/high/assets/font_asset.cpp
@@ -5,7 +5,7 @@
  ******************************************************************************/
 
 #include <enduro2d/high/assets/font_asset.hpp>
-#include <enduro2d/high/assets/text_asset.hpp>
+#include <enduro2d/high/assets/binary_asset.hpp>
 
 namespace
 {
@@ -23,11 +23,14 @@ namespace e2d
     font_asset::load_async_result font_asset::load_async(
         const library& library, str_view address)
     {
-        return library.load_asset_async<text_asset>(address)
-        .then([](const text_asset::load_result& text_data){
-            return the<deferrer>().do_in_main_thread([text_data](){
-                auto f = font::create(text_data->content());
-                return font_asset::create(f);
+        return library.load_asset_async<binary_asset>(address)
+        .then([](const binary_asset::load_result& font_data){
+            return the<deferrer>().do_in_worker_thread([font_data](){
+                font content;
+                if ( !fonts::try_load_font(content, font_data->content()) ) {
+                    throw font_asset_loading_exception();
+                }
+                return font_asset::create(std::move(content));
             });
         });
     }
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index 4e5e40a1..5ab0275b 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -32,14 +32,11 @@ namespace e2d
                 vector<v2f> uvs;
                 vector<v3f> normals;
                 vector<color32> colors;
-                f32 xoffset{0};
-                f32 yoffset{0};
+                v2f offset;
                 str32 text = l.text();
                 const auto& f = l.font()->content();
                 auto common = f.common();
-                v2f texture_size;
-                texture_size.x = common.atlas_width;
-                texture_size.y = common.atlas_height;
+                v2f texture_size = common.atlas_size.cast_to<f32>();
 
                 size_t letters_size = text.size();
                 for ( size_t i = 0; i < text.size(); i++ ) {
@@ -59,38 +56,37 @@ namespace e2d
                 u32 letters_counter{0};
                 for ( size_t i = 0; i < text.size(); i++ ) {
                     if ( text[i] == '\n' ) {
-                        y_pos -= f.common().line_height;
+                        y_pos -= f.common().line;
                         x_pos = 0.f;
                         prev_char = 0;
                         continue;
                     }
                     auto data = f.find_char(text[i]);
                     if ( data ) {
-                        yoffset = data->yoffset;
-                        xoffset = data->xoffset;
+                        offset = data->offset.cast_to<f32>();
                         if ( prev_char != 0 ) {
-                            kerning = f.find_kerning(prev_char, data->id);
+                            kerning = f.get_kerning(prev_char, data->id);
                         } else {
                             kerning = 0;
                         }
-                        xoffset += kerning;
+                        offset.x += kerning;
                         prev_char = data->id;
                         size_t start_vertices = letters_counter * 4;
                         vertices[start_vertices] = v3f(
-                            x_pos + xoffset,
-                            y_pos + yoffset,
+                            x_pos + offset.x,
+                            y_pos + offset.y,
                             0);
                         vertices[start_vertices + 1] = v3f(
-                            x_pos + xoffset,
-                            y_pos + data->rect.size.y + yoffset,
+                            x_pos + offset.x,
+                            y_pos + data->rect.size.y + offset.y,
                             0);
                         vertices[start_vertices + 2] = v3f(
-                            x_pos + data->rect.size.x + xoffset,
-                            y_pos + data->rect.size.y + yoffset,
+                            x_pos + data->rect.size.x + offset.x,
+                            y_pos + data->rect.size.y + offset.y,
                             0);
                         vertices[start_vertices + 3] = v3f(
-                            x_pos + data->rect.size.x + xoffset,
-                            y_pos + yoffset,
+                            x_pos + data->rect.size.x + offset.x,
+                            y_pos + offset.y,
                             0);
 
                         uvs[start_vertices] = v2f(
@@ -119,7 +115,7 @@ namespace e2d
                         indices[start_indices + 4] = start_vertices + 3;
                         indices[start_indices + 5] = start_vertices;
 
-                        x_pos += data->xadvance + kerning;
+                        x_pos += data->advance + kerning;
                         letters_counter++;
                     }
                 }
diff --git a/sources/enduro2d/utils/font.cpp b/sources/enduro2d/utils/font.cpp
index 4e2575d1..8ed4ca23 100644
--- a/sources/enduro2d/utils/font.cpp
+++ b/sources/enduro2d/utils/font.cpp
@@ -5,14 +5,151 @@
  ******************************************************************************/
 
 #include <enduro2d/utils/font.hpp>
-#include <sstream>
 
 namespace
 {
     using namespace e2d;
 
-    u64 make_kerning_key(u32 first, u32 second) noexcept {
-        return (static_cast<u64>(first) << 32) | static_cast<u64>(second);
+    font::data load_font_data(str_view content) {
+        str s(content);
+        font::data data;
+
+        std::replace(s.begin(), s.end(), '=', ' ');
+        std::replace(s.begin(), s.end(), ',', ' ');
+
+        str tag, line;
+        std::stringstream data_stream(s);
+
+        while ( getline(data_stream, line, '\n') ) {
+            std::stringstream line_stream(line);
+            line_stream >> tag;
+
+            if ( tag == "info" ) {
+                // info face="Arial-Black" size=32 bold=0 italic=0 charset=""
+                //      unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=2,2
+                line_stream >> tag;
+                while ( !line_stream.eof() ) {
+                    if ( tag == "face" ) {
+                        line_stream >> data.info.face;
+                        // remove ""
+                        data.info.face.erase(data.info.face.begin());
+                        data.info.face.pop_back();
+                    } else if ( tag == "size" ) {
+                        line_stream >> data.info.size;
+                    }
+                    line_stream >> tag;
+                }
+            } else if ( tag == "common" ) {
+                // common lineHeight=54 base=35 scaleW=512 scaleH=512 pages=1 packed=0
+                line_stream >> tag;
+                while ( !line_stream.eof() ) {
+                    if ( tag == "lineHeight" ) {
+                        line_stream >> data.common.line;
+                    } else if ( tag == "base" ) {
+                        line_stream >> data.common.base;
+                    } else if ( tag == "pages" ) {
+                        line_stream >> data.common.pages;
+                        data.pages.reserve(data.common.pages);
+                    } else if ( tag == "scaleW" ) {
+                        line_stream >> data.common.atlas_size.x;
+                    } else if ( tag == "scaleH" ) {
+                        line_stream >> data.common.atlas_size.y;
+                    }
+                    line_stream >> tag;
+                }
+            } else if ( tag == "page" ) {
+                // page id=0 file="arial.png"
+                line_stream >> tag;
+                font::page_data page_data;
+                while ( !line_stream.eof() ) {
+                    if ( tag == "id" ) {
+                        line_stream >> page_data.id;
+                    } else if ( tag == "file" ) {
+                        line_stream >> page_data.file;
+                        // remove ""
+                        page_data.file.erase(page_data.file.begin());
+                        page_data.file.pop_back();
+                    }
+                    line_stream >> tag;
+                }
+                data.pages.insert(std::move(page_data));
+            } else if ( tag == "chars" ) {
+                // chars count=95
+                while ( !line_stream.eof() ) {
+                    if ( tag == "count" ) {
+                        std::size_t count{0u};
+                        line_stream >> count;
+                        data.chars.reserve(count);
+                    }
+                    line_stream >> tag;
+                }
+            } else if ( tag == "char" ) {
+                // char id=123 x=2 y=2 width=38 height=54
+                //      xoffset=0 yoffset=-3 xadvance=12 page=0 chnl=0
+                line_stream >> tag;
+                font::char_data char_data;
+                while ( !line_stream.eof() ) {
+                    if ( tag == "id" ) {
+                        line_stream >> char_data.id;
+                    } else if ( tag == "x" ) {
+                        line_stream >> char_data.rect.position.x;
+                    } else if ( tag == "y" ) {
+                        line_stream >> char_data.rect.position.y;
+                    } else if ( tag == "width" ) {
+                        line_stream >> char_data.rect.size.x;
+                    } else if ( tag == "height" ) {
+                        line_stream >> char_data.rect.size.y;
+                        char_data.rect.position.y =
+                            data.common.atlas_size.y -
+                            char_data.rect.position.y -
+                            char_data.rect.size.y;
+                    } else if ( tag == "xoffset" ) {
+                        line_stream >> char_data.offset.x;
+                    } else if ( tag == "yoffset" ) {
+                        line_stream >> char_data.offset.y;
+                        char_data.offset.y =
+                            data.common.base -
+                            char_data.offset.y -
+                            char_data.rect.size.y;
+                    } else if ( tag == "xadvance" ) {
+                        line_stream >> char_data.advance;
+                    } else if ( tag == "page" ) {
+                        line_stream >> char_data.page;
+                    } else if ( tag == "chnl" ) {
+                        line_stream >> char_data.chnl;
+                    }
+                    line_stream >> tag;
+                }
+                data.chars.insert(std::move(char_data));
+            } else if ( tag == "kernings" ) {
+                // kernings count=243
+                while ( !line_stream.eof() ) {
+                    if ( tag == "count" ) {
+                        std::size_t count{0u};
+                        line_stream >> count;
+                        data.kernings.reserve(count);
+                    }
+                    line_stream >> tag;
+                }
+            } else if ( tag == "kerning" ) {
+                // kerning first=86 second=101 amount=-2
+                line_stream >> tag;
+                font::kerning_data k;
+                while ( !line_stream.eof() ) {
+                    if ( tag == "first" ) {
+                        line_stream >> k.chars.first;
+                    } else if ( tag == "second" ) {
+                        line_stream >> k.chars.second;
+                    } else if ( tag == "amount" ) {
+                        line_stream >> k.amount;
+                    }
+                    line_stream >> tag;
+                }
+                data.kernings.insert(std::move(k));
+            }
+        }
+
+        return data;
     }
 }
 
@@ -34,22 +171,12 @@ namespace e2d
         return assign(other);
     }
 
-    font::font(
-        font::info_data&& info,
-        font::common_data&& common,
-        vector<str>&& pages,
-        vector<font::char_data>&& chars,
-        flat_map<u64,i32>&& kerning) noexcept {
-        assign(info, common, pages, chars, kerning);
+    font::font(data&& data) noexcept {
+        assign(std::move(data));
     }
 
-    font::font(
-        const font::info_data& info,
-        const font::common_data& common,
-        const vector<str>& pages,
-        const vector<font::char_data>& chars,
-        const flat_map<u64,i32>& kerning) {
-        assign(info, common, pages, chars, kerning);
+    font::font(const data& data) {
+        assign(data);
     }
 
     font& font::assign(font&& other) noexcept {
@@ -62,283 +189,182 @@ namespace e2d
 
     font& font::assign(const font& other) {
         if ( this != &other ) {
-            info_ = other.info_;
-            common_ = other.common_;
-            pages_ = other.pages_;
-            chars_ = other.chars_;
-            kerning_ = other.kerning_;
+            data_ = other.data_;
         }
         return *this;
     }
 
-    font& font::assign(
-        font::info_data&& info,
-        font::common_data&& common,
-        vector<str>&& pages,
-        vector<font::char_data>&& chars,
-        flat_map<u64,i32>&& kerning) noexcept {
-        info_ = std::move(info);
-        common_ = std::move(common);
-        pages_ = std::move(pages);
-        chars_ = std::move(chars);
-        kerning_ = std::move(kerning);
+    font& font::assign(data&& data) noexcept {
+        data_ = std::move(data);
         return *this;
     }
 
-    font& font::assign(
-        const font::info_data& info,
-        const font::common_data& common,
-        const vector<str>& pages,
-        const vector<font::char_data>& chars,
-        const flat_map<u64,i32>& kerning) {
-        info_ = info;
-        common_ = common;
-        pages_ = pages;
-        chars_ = chars;
-        kerning_ = kerning;
+    font& font::assign(const data& data) {
+        data_ = data;
         return *this;
     }
 
     void font::swap(font& other) noexcept {
         using std::swap;
-        swap(info_, other.info_);
-        swap(common_, other.common_);
-        swap(pages_, other.pages_);
-        swap(chars_, other.chars_);
-        swap(kerning_, other.kerning_);
+        swap(data_.info, other.data_.info);
+        swap(data_.common, other.data_.common);
+        swap(data_.pages, other.data_.pages);
+        swap(data_.chars, other.data_.chars);
+        swap(data_.kernings, other.data_.kernings);
     }
 
     void font::clear() noexcept {
-        pages_.clear();
-        chars_.clear();
-        kerning_.clear();
+        data_ = data();
     }
 
     bool font::empty() const noexcept {
-        return pages_.empty();
+        return data_.pages.empty();
     }
 
     const font::info_data& font::info() const noexcept {
-        return info_;
+        return data_.info;
     }
 
     const font::common_data& font::common() const noexcept {
-        return common_;
+        return data_.common;
     }
 
-    const vector<str>& font::pages() const noexcept {
-        return pages_;
+    const flat_set<font::page_data>& font::pages() const noexcept {
+        return data_.pages;
     }
 
-    const vector<font::char_data>& font::chars() const noexcept {
-        return chars_;
+    const flat_set<font::char_data>& font::chars() const noexcept {
+        return data_.chars;
     }
 
-    const flat_map<u64,i32>& font::kerning() const noexcept {
-        return kerning_;
+    const flat_set<font::kerning_data>& font::kernings() const noexcept {
+        return data_.kernings;
     }
 
-    font font::create(str_view content) {
-        font b;
-        str s{content.data()};
-        std::replace(s.begin(), s.end(), '=', ' ');
-        std::replace(s.begin(), s.end(), ',', ' ');
-
-        str tag;
-        str line;
-        std::stringstream data_stream(s);
-        vector<char_data> chars(120);
-        vector<kerning_data> kerning(120);
-        int chars_counter = 0;
-        int kerning_counter = 0;
-        while (getline(data_stream, line, '\n'))
-        {
-            std::stringstream line_stream(line);
-            line_stream >> tag;
-            if (tag == "info") {
-                //info face="Arial-Black" size=32 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=2,2
-                line_stream >> tag;
-                while (!line_stream.eof()) {
-                    if (tag == "size") {
-                        line_stream >>  b.info_.size;
-                    }
-                    line_stream >> tag;
-                }
-            } else if (tag == "common") {
-                //common lineHeight=54 base=35 scaleW=512 scaleH=512 pages=1 packed=0
-                line_stream >> tag;
-                while (!line_stream.eof()) {
-                    if (tag == "lineHeight") {
-                        line_stream >>  b.common_.line_height;
-                    } else if (tag == "base") {
-                        line_stream >>  b.common_.base;
-                    } else if (tag == "pages") {
-                        line_stream >>  b.common_.pages;
-                         b.pages_.resize( b.common_.pages);
-                    } else if (tag == "scaleW") {
-                        line_stream >>  b.common_.atlas_width;
-                    } else if (tag == "scaleH") {
-                        line_stream >>  b.common_.atlas_height;
-                    }
-                    line_stream >> tag;
-                }
-            } else if (tag == "page") {
-                //page id=0 file="boundsTestFont.png"
-                line_stream >> tag;
-                i32 id{-1};
-                while (!line_stream.eof()) {
-                    if (tag == "id") {
-                        line_stream >> id;
-                    } else if (tag == "file") {
-                        str file;
-                        line_stream >> file;
-                        //remove ""
-                        file.erase(file.begin());
-                        file.pop_back();
-                        b.pages_[id] = file;
-                    }
-                    line_stream >> tag;
-                }
-            } else if (tag == "chars") {
-                //chars count=95
-                //this field may not exist!
-                while (!line_stream.eof()) {
-                    if (tag == "count") {
-                        size_t count;
-                        line_stream >> count;
-                        if ( count > chars.size() ) {
-                            chars.resize(count);
-                        }
-                    }
-                    line_stream >> tag;
-                }
-            } else if (tag == "char") {
-                //char id=123 x=2 y=2 width=38 height=54 xoffset=0 yoffset=-3 xadvance=12 page=0 chnl=0 letter="{"
-                line_stream >> tag;
-                char_data& c = chars[chars_counter++];
-                while (!line_stream.eof()) {
-                    if (tag == "id") {
-                        line_stream >> c.id;
-                    } else if (tag == "x") {
-                        line_stream >> c.rect.position.x;
-                    } else if (tag == "y") {
-                        line_stream >> c.rect.position.y;
-                    } else if (tag == "width") {
-                        line_stream >> c.rect.size.x;
-                    } else if (tag == "height") {
-                        line_stream >> c.rect.size.y;
-                        c.rect.position.y = b.common_.atlas_height - c.rect.position.y - c.rect.size.y;
-                    } else if (tag == "xoffset") {
-                        line_stream >> c.xoffset;
-                    } else if (tag == "yoffset") {
-                        line_stream >> c.yoffset;
-                        c.yoffset = b.common_.base - c.yoffset - c.rect.size.y;
-                    } else if (tag == "xadvance") {
-                        line_stream >> c.xadvance;
-                    } else if (tag == "page") {
-                        line_stream >> c.page;
-                    }
-                    line_stream >> tag;
-                }
-            } else if (tag == "kernings") {
-                //kernings count=243
-                //this field may not exist!
-                while (!line_stream.eof()) {
-                    if (tag == "count") {
-                        size_t count;
-                        line_stream >> count;
-                        if ( count > kerning.size() ) {
-                            kerning.resize(count);
-                        }
-                    }
-                    line_stream >> tag;
-                }
-            } else if (tag == "kerning") {
-                //kerning first=86 second=101 amount=-2
-                line_stream >> tag;
-                kerning_data& k = kerning[kerning_counter++];
-                while (!line_stream.eof()) {
-                    if (tag == "first") {
-                        line_stream >> k.first;
-                    } else if (tag == "second") {
-                        line_stream >> k.second;
-                    } else if (tag == "amount") {
-                        line_stream >> k.amount;
-                    }
-                    line_stream >> tag;
-                }
-            }
-        }
-
-        b.chars_.insert(b.chars_.begin(), chars.begin(), chars.begin()+chars_counter);
-        b.kerning_.reserve(kerning_counter);
-        for ( int i = 0; i < kerning_counter; i++ ) {
-            b.kerning_.insert_or_assign(make_kerning_key(kerning[i].first,kerning[i].second),
-                                         kerning[i].amount);
-        }
-
-        return b;
+    const font::page_data* font::find_page(u32 id) const noexcept {
+        const auto iter = data_.pages.find(id);
+        return iter != data_.pages.end()
+            ? &*iter
+            : nullptr;
     }
 
-    const font::char_data* font::find_char(u32 charId) const noexcept {
-        for ( auto& c: chars_ ) {
-            if (c.id == charId) {
-                return &c;
-            }
-        }
-
-        return 0;
+    const font::char_data* font::find_char(u32 id) const noexcept {
+        const auto iter = data_.chars.find(id);
+        return iter != data_.chars.end()
+            ? &*iter
+            : nullptr;
     }
 
-    i32 font::find_kerning(u32 first, u32 second) const noexcept {
-        auto it = kerning_.find(make_kerning_key(first,second));
-        if (it != kerning_.end()) {
-            return it->second;
-        }
-
-        return 0;
+    i32 font::get_kerning(u32 first, u32 second) const noexcept {
+        const auto iter = data_.kernings.find(std::make_pair(first, second));
+        return iter != data_.kernings.end()
+            ? iter->amount
+            : 0;
     }
 }
 
-
 namespace e2d
 {
-    bool operator==(const font::info_data& l, const font::info_data& r) noexcept {
-        return l.size == r.size;
-    }
-
-    bool operator==(const font::common_data& l, const font::common_data& r) noexcept {
-        return l.line_height == r.line_height
-        && l.base == r.base
-        && l.pages == r.pages
-        && l.atlas_width == r.atlas_width
-        && l.atlas_height == r.atlas_height;
-    }
-
-    bool operator==(const font::char_data& l, const font::char_data& r) noexcept {
-        return l.id == r.id
-        && l.rect == r.rect
-        && l.xoffset == r.xoffset
-        && l.yoffset == r.yoffset
-        && l.xadvance == r.xadvance
-        && l.page == r.page
-        && l.chnl == r.chnl;
-    }
-
-
     void swap(font& l, font& r) noexcept {
         l.swap(r);
     }
 
     bool operator==(const font& l, const font& r) noexcept {
         return l.info() == r.info()
-        && l.common() == r.common()
-        && l.pages() == r.pages()
-        && l.chars() == r.chars()
-        && l.kerning() == r.kerning();
+            && l.common() == r.common()
+            && l.pages() == r.pages()
+            && l.chars() == r.chars()
+            && l.kernings() == r.kernings();
     }
 
     bool operator!=(const font& l, const font& r) noexcept {
         return !(l == r);
     }
+
+    bool operator<(u32 l, const font::page_data& r) noexcept {
+        return l < r.id;
+    }
+
+    bool operator<(const font::page_data& l, u32 r) noexcept {
+        return l.id < r;
+    }
+
+    bool operator<(const font::page_data& l, const font::page_data& r) noexcept {
+        return l.id < r.id;
+    }
+
+    bool operator<(u32 l, const font::char_data& r) noexcept {
+        return l < r.id;
+    }
+
+    bool operator<(const font::char_data& l, u32 r) noexcept {
+        return l.id < r;
+    }
+
+    bool operator<(const font::char_data& l, const font::char_data& r) noexcept {
+        return l.id < r.id;
+    }
+
+    bool operator<(const std::pair<u32,u32>& l, const font::kerning_data& r) noexcept {
+        return l < r.chars;
+    }
+
+    bool operator<(const font::kerning_data& l, const std::pair<u32,u32>& r) noexcept {
+        return l.chars < r;
+    }
+
+    bool operator<(const font::kerning_data& l, const font::kerning_data& r) noexcept {
+        return l.chars < r.chars;
+    }
+
+    bool operator==(const font::info_data& l, const font::info_data& r) noexcept {
+        return l.face == r.face
+            && l.size == r.size;
+    }
+
+    bool operator==(const font::common_data& l, const font::common_data& r) noexcept {
+        return l.line == r.line
+            && l.base == r.base
+            && l.pages == r.pages
+            && l.atlas_size == r.atlas_size;
+    }
+
+    bool operator==(const font::page_data& l, const font::page_data& r) noexcept {
+        return l.id == r.id
+            && l.file == r.file;
+    }
+
+    bool operator==(const font::char_data& l, const font::char_data& r) noexcept {
+        return l.id == r.id
+            && l.rect == r.rect
+            && l.offset == r.offset
+            && l.advance == r.advance
+            && l.page == r.page
+            && l.chnl == r.chnl;
+    }
+
+    bool operator==(const font::kerning_data& l, const font::kerning_data& r) noexcept {
+        return l.chars == r.chars
+            && l.amount == r.amount;
+    }
+}
+
+namespace e2d::fonts
+{
+    bool try_load_font(font& dst, const buffer& src) noexcept {
+        try {
+            dst = load_font_data(str_view{
+                reinterpret_cast<const char*>(src.data()),
+                src.size()});
+            return true;
+        } catch (...) {
+            return false;
+        }
+    }
+
+    bool try_load_font(font& dst, const input_stream_uptr& src) noexcept {
+        buffer file_data;
+        return streams::try_read_tail(file_data, src)
+            && try_load_font(dst, file_data);
+    }
 }

From ba8c4827fbd74a8a2ddc1502cb6e64351683a7f0 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 25 Jul 2019 17:32:29 +0700
Subject: [PATCH 017/108] add font loading test and sample arial font

---
 samples/bin/library/arial.fnt          | 510 +++++++++++++++++++++++++
 samples/bin/library/arial.png          |   3 +
 sources/enduro2d/utils/font.cpp        |  44 ++-
 untests/sources/untests_utils/font.cpp |  74 ++++
 4 files changed, 618 insertions(+), 13 deletions(-)
 create mode 100644 samples/bin/library/arial.fnt
 create mode 100644 samples/bin/library/arial.png
 create mode 100644 untests/sources/untests_utils/font.cpp

diff --git a/samples/bin/library/arial.fnt b/samples/bin/library/arial.fnt
new file mode 100644
index 00000000..c1caa43d
--- /dev/null
+++ b/samples/bin/library/arial.fnt
@@ -0,0 +1,510 @@
+info face="Arial" size=50 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=0,0
+common lineHeight=58 base=49 scaleW=512 scaleH=512 pages=1 packed=0
+page id=0 file="arial.png"
+chars count=162
+char id=32 x=342 y=38 width=0 height=0 xoffset=0 yoffset=46 xadvance=14 page=0 chnl=0
+char id=33 x=448 y=386 width=10 height=40 xoffset=5 yoffset=10 xadvance=14 page=0 chnl=0
+char id=34 x=394 y=306 width=18 height=18 xoffset=3 yoffset=8 xadvance=18 page=0 chnl=0
+char id=35 x=178 y=180 width=32 height=42 xoffset=1 yoffset=8 xadvance=28 page=0 chnl=0
+char id=36 x=278 y=444 width=28 height=50 xoffset=2 yoffset=5 xadvance=28 page=0 chnl=0
+char id=37 x=4 y=204 width=44 height=42 xoffset=3 yoffset=9 xadvance=45 page=0 chnl=0
+char id=38 x=102 y=364 width=36 height=42 xoffset=3 yoffset=8 xadvance=34 page=0 chnl=0
+char id=39 x=416 y=306 width=10 height=18 xoffset=3 yoffset=8 xadvance=10 page=0 chnl=0
+char id=40 x=392 y=442 width=16 height=52 xoffset=4 yoffset=8 xadvance=17 page=0 chnl=0
+char id=41 x=392 y=386 width=16 height=52 xoffset=4 yoffset=8 xadvance=17 page=0 chnl=0
+char id=42 x=368 y=306 width=22 height=20 xoffset=2 yoffset=8 xadvance=20 page=0 chnl=0
+char id=43 x=178 y=476 width=28 height=28 xoffset=3 yoffset=16 xadvance=30 page=0 chnl=0
+char id=44 x=492 y=226 width=10 height=18 xoffset=5 yoffset=39 xadvance=14 page=0 chnl=0
+char id=45 x=4 y=492 width=18 height=10 xoffset=2 yoffset=29 xadvance=17 page=0 chnl=0
+char id=46 x=26 y=492 width=10 height=10 xoffset=5 yoffset=40 xadvance=14 page=0 chnl=0
+char id=47 x=436 y=340 width=18 height=42 xoffset=0 yoffset=8 xadvance=14 page=0 chnl=0
+char id=48 x=278 y=398 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0
+char id=49 x=414 y=340 width=18 height=40 xoffset=6 yoffset=10 xadvance=28 page=0 chnl=0
+char id=50 x=342 y=262 width=28 height=40 xoffset=2 yoffset=10 xadvance=28 page=0 chnl=0
+char id=51 x=278 y=352 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0
+char id=52 x=178 y=432 width=30 height=40 xoffset=1 yoffset=10 xadvance=28 page=0 chnl=0
+char id=53 x=310 y=262 width=28 height=40 xoffset=3 yoffset=10 xadvance=28 page=0 chnl=0
+char id=54 x=278 y=306 width=28 height=42 xoffset=2 yoffset=8 xadvance=28 page=0 chnl=0
+char id=55 x=278 y=262 width=28 height=40 xoffset=3 yoffset=10 xadvance=28 page=0 chnl=0
+char id=56 x=246 y=444 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0
+char id=57 x=246 y=398 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0
+char id=58 x=46 y=444 width=10 height=30 xoffset=5 yoffset=20 xadvance=14 page=0 chnl=0
+char id=59 x=486 y=340 width=10 height=38 xoffset=5 yoffset=19 xadvance=14 page=0 chnl=0
+char id=60 x=310 y=226 width=28 height=30 xoffset=3 yoffset=14 xadvance=30 page=0 chnl=0
+char id=61 x=452 y=48 width=28 height=20 xoffset=3 yoffset=19 xadvance=30 page=0 chnl=0
+char id=62 x=420 y=48 width=28 height=30 xoffset=3 yoffset=14 xadvance=30 page=0 chnl=0
+char id=63 x=246 y=352 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0
+char id=64 x=4 y=48 width=52 height=52 xoffset=3 yoffset=8 xadvance=51 page=0 chnl=0
+char id=65 x=60 y=448 width=38 height=40 xoffset=0 yoffset=10 xadvance=34 page=0 chnl=0
+char id=66 x=142 y=452 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
+char id=67 x=102 y=318 width=36 height=42 xoffset=3 yoffset=8 xadvance=37 page=0 chnl=0
+char id=68 x=256 y=126 width=34 height=40 xoffset=4 yoffset=10 xadvance=37 page=0 chnl=0
+char id=69 x=142 y=408 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
+char id=70 x=178 y=388 width=30 height=40 xoffset=5 yoffset=10 xadvance=31 page=0 chnl=0
+char id=71 x=60 y=402 width=38 height=42 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0
+char id=72 x=218 y=126 width=34 height=40 xoffset=5 yoffset=10 xadvance=37 page=0 chnl=0
+char id=73 x=472 y=340 width=10 height=40 xoffset=5 yoffset=10 xadvance=14 page=0 chnl=0
+char id=74 x=340 y=376 width=24 height=42 xoffset=2 yoffset=8 xadvance=25 page=0 chnl=0
+char id=75 x=448 y=82 width=34 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
+char id=76 x=246 y=308 width=28 height=40 xoffset=4 yoffset=10 xadvance=28 page=0 chnl=0
+char id=77 x=430 y=4 width=40 height=40 xoffset=4 yoffset=10 xadvance=42 page=0 chnl=0
+char id=78 x=410 y=82 width=34 height=40 xoffset=4 yoffset=10 xadvance=37 page=0 chnl=0
+char id=79 x=4 y=398 width=40 height=42 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0
+char id=80 x=142 y=364 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
+char id=81 x=4 y=350 width=40 height=44 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0
+char id=82 x=142 y=82 width=36 height=40 xoffset=4 yoffset=10 xadvance=37 page=0 chnl=0
+char id=83 x=180 y=126 width=34 height=42 xoffset=3 yoffset=8 xadvance=34 page=0 chnl=0
+char id=84 x=372 y=82 width=34 height=40 xoffset=2 yoffset=10 xadvance=31 page=0 chnl=0
+char id=85 x=102 y=456 width=34 height=42 xoffset=4 yoffset=8 xadvance=37 page=0 chnl=0
+char id=86 x=60 y=358 width=38 height=40 xoffset=1 yoffset=10 xadvance=34 page=0 chnl=0
+char id=87 x=4 y=4 width=52 height=40 xoffset=1 yoffset=10 xadvance=48 page=0 chnl=0
+char id=88 x=60 y=314 width=38 height=40 xoffset=1 yoffset=10 xadvance=34 page=0 chnl=0
+char id=89 x=60 y=270 width=38 height=40 xoffset=1 yoffset=10 xadvance=34 page=0 chnl=0
+char id=90 x=334 y=82 width=34 height=40 xoffset=2 yoffset=10 xadvance=31 page=0 chnl=0
+char id=91 x=430 y=386 width=14 height=50 xoffset=4 yoffset=9 xadvance=14 page=0 chnl=0
+char id=92 x=392 y=340 width=18 height=42 xoffset=0 yoffset=8 xadvance=14 page=0 chnl=0
+char id=93 x=412 y=442 width=14 height=50 xoffset=1 yoffset=9 xadvance=14 page=0 chnl=0
+char id=94 x=310 y=466 width=26 height=24 xoffset=2 yoffset=9 xadvance=24 page=0 chnl=0
+char id=95 x=4 y=480 width=34 height=8 xoffset=0 yoffset=51 xadvance=28 page=0 chnl=0
+char id=96 x=42 y=480 width=14 height=12 xoffset=3 yoffset=8 xadvance=17 page=0 chnl=0
+char id=97 x=278 y=226 width=28 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
+char id=98 x=246 y=262 width=28 height=42 xoffset=4 yoffset=8 xadvance=28 page=0 chnl=0
+char id=99 x=246 y=226 width=28 height=32 xoffset=2 yoffset=18 xadvance=25 page=0 chnl=0
+char id=100 x=214 y=446 width=28 height=42 xoffset=2 yoffset=8 xadvance=28 page=0 chnl=0
+char id=101 x=214 y=410 width=28 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
+char id=102 x=368 y=432 width=20 height=42 xoffset=1 yoffset=8 xadvance=14 page=0 chnl=0
+char id=103 x=214 y=364 width=28 height=42 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
+char id=104 x=310 y=422 width=26 height=40 xoffset=4 yoffset=10 xadvance=28 page=0 chnl=0
+char id=105 x=458 y=340 width=10 height=40 xoffset=4 yoffset=10 xadvance=12 page=0 chnl=0
+char id=106 x=412 y=386 width=14 height=52 xoffset=-2 yoffset=8 xadvance=12 page=0 chnl=0
+char id=107 x=310 y=378 width=26 height=40 xoffset=4 yoffset=10 xadvance=25 page=0 chnl=0
+char id=108 x=494 y=262 width=10 height=40 xoffset=4 yoffset=10 xadvance=12 page=0 chnl=0
+char id=109 x=386 y=4 width=40 height=32 xoffset=4 yoffset=18 xadvance=42 page=0 chnl=0
+char id=110 x=310 y=342 width=26 height=32 xoffset=4 yoffset=18 xadvance=28 page=0 chnl=0
+char id=111 x=178 y=352 width=30 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
+char id=112 x=214 y=318 width=28 height=42 xoffset=4 yoffset=17 xadvance=28 page=0 chnl=0
+char id=113 x=214 y=272 width=28 height=42 xoffset=2 yoffset=17 xadvance=28 page=0 chnl=0
+char id=114 x=368 y=396 width=20 height=32 xoffset=4 yoffset=18 xadvance=17 page=0 chnl=0
+char id=115 x=310 y=306 width=26 height=32 xoffset=2 yoffset=18 xadvance=25 page=0 chnl=0
+char id=116 x=486 y=82 width=18 height=40 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0
+char id=117 x=464 y=262 width=26 height=32 xoffset=4 yoffset=18 xadvance=28 page=0 chnl=0
+char id=118 x=388 y=48 width=28 height=30 xoffset=1 yoffset=20 xadvance=25 page=0 chnl=0
+char id=119 x=342 y=4 width=40 height=30 xoffset=1 yoffset=20 xadvance=37 page=0 chnl=0
+char id=120 x=290 y=48 width=30 height=30 xoffset=1 yoffset=20 xadvance=25 page=0 chnl=0
+char id=121 x=214 y=226 width=28 height=42 xoffset=1 yoffset=18 xadvance=25 page=0 chnl=0
+char id=122 x=356 y=48 width=28 height=30 xoffset=1 yoffset=20 xadvance=25 page=0 chnl=0
+char id=123 x=368 y=340 width=20 height=52 xoffset=2 yoffset=8 xadvance=17 page=0 chnl=0
+char id=124 x=430 y=440 width=8 height=52 xoffset=5 yoffset=8 xadvance=13 page=0 chnl=0
+char id=125 x=340 y=422 width=20 height=52 xoffset=2 yoffset=8 xadvance=17 page=0 chnl=0
+char id=126 x=256 y=48 width=30 height=14 xoffset=3 yoffset=22 xadvance=30 page=0 chnl=0
+char id=127 x=350 y=38 width=0 height=0 xoffset=0 yoffset=0 xadvance=0 page=0 chnl=0
+char id=1025 x=142 y=312 width=32 height=48 xoffset=4 yoffset=2 xadvance=34 page=0 chnl=0
+char id=1040 x=60 y=226 width=38 height=40 xoffset=0 yoffset=10 xadvance=34 page=0 chnl=0
+char id=1041 x=142 y=268 width=32 height=40 xoffset=5 yoffset=10 xadvance=33 page=0 chnl=0
+char id=1042 x=142 y=224 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
+char id=1043 x=470 y=180 width=28 height=40 xoffset=4 yoffset=10 xadvance=28 page=0 chnl=0
+char id=1044 x=60 y=172 width=38 height=50 xoffset=0 yoffset=8 xadvance=34 page=0 chnl=0
+char id=1045 x=142 y=180 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
+char id=1046 x=60 y=4 width=50 height=40 xoffset=1 yoffset=10 xadvance=47 page=0 chnl=0
+char id=1047 x=438 y=126 width=32 height=42 xoffset=2 yoffset=8 xadvance=31 page=0 chnl=0
+char id=1048 x=296 y=82 width=34 height=40 xoffset=4 yoffset=10 xadvance=36 page=0 chnl=0
+char id=1049 x=142 y=126 width=34 height=50 xoffset=4 yoffset=0 xadvance=36 page=0 chnl=0
+char id=1050 x=178 y=308 width=30 height=40 xoffset=4 yoffset=10 xadvance=30 page=0 chnl=0
+char id=1051 x=102 y=410 width=34 height=42 xoffset=1 yoffset=8 xadvance=33 page=0 chnl=0
+char id=1052 x=298 y=4 width=40 height=40 xoffset=4 yoffset=10 xadvance=42 page=0 chnl=0
+char id=1053 x=258 y=82 width=34 height=40 xoffset=5 yoffset=10 xadvance=37 page=0 chnl=0
+char id=1054 x=4 y=304 width=40 height=42 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0
+char id=1055 x=220 y=82 width=34 height=40 xoffset=4 yoffset=10 xadvance=36 page=0 chnl=0
+char id=1056 x=402 y=126 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
+char id=1057 x=102 y=272 width=36 height=42 xoffset=3 yoffset=8 xadvance=37 page=0 chnl=0
+char id=1058 x=182 y=82 width=34 height=40 xoffset=2 yoffset=10 xadvance=31 page=0 chnl=0
+char id=1059 x=102 y=226 width=36 height=42 xoffset=1 yoffset=8 xadvance=32 page=0 chnl=0
+char id=1060 x=60 y=126 width=38 height=42 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0
+char id=1061 x=60 y=82 width=38 height=40 xoffset=1 yoffset=10 xadvance=34 page=0 chnl=0
+char id=1062 x=102 y=172 width=36 height=50 xoffset=4 yoffset=9 xadvance=37 page=0 chnl=0
+char id=1063 x=366 y=126 width=32 height=40 xoffset=3 yoffset=10 xadvance=34 page=0 chnl=0
+char id=1064 x=252 y=4 width=42 height=40 xoffset=4 yoffset=10 xadvance=46 page=0 chnl=0
+char id=1065 x=4 y=150 width=46 height=50 xoffset=4 yoffset=9 xadvance=47 page=0 chnl=0
+char id=1066 x=206 y=4 width=42 height=40 xoffset=0 yoffset=10 xadvance=40 page=0 chnl=0
+char id=1067 x=160 y=4 width=42 height=40 xoffset=5 yoffset=10 xadvance=45 page=0 chnl=0
+char id=1068 x=330 y=126 width=32 height=40 xoffset=5 yoffset=10 xadvance=33 page=0 chnl=0
+char id=1069 x=102 y=126 width=36 height=42 xoffset=3 yoffset=8 xadvance=36 page=0 chnl=0
+char id=1070 x=4 y=104 width=48 height=42 xoffset=5 yoffset=8 xadvance=51 page=0 chnl=0
+char id=1071 x=102 y=82 width=36 height=40 xoffset=1 yoffset=10 xadvance=37 page=0 chnl=0
+char id=1072 x=438 y=180 width=28 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
+char id=1073 x=178 y=262 width=30 height=42 xoffset=3 yoffset=8 xadvance=29 page=0 chnl=0
+char id=1074 x=434 y=262 width=26 height=30 xoffset=4 yoffset=20 xadvance=27 page=0 chnl=0
+char id=1075 x=484 y=48 width=20 height=30 xoffset=4 yoffset=20 xadvance=19 page=0 chnl=0
+char id=1076 x=294 y=126 width=32 height=38 xoffset=0 yoffset=19 xadvance=30 page=0 chnl=0
+char id=1077 x=406 y=180 width=28 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
+char id=1078 x=102 y=48 width=38 height=30 xoffset=0 yoffset=20 xadvance=34 page=0 chnl=0
+char id=1079 x=340 y=340 width=24 height=32 xoffset=2 yoffset=18 xadvance=23 page=0 chnl=0
+char id=1080 x=404 y=262 width=26 height=30 xoffset=4 yoffset=20 xadvance=28 page=0 chnl=0
+char id=1081 x=374 y=262 width=26 height=40 xoffset=4 yoffset=10 xadvance=28 page=0 chnl=0
+char id=1082 x=340 y=306 width=24 height=30 xoffset=4 yoffset=20 xadvance=22 page=0 chnl=0
+char id=1083 x=178 y=226 width=30 height=32 xoffset=1 yoffset=18 xadvance=30 page=0 chnl=0
+char id=1084 x=220 y=48 width=32 height=30 xoffset=4 yoffset=20 xadvance=35 page=0 chnl=0
+char id=1085 x=462 y=226 width=26 height=30 xoffset=4 yoffset=20 xadvance=28 page=0 chnl=0
+char id=1086 x=474 y=126 width=30 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
+char id=1087 x=432 y=226 width=26 height=30 xoffset=4 yoffset=20 xadvance=28 page=0 chnl=0
+char id=1088 x=374 y=180 width=28 height=42 xoffset=4 yoffset=17 xadvance=28 page=0 chnl=0
+char id=1089 x=342 y=180 width=28 height=32 xoffset=2 yoffset=18 xadvance=25 page=0 chnl=0
+char id=1090 x=402 y=226 width=26 height=30 xoffset=1 yoffset=20 xadvance=23 page=0 chnl=0
+char id=1091 x=310 y=180 width=28 height=42 xoffset=1 yoffset=18 xadvance=25 page=0 chnl=0
+char id=1092 x=4 y=250 width=42 height=50 xoffset=2 yoffset=9 xadvance=42 page=0 chnl=0
+char id=1093 x=474 y=4 width=30 height=30 xoffset=1 yoffset=20 xadvance=25 page=0 chnl=0
+char id=1094 x=278 y=180 width=28 height=38 xoffset=4 yoffset=19 xadvance=29 page=0 chnl=0
+char id=1095 x=372 y=226 width=26 height=30 xoffset=2 yoffset=20 xadvance=27 page=0 chnl=0
+char id=1096 x=60 y=48 width=38 height=30 xoffset=4 yoffset=20 xadvance=41 page=0 chnl=0
+char id=1097 x=114 y=4 width=42 height=38 xoffset=4 yoffset=19 xadvance=42 page=0 chnl=0
+char id=1098 x=182 y=48 width=34 height=30 xoffset=1 yoffset=20 xadvance=32 page=0 chnl=0
+char id=1099 x=144 y=48 width=34 height=30 xoffset=4 yoffset=20 xadvance=36 page=0 chnl=0
+char id=1100 x=342 y=226 width=26 height=30 xoffset=4 yoffset=20 xadvance=27 page=0 chnl=0
+char id=1101 x=246 y=180 width=28 height=32 xoffset=2 yoffset=18 xadvance=26 page=0 chnl=0
+char id=1102 x=4 y=444 width=38 height=32 xoffset=4 yoffset=18 xadvance=38 page=0 chnl=0
+char id=1103 x=324 y=48 width=28 height=30 xoffset=1 yoffset=20 xadvance=28 page=0 chnl=0
+char id=1105 x=214 y=180 width=28 height=42 xoffset=2 yoffset=8 xadvance=28 page=0 chnl=0
+kernings count=343
+kerning first=1059 second=1081 amount=-1
+kerning first=1043 second=1071 amount=-1
+kerning first=86 second=117 amount=-1
+kerning first=1059 second=44 amount=-6
+kerning first=84 second=97 amount=-5
+kerning first=1047 second=1063 amount=-1
+kerning first=1059 second=1096 amount=-2
+kerning first=1070 second=1046 amount=-1
+kerning first=1042 second=1090 amount=-1
+kerning first=1043 second=1086 amount=-3
+kerning first=1100 second=1090 amount=-3
+kerning first=1041 second=1061 amount=-1
+kerning first=1042 second=1057 amount=-1
+kerning first=1058 second=1100 amount=-2
+kerning first=1075 second=1072 amount=-1
+kerning first=1060 second=1058 amount=-2
+kerning first=1043 second=1091 amount=-3
+kerning first=1070 second=1051 amount=-2
+kerning first=1074 second=1091 amount=-1
+kerning first=1086 second=1076 amount=-1
+kerning first=84 second=99 amount=-5
+kerning first=87 second=65 amount=-1
+kerning first=1058 second=1072 amount=-2
+kerning first=1078 second=1098 amount=1
+kerning first=1069 second=1061 amount=-1
+kerning first=1046 second=1054 amount=-1
+kerning first=1058 second=1087 amount=-2
+kerning first=1069 second=1076 amount=-1
+kerning first=1060 second=1063 amount=-1
+kerning first=1056 second=58 amount=-1
+kerning first=1057 second=1058 amount=-1
+kerning first=1056 second=1077 amount=-2
+kerning first=80 second=65 amount=-3
+kerning first=1059 second=1073 amount=-1
+kerning first=1050 second=1060 amount=-1
+kerning first=86 second=101 amount=-2
+kerning first=1059 second=1088 amount=-2
+kerning first=1058 second=1044 amount=-1
+kerning first=1075 second=44 amount=-6
+kerning first=1057 second=1063 amount=-1
+kerning first=1091 second=1083 amount=-1
+kerning first=1060 second=1083 amount=-1
+kerning first=1068 second=1052 amount=-1
+kerning first=1057 second=1078 amount=1
+kerning first=1059 second=1093 amount=-2
+kerning first=1074 second=1083 amount=-1
+kerning first=1043 second=1083 amount=-2
+kerning first=1044 second=1079 amount=1
+kerning first=1101 second=1083 amount=-1
+kerning first=1070 second=1058 amount=-2
+kerning first=1074 second=1098 amount=-1
+kerning first=1042 second=1054 amount=-1
+kerning first=1088 second=1083 amount=-1
+kerning first=1060 second=1040 amount=-1
+kerning first=1056 second=1054 amount=-1
+kerning first=1040 second=1044 amount=1
+kerning first=1079 second=1076 amount=-1
+kerning first=1043 second=1040 amount=-3
+kerning first=1070 second=1063 amount=-1
+kerning first=1040 second=1059 amount=-2
+kerning first=1059 second=46 amount=-6
+kerning first=1054 second=1044 amount=-1
+kerning first=1058 second=1084 amount=-2
+kerning first=89 second=111 amount=-4
+kerning first=1057 second=1040 amount=-1
+kerning first=1043 second=1103 amount=-3
+kerning first=1046 second=1066 amount=1
+kerning first=1054 second=1059 amount=-1
+kerning first=1058 second=1099 amount=-2
+kerning first=1068 second=1044 amount=-1
+kerning first=1058 second=44 amount=-5
+kerning first=87 second=44 amount=-2
+kerning first=1091 second=44 amount=-5
+kerning first=1070 second=1083 amount=-2
+kerning first=84 second=111 amount=-5
+kerning first=1059 second=1085 amount=-2
+kerning first=89 second=112 amount=-3
+kerning first=84 second=65 amount=-3
+kerning first=1092 second=1076 amount=-1
+kerning first=1042 second=1046 amount=-1
+kerning first=80 second=44 amount=-6
+kerning first=87 second=46 amount=-2
+kerning first=1070 second=1040 amount=-1
+kerning first=1075 second=1076 amount=-2
+kerning first=1043 second=1080 amount=-2
+kerning first=1082 second=1073 amount=1
+kerning first=1102 second=1076 amount=-1
+kerning first=1074 second=1095 amount=-2
+kerning first=1043 second=1047 amount=-1
+kerning first=89 second=113 amount=-4
+kerning first=1042 second=1066 amount=-2
+kerning first=1088 second=1095 amount=-1
+kerning first=1075 second=46 amount=-6
+kerning first=76 second=84 amount=-3
+kerning first=80 second=46 amount=-6
+kerning first=1056 second=1051 amount=-2
+kerning first=1043 second=1052 amount=-1
+kerning first=1059 second=1077 amount=-3
+kerning first=1042 second=1071 amount=-1
+kerning first=1043 second=1100 amount=-2
+kerning first=76 second=121 amount=-1
+kerning first=1072 second=1090 amount=-1
+kerning first=76 second=86 amount=-3
+kerning first=1056 second=1071 amount=-1
+kerning first=1086 second=1090 amount=-1
+kerning first=1056 second=1086 amount=-2
+kerning first=1059 second=1082 amount=-2
+kerning first=1043 second=1072 amount=-2
+kerning first=84 second=114 amount=-1
+kerning first=1054 second=1061 amount=-2
+kerning first=76 second=87 amount=-3
+kerning first=1059 second=1097 amount=-2
+kerning first=1062 second=1054 amount=-1
+kerning first=1073 second=1091 amount=-1
+kerning first=1077 second=1083 amount=-1
+kerning first=1054 second=1076 amount=-1
+kerning first=1042 second=1058 amount=-3
+kerning first=1068 second=1061 amount=-2
+kerning first=1060 second=1044 amount=-1
+kerning first=1058 second=46 amount=-5
+kerning first=1060 second=1059 amount=-2
+kerning first=1056 second=1058 amount=-2
+kerning first=1090 second=1078 amount=1
+kerning first=84 second=58 amount=-5
+kerning first=84 second=44 amount=-5
+kerning first=1091 second=46 amount=-5
+kerning first=1043 second=44 amount=-6
+kerning first=84 second=115 amount=-5
+kerning first=1043 second=1044 amount=-3
+kerning first=1059 second=1054 amount=-1
+kerning first=76 second=89 amount=-3
+kerning first=1059 second=1069 amount=-1
+kerning first=1042 second=1063 amount=-2
+kerning first=1059 second=1102 amount=-2
+kerning first=1058 second=1088 amount=-2
+kerning first=1057 second=1044 amount=-1
+kerning first=1090 second=44 amount=-5
+kerning first=1057 second=1059 amount=-1
+kerning first=1090 second=1083 amount=-1
+kerning first=1059 second=1074 amount=-2
+kerning first=84 second=46 amount=-5
+kerning first=1040 second=1101 amount=1
+kerning first=1066 second=1071 amount=-1
+kerning first=1058 second=1093 amount=-2
+kerning first=1059 second=1089 amount=-3
+kerning first=1073 second=1083 amount=-2
+kerning first=89 second=117 amount=-2
+kerning first=1073 second=1098 amount=-1
+kerning first=1070 second=1044 amount=-2
+kerning first=1059 second=1094 amount=-2
+kerning first=89 second=97 amount=-3
+kerning first=1043 second=1084 amount=-2
+kerning first=119 second=44 amount=-2
+kerning first=84 second=117 amount=-1
+kerning first=1042 second=1040 amount=-1
+kerning first=1043 second=1099 amount=-2
+kerning first=1077 second=1095 amount=-1
+kerning first=89 second=118 amount=-2
+kerning first=114 second=44 amount=-2
+kerning first=1056 second=1040 amount=-3
+kerning first=1073 second=1103 amount=-1
+kerning first=1059 second=1051 amount=-1
+kerning first=1056 second=1103 amount=-1
+kerning first=1092 second=1090 amount=-1
+kerning first=1042 second=1060 amount=-1
+kerning first=1061 second=1057 amount=-1
+kerning first=89 second=101 amount=-4
+kerning first=1091 second=1076 amount=-1
+kerning first=49 second=49 amount=-3
+kerning first=86 second=121 amount=-1
+kerning first=1102 second=1090 amount=-1
+kerning first=1059 second=1071 amount=-1
+kerning first=1059 second=1086 amount=-3
+kerning first=1043 second=46 amount=-6
+kerning first=119 second=46 amount=-2
+kerning first=1043 second=1076 amount=-3
+kerning first=84 second=119 amount=-2
+kerning first=1101 second=1076 amount=-1
+kerning first=84 second=101 amount=-5
+kerning first=1073 second=1095 amount=-1
+kerning first=1042 second=1095 amount=-1
+kerning first=1057 second=1061 amount=-2
+kerning first=1100 second=1095 amount=-3
+kerning first=1042 second=1047 amount=-1
+kerning first=1088 second=1076 amount=-1
+kerning first=114 second=46 amount=-2
+kerning first=1090 second=46 amount=-5
+kerning first=1041 second=1066 amount=-1
+kerning first=1056 second=1047 amount=-1
+kerning first=1075 second=1077 amount=-1
+kerning first=1056 second=44 amount=-9
+kerning first=1069 second=1051 amount=-1
+kerning first=1058 second=1077 amount=-2
+kerning first=1046 second=1059 amount=1
+kerning first=1040 second=1090 amount=-1
+kerning first=1059 second=58 amount=-1
+kerning first=1070 second=1061 amount=-2
+kerning first=1040 second=1057 amount=-1
+kerning first=1070 second=1076 amount=-2
+kerning first=1058 second=1082 amount=-2
+kerning first=1059 second=1078 amount=-1
+kerning first=1073 second=1072 amount=-1
+kerning first=86 second=97 amount=-3
+kerning first=1069 second=1071 amount=-1
+kerning first=1061 second=1054 amount=-1
+kerning first=1058 second=1097 amount=-2
+kerning first=1041 second=1091 amount=-1
+kerning first=1077 second=1079 amount=-1
+kerning first=1061 second=1069 amount=-1
+kerning first=1056 second=1072 amount=-1
+kerning first=1076 second=1098 amount=-1
+kerning first=1083 second=1095 amount=-1
+kerning first=1041 second=1058 amount=-2
+kerning first=1068 second=1057 amount=-1
+kerning first=1059 second=1083 amount=-3
+kerning first=1043 second=1088 amount=-2
+kerning first=1058 second=1054 amount=-2
+kerning first=89 second=65 amount=-3
+kerning first=1042 second=1044 amount=-1
+kerning first=1041 second=1063 amount=-2
+kerning first=1042 second=1059 amount=-1
+kerning first=89 second=105 amount=-1
+kerning first=118 second=44 amount=-3
+kerning first=1058 second=1102 amount=-2
+kerning first=65 second=84 amount=-3
+kerning first=1056 second=1044 amount=-3
+kerning first=1059 second=1040 amount=-3
+kerning first=1056 second=1059 amount=-1
+kerning first=1075 second=1089 amount=-1
+kerning first=1058 second=1074 amount=-2
+kerning first=84 second=105 amount=-1
+kerning first=1059 second=1103 amount=-3
+kerning first=1058 second=1089 amount=-2
+kerning first=1073 second=1079 amount=-1
+kerning first=65 second=86 amount=-3
+kerning first=1040 second=1054 amount=-1
+kerning first=1059 second=1060 amount=-1
+kerning first=1086 second=1083 amount=-1
+kerning first=1040 second=1069 amount=-1
+kerning first=1056 second=46 amount=-9
+kerning first=1059 second=1075 amount=-2
+kerning first=1093 second=1095 amount=-1
+kerning first=1065 second=1091 amount=1
+kerning first=1073 second=1084 amount=-1
+kerning first=65 second=87 amount=-1
+kerning first=1041 second=1040 amount=-1
+kerning first=1069 second=1083 amount=-1
+kerning first=1077 second=1076 amount=-1
+kerning first=118 second=46 amount=-3
+kerning first=1068 second=1054 amount=-1
+kerning first=1045 second=1047 amount=-1
+kerning first=1059 second=1080 amount=-2
+kerning first=1043 second=1085 amount=-2
+kerning first=1058 second=1051 amount=-1
+kerning first=1059 second=1047 amount=-1
+kerning first=65 second=89 amount=-3
+kerning first=70 second=65 amount=-2
+kerning first=1074 second=1090 amount=-1
+kerning first=1075 second=1086 amount=-1
+kerning first=1090 second=1076 amount=-1
+kerning first=1101 second=1090 amount=-1
+kerning first=89 second=58 amount=-2
+kerning first=89 second=44 amount=-6
+kerning first=1062 second=1072 amount=1
+kerning first=1058 second=1071 amount=-1
+kerning first=1042 second=1061 amount=-2
+kerning first=1043 second=1057 amount=-2
+kerning first=1061 second=1091 amount=-1
+kerning first=1088 second=1090 amount=-1
+kerning first=1054 second=1046 amount=-1
+kerning first=1058 second=1086 amount=-3
+kerning first=1073 second=1076 amount=-2
+kerning first=86 second=65 amount=-3
+kerning first=1072 second=1095 amount=-1
+kerning first=1056 second=1061 amount=-2
+kerning first=1040 second=1051 amount=1
+kerning first=1044 second=1091 amount=1
+kerning first=1068 second=1046 amount=-1
+kerning first=1056 second=1076 amount=-3
+kerning first=86 second=111 amount=-2
+kerning first=1079 second=1098 amount=-1
+kerning first=1086 second=1095 amount=-1
+kerning first=89 second=46 amount=-6
+kerning first=1043 second=1077 amount=-3
+kerning first=1058 second=1091 amount=-2
+kerning first=1059 second=1087 amount=-2
+kerning first=1068 second=1051 amount=-1
+kerning first=1044 second=1063 amount=-1
+kerning first=1059 second=1044 amount=-2
+kerning first=1054 second=1071 amount=-1
+kerning first=1077 second=1093 amount=-1
+kerning first=1092 second=1083 amount=-1
+kerning first=121 second=44 amount=-3
+kerning first=1068 second=1071 amount=-2
+kerning first=1075 second=1083 amount=-1
+kerning first=1102 second=1083 amount=-1
+kerning first=87 second=97 amount=-1
+kerning first=1040 second=1058 amount=-3
+kerning first=1056 second=1101 amount=-1
+kerning first=1043 second=1054 amount=-2
+kerning first=1058 second=1083 amount=-2
+kerning first=1059 second=1079 amount=-2
+kerning first=70 second=44 amount=-5
+kerning first=1043 second=1102 amount=-2
+kerning first=1057 second=1054 amount=-1
+kerning first=1040 second=1063 amount=-3
+kerning first=1041 second=1059 amount=-1
+kerning first=84 second=121 amount=-2
+kerning first=1068 second=1058 amount=-5
+kerning first=1079 second=1095 amount=-1
+kerning first=86 second=114 amount=-1
+kerning first=1059 second=1084 amount=-2
+kerning first=1043 second=1074 amount=-2
+kerning first=1058 second=1040 amount=-1
+kerning first=86 second=58 amount=-1
+kerning first=86 second=44 amount=-4
+kerning first=1054 second=1063 amount=-1
+kerning first=1061 second=1060 amount=-1
+kerning first=1073 second=1093 amount=-1
+kerning first=70 second=46 amount=-5
+kerning first=121 second=46 amount=-3
+kerning first=1069 second=1044 amount=-1
+kerning first=1058 second=1103 amount=-2
+kerning first=1068 second=1063 amount=-3
+kerning first=1044 second=1060 amount=-1
+kerning first=1082 second=1072 amount=1
+kerning first=1058 second=1060 amount=-1
+kerning first=1077 second=1090 amount=-1
+kerning first=86 second=46 amount=-4
+kerning first=1092 second=1095 amount=-1
+kerning first=1060 second=1051 amount=-1
+kerning first=1061 second=1047 amount=-1
+kerning first=1102 second=1095 amount=-1
+kerning first=1043 second=1051 amount=-2
+kerning first=1054 second=1040 amount=-1
+kerning first=1058 second=1080 amount=-2
+kerning first=1059 second=1076 amount=-3
+kerning first=1047 second=1058 amount=-1
+kerning first=1057 second=1051 amount=-1
+kerning first=1060 second=1071 amount=-1
+kerning first=1068 second=1040 amount=-1
+kerning first=1057 second=1066 amount=-1
+kerning first=1040 second=1060 amount=-1
diff --git a/samples/bin/library/arial.png b/samples/bin/library/arial.png
new file mode 100644
index 00000000..692e7e72
--- /dev/null
+++ b/samples/bin/library/arial.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2f1044cd99d8bd2b0576b06928493cf7cdad421bae5d71c56a436cc33f59c30a
+size 217444
diff --git a/sources/enduro2d/utils/font.cpp b/sources/enduro2d/utils/font.cpp
index 8ed4ca23..544ad10b 100644
--- a/sources/enduro2d/utils/font.cpp
+++ b/sources/enduro2d/utils/font.cpp
@@ -20,10 +20,16 @@ namespace
         str tag, line;
         std::stringstream data_stream(s);
 
-        while ( getline(data_stream, line, '\n') ) {
+        while ( !data_stream.eof() && std::getline(data_stream, line) ) {
             std::stringstream line_stream(line);
-            line_stream >> tag;
+            line_stream.exceptions(std::ios::failbit | std::ios::badbit);
 
+            line_stream >> std::ws;
+            if ( line_stream.eof() ) {
+                continue;
+            }
+
+            line_stream >> tag;
             if ( tag == "info" ) {
                 // info face="Arial-Black" size=32 bold=0 italic=0 charset=""
                 //      unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=2,2
@@ -37,7 +43,9 @@ namespace
                     } else if ( tag == "size" ) {
                         line_stream >> data.info.size;
                     }
-                    line_stream >> tag;
+                    if ( !line_stream.eof() ) {
+                        line_stream >> tag;
+                    }
                 }
             } else if ( tag == "common" ) {
                 // common lineHeight=54 base=35 scaleW=512 scaleH=512 pages=1 packed=0
@@ -55,7 +63,9 @@ namespace
                     } else if ( tag == "scaleH" ) {
                         line_stream >> data.common.atlas_size.y;
                     }
-                    line_stream >> tag;
+                    if ( !line_stream.eof() ) {
+                        line_stream >> tag;
+                    }
                 }
             } else if ( tag == "page" ) {
                 // page id=0 file="arial.png"
@@ -70,18 +80,23 @@ namespace
                         page_data.file.erase(page_data.file.begin());
                         page_data.file.pop_back();
                     }
-                    line_stream >> tag;
+                    if ( !line_stream.eof() ) {
+                        line_stream >> tag;
+                    }
                 }
                 data.pages.insert(std::move(page_data));
             } else if ( tag == "chars" ) {
                 // chars count=95
+                line_stream >> tag;
                 while ( !line_stream.eof() ) {
                     if ( tag == "count" ) {
                         std::size_t count{0u};
                         line_stream >> count;
                         data.chars.reserve(count);
                     }
-                    line_stream >> tag;
+                    if ( !line_stream.eof() ) {
+                        line_stream >> tag;
+                    }
                 }
             } else if ( tag == "char" ) {
                 // char id=123 x=2 y=2 width=38 height=54
@@ -107,10 +122,6 @@ namespace
                         line_stream >> char_data.offset.x;
                     } else if ( tag == "yoffset" ) {
                         line_stream >> char_data.offset.y;
-                        char_data.offset.y =
-                            data.common.base -
-                            char_data.offset.y -
-                            char_data.rect.size.y;
                     } else if ( tag == "xadvance" ) {
                         line_stream >> char_data.advance;
                     } else if ( tag == "page" ) {
@@ -118,18 +129,23 @@ namespace
                     } else if ( tag == "chnl" ) {
                         line_stream >> char_data.chnl;
                     }
-                    line_stream >> tag;
+                    if ( !line_stream.eof() ) {
+                        line_stream >> tag;
+                    }
                 }
                 data.chars.insert(std::move(char_data));
             } else if ( tag == "kernings" ) {
                 // kernings count=243
+                line_stream >> tag;
                 while ( !line_stream.eof() ) {
                     if ( tag == "count" ) {
                         std::size_t count{0u};
                         line_stream >> count;
                         data.kernings.reserve(count);
                     }
-                    line_stream >> tag;
+                    if ( !line_stream.eof() ) {
+                        line_stream >> tag;
+                    }
                 }
             } else if ( tag == "kerning" ) {
                 // kerning first=86 second=101 amount=-2
@@ -143,7 +159,9 @@ namespace
                     } else if ( tag == "amount" ) {
                         line_stream >> k.amount;
                     }
-                    line_stream >> tag;
+                    if ( !line_stream.eof() ) {
+                        line_stream >> tag;
+                    }
                 }
                 data.kernings.insert(std::move(k));
             }
diff --git a/untests/sources/untests_utils/font.cpp b/untests/sources/untests_utils/font.cpp
new file mode 100644
index 00000000..d8f23981
--- /dev/null
+++ b/untests/sources/untests_utils/font.cpp
@@ -0,0 +1,74 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include "_utils.hpp"
+using namespace e2d;
+
+namespace
+{
+    const char* const mini_fnt = R"fnt(
+        info face="Arial" size=50 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=0,0
+        common lineHeight=58 base=49 scaleW=512 scaleH=512 pages=1 packed=0
+        page id=0 file="arial.png"
+        chars count=3
+        char id=32 x=342 y=38 width=0 height=0 xoffset=0 yoffset=46 xadvance=14 page=0 chnl=0
+        char id=33 x=448 y=386 width=10 height=40 xoffset=5 yoffset=10 xadvance=14 page=0 chnl=0
+        char id=34 x=394 y=306 width=18 height=18 xoffset=3 yoffset=8 xadvance=18 page=0 chnl=0
+        kernings count=2
+        kerning first=1059 second=1081 amount=-1
+        kerning first=1043 second=1071 amount=-1
+    )fnt";
+
+    const char* const mini_bad_fnt = R"fnt(
+        info face="Arial" size=HELLO bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=0,0
+    )fnt";
+}
+
+TEST_CASE("font") {
+    {
+        font f;
+        REQUIRE_FALSE(fonts::try_load_font(f, buffer(mini_bad_fnt, std::strlen(mini_bad_fnt))));
+        REQUIRE_FALSE(fonts::try_load_font(f, make_memory_stream(buffer(mini_bad_fnt, std::strlen(mini_bad_fnt)))));
+    }
+    {
+        font f, f2;
+        REQUIRE(fonts::try_load_font(f, buffer(mini_fnt, std::strlen(mini_fnt))));
+        REQUIRE(fonts::try_load_font(f2, make_memory_stream(buffer(mini_fnt, std::strlen(mini_fnt)))));
+        REQUIRE(f == f2);
+
+        REQUIRE(f.info().face == "Arial");
+        REQUIRE(f.info().size == 50);
+
+        REQUIRE(f.common().line == 58);
+        REQUIRE(f.common().base == 49);
+        REQUIRE(f.common().pages == 1);
+        REQUIRE(f.common().atlas_size == v2u(512,512));
+
+        REQUIRE(f.pages().size() == 1);
+        REQUIRE(f.find_page(0));
+        REQUIRE(f.find_page(0)->id == 0);
+        REQUIRE(f.find_page(0)->file == "arial.png");
+
+        REQUIRE(f.chars().size() == 3);
+        REQUIRE_FALSE(f.find_char(100500));
+        REQUIRE(f.find_char(33));
+        {
+            // char id=33 x=448 y=386 width=10 height=40 xoffset=5 yoffset=10 xadvance=14 page=0 chnl=0
+            font::char_data c;
+            c.id = 33;
+            c.rect = b2hi(448, 86, 10, 40);
+            c.offset = v2hi(5, 10);
+            c.advance = 14;
+            c.page = 0;
+            c.chnl = 0;
+            REQUIRE(*f.find_char(33) == c);
+        }
+
+        REQUIRE(f.kernings().size() == 2);
+        REQUIRE(f.get_kerning(1059, 1081) == -1);
+        REQUIRE(f.get_kerning(1059, 100500) == 0);
+    }
+}

From abb7fe44ca930546c905b7b8f6af0493118343e7 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Wed, 24 Jul 2019 18:54:53 +0300
Subject: [PATCH 018/108] added spine components and asset

---
 .gitattributes                                |   3 +
 headers/enduro2d/high/_all.hpp                |   2 +
 headers/enduro2d/high/_high.hpp               |   2 +
 .../high/assets/spine_model_asset.hpp         |  21 ++
 .../enduro2d/high/components/spine_player.hpp |  52 ++++
 .../high/components/spine_renderer.hpp        |  57 +++++
 headers/enduro2d/high/spine_model.hpp         |  58 +++++
 .../high/assets/spine_model_asset.cpp         | 237 ++++++++++++++++++
 .../enduro2d/high/components/spine_player.cpp |  82 ++++++
 .../high/components/spine_renderer.cpp        |  78 ++++++
 sources/enduro2d/high/spine_model.cpp         | 120 +++++++++
 sources/enduro2d/high/starter.cpp             |   6 +-
 .../render_system_drawer.cpp                  | 200 ++++++++++++++-
 .../render_system_drawer.hpp                  |  13 +-
 14 files changed, 926 insertions(+), 5 deletions(-)
 create mode 100644 headers/enduro2d/high/assets/spine_model_asset.hpp
 create mode 100644 headers/enduro2d/high/components/spine_player.hpp
 create mode 100644 headers/enduro2d/high/components/spine_renderer.hpp
 create mode 100644 headers/enduro2d/high/spine_model.hpp
 create mode 100644 sources/enduro2d/high/assets/spine_model_asset.cpp
 create mode 100644 sources/enduro2d/high/components/spine_player.cpp
 create mode 100644 sources/enduro2d/high/components/spine_renderer.cpp
 create mode 100644 sources/enduro2d/high/spine_model.cpp

diff --git a/.gitattributes b/.gitattributes
index eafcbc92..7fef1442 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -12,3 +12,6 @@
 *.pvr filter=lfs diff=lfs merge=lfs -text
 *.dds filter=lfs diff=lfs merge=lfs -text
 *.ogg filter=lfs diff=lfs merge=lfs -text
+*.skel filter=lfs diff=lfs merge=lfs -text
+*.atlas filter=lfs diff=lfs merge=lfs -text
+*.json filter=lfs diff=lfs merge=lfs -text
diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index 4c8246a6..17546563 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -33,6 +33,8 @@
 #include "components/renderer.hpp"
 #include "components/scene.hpp"
 #include "components/sprite_renderer.hpp"
+#include "components/spine_renderer.hpp"
+#include "components/spine_player.hpp"
 
 #include "systems/flipbook_system.hpp"
 #include "systems/render_system.hpp"
diff --git a/headers/enduro2d/high/_high.hpp b/headers/enduro2d/high/_high.hpp
index a593f322..e0d44575 100644
--- a/headers/enduro2d/high/_high.hpp
+++ b/headers/enduro2d/high/_high.hpp
@@ -45,6 +45,8 @@ namespace e2d
     class renderer;
     class scene;
     class sprite_renderer;
+    class spine_renderer;
+    class spine_player;
 
     class flipbook_system;
     class render_system;
diff --git a/headers/enduro2d/high/assets/spine_model_asset.hpp b/headers/enduro2d/high/assets/spine_model_asset.hpp
new file mode 100644
index 00000000..8bfb86e0
--- /dev/null
+++ b/headers/enduro2d/high/assets/spine_model_asset.hpp
@@ -0,0 +1,21 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include "../_high.hpp"
+
+#include "../library.hpp"
+#include "../spine_model.hpp"
+
+namespace e2d
+{
+    class spine_model_asset final : public content_asset<spine_model_asset, spine_model> {
+    public:
+        static const char* type_name() noexcept { return "spine_model_asset"; }
+        static load_async_result load_async(const library& library, str_view address);
+    };
+}
diff --git a/headers/enduro2d/high/components/spine_player.hpp b/headers/enduro2d/high/components/spine_player.hpp
new file mode 100644
index 00000000..e87f9cd7
--- /dev/null
+++ b/headers/enduro2d/high/components/spine_player.hpp
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include "../_high.hpp"
+
+#include "../factory.hpp"
+#include "../assets/spine_model_asset.hpp"
+
+struct spAnimationState;
+
+namespace e2d
+{
+    class spine_player final {
+    public:
+        using animation_ptr = std::shared_ptr<spAnimationState>;
+    public:
+        spine_player() = default;
+        spine_player(const spine_model_asset::ptr& model);
+        
+        spine_player& set_animation(int track, const str& name, bool loop);
+        spine_player& add_animation(int track, const str& name, bool loop, secf delay);
+        
+        const animation_ptr& animation() const noexcept;
+        const spine_model_asset::ptr& model() const noexcept;
+    private:
+        animation_ptr animation_;
+        spine_model_asset::ptr model_;
+    };
+
+    template <>
+    class factory_loader<spine_player> final : factory_loader<> {
+    public:
+        static const char* schema_source;
+
+        bool operator()(
+            spine_player& component,
+            const fill_context& ctx) const;
+            
+        bool operator()(
+            asset_dependencies& dependencies,
+            const collect_context& ctx) const;
+    };
+}
+
+namespace e2d
+{
+}
diff --git a/headers/enduro2d/high/components/spine_renderer.hpp b/headers/enduro2d/high/components/spine_renderer.hpp
new file mode 100644
index 00000000..431776b3
--- /dev/null
+++ b/headers/enduro2d/high/components/spine_renderer.hpp
@@ -0,0 +1,57 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include "../_high.hpp"
+
+#include "../factory.hpp"
+#include "../assets/spine_model_asset.hpp"
+
+struct spSkeleton;
+struct spSkeletonClipping;
+struct spVertexEffect;
+
+namespace e2d
+{
+
+    class spine_renderer final {
+    public:
+        using skeleton_ptr = std::shared_ptr<spSkeleton>;
+        using clipping_ptr = std::shared_ptr<spSkeletonClipping>;
+        using effect_ptr = std::shared_ptr<spVertexEffect>;
+    public:
+        spine_renderer() = default;
+        spine_renderer(const spine_model_asset::ptr& model);
+
+        spine_renderer& skin(const str& value);
+        spine_renderer& attachment(const str& slot, const str& name);
+
+        const skeleton_ptr& skeleton() const noexcept;
+        const clipping_ptr& clipper() const noexcept;
+        const effect_ptr& effect() const noexcept;
+        const spine_model_asset::ptr& model() const noexcept;
+    private:
+        skeleton_ptr skeleton_;
+        clipping_ptr clipping_;
+        effect_ptr effect_;
+        spine_model_asset::ptr model_;
+    };
+
+    template <>
+    class factory_loader<spine_renderer> final : factory_loader<> {
+    public:
+        static const char* schema_source;
+
+        bool operator()(
+            spine_renderer& component,
+            const fill_context& ctx) const;
+            
+        bool operator()(
+            asset_dependencies& dependencies,
+            const collect_context& ctx) const;
+    };
+}
diff --git a/headers/enduro2d/high/spine_model.hpp b/headers/enduro2d/high/spine_model.hpp
new file mode 100644
index 00000000..70f6a5e9
--- /dev/null
+++ b/headers/enduro2d/high/spine_model.hpp
@@ -0,0 +1,58 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include "_high.hpp"
+
+struct spAnimationStateData;
+struct spSkeletonData;
+struct spAtlas;
+
+namespace e2d
+{
+
+    class spine_model final {
+    public:
+        using animation_data_ptr = std::shared_ptr<spAnimationStateData>;
+        using skeleton_data_ptr = std::shared_ptr<spSkeletonData>;
+        using atlas_ptr = std::shared_ptr<spAtlas>;
+    public:
+        spine_model() noexcept = default;
+        ~spine_model() noexcept = default;
+
+        spine_model(spine_model&& other) noexcept;
+        spine_model& operator=(spine_model&& other) noexcept;
+        
+        spine_model(const spine_model& other);
+        spine_model& operator=(const spine_model& other);
+
+        void clear() noexcept;
+        void swap(spine_model& other) noexcept;
+
+        spine_model& assign(spine_model&& other) noexcept;
+        spine_model& assign(const spine_model& other);
+
+        spine_model& set_skeleton(skeleton_data_ptr data);
+        spine_model& set_atlas(atlas_ptr atlas, bool premultiplied_alpha);
+
+        spine_model& mix_animations(const str& from, const str& to, secf duration);
+
+        const atlas_ptr& atlas() const noexcept;
+        const animation_data_ptr& animation() const noexcept;
+        const skeleton_data_ptr& skeleton() const noexcept;
+        bool premultiplied_alpha() const noexcept;
+    private:
+        animation_data_ptr animation_;
+        skeleton_data_ptr skeleton_;
+        atlas_ptr atlas_;
+        bool premultiplied_alpha_ = false;
+    };
+
+    void swap(spine_model& l, spine_model& r) noexcept;
+    bool operator==(const spine_model& l, const spine_model& r) noexcept;
+    bool operator!=(const spine_model& l, const spine_model& r) noexcept;
+}
diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
new file mode 100644
index 00000000..473ab5d3
--- /dev/null
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -0,0 +1,237 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/assets/spine_model_asset.hpp>
+
+#include <enduro2d/high/assets/json_asset.hpp>
+#include <enduro2d/high/assets/binary_asset.hpp>
+#include <enduro2d/high/assets/texture_asset.hpp>
+
+#include <spine/SkeletonJson.h>
+#include <spine/extension.h>
+
+using namespace e2d;
+
+namespace
+{
+    class spine_model_asset_loading_exception final : public asset_loading_exception {
+        const char* what() const noexcept final {
+            return "spine model asset loading exception";
+        }
+    };
+
+    const char* spine_model_asset_schema_source = R"json({
+        "type" : "object",
+        "required" : [ "skeleton", "atlas" ],
+        "additionalProperties" : false,
+        "properties" : {
+            "skeleton" : { "$ref" : "#/common_definitions/address" },
+            "atlas" : { "$ref" : "#/common_definitions/address" },
+            "premultiplied_alpha" : { "type" : "boolean" },
+            "mix_animations" : {
+                "type" : "array",
+                "items" : { "$ref": "#/definitions/spine_animation_mix_array" }
+            }
+        },
+        "definitions" : {
+            "spine_animation_mix_array" : {
+                "type" : "array",
+                "items" : { "$ref": "#/definitions/spine_animation_mix" }
+            },
+            "spine_animation_mix" : {
+                "type" : "object",
+                "required" : [ "from_anim", "to_anim", "duration" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "from_anim" : { "$ref": "#/common_definitions/name" },
+                    "to_anim" : { "$ref": "#/common_definitions/name" },
+                    "duration" : { "type" : "number" }
+                }
+            }
+        }
+    })json";
+
+    const rapidjson::SchemaDocument& spine_model_asset_schema() {
+        static std::mutex mutex;
+        static std::unique_ptr<rapidjson::SchemaDocument> schema;
+
+        std::lock_guard<std::mutex> guard(mutex);
+        if ( !schema ) {
+            rapidjson::Document doc;
+            if ( doc.Parse(spine_model_asset_schema_source).HasParseError() ) {
+                the<debug>().error("SPINE: Failed to parse spine model asset schema");
+                throw spine_model_asset_loading_exception();
+            }
+            json_utils::add_common_schema_definitions(doc);
+            schema = std::make_unique<rapidjson::SchemaDocument>(doc);
+        }
+
+        return *schema;
+    }
+
+    bool parse_mix_animations(
+        const rapidjson::Value& root,
+        spine_model& model)
+    {
+        E2D_ASSERT(root.IsArray());
+        str from_anim;
+        str to_anim;
+        secf duration;
+
+        for ( rapidjson::SizeType i = 0; i < root.Size(); ++i ) {
+            E2D_ASSERT(root[i].IsObject());
+            const auto& sprite_json = root[i];
+
+            E2D_ASSERT(sprite_json.HasMember("from_anim"));
+            if ( !json_utils::try_parse_value(sprite_json["from_anim"], from_anim) ) {
+                the<debug>().error("SPINE: Incorrect formatting of 'from_anim' property");
+                return false;
+            }
+
+            E2D_ASSERT(sprite_json.HasMember("to_anim"));
+            if ( !json_utils::try_parse_value(sprite_json["to_anim"], to_anim) ) {
+                the<debug>().error("SPINE: Incorrect formatting of 'to_anim' property");
+                return false;
+            }
+
+            E2D_ASSERT(sprite_json.HasMember("duration"));
+            if ( !json_utils::try_parse_value(sprite_json["duration"], duration.value) ) {
+                the<debug>().error("SPINE: Incorrect formatting of 'duration' property");
+                return false;
+            }
+
+            model.mix_animations(from_anim, to_anim, duration);
+        }
+        return true;
+    }
+
+    stdex::promise<spine_model> parse_spine_model(
+        const library& library,
+        const str& parent_address,
+        const rapidjson::Value& root)
+    {
+        using skeleton_json_ptr = std::unique_ptr<spSkeletonJson, void(*)(spSkeletonJson*)>;
+        stdex::promise<spine_model> result;
+
+        E2D_ASSERT(root.HasMember("atlas") && root["atlas"].IsString());
+        binary_asset::load_result atlas_data = library.load_asset<binary_asset>(
+            path::combine(parent_address, root["atlas"].GetString()));
+        spine_model::atlas_ptr atlas(
+            spAtlas_create(
+                reinterpret_cast<const char*>(atlas_data->content().data()),
+                math::numeric_cast<int>(atlas_data->content().size()),
+                parent_address.data(),
+                nullptr),
+            spAtlas_dispose);
+
+        E2D_ASSERT(root.HasMember("skeleton") && root["skeleton"].IsString());
+        binary_asset::load_result skeleton_data = library.load_asset<binary_asset>(
+            path::combine(parent_address, root["skeleton"].GetString()));
+	    skeleton_json_ptr json(
+            spSkeletonJson_create(atlas.get()),
+            spSkeletonJson_dispose);
+	    spine_model::skeleton_data_ptr skeleton(
+            spSkeletonJson_readSkeletonData(
+                json.get(),
+                reinterpret_cast<const char*>(skeleton_data->content().data())),
+            spSkeletonData_dispose);
+
+        bool pma = false;
+        if ( root.HasMember("premultiplied_alpha") ) {
+            if ( !json_utils::try_parse_value(root["premultiplied_alpha"], pma) ) {
+                the<debug>().error("SPINE: Incorrect formating of 'premultiplied_alpha' property");
+            }
+        }
+        
+        spine_model content;
+        content.set_atlas(atlas, pma);
+        content.set_skeleton(skeleton);
+
+        if ( root.HasMember("mix_animations") ) {
+            const auto& mix_animations_json = root["mix_animations"];
+            if ( !parse_mix_animations(mix_animations_json, content) ) {
+                result.reject(spine_model_asset_loading_exception());
+                return result;
+            }
+        }
+
+        result.resolve(std::move(content));
+        return result;
+    }
+}
+
+void _spAtlasPage_createTexture (spAtlasPage* self, const char* path) {
+    try {
+        texture_asset::load_result texture = the<library>().load_asset<texture_asset>(path);
+        if ( !texture ) {
+            throw;
+        }
+        self->width = texture->content()->size().x;
+        self->height = texture->content()->size().y;
+        self->rendererObject = texture.release();
+    } catch(...) {
+        the<debug>().error("SPINE: Failed to load atlas texture");
+    }
+}
+
+void _spAtlasPage_disposeTexture (spAtlasPage* self) {
+    // acquire by smart pointer and release
+    texture_asset::ptr(static_cast<texture_asset*>(self->rendererObject), false);
+}
+
+char* _spUtil_readFile (const char* path, int* length) {
+    E2D_ASSERT(false);
+	return _spReadFile(path, length);
+}
+
+namespace e2d
+{
+    spine_model_asset::load_async_result spine_model_asset::load_async(
+        const library& library, str_view address)
+    {
+        return library.load_asset_async<json_asset>(address)
+        .then([
+            &library,
+            address = str(address),
+            parent_address = path::parent_path(address)
+        ](const json_asset::load_result& spine_data){
+            return the<deferrer>().do_in_worker_thread([address, spine_data](){
+                const rapidjson::Document& doc = *spine_data->content();
+                rapidjson::SchemaValidator validator(spine_model_asset_schema());
+
+                if ( doc.Accept(validator) ) {
+                    return;
+                }
+
+                rapidjson::StringBuffer sb;
+                if ( validator.GetInvalidDocumentPointer().StringifyUriFragment(sb) ) {
+                    the<debug>().error("ASSET: Failed to validate asset json:\n"
+                        "--> Address: %0\n"
+                        "--> Invalid schema keyword: %1\n"
+                        "--> Invalid document pointer: %2",
+                        address,
+                        validator.GetInvalidSchemaKeyword(),
+                        sb.GetString());
+                } else {
+                    the<debug>().error("ASSET: Failed to validate asset json");
+                }
+
+                throw spine_model_asset_loading_exception();
+            })
+            .except([](auto&){
+                E2D_ASSERT(false);
+            })
+            .then([&library, parent_address, spine_data](){
+                return parse_spine_model(
+                    library, parent_address, *spine_data->content());
+            })
+            .then([](auto&& content){
+                return spine_model_asset::create(
+                    std::forward<decltype(content)>(content));
+            });
+        });
+    }
+}
diff --git a/sources/enduro2d/high/components/spine_player.cpp b/sources/enduro2d/high/components/spine_player.cpp
new file mode 100644
index 00000000..df7a8991
--- /dev/null
+++ b/sources/enduro2d/high/components/spine_player.cpp
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/components/spine_player.hpp>
+
+#include <spine/AnimationState.h>
+
+namespace e2d
+{
+    spine_player::spine_player(const spine_model_asset::ptr& model)
+    : model_(model) {
+        E2D_ASSERT(model_);
+        E2D_ASSERT(model_->content().animation());
+
+        animation_ = animation_ptr(spAnimationState_create(model_->content().animation().get()), spAnimationState_dispose);
+    }
+    
+    spine_player& spine_player::set_animation(int track, const str& name, bool loop) {
+        E2D_ASSERT(model_);
+        spAnimation* anim = spSkeletonData_findAnimation(model_->content().skeleton().operator->(), name.c_str());
+        if ( !anim ) {
+            E2D_ASSERT(false);  // TODO: exception?
+            return *this;
+        }
+        spAnimationState_setAnimation(animation_.get(), track, anim, loop);
+        return *this;
+    }
+
+    spine_player& spine_player::add_animation(int track, const str& name, bool loop, secf delay) {
+        E2D_ASSERT(model_);
+        spAnimation* anim = spSkeletonData_findAnimation(model_->content().skeleton().operator->(), name.c_str());
+        if ( !anim ) {
+            E2D_ASSERT(false);  // TODO: exception?
+            return *this;
+        }
+        spAnimationState_addAnimation(animation_.get(), track, anim, loop, delay.value);
+        return *this;
+    }
+    
+    const spine_player::animation_ptr& spine_player::animation() const noexcept {
+        return animation_;
+    }
+    
+    const spine_model_asset::ptr& spine_player::model() const noexcept {
+        return model_;
+    }
+}
+
+namespace e2d
+{
+    const char* factory_loader<spine_player>::schema_source = R"json({
+        "type" : "object",
+        "required" : [],
+        "additionalProperties" : false,
+        "properties" : {
+            "time" : { "type" : "number" },
+            "speed" : { "type" : "number" },
+            "looped" : { "type" : "boolean" },
+            "stopped" : { "type" : "boolean" },
+            "playing" : { "type" : "boolean" },
+            "sequence" : { "$ref": "#/common_definitions/name" }
+        }
+    })json";
+    
+    bool factory_loader<spine_player>::operator()(
+        spine_player& component,
+        const fill_context& ctx) const
+    {
+        return false;
+    }
+    
+    bool factory_loader<spine_player>::operator()(
+        asset_dependencies& dependencies,
+        const collect_context& ctx) const
+    {
+        E2D_UNUSED(dependencies, ctx);
+        return true;
+    }
+}
diff --git a/sources/enduro2d/high/components/spine_renderer.cpp b/sources/enduro2d/high/components/spine_renderer.cpp
new file mode 100644
index 00000000..ef230d71
--- /dev/null
+++ b/sources/enduro2d/high/components/spine_renderer.cpp
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/components/spine_renderer.hpp>
+#include <spine/Skeleton.h>
+#include <spine/VertexEffect.h>
+#include <spine/SkeletonClipping.h>
+
+namespace e2d
+{
+    spine_renderer::spine_renderer(const spine_model_asset::ptr& model)
+    : model_(model) {
+        E2D_ASSERT(model_);
+        E2D_ASSERT(model_->content().skeleton());
+        E2D_ASSERT(model_->content().atlas());
+
+        skeleton_ = skeleton_ptr(spSkeleton_create(model_->content().skeleton().get()), spSkeleton_dispose);
+        clipping_ = clipping_ptr(spSkeletonClipping_create(), spSkeletonClipping_dispose);
+    }
+    
+    spine_renderer& spine_renderer::skin(const str& value) {
+        spSkeleton_setSkinByName(skeleton_.get(), value.empty() ? nullptr : value.c_str());
+        return *this;
+    }
+
+    spine_renderer& spine_renderer::attachment(const str& slot, const str& name) {
+        E2D_ASSERT(!slot.empty());
+        E2D_ASSERT(!name.empty());
+        spSkeleton_setAttachment(skeleton_.get(), slot.c_str(), name.c_str()); // TODO: check result
+        return *this;
+    }
+
+    const spine_renderer::skeleton_ptr& spine_renderer::skeleton() const noexcept {
+        return skeleton_;
+    }
+    
+    const spine_renderer::clipping_ptr& spine_renderer::clipper() const noexcept {
+        return clipping_;
+    }
+
+    const spine_renderer::effect_ptr& spine_renderer::effect() const noexcept {
+        return effect_;
+    }
+
+    const spine_model_asset::ptr& spine_renderer::model() const noexcept {
+        return model_;
+    }
+}
+
+namespace e2d
+{
+    const char* factory_loader<spine_renderer>::schema_source = R"json({
+        "type" : "object",
+        "required" : [ "model" ],
+        "additionalProperties" : false,
+        "properties" : {
+            "model" : { "$ref": "#/common_definitions/address" },
+            "skin" : { "$ref": "#/common_definitions/name" }
+        }
+    })json";
+    
+    bool factory_loader<spine_renderer>::operator()(
+        spine_renderer& component,
+        const fill_context& ctx) const
+    {
+        return false;
+    }
+
+    bool factory_loader<spine_renderer>::operator()(
+        asset_dependencies& dependencies,
+        const collect_context& ctx) const
+    {
+        return false;
+    }
+}
diff --git a/sources/enduro2d/high/spine_model.cpp b/sources/enduro2d/high/spine_model.cpp
new file mode 100644
index 00000000..c78b54aa
--- /dev/null
+++ b/sources/enduro2d/high/spine_model.cpp
@@ -0,0 +1,120 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/spine_model.hpp>
+#include <spine/AnimationStateData.h>
+#include <spine/SkeletonData.h>
+#include <spine/Atlas.h>
+
+namespace e2d
+{
+    spine_model::spine_model(spine_model&& other) noexcept {
+        assign(std::move(other));
+    }
+
+    spine_model& spine_model::operator=(spine_model&& other) noexcept {
+        return assign(std::move(other));
+    }
+    
+    spine_model::spine_model(const spine_model& other) {
+        assign(other);
+    }
+
+    spine_model& spine_model::operator=(const spine_model& other) {
+        return assign(other);
+    }
+
+    void spine_model::clear() noexcept {
+        animation_.reset();
+        skeleton_.reset();
+        atlas_.reset();
+    }
+
+    void spine_model::swap(spine_model& other) noexcept {
+        using std::swap;
+        swap(animation_, other.animation_);
+        swap(skeleton_, other.skeleton_);
+        swap(atlas_, other.atlas_);
+        swap(premultiplied_alpha_, other.premultiplied_alpha_);
+    }
+
+    spine_model& spine_model::assign(spine_model&& other) noexcept {
+        if ( this != &other ) {
+            swap(other);
+            other.clear();
+        }
+        return *this;
+    }
+    
+    spine_model& spine_model::assign(const spine_model& other) {
+        if ( this != &other ) {
+            spine_model m;
+            m.animation_ = other.animation_;
+            m.skeleton_ = other.skeleton_;
+            m.atlas_ = other.atlas_;
+            m.premultiplied_alpha_ = other.premultiplied_alpha_;
+            swap(m);
+        }
+        return *this;
+    }
+
+    spine_model& spine_model::set_skeleton(skeleton_data_ptr data) {
+        animation_.reset();
+        skeleton_ = std::move(data);
+        if ( skeleton_ ) {
+            animation_ = animation_data_ptr(
+                spAnimationStateData_create(skeleton_.get()),
+                spAnimationStateData_dispose);
+        }
+        return *this;
+    }
+
+    spine_model& spine_model::set_atlas(atlas_ptr atlas, bool premultiplied_alpha) {
+        atlas_ = std::move(atlas);
+        premultiplied_alpha_ = premultiplied_alpha;
+        return *this;
+    }
+
+    spine_model& spine_model::mix_animations(const str& from, const str& to, secf duration) {
+        E2D_ASSERT(animation_);
+       spAnimationStateData_setMixByName(animation_.get(), from.c_str(), to.c_str(), duration.value);
+       return *this;
+    }
+
+    const spine_model::atlas_ptr& spine_model::atlas() const noexcept {
+        return atlas_;
+    }
+
+    const spine_model::animation_data_ptr& spine_model::animation() const noexcept {
+        return animation_;
+    }
+
+    const spine_model::skeleton_data_ptr& spine_model::skeleton() const noexcept {
+        return skeleton_;
+    }
+    
+    bool spine_model::premultiplied_alpha() const noexcept {
+        return premultiplied_alpha_;
+    }
+}
+
+namespace e2d
+{
+    void swap(spine_model& l, spine_model& r) noexcept {
+        l.swap(r);
+    }
+    
+    bool operator==(const spine_model& l, const spine_model& r) noexcept {
+        return l.atlas() == r.atlas()
+            && l.animation() == r.animation()
+            && l.skeleton() == r.skeleton()
+            && l.premultiplied_alpha() == r.premultiplied_alpha();
+    }
+
+    bool operator!=(const spine_model& l, const spine_model& r) noexcept {
+        return !(l == r);
+    }
+}
diff --git a/sources/enduro2d/high/starter.cpp b/sources/enduro2d/high/starter.cpp
index a923837f..0b9e4b45 100644
--- a/sources/enduro2d/high/starter.cpp
+++ b/sources/enduro2d/high/starter.cpp
@@ -18,6 +18,8 @@
 #include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/scene.hpp>
 #include <enduro2d/high/components/sprite_renderer.hpp>
+#include <enduro2d/high/components/spine_player.hpp>
+#include <enduro2d/high/components/spine_renderer.hpp>
 
 #include <enduro2d/high/systems/flipbook_system.hpp>
 #include <enduro2d/high/systems/render_system.hpp>
@@ -133,7 +135,9 @@ namespace e2d
             .register_component<model_renderer>("model_renderer")
             .register_component<renderer>("renderer")
             .register_component<scene>("scene")
-            .register_component<sprite_renderer>("sprite_renderer");
+            .register_component<sprite_renderer>("sprite_renderer")
+            .register_component<spine_renderer>("spine_renderer")
+            .register_component<spine_player>("spine_player");
         safe_module_initialize<library>(params.library_root(), the<deferrer>());
         safe_module_initialize<world>();
     }
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index 751ec273..37bf923d 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -9,6 +9,15 @@
 #include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/model_renderer.hpp>
 #include <enduro2d/high/components/sprite_renderer.hpp>
+#include <enduro2d/high/components/spine_renderer.hpp>
+#include <enduro2d/high/components/spine_player.hpp>
+
+#include <spine/AnimationState.h>
+#include <spine/Skeleton.h>
+#include <spine/VertexEffect.h>
+#include <spine/SkeletonClipping.h>
+#include <spine/RegionAttachment.h>
+#include <spine/MeshAttachment.h>
 
 namespace
 {
@@ -32,9 +41,11 @@ namespace e2d::render_system_impl
         const const_node_iptr& cam_n,
         engine& engine,
         render& render,
-        batcher_type& batcher)
+        batcher_type& batcher,
+        std::vector<batcher_type::vertex_type>& spine_vertices)
     : render_(render)
     , batcher_(batcher)
+    , spine_vertices_(spine_vertices)
     {
         const m4f& cam_w = cam_n
             ? cam_n->world_matrix()
@@ -83,6 +94,11 @@ namespace e2d::render_system_impl
             if ( spr_r ) {
                 draw(node, *node_r, *spr_r);
             }
+            const spine_renderer* spine_r = node_e.find_component<spine_renderer>();
+            const spine_player* spine_p = node_e.find_component<spine_player>();
+            if ( spine_r ) {
+                draw(node, *node_r, *spine_r, spine_p);
+            }
         }
     }
 
@@ -210,6 +226,184 @@ namespace e2d::render_system_impl
         }
         property_cache_.clear();
     }
+    
+    void drawer::context::draw(
+        const const_node_iptr& node,
+        const renderer& node_r,
+        const spine_renderer& spine_r,
+        const spine_player* spine_p)
+    {
+        static_assert(sizeof(batcher_type::vertex_type) % sizeof(float) == 0, "invalid stride");
+        constexpr int stride = sizeof(batcher_type::vertex_type) / sizeof(float);
+
+        if ( !node || !node_r.enabled() ) {
+            return;
+        }
+
+        if ( node_r.materials().empty() ) {
+            return;
+        }
+
+        spSkeleton* skeleton = spine_r.skeleton().operator->();
+        spAnimationState* anim_state = spine_p ? spine_p->animation().operator->() : nullptr;
+        spSkeletonClipping* clipper = spine_r.clipper().operator->();
+        spVertexEffect* effect = spine_r.effect().operator->();
+        const material_asset::ptr& mat_a = node_r.materials().front();
+        float dt = 0.01f;
+
+        if ( !skeleton || !clipper || !mat_a ) {
+            return;
+        }
+
+        spSkeleton_update(skeleton, dt);
+        if ( anim_state ) {
+            spAnimationState_update(anim_state, dt);
+            spAnimationState_apply(anim_state, skeleton);
+        }
+        spSkeleton_updateWorldTransform(skeleton);
+
+    	const u16 quad_indices[6] = { 0, 1, 2, 2, 3, 0 };
+
+        if ( skeleton->color.a == 0 ) {
+            return;
+        }
+
+        if ( effect ) {
+            effect->begin(effect, skeleton);
+        }
+
+        for ( int i = 0; i < skeleton->slotsCount; ++i ) {
+            spSlot* slot = skeleton->drawOrder[i];
+            spAttachment* attachment = slot->attachment;
+            if ( !attachment ) {
+                continue;
+            }
+            if ( slot->color.a == 0 ) {
+                spSkeletonClipping_clipEnd(clipper, slot);
+                continue;
+            }
+
+            int vertex_count = 0;
+            const float* uvs = nullptr;
+            const u16* indices = nullptr;
+            int index_count = 0;
+            const spColor* attachment_color;
+            texture_ptr texture;
+
+            if ( attachment->type == SP_ATTACHMENT_REGION ) {
+                spRegionAttachment* region = reinterpret_cast<spRegionAttachment*>(attachment);
+                attachment_color = &region->color;
+
+                if ( attachment_color->a == 0 ) {
+                    spSkeletonClipping_clipEnd(clipper, slot);
+                    continue;
+                }
+                spRegionAttachment_computeWorldVertices(region, slot->bone, &spine_vertices_.data()->v.x, 0, stride);
+                vertex_count = 4;
+                uvs = region->uvs;
+                indices = quad_indices;
+                index_count = 6;
+                if ( texture_asset* asset = static_cast<texture_asset*>(static_cast<spAtlasRegion*>(region->rendererObject)->page->rendererObject) ) {
+                    texture = asset->content();
+                }
+            } else if ( attachment->type == SP_ATTACHMENT_MESH ) {
+                spMeshAttachment* mesh = reinterpret_cast<spMeshAttachment*>(attachment);
+                attachment_color = &mesh->color;
+
+                if ( attachment_color->a == 0 ) {
+                    spSkeletonClipping_clipEnd(clipper, slot);
+                    continue;
+                }
+                vertex_count = mesh->super.worldVerticesLength >> 1;
+                if ( vertex_count > spine_vertices_.size() ) {
+                    spine_vertices_.resize(vertex_count);
+                }
+                spVertexAttachment_computeWorldVertices(&mesh->super, slot, 0, mesh->super.worldVerticesLength, &spine_vertices_.data()->v.x, 0, stride);
+                uvs = mesh->uvs;
+                indices = mesh->triangles;
+                index_count = mesh->trianglesCount;
+                if ( texture_asset* asset = static_cast<texture_asset*>(static_cast<spAtlasRegion*>(mesh->rendererObject)->page->rendererObject) ) {
+                    texture = asset->content();
+                }
+            } else if ( attachment->type == SP_ATTACHMENT_CLIPPING ) {
+                spClippingAttachment* clip = reinterpret_cast<spClippingAttachment*>(attachment);
+                spSkeletonClipping_clipStart(clipper, slot, clip);
+                E2D_ASSERT(false);
+                continue;
+            } else {
+                continue;
+            }
+
+            const color32 color(
+                color(skeleton->color.r, skeleton->color.b, skeleton->color.g, skeleton->color.a) *
+                color(slot->color.r, slot->color.b, slot->color.g, slot->color.a) *
+                color(attachment_color->r, attachment_color->g, attachment_color->b, attachment_color->a));
+
+            switch ( slot->data->blendMode ) {
+                case SP_BLEND_MODE_NORMAL :
+                    break;
+                case SP_BLEND_MODE_ADDITIVE :
+                    break;
+                case SP_BLEND_MODE_MULTIPLY :
+                    break;
+                case SP_BLEND_MODE_SCREEN :
+                    break;
+                default :
+                    break;
+            }
+
+            /*const float* vertices = spine_vertices_.data();
+            if ( spSkeletonClipping_isClipping(clipper) ) {
+                spSkeletonClipping_clipTriangles(clipper, vertices, vertex_count, indices, index_count, uvs, 2);
+                vertices = clipper->clippedVertices->items;
+                vertex_count = clipper->clippedVertices->size >> 1;
+                uvs = clipper->clippedUVs->items;
+                indices = clipper->clippedTriangles->items;
+                index_count = clipper->clippedTriangles->size;
+            }*/
+
+            if ( effect ) {
+                E2D_ASSERT(false);
+            } else {
+                for ( int i = 0; i < index_count; ++i ) {
+                    int index = indices[i] << 1;
+                    auto& vert = spine_vertices_[indices[i]];
+                    vert.v.z = 0.0f;
+                    vert.t.x = uvs[index];
+                    vert.t.y = uvs[index+1];
+                    vert.c = color;
+                }
+            }
+            
+            try {
+                property_cache_
+                    .sampler(sprite_texture_sampler_hash, render::sampler_state()
+                        .texture(texture)
+                        .min_filter(render::sampler_min_filter::linear)
+                        .mag_filter(render::sampler_mag_filter::linear))
+                    .merge(node_r.properties());
+
+                batcher_.batch(
+                    mat_a,
+                    property_cache_,
+                    indices, index_count,
+                    spine_vertices_.data(), vertex_count);
+            } catch (...) {
+                property_cache_.clear();
+                throw;
+            }
+
+            spSkeletonClipping_clipEnd(clipper, slot);
+        }
+
+        spSkeletonClipping_clipEnd2(clipper);
+
+        if ( effect ) {
+            effect->end(effect);
+        }
+        
+        property_cache_.clear();
+    }
 
     void drawer::context::flush() {
         batcher_.flush();
@@ -222,5 +416,7 @@ namespace e2d::render_system_impl
     drawer::drawer(engine& e, debug& d, render& r)
     : engine_(e)
     , render_(r)
-    , batcher_(d, r) {}
+    , batcher_(d, r) {
+        spine_vertices_.resize(256);
+    }
 }
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
index 641e8136..05c82cff 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
@@ -36,7 +36,8 @@ namespace e2d::render_system_impl
                 const const_node_iptr& cam_n,
                 engine& engine,
                 render& render,
-                batcher_type& batcher);
+                batcher_type& batcher,
+                std::vector<batcher_type::vertex_type>& spine_vertices);
             ~context() noexcept;
 
             void draw(
@@ -51,11 +52,18 @@ namespace e2d::render_system_impl
                 const const_node_iptr& node,
                 const renderer& node_r,
                 const sprite_renderer& spr_r);
+            
+            void draw(
+                const const_node_iptr& node,
+                const renderer& node_r,
+                const spine_renderer& spine_r,
+                const spine_player* spine_p);
 
             void flush();
         private:
             render& render_;
             batcher_type& batcher_;
+            std::vector<batcher_type::vertex_type>& spine_vertices_;
             render::property_block property_cache_;
         };
     public:
@@ -67,6 +75,7 @@ namespace e2d::render_system_impl
         engine& engine_;
         render& render_;
         batcher_type batcher_;
+        std::vector<batcher_type::vertex_type> spine_vertices_;
     };
 }
 
@@ -74,7 +83,7 @@ namespace e2d::render_system_impl
 {
     template < typename F >
     void drawer::with(const camera& cam, const const_node_iptr& cam_n, F&& f) {
-        context ctx{cam, cam_n, engine_, render_, batcher_};
+        context ctx{cam, cam_n, engine_, render_, batcher_, spine_vertices_};
         std::forward<F>(f)(ctx);
         ctx.flush();
     }

From 2fb7870e7141f72f1f8600963fd69fe456ccafd5 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Thu, 25 Jul 2019 17:41:40 +0300
Subject: [PATCH 019/108] fixed spine rendering

---
 samples/CMakeLists.txt                        |   1 +
 .../bin/library/raptor/export/raptor-pro.json |   3 +
 .../bin/library/raptor/export/raptor-pro.skel |   3 +
 .../bin/library/raptor/export/raptor.atlas    |   3 +
 samples/bin/library/raptor/export/raptor.png  |   3 +
 samples/bin/library/spine_material.json       |   3 +
 samples/bin/library/spine_raptor.json         |   3 +
 samples/bin/library/spine_shader.frag         |  11 ++
 samples/bin/library/spine_shader.json         |   3 +
 samples/bin/library/spine_shader.vert         |  16 +++
 samples/sources/sample_07/sample_07.cpp       | 113 ++++++++++++++++++
 .../high/assets/spine_model_asset.cpp         |  16 ++-
 .../render_system_drawer.cpp                  |  14 ++-
 .../render_system_drawer.hpp                  |   2 +
 14 files changed, 185 insertions(+), 9 deletions(-)
 create mode 100644 samples/bin/library/raptor/export/raptor-pro.json
 create mode 100644 samples/bin/library/raptor/export/raptor-pro.skel
 create mode 100644 samples/bin/library/raptor/export/raptor.atlas
 create mode 100644 samples/bin/library/raptor/export/raptor.png
 create mode 100644 samples/bin/library/spine_material.json
 create mode 100644 samples/bin/library/spine_raptor.json
 create mode 100644 samples/bin/library/spine_shader.frag
 create mode 100644 samples/bin/library/spine_shader.json
 create mode 100644 samples/bin/library/spine_shader.vert
 create mode 100644 samples/sources/sample_07/sample_07.cpp

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 107ae51d..6715c073 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -36,3 +36,4 @@ add_e2d_sample(02)
 add_e2d_sample(03)
 add_e2d_sample(04)
 add_e2d_sample(05)
+add_e2d_sample(07)
diff --git a/samples/bin/library/raptor/export/raptor-pro.json b/samples/bin/library/raptor/export/raptor-pro.json
new file mode 100644
index 00000000..47afbe58
--- /dev/null
+++ b/samples/bin/library/raptor/export/raptor-pro.json
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c8d0e5057c92306900f39879e51642500b841825cedb47833bbfa129978b5757
+size 172896
diff --git a/samples/bin/library/raptor/export/raptor-pro.skel b/samples/bin/library/raptor/export/raptor-pro.skel
new file mode 100644
index 00000000..235f7aa0
--- /dev/null
+++ b/samples/bin/library/raptor/export/raptor-pro.skel
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83c00999f00c4ac395ba063291d02131fb2a8869cb6d8f4fd20bc15131d52d54
+size 63077
diff --git a/samples/bin/library/raptor/export/raptor.atlas b/samples/bin/library/raptor/export/raptor.atlas
new file mode 100644
index 00000000..09e4ce87
--- /dev/null
+++ b/samples/bin/library/raptor/export/raptor.atlas
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:19b38bacd3e0cb4b41df20d88d2097e9886745b535bf821004736f7ae7582736
+size 4224
diff --git a/samples/bin/library/raptor/export/raptor.png b/samples/bin/library/raptor/export/raptor.png
new file mode 100644
index 00000000..6e6a20d2
--- /dev/null
+++ b/samples/bin/library/raptor/export/raptor.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:879d84230024a1529ea994e7cd6416c5883f4b74b0d268b5e2dea1cbe2d00777
+size 480392
diff --git a/samples/bin/library/spine_material.json b/samples/bin/library/spine_material.json
new file mode 100644
index 00000000..ecaf4333
--- /dev/null
+++ b/samples/bin/library/spine_material.json
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b20bd767ea8ad744e3af8c4bd353f010e9f4d65f17c34b70a974baf117ff7ecb
+size 349
diff --git a/samples/bin/library/spine_raptor.json b/samples/bin/library/spine_raptor.json
new file mode 100644
index 00000000..fcd252a0
--- /dev/null
+++ b/samples/bin/library/spine_raptor.json
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5b2d2131b3fe0d761de597e316a9001f3fefc7c03c503ec9b2bac538543893e1
+size 131
diff --git a/samples/bin/library/spine_shader.frag b/samples/bin/library/spine_shader.frag
new file mode 100644
index 00000000..e0fff40b
--- /dev/null
+++ b/samples/bin/library/spine_shader.frag
@@ -0,0 +1,11 @@
+#version 120
+
+uniform sampler2D u_texture;
+
+varying vec4 v_tint;
+varying vec2 v_st;
+
+void main() {
+    vec2 st = vec2(v_st.s, v_st.t);
+    gl_FragColor = texture2D(u_texture, st) * v_tint;
+}
diff --git a/samples/bin/library/spine_shader.json b/samples/bin/library/spine_shader.json
new file mode 100644
index 00000000..b13c1dcf
--- /dev/null
+++ b/samples/bin/library/spine_shader.json
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:aa42a9a09042744abe4f9ef1d50b190baef49e43ccd979ac99e491743d17dfec
+size 81
diff --git a/samples/bin/library/spine_shader.vert b/samples/bin/library/spine_shader.vert
new file mode 100644
index 00000000..edfe96a4
--- /dev/null
+++ b/samples/bin/library/spine_shader.vert
@@ -0,0 +1,16 @@
+#version 120
+
+uniform mat4 u_matrix_mvp;
+
+attribute vec3 a_vertex;
+attribute vec4 a_tint;
+attribute vec2 a_st;
+
+varying vec4 v_tint;
+varying vec2 v_st;
+
+void main() {
+    v_st = a_st;
+    v_tint = a_tint;
+    gl_Position = vec4(a_vertex, 1.0) * u_matrix_mvp;
+}
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
new file mode 100644
index 00000000..b0a750e3
--- /dev/null
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -0,0 +1,113 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include "../common.hpp"
+using namespace e2d;
+
+namespace
+{
+    class game_system final : public ecs::system {
+    public:
+        void process(ecs::registry& owner) override {
+            E2D_UNUSED(owner);
+            const keyboard& k = the<input>().keyboard();
+
+            if ( k.is_key_just_released(keyboard_key::f12) ) {
+                the<dbgui>().toggle_visible(!the<dbgui>().visible());
+            }
+
+            if ( k.is_key_just_released(keyboard_key::escape) ) {
+                the<window>().set_should_close(true);
+            }
+
+            if ( k.is_key_pressed(keyboard_key::lsuper) && k.is_key_just_released(keyboard_key::enter) ) {
+                the<window>().toggle_fullscreen(!the<window>().fullscreen());
+            }
+        }
+    };
+    
+    class camera_system final : public ecs::system {
+    public:
+        void process(ecs::registry& owner) override {
+            owner.for_joined_components<camera>(
+            [](const ecs::const_entity&, camera& cam){
+                if ( !cam.target() ) {
+                    cam.viewport(
+                        the<window>().real_size());
+                    cam.projection(math::make_orthogonal_lh_matrix4(
+                        the<window>().real_size().cast_to<f32>(), 0.f, 1000.f));
+                }
+            });
+        }
+    };
+
+    class game final : public starter::application {
+    public:
+        bool initialize() final {
+            return create_scene()
+                && create_camera()
+                && create_systems();
+        }
+    private:
+        bool create_scene() {
+            auto spine_res = the<library>().load_asset<spine_model_asset>("spine_raptor.json");
+            auto spine_mat = the<library>().load_asset<material_asset>("spine_material.json");
+
+            if ( !spine_res || !spine_mat ) {
+                return false;
+            }
+            
+            auto scene_i = the<world>().instantiate();
+
+            scene_i->entity_filler()
+                .component<scene>()
+                .component<actor>(node::create(scene_i));
+
+            node_iptr scene_r = scene_i->get_component<actor>().get().node();
+
+            auto spine_i = the<world>().instantiate();
+            spine_i->entity_filler()
+                .component<actor>(node::create(spine_i, scene_r))
+                .component<renderer>(renderer()
+                    .materials({spine_mat}))
+                .component<spine_renderer>(spine_renderer(spine_res))
+                .component<spine_player>(spine_player(spine_res)
+                    .set_animation(0, "walk", true)
+                    .add_animation(1, "gun-grab", false, secf(2.0f)));
+            
+            node_iptr spine_n = spine_i->get_component<actor>().get().node();
+            spine_n->scale(v3f(0.25f));
+            spine_n->translation(v3f{-40.f, -100.f, 0.0f});
+            return true;
+        }
+
+        bool create_camera() {
+            auto camera_i = the<world>().instantiate();
+            camera_i->entity_filler()
+                .component<camera>(camera()
+                    .background({1.f, 0.4f, 0.f, 1.f}))
+                .component<actor>(node::create(camera_i));
+            return true;
+        }
+
+        bool create_systems() {
+            ecs::registry_filler(the<world>().registry())
+                .system<game_system>(world::priority_update)
+                .system<camera_system>(world::priority_pre_render);
+            return true;
+        }
+    };
+}
+
+int e2d_main(int argc, char *argv[]) {
+    const auto starter_params = starter::parameters(
+        engine::parameters("sample_07", "enduro2d")
+            .timer_params(engine::timer_parameters()
+                .maximal_framerate(100)));
+    modules::initialize<starter>(argc, argv, starter_params).start<game>();
+    modules::shutdown<starter>();
+    return 0;
+}
diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
index 473ab5d3..9d141386 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -29,6 +29,7 @@ namespace
         "additionalProperties" : false,
         "properties" : {
             "skeleton" : { "$ref" : "#/common_definitions/address" },
+            "scale" : { "type" : "number" },
             "atlas" : { "$ref" : "#/common_definitions/address" },
             "premultiplied_alpha" : { "type" : "boolean" },
             "mix_animations" : {
@@ -127,15 +128,22 @@ namespace
                 nullptr),
             spAtlas_dispose);
 
+        float skeleton_scale = 1.0f;
+        if ( root.HasMember("scale") ) {
+            if ( !json_utils::try_parse_value(root["scale"], skeleton_scale) ) {
+                the<debug>().error("SPINE: Incorrect formating of 'scale' property");
+            }
+        }
+
+	    skeleton_json_ptr skeleton_json(spSkeletonJson_create(atlas.get()), spSkeletonJson_dispose);
+        skeleton_json->scale = skeleton_scale;
+
         E2D_ASSERT(root.HasMember("skeleton") && root["skeleton"].IsString());
         binary_asset::load_result skeleton_data = library.load_asset<binary_asset>(
             path::combine(parent_address, root["skeleton"].GetString()));
-	    skeleton_json_ptr json(
-            spSkeletonJson_create(atlas.get()),
-            spSkeletonJson_dispose);
 	    spine_model::skeleton_data_ptr skeleton(
             spSkeletonJson_readSkeletonData(
-                json.get(),
+                skeleton_json.get(),
                 reinterpret_cast<const char*>(skeleton_data->content().data())),
             spSkeletonData_dispose);
 
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index 37bf923d..2c8459eb 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -26,6 +26,7 @@ namespace
     const str_hash matrix_v_property_hash = "u_matrix_v";
     const str_hash matrix_p_property_hash = "u_matrix_p";
     const str_hash matrix_vp_property_hash = "u_matrix_vp";
+    const str_hash matrix_mvp_property_hash = "u_matrix_mvp";
     const str_hash game_time_property_hash = "u_game_time";
     const str_hash sprite_texture_sampler_hash = "u_texture";
 }
@@ -52,15 +53,15 @@ namespace e2d::render_system_impl
             : m4f::identity();
         const std::pair<m4f,bool> cam_w_inv = math::inversed(cam_w);
 
-        const m4f& m_v = cam_w_inv.second
+        view_mat_ = cam_w_inv.second
             ? cam_w_inv.first
             : m4f::identity();
-        const m4f& m_p = cam.projection();
+        proj_mat_ = cam.projection();
 
         batcher_.flush()
-            .property(matrix_v_property_hash, m_v)
-            .property(matrix_p_property_hash, m_p)
-            .property(matrix_vp_property_hash, m_v * m_p)
+            .property(matrix_v_property_hash, view_mat_)
+            .property(matrix_p_property_hash, proj_mat_)
+            .property(matrix_vp_property_hash, view_mat_ * proj_mat_)
             .property(game_time_property_hash, engine.time());
 
         render.execute(render::command_block<3>()
@@ -249,6 +250,7 @@ namespace e2d::render_system_impl
         spSkeletonClipping* clipper = spine_r.clipper().operator->();
         spVertexEffect* effect = spine_r.effect().operator->();
         const material_asset::ptr& mat_a = node_r.materials().front();
+        const m4f& mvp = node->world_matrix() * view_mat_ * proj_mat_;
         float dt = 0.01f;
 
         if ( !skeleton || !clipper || !mat_a ) {
@@ -271,6 +273,7 @@ namespace e2d::render_system_impl
         if ( effect ) {
             effect->begin(effect, skeleton);
         }
+        
 
         for ( int i = 0; i < skeleton->slotsCount; ++i ) {
             spSlot* slot = skeleton->drawOrder[i];
@@ -381,6 +384,7 @@ namespace e2d::render_system_impl
                         .texture(texture)
                         .min_filter(render::sampler_min_filter::linear)
                         .mag_filter(render::sampler_mag_filter::linear))
+                    .property(matrix_mvp_property_hash, mvp)
                     .merge(node_r.properties());
 
                 batcher_.batch(
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
index 05c82cff..6f584a4b 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
@@ -65,6 +65,8 @@ namespace e2d::render_system_impl
             batcher_type& batcher_;
             std::vector<batcher_type::vertex_type>& spine_vertices_;
             render::property_block property_cache_;
+            m4f view_mat_;
+            m4f proj_mat_;
         };
     public:
         drawer(engine& e, debug& d, render& r);

From 04695f4c001f26283a3ec01dd167a5738b9d5301 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Thu, 25 Jul 2019 19:08:02 +0300
Subject: [PATCH 020/108] use .json-large to put json into lfs

---
 .gitattributes                                           | 2 +-
 samples/bin/library/raptor/export/raptor.atlas           | 3 ---
 .../{export/raptor-pro.json => raptor-pro.json-large}    | 0
 samples/bin/library/raptor/{export => }/raptor-pro.skel  | 0
 samples/bin/library/raptor/raptor.atlas                  | 3 +++
 samples/bin/library/raptor/{export => }/raptor.png       | 0
 samples/bin/library/spine_raptor.json                    | 9 ++++++---
 7 files changed, 10 insertions(+), 7 deletions(-)
 delete mode 100644 samples/bin/library/raptor/export/raptor.atlas
 rename samples/bin/library/raptor/{export/raptor-pro.json => raptor-pro.json-large} (100%)
 rename samples/bin/library/raptor/{export => }/raptor-pro.skel (100%)
 create mode 100644 samples/bin/library/raptor/raptor.atlas
 rename samples/bin/library/raptor/{export => }/raptor.png (100%)

diff --git a/.gitattributes b/.gitattributes
index 7fef1442..150fa32e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -14,4 +14,4 @@
 *.ogg filter=lfs diff=lfs merge=lfs -text
 *.skel filter=lfs diff=lfs merge=lfs -text
 *.atlas filter=lfs diff=lfs merge=lfs -text
-*.json filter=lfs diff=lfs merge=lfs -text
+*.json-large filter=lfs diff=lfs merge=lfs -text
diff --git a/samples/bin/library/raptor/export/raptor.atlas b/samples/bin/library/raptor/export/raptor.atlas
deleted file mode 100644
index 09e4ce87..00000000
--- a/samples/bin/library/raptor/export/raptor.atlas
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19b38bacd3e0cb4b41df20d88d2097e9886745b535bf821004736f7ae7582736
-size 4224
diff --git a/samples/bin/library/raptor/export/raptor-pro.json b/samples/bin/library/raptor/raptor-pro.json-large
similarity index 100%
rename from samples/bin/library/raptor/export/raptor-pro.json
rename to samples/bin/library/raptor/raptor-pro.json-large
diff --git a/samples/bin/library/raptor/export/raptor-pro.skel b/samples/bin/library/raptor/raptor-pro.skel
similarity index 100%
rename from samples/bin/library/raptor/export/raptor-pro.skel
rename to samples/bin/library/raptor/raptor-pro.skel
diff --git a/samples/bin/library/raptor/raptor.atlas b/samples/bin/library/raptor/raptor.atlas
new file mode 100644
index 00000000..f14d752d
--- /dev/null
+++ b/samples/bin/library/raptor/raptor.atlas
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7b7c681d1cc80b52f0a501810405f44cbe9159fb348e3af155bcd9948267896
+size 4217
diff --git a/samples/bin/library/raptor/export/raptor.png b/samples/bin/library/raptor/raptor.png
similarity index 100%
rename from samples/bin/library/raptor/export/raptor.png
rename to samples/bin/library/raptor/raptor.png
diff --git a/samples/bin/library/spine_raptor.json b/samples/bin/library/spine_raptor.json
index fcd252a0..daf58174 100644
--- a/samples/bin/library/spine_raptor.json
+++ b/samples/bin/library/spine_raptor.json
@@ -1,3 +1,6 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5b2d2131b3fe0d761de597e316a9001f3fefc7c03c503ec9b2bac538543893e1
-size 131
+{
+    "skeleton" : "raptor/raptor-pro.json-large",
+    "atlas" : "raptor/raptor.atlas",
+    "scale" : 1.0,
+    "premultiplied_alpha" : false
+}
\ No newline at end of file

From 7c7a58c0c8420dfce06b9f67aa42f072ceadd7a8 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Thu, 25 Jul 2019 19:09:06 +0300
Subject: [PATCH 021/108] enabled some errors for msvc

---
 CMakeLists.txt | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83c4226a..c38dd399 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,10 +70,22 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
                              -Werror=parentheses
                              -Werror=address
                              -Werror=return-stack-address)
-    string(REPLACE ";" " " E2D_SHARED_CXX_FLAGS "${E2D_SHARED_CXX_FLAGS}")
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    set(E2D_SHARED_CXX_FLAGS
+        /we4297   # function assumed not to throw an exception but does
+        /we4715   # not all control paths return a value
+        /we4716   # must return a value
+        /we4172   # returning address of local variable or temporary
+        /we4717   # recursive on all control paths, function will cause runtime stack overflow
+        /we4239   # conversion from 'type' to 'type &'
+        /we4238   # class rvalue used as lvalue
+        /we4700   # uninitialized local variable used
+        /we4706   # assignment within conditional expression
+        /we4554   # check operator precedence for possible error; use parentheses to clarify precedence
+        )
 endif()
+string(REPLACE ";" " " E2D_SHARED_CXX_FLAGS "${E2D_SHARED_CXX_FLAGS}")
 
 foreach(config ${E2D_ALL_CXX_CONFIGS})
     set(${config} "${${config}} ${E2D_SHARED_CXX_FLAGS}")

From 28556da7613b0de7287a4b778ee916be6196a121 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Fri, 26 Jul 2019 11:08:23 +0300
Subject: [PATCH 022/108] fixed compilation on mac

---
 .../render_system_impl/render_system_drawer.cpp        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index 2c8459eb..b78b86ad 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -286,7 +286,7 @@ namespace e2d::render_system_impl
                 continue;
             }
 
-            int vertex_count = 0;
+            size_t vertex_count = 0;
             const float* uvs = nullptr;
             const u16* indices = nullptr;
             int index_count = 0;
@@ -337,9 +337,9 @@ namespace e2d::render_system_impl
                 continue;
             }
 
-            const color32 color(
-                color(skeleton->color.r, skeleton->color.b, skeleton->color.g, skeleton->color.a) *
-                color(slot->color.r, slot->color.b, slot->color.g, slot->color.a) *
+            const color32 vert_color(
+                color(skeleton->color.r, skeleton->color.g, skeleton->color.b, skeleton->color.a) *
+                color(slot->color.r, slot->color.g, slot->color.b, slot->color.a) *
                 color(attachment_color->r, attachment_color->g, attachment_color->b, attachment_color->a));
 
             switch ( slot->data->blendMode ) {
@@ -374,7 +374,7 @@ namespace e2d::render_system_impl
                     vert.v.z = 0.0f;
                     vert.t.x = uvs[index];
                     vert.t.y = uvs[index+1];
-                    vert.c = color;
+                    vert.c = vert_color;
                 }
             }
             

From a8817ebe20f8abad279c42be51c3f313507c1123 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Thu, 25 Jul 2019 19:24:39 +0300
Subject: [PATCH 023/108] add halign and valign implementation

---
 .../enduro2d/high/systems/label_system.cpp    | 94 ++++++++++++++++---
 1 file changed, 81 insertions(+), 13 deletions(-)

diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index 5ab0275b..70dc31da 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -9,6 +9,56 @@
 #include <enduro2d/high/components/label.hpp>
 #include <enduro2d/high/components/model_renderer.hpp>
 
+namespace
+{
+    using namespace e2d;
+
+    f32 get_x_pos(const label& l, f32 string_width) {
+        f32 x_pos{0};
+        switch ( l.halign() ) {
+            case label::haligns::left :
+                x_pos = 0;
+            break;
+            case label::haligns::center :
+                x_pos = -0.5f * string_width;
+            break;
+            case label::haligns::right :
+                x_pos = -string_width;
+            break;
+            default:
+                E2D_ASSERT_MSG(false,"label_system: uncknow horizontal align flag");
+            break;
+        }
+
+        return x_pos;
+    }
+
+    f32 get_top_pos(const label& l, u32 strings_count) {
+        const auto& f = l.font()->content();
+        f32 label_height = f.common().line * strings_count;
+        f32 top{0};
+        switch ( l.valign() ) {
+            case label::valigns::top :
+                top = label_height;
+            break;
+            case label::valigns::center :
+                top = 0.5f * label_height;
+            break;
+            case label::valigns::bottom :
+                top = 0;
+            break;
+            case label::valigns::baseline :
+                top = label_height - (f.common().line - f.common().base);
+            break;
+            default:
+                E2D_ASSERT_MSG(false,"label_system: uncknow vertical align flag");
+            break;
+        }
+
+        return top;
+    }
+}
+
 namespace e2d
 {
     //
@@ -38,10 +88,29 @@ namespace e2d
                 auto common = f.common();
                 v2f texture_size = common.atlas_size.cast_to<f32>();
 
-                size_t letters_size = text.size();
+                size_t strings_count{1};
                 for ( size_t i = 0; i < text.size(); i++ ) {
                     if ( text[i] == '\n' ) {
-                        letters_size--;
+                        strings_count++;
+                    }
+                }
+                size_t letters_size{0};
+                vector<f32> strings_width(strings_count);
+                std::fill(strings_width.begin(), strings_width.end(), 0);
+                f32 kerning{0};
+                u32 prev_char{0};
+                for ( size_t i = 0, string_ind = 0; i < text.size(); i++ ) {
+                    if ( text[i] != '\n' ) {
+                        auto data = f.find_char(text[i]);
+                        if ( data ) {
+                            letters_size++;
+                            prev_char != 0
+                            ? kerning = f.get_kerning(prev_char, data->id)
+                            : kerning = 0;
+                            strings_width[string_ind] += data->advance + kerning;
+                        }
+                    } else {
+                        string_ind++;
                     }
                 }
 
@@ -49,15 +118,14 @@ namespace e2d
                 uvs.resize(vertices.size());
                 colors.resize(vertices.size());
                 indices.resize(text.size() * 6);
-                f32 x_pos{0.f};
-                f32 y_pos{0.f};
-                f32 kerning{0};
-                u32 prev_char{0};
+                f32 x_pos = get_x_pos(l, strings_width[0]);
+                f32 y_pos = get_top_pos(l, strings_count);
                 u32 letters_counter{0};
-                for ( size_t i = 0; i < text.size(); i++ ) {
+                for ( size_t i = 0, string_ind = 0; i < text.size(); i++ ) {
                     if ( text[i] == '\n' ) {
-                        y_pos -= f.common().line;
-                        x_pos = 0.f;
+                        string_ind++;
+                        y_pos -= common.line;
+                        x_pos = get_x_pos(l, strings_width[string_ind]);
                         prev_char = 0;
                         continue;
                     }
@@ -74,19 +142,19 @@ namespace e2d
                         size_t start_vertices = letters_counter * 4;
                         vertices[start_vertices] = v3f(
                             x_pos + offset.x,
-                            y_pos + offset.y,
+                            y_pos - offset.y - data->rect.size.y,
                             0);
                         vertices[start_vertices + 1] = v3f(
                             x_pos + offset.x,
-                            y_pos + data->rect.size.y + offset.y,
+                            y_pos - offset.y,
                             0);
                         vertices[start_vertices + 2] = v3f(
                             x_pos + data->rect.size.x + offset.x,
-                            y_pos + data->rect.size.y + offset.y,
+                            y_pos - offset.y,
                             0);
                         vertices[start_vertices + 3] = v3f(
                             x_pos + data->rect.size.x + offset.x,
-                            y_pos + offset.y,
+                            y_pos - offset.y - data->rect.size.y,
                             0);
 
                         uvs[start_vertices] = v2f(

From 7854fd2c221f392d50a65f96369556318b7f25e1 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Fri, 26 Jul 2019 17:18:05 +0300
Subject: [PATCH 024/108] label width implementation

---
 .../enduro2d/high/systems/label_system.cpp    | 86 ++++++++++++++++---
 1 file changed, 73 insertions(+), 13 deletions(-)

diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index 70dc31da..c7e38767 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -83,30 +83,91 @@ namespace e2d
                 vector<v3f> normals;
                 vector<color32> colors;
                 v2f offset;
+                f32 kerning{0};
+                u32 prev_char{0};
                 str32 text = l.text();
+                if (text.empty()) {
+                    return;
+                }
                 const auto& f = l.font()->content();
                 auto common = f.common();
                 v2f texture_size = common.atlas_size.cast_to<f32>();
 
+                if ( l.width() != 0 ) {
+                    f32 word_width{0};
+                    f32 string_width{0};
+                    i32 last_space{-1};
+                    for ( size_t i = 0; i < text.size(); i++ ) {
+                        const auto& ch = text[i];
+                        if ( ch == '\n' ) {
+                            word_width = 0;
+                            string_width = 0;
+                            last_space = -1;
+                        } else {
+                            auto data = f.find_char(ch);
+                            if ( data ) {
+                                prev_char != 0
+                                    ? kerning = f.get_kerning(prev_char, data->id)
+                                    : kerning = 0;
+                                prev_char = ch;
+                                f32 char_width = data->advance + kerning;
+                                if ( ch == ' ' ) {
+                                    if ( string_width + word_width < l.width() ) {
+                                        if ( string_width + word_width + char_width < l.width() ) {
+                                            string_width += word_width + char_width;
+                                            word_width = 0;
+                                            last_space = i;
+                                        } else {
+                                            text[i] = '\n';
+                                            word_width = 0;
+                                            string_width = 0;
+                                            last_space = -1;
+                                        }
+                                    } else {
+                                        if ( last_space != -1 ) {
+                                            text[last_space] = '\n';
+                                            last_space = -1;
+                                            string_width = 0;
+                                            --i;
+                                        } else {
+                                            text[i] = '\n';
+                                            word_width = 0;
+                                            string_width = 0;
+                                        }
+                                    }
+                                } else {
+                                    word_width += char_width;
+                                    if ( i == text.size() - 1) {
+                                        if ( string_width + word_width > l.width() ) {
+                                            if ( last_space != -1 ) {
+                                                text[last_space] = '\n';
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
                 size_t strings_count{1};
                 for ( size_t i = 0; i < text.size(); i++ ) {
-                    if ( text[i] == '\n' ) {
+                    if ( text[i] == '\n' && i != text.size() - 1) {
                         strings_count++;
                     }
                 }
                 size_t letters_size{0};
                 vector<f32> strings_width(strings_count);
                 std::fill(strings_width.begin(), strings_width.end(), 0);
-                f32 kerning{0};
-                u32 prev_char{0};
+                prev_char = 0;
                 for ( size_t i = 0, string_ind = 0; i < text.size(); i++ ) {
                     if ( text[i] != '\n' ) {
                         auto data = f.find_char(text[i]);
                         if ( data ) {
                             letters_size++;
                             prev_char != 0
-                            ? kerning = f.get_kerning(prev_char, data->id)
-                            : kerning = 0;
+                                ? kerning = f.get_kerning(prev_char, data->id)
+                                : kerning = 0;
                             strings_width[string_ind] += data->advance + kerning;
                         }
                     } else {
@@ -121,22 +182,21 @@ namespace e2d
                 f32 x_pos = get_x_pos(l, strings_width[0]);
                 f32 y_pos = get_top_pos(l, strings_count);
                 u32 letters_counter{0};
-                for ( size_t i = 0, string_ind = 0; i < text.size(); i++ ) {
+                prev_char = 0;
+                for ( size_t i = 0, str_ind = 0; i < text.size(); i++ ) {
                     if ( text[i] == '\n' ) {
-                        string_ind++;
+                        str_ind++;
                         y_pos -= common.line;
-                        x_pos = get_x_pos(l, strings_width[string_ind]);
+                        x_pos = get_x_pos(l, strings_width[str_ind]);
                         prev_char = 0;
                         continue;
                     }
                     auto data = f.find_char(text[i]);
                     if ( data ) {
                         offset = data->offset.cast_to<f32>();
-                        if ( prev_char != 0 ) {
-                            kerning = f.get_kerning(prev_char, data->id);
-                        } else {
-                            kerning = 0;
-                        }
+                        prev_char != 0
+                            ? kerning = f.get_kerning(prev_char, data->id)
+                            : kerning = 0;
                         offset.x += kerning;
                         prev_char = data->id;
                         size_t start_vertices = letters_counter * 4;

From add585af7290210b95a9887d8ea08c666a933286 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Fri, 26 Jul 2019 18:39:44 +0300
Subject: [PATCH 025/108] added performance test

---
 samples/sources/sample_07/sample_07.cpp | 27 +++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index b0a750e3..dd18dda0 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -67,20 +67,35 @@ namespace
                 .component<actor>(node::create(scene_i));
 
             node_iptr scene_r = scene_i->get_component<actor>().get().node();
-
+            
+        #if 1
             auto spine_i = the<world>().instantiate();
             spine_i->entity_filler()
                 .component<actor>(node::create(spine_i, scene_r))
-                .component<renderer>(renderer()
-                    .materials({spine_mat}))
-                .component<spine_renderer>(spine_renderer(spine_res))
-                .component<spine_player>(spine_player(spine_res)
-                    .set_animation(0, "walk", true)
                     .add_animation(1, "gun-grab", false, secf(2.0f)));
             
             node_iptr spine_n = spine_i->get_component<actor>().get().node();
             spine_n->scale(v3f(0.25f));
             spine_n->translation(v3f{-40.f, -100.f, 0.0f});
+        #else
+            // performace test
+            for ( std::size_t i = 0; i < 20; ++i )
+            for ( std::size_t j = 0; j < 40; ++j ) {
+                auto spine_i = the<world>().instantiate();
+                spine_i->entity_filler()
+                    .component<actor>(node::create(spine_i, scene_r))
+                    .component<renderer>(renderer()
+                        .materials({spine_mat}))
+                    .component<spine_renderer>(spine_renderer(spine_res))
+                    .component<spine_player>(spine_player(spine_res)
+                        .set_animation(0, "walk", true)
+                        .add_animation(1, "gun-grab", false, secf(2.0f)));
+            
+                node_iptr spine_n = spine_i->get_component<actor>().get().node();
+                spine_n->scale(v3f(0.05f));
+                spine_n->translation(v3f{-400.f, -300.f, 0.0f} + v3f{j * 30.f, i * 30.f, 0});
+            }
+        #endif
             return true;
         }
 

From cac6761eb5c2b7842fc5486c571e56899371d9f4 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Sat, 27 Jul 2019 01:24:33 +0700
Subject: [PATCH 026/108] return lfs json files

---
 samples/bin/library/spine_material.json | 17 ++++++++++++++---
 samples/bin/library/spine_shader.json   |  7 ++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/samples/bin/library/spine_material.json b/samples/bin/library/spine_material.json
index ecaf4333..e2f9770f 100644
--- a/samples/bin/library/spine_material.json
+++ b/samples/bin/library/spine_material.json
@@ -1,3 +1,14 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b20bd767ea8ad744e3af8c4bd353f010e9f4d65f17c34b70a974baf117ff7ecb
-size 349
+{
+    "passes" : [{
+        "shader" : "sprite_shader.json",
+        "state_block" : {
+            "blending_state" : {
+                "src_factor" : "src_alpha",
+                "dst_factor" : "one_minus_src_alpha"
+            },
+            "capabilities_state" : {
+                "blending" : true
+            }
+        }
+    }]
+}
diff --git a/samples/bin/library/spine_shader.json b/samples/bin/library/spine_shader.json
index b13c1dcf..49e5a054 100644
--- a/samples/bin/library/spine_shader.json
+++ b/samples/bin/library/spine_shader.json
@@ -1,3 +1,4 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa42a9a09042744abe4f9ef1d50b190baef49e43ccd979ac99e491743d17dfec
-size 81
+{
+    "vertex" : "spine_shader.vert",
+    "fragment" : "spine_shader.frag"
+}

From be5141f296c9d356238d72ebe2d75e84a6577cd8 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Mon, 29 Jul 2019 13:55:08 +0300
Subject: [PATCH 027/108] added spine system; transform vertices on cpu instead
 of using mvp matrix

---
 headers/enduro2d/high/_all.hpp                |  1 +
 headers/enduro2d/high/_high.hpp               |  1 +
 .../enduro2d/high/systems/spine_system.hpp    | 19 ++++++++
 samples/bin/library/spine_material.json       |  2 +-
 samples/bin/library/spine_shader.vert         |  4 +-
 samples/sources/sample_07/sample_07.cpp       |  8 +++-
 .../high/assets/spine_model_asset.cpp         |  6 +--
 .../render_system_drawer.cpp                  | 43 +++++++------------
 .../render_system_drawer.hpp                  |  5 +--
 .../enduro2d/high/systems/spine_system.cpp    | 42 ++++++++++++++++++
 10 files changed, 93 insertions(+), 38 deletions(-)
 create mode 100644 headers/enduro2d/high/systems/spine_system.hpp
 create mode 100644 sources/enduro2d/high/systems/spine_system.cpp

diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index 17546563..a07c37ba 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -38,6 +38,7 @@
 
 #include "systems/flipbook_system.hpp"
 #include "systems/render_system.hpp"
+#include "systems/spine_system.hpp"
 
 #include "address.hpp"
 #include "asset.hpp"
diff --git a/headers/enduro2d/high/_high.hpp b/headers/enduro2d/high/_high.hpp
index e0d44575..c57313ce 100644
--- a/headers/enduro2d/high/_high.hpp
+++ b/headers/enduro2d/high/_high.hpp
@@ -50,6 +50,7 @@ namespace e2d
 
     class flipbook_system;
     class render_system;
+    class spine_system;
 
     template < typename Asset, typename Content >
     class content_asset;
diff --git a/headers/enduro2d/high/systems/spine_system.hpp b/headers/enduro2d/high/systems/spine_system.hpp
new file mode 100644
index 00000000..eee98595
--- /dev/null
+++ b/headers/enduro2d/high/systems/spine_system.hpp
@@ -0,0 +1,19 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include "../_high.hpp"
+
+namespace e2d
+{
+    class spine_system final : public ecs::system {
+    public:
+        spine_system();
+        ~spine_system() noexcept final;
+        void process(ecs::registry& owner) override;
+    };
+}
diff --git a/samples/bin/library/spine_material.json b/samples/bin/library/spine_material.json
index e2f9770f..7d83f326 100644
--- a/samples/bin/library/spine_material.json
+++ b/samples/bin/library/spine_material.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "sprite_shader.json",
+        "shader" : "spine_shader.json",
         "state_block" : {
             "blending_state" : {
                 "src_factor" : "src_alpha",
diff --git a/samples/bin/library/spine_shader.vert b/samples/bin/library/spine_shader.vert
index edfe96a4..57e41375 100644
--- a/samples/bin/library/spine_shader.vert
+++ b/samples/bin/library/spine_shader.vert
@@ -1,6 +1,6 @@
 #version 120
 
-uniform mat4 u_matrix_mvp;
+uniform mat4 u_matrix_vp;
 
 attribute vec3 a_vertex;
 attribute vec4 a_tint;
@@ -12,5 +12,5 @@ varying vec2 v_st;
 void main() {
     v_st = a_st;
     v_tint = a_tint;
-    gl_Position = vec4(a_vertex, 1.0) * u_matrix_mvp;
+    gl_Position = vec4(a_vertex, 1.0) * u_matrix_vp;
 }
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index dd18dda0..0c667163 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -72,6 +72,11 @@ namespace
             auto spine_i = the<world>().instantiate();
             spine_i->entity_filler()
                 .component<actor>(node::create(spine_i, scene_r))
+                .component<renderer>(renderer()
+                    .materials({spine_mat}))
+                .component<spine_renderer>(spine_renderer(spine_res))
+                .component<spine_player>(spine_player(spine_res)
+                    .set_animation(0, "walk", true)
                     .add_animation(1, "gun-grab", false, secf(2.0f)));
             
             node_iptr spine_n = spine_i->get_component<actor>().get().node();
@@ -111,7 +116,8 @@ namespace
         bool create_systems() {
             ecs::registry_filler(the<world>().registry())
                 .system<game_system>(world::priority_update)
-                .system<camera_system>(world::priority_pre_render);
+                .system<camera_system>(world::priority_pre_render)
+                .system<spine_system>(world::priority_update);
             return true;
         }
     };
diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
index 9d141386..d0eda81f 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -135,13 +135,13 @@ namespace
             }
         }
 
-	    skeleton_json_ptr skeleton_json(spSkeletonJson_create(atlas.get()), spSkeletonJson_dispose);
+        skeleton_json_ptr skeleton_json(spSkeletonJson_create(atlas.get()), spSkeletonJson_dispose);
         skeleton_json->scale = skeleton_scale;
 
         E2D_ASSERT(root.HasMember("skeleton") && root["skeleton"].IsString());
         binary_asset::load_result skeleton_data = library.load_asset<binary_asset>(
             path::combine(parent_address, root["skeleton"].GetString()));
-	    spine_model::skeleton_data_ptr skeleton(
+        spine_model::skeleton_data_ptr skeleton(
             spSkeletonJson_readSkeletonData(
                 skeleton_json.get(),
                 reinterpret_cast<const char*>(skeleton_data->content().data())),
@@ -192,7 +192,7 @@ void _spAtlasPage_disposeTexture (spAtlasPage* self) {
 
 char* _spUtil_readFile (const char* path, int* length) {
     E2D_ASSERT(false);
-	return _spReadFile(path, length);
+    return _spReadFile(path, length);
 }
 
 namespace e2d
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index b78b86ad..3fce9f74 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -53,15 +53,15 @@ namespace e2d::render_system_impl
             : m4f::identity();
         const std::pair<m4f,bool> cam_w_inv = math::inversed(cam_w);
 
-        view_mat_ = cam_w_inv.second
+        const m4f& m_v = cam_w_inv.second
             ? cam_w_inv.first
             : m4f::identity();
-        proj_mat_ = cam.projection();
+        const m4f& m_p = cam.projection();
 
         batcher_.flush()
-            .property(matrix_v_property_hash, view_mat_)
-            .property(matrix_p_property_hash, proj_mat_)
-            .property(matrix_vp_property_hash, view_mat_ * proj_mat_)
+            .property(matrix_v_property_hash, m_v)
+            .property(matrix_p_property_hash, m_p)
+            .property(matrix_vp_property_hash, m_v * m_p)
             .property(game_time_property_hash, engine.time());
 
         render.execute(render::command_block<3>()
@@ -96,9 +96,8 @@ namespace e2d::render_system_impl
                 draw(node, *node_r, *spr_r);
             }
             const spine_renderer* spine_r = node_e.find_component<spine_renderer>();
-            const spine_player* spine_p = node_e.find_component<spine_player>();
             if ( spine_r ) {
-                draw(node, *node_r, *spine_r, spine_p);
+                draw(node, *node_r, *spine_r);
             }
         }
     }
@@ -231,8 +230,7 @@ namespace e2d::render_system_impl
     void drawer::context::draw(
         const const_node_iptr& node,
         const renderer& node_r,
-        const spine_renderer& spine_r,
-        const spine_player* spine_p)
+        const spine_renderer& spine_r)
     {
         static_assert(sizeof(batcher_type::vertex_type) % sizeof(float) == 0, "invalid stride");
         constexpr int stride = sizeof(batcher_type::vertex_type) / sizeof(float);
@@ -246,25 +244,15 @@ namespace e2d::render_system_impl
         }
 
         spSkeleton* skeleton = spine_r.skeleton().operator->();
-        spAnimationState* anim_state = spine_p ? spine_p->animation().operator->() : nullptr;
         spSkeletonClipping* clipper = spine_r.clipper().operator->();
         spVertexEffect* effect = spine_r.effect().operator->();
         const material_asset::ptr& mat_a = node_r.materials().front();
-        const m4f& mvp = node->world_matrix() * view_mat_ * proj_mat_;
-        float dt = 0.01f;
 
         if ( !skeleton || !clipper || !mat_a ) {
             return;
         }
 
-        spSkeleton_update(skeleton, dt);
-        if ( anim_state ) {
-            spAnimationState_update(anim_state, dt);
-            spAnimationState_apply(anim_state, skeleton);
-        }
-        spSkeleton_updateWorldTransform(skeleton);
-
-    	const u16 quad_indices[6] = { 0, 1, 2, 2, 3, 0 };
+        const u16 quad_indices[6] = { 0, 1, 2, 2, 3, 0 };
 
         if ( skeleton->color.a == 0 ) {
             return;
@@ -274,6 +262,9 @@ namespace e2d::render_system_impl
             effect->begin(effect, skeleton);
         }
         
+        const m3f sm = m3f(v3f(node->world_matrix()[0]),
+                            v3f(node->world_matrix()[1]),
+                            v3f(node->world_matrix()[3]));
 
         for ( int i = 0; i < skeleton->slotsCount; ++i ) {
             spSlot* slot = skeleton->drawOrder[i];
@@ -368,12 +359,11 @@ namespace e2d::render_system_impl
             if ( effect ) {
                 E2D_ASSERT(false);
             } else {
-                for ( int i = 0; i < index_count; ++i ) {
-                    int index = indices[i] << 1;
-                    auto& vert = spine_vertices_[indices[i]];
-                    vert.v.z = 0.0f;
-                    vert.t.x = uvs[index];
-                    vert.t.y = uvs[index+1];
+                for ( int j = 0; j < vertex_count; ++j ) {
+                    auto& vert = spine_vertices_[j];
+                    v2f v(vert.v.x, vert.v.y);
+                    vert.v = v3f(v.x, v.y, 1.0f) * sm;
+                    vert.t = v2f(uvs[j*2], uvs[j*2+1]);
                     vert.c = vert_color;
                 }
             }
@@ -384,7 +374,6 @@ namespace e2d::render_system_impl
                         .texture(texture)
                         .min_filter(render::sampler_min_filter::linear)
                         .mag_filter(render::sampler_mag_filter::linear))
-                    .property(matrix_mvp_property_hash, mvp)
                     .merge(node_r.properties());
 
                 batcher_.batch(
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
index 6f584a4b..f23cddd0 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
@@ -56,8 +56,7 @@ namespace e2d::render_system_impl
             void draw(
                 const const_node_iptr& node,
                 const renderer& node_r,
-                const spine_renderer& spine_r,
-                const spine_player* spine_p);
+                const spine_renderer& spine_r);
 
             void flush();
         private:
@@ -65,8 +64,6 @@ namespace e2d::render_system_impl
             batcher_type& batcher_;
             std::vector<batcher_type::vertex_type>& spine_vertices_;
             render::property_block property_cache_;
-            m4f view_mat_;
-            m4f proj_mat_;
         };
     public:
         drawer(engine& e, debug& d, render& r);
diff --git a/sources/enduro2d/high/systems/spine_system.cpp b/sources/enduro2d/high/systems/spine_system.cpp
new file mode 100644
index 00000000..88a480c4
--- /dev/null
+++ b/sources/enduro2d/high/systems/spine_system.cpp
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/systems/spine_system.hpp>
+
+#include <enduro2d/high/components/spine_player.hpp>
+#include <enduro2d/high/components/spine_renderer.hpp>
+
+#include <spine/AnimationState.h>
+#include <spine/Skeleton.h>
+
+namespace e2d
+{
+    spine_system::spine_system()
+    {}
+
+    spine_system::~spine_system() noexcept = default;
+
+    void spine_system::process(ecs::registry& owner) {
+        float dt = the<engine>().delta_time();
+        owner.for_joined_components<spine_player, spine_renderer>([dt](
+            const ecs::const_entity&,
+            spine_player& player,
+            const spine_renderer& renderer)
+        {
+            spSkeleton* skeleton = renderer.skeleton().operator->();
+            spAnimationState* anim_state = player.animation().operator->();
+            
+            if ( !skeleton || !anim_state ) {
+                return;
+            }
+
+            spSkeleton_update(skeleton, dt);
+            spAnimationState_update(anim_state, dt);
+            spAnimationState_apply(anim_state, skeleton);
+            spSkeleton_updateWorldTransform(skeleton);
+        });
+    }
+}

From 81aab4efb47acd077ff02d905ba01a4280724a94 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Mon, 29 Jul 2019 14:01:44 +0300
Subject: [PATCH 028/108] set 'inline all' for profiling, optimize color to
 color32 conversion, don't create zero-sized buffers

---
 CMakeLists.txt                                            | 7 +++++++
 sources/enduro2d/core/render_impl/render_opengl.cpp       | 2 ++
 .../systems/render_system_impl/render_system_batcher.hpp  | 6 ++++++
 sources/enduro2d/utils/color32.cpp                        | 8 ++++----
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c38dd399..8de9d652 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -83,7 +83,14 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         /we4700   # uninitialized local variable used
         /we4706   # assignment within conditional expression
         /we4554   # check operator precedence for possible error; use parentheses to clarify precedence
+        /w14100   # unreferenced formal parameter
+        /w14189   # local variable is initialized but not referenced
+        /we4456   # declaration of 'var' hides previous local declaration
         )
+    if(CMAKE_CXX_FLAGS_RELWITHDEBINFO)
+        set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /Ob2")
+        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Ob2")
+    endif()
 endif()
 string(REPLACE ";" " " E2D_SHARED_CXX_FLAGS "${E2D_SHARED_CXX_FLAGS}")
 
diff --git a/sources/enduro2d/core/render_impl/render_opengl.cpp b/sources/enduro2d/core/render_impl/render_opengl.cpp
index 3a4e4715..f56c0fa9 100644
--- a/sources/enduro2d/core/render_impl/render_opengl.cpp
+++ b/sources/enduro2d/core/render_impl/render_opengl.cpp
@@ -694,6 +694,7 @@ namespace e2d
         index_buffer::usage usage)
     {
         E2D_ASSERT(is_in_main_thread());
+        E2D_ASSERT(indices.size() > 0);
         E2D_ASSERT(indices.size() % decl.bytes_per_index() == 0);
 
         if ( !is_index_supported(decl) ) {
@@ -730,6 +731,7 @@ namespace e2d
         vertex_buffer::usage usage)
     {
         E2D_ASSERT(is_in_main_thread());
+        E2D_ASSERT(vertices.size() > 0);
         E2D_ASSERT(vertices.size() % decl.bytes_per_vertex() == 0);
 
         if ( !is_vertex_supported(decl) ) {
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_batcher.hpp b/sources/enduro2d/high/systems/render_system_impl/render_system_batcher.hpp
index 4f65ce22..5ac238b6 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_batcher.hpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_batcher.hpp
@@ -201,6 +201,9 @@ namespace e2d::render_system_impl
 
     template < typename Index, typename Vertex >
     void batcher<Index, Vertex>::update_index_buffer_() {
+        if ( indices_.empty() ) {
+            return;
+        }
         const std::size_t min_ib_size = indices_.size() * sizeof(indices_[0]);
         if ( index_buffer_ && index_buffer_->buffer_size() >= min_ib_size ) {
             index_buffer_->update(indices_, 0u);
@@ -228,6 +231,9 @@ namespace e2d::render_system_impl
 
     template < typename Index, typename Vertex >
     void batcher<Index, Vertex>::update_vertex_buffer_() {
+        if ( vertices_.empty() ) {
+            return;
+        }
         const std::size_t min_vb_size = vertices_.size() * sizeof(vertices_[0]);
         if ( vertex_buffer_ && vertex_buffer_->buffer_size() >= min_vb_size ) {
             vertex_buffer_->update(vertices_, 0u);
diff --git a/sources/enduro2d/utils/color32.cpp b/sources/enduro2d/utils/color32.cpp
index 0d7cab2b..4adaf6f8 100644
--- a/sources/enduro2d/utils/color32.cpp
+++ b/sources/enduro2d/utils/color32.cpp
@@ -55,10 +55,10 @@ namespace e2d
     }
 
     color32::color32(const color& other) noexcept
-    : r(math::numeric_cast<u8>(math::round(math::saturate(other.r) * 255.f)))
-    , g(math::numeric_cast<u8>(math::round(math::saturate(other.g) * 255.f)))
-    , b(math::numeric_cast<u8>(math::round(math::saturate(other.b) * 255.f)))
-    , a(math::numeric_cast<u8>(math::round(math::saturate(other.a) * 255.f))) {}
+    : r(u8(other.r * 255.0f + 0.5f))
+    , g(u8(other.g * 255.0f + 0.5f))
+    , b(u8(other.b * 255.0f + 0.5f))
+    , a(u8(other.a * 255.0f + 0.5f)) {}
 
     color32::color32(u8 nr, u8 ng, u8 nb, u8 na) noexcept
     : r(nr)

From dab28cb2106a0215924bd84f420b518b511b4068 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Mon, 29 Jul 2019 16:27:24 +0300
Subject: [PATCH 029/108] create label material from system_label

---
 .../enduro2d/high/systems/label_system.cpp    | 45 +++++++++++++++++--
 1 file changed, 42 insertions(+), 3 deletions(-)

diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index c7e38767..ea046917 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -7,7 +7,10 @@
 #include <enduro2d/high/systems/label_system.hpp>
 
 #include <enduro2d/high/components/label.hpp>
+#include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/model_renderer.hpp>
+#include <enduro2d/high/assets/texture_asset.hpp>
+#include <enduro2d/high/assets/shader_asset.hpp>
 
 namespace
 {
@@ -71,10 +74,11 @@ namespace e2d
         ~internal_state() noexcept = default;
 
         void process(ecs::registry& owner) {
-            owner.for_joined_components<label::dirty, label, model_renderer>([](
+            owner.for_joined_components<label::dirty, label, renderer, model_renderer>([](
                 const ecs::const_entity&,
-                label::dirty&,
-                label& l,
+                const label::dirty&,
+                const label& l,
+                renderer& r,
                 model_renderer& mr)
             {
                 vector<v3f> vertices;
@@ -263,6 +267,41 @@ namespace e2d
                 } else {
                     mr.model()->fill(content);
                 }
+
+                if ( r.materials().empty() ) {
+                    str page_file = f.find_page(0)->file;
+                    auto texture_p = the<library>().load_asset<texture_asset>(page_file);
+                    auto shader_p = the<library>().load_asset<shader_asset>("font_shader.json");
+
+                    if ( !texture_p || !shader_p ) {
+                        return;
+                    }
+
+                    const render::sampler_min_filter min_filter = l.filtering()
+                        ? render::sampler_min_filter::linear
+                        : render::sampler_min_filter::nearest;
+                    
+                    const render::sampler_mag_filter mag_filter = l.filtering()
+                        ? render::sampler_mag_filter::linear
+                        : render::sampler_mag_filter::nearest;
+
+                    render::material mat;
+                    mat.properties(render::property_block()
+                        .sampler("u_texture", render::sampler_state()
+                              .texture(texture_p->content())
+                              .min_filter(min_filter)
+                              .mag_filter(mag_filter)))
+                        .add_pass(render::pass_state()
+                            .states(render::state_block()
+                                .capabilities(render::capabilities_state()
+                                    .blending(true)
+                                    .depth_test(false))
+                                .blending(render::blending_state()
+                                    .src_factor(render::blending_factor::src_alpha)
+                                    .dst_factor(render::blending_factor::one_minus_src_alpha)))
+                            .shader(shader_p->content()));
+                    r.materials({material_asset::create(mat)});
+                }
             });
 
             owner.remove_all_components<label::dirty>();

From ad0db0de862d09e6172d9953426ae465b7aee4e3 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Tue, 30 Jul 2019 11:47:24 +0300
Subject: [PATCH 030/108] use vfs for spine

---
 .../high/assets/spine_model_asset.cpp         | 23 ++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
index d0eda81f..a84628ee 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -5,11 +5,12 @@
  ******************************************************************************/
 
 #include <enduro2d/high/assets/spine_model_asset.hpp>
-
 #include <enduro2d/high/assets/json_asset.hpp>
 #include <enduro2d/high/assets/binary_asset.hpp>
 #include <enduro2d/high/assets/texture_asset.hpp>
 
+#include <enduro2d/core/vfs.hpp>
+
 #include <spine/SkeletonJson.h>
 #include <spine/extension.h>
 
@@ -191,8 +192,24 @@ void _spAtlasPage_disposeTexture (spAtlasPage* self) {
 }
 
 char* _spUtil_readFile (const char* path, int* length) {
-    E2D_ASSERT(false);
-    return _spReadFile(path, length);
+    try {
+        input_stream_uptr stream = the<vfs>().read(url(path));
+        if ( !stream ) {
+            throw;
+        }
+        size_t size = stream->length();
+	    char*  data = MALLOC(char, size);
+        size_t readn = 0;
+
+        for ( ; readn < size; ) {
+            readn += stream->read(data + readn, size - readn);
+        }
+        *length = math::numeric_cast<int>(readn);
+        return data;
+    } catch(...) {
+        the<debug>().error("SPINE: Failed to read file");
+    }
+    return nullptr;
 }
 
 namespace e2d

From 1188a179c8bf6f033f544e9a593c61507d370504 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Wed, 31 Jul 2019 15:52:13 +0300
Subject: [PATCH 031/108] new bmfont parsing

---
 sources/enduro2d/utils/font.cpp | 252 ++++++++++++++++++--------------
 1 file changed, 140 insertions(+), 112 deletions(-)

diff --git a/sources/enduro2d/utils/font.cpp b/sources/enduro2d/utils/font.cpp
index 544ad10b..2112805a 100644
--- a/sources/enduro2d/utils/font.cpp
+++ b/sources/enduro2d/utils/font.cpp
@@ -10,161 +10,189 @@ namespace
 {
     using namespace e2d;
 
+    class bmfont_loading_exception : public exception {
+        const char* what() const noexcept override {
+            return "bmfont loading exception";
+        }
+    };
+
+    str read_tag(const str& buf, u32& pos) {
+        str res;
+        auto end = buf.find(' ', pos);
+        if ( end == str::npos ) {
+            throw bmfont_loading_exception();
+        } else {
+            res = buf.substr(pos, end - pos);
+            pos = end;
+        }
+
+        return res;
+    }
+
+    bool read_key(const str& buf, u32& pos, str& key) {
+        u32 start_pos = pos;
+        auto end = buf.find('=', pos);
+        if ( end != str::npos ) {
+            auto start = buf.rfind(' ', end);
+            if ( start != str::npos ) {
+                start++;
+                key = buf.substr(start, end - start);
+                pos = end + 1;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    i32 read_int(const str& buf, u32& pos) {
+        i32 res;
+        auto end = buf.find(' ', pos);
+        if ( end == str::npos ) {
+            end = buf.find('\n', pos);
+        }
+
+        if ( end == str::npos ) {
+            throw bmfont_loading_exception();
+        } else {
+            res = std::stoi(buf.substr(pos, end - pos));
+            pos = end;
+        }
+
+        return res;
+    }
+
+    str read_string(const str& buf, u32& pos) {
+        str res;
+        auto start = buf.find('"', pos);
+        if ( start == str::npos ) {
+            throw bmfont_loading_exception();
+        } else {
+            start++;
+            auto end = buf.find('"', start);
+            if ( end == str::npos ) {
+                throw bmfont_loading_exception();
+            } else {
+                res = buf.substr(start, end - start);
+                pos = end + 1;
+            }
+        }
+
+        return res;
+    }
+
     font::data load_font_data(str_view content) {
         str s(content);
         font::data data;
+        u32 pos{0};
+        str line;
+        str tag;
+        str key;
 
-        std::replace(s.begin(), s.end(), '=', ' ');
-        std::replace(s.begin(), s.end(), ',', ' ');
-
-        str tag, line;
-        std::stringstream data_stream(s);
-
-        while ( !data_stream.eof() && std::getline(data_stream, line) ) {
-            std::stringstream line_stream(line);
-            line_stream.exceptions(std::ios::failbit | std::ios::badbit);
-
-            line_stream >> std::ws;
-            if ( line_stream.eof() ) {
-                continue;
-            }
-
-            line_stream >> tag;
+        size_t start_line{0};
+        size_t end_line = s.find('\n', start_line);
+        while ( end_line != str::npos ) {
+            pos = 0;
+            line = s.substr(start_line, end_line - start_line + 1);
+            line[line.size()-1] = '\n';
+            tag = read_tag(line, pos);
             if ( tag == "info" ) {
                 // info face="Arial-Black" size=32 bold=0 italic=0 charset=""
                 //      unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=2,2
-                line_stream >> tag;
-                while ( !line_stream.eof() ) {
-                    if ( tag == "face" ) {
-                        line_stream >> data.info.face;
-                        // remove ""
-                        data.info.face.erase(data.info.face.begin());
-                        data.info.face.pop_back();
-                    } else if ( tag == "size" ) {
-                        line_stream >> data.info.size;
-                    }
-                    if ( !line_stream.eof() ) {
-                        line_stream >> tag;
+                while ( read_key(line, pos, key) ) {
+                    if ( key == "face" ) {
+                        data.info.face = read_string(line, pos);
+                    } else if ( key == "size" ) {
+                        data.info.size = read_int(line, pos);
                     }
                 }
             } else if ( tag == "common" ) {
                 // common lineHeight=54 base=35 scaleW=512 scaleH=512 pages=1 packed=0
-                line_stream >> tag;
-                while ( !line_stream.eof() ) {
-                    if ( tag == "lineHeight" ) {
-                        line_stream >> data.common.line;
-                    } else if ( tag == "base" ) {
-                        line_stream >> data.common.base;
-                    } else if ( tag == "pages" ) {
-                        line_stream >> data.common.pages;
-                        data.pages.reserve(data.common.pages);
-                    } else if ( tag == "scaleW" ) {
-                        line_stream >> data.common.atlas_size.x;
-                    } else if ( tag == "scaleH" ) {
-                        line_stream >> data.common.atlas_size.y;
-                    }
-                    if ( !line_stream.eof() ) {
-                        line_stream >> tag;
+                while ( read_key(line, pos, key) ) {
+                    if ( key == "lineHeight" ) {
+                        data.common.line = read_int(line, pos);
+                    } else if ( key == "base" ) {
+                        data.common.base = read_int(line, pos);
+                    } else if ( key == "scaleW" ) {
+                        data.common.atlas_size.x = read_int(line, pos);
+                    } else if ( key == "scaleH" ) {
+                        data.common.atlas_size.y = read_int(line, pos);
+                    } else if ( key == "pages" ) {
+                        data.common.pages = read_int(line, pos);
                     }
                 }
             } else if ( tag == "page" ) {
                 // page id=0 file="arial.png"
-                line_stream >> tag;
                 font::page_data page_data;
-                while ( !line_stream.eof() ) {
-                    if ( tag == "id" ) {
-                        line_stream >> page_data.id;
-                    } else if ( tag == "file" ) {
-                        line_stream >> page_data.file;
-                        // remove ""
-                        page_data.file.erase(page_data.file.begin());
-                        page_data.file.pop_back();
-                    }
-                    if ( !line_stream.eof() ) {
-                        line_stream >> tag;
+                while ( read_key(line, pos, key) ) {
+                    if ( key == "id" ) {
+                        page_data.id = read_int(line, pos);
+                    } else if ( key == "file" ) {
+                        page_data.file = read_string(line, pos);
                     }
                 }
                 data.pages.insert(std::move(page_data));
             } else if ( tag == "chars" ) {
                 // chars count=95
-                line_stream >> tag;
-                while ( !line_stream.eof() ) {
-                    if ( tag == "count" ) {
-                        std::size_t count{0u};
-                        line_stream >> count;
-                        data.chars.reserve(count);
-                    }
-                    if ( !line_stream.eof() ) {
-                        line_stream >> tag;
+                while ( read_key(line, pos, key) ) {
+                    if ( key == "count" ) {
+                        data.chars.reserve(read_int(line, pos));
                     }
                 }
             } else if ( tag == "char" ) {
                 // char id=123 x=2 y=2 width=38 height=54
                 //      xoffset=0 yoffset=-3 xadvance=12 page=0 chnl=0
-                line_stream >> tag;
                 font::char_data char_data;
-                while ( !line_stream.eof() ) {
-                    if ( tag == "id" ) {
-                        line_stream >> char_data.id;
-                    } else if ( tag == "x" ) {
-                        line_stream >> char_data.rect.position.x;
-                    } else if ( tag == "y" ) {
-                        line_stream >> char_data.rect.position.y;
-                    } else if ( tag == "width" ) {
-                        line_stream >> char_data.rect.size.x;
-                    } else if ( tag == "height" ) {
-                        line_stream >> char_data.rect.size.y;
+                while ( read_key(line, pos, key) ) {
+                    if ( key == "id" ) {
+                        char_data.id = read_int(line, pos);
+                    } else if ( key == "x" ) {
+                        char_data.rect.position.x = read_int(line, pos);
+                    } else if ( key == "y" ) {
+                        char_data.rect.position.y = read_int(line, pos);
+                    } else if ( key == "width" ) {
+                        char_data.rect.size.x = read_int(line, pos);
+                    } else if ( key == "height" ) {
+                        char_data.rect.size.y = read_int(line, pos);
                         char_data.rect.position.y =
                             data.common.atlas_size.y -
                             char_data.rect.position.y -
                             char_data.rect.size.y;
-                    } else if ( tag == "xoffset" ) {
-                        line_stream >> char_data.offset.x;
-                    } else if ( tag == "yoffset" ) {
-                        line_stream >> char_data.offset.y;
-                    } else if ( tag == "xadvance" ) {
-                        line_stream >> char_data.advance;
-                    } else if ( tag == "page" ) {
-                        line_stream >> char_data.page;
-                    } else if ( tag == "chnl" ) {
-                        line_stream >> char_data.chnl;
-                    }
-                    if ( !line_stream.eof() ) {
-                        line_stream >> tag;
+                    } else if ( key == "xoffset" ) {
+                        char_data.offset.x = read_int(line, pos);
+                    } else if ( key == "yoffset" ) {
+                        char_data.offset.y = read_int(line, pos);
+                    } else if ( key == "xadvance" ) {
+                        char_data.advance = read_int(line, pos);
+                    } else if ( key == "page" ) {
+                        char_data.page = read_int(line, pos);
+                    } else if ( key == "chnl" ) {
+                        char_data.chnl = read_int(line, pos);
                     }
                 }
                 data.chars.insert(std::move(char_data));
             } else if ( tag == "kernings" ) {
-                // kernings count=243
-                line_stream >> tag;
-                while ( !line_stream.eof() ) {
-                    if ( tag == "count" ) {
-                        std::size_t count{0u};
-                        line_stream >> count;
-                        data.kernings.reserve(count);
-                    }
-                    if ( !line_stream.eof() ) {
-                        line_stream >> tag;
+                while ( read_key(line, pos, key) ) {
+                    if ( key == "count" ) {
+                        data.kernings.reserve(read_int(line, pos));
                     }
                 }
             } else if ( tag == "kerning" ) {
-                // kerning first=86 second=101 amount=-2
-                line_stream >> tag;
                 font::kerning_data k;
-                while ( !line_stream.eof() ) {
-                    if ( tag == "first" ) {
-                        line_stream >> k.chars.first;
-                    } else if ( tag == "second" ) {
-                        line_stream >> k.chars.second;
-                    } else if ( tag == "amount" ) {
-                        line_stream >> k.amount;
-                    }
-                    if ( !line_stream.eof() ) {
-                        line_stream >> tag;
+                while ( read_key(line, pos, key) ) {
+                    if ( key == "first" ) {
+                        k.chars.first = read_int(line, pos);
+                    } else if ( key == "second" ) {
+                        k.chars.second = read_int(line, pos);
+                    } else if ( key == "amount" ) {
+                        k.amount = read_int(line, pos);
                     }
                 }
                 data.kernings.insert(std::move(k));
             }
+
+            start_line = end_line + 1;
+            end_line = s.find('\n', start_line);
         }
 
         return data;

From 3d3437c4a4889459c934f49d0c49accc06d29c02 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Wed, 31 Jul 2019 18:27:23 +0300
Subject: [PATCH 032/108] changed flat_set to flat_map in fonts chars and
 kernings

---
 headers/enduro2d/utils/font.hpp | 10 +++---
 sources/enduro2d/utils/font.cpp | 61 ++++++++++++++++++++-------------
 2 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/headers/enduro2d/utils/font.hpp b/headers/enduro2d/utils/font.hpp
index 625d8f86..96895299 100644
--- a/headers/enduro2d/utils/font.hpp
+++ b/headers/enduro2d/utils/font.hpp
@@ -42,7 +42,7 @@ namespace e2d
         };
 
         struct kerning_data {
-            std::pair<u32,u32> chars{0,0};
+            std::pair<u32, u32> chars{0,0};
             i32 amount{0};
         };
 
@@ -50,8 +50,8 @@ namespace e2d
             info_data info;
             common_data common;
             flat_set<page_data> pages;
-            flat_set<char_data> chars;
-            flat_set<kerning_data> kernings;
+            flat_map<u32, char_data> chars;
+            flat_map<std::pair<u32, u32>, i32> kernings;
         };
     public:
         font() = default;
@@ -78,8 +78,8 @@ namespace e2d
         const info_data& info() const noexcept;
         const common_data& common() const noexcept;
         const flat_set<page_data>& pages() const noexcept;
-        const flat_set<char_data>& chars() const noexcept;
-        const flat_set<kerning_data>& kernings() const noexcept;
+        const flat_map<u32, char_data>& chars() const noexcept;
+        const flat_map<std::pair<u32, u32>, i32>& kernings() const noexcept;
 
         const page_data* find_page(u32 id) const noexcept;
         const char_data* find_char(u32 id) const noexcept;
diff --git a/sources/enduro2d/utils/font.cpp b/sources/enduro2d/utils/font.cpp
index 2112805a..38712878 100644
--- a/sources/enduro2d/utils/font.cpp
+++ b/sources/enduro2d/utils/font.cpp
@@ -30,7 +30,6 @@ namespace
     }
 
     bool read_key(const str& buf, u32& pos, str& key) {
-        u32 start_pos = pos;
         auto end = buf.find('=', pos);
         if ( end != str::npos ) {
             auto start = buf.rfind(' ', end);
@@ -83,12 +82,16 @@ namespace
 
     font::data load_font_data(str_view content) {
         str s(content);
-        font::data data;
         u32 pos{0};
         str line;
         str tag;
         str key;
+        font::data data;
+        vector<font::char_data> chars;
+        vector<font::kerning_data> kernings;
 
+        chars.reserve(120);
+        kernings.reserve(120);
         size_t start_line{0};
         size_t end_line = s.find('\n', start_line);
         while ( end_line != str::npos ) {
@@ -136,45 +139,45 @@ namespace
                 // chars count=95
                 while ( read_key(line, pos, key) ) {
                     if ( key == "count" ) {
-                        data.chars.reserve(read_int(line, pos));
+                        chars.reserve(read_int(line, pos));
                     }
                 }
             } else if ( tag == "char" ) {
                 // char id=123 x=2 y=2 width=38 height=54
                 //      xoffset=0 yoffset=-3 xadvance=12 page=0 chnl=0
-                font::char_data char_data;
+                font::char_data c;
                 while ( read_key(line, pos, key) ) {
                     if ( key == "id" ) {
-                        char_data.id = read_int(line, pos);
+                        c.id = read_int(line, pos);
                     } else if ( key == "x" ) {
-                        char_data.rect.position.x = read_int(line, pos);
+                        c.rect.position.x = read_int(line, pos);
                     } else if ( key == "y" ) {
-                        char_data.rect.position.y = read_int(line, pos);
+                        c.rect.position.y = read_int(line, pos);
                     } else if ( key == "width" ) {
-                        char_data.rect.size.x = read_int(line, pos);
+                        c.rect.size.x = read_int(line, pos);
                     } else if ( key == "height" ) {
-                        char_data.rect.size.y = read_int(line, pos);
-                        char_data.rect.position.y =
+                        c.rect.size.y = read_int(line, pos);
+                        c.rect.position.y =
                             data.common.atlas_size.y -
-                            char_data.rect.position.y -
-                            char_data.rect.size.y;
+                            c.rect.position.y -
+                            c.rect.size.y;
                     } else if ( key == "xoffset" ) {
-                        char_data.offset.x = read_int(line, pos);
+                        c.offset.x = read_int(line, pos);
                     } else if ( key == "yoffset" ) {
-                        char_data.offset.y = read_int(line, pos);
+                        c.offset.y = read_int(line, pos);
                     } else if ( key == "xadvance" ) {
-                        char_data.advance = read_int(line, pos);
+                        c.advance = read_int(line, pos);
                     } else if ( key == "page" ) {
-                        char_data.page = read_int(line, pos);
+                        c.page = read_int(line, pos);
                     } else if ( key == "chnl" ) {
-                        char_data.chnl = read_int(line, pos);
+                        c.chnl = read_int(line, pos);
                     }
                 }
-                data.chars.insert(std::move(char_data));
+                chars.push_back(std::move(c));
             } else if ( tag == "kernings" ) {
                 while ( read_key(line, pos, key) ) {
                     if ( key == "count" ) {
-                        data.kernings.reserve(read_int(line, pos));
+                        kernings.reserve(read_int(line, pos));
                     }
                 }
             } else if ( tag == "kerning" ) {
@@ -188,13 +191,23 @@ namespace
                         k.amount = read_int(line, pos);
                     }
                 }
-                data.kernings.insert(std::move(k));
+                kernings.push_back(std::move(k));
             }
 
             start_line = end_line + 1;
             end_line = s.find('\n', start_line);
         }
 
+        data.chars.reserve(chars.size());
+        for ( size_t i = 0; i < chars.size(); i++ ) {
+            data.chars.insert(std::make_pair(chars[i].id, chars[i]));
+        }
+
+        data.kernings.reserve(kernings.size());
+        for ( size_t i = 0; i < kernings.size(); i++ ) {
+            data.kernings.insert(std::make_pair(kernings[i].chars, kernings[i].amount));
+        }
+
         return data;
     }
 }
@@ -279,11 +292,11 @@ namespace e2d
         return data_.pages;
     }
 
-    const flat_set<font::char_data>& font::chars() const noexcept {
+    const flat_map<u32, font::char_data>& font::chars() const noexcept {
         return data_.chars;
     }
 
-    const flat_set<font::kerning_data>& font::kernings() const noexcept {
+    const flat_map<std::pair<u32, u32>, i32>& font::kernings() const noexcept {
         return data_.kernings;
     }
 
@@ -297,14 +310,14 @@ namespace e2d
     const font::char_data* font::find_char(u32 id) const noexcept {
         const auto iter = data_.chars.find(id);
         return iter != data_.chars.end()
-            ? &*iter
+            ? &iter->second
             : nullptr;
     }
 
     i32 font::get_kerning(u32 first, u32 second) const noexcept {
         const auto iter = data_.kernings.find(std::make_pair(first, second));
         return iter != data_.kernings.end()
-            ? iter->amount
+            ? iter->second
             : 0;
     }
 }

From af0942a371832619c6fed01703a209315305df58 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Wed, 31 Jul 2019 18:35:08 +0300
Subject: [PATCH 033/108] changed kernings key to u64

---
 headers/enduro2d/utils/font.hpp |  4 ++--
 sources/enduro2d/utils/font.cpp | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/headers/enduro2d/utils/font.hpp b/headers/enduro2d/utils/font.hpp
index 96895299..cd447e20 100644
--- a/headers/enduro2d/utils/font.hpp
+++ b/headers/enduro2d/utils/font.hpp
@@ -51,7 +51,7 @@ namespace e2d
             common_data common;
             flat_set<page_data> pages;
             flat_map<u32, char_data> chars;
-            flat_map<std::pair<u32, u32>, i32> kernings;
+            flat_map<u64, i32> kernings;
         };
     public:
         font() = default;
@@ -79,7 +79,7 @@ namespace e2d
         const common_data& common() const noexcept;
         const flat_set<page_data>& pages() const noexcept;
         const flat_map<u32, char_data>& chars() const noexcept;
-        const flat_map<std::pair<u32, u32>, i32>& kernings() const noexcept;
+        const flat_map<u64, i32>& kernings() const noexcept;
 
         const page_data* find_page(u32 id) const noexcept;
         const char_data* find_char(u32 id) const noexcept;
diff --git a/sources/enduro2d/utils/font.cpp b/sources/enduro2d/utils/font.cpp
index 38712878..316e4b4d 100644
--- a/sources/enduro2d/utils/font.cpp
+++ b/sources/enduro2d/utils/font.cpp
@@ -16,6 +16,10 @@ namespace
         }
     };
 
+    inline u64 make_kerning_key(u32 first, u32 second) noexcept {
+        return (static_cast<u64>(first) << 32) | static_cast<u64>(second);
+    }
+
     str read_tag(const str& buf, u32& pos) {
         str res;
         auto end = buf.find(' ', pos);
@@ -205,7 +209,11 @@ namespace
 
         data.kernings.reserve(kernings.size());
         for ( size_t i = 0; i < kernings.size(); i++ ) {
-            data.kernings.insert(std::make_pair(kernings[i].chars, kernings[i].amount));
+            auto& k = kernings[i];
+            data.kernings.insert(
+                std::make_pair(
+                    make_kerning_key(k.chars.first, k.chars.second),
+                    k.amount));
         }
 
         return data;
@@ -296,7 +304,7 @@ namespace e2d
         return data_.chars;
     }
 
-    const flat_map<std::pair<u32, u32>, i32>& font::kernings() const noexcept {
+    const flat_map<u64, i32>& font::kernings() const noexcept {
         return data_.kernings;
     }
 
@@ -315,7 +323,8 @@ namespace e2d
     }
 
     i32 font::get_kerning(u32 first, u32 second) const noexcept {
-        const auto iter = data_.kernings.find(std::make_pair(first, second));
+        u64 key = make_kerning_key(first, second);
+        const auto iter = data_.kernings.find(key);
         return iter != data_.kernings.end()
             ? iter->second
             : 0;

From 22c35892ad1404c30e8aff92a57144ef2f421728 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Fri, 2 Aug 2019 13:01:41 +0300
Subject: [PATCH 034/108] fix font loading for utils test

---
 sources/enduro2d/utils/font.cpp | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/sources/enduro2d/utils/font.cpp b/sources/enduro2d/utils/font.cpp
index 316e4b4d..8ac81346 100644
--- a/sources/enduro2d/utils/font.cpp
+++ b/sources/enduro2d/utils/font.cpp
@@ -23,9 +23,7 @@ namespace
     str read_tag(const str& buf, u32& pos) {
         str res;
         auto end = buf.find(' ', pos);
-        if ( end == str::npos ) {
-            throw bmfont_loading_exception();
-        } else {
+        if ( end != str::npos ) {
             res = buf.substr(pos, end - pos);
             pos = end;
         }
@@ -49,7 +47,7 @@ namespace
     }
 
     i32 read_int(const str& buf, u32& pos) {
-        i32 res;
+        i32 res{0};
         auto end = buf.find(' ', pos);
         if ( end == str::npos ) {
             end = buf.find('\n', pos);
@@ -94,6 +92,10 @@ namespace
         vector<font::char_data> chars;
         vector<font::kerning_data> kernings;
 
+        if (s.back() != '\n') {
+            s.push_back('\n');
+        }
+
         chars.reserve(120);
         kernings.reserve(120);
         size_t start_line{0};
@@ -101,7 +103,6 @@ namespace
         while ( end_line != str::npos ) {
             pos = 0;
             line = s.substr(start_line, end_line - start_line + 1);
-            line[line.size()-1] = '\n';
             tag = read_tag(line, pos);
             if ( tag == "info" ) {
                 // info face="Arial-Black" size=32 bold=0 italic=0 charset=""
@@ -197,11 +198,14 @@ namespace
                 }
                 kernings.push_back(std::move(k));
             }
-
-            start_line = end_line + 1;
+            start_line = s.find_first_not_of(' ', end_line + 1);
             end_line = s.find('\n', start_line);
         }
 
+        if (chars.empty()) {
+            throw bmfont_loading_exception();
+        }
+
         data.chars.reserve(chars.size());
         for ( size_t i = 0; i < chars.size(); i++ ) {
             data.chars.insert(std::make_pair(chars[i].id, chars[i]));

From 4cde0582aa21f45aecf5e8e053d809fe4df6b614 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Fri, 2 Aug 2019 15:07:35 +0300
Subject: [PATCH 035/108] updated material creation for font

---
 .../enduro2d/high/systems/label_system.cpp    | 25 +++++--------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index ea046917..c861dc3e 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -268,12 +268,10 @@ namespace e2d
                     mr.model()->fill(content);
                 }
 
-                if ( r.materials().empty() ) {
+                if ( r.materials().front()->content().properties().sampler_count() == 0 ) {
                     str page_file = f.find_page(0)->file;
                     auto texture_p = the<library>().load_asset<texture_asset>(page_file);
-                    auto shader_p = the<library>().load_asset<shader_asset>("font_shader.json");
-
-                    if ( !texture_p || !shader_p ) {
+                    if ( !texture_p ) {
                         return;
                     }
 
@@ -285,22 +283,11 @@ namespace e2d
                         ? render::sampler_mag_filter::linear
                         : render::sampler_mag_filter::nearest;
 
-                    render::material mat;
-                    mat.properties(render::property_block()
+                    r.properties(render::property_block()
                         .sampler("u_texture", render::sampler_state()
-                              .texture(texture_p->content())
-                              .min_filter(min_filter)
-                              .mag_filter(mag_filter)))
-                        .add_pass(render::pass_state()
-                            .states(render::state_block()
-                                .capabilities(render::capabilities_state()
-                                    .blending(true)
-                                    .depth_test(false))
-                                .blending(render::blending_state()
-                                    .src_factor(render::blending_factor::src_alpha)
-                                    .dst_factor(render::blending_factor::one_minus_src_alpha)))
-                            .shader(shader_p->content()));
-                    r.materials({material_asset::create(mat)});
+                            .texture(texture_p->content())
+                            .min_filter(min_filter)
+                            .mag_filter(mag_filter)));
                 }
             });
 

From 3a00702b676375879b4c539365dbd58458ef21c2 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Fri, 2 Aug 2019 17:59:14 +0300
Subject: [PATCH 036/108] _spUtil_readFile now uses library module instead of
 vfs

---
 .../high/assets/spine_model_asset.cpp         | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
index a84628ee..cbcf8fee 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -9,7 +9,6 @@
 #include <enduro2d/high/assets/binary_asset.hpp>
 #include <enduro2d/high/assets/texture_asset.hpp>
 
-#include <enduro2d/core/vfs.hpp>
 
 #include <spine/SkeletonJson.h>
 #include <spine/extension.h>
@@ -172,7 +171,7 @@ namespace
     }
 }
 
-void _spAtlasPage_createTexture (spAtlasPage* self, const char* path) {
+extern "C" void _spAtlasPage_createTexture (spAtlasPage* self, const char* path) {
     try {
         texture_asset::load_result texture = the<library>().load_asset<texture_asset>(path);
         if ( !texture ) {
@@ -186,25 +185,26 @@ void _spAtlasPage_createTexture (spAtlasPage* self, const char* path) {
     }
 }
 
-void _spAtlasPage_disposeTexture (spAtlasPage* self) {
-    // acquire by smart pointer and release
-    texture_asset::ptr(static_cast<texture_asset*>(self->rendererObject), false);
+extern "C" void _spAtlasPage_disposeTexture (spAtlasPage* self) {
+    // decrease ref counter
+    E2D_UNUSED(texture_asset::ptr(static_cast<texture_asset*>(self->rendererObject), false));
 }
 
-char* _spUtil_readFile (const char* path, int* length) {
+extern "C" char* _spUtil_readFile (const char* path, int* length) {
     try {
-        input_stream_uptr stream = the<vfs>().read(url(path));
-        if ( !stream ) {
+        binary_asset::load_result file = the<library>().load_asset<binary_asset>(path);
+        if ( !file ) {
             throw;
         }
-        size_t size = stream->length();
-	    char*  data = MALLOC(char, size);
-        size_t readn = 0;
-
-        for ( ; readn < size; ) {
-            readn += stream->read(data + readn, size - readn);
+        if ( file->content().size() > std::numeric_limits<int>::max() ) {
+            throw;
         }
-        *length = math::numeric_cast<int>(readn);
+        *length = math::numeric_cast<int>(file->content().size());
+	    char*  data = MALLOC(char, *length);
+        if ( !data ) {
+            throw;
+        }
+        memcpy(data, file->content().data(), *length);
         return data;
     } catch(...) {
         the<debug>().error("SPINE: Failed to read file");

From 19a5670f4cc174e4aeeeb61f90a0f7f8897bad58 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Fri, 2 Aug 2019 18:00:14 +0300
Subject: [PATCH 037/108] load binary skeleton

---
 .../high/assets/spine_model_asset.cpp         | 72 ++++++++++++++-----
 1 file changed, 53 insertions(+), 19 deletions(-)

diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
index cbcf8fee..a29fbdfd 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -9,8 +9,8 @@
 #include <enduro2d/high/assets/binary_asset.hpp>
 #include <enduro2d/high/assets/texture_asset.hpp>
 
-
 #include <spine/SkeletonJson.h>
+#include <spine/SkeletonBinary.h>
 #include <spine/extension.h>
 
 using namespace e2d;
@@ -115,7 +115,7 @@ namespace
         const rapidjson::Value& root)
     {
         using skeleton_json_ptr = std::unique_ptr<spSkeletonJson, void(*)(spSkeletonJson*)>;
-        stdex::promise<spine_model> result;
+        using skeleton_bin_ptr = std::unique_ptr<spSkeletonBinary, void(*)(spSkeletonBinary*)>;
 
         E2D_ASSERT(root.HasMember("atlas") && root["atlas"].IsString());
         binary_asset::load_result atlas_data = library.load_asset<binary_asset>(
@@ -135,17 +135,55 @@ namespace
             }
         }
 
-        skeleton_json_ptr skeleton_json(spSkeletonJson_create(atlas.get()), spSkeletonJson_dispose);
-        skeleton_json->scale = skeleton_scale;
-
         E2D_ASSERT(root.HasMember("skeleton") && root["skeleton"].IsString());
-        binary_asset::load_result skeleton_data = library.load_asset<binary_asset>(
-            path::combine(parent_address, root["skeleton"].GetString()));
-        spine_model::skeleton_data_ptr skeleton(
-            spSkeletonJson_readSkeletonData(
-                skeleton_json.get(),
-                reinterpret_cast<const char*>(skeleton_data->content().data())),
-            spSkeletonData_dispose);
+        const str ext = path::extension(root["skeleton"].GetString());
+        spine_model::skeleton_data_ptr skeleton;
+
+        if ( ext == ".skel" ) {
+	        skeleton_bin_ptr skeleton_binary(
+                spSkeletonBinary_create(atlas.get()),
+                spSkeletonBinary_dispose);
+            skeleton_binary->scale = skeleton_scale;
+
+            binary_asset::load_result skeleton_data = library.load_asset<binary_asset>(
+                path::combine(parent_address, root["skeleton"].GetString()));
+            skeleton = spine_model::skeleton_data_ptr(
+                spSkeletonBinary_readSkeletonData(
+                    skeleton_binary.get(),
+                    reinterpret_cast<const unsigned char*>(skeleton_data->content().data()),
+                    math::numeric_cast<int>(skeleton_data->content().size())),
+                spSkeletonData_dispose);
+
+            if ( !skeleton ) {
+                the<debug>().error("SPINE: Failed to read skeleton binary data:\n"
+                    "--> Error: $s",
+                    skeleton_binary->error);
+                return stdex::make_rejected_promise<spine_model>(
+                    spine_model_asset_loading_exception());
+            }
+        } else {
+            skeleton_json_ptr skeleton_json(
+                spSkeletonJson_create(atlas.get()),
+                spSkeletonJson_dispose);
+            skeleton_json->scale = skeleton_scale;
+
+            binary_asset::load_result skeleton_data = library.load_asset<binary_asset>(
+                path::combine(parent_address, root["skeleton"].GetString()));
+            skeleton = spine_model::skeleton_data_ptr(
+                spSkeletonJson_readSkeletonData(
+                    skeleton_json.get(),
+                    reinterpret_cast<const char*>(skeleton_data->content().data())),
+                spSkeletonData_dispose);
+
+            if ( !skeleton ) {
+                the<debug>().error("SPINE: Failed to read skeleton json data:\n"
+                    "--> Error: $s",
+                    skeleton_json->error);
+                return stdex::make_rejected_promise<spine_model>(
+                    spine_model_asset_loading_exception());
+            }
+        }
+
 
         bool pma = false;
         if ( root.HasMember("premultiplied_alpha") ) {
@@ -161,13 +199,12 @@ namespace
         if ( root.HasMember("mix_animations") ) {
             const auto& mix_animations_json = root["mix_animations"];
             if ( !parse_mix_animations(mix_animations_json, content) ) {
-                result.reject(spine_model_asset_loading_exception());
-                return result;
+                return stdex::make_rejected_promise<spine_model>(
+                    spine_model_asset_loading_exception());
             }
         }
 
-        result.resolve(std::move(content));
-        return result;
+        return stdex::make_resolved_promise(std::move(content));
     }
 }
 
@@ -246,9 +283,6 @@ namespace e2d
 
                 throw spine_model_asset_loading_exception();
             })
-            .except([](auto&){
-                E2D_ASSERT(false);
-            })
             .then([&library, parent_address, spine_data](){
                 return parse_spine_model(
                     library, parent_address, *spine_data->content());

From a1da012f4bed1a04d052cf2adedcca3aed0f80a7 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Fri, 2 Aug 2019 18:00:51 +0300
Subject: [PATCH 038/108] load spine renderer component from json

---
 .../high/components/spine_renderer.hpp        |  3 +-
 .../high/components/spine_renderer.cpp        | 71 +++++++++++++++++--
 2 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/headers/enduro2d/high/components/spine_renderer.hpp b/headers/enduro2d/high/components/spine_renderer.hpp
index 431776b3..fcf2d9e2 100644
--- a/headers/enduro2d/high/components/spine_renderer.hpp
+++ b/headers/enduro2d/high/components/spine_renderer.hpp
@@ -26,7 +26,8 @@ namespace e2d
     public:
         spine_renderer() = default;
         spine_renderer(const spine_model_asset::ptr& model);
-
+        
+        spine_renderer& model(const spine_model_asset::ptr& value);
         spine_renderer& skin(const str& value);
         spine_renderer& attachment(const str& slot, const str& name);
 
diff --git a/sources/enduro2d/high/components/spine_renderer.cpp b/sources/enduro2d/high/components/spine_renderer.cpp
index ef230d71..41f7499b 100644
--- a/sources/enduro2d/high/components/spine_renderer.cpp
+++ b/sources/enduro2d/high/components/spine_renderer.cpp
@@ -11,16 +11,21 @@
 
 namespace e2d
 {
-    spine_renderer::spine_renderer(const spine_model_asset::ptr& model)
-    : model_(model) {
-        E2D_ASSERT(model_);
-        E2D_ASSERT(model_->content().skeleton());
-        E2D_ASSERT(model_->content().atlas());
+    spine_renderer::spine_renderer(const spine_model_asset::ptr& model) {
+        this->model(model);
+    }
+    
+    spine_renderer& spine_renderer::model(const spine_model_asset::ptr& value) {
+        E2D_ASSERT(value);
+        E2D_ASSERT(value->content().skeleton());
+        E2D_ASSERT(value->content().atlas());
+        model_ = value;
 
         skeleton_ = skeleton_ptr(spSkeleton_create(model_->content().skeleton().get()), spSkeleton_dispose);
         clipping_ = clipping_ptr(spSkeletonClipping_create(), spSkeletonClipping_dispose);
+        return *this;
     }
-    
+
     spine_renderer& spine_renderer::skin(const str& value) {
         spSkeleton_setSkinByName(skeleton_.get(), value.empty() ? nullptr : value.c_str());
         return *this;
@@ -58,7 +63,26 @@ namespace e2d
         "additionalProperties" : false,
         "properties" : {
             "model" : { "$ref": "#/common_definitions/address" },
-            "skin" : { "$ref": "#/common_definitions/name" }
+            "skin" : { "$ref": "#/common_definitions/name" },
+            "attachments" : {
+                "type" : "array",
+                "items" : { "$ref": "#/definitions/spine_attachment_array" }
+            }
+        },
+        "definitions" : {
+            "spine_attachment_array" : {
+                "type" : "array",
+                "items" : { "$ref": "#/definitions/spine_attachment" }
+            },
+            "spine_attachment" : {
+                "type" : "object",
+                "required" : [ "slot", "name" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "slot" : { "$ref": "#/common_definitions/name" },
+                    "name" : { "$ref": "#/common_definitions/name" }
+                }
+            }
         }
     })json";
     
@@ -66,6 +90,29 @@ namespace e2d
         spine_renderer& component,
         const fill_context& ctx) const
     {
+        if ( ctx.root.HasMember("model") ) {
+            auto model = ctx.dependencies.find_asset<spine_model_asset>(
+                path::combine(ctx.parent_address, ctx.root["model"].GetString()));
+            if ( !model ) {
+                the<debug>().error("SPINE RENDERER: Dependency 'model' is not found:\n"
+                    "--> Parent address: %s\n"
+                    "--> Dependency address: $s",
+                    ctx.parent_address,
+                    ctx.root["model"].GetString());
+                return false;
+            }
+            component.model(model);
+        }
+
+        if ( ctx.root.HasMember("skin") ) {
+            str skin;
+            if ( !json_utils::try_parse_value(ctx.root["skin"], skin) ) {
+                the<debug>().error("SPINE RENDERER: Incorrect formatting of 'skin' property");
+                return false;
+            }
+            component.skin(skin);
+        }
+
         return false;
     }
 
@@ -73,6 +120,16 @@ namespace e2d
         asset_dependencies& dependencies,
         const collect_context& ctx) const
     {
+        if ( ctx.root.HasMember("model") ) {
+            dependencies.add_dependency<spine_model_asset>(
+                path::combine(ctx.parent_address, ctx.root["model"].GetString()));
+        }
+        
+        if ( ctx.root.HasMember("skin") ) {
+            dependencies.add_dependency<spine_model_asset>(
+                path::combine(ctx.parent_address, ctx.root["skin"].GetString()));
+        }
+
         return false;
     }
 }

From ba989c6034f37434f4a5d29dc285faa3672fc7e6 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Fri, 2 Aug 2019 18:31:47 +0300
Subject: [PATCH 039/108] changed str to str_view, stoi to try_parse

---
 sources/enduro2d/utils/font.cpp | 225 ++++++++++++++++----------------
 1 file changed, 113 insertions(+), 112 deletions(-)

diff --git a/sources/enduro2d/utils/font.cpp b/sources/enduro2d/utils/font.cpp
index 8ac81346..fa5d7474 100644
--- a/sources/enduro2d/utils/font.cpp
+++ b/sources/enduro2d/utils/font.cpp
@@ -5,10 +5,12 @@
  ******************************************************************************/
 
 #include <enduro2d/utils/font.hpp>
+#include <enduro2d/utils/strings.hpp>
 
 namespace
 {
     using namespace e2d;
+    using namespace e2d::strings;
 
     class bmfont_loading_exception : public exception {
         const char* what() const noexcept override {
@@ -20,10 +22,10 @@ namespace
         return (static_cast<u64>(first) << 32) | static_cast<u64>(second);
     }
 
-    str read_tag(const str& buf, u32& pos) {
-        str res;
+    str_view read_tag(str_view buf, u32& pos) {
+        str_view res;
         auto end = buf.find(' ', pos);
-        if ( end != str::npos ) {
+        if ( end != str_view::npos ) {
             res = buf.substr(pos, end - pos);
             pos = end;
         }
@@ -31,11 +33,11 @@ namespace
         return res;
     }
 
-    bool read_key(const str& buf, u32& pos, str& key) {
+    bool read_key(str_view buf, u32& pos, str& key) {
         auto end = buf.find('=', pos);
-        if ( end != str::npos ) {
+        if ( end != str_view::npos ) {
             auto start = buf.rfind(' ', end);
-            if ( start != str::npos ) {
+            if ( start != str_view::npos ) {
                 start++;
                 key = buf.substr(start, end - start);
                 pos = end + 1;
@@ -46,32 +48,34 @@ namespace
         return false;
     }
 
-    i32 read_int(const str& buf, u32& pos) {
+    i32 read_int(str_view buf, u32& pos) {
         i32 res{0};
         auto end = buf.find(' ', pos);
-        if ( end == str::npos ) {
+        if ( end == str_view::npos ) {
             end = buf.find('\n', pos);
         }
 
-        if ( end == str::npos ) {
+        if ( end == str_view::npos ) {
             throw bmfont_loading_exception();
         } else {
-            res = std::stoi(buf.substr(pos, end - pos));
+            if ( !try_parse(buf.substr(pos, end - pos), res) ) {
+                throw bmfont_loading_exception();
+            }
             pos = end;
         }
 
         return res;
     }
 
-    str read_string(const str& buf, u32& pos) {
-        str res;
+    str_view read_string(const str_view& buf, u32& pos) {
+        str_view res;
         auto start = buf.find('"', pos);
-        if ( start == str::npos ) {
+        if ( start == str_view::npos ) {
             throw bmfont_loading_exception();
         } else {
             start++;
             auto end = buf.find('"', start);
-            if ( end == str::npos ) {
+            if ( end == str_view::npos ) {
                 throw bmfont_loading_exception();
             } else {
                 res = buf.substr(start, end - start);
@@ -83,123 +87,120 @@ namespace
     }
 
     font::data load_font_data(str_view content) {
-        str s(content);
         u32 pos{0};
-        str line;
-        str tag;
+        str_view line;
+        str_view tag;
         str key;
         font::data data;
         vector<font::char_data> chars;
         vector<font::kerning_data> kernings;
 
-        if (s.back() != '\n') {
-            s.push_back('\n');
-        }
-
         chars.reserve(120);
         kernings.reserve(120);
         size_t start_line{0};
-        size_t end_line = s.find('\n', start_line);
-        while ( end_line != str::npos ) {
+        size_t end_line = content.find('\n', start_line);
+        while ( end_line != str_view::npos ) {
             pos = 0;
-            line = s.substr(start_line, end_line - start_line + 1);
-            tag = read_tag(line, pos);
-            if ( tag == "info" ) {
-                // info face="Arial-Black" size=32 bold=0 italic=0 charset=""
-                //      unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=2,2
-                while ( read_key(line, pos, key) ) {
-                    if ( key == "face" ) {
-                        data.info.face = read_string(line, pos);
-                    } else if ( key == "size" ) {
-                        data.info.size = read_int(line, pos);
+            line = content.substr(start_line, end_line - start_line + 1);
+            if ( !line.empty() ) {
+                tag = read_tag(line, pos);
+                if ( tag == "info" ) {
+                    // info face="Arial-Black" size=32 bold=0 italic=0 charset=""
+                    //      unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=2,2
+                    while ( read_key(line, pos, key) ) {
+                        if ( key == "face" ) {
+                            data.info.face = read_string(line, pos);
+                        } else if ( key == "size" ) {
+                            data.info.size = read_int(line, pos);
+                        }
                     }
-                }
-            } else if ( tag == "common" ) {
-                // common lineHeight=54 base=35 scaleW=512 scaleH=512 pages=1 packed=0
-                while ( read_key(line, pos, key) ) {
-                    if ( key == "lineHeight" ) {
-                        data.common.line = read_int(line, pos);
-                    } else if ( key == "base" ) {
-                        data.common.base = read_int(line, pos);
-                    } else if ( key == "scaleW" ) {
-                        data.common.atlas_size.x = read_int(line, pos);
-                    } else if ( key == "scaleH" ) {
-                        data.common.atlas_size.y = read_int(line, pos);
-                    } else if ( key == "pages" ) {
-                        data.common.pages = read_int(line, pos);
+                } else if ( tag == "common" ) {
+                    // common lineHeight=54 base=35 scaleW=512 scaleH=512 pages=1 packed=0
+                    while ( read_key(line, pos, key) ) {
+                        if ( key == "lineHeight" ) {
+                            data.common.line = read_int(line, pos);
+                        } else if ( key == "base" ) {
+                            data.common.base = read_int(line, pos);
+                        } else if ( key == "scaleW" ) {
+                            data.common.atlas_size.x = read_int(line, pos);
+                        } else if ( key == "scaleH" ) {
+                            data.common.atlas_size.y = read_int(line, pos);
+                        } else if ( key == "pages" ) {
+                            data.common.pages = read_int(line, pos);
+                        }
                     }
-                }
-            } else if ( tag == "page" ) {
-                // page id=0 file="arial.png"
-                font::page_data page_data;
-                while ( read_key(line, pos, key) ) {
-                    if ( key == "id" ) {
-                        page_data.id = read_int(line, pos);
-                    } else if ( key == "file" ) {
-                        page_data.file = read_string(line, pos);
+                } else if ( tag == "page" ) {
+                    // page id=0 file="arial.png"
+                    font::page_data page_data;
+                    while ( read_key(line, pos, key) ) {
+                        if ( key == "id" ) {
+                            page_data.id = read_int(line, pos);
+                        } else if ( key == "file" ) {
+                            page_data.file = read_string(line, pos);
+                        }
                     }
-                }
-                data.pages.insert(std::move(page_data));
-            } else if ( tag == "chars" ) {
-                // chars count=95
-                while ( read_key(line, pos, key) ) {
-                    if ( key == "count" ) {
-                        chars.reserve(read_int(line, pos));
+                    data.pages.insert(std::move(page_data));
+                } else if ( tag == "chars" ) {
+                    // chars count=95
+                    while ( read_key(line, pos, key) ) {
+                        if ( key == "count" ) {
+                            chars.reserve(read_int(line, pos));
+                        }
                     }
-                }
-            } else if ( tag == "char" ) {
-                // char id=123 x=2 y=2 width=38 height=54
-                //      xoffset=0 yoffset=-3 xadvance=12 page=0 chnl=0
-                font::char_data c;
-                while ( read_key(line, pos, key) ) {
-                    if ( key == "id" ) {
-                        c.id = read_int(line, pos);
-                    } else if ( key == "x" ) {
-                        c.rect.position.x = read_int(line, pos);
-                    } else if ( key == "y" ) {
-                        c.rect.position.y = read_int(line, pos);
-                    } else if ( key == "width" ) {
-                        c.rect.size.x = read_int(line, pos);
-                    } else if ( key == "height" ) {
-                        c.rect.size.y = read_int(line, pos);
-                        c.rect.position.y =
-                            data.common.atlas_size.y -
-                            c.rect.position.y -
-                            c.rect.size.y;
-                    } else if ( key == "xoffset" ) {
-                        c.offset.x = read_int(line, pos);
-                    } else if ( key == "yoffset" ) {
-                        c.offset.y = read_int(line, pos);
-                    } else if ( key == "xadvance" ) {
-                        c.advance = read_int(line, pos);
-                    } else if ( key == "page" ) {
-                        c.page = read_int(line, pos);
-                    } else if ( key == "chnl" ) {
-                        c.chnl = read_int(line, pos);
+                } else if ( tag == "char" ) {
+                    // char id=123 x=2 y=2 width=38 height=54
+                    //      xoffset=0 yoffset=-3 xadvance=12 page=0 chnl=0
+                    font::char_data c;
+                    while ( read_key(line, pos, key) ) {
+                        if ( key == "id" ) {
+                            c.id = read_int(line, pos);
+                        } else if ( key == "x" ) {
+                            c.rect.position.x = read_int(line, pos);
+                        } else if ( key == "y" ) {
+                            c.rect.position.y = read_int(line, pos);
+                        } else if ( key == "width" ) {
+                            c.rect.size.x = read_int(line, pos);
+                        } else if ( key == "height" ) {
+                            c.rect.size.y = read_int(line, pos);
+                            c.rect.position.y =
+                                data.common.atlas_size.y -
+                                c.rect.position.y -
+                                c.rect.size.y;
+                        } else if ( key == "xoffset" ) {
+                            c.offset.x = read_int(line, pos);
+                        } else if ( key == "yoffset" ) {
+                            c.offset.y = read_int(line, pos);
+                        } else if ( key == "xadvance" ) {
+                            c.advance = read_int(line, pos);
+                        } else if ( key == "page" ) {
+                            c.page = read_int(line, pos);
+                        } else if ( key == "chnl" ) {
+                            c.chnl = read_int(line, pos);
+                        }
                     }
-                }
-                chars.push_back(std::move(c));
-            } else if ( tag == "kernings" ) {
-                while ( read_key(line, pos, key) ) {
-                    if ( key == "count" ) {
-                        kernings.reserve(read_int(line, pos));
+                    chars.push_back(std::move(c));
+                } else if ( tag == "kernings" ) {
+                    while ( read_key(line, pos, key) ) {
+                        if ( key == "count" ) {
+                            kernings.reserve(read_int(line, pos));
+                        }
                     }
-                }
-            } else if ( tag == "kerning" ) {
-                font::kerning_data k;
-                while ( read_key(line, pos, key) ) {
-                    if ( key == "first" ) {
-                        k.chars.first = read_int(line, pos);
-                    } else if ( key == "second" ) {
-                        k.chars.second = read_int(line, pos);
-                    } else if ( key == "amount" ) {
-                        k.amount = read_int(line, pos);
+                } else if ( tag == "kerning" ) {
+                    font::kerning_data k;
+                    while ( read_key(line, pos, key) ) {
+                        if ( key == "first" ) {
+                            k.chars.first = read_int(line, pos);
+                        } else if ( key == "second" ) {
+                            k.chars.second = read_int(line, pos);
+                        } else if ( key == "amount" ) {
+                            k.amount = read_int(line, pos);
+                        }
                     }
+                    kernings.push_back(std::move(k));
                 }
-                kernings.push_back(std::move(k));
             }
-            start_line = s.find_first_not_of(' ', end_line + 1);
-            end_line = s.find('\n', start_line);
+            start_line = content.find_first_not_of(' ', end_line + 1);
+            end_line = content.find('\n', start_line);
         }
 
         if (chars.empty()) {

From e442d40d6edcbe59a98a2c9009e0076eecdaf9ab Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Fri, 2 Aug 2019 18:32:25 +0300
Subject: [PATCH 040/108] minor fix label_system

---
 sources/enduro2d/high/systems/label_system.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index c861dc3e..c37763b5 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -268,7 +268,8 @@ namespace e2d
                     mr.model()->fill(content);
                 }
 
-                if ( r.materials().front()->content().properties().sampler_count() == 0 ) {
+                if ( r.materials().size() > 0 &&
+                     r.materials().front()->content().properties().sampler_count() == 0 ) {
                     str page_file = f.find_page(0)->file;
                     auto texture_p = the<library>().load_asset<texture_asset>(page_file);
                     if ( !texture_p ) {

From 6726417ad8eaf97cfd0c9496a499d3d8baa29855 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Fri, 2 Aug 2019 18:33:41 +0300
Subject: [PATCH 041/108] updated fonts shader and material

---
 samples/bin/library/font_material.json | 7 +------
 samples/bin/library/font_shader.frag   | 2 --
 samples/bin/library/font_shader.vert   | 2 --
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/samples/bin/library/font_material.json b/samples/bin/library/font_material.json
index d16987f8..13216dd9 100644
--- a/samples/bin/library/font_material.json
+++ b/samples/bin/library/font_material.json
@@ -12,10 +12,5 @@
             }
         }
     }],
-    "property_block" : {
-        "samplers" : [{
-            "name" : "u_texture",
-            "texture" : "bmruen.png"
-        }]
-    }
+    "property_block" : {}
 }
diff --git a/samples/bin/library/font_shader.frag b/samples/bin/library/font_shader.frag
index a04c8752..c6b20f0a 100644
--- a/samples/bin/library/font_shader.frag
+++ b/samples/bin/library/font_shader.frag
@@ -1,5 +1,3 @@
-#version 120
-
 uniform sampler2D u_texture;
 
 varying vec2 v_st0;
diff --git a/samples/bin/library/font_shader.vert b/samples/bin/library/font_shader.vert
index 0e2e9922..321b34fe 100644
--- a/samples/bin/library/font_shader.vert
+++ b/samples/bin/library/font_shader.vert
@@ -1,5 +1,3 @@
-#version 120
-
 uniform mat4 u_matrix_m;
 uniform mat4 u_matrix_vp;
 

From 614a9606a162668776a922d3ee8cb09cb0554757 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Fri, 2 Aug 2019 19:25:04 +0300
Subject: [PATCH 042/108] fixed clipping

---
 .../render_system_drawer.cpp                  | 136 +++++++++++-------
 .../render_system_drawer.hpp                  |   7 +-
 2 files changed, 84 insertions(+), 59 deletions(-)

diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index 3fce9f74..c6933761 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -29,6 +29,24 @@ namespace
     const str_hash matrix_mvp_property_hash = "u_matrix_mvp";
     const str_hash game_time_property_hash = "u_game_time";
     const str_hash sprite_texture_sampler_hash = "u_texture";
+
+    const render::blending_state blend_normal = render::blending_state()
+        .factor(render::blending_factor::src_alpha, render::blending_factor::one_minus_src_alpha);
+    const render::blending_state blend_additive = render::blending_state()
+        .factor(render::blending_factor::src_alpha, render::blending_factor::one);
+    const render::blending_state blend_multiply = render::blending_state()
+        .factor(render::blending_factor::dst_color, render::blending_factor::one_minus_src_alpha);
+    const render::blending_state blend_screen = render::blending_state()
+        .factor(render::blending_factor::one, render::blending_factor::one_minus_src_color);
+    
+    const render::blending_state blend_normal_pma = render::blending_state()
+        .factor(render::blending_factor::one, render::blending_factor::one_minus_src_alpha);
+    const render::blending_state blend_additive_pma = render::blending_state()
+        .factor(render::blending_factor::one, render::blending_factor::one);
+    const render::blending_state blend_multiply_pma = render::blending_state()
+        .factor(render::blending_factor::dst_color, render::blending_factor::one_minus_src_alpha);
+    const render::blending_state blend_screen_pma = render::blending_state()
+        .factor(render::blending_factor::one, render::blending_factor::one_minus_src_color);
 }
 
 namespace e2d::render_system_impl
@@ -42,11 +60,9 @@ namespace e2d::render_system_impl
         const const_node_iptr& cam_n,
         engine& engine,
         render& render,
-        batcher_type& batcher,
-        std::vector<batcher_type::vertex_type>& spine_vertices)
+        batcher_type& batcher)
     : render_(render)
     , batcher_(batcher)
-    , spine_vertices_(spine_vertices)
     {
         const m4f& cam_w = cam_n
             ? cam_n->world_matrix()
@@ -232,8 +248,9 @@ namespace e2d::render_system_impl
         const renderer& node_r,
         const spine_renderer& spine_r)
     {
-        static_assert(sizeof(batcher_type::vertex_type) % sizeof(float) == 0, "invalid stride");
-        constexpr int stride = sizeof(batcher_type::vertex_type) / sizeof(float);
+        constexpr int stride = 2;
+        std::vector<batcher_type::vertex_type> batch_vertices; // TODO: optimize
+        std::vector<float> temp_vertices;
 
         if ( !node || !node_r.enabled() ) {
             return;
@@ -246,9 +263,10 @@ namespace e2d::render_system_impl
         spSkeleton* skeleton = spine_r.skeleton().operator->();
         spSkeletonClipping* clipper = spine_r.clipper().operator->();
         spVertexEffect* effect = spine_r.effect().operator->();
-        const material_asset::ptr& mat_a = node_r.materials().front();
+        const material_asset::ptr& src_mat = node_r.materials().front();
+        const bool use_premultiplied_alpha = spine_r.model()->content().premultiplied_alpha();
 
-        if ( !skeleton || !clipper || !mat_a ) {
+        if ( !skeleton || !clipper || !src_mat ) {
             return;
         }
 
@@ -262,9 +280,7 @@ namespace e2d::render_system_impl
             effect->begin(effect, skeleton);
         }
         
-        const m3f sm = m3f(v3f(node->world_matrix()[0]),
-                            v3f(node->world_matrix()[1]),
-                            v3f(node->world_matrix()[3]));
+        const m4f& sm = node->world_matrix();
 
         for ( int i = 0; i < skeleton->slotsCount; ++i ) {
             spSlot* slot = skeleton->drawOrder[i];
@@ -277,7 +293,7 @@ namespace e2d::render_system_impl
                 continue;
             }
 
-            size_t vertex_count = 0;
+            int vertex_count = 0;
             const float* uvs = nullptr;
             const u16* indices = nullptr;
             int index_count = 0;
@@ -292,8 +308,11 @@ namespace e2d::render_system_impl
                     spSkeletonClipping_clipEnd(clipper, slot);
                     continue;
                 }
-                spRegionAttachment_computeWorldVertices(region, slot->bone, &spine_vertices_.data()->v.x, 0, stride);
-                vertex_count = 4;
+                if ( temp_vertices.size() < 8 ) {
+                    temp_vertices.resize(8);
+                }
+                spRegionAttachment_computeWorldVertices(region, slot->bone, temp_vertices.data(), 0, stride);
+                vertex_count = 8;
                 uvs = region->uvs;
                 indices = quad_indices;
                 index_count = 6;
@@ -308,11 +327,11 @@ namespace e2d::render_system_impl
                     spSkeletonClipping_clipEnd(clipper, slot);
                     continue;
                 }
-                vertex_count = mesh->super.worldVerticesLength >> 1;
-                if ( vertex_count > spine_vertices_.size() ) {
-                    spine_vertices_.resize(vertex_count);
+                vertex_count = mesh->super.worldVerticesLength;
+                if ( vertex_count > int(temp_vertices.size()) ) {
+                    temp_vertices.resize(vertex_count);
                 }
-                spVertexAttachment_computeWorldVertices(&mesh->super, slot, 0, mesh->super.worldVerticesLength, &spine_vertices_.data()->v.x, 0, stride);
+                spVertexAttachment_computeWorldVertices(&mesh->super, slot, 0, mesh->super.worldVerticesLength, temp_vertices.data(), 0, stride);
                 uvs = mesh->uvs;
                 indices = mesh->triangles;
                 index_count = mesh->trianglesCount;
@@ -322,7 +341,6 @@ namespace e2d::render_system_impl
             } else if ( attachment->type == SP_ATTACHMENT_CLIPPING ) {
                 spClippingAttachment* clip = reinterpret_cast<spClippingAttachment*>(attachment);
                 spSkeletonClipping_clipStart(clipper, slot, clip);
-                E2D_ASSERT(false);
                 continue;
             } else {
                 continue;
@@ -333,59 +351,71 @@ namespace e2d::render_system_impl
                 color(slot->color.r, slot->color.g, slot->color.b, slot->color.a) *
                 color(attachment_color->r, attachment_color->g, attachment_color->b, attachment_color->a));
 
+            render::blending_state blend_mode;
             switch ( slot->data->blendMode ) {
                 case SP_BLEND_MODE_NORMAL :
+                    blend_mode = use_premultiplied_alpha ? blend_normal_pma : blend_normal;
                     break;
                 case SP_BLEND_MODE_ADDITIVE :
+                    blend_mode = use_premultiplied_alpha ? blend_additive_pma : blend_additive;
                     break;
                 case SP_BLEND_MODE_MULTIPLY :
+                    blend_mode = use_premultiplied_alpha ? blend_multiply_pma : blend_multiply;
                     break;
                 case SP_BLEND_MODE_SCREEN :
+                    blend_mode = use_premultiplied_alpha ? blend_screen_pma : blend_screen;
                     break;
                 default :
+                    E2D_ASSERT_MSG(false, "unexpected blend mode for slot");
                     break;
             }
-
-            /*const float* vertices = spine_vertices_.data();
+            
+            material_asset::ptr mat_a = material_asset::create(src_mat->content());
+            const_cast<render::state_block&>(mat_a->content().pass(0).states()).blending(blend_mode);
+            
+            const float* vertices = temp_vertices.data();
             if ( spSkeletonClipping_isClipping(clipper) ) {
-                spSkeletonClipping_clipTriangles(clipper, vertices, vertex_count, indices, index_count, uvs, 2);
+                spSkeletonClipping_clipTriangles(
+                    clipper,
+                    temp_vertices.data(), vertex_count,
+                    const_cast<u16*>(indices), index_count,
+                    const_cast<float*>(uvs),
+                    stride);
                 vertices = clipper->clippedVertices->items;
-                vertex_count = clipper->clippedVertices->size >> 1;
+                vertex_count = clipper->clippedVertices->size;
                 uvs = clipper->clippedUVs->items;
                 indices = clipper->clippedTriangles->items;
                 index_count = clipper->clippedTriangles->size;
-            }*/
+            }
 
-            if ( effect ) {
-                E2D_ASSERT(false);
-            } else {
-                for ( int j = 0; j < vertex_count; ++j ) {
-                    auto& vert = spine_vertices_[j];
-                    v2f v(vert.v.x, vert.v.y);
-                    vert.v = v3f(v.x, v.y, 1.0f) * sm;
-                    vert.t = v2f(uvs[j*2], uvs[j*2+1]);
-                    vert.c = vert_color;
+            batch_vertices.resize(vertex_count >> 1);
+            for ( size_t j = 0; j < batch_vertices.size(); ++j ) {
+                auto& vert = batch_vertices[j];
+                v2f v(vertices[j*2], vertices[j*2+1]);
+                vert.v = v3f(v4f(v.x, v.y, 0.0f, 1.0f) * sm);
+                vert.t = v2f(uvs[j*2], uvs[j*2+1]);
+                vert.c = vert_color;
+            }
+
+            if ( index_count ) {
+                try {
+                    property_cache_
+                        .sampler(sprite_texture_sampler_hash, render::sampler_state()
+                            .texture(texture)
+                            .min_filter(render::sampler_min_filter::linear)
+                            .mag_filter(render::sampler_mag_filter::linear))
+                        .merge(node_r.properties());
+
+                    batcher_.batch(
+                        mat_a,
+                        property_cache_,
+                        indices, index_count,
+                        batch_vertices.data(), batch_vertices.size());
+                } catch (...) {
+                    property_cache_.clear();
+                    throw;
                 }
             }
-            
-            try {
-                property_cache_
-                    .sampler(sprite_texture_sampler_hash, render::sampler_state()
-                        .texture(texture)
-                        .min_filter(render::sampler_min_filter::linear)
-                        .mag_filter(render::sampler_mag_filter::linear))
-                    .merge(node_r.properties());
-
-                batcher_.batch(
-                    mat_a,
-                    property_cache_,
-                    indices, index_count,
-                    spine_vertices_.data(), vertex_count);
-            } catch (...) {
-                property_cache_.clear();
-                throw;
-            }
-
             spSkeletonClipping_clipEnd(clipper, slot);
         }
 
@@ -409,7 +439,5 @@ namespace e2d::render_system_impl
     drawer::drawer(engine& e, debug& d, render& r)
     : engine_(e)
     , render_(r)
-    , batcher_(d, r) {
-        spine_vertices_.resize(256);
-    }
+    , batcher_(d, r) {}
 }
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
index f23cddd0..e4180eb3 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
@@ -36,8 +36,7 @@ namespace e2d::render_system_impl
                 const const_node_iptr& cam_n,
                 engine& engine,
                 render& render,
-                batcher_type& batcher,
-                std::vector<batcher_type::vertex_type>& spine_vertices);
+                batcher_type& batcher);
             ~context() noexcept;
 
             void draw(
@@ -62,7 +61,6 @@ namespace e2d::render_system_impl
         private:
             render& render_;
             batcher_type& batcher_;
-            std::vector<batcher_type::vertex_type>& spine_vertices_;
             render::property_block property_cache_;
         };
     public:
@@ -74,7 +72,6 @@ namespace e2d::render_system_impl
         engine& engine_;
         render& render_;
         batcher_type batcher_;
-        std::vector<batcher_type::vertex_type> spine_vertices_;
     };
 }
 
@@ -82,7 +79,7 @@ namespace e2d::render_system_impl
 {
     template < typename F >
     void drawer::with(const camera& cam, const const_node_iptr& cam_n, F&& f) {
-        context ctx{cam, cam_n, engine_, render_, batcher_, spine_vertices_};
+        context ctx{cam, cam_n, engine_, render_, batcher_};
         std::forward<F>(f)(ctx);
         ctx.flush();
     }

From 21487e669099279404e9e9f62bda9bbb81003b3e Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Mon, 5 Aug 2019 11:29:00 +0300
Subject: [PATCH 043/108] added coin spine, load spine_player from json

---
 .../enduro2d/high/components/spine_player.hpp |  11 +-
 samples/bin/library/coin/coin-pma.atlas       |   3 +
 samples/bin/library/coin/coin-pma.png         |   3 +
 samples/bin/library/coin/coin-pro.skel        |   3 +
 samples/bin/library/spine_coin.json           |   6 +
 samples/bin/library/spine_shader.frag         |   3 +-
 samples/sources/sample_07/sample_07.cpp       |  39 +++--
 .../high/assets/spine_model_asset.cpp         |  14 +-
 .../enduro2d/high/components/spine_player.cpp | 135 ++++++++++++++++--
 9 files changed, 175 insertions(+), 42 deletions(-)
 create mode 100644 samples/bin/library/coin/coin-pma.atlas
 create mode 100644 samples/bin/library/coin/coin-pma.png
 create mode 100644 samples/bin/library/coin/coin-pro.skel
 create mode 100644 samples/bin/library/spine_coin.json

diff --git a/headers/enduro2d/high/components/spine_player.hpp b/headers/enduro2d/high/components/spine_player.hpp
index e87f9cd7..1854df76 100644
--- a/headers/enduro2d/high/components/spine_player.hpp
+++ b/headers/enduro2d/high/components/spine_player.hpp
@@ -22,8 +22,11 @@ namespace e2d
         spine_player() = default;
         spine_player(const spine_model_asset::ptr& model);
         
-        spine_player& set_animation(int track, const str& name, bool loop);
-        spine_player& add_animation(int track, const str& name, bool loop, secf delay);
+        spine_player& set_animation(u32 track, const str& name, bool loop);
+        spine_player& add_animation(u32 track, const str& name, bool loop, secf delay);
+        spine_player& add_empty_animation(u32 track, secf duration, secf delay);
+        spine_player& clear(u32 track);
+        spine_player& clear();
         
         const animation_ptr& animation() const noexcept;
         const spine_model_asset::ptr& model() const noexcept;
@@ -46,7 +49,3 @@ namespace e2d
             const collect_context& ctx) const;
     };
 }
-
-namespace e2d
-{
-}
diff --git a/samples/bin/library/coin/coin-pma.atlas b/samples/bin/library/coin/coin-pma.atlas
new file mode 100644
index 00000000..8e6be350
--- /dev/null
+++ b/samples/bin/library/coin/coin-pma.atlas
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b8338ca1b86be5b333b5a1ebd331e48687101f7358149e804070685ed148f8f6
+size 895
diff --git a/samples/bin/library/coin/coin-pma.png b/samples/bin/library/coin/coin-pma.png
new file mode 100644
index 00000000..61759bb1
--- /dev/null
+++ b/samples/bin/library/coin/coin-pma.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:75e1d17fb84154f882a20d5e5069ab52d6d635ba7a9691e78b4f93c8128be35a
+size 342389
diff --git a/samples/bin/library/coin/coin-pro.skel b/samples/bin/library/coin/coin-pro.skel
new file mode 100644
index 00000000..da1f3b2f
--- /dev/null
+++ b/samples/bin/library/coin/coin-pro.skel
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:772bf78b10c22079c0afb46edfff2eff789c4082cd52f4124868a04905b72bbf
+size 2657
diff --git a/samples/bin/library/spine_coin.json b/samples/bin/library/spine_coin.json
new file mode 100644
index 00000000..9e56fa47
--- /dev/null
+++ b/samples/bin/library/spine_coin.json
@@ -0,0 +1,6 @@
+{
+    "skeleton" : "coin/coin-pro.skel",
+    "atlas" : "coin/coin-pma.atlas",
+    "scale" : 1.0,
+    "premultiplied_alpha" : true
+}
\ No newline at end of file
diff --git a/samples/bin/library/spine_shader.frag b/samples/bin/library/spine_shader.frag
index e0fff40b..c48ba948 100644
--- a/samples/bin/library/spine_shader.frag
+++ b/samples/bin/library/spine_shader.frag
@@ -6,6 +6,5 @@ varying vec4 v_tint;
 varying vec2 v_st;
 
 void main() {
-    vec2 st = vec2(v_st.s, v_st.t);
-    gl_FragColor = texture2D(u_texture, st) * v_tint;
+    gl_FragColor = texture2D(u_texture, v_st) * v_tint;
 }
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index 0c667163..c84df02f 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -53,10 +53,11 @@ namespace
         }
     private:
         bool create_scene() {
-            auto spine_res = the<library>().load_asset<spine_model_asset>("spine_raptor.json");
+            auto spine_raptor = the<library>().load_asset<spine_model_asset>("spine_raptor.json");
+            auto spine_coin = the<library>().load_asset<spine_model_asset>("spine_coin.json");
             auto spine_mat = the<library>().load_asset<material_asset>("spine_material.json");
 
-            if ( !spine_res || !spine_mat ) {
+            if ( !spine_raptor || !spine_coin || !spine_mat ) {
                 return false;
             }
             
@@ -69,19 +70,33 @@ namespace
             node_iptr scene_r = scene_i->get_component<actor>().get().node();
             
         #if 1
-            auto spine_i = the<world>().instantiate();
-            spine_i->entity_filler()
-                .component<actor>(node::create(spine_i, scene_r))
+            auto coin_i = the<world>().instantiate();
+            coin_i->entity_filler()
+                .component<actor>(node::create(coin_i, scene_r))
                 .component<renderer>(renderer()
                     .materials({spine_mat}))
-                .component<spine_renderer>(spine_renderer(spine_res))
-                .component<spine_player>(spine_player(spine_res)
+                .component<spine_renderer>(spine_renderer(spine_coin))
+                .component<spine_player>(spine_player(spine_coin)
+                    .set_animation(0, "animation", true));
+            
+            node_iptr coin_n = coin_i->get_component<actor>().get().node();
+            coin_n->scale(v3f(0.5f));
+            coin_n->translation(v3f{150.0f, 0.0f, 0.0f});
+
+            auto raptor_i = the<world>().instantiate();
+            raptor_i->entity_filler()
+                .component<actor>(node::create(raptor_i, scene_r))
+                .component<renderer>(renderer()
+                    .materials({spine_mat}))
+                .component<spine_renderer>(spine_renderer(spine_raptor))
+                .component<spine_player>(spine_player(spine_raptor)
                     .set_animation(0, "walk", true)
                     .add_animation(1, "gun-grab", false, secf(2.0f)));
             
-            node_iptr spine_n = spine_i->get_component<actor>().get().node();
-            spine_n->scale(v3f(0.25f));
-            spine_n->translation(v3f{-40.f, -100.f, 0.0f});
+            node_iptr raptor_n = raptor_i->get_component<actor>().get().node();
+            raptor_n->scale(v3f(0.25f));
+            raptor_n->translation(v3f{-170.f, -100.f, 0.0f});
+
         #else
             // performace test
             for ( std::size_t i = 0; i < 20; ++i )
@@ -91,8 +106,8 @@ namespace
                     .component<actor>(node::create(spine_i, scene_r))
                     .component<renderer>(renderer()
                         .materials({spine_mat}))
-                    .component<spine_renderer>(spine_renderer(spine_res))
-                    .component<spine_player>(spine_player(spine_res)
+                    .component<spine_renderer>(spine_renderer(spine_raptor))
+                    .component<spine_player>(spine_player(spine_raptor)
                         .set_animation(0, "walk", true)
                         .add_animation(1, "gun-grab", false, secf(2.0f)));
             
diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
index a29fbdfd..178f4a28 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -84,22 +84,22 @@ namespace
 
         for ( rapidjson::SizeType i = 0; i < root.Size(); ++i ) {
             E2D_ASSERT(root[i].IsObject());
-            const auto& sprite_json = root[i];
+            const auto& item_json = root[i];
 
-            E2D_ASSERT(sprite_json.HasMember("from_anim"));
-            if ( !json_utils::try_parse_value(sprite_json["from_anim"], from_anim) ) {
+            E2D_ASSERT(item_json.HasMember("from_anim"));
+            if ( !json_utils::try_parse_value(item_json["from_anim"], from_anim) ) {
                 the<debug>().error("SPINE: Incorrect formatting of 'from_anim' property");
                 return false;
             }
 
-            E2D_ASSERT(sprite_json.HasMember("to_anim"));
-            if ( !json_utils::try_parse_value(sprite_json["to_anim"], to_anim) ) {
+            E2D_ASSERT(item_json.HasMember("to_anim"));
+            if ( !json_utils::try_parse_value(item_json["to_anim"], to_anim) ) {
                 the<debug>().error("SPINE: Incorrect formatting of 'to_anim' property");
                 return false;
             }
 
-            E2D_ASSERT(sprite_json.HasMember("duration"));
-            if ( !json_utils::try_parse_value(sprite_json["duration"], duration.value) ) {
+            E2D_ASSERT(item_json.HasMember("duration"));
+            if ( !json_utils::try_parse_value(item_json["duration"], duration.value) ) {
                 the<debug>().error("SPINE: Incorrect formatting of 'duration' property");
                 return false;
             }
diff --git a/sources/enduro2d/high/components/spine_player.cpp b/sources/enduro2d/high/components/spine_player.cpp
index df7a8991..6b89d287 100644
--- a/sources/enduro2d/high/components/spine_player.cpp
+++ b/sources/enduro2d/high/components/spine_player.cpp
@@ -8,6 +8,12 @@
 
 #include <spine/AnimationState.h>
 
+namespace
+{
+    // spine will allocate storage for each track, so keep number of track as small as possible
+    constexpr e2d::u32 max_track_count = 8;
+}
+
 namespace e2d
 {
     spine_player::spine_player(const spine_model_asset::ptr& model)
@@ -15,12 +21,18 @@ namespace e2d
         E2D_ASSERT(model_);
         E2D_ASSERT(model_->content().animation());
 
-        animation_ = animation_ptr(spAnimationState_create(model_->content().animation().get()), spAnimationState_dispose);
+        animation_ = animation_ptr(
+            spAnimationState_create(model_->content().animation().get()),
+            spAnimationState_dispose);
     }
     
-    spine_player& spine_player::set_animation(int track, const str& name, bool loop) {
-        E2D_ASSERT(model_);
-        spAnimation* anim = spSkeletonData_findAnimation(model_->content().skeleton().operator->(), name.c_str());
+    spine_player& spine_player::set_animation(u32 track, const str& name, bool loop) {
+        E2D_ASSERT(model_ && animation_);
+        E2D_ASSERT(track < max_track_count);
+        spAnimation* anim = spSkeletonData_findAnimation(
+            model_->content().skeleton().operator->(),
+            name.c_str());
+
         if ( !anim ) {
             E2D_ASSERT(false);  // TODO: exception?
             return *this;
@@ -29,9 +41,13 @@ namespace e2d
         return *this;
     }
 
-    spine_player& spine_player::add_animation(int track, const str& name, bool loop, secf delay) {
-        E2D_ASSERT(model_);
-        spAnimation* anim = spSkeletonData_findAnimation(model_->content().skeleton().operator->(), name.c_str());
+    spine_player& spine_player::add_animation(u32 track, const str& name, bool loop, secf delay) {
+        E2D_ASSERT(model_ && animation_);
+        E2D_ASSERT(track < max_track_count);
+        spAnimation* anim = spSkeletonData_findAnimation(
+            model_->content().skeleton().operator->(),
+            name.c_str());
+
         if ( !anim ) {
             E2D_ASSERT(false);  // TODO: exception?
             return *this;
@@ -40,6 +56,26 @@ namespace e2d
         return *this;
     }
     
+    spine_player& spine_player::add_empty_animation(u32 track, secf duration, secf delay) {
+        E2D_ASSERT(animation_);
+        E2D_ASSERT(track < max_track_count);
+        spAnimationState_addEmptyAnimation(animation_.get(), track, duration.value, delay.value);
+        return *this;
+    }
+    
+    spine_player& spine_player::clear(u32 track) {
+        E2D_ASSERT(animation_);
+        E2D_ASSERT(track < max_track_count);
+        spAnimationState_clearTrack(animation_.get(), track);
+        return *this;
+    }
+    
+    spine_player& spine_player::clear() {
+        E2D_ASSERT(animation_);
+        spAnimationState_clearTracks(animation_.get());
+        return *this;
+    }
+
     const spine_player::animation_ptr& spine_player::animation() const noexcept {
         return animation_;
     }
@@ -53,15 +89,31 @@ namespace e2d
 {
     const char* factory_loader<spine_player>::schema_source = R"json({
         "type" : "object",
-        "required" : [],
+        "required" : [ "model" ],
         "additionalProperties" : false,
         "properties" : {
-            "time" : { "type" : "number" },
-            "speed" : { "type" : "number" },
-            "looped" : { "type" : "boolean" },
-            "stopped" : { "type" : "boolean" },
-            "playing" : { "type" : "boolean" },
-            "sequence" : { "$ref": "#/common_definitions/name" }
+            "model" : { "$ref": "#/common_definitions/address" },
+            "animations" : {
+                "type" : "array",
+                "items" : { "$ref": "#/definitions/spine_animation_array" }
+            }
+        },
+        "definitions" : {
+            "spine_animation_array" : {
+                "type" : "array",
+                "items" : { "$ref": "#/definitions/spine_animation" }
+            },
+            "spine_animation" : {
+                "type" : "object",
+                "required" : [ "track", "name" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "track" : { "type" : "integer", "minimum" : 0, "maximum": 8 },
+                    "name" : { "$ref": "#/common_definitions/name" },
+                    "loop" : { "type" : "boolean" },
+                    "delay" : { "type" : "number" }
+                }
+            }
         }
     })json";
     
@@ -69,7 +121,60 @@ namespace e2d
         spine_player& component,
         const fill_context& ctx) const
     {
-        return false;
+        if ( ctx.root.HasMember("model") ) {
+            
+            spine_model_asset::load_result model =
+                the<library>().load_asset<spine_model_asset>(
+                    path::combine(ctx.parent_address, ctx.root["model"].GetString()));
+            component = spine_player(model);
+        } else {
+            the<debug>().error("SPINE_PLAYER: Property 'model' is not found");
+            return false;
+        }
+
+        if ( ctx.root.HasMember("animations") ) {
+            const auto& animations_json = ctx.root["animations"];
+            E2D_ASSERT(animations_json.IsArray());
+            
+            for ( rapidjson::SizeType i = 0; i < animations_json.Size(); ++i ) {
+                E2D_ASSERT(animations_json[i].IsObject());
+                const auto& item_json = animations_json[i];
+
+                E2D_ASSERT(item_json.HasMember("track") && item_json.HasMember("name"));
+                u32 track = 0;
+                secf delay;
+                bool loop = false;
+                const char* name = "";
+
+                if ( item_json.HasMember("name") ) {
+                    name = item_json["name"].GetString();
+                }
+
+                if ( item_json.HasMember("track") ) {
+                    if ( !json_utils::try_parse_value(item_json["track"], track) ) {
+                        the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'track' property");
+                        return false;
+                    }
+                }
+
+                if ( item_json.HasMember("delay") ) {
+                    if ( !json_utils::try_parse_value(item_json["delay"], delay.value) ) {
+                        the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'delay' property");
+                        return false;
+                    }
+                }
+
+                if ( item_json.HasMember("loop") ) {
+                    if ( !json_utils::try_parse_value(item_json["loop"], loop) ) {
+                        the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'loop' property");
+                        return false;
+                    }
+                }
+
+                component.add_animation(track, name, loop, delay);
+            }
+        }
+        return true;
     }
     
     bool factory_loader<spine_player>::operator()(

From 31c1dd4146ae642092381a86225b11fcd635a1e0 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Mon, 5 Aug 2019 11:52:24 +0300
Subject: [PATCH 044/108] save dds and pvr

---
 .../image_impl/image_impl_structures.hpp      | 174 ++++++++++++++++++
 .../utils/image_impl/image_reader_dds.cpp     |  47 +----
 .../utils/image_impl/image_reader_pvr.cpp     |  97 +---------
 .../utils/image_impl/image_writer_dds.cpp     |  89 ++++++++-
 .../utils/image_impl/image_writer_pvr.cpp     |  80 +++++++-
 untests/sources/untests_utils/image.cpp       |  52 ++++++
 6 files changed, 393 insertions(+), 146 deletions(-)
 create mode 100644 sources/enduro2d/utils/image_impl/image_impl_structures.hpp

diff --git a/sources/enduro2d/utils/image_impl/image_impl_structures.hpp b/sources/enduro2d/utils/image_impl/image_impl_structures.hpp
new file mode 100644
index 00000000..92fc857d
--- /dev/null
+++ b/sources/enduro2d/utils/image_impl/image_impl_structures.hpp
@@ -0,0 +1,174 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include <enduro2d/utils/image.hpp>
+#include <enduro2d/utils/buffer.hpp>
+
+namespace e2d::images::impl::dds
+{
+    // pixel format flags
+    const u32 ddsf_alphapixels = 0x00000001;
+    const u32 ddsf_fourcc = 0x00000004;
+    const u32 ddsf_rgb = 0x00000040;
+    const u32 ddsf_rgba = 0x00000041;
+
+    // dwCaps2 flags
+    const u32 ddsf_cubemap = 0x00000200;
+    const u32 ddsf_volume = 0x00200000;
+
+    // compressed texture types
+    const u32 fourcc_dxt1 = 0x31545844; // 'DXT1'
+    const u32 fourcc_dxt3 = 0x33545844; // 'DXT3'
+    const u32 fourcc_dxt5 = 0x35545844; // 'DXT5'
+
+    struct dds_pixel_format {
+        u32 dwSize;
+        u32 dwFlags;
+        u32 dwFourCC;
+        u32 dwRGBBitCount;
+        u32 dwRBitMask;
+        u32 dwGBitMask;
+        u32 dwBBitMask;
+        u32 dwABitMask;
+    };
+
+    struct dds_header {
+        u32 dwMagic;
+        u32 dwSize;
+        u32 dwFlags;
+        u32 dwHeight;
+        u32 dwWidth;
+        u32 dwPitchOrLinearSize;
+        u32 dwDepth;
+        u32 dwMipMapCount;
+        u32 dwReserved1[11];
+        dds_pixel_format ddspf;
+        u32 dwCaps;
+        u32 dwCaps2;
+        u32 dwCaps3;
+        u32 dwCaps4;
+        u32 dwReserved2;
+    };
+
+    // pixel format flags
+    const u32 ddsd_caps = 0x00000001;
+    const u32 ddsd_height = 0x00000002;
+    const u32 ddsd_width = 0x00000004;
+    const u32 ddsd_pitch = 0x00000008;
+    const u32 ddsd_pixelformat = 0x00001000;
+    const u32 ddsd_mipmapcount = 0x00020000;
+    const u32 ddsd_linearsize = 0x00080000;
+    const u32 ddsd_dept = 0x00800000;
+
+    static_assert(sizeof(dds_pixel_format) == 32, "invalid dds_pixel_format structure size");
+    static_assert(sizeof(dds_header) == 128, "invalid dds_header structure size");
+}
+
+namespace e2d::images::impl::pvr
+{
+    enum class pvr_flags : u32 {
+        none = 0,
+        premultiplied = 0x02,
+    };
+
+    enum class pvr_pixel_format : u64 {
+        pvrtc_2bpp_rgb = 0,
+        pvrtc_2bpp_rgba = 1,
+        pvrtc_4bpp_rgb = 2,
+        pvrtc_4bpp_rgba = 3,
+        pvrtc_ii_2bpp = 4,
+        pvrtc_ii_4bpp = 5,
+        etc1 = 6,
+        dxt1 = 7,
+        dxt2 = 8,
+        dxt3 = 9,
+        dxt4 = 10,
+        dxt5 = 11,
+        bc1 = 7,
+        bc2 = 9,
+        bc3 = 11,
+        bc4 = 12,
+        bc5 = 13,
+        bc6 = 14,
+        bc7 = 15,
+        uyvy = 16,
+        yuy2 = 17,
+        bw_1bpp = 18,
+        r9g9b9e5 = 19,
+        rgbg8888 = 20,
+        grgb8888 = 21,
+        etc2_rgb = 22,
+        etc2_rgba = 23,
+        etc2_rgb_a1 = 24,
+        eac_r11 = 25,
+        eac_rg11 = 26,
+        astc_4x4 = 27,
+        astc_5x4 = 28,
+        astc_5x5 = 29,
+        astc_6x5 = 30,
+        astc_6x6 = 31,
+        astc_8x5 = 32,
+        astc_8x6 = 33,
+        astc_8x8 = 34,
+        astc_10x5 = 35,
+        astc_10x6 = 36,
+        astc_10x8 = 37,
+        astc_10x10 = 38,
+        astc_12x10 = 39,
+        astc_12x12 = 40,
+        rgba8 = 0x08080808'61626772ull,
+        r8 = 0x00000008'00000072ull,
+        rg8 = 0x00000808'00006772ull,
+        rgb8 = 0x00080808'00626772ull,
+    };
+
+    enum class pvr_color_space : u32 {
+        linear = 0,
+        srgb = 1,
+    };
+
+    enum class pvr_channel_type : u32 {
+        byte_unorm = 0,
+        byte_snorm = 1,
+        ubyte = 2,
+        sbyte = 3,
+        short_unorm = 4,
+        short_snorm = 5,
+        ushort = 6,
+        sshort = 7,
+        int_unorm = 8,
+        int_snorm = 9,
+        uint = 10,
+        sint = 11,
+        sfloat = 12,
+    };
+
+    struct pvr_header {
+        u32 version;
+        u32 flags;
+        u32 pixelFormat0;
+        u32 pixelFormat1;
+        u32 colorSpace;
+        u32 channelType;
+        u32 height;
+        u32 width;
+        u32 depth;
+        u32 numSurfaces;
+        u32 numFaces;
+        u32 mipMapCount;
+        u32 metaDataSize;
+    };
+
+    struct pvr_meta_data {
+        u32 four_cc{0};
+        u32 key{0};
+        u32 data_size{0};
+    };
+
+    static_assert(sizeof(pvr_header) == 52, "invalid PVR header size");
+}
diff --git a/sources/enduro2d/utils/image_impl/image_reader_dds.cpp b/sources/enduro2d/utils/image_impl/image_reader_dds.cpp
index 4601374c..6793c168 100644
--- a/sources/enduro2d/utils/image_impl/image_reader_dds.cpp
+++ b/sources/enduro2d/utils/image_impl/image_reader_dds.cpp
@@ -5,6 +5,7 @@
  ******************************************************************************/
 
 #include "image_impl.hpp"
+#include "image_impl_structures.hpp"
 
 namespace
 {
@@ -12,51 +13,7 @@ namespace
     // https://docs.microsoft.com/en-us/windows/desktop/direct3ddds/dx-graphics-dds-pguide
 
     using namespace e2d;
-
-    // pixel format flags
-    const u32 ddsf_alphapixels = 0x00000001;
-    const u32 ddsf_fourcc = 0x00000004;
-    const u32 ddsf_rgb = 0x00000040;
-    const u32 ddsf_rgba = 0x00000041;
-
-    // dwCaps2 flags
-    const u32 ddsf_cubemap = 0x00000200;
-    const u32 ddsf_volume = 0x00200000;
-
-    // compressed texture types
-    const u32 fourcc_dxt1 = 0x31545844; // 'DXT1'
-    const u32 fourcc_dxt3 = 0x33545844; // 'DXT3'
-    const u32 fourcc_dxt5 = 0x35545844; // 'DXT5'
-
-    struct dds_pixel_format {
-        u32 dwSize;
-        u32 dwFlags;
-        u32 dwFourCC;
-        u32 dwRGBBitCount;
-        u32 dwRBitMask;
-        u32 dwGBitMask;
-        u32 dwBBitMask;
-        u32 dwABitMask;
-    };
-
-    struct dds_header {
-        u32 dwMagic;
-        u32 dwSize;
-        u32 dwFlags;
-        u32 dwHeight;
-        u32 dwWidth;
-        u32 dwPitchOrLinearSize;
-        u32 dwDepth;
-        u32 dwMipMapCount;
-        u32 dwReserved1[11];
-        dds_pixel_format ddspf;
-        u32 dwCaps1;
-        u32 dwCaps2;
-        u32 dwReserved2[3];
-    };
-
-    static_assert(sizeof(dds_pixel_format) == 32, "invalid dds_pixel_format structure size");
-    static_assert(sizeof(dds_header) == 128, "invalid dds_header structure size");
+    using namespace e2d::images::impl::dds;
 
     bool is_dds(const void* data, std::size_t byte_size) noexcept {
         if ( byte_size > sizeof(dds_header) ) {
diff --git a/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp b/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp
index efdf072e..96eaf887 100644
--- a/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp
+++ b/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp
@@ -5,6 +5,7 @@
  ******************************************************************************/
 
 #include "image_impl.hpp"
+#include "image_impl_structures.hpp"
 
 namespace
 {
@@ -12,101 +13,7 @@ namespace
     // https://cdn.imgtec.com/sdk-documentation/PVR+File+Format.Specification.pdf
 
     using namespace e2d;
-
-    enum class pvr_flags : u32 {
-        none = 0,
-        premultiplied = 0x02,
-    };
-
-    enum class pvr_pixel_format : u64 {
-        pvrtc_2bpp_rgb = 0,
-        pvrtc_2bpp_rgba = 1,
-        pvrtc_4bpp_rgb = 2,
-        pvrtc_4bpp_rgba = 3,
-        pvrtc_ii_2bpp = 4,
-        pvrtc_ii_4bpp = 5,
-        etc1 = 6,
-        dxt1 = 7,
-        dxt2 = 8,
-        dxt3 = 9,
-        dxt4 = 10,
-        dxt5 = 11,
-        bc1 = 7,
-        bc2 = 9,
-        bc3 = 11,
-        bc4 = 12,
-        bc5 = 13,
-        bc6 = 14,
-        bc7 = 15,
-        uyvy = 16,
-        yuy2 = 17,
-        bw_1bpp = 18,
-        r9g9b9e5 = 19,
-        rgbg8888 = 20,
-        grgb8888 = 21,
-        etc2_rgb = 22,
-        etc2_rgba = 23,
-        etc2_rgb_a1 = 24,
-        eac_r11 = 25,
-        eac_rg11 = 26,
-        astc_4x4 = 27,
-        astc_5x4 = 28,
-        astc_5x5 = 29,
-        astc_6x5 = 30,
-        astc_6x6 = 31,
-        astc_8x5 = 32,
-        astc_8x6 = 33,
-        astc_8x8 = 34,
-        astc_10x5 = 35,
-        astc_10x6 = 36,
-        astc_10x8 = 37,
-        astc_10x10 = 38,
-        astc_12x10 = 39,
-        astc_12x12 = 40,
-        rgba8 = 0x08080808'61626772ull,
-        r8 = 0x00000008'00000072ull,
-        rg8 = 0x00000808'00006772ull,
-        rgb8 = 0x00080808'00626772ull,
-    };
-
-    enum class pvr_color_space : u32 {
-        linear = 0,
-        srgb = 1,
-    };
-
-    enum class pvr_channel_type : u32 {
-        byte_unorm = 0,
-        byte_snorm = 1,
-        ubyte = 2,
-        sbyte = 3,
-        short_unorm = 4,
-        short_snorm = 5,
-        ushort = 6,
-        sshort = 7,
-        int_unorm = 8,
-        int_snorm = 9,
-        uint = 10,
-        sint = 11,
-        sfloat = 12,
-    };
-
-    struct pvr_header {
-        u32 version;
-        u32 flags;
-        u32 pixelFormat0;
-        u32 pixelFormat1;
-        u32 colorSpace;
-        u32 channelType;
-        u32 height;
-        u32 width;
-        u32 depth;
-        u32 numSurfaces;
-        u32 numFaces;
-        u32 mipMapCount;
-        u32 metaDataSize;
-    };
-
-    static_assert(sizeof(pvr_header) == 52, "invalid PVR header size");
+    using namespace e2d::images::impl::pvr;
 
     bool is_pvr(const void* data, std::size_t byte_size) noexcept {
         if ( byte_size > sizeof(pvr_header) ) {
diff --git a/sources/enduro2d/utils/image_impl/image_writer_dds.cpp b/sources/enduro2d/utils/image_impl/image_writer_dds.cpp
index 0d397d42..a96bce57 100644
--- a/sources/enduro2d/utils/image_impl/image_writer_dds.cpp
+++ b/sources/enduro2d/utils/image_impl/image_writer_dds.cpp
@@ -5,15 +5,17 @@
  ******************************************************************************/
 
 #include "image_impl.hpp"
+#include "image_impl_structures.hpp"
+
 
 namespace
 {
     using namespace e2d;
+    using namespace e2d::images::impl::dds;
 
     bool is_save_image_dds_supported(image_data_format data_format) noexcept {
         switch ( data_format ) {
             case image_data_format::g8:
-            case image_data_format::ga8:
             case image_data_format::rgb8:
             case image_data_format::rgba8:
             case image_data_format::rgb_dxt1:
@@ -25,6 +27,30 @@ namespace
                 return false;
         }
     }
+
+    u32 get_pitch_or_linear_size(image_data_format data_format) noexcept {
+        switch ( data_format ) {
+            case image_data_format::g8:
+                break;
+            case image_data_format::rgb8:
+                break;
+            case image_data_format::rgba8:
+                break;
+            case image_data_format::rgb_dxt1:
+                break;
+            case image_data_format::rgba_dxt1:
+                break;
+            case image_data_format::rgba_dxt3:
+                break;
+            case image_data_format::rgba_dxt5:
+                break;
+            default:
+                E2D_ASSERT_MSG(false, "unused pixel format");
+                break;
+        }
+
+        return 0;
+    }
 }
 
 namespace e2d::images::impl
@@ -32,8 +58,65 @@ namespace e2d::images::impl
     bool save_image_dds(const image& src, buffer& dst) {
         E2D_UNUSED(src, dst);
         if ( is_save_image_dds_supported(src.format()) ) {
-            //TODO(BlackMat): implme
-            E2D_ASSERT_MSG(false, "implme");
+            dds_header hdr;
+            hdr.dwMagic = 0x20534444;
+            hdr.dwSize = 124;
+            hdr.dwFlags = ddsd_caps | ddsd_height | ddsd_width | ddsd_pixelformat;
+            hdr.dwHeight = src.size().y;
+            hdr.dwWidth = src.size().x;
+            hdr.dwPitchOrLinearSize = get_pitch_or_linear_size(src.format());
+            hdr.dwDepth = 0;
+            hdr.dwMipMapCount = 0;
+            hdr.ddspf.dwSize = 32;
+            hdr.ddspf.dwFlags = 0;
+            hdr.ddspf.dwFourCC = 0;
+            switch ( src.format() ) {
+                case image_data_format::g8:
+                    hdr.ddspf.dwRGBBitCount = 8;
+                    break;
+                case image_data_format::rgb8:
+                    hdr.ddspf.dwFlags |= ddsf_rgb;
+                    hdr.ddspf.dwRGBBitCount = 24;
+                    hdr.ddspf.dwRBitMask = 0x00FF0000;
+                    hdr.ddspf.dwGBitMask = 0x0000FF00;
+                    hdr.ddspf.dwBBitMask = 0x000000FF;
+                    break;
+                case image_data_format::rgba8:
+                    hdr.ddspf.dwFlags |= ddsf_rgba;
+                    hdr.ddspf.dwRGBBitCount = 32;
+                    break;
+                case image_data_format::rgb_dxt1:
+                    hdr.ddspf.dwFlags |= ddsf_fourcc;
+                    hdr.ddspf.dwFourCC = fourcc_dxt1;
+                    break;
+                case image_data_format::rgba_dxt1:
+                    hdr.ddspf.dwFlags |= ddsf_fourcc | ddsf_alphapixels;
+                    hdr.ddspf.dwFourCC = fourcc_dxt1;
+                    break;
+                case image_data_format::rgba_dxt3:
+                    hdr.ddspf.dwFlags |= ddsf_fourcc;
+                    hdr.ddspf.dwFourCC |= fourcc_dxt3;
+                    break;
+                case image_data_format::rgba_dxt5:
+                    hdr.ddspf.dwFlags |= ddsf_fourcc;
+                    hdr.ddspf.dwFourCC = fourcc_dxt5;
+                    break;
+                default:
+                    E2D_ASSERT_MSG(false, "unused pixel format");
+                    break;;
+            }
+            hdr.dwCaps = 0x1000;//DDSCAPS_TEXTURE
+            hdr.dwCaps2 = 0;
+            hdr.dwCaps3 = 0;
+            hdr.dwCaps4 = 0;
+            hdr.dwReserved2 = 0;
+
+            size_t size = sizeof(hdr) + src.data().size();
+            u8 content[size];
+            std::memcpy(content, &hdr, sizeof(hdr));
+            std::memcpy(content + sizeof(hdr), src.data().data(), src.data().size());
+            dst.assign(content, size);
+            return true;
         }
         return false;
     }
diff --git a/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp b/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
index 33611c5b..f61692ff 100644
--- a/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
+++ b/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
@@ -5,10 +5,12 @@
  ******************************************************************************/
 
 #include "image_impl.hpp"
+#include "image_impl_structures.hpp"
 
 namespace
 {
     using namespace e2d;
+    using namespace e2d::images::impl::pvr;
 
     bool is_save_image_pvr_supported(image_data_format data_format) noexcept {
         switch ( data_format ) {
@@ -17,7 +19,6 @@ namespace
             case image_data_format::rgb8:
             case image_data_format::rgba8:
             case image_data_format::rgb_dxt1:
-            case image_data_format::rgba_dxt1:
             case image_data_format::rgba_dxt3:
             case image_data_format::rgba_dxt5:
             case image_data_format::rgb_pvrtc2:
@@ -31,6 +32,56 @@ namespace
                 return false;
         }
     }
+
+    u64 get_pvr_pixel_format(image_data_format data_format) noexcept {
+        pvr_pixel_format res;
+        switch ( data_format ) {
+            case image_data_format::g8:
+                res = pvr_pixel_format::r8;
+                break;
+            case image_data_format::ga8:
+                res = pvr_pixel_format::rg8;
+                break;
+            case image_data_format::rgb8:
+                res = pvr_pixel_format::rgb8;
+                break;
+            case image_data_format::rgba8:
+                res = pvr_pixel_format::rgba8;
+                break;
+            case image_data_format::rgb_dxt1:
+                res = pvr_pixel_format::dxt1;
+                break;
+            case image_data_format::rgba_dxt3:
+                res = pvr_pixel_format::dxt3;
+                break;
+            case image_data_format::rgba_dxt5:
+                res = pvr_pixel_format::dxt5;
+                break;
+            case image_data_format::rgb_pvrtc2:
+                res = pvr_pixel_format::pvrtc_2bpp_rgb;
+                break;
+            case image_data_format::rgb_pvrtc4:
+                res = pvr_pixel_format::pvrtc_4bpp_rgb;
+                break;
+            case image_data_format::rgba_pvrtc2:
+                res = pvr_pixel_format::pvrtc_2bpp_rgba;
+                break;
+            case image_data_format::rgba_pvrtc4:
+                res = pvr_pixel_format::pvrtc_4bpp_rgba;
+                break;
+            case image_data_format::rgba_pvrtc2_v2:
+                res = pvr_pixel_format::pvrtc_ii_2bpp;
+                break;
+            case image_data_format::rgba_pvrtc4_v2:
+                res = pvr_pixel_format::pvrtc_ii_4bpp;
+                break;
+            default:
+                E2D_ASSERT_MSG(false, "unused pixel format");
+                break;
+        }
+
+        return static_cast<u64>(res);
+    }
 }
 
 namespace e2d::images::impl
@@ -38,8 +89,31 @@ namespace e2d::images::impl
     bool save_image_pvr(const image& src, buffer& dst) {
         E2D_UNUSED(src, dst);
         if ( is_save_image_pvr_supported(src.format()) ) {
-            //TODO(BlackMat): implme
-            E2D_ASSERT_MSG(false, "implme");
+            u64 pixel_format = get_pvr_pixel_format(src.format());
+            pvr_header hdr;
+            hdr.version = 0x03525650;
+            hdr.flags = 0;
+            hdr.pixelFormat0 = pixel_format & 0x00000000'FFFFFFFFull;
+            hdr.pixelFormat1 = pixel_format >> 32;
+            hdr.colorSpace = static_cast<u32>(pvr_color_space::linear);
+            hdr.channelType = 2;//unsigned byte
+            hdr.height = src.size().y;
+            hdr.width = src.size().x;
+            hdr.depth = 0;
+            hdr.numSurfaces = 1;
+            hdr.numFaces = 1;
+            hdr.mipMapCount = 0;
+            hdr.metaDataSize = sizeof(pvr_meta_data);
+
+            pvr_meta_data md;
+
+            size_t size = sizeof(hdr) + sizeof(md) + src.data().size();
+            u8 content[size];
+            std::memcpy(content, &hdr, sizeof(hdr));
+            std::memcpy(content + sizeof(hdr), &md, sizeof(md));
+            std::memcpy(content + sizeof(hdr) + sizeof(md), src.data().data(), src.data().size());
+            dst.assign(content, size);
+            return true;
         }
         return false;
     }
diff --git a/untests/sources/untests_utils/image.cpp b/untests/sources/untests_utils/image.cpp
index 40e6366b..2ae1dc27 100644
--- a/untests/sources/untests_utils/image.cpp
+++ b/untests/sources/untests_utils/image.cpp
@@ -53,6 +53,16 @@ TEST_CASE("images") {
             image_file_format::tga,
             make_write_file("image_save_test.tga", false)));
         REQUIRE(filesystem::file_exists("image_save_test.tga"));
+        REQUIRE(images::try_save_image(
+            img,
+            image_file_format::pvr,
+            make_write_file("image_save_test.pvr", false)));
+        REQUIRE(filesystem::file_exists("image_save_test.pvr"));
+        REQUIRE(images::try_save_image(
+            img,
+            image_file_format::dds,
+            make_write_file("image_save_test.dds", false)));
+        REQUIRE(filesystem::file_exists("image_save_test.dds"));
     }
     {
         image img;
@@ -77,11 +87,27 @@ TEST_CASE("images") {
         REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0u));
         REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0u));
         REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0u));
+
+        REQUIRE(images::try_load_image(img, make_read_file("image_save_test.pvr")));
+        REQUIRE(img.size() == v2u(3,1));
+        REQUIRE(img.format() == image_data_format::rgb8);
+        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0u));
+        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0u));
+        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0u));
+
+        REQUIRE(images::try_load_image(img, make_read_file("image_save_test.dds")));
+        REQUIRE(img.size() == v2u(3,1));
+        REQUIRE(img.format() == image_data_format::rgb8);
+        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0u));
+        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0u));
+        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0u));
     }
     {
         REQUIRE(filesystem::remove_file("image_save_test.jpg"));
         REQUIRE(filesystem::remove_file("image_save_test.png"));
         REQUIRE(filesystem::remove_file("image_save_test.tga"));
+        REQUIRE(filesystem::remove_file("image_save_test.pvr"));
+        REQUIRE(filesystem::remove_file("image_save_test.dds"));
         const u8 img_data[] = {255,0,0, 0,255,0, 0,0,255};
         image img(v2u(3,1), image_data_format::rgb8, buffer(img_data, sizeof(img_data)));
         buffer buf;
@@ -100,6 +126,16 @@ TEST_CASE("images") {
             image_file_format::tga,
             buf));
         REQUIRE(filesystem::try_write_all(buf, "image_save_test.tga", false));
+        REQUIRE(images::try_save_image(
+            img,
+            image_file_format::pvr,
+            buf));
+        REQUIRE(filesystem::try_write_all(buf, "image_save_test.pvr", false));
+        REQUIRE(images::try_save_image(
+            img,
+            image_file_format::dds,
+            buf));
+        REQUIRE(filesystem::try_write_all(buf, "image_save_test.dds", false));
     }
     {
         image img;
@@ -128,6 +164,22 @@ TEST_CASE("images") {
         REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0));
         REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0));
         REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0));
+
+        REQUIRE(filesystem::try_read_all(buf, "image_save_test.pvr"));
+        REQUIRE(images::try_load_image(img, buf));
+        REQUIRE(img.size() == v2u(3,1));
+        REQUIRE(img.format() == image_data_format::rgb8);
+        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0));
+        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0));
+        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0));
+
+        REQUIRE(filesystem::try_read_all(buf, "image_save_test.dds"));
+        REQUIRE(images::try_load_image(img, buf));
+        REQUIRE(img.size() == v2u(3,1));
+        REQUIRE(img.format() == image_data_format::rgb8);
+        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0));
+        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0));
+        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0));
     }
     {
         struct img_info {

From 08201aa48a454963aab278c7ced7b967dd32ab5d Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Mon, 5 Aug 2019 12:51:46 +0300
Subject: [PATCH 045/108] updated masks for dds

---
 .../enduro2d/utils/image_impl/image_writer_dds.cpp  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/sources/enduro2d/utils/image_impl/image_writer_dds.cpp b/sources/enduro2d/utils/image_impl/image_writer_dds.cpp
index a96bce57..c3c84467 100644
--- a/sources/enduro2d/utils/image_impl/image_writer_dds.cpp
+++ b/sources/enduro2d/utils/image_impl/image_writer_dds.cpp
@@ -70,6 +70,10 @@ namespace e2d::images::impl
             hdr.ddspf.dwSize = 32;
             hdr.ddspf.dwFlags = 0;
             hdr.ddspf.dwFourCC = 0;
+            hdr.ddspf.dwRBitMask = 0;
+            hdr.ddspf.dwGBitMask = 0;
+            hdr.ddspf.dwBBitMask = 0;
+            hdr.ddspf.dwABitMask = 0;
             switch ( src.format() ) {
                 case image_data_format::g8:
                     hdr.ddspf.dwRGBBitCount = 8;
@@ -77,13 +81,18 @@ namespace e2d::images::impl
                 case image_data_format::rgb8:
                     hdr.ddspf.dwFlags |= ddsf_rgb;
                     hdr.ddspf.dwRGBBitCount = 24;
-                    hdr.ddspf.dwRBitMask = 0x00FF0000;
+                    hdr.ddspf.dwRBitMask = 0x000000FF;
                     hdr.ddspf.dwGBitMask = 0x0000FF00;
-                    hdr.ddspf.dwBBitMask = 0x000000FF;
+                    hdr.ddspf.dwBBitMask = 0x00FF0000;
+                    hdr.ddspf.dwABitMask = 0x00000000;
                     break;
                 case image_data_format::rgba8:
                     hdr.ddspf.dwFlags |= ddsf_rgba;
                     hdr.ddspf.dwRGBBitCount = 32;
+                    hdr.ddspf.dwRBitMask = 0x000000FF;
+                    hdr.ddspf.dwGBitMask = 0x0000FF00;
+                    hdr.ddspf.dwBBitMask = 0x00FF0000;
+                    hdr.ddspf.dwABitMask = 0xFF000000;
                     break;
                 case image_data_format::rgb_dxt1:
                     hdr.ddspf.dwFlags |= ddsf_fourcc;

From bb0b8be545cf4f5025d6b26f56de8cdd8d32c193 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Mon, 5 Aug 2019 12:52:51 +0300
Subject: [PATCH 046/108] updated pvr channel type

---
 sources/enduro2d/utils/image_impl/image_writer_pvr.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp b/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
index f61692ff..bcc26361 100644
--- a/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
+++ b/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
@@ -96,7 +96,7 @@ namespace e2d::images::impl
             hdr.pixelFormat0 = pixel_format & 0x00000000'FFFFFFFFull;
             hdr.pixelFormat1 = pixel_format >> 32;
             hdr.colorSpace = static_cast<u32>(pvr_color_space::linear);
-            hdr.channelType = 2;//unsigned byte
+            hdr.channelType = static_cast<u32>(pvr_channel_type::ubyte);
             hdr.height = src.size().y;
             hdr.width = src.size().x;
             hdr.depth = 0;

From 664f021c2e12786fe859e8542cc80f5220ed67e1 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Mon, 5 Aug 2019 15:14:01 +0300
Subject: [PATCH 047/108] load spine model from dependencies

---
 sources/enduro2d/high/components/spine_player.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/sources/enduro2d/high/components/spine_player.cpp b/sources/enduro2d/high/components/spine_player.cpp
index 6b89d287..7c7f9bc3 100644
--- a/sources/enduro2d/high/components/spine_player.cpp
+++ b/sources/enduro2d/high/components/spine_player.cpp
@@ -122,10 +122,16 @@ namespace e2d
         const fill_context& ctx) const
     {
         if ( ctx.root.HasMember("model") ) {
-            
-            spine_model_asset::load_result model =
-                the<library>().load_asset<spine_model_asset>(
-                    path::combine(ctx.parent_address, ctx.root["model"].GetString()));
+            auto model = ctx.dependencies.find_asset<spine_model_asset>(
+                path::combine(ctx.parent_address, ctx.root["model"].GetString()));
+            if ( !model ) {
+                the<debug>().error("SPINE_PLAYER: Dependency 'model' is not found:\n"
+                    "--> Parent address: %s\n"
+                    "--> Dependency address: $s",
+                    ctx.parent_address,
+                    ctx.root["model"].GetString());
+                return false;
+            }
             component = spine_player(model);
         } else {
             the<debug>().error("SPINE_PLAYER: Property 'model' is not found");

From 52252187b5f65e5f91f07fc81109a547a3e82468 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Tue, 6 Aug 2019 11:55:43 +0300
Subject: [PATCH 048/108] added sdf material

---
 samples/bin/library/sdf_material.json | 16 ++++++++++++++++
 samples/bin/library/sdf_shader.frag   | 14 ++++++++++++++
 samples/bin/library/sdf_shader.json   |  4 ++++
 samples/bin/library/sdf_shader.vert   | 15 +++++++++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 samples/bin/library/sdf_material.json
 create mode 100644 samples/bin/library/sdf_shader.frag
 create mode 100644 samples/bin/library/sdf_shader.json
 create mode 100644 samples/bin/library/sdf_shader.vert

diff --git a/samples/bin/library/sdf_material.json b/samples/bin/library/sdf_material.json
new file mode 100644
index 00000000..153da736
--- /dev/null
+++ b/samples/bin/library/sdf_material.json
@@ -0,0 +1,16 @@
+{
+    "passes" : [{
+        "shader" : "sdf_shader.json",
+        "state_block" : {
+            "capabilities_state" : {
+                "depth_test" : false,
+                "blending" : true
+            },
+            "blending_state" : {
+                "src_factor" : "src_alpha",
+                "dst_factor" : "one_minus_src_alpha"
+            }
+        }
+    }],
+    "property_block" : {}
+}
diff --git a/samples/bin/library/sdf_shader.frag b/samples/bin/library/sdf_shader.frag
new file mode 100644
index 00000000..052e5143
--- /dev/null
+++ b/samples/bin/library/sdf_shader.frag
@@ -0,0 +1,14 @@
+uniform sampler2D u_texture;
+
+varying vec2 v_st0;
+varying vec4 v_color;
+
+const float smoothing = 1.0 / 16.0;
+
+void main() {
+    vec2 st = vec2(v_st0.s, 1.0 - v_st0.t);
+    gl_FragColor = texture2D(u_texture, st) * v_color;
+    float distance = texture2D(u_texture, st).a;
+    float alpha = smoothstep(0.5 - smoothing, 0.5 + smoothing, distance);
+    gl_FragColor = vec4(v_color.rgb, v_color.a * alpha);
+}
diff --git a/samples/bin/library/sdf_shader.json b/samples/bin/library/sdf_shader.json
new file mode 100644
index 00000000..c56b2e8d
--- /dev/null
+++ b/samples/bin/library/sdf_shader.json
@@ -0,0 +1,4 @@
+{
+    "vertex" : "sdf_shader.vert",
+    "fragment" : "sdf_shader.frag"
+}
diff --git a/samples/bin/library/sdf_shader.vert b/samples/bin/library/sdf_shader.vert
new file mode 100644
index 00000000..321b34fe
--- /dev/null
+++ b/samples/bin/library/sdf_shader.vert
@@ -0,0 +1,15 @@
+uniform mat4 u_matrix_m;
+uniform mat4 u_matrix_vp;
+
+attribute vec3 a_vertex;
+attribute vec2 a_st0;
+attribute vec4 a_color0;
+
+varying vec2 v_st0;
+varying vec4 v_color;
+
+void main() {
+    v_st0 = a_st0;
+    v_color = a_color0;
+    gl_Position = vec4(a_vertex, 1.0) * u_matrix_m * u_matrix_vp;
+}

From d45685d4bea5c702b3e7a0012feb530ef3c1a7e1 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Tue, 6 Aug 2019 12:34:22 +0300
Subject: [PATCH 049/108] update sample: added key bindings to start
 animations, bug fix

---
 .../enduro2d/high/components/spine_player.hpp | 10 ++-
 samples/bin/library/spine_raptor.json         | 42 +++++++++--
 samples/sources/sample_07/sample_07.cpp       | 75 +++++++++++--------
 .../high/assets/spine_model_asset.cpp         |  5 +-
 .../enduro2d/high/components/spine_player.cpp |  4 +
 sources/enduro2d/high/spine_model.cpp         |  7 +-
 .../enduro2d/high/systems/spine_system.cpp    |  7 +-
 7 files changed, 103 insertions(+), 47 deletions(-)

diff --git a/headers/enduro2d/high/components/spine_player.hpp b/headers/enduro2d/high/components/spine_player.hpp
index 1854df76..ae2a15a9 100644
--- a/headers/enduro2d/high/components/spine_player.hpp
+++ b/headers/enduro2d/high/components/spine_player.hpp
@@ -22,9 +22,13 @@ namespace e2d
         spine_player() = default;
         spine_player(const spine_model_asset::ptr& model);
         
-        spine_player& set_animation(u32 track, const str& name, bool loop);
-        spine_player& add_animation(u32 track, const str& name, bool loop, secf delay);
-        spine_player& add_empty_animation(u32 track, secf duration, secf delay);
+        spine_player& set_animation(u32 track, const str& name, bool loop = false);
+
+        spine_player& add_animation(u32 track, const str& name, bool loop, secf delay = secf(0.0f));
+        spine_player& add_animation(u32 track, const str& name, secf delay = secf(0.0f));
+
+        spine_player& add_empty_animation(u32 track, secf duration, secf delay = secf(0.0f));
+
         spine_player& clear(u32 track);
         spine_player& clear();
         
diff --git a/samples/bin/library/spine_raptor.json b/samples/bin/library/spine_raptor.json
index daf58174..93f11198 100644
--- a/samples/bin/library/spine_raptor.json
+++ b/samples/bin/library/spine_raptor.json
@@ -1,6 +1,38 @@
 {
-    "skeleton" : "raptor/raptor-pro.json-large",
-    "atlas" : "raptor/raptor.atlas",
-    "scale" : 1.0,
-    "premultiplied_alpha" : false
-}
\ No newline at end of file
+    "skeleton": "raptor/raptor-pro.json-large",
+    "atlas": "raptor/raptor.atlas",
+    "scale": 1.0,
+    "premultiplied_alpha": false,
+    "mix_animations": [
+        {
+            "from_anim": "walk",
+            "to_anim": "roar",
+            "duration": 0.5
+        },
+        {
+            "from_anim": "roar",
+            "to_anim": "walk",
+            "duration": 0.5
+        },
+        {
+            "from_anim": "walk",
+            "to_anim": "jump",
+            "duration": 0.5
+        },
+        {
+            "from_anim": "jump",
+            "to_anim": "walk",
+            "duration": 0.5
+        },
+        {
+            "from_anim": "roar",
+            "to_anim": "jump",
+            "duration": 0.5
+        },
+        {
+            "from_anim": "jump",
+            "to_anim": "roar",
+            "duration": 0.5
+        }
+    ]
+}
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index c84df02f..7cffc429 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -11,6 +11,11 @@ namespace
 {
     class game_system final : public ecs::system {
     public:
+        game_system(gobject_iptr raptor)
+        : raptor_gobj_(raptor) {}
+
+        ~game_system() noexcept override {}
+
         void process(ecs::registry& owner) override {
             E2D_UNUSED(owner);
             const keyboard& k = the<input>().keyboard();
@@ -26,7 +31,35 @@ namespace
             if ( k.is_key_pressed(keyboard_key::lsuper) && k.is_key_just_released(keyboard_key::enter) ) {
                 the<window>().toggle_fullscreen(!the<window>().fullscreen());
             }
+            
+            // use keys R, J, G to start animations
+            if ( raptor_gobj_ ) {
+                if ( k.is_key_just_pressed(keyboard_key::r) ) {
+                    auto player = raptor_gobj_->get_component<spine_player>();
+                    if ( player ) {
+                        (*player).set_animation(0, "roar")
+                            .add_animation(0, "walk", true);
+                    }
+                }
+                if ( k.is_key_just_pressed(keyboard_key::j) ) {
+                    auto player = raptor_gobj_->get_component<spine_player>();
+                    if ( player ) {
+                        (*player).set_animation(0, "jump")
+                            .add_animation(0, "walk", true);
+                    }
+                }
+                if ( k.is_key_just_pressed(keyboard_key::g) ) {
+                    auto player = raptor_gobj_->get_component<spine_player>();
+                    if ( player ) {
+                        (*player).set_animation(1, "gun-grab")
+                            .add_animation(1, "gun-holster", secf(3.0f));
+                    }
+                }
+            }
         }
+
+    private:
+        gobject_iptr raptor_gobj_;
     };
     
     class camera_system final : public ecs::system {
@@ -69,7 +102,6 @@ namespace
 
             node_iptr scene_r = scene_i->get_component<actor>().get().node();
             
-        #if 1
             auto coin_i = the<world>().instantiate();
             coin_i->entity_filler()
                 .component<actor>(node::create(coin_i, scene_r))
@@ -80,42 +112,22 @@ namespace
                     .set_animation(0, "animation", true));
             
             node_iptr coin_n = coin_i->get_component<actor>().get().node();
-            coin_n->scale(v3f(0.5f));
-            coin_n->translation(v3f{150.0f, 0.0f, 0.0f});
+            coin_n->scale(v3f(0.125f));
+            coin_n->translation(v3f{200.0f, 200.0f, 0.0f});
 
-            auto raptor_i = the<world>().instantiate();
-            raptor_i->entity_filler()
-                .component<actor>(node::create(raptor_i, scene_r))
+            raptor_gobj_ = the<world>().instantiate();
+            raptor_gobj_->entity_filler()
+                .component<actor>(node::create(raptor_gobj_, scene_r))
                 .component<renderer>(renderer()
                     .materials({spine_mat}))
                 .component<spine_renderer>(spine_renderer(spine_raptor))
                 .component<spine_player>(spine_player(spine_raptor)
-                    .set_animation(0, "walk", true)
-                    .add_animation(1, "gun-grab", false, secf(2.0f)));
+                    .set_animation(0, "walk", true));
             
-            node_iptr raptor_n = raptor_i->get_component<actor>().get().node();
+            node_iptr raptor_n = raptor_gobj_->get_component<actor>().get().node();
             raptor_n->scale(v3f(0.25f));
-            raptor_n->translation(v3f{-170.f, -100.f, 0.0f});
+            raptor_n->translation(v3f{-80.f, -100.f, 0.0f});
 
-        #else
-            // performace test
-            for ( std::size_t i = 0; i < 20; ++i )
-            for ( std::size_t j = 0; j < 40; ++j ) {
-                auto spine_i = the<world>().instantiate();
-                spine_i->entity_filler()
-                    .component<actor>(node::create(spine_i, scene_r))
-                    .component<renderer>(renderer()
-                        .materials({spine_mat}))
-                    .component<spine_renderer>(spine_renderer(spine_raptor))
-                    .component<spine_player>(spine_player(spine_raptor)
-                        .set_animation(0, "walk", true)
-                        .add_animation(1, "gun-grab", false, secf(2.0f)));
-            
-                node_iptr spine_n = spine_i->get_component<actor>().get().node();
-                spine_n->scale(v3f(0.05f));
-                spine_n->translation(v3f{-400.f, -300.f, 0.0f} + v3f{j * 30.f, i * 30.f, 0});
-            }
-        #endif
             return true;
         }
 
@@ -130,11 +142,14 @@ namespace
 
         bool create_systems() {
             ecs::registry_filler(the<world>().registry())
-                .system<game_system>(world::priority_update)
+                .system<game_system>(world::priority_update, raptor_gobj_)
                 .system<camera_system>(world::priority_pre_render)
                 .system<spine_system>(world::priority_update);
             return true;
         }
+
+    private:
+        gobject_iptr raptor_gobj_;
     };
 }
 
diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
index 178f4a28..e1bfb2f7 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -32,10 +32,7 @@ namespace
             "scale" : { "type" : "number" },
             "atlas" : { "$ref" : "#/common_definitions/address" },
             "premultiplied_alpha" : { "type" : "boolean" },
-            "mix_animations" : {
-                "type" : "array",
-                "items" : { "$ref": "#/definitions/spine_animation_mix_array" }
-            }
+            "mix_animations" : { "$ref": "#/definitions/spine_animation_mix_array" }
         },
         "definitions" : {
             "spine_animation_mix_array" : {
diff --git a/sources/enduro2d/high/components/spine_player.cpp b/sources/enduro2d/high/components/spine_player.cpp
index 7c7f9bc3..157232c9 100644
--- a/sources/enduro2d/high/components/spine_player.cpp
+++ b/sources/enduro2d/high/components/spine_player.cpp
@@ -41,6 +41,10 @@ namespace e2d
         return *this;
     }
 
+    spine_player& spine_player::add_animation(u32 track, const str& name, secf delay) {
+        return add_animation(track, name, false, delay);
+    }
+
     spine_player& spine_player::add_animation(u32 track, const str& name, bool loop, secf delay) {
         E2D_ASSERT(model_ && animation_);
         E2D_ASSERT(track < max_track_count);
diff --git a/sources/enduro2d/high/spine_model.cpp b/sources/enduro2d/high/spine_model.cpp
index c78b54aa..e1f28b66 100644
--- a/sources/enduro2d/high/spine_model.cpp
+++ b/sources/enduro2d/high/spine_model.cpp
@@ -80,8 +80,11 @@ namespace e2d
 
     spine_model& spine_model::mix_animations(const str& from, const str& to, secf duration) {
         E2D_ASSERT(animation_);
-       spAnimationStateData_setMixByName(animation_.get(), from.c_str(), to.c_str(), duration.value);
-       return *this;
+        E2D_ASSERT(spSkeletonData_findAnimation(animation_->skeletonData, from.c_str()));
+        E2D_ASSERT(spSkeletonData_findAnimation(animation_->skeletonData, to.c_str()));
+
+        spAnimationStateData_setMixByName(animation_.get(), from.c_str(), to.c_str(), duration.value);
+        return *this;
     }
 
     const spine_model::atlas_ptr& spine_model::atlas() const noexcept {
diff --git a/sources/enduro2d/high/systems/spine_system.cpp b/sources/enduro2d/high/systems/spine_system.cpp
index 88a480c4..deaa31e6 100644
--- a/sources/enduro2d/high/systems/spine_system.cpp
+++ b/sources/enduro2d/high/systems/spine_system.cpp
@@ -14,10 +14,11 @@
 
 namespace e2d
 {
-    spine_system::spine_system()
-    {}
+    spine_system::spine_system() {}
 
-    spine_system::~spine_system() noexcept = default;
+    spine_system::~spine_system() noexcept {
+        spAnimationState_disposeStatics();
+    }
 
     void spine_system::process(ecs::registry& owner) {
         float dt = the<engine>().delta_time();

From 5f469a8ac38e168890553c51842e696368893f8f Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Tue, 6 Aug 2019 12:59:04 +0300
Subject: [PATCH 050/108] added default animation mix, log errors

---
 .../enduro2d/high/components/spine_player.hpp | 17 ++++++---
 .../high/components/spine_renderer.hpp        |  6 +--
 headers/enduro2d/high/spine_model.hpp         |  1 +
 .../high/assets/spine_model_asset.cpp         | 10 +++++
 .../enduro2d/high/components/spine_player.cpp | 37 +++++++++++++++----
 .../high/components/spine_renderer.cpp        | 10 +++--
 sources/enduro2d/high/spine_model.cpp         |  6 +++
 7 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/headers/enduro2d/high/components/spine_player.hpp b/headers/enduro2d/high/components/spine_player.hpp
index ae2a15a9..c60bd059 100644
--- a/headers/enduro2d/high/components/spine_player.hpp
+++ b/headers/enduro2d/high/components/spine_player.hpp
@@ -21,16 +21,21 @@ namespace e2d
     public:
         spine_player() = default;
         spine_player(const spine_model_asset::ptr& model);
+
+        spine_player& time_scale(float value) noexcept;
+        [[nodiscard]] float time_scale() const noexcept;
+
+        [[nodiscard]] bool has_animation(const str& name) const noexcept;
         
-        spine_player& set_animation(u32 track, const str& name, bool loop = false);
+        spine_player& set_animation(u32 track, const str& name, bool loop = false) noexcept;
 
-        spine_player& add_animation(u32 track, const str& name, bool loop, secf delay = secf(0.0f));
-        spine_player& add_animation(u32 track, const str& name, secf delay = secf(0.0f));
+        spine_player& add_animation(u32 track, const str& name, bool loop, secf delay = secf(0.0f)) noexcept;
+        spine_player& add_animation(u32 track, const str& name, secf delay = secf(0.0f)) noexcept;
 
-        spine_player& add_empty_animation(u32 track, secf duration, secf delay = secf(0.0f));
+        spine_player& add_empty_animation(u32 track, secf duration, secf delay = secf(0.0f)) noexcept;
 
-        spine_player& clear(u32 track);
-        spine_player& clear();
+        spine_player& clear(u32 track) noexcept;
+        spine_player& clear() noexcept;
         
         const animation_ptr& animation() const noexcept;
         const spine_model_asset::ptr& model() const noexcept;
diff --git a/headers/enduro2d/high/components/spine_renderer.hpp b/headers/enduro2d/high/components/spine_renderer.hpp
index fcf2d9e2..f7b6ab8d 100644
--- a/headers/enduro2d/high/components/spine_renderer.hpp
+++ b/headers/enduro2d/high/components/spine_renderer.hpp
@@ -27,9 +27,9 @@ namespace e2d
         spine_renderer() = default;
         spine_renderer(const spine_model_asset::ptr& model);
         
-        spine_renderer& model(const spine_model_asset::ptr& value);
-        spine_renderer& skin(const str& value);
-        spine_renderer& attachment(const str& slot, const str& name);
+        spine_renderer& model(const spine_model_asset::ptr& value) noexcept;
+        spine_renderer& skin(const str& value) noexcept;
+        spine_renderer& attachment(const str& slot, const str& name) noexcept;
 
         const skeleton_ptr& skeleton() const noexcept;
         const clipping_ptr& clipper() const noexcept;
diff --git a/headers/enduro2d/high/spine_model.hpp b/headers/enduro2d/high/spine_model.hpp
index 70f6a5e9..b82d6d62 100644
--- a/headers/enduro2d/high/spine_model.hpp
+++ b/headers/enduro2d/high/spine_model.hpp
@@ -40,6 +40,7 @@ namespace e2d
         spine_model& set_atlas(atlas_ptr atlas, bool premultiplied_alpha);
 
         spine_model& mix_animations(const str& from, const str& to, secf duration);
+        spine_model& set_default_mix(secf duration);
 
         const atlas_ptr& atlas() const noexcept;
         const animation_data_ptr& animation() const noexcept;
diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
index e1bfb2f7..13a05043 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -32,6 +32,7 @@ namespace
             "scale" : { "type" : "number" },
             "atlas" : { "$ref" : "#/common_definitions/address" },
             "premultiplied_alpha" : { "type" : "boolean" },
+            "default_mix" : { "type" : "number" },
             "mix_animations" : { "$ref": "#/definitions/spine_animation_mix_array" }
         },
         "definitions" : {
@@ -193,6 +194,15 @@ namespace
         content.set_atlas(atlas, pma);
         content.set_skeleton(skeleton);
 
+        secf default_mix(0.0f);
+        if ( root.HasMember("default_mix") ) {
+            if ( json_utils::try_parse_value(root["default_mix"], default_mix.value) ) {
+                content.set_default_mix(default_mix);
+            } else {
+                the<debug>().error("SPINE: Incorrect formating of 'default_mix' property");
+            } 
+        }
+
         if ( root.HasMember("mix_animations") ) {
             const auto& mix_animations_json = root["mix_animations"];
             if ( !parse_mix_animations(mix_animations_json, content) ) {
diff --git a/sources/enduro2d/high/components/spine_player.cpp b/sources/enduro2d/high/components/spine_player.cpp
index 157232c9..743907f3 100644
--- a/sources/enduro2d/high/components/spine_player.cpp
+++ b/sources/enduro2d/high/components/spine_player.cpp
@@ -26,7 +26,28 @@ namespace e2d
             spAnimationState_dispose);
     }
     
-    spine_player& spine_player::set_animation(u32 track, const str& name, bool loop) {
+    spine_player& spine_player::time_scale(float value) noexcept {
+        E2D_ASSERT(animation_);
+        animation_->timeScale = value;
+        return *this;
+    }
+
+    float spine_player::time_scale() const noexcept {
+        E2D_ASSERT(animation_);
+        return animation_->timeScale;
+    }
+    
+    bool spine_player::has_animation(const str& name) const noexcept {
+        if ( !model_ ) {
+            return false;
+        }
+        spAnimation* anim = spSkeletonData_findAnimation(
+            model_->content().skeleton().operator->(),
+            name.c_str());
+        return anim != nullptr;
+    }
+
+    spine_player& spine_player::set_animation(u32 track, const str& name, bool loop) noexcept {
         E2D_ASSERT(model_ && animation_);
         E2D_ASSERT(track < max_track_count);
         spAnimation* anim = spSkeletonData_findAnimation(
@@ -34,18 +55,18 @@ namespace e2d
             name.c_str());
 
         if ( !anim ) {
-            E2D_ASSERT(false);  // TODO: exception?
+            the<debug>().error("SPINE_PLAYER: animation '%0' is not found", name);
             return *this;
         }
         spAnimationState_setAnimation(animation_.get(), track, anim, loop);
         return *this;
     }
 
-    spine_player& spine_player::add_animation(u32 track, const str& name, secf delay) {
+    spine_player& spine_player::add_animation(u32 track, const str& name, secf delay) noexcept {
         return add_animation(track, name, false, delay);
     }
 
-    spine_player& spine_player::add_animation(u32 track, const str& name, bool loop, secf delay) {
+    spine_player& spine_player::add_animation(u32 track, const str& name, bool loop, secf delay) noexcept {
         E2D_ASSERT(model_ && animation_);
         E2D_ASSERT(track < max_track_count);
         spAnimation* anim = spSkeletonData_findAnimation(
@@ -53,28 +74,28 @@ namespace e2d
             name.c_str());
 
         if ( !anim ) {
-            E2D_ASSERT(false);  // TODO: exception?
+            the<debug>().error("SPINE_PLAYER: animation '%0' is not found", name);
             return *this;
         }
         spAnimationState_addAnimation(animation_.get(), track, anim, loop, delay.value);
         return *this;
     }
     
-    spine_player& spine_player::add_empty_animation(u32 track, secf duration, secf delay) {
+    spine_player& spine_player::add_empty_animation(u32 track, secf duration, secf delay) noexcept {
         E2D_ASSERT(animation_);
         E2D_ASSERT(track < max_track_count);
         spAnimationState_addEmptyAnimation(animation_.get(), track, duration.value, delay.value);
         return *this;
     }
     
-    spine_player& spine_player::clear(u32 track) {
+    spine_player& spine_player::clear(u32 track) noexcept {
         E2D_ASSERT(animation_);
         E2D_ASSERT(track < max_track_count);
         spAnimationState_clearTrack(animation_.get(), track);
         return *this;
     }
     
-    spine_player& spine_player::clear() {
+    spine_player& spine_player::clear() noexcept {
         E2D_ASSERT(animation_);
         spAnimationState_clearTracks(animation_.get());
         return *this;
diff --git a/sources/enduro2d/high/components/spine_renderer.cpp b/sources/enduro2d/high/components/spine_renderer.cpp
index 41f7499b..afbbef13 100644
--- a/sources/enduro2d/high/components/spine_renderer.cpp
+++ b/sources/enduro2d/high/components/spine_renderer.cpp
@@ -15,7 +15,7 @@ namespace e2d
         this->model(model);
     }
     
-    spine_renderer& spine_renderer::model(const spine_model_asset::ptr& value) {
+    spine_renderer& spine_renderer::model(const spine_model_asset::ptr& value) noexcept {
         E2D_ASSERT(value);
         E2D_ASSERT(value->content().skeleton());
         E2D_ASSERT(value->content().atlas());
@@ -26,15 +26,17 @@ namespace e2d
         return *this;
     }
 
-    spine_renderer& spine_renderer::skin(const str& value) {
+    spine_renderer& spine_renderer::skin(const str& value) noexcept {
         spSkeleton_setSkinByName(skeleton_.get(), value.empty() ? nullptr : value.c_str());
         return *this;
     }
 
-    spine_renderer& spine_renderer::attachment(const str& slot, const str& name) {
+    spine_renderer& spine_renderer::attachment(const str& slot, const str& name) noexcept {
         E2D_ASSERT(!slot.empty());
         E2D_ASSERT(!name.empty());
-        spSkeleton_setAttachment(skeleton_.get(), slot.c_str(), name.c_str()); // TODO: check result
+        if ( !spSkeleton_setAttachment(skeleton_.get(), slot.c_str(), name.c_str()) ) {
+            the<debug>().error("SPINE_RENDERER: can't set attachment '%0' to slot '%1'", name, slot);
+        }
         return *this;
     }
 
diff --git a/sources/enduro2d/high/spine_model.cpp b/sources/enduro2d/high/spine_model.cpp
index e1f28b66..0575e647 100644
--- a/sources/enduro2d/high/spine_model.cpp
+++ b/sources/enduro2d/high/spine_model.cpp
@@ -86,6 +86,12 @@ namespace e2d
         spAnimationStateData_setMixByName(animation_.get(), from.c_str(), to.c_str(), duration.value);
         return *this;
     }
+    
+    spine_model& spine_model::set_default_mix(secf duration) {
+        E2D_ASSERT(animation_);
+        animation_->defaultMix = duration.value;
+        return *this;
+    }
 
     const spine_model::atlas_ptr& spine_model::atlas() const noexcept {
         return atlas_;

From 98fa28e521db69a01cdee8376c2c8d7029b5e2e8 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Tue, 6 Aug 2019 19:39:04 +0300
Subject: [PATCH 051/108] label supports sdf

---
 headers/enduro2d/high/components/label.hpp    | 78 +++++++++++++++++++
 samples/bin/library/sdf_shader.frag           | 24 ++++--
 sources/enduro2d/high/components/label.cpp    | 62 ++++++++++++++-
 .../enduro2d/high/systems/label_system.cpp    | 10 ++-
 4 files changed, 165 insertions(+), 9 deletions(-)

diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
index 47de759d..7ca7b027 100644
--- a/headers/enduro2d/high/components/label.hpp
+++ b/headers/enduro2d/high/components/label.hpp
@@ -54,6 +54,24 @@ namespace e2d
 
         label& filtering(bool value) noexcept;
         bool filtering() const noexcept;
+
+        label& smoothing(f32 value) noexcept;
+        f32 smoothing() const noexcept;
+
+        label& outline_distance(f32 value) noexcept;
+        f32 outline_distance() const noexcept;
+
+        label& outline_color(const color32& value) noexcept;
+        color32 outline_color() const noexcept;
+
+        label& shadow_smoothing(f32 value) noexcept;
+        f32 shadow_smoothing() const noexcept;
+
+        label& shadow_offset(const v2f& value) noexcept;
+        v2f shadow_offset() const noexcept;
+
+        label& shadow_color(const color32& value) noexcept;
+        color32 shadow_color() const noexcept;
     private:
         str32 text_;
         font_asset::ptr font_;
@@ -62,6 +80,12 @@ namespace e2d
         haligns haligh_ = haligns::left;
         valigns valign_ = valigns::baseline;
         bool filtering_ = true;
+        f32 smoothing_ = 0.f;
+        f32 outline_distance_ = 0.f;
+        color32 outline_color_ = color32::white();
+        f32 shadow_smoothing_ = 0.f;
+        v2f shadow_offset_;
+        color32 shadow_color_ = color32::white();
     };
 
     template <>
@@ -160,4 +184,58 @@ namespace e2d
     inline bool label::filtering() const noexcept {
         return filtering_;
     }
+
+    inline label& label::smoothing(f32 value) noexcept {
+        smoothing_ = value;
+        return *this;
+    }
+
+    inline f32 label::smoothing() const noexcept {
+        return smoothing_;
+    }
+
+    inline label& label::outline_distance(f32 value) noexcept {
+        outline_distance_ = value;
+        return *this;
+    }
+
+    inline f32 label::outline_distance() const noexcept {
+        return outline_distance_;
+    }
+
+    inline label& label::outline_color(const color32& value) noexcept {
+        outline_color_ = value;
+        return *this;
+    }
+
+    inline color32 label::outline_color() const noexcept {
+        return outline_color_;
+    }
+
+    inline label& label::shadow_smoothing(f32 value) noexcept {
+        shadow_smoothing_ = value;
+        return *this;
+    }
+
+    inline f32 label::shadow_smoothing() const noexcept {
+        return shadow_smoothing_;
+    }
+
+    inline label& label::shadow_offset(const v2f& value) noexcept {
+        shadow_offset_ = value;
+        return *this;
+    }
+
+    inline v2f label::shadow_offset() const noexcept {
+        return shadow_offset_;
+    }
+
+    inline label& label::shadow_color(const color32& value) noexcept {
+        shadow_color_ = value;
+        return *this;
+    }
+
+    inline color32 label::shadow_color() const noexcept {
+        return shadow_color_;
+    }
 }
diff --git a/samples/bin/library/sdf_shader.frag b/samples/bin/library/sdf_shader.frag
index 052e5143..9175000e 100644
--- a/samples/bin/library/sdf_shader.frag
+++ b/samples/bin/library/sdf_shader.frag
@@ -1,14 +1,24 @@
 uniform sampler2D u_texture;
+uniform lowp float u_smoothing;
+uniform lowp float u_outline_distance;// Between 0 and 0.5, 0 = thick outline, 0.5 = no outline
+uniform lowp float u_shadow_smoothing;// Between 0 and 0.5
+uniform lowp vec2 u_shadow_offset;    // Between 0 and spread / texture_size
+uniform lowp vec4 u_shadow_color;
+uniform lowp vec4 u_outline_color;
 
 varying vec2 v_st0;
 varying vec4 v_color;
 
-const float smoothing = 1.0 / 16.0;
-
 void main() {
-    vec2 st = vec2(v_st0.s, 1.0 - v_st0.t);
-    gl_FragColor = texture2D(u_texture, st) * v_color;
-    float distance = texture2D(u_texture, st).a;
-    float alpha = smoothstep(0.5 - smoothing, 0.5 + smoothing, distance);
-    gl_FragColor = vec4(v_color.rgb, v_color.a * alpha);
+    lowp vec2  st = vec2(v_st0.s, 1.0 - v_st0.t);
+    lowp float distance = texture2D(u_texture, st).a;
+    lowp float outline_factor = smoothstep(0.5 - u_smoothing, 0.5 + u_smoothing, distance);
+    lowp vec4  color = mix(u_outline_color, v_color, outline_factor);
+    lowp float alpha = smoothstep(u_outline_distance - u_smoothing, u_outline_distance + u_smoothing, distance);
+    lowp vec4  text = vec4(color.rgb, color.a * alpha);
+    lowp float shadow_distance = texture2D(u_texture, st - u_shadow_offset).a;
+    lowp float shadow_alpha = smoothstep(0.5 - u_shadow_smoothing, 0.5 + u_shadow_smoothing, shadow_distance);
+    lowp vec4  shadow = vec4(u_shadow_color.rgb, u_shadow_color.a * shadow_alpha);
+
+    gl_FragColor = mix(shadow, text, text.a);
 }
diff --git a/sources/enduro2d/high/components/label.cpp b/sources/enduro2d/high/components/label.cpp
index 6347e1bd..5be2edbe 100644
--- a/sources/enduro2d/high/components/label.cpp
+++ b/sources/enduro2d/high/components/label.cpp
@@ -43,7 +43,13 @@ namespace e2d
             "width" : { "type" : "number" },
             "halign" : { "$ref": "#/definitions/haligns" },
             "valign" : { "$ref": "#/definitions/valigns" },
-            "filtering" : { "type" : "boolean" }
+            "filtering" : { "type" : "boolean" },
+            "smoothing" : { "type" : "number" },
+            "outline_distance" : { "type" : "number" },
+            "outline_color" : { "$ref": "#/common_definitions/color" },
+            "shadow_smoothing" : { "type" : "number" },
+            "shadow_offset" : { "$ref": "#/common_definitions/v2" },
+            "shadow_color" : { "$ref": "#/common_definitions/color" }
         },
         "definitions" : {
             "haligns" : {
@@ -138,6 +144,60 @@ namespace e2d
             component.filtering(filtering);
         }
 
+        if ( ctx.root.HasMember("smoothing") ) {
+            f32 smoothing = component.filtering();
+            if ( !json_utils::try_parse_value(ctx.root["smoothing"], smoothing) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'smoothing' property");
+                return false;
+            }
+            component.smoothing(smoothing);
+        }
+
+        if ( ctx.root.HasMember("outline_distance") ) {
+            f32 outline_distance = component.outline_distance();
+            if ( !json_utils::try_parse_value(ctx.root["outline_distance"], outline_distance) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'outline_distance' property");
+                return false;
+            }
+            component.outline_distance(outline_distance);
+        }
+
+        if ( ctx.root.HasMember("outline_color") ) {
+            color32 outline_color = component.outline_color();
+            if ( !json_utils::try_parse_value(ctx.root["outline_color"], outline_color) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'outline_color' property");
+                return false;
+            }
+            component.outline_color(outline_color);
+        }
+
+        if ( ctx.root.HasMember("shadow_smoothing") ) {
+            f32 shadow_smoothing = component.shadow_smoothing();
+            if ( !json_utils::try_parse_value(ctx.root["shadow_smoothing"], shadow_smoothing) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'shadow_smoothing' property");
+                return false;
+            }
+            component.shadow_smoothing(shadow_smoothing);
+        }
+
+        if ( ctx.root.HasMember("shadow_offset") ) {
+            v2f shadow_offset = component.shadow_offset();
+            if ( !json_utils::try_parse_value(ctx.root["shadow_offset"], shadow_offset) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'shadow_offset' property");
+                return false;
+            }
+            component.shadow_offset(shadow_offset);
+        }
+
+        if ( ctx.root.HasMember("shadow_color") ) {
+            color32 shadow_color = component.shadow_color();
+            if ( !json_utils::try_parse_value(ctx.root["shadow_color"], shadow_color) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'shadow_color' property");
+                return false;
+            }
+            component.shadow_color(shadow_color);
+        }
+
         return true;
     }
 
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index c37763b5..ec1f49df 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -284,11 +284,19 @@ namespace e2d
                         ? render::sampler_mag_filter::linear
                         : render::sampler_mag_filter::nearest;
 
+                    color sc(l.shadow_color());
+                    color oc(l.outline_color());
                     r.properties(render::property_block()
                         .sampler("u_texture", render::sampler_state()
                             .texture(texture_p->content())
                             .min_filter(min_filter)
-                            .mag_filter(mag_filter)));
+                            .mag_filter(mag_filter))
+                        .property("u_smoothing", l.smoothing())
+                        .property("u_outline_distance", l.outline_distance())
+                        .property("u_shadow_smoothing", l.shadow_smoothing())
+                        .property("u_shadow_offset", l.shadow_offset())
+                        .property("u_shadow_color", make_vec4(sc.r, sc.g, sc.b, sc.a))
+                        .property("u_outline_color", make_vec4(oc.r, oc.g, oc.b, oc.a)));
                 }
             });
 

From 54f32a56a4a03733ea0019555311f6185ccb9e79 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Wed, 7 Aug 2019 11:13:56 +0300
Subject: [PATCH 052/108] removed lowp

---
 samples/bin/library/sdf_shader.frag | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/samples/bin/library/sdf_shader.frag b/samples/bin/library/sdf_shader.frag
index 9175000e..46e83d8a 100644
--- a/samples/bin/library/sdf_shader.frag
+++ b/samples/bin/library/sdf_shader.frag
@@ -1,24 +1,24 @@
 uniform sampler2D u_texture;
-uniform lowp float u_smoothing;
-uniform lowp float u_outline_distance;// Between 0 and 0.5, 0 = thick outline, 0.5 = no outline
-uniform lowp float u_shadow_smoothing;// Between 0 and 0.5
-uniform lowp vec2 u_shadow_offset;    // Between 0 and spread / texture_size
-uniform lowp vec4 u_shadow_color;
-uniform lowp vec4 u_outline_color;
+uniform float u_smoothing;
+uniform float u_outline_distance;//between 0 and 0.5, 0 = thick outline, 0.5 = no outline
+uniform float u_shadow_smoothing;//between 0 and 0.5
+uniform vec2 u_shadow_offset;    //between 0 and spread / texture_size
+uniform vec4 u_shadow_color;
+uniform vec4 u_outline_color;
 
 varying vec2 v_st0;
 varying vec4 v_color;
 
 void main() {
-    lowp vec2  st = vec2(v_st0.s, 1.0 - v_st0.t);
-    lowp float distance = texture2D(u_texture, st).a;
-    lowp float outline_factor = smoothstep(0.5 - u_smoothing, 0.5 + u_smoothing, distance);
-    lowp vec4  color = mix(u_outline_color, v_color, outline_factor);
-    lowp float alpha = smoothstep(u_outline_distance - u_smoothing, u_outline_distance + u_smoothing, distance);
-    lowp vec4  text = vec4(color.rgb, color.a * alpha);
-    lowp float shadow_distance = texture2D(u_texture, st - u_shadow_offset).a;
-    lowp float shadow_alpha = smoothstep(0.5 - u_shadow_smoothing, 0.5 + u_shadow_smoothing, shadow_distance);
-    lowp vec4  shadow = vec4(u_shadow_color.rgb, u_shadow_color.a * shadow_alpha);
+    vec2  st = vec2(v_st0.s, 1.0 - v_st0.t);
+    float distance = texture2D(u_texture, st).a;
+    float outline_factor = smoothstep(0.5 - u_smoothing, 0.5 + u_smoothing, distance);
+    vec4  color = mix(u_outline_color, v_color, outline_factor);
+    float alpha = smoothstep(u_outline_distance - u_smoothing, u_outline_distance + u_smoothing, distance);
+    vec4  text = vec4(color.rgb, color.a * alpha);
+    float shadow_distance = texture2D(u_texture, st - u_shadow_offset).a;
+    float shadow_alpha = smoothstep(0.5 - u_shadow_smoothing, 0.5 + u_shadow_smoothing, shadow_distance);
+    vec4  shadow = vec4(u_shadow_color.rgb, u_shadow_color.a * shadow_alpha);
 
     gl_FragColor = mix(shadow, text, text.a);
 }

From f0605be9279a727baf748f4a5ef2d7692fba28ce Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Wed, 7 Aug 2019 16:00:52 +0300
Subject: [PATCH 053/108] bug fix: removed second camera

---
 samples/sources/sample_07/sample_07.cpp | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index c9085b8b..2b4e4bb8 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -48,7 +48,6 @@ namespace
     public:
         bool initialize() final {
             return create_scene()
-                && create_camera()
                 && create_systems();
         }
     private:
@@ -59,16 +58,6 @@ namespace
             : nullptr;
             return !!scene_go;
         }
-
-        bool create_camera() {
-            auto camera_i = the<world>().instantiate();
-            camera_i->entity_filler()
-                .component<camera>(camera()
-                    .background({1.f, 0.4f, 0.f, 1.f}))
-                .component<actor>(node::create(camera_i));
-            return true;
-        }
-
         bool create_systems() {
             ecs::registry_filler(the<world>().registry())
                 .system<game_system>(world::priority_update)

From a9763427335c896bbf76600712c83c2f1ee6b01f Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Wed, 7 Aug 2019 16:12:32 +0300
Subject: [PATCH 054/108] removed filtering

---
 headers/enduro2d/high/components/label.hpp    | 19 +++----------------
 sources/enduro2d/high/components/label.cpp    | 12 +-----------
 .../enduro2d/high/systems/label_system.cpp    | 12 ++----------
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
index 7ca7b027..55d46503 100644
--- a/headers/enduro2d/high/components/label.hpp
+++ b/headers/enduro2d/high/components/label.hpp
@@ -52,9 +52,6 @@ namespace e2d
         label& valigh(valigns value) noexcept;
         [[nodiscard]] valigns valign() const noexcept;
 
-        label& filtering(bool value) noexcept;
-        bool filtering() const noexcept;
-
         label& smoothing(f32 value) noexcept;
         f32 smoothing() const noexcept;
 
@@ -77,9 +74,8 @@ namespace e2d
         font_asset::ptr font_;
         color32 tint_ = color32::white();
         f32 width_ = 0.f;
-        haligns haligh_ = haligns::left;
+        haligns halign_ = haligns::left;
         valigns valign_ = valigns::baseline;
-        bool filtering_ = true;
         f32 smoothing_ = 0.f;
         f32 outline_distance_ = 0.f;
         color32 outline_color_ = color32::white();
@@ -159,12 +155,12 @@ namespace e2d
     }
 
     inline label& label::haligh(haligns value) noexcept {
-        haligh_ = value;
+        halign_ = value;
         return *this;
     }
 
     inline label::haligns label::halign() const noexcept {
-        return haligh_;
+        return halign_;
     }
 
     inline label& label::valigh(valigns value) noexcept {
@@ -176,15 +172,6 @@ namespace e2d
         return valign_;
     }
 
-    inline label& label::filtering(bool value) noexcept {
-        filtering_ = value;
-        return *this;
-    }
-
-    inline bool label::filtering() const noexcept {
-        return filtering_;
-    }
-
     inline label& label::smoothing(f32 value) noexcept {
         smoothing_ = value;
         return *this;
diff --git a/sources/enduro2d/high/components/label.cpp b/sources/enduro2d/high/components/label.cpp
index 5be2edbe..7ee187b1 100644
--- a/sources/enduro2d/high/components/label.cpp
+++ b/sources/enduro2d/high/components/label.cpp
@@ -43,7 +43,6 @@ namespace e2d
             "width" : { "type" : "number" },
             "halign" : { "$ref": "#/definitions/haligns" },
             "valign" : { "$ref": "#/definitions/valigns" },
-            "filtering" : { "type" : "boolean" },
             "smoothing" : { "type" : "number" },
             "outline_distance" : { "type" : "number" },
             "outline_color" : { "$ref": "#/common_definitions/color" },
@@ -135,17 +134,8 @@ namespace e2d
             component.valigh(valign);
         }
 
-        if ( ctx.root.HasMember("filtering") ) {
-            bool filtering = component.filtering();
-            if ( !json_utils::try_parse_value(ctx.root["filtering"], filtering) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'filtering' property");
-                return false;
-            }
-            component.filtering(filtering);
-        }
-
         if ( ctx.root.HasMember("smoothing") ) {
-            f32 smoothing = component.filtering();
+            f32 smoothing = component.smoothing();
             if ( !json_utils::try_parse_value(ctx.root["smoothing"], smoothing) ) {
                 the<debug>().error("LABEL: Incorrect formatting of 'smoothing' property");
                 return false;
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index ec1f49df..0538d7b6 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -276,21 +276,13 @@ namespace e2d
                         return;
                     }
 
-                    const render::sampler_min_filter min_filter = l.filtering()
-                        ? render::sampler_min_filter::linear
-                        : render::sampler_min_filter::nearest;
-                    
-                    const render::sampler_mag_filter mag_filter = l.filtering()
-                        ? render::sampler_mag_filter::linear
-                        : render::sampler_mag_filter::nearest;
-
                     color sc(l.shadow_color());
                     color oc(l.outline_color());
                     r.properties(render::property_block()
                         .sampler("u_texture", render::sampler_state()
                             .texture(texture_p->content())
-                            .min_filter(min_filter)
-                            .mag_filter(mag_filter))
+                            .min_filter(render::sampler_min_filter::linear)
+                            .mag_filter(render::sampler_mag_filter::linear))
                         .property("u_smoothing", l.smoothing())
                         .property("u_outline_distance", l.outline_distance())
                         .property("u_shadow_smoothing", l.shadow_smoothing())

From 6609f4c07b3dc15b4c578d564a80de7ba3912a48 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 8 Aug 2019 19:35:58 +0700
Subject: [PATCH 055/108] explicit conversion buffer_view to buffer

---
 headers/enduro2d/utils/buffer_view.hpp   | 2 ++
 sources/enduro2d/utils/buffer_view.cpp   | 4 ++++
 untests/sources/untests_utils/buffer.cpp | 9 +++++++++
 3 files changed, 15 insertions(+)

diff --git a/headers/enduro2d/utils/buffer_view.hpp b/headers/enduro2d/utils/buffer_view.hpp
index 78a2eff0..7d2b81d1 100644
--- a/headers/enduro2d/utils/buffer_view.hpp
+++ b/headers/enduro2d/utils/buffer_view.hpp
@@ -37,6 +37,8 @@ namespace e2d
         std::size_t size() const noexcept;
         bool empty() const noexcept;
         void swap(buffer_view& other) noexcept;
+
+        explicit operator buffer();
     private:
         const void* data_ = nullptr;
         std::size_t size_ = 0;
diff --git a/sources/enduro2d/utils/buffer_view.cpp b/sources/enduro2d/utils/buffer_view.cpp
index 7788c6c6..754c8a4a 100644
--- a/sources/enduro2d/utils/buffer_view.cpp
+++ b/sources/enduro2d/utils/buffer_view.cpp
@@ -34,6 +34,10 @@ namespace e2d
         std::swap(data_, other.data_);
         std::swap(size_, other.size_);
     }
+
+    buffer_view::operator buffer() {
+        return buffer(data_, size_);
+    }
 }
 
 namespace e2d
diff --git a/untests/sources/untests_utils/buffer.cpp b/untests/sources/untests_utils/buffer.cpp
index 899317e7..f32bc204 100644
--- a/untests/sources/untests_utils/buffer.cpp
+++ b/untests/sources/untests_utils/buffer.cpp
@@ -273,4 +273,13 @@ TEST_CASE("buffer_view") {
         REQUIRE(buffer_view("hello",5) != buffer_view("hello, world",12));
         REQUIRE_FALSE(buffer_view("hello",5) == buffer_view("hello, world",12));
     }
+    {
+        buffer_view v0("hello",5);
+        buffer b0 = buffer(v0);
+        REQUIRE(v0 == b0);
+
+        buffer_view v1;
+        buffer b1 = buffer(v1);
+        REQUIRE(v1 == b1);
+    }
 }

From b697a8a0074c54398349ce269b3a88d3add10b53 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 8 Aug 2019 19:36:21 +0700
Subject: [PATCH 056/108] add tga and jpg to LFS

---
 .gitattributes | 2 ++
 .gitignore     | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index eafcbc92..2d406d4f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,6 +1,8 @@
 *.zip filter=lfs diff=lfs merge=lfs -text
 *.bin filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text
+*.tga filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
 *.obj filter=lfs diff=lfs merge=lfs -text
 *.e2d_mesh filter=lfs diff=lfs merge=lfs -text
 *.e2d_shape filter=lfs diff=lfs merge=lfs -text
diff --git a/.gitignore b/.gitignore
index 907d79a6..fbbb86d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .vs/*
 .vscode/*
 build/*
+.DS_Store
 CMakeSettings.json
-CMakeLists.txt.user
\ No newline at end of file
+CMakeLists.txt.user

From f8fda0c6457e4071bf84510a748b73d96bac16ed Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Thu, 8 Aug 2019 17:13:55 +0300
Subject: [PATCH 057/108] new sdf shader

---
 headers/enduro2d/high/components/label.hpp    | 83 ++++++++++++++-----
 samples/bin/library/sdf_shader.frag           | 34 ++++----
 samples/bin/library/sdf_shader.vert           |  2 +-
 sources/enduro2d/high/components/label.cpp    | 66 +++++++++++----
 .../enduro2d/high/systems/label_system.cpp    | 21 +++--
 5 files changed, 143 insertions(+), 63 deletions(-)

diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
index 55d46503..b589ed66 100644
--- a/headers/enduro2d/high/components/label.hpp
+++ b/headers/enduro2d/high/components/label.hpp
@@ -52,17 +52,26 @@ namespace e2d
         label& valigh(valigns value) noexcept;
         [[nodiscard]] valigns valign() const noexcept;
 
-        label& smoothing(f32 value) noexcept;
-        f32 smoothing() const noexcept;
+        label& char_width(f32 value) noexcept;
+        f32 char_width() const noexcept;
 
-        label& outline_distance(f32 value) noexcept;
-        f32 outline_distance() const noexcept;
+        label& char_edge(f32 value) noexcept;
+        f32 char_edge() const noexcept;
+
+        label& outline_width(f32 value) noexcept;
+        f32 outline_width() const noexcept;
+
+        label& outline_edge(f32 value) noexcept;
+        f32 outline_edge() const noexcept;
 
         label& outline_color(const color32& value) noexcept;
         color32 outline_color() const noexcept;
 
-        label& shadow_smoothing(f32 value) noexcept;
-        f32 shadow_smoothing() const noexcept;
+        label& shadow_width(f32 value) noexcept;
+        f32 shadow_width() const noexcept;
+
+        label& shadow_edge(f32 value) noexcept;
+        f32 shadow_edge() const noexcept;
 
         label& shadow_offset(const v2f& value) noexcept;
         v2f shadow_offset() const noexcept;
@@ -76,11 +85,14 @@ namespace e2d
         f32 width_ = 0.f;
         haligns halign_ = haligns::left;
         valigns valign_ = valigns::baseline;
-        f32 smoothing_ = 0.f;
-        f32 outline_distance_ = 0.f;
+        f32 char_width_ = 0.f;
+        f32 char_edge_ = 0.f;
+        f32 outline_width_ = 0.5f;
+        f32 outline_edge_ = 0.1f;
         color32 outline_color_ = color32::white();
-        f32 shadow_smoothing_ = 0.f;
-        v2f shadow_offset_;
+        f32 shadow_width_ = 0.f;
+        f32 shadow_edge_ = 0.f;
+        v2f shadow_offset_ = v2f::zero();
         color32 shadow_color_ = color32::white();
     };
 
@@ -172,22 +184,40 @@ namespace e2d
         return valign_;
     }
 
-    inline label& label::smoothing(f32 value) noexcept {
-        smoothing_ = value;
+    inline label& label::char_width(f32 value) noexcept {
+        char_width_ = value;
         return *this;
     }
 
-    inline f32 label::smoothing() const noexcept {
-        return smoothing_;
+    inline f32 label::char_width() const noexcept {
+        return char_width_;
     }
 
-    inline label& label::outline_distance(f32 value) noexcept {
-        outline_distance_ = value;
+    inline label& label::char_edge(f32 value) noexcept {
+        char_edge_ = value;
         return *this;
     }
 
-    inline f32 label::outline_distance() const noexcept {
-        return outline_distance_;
+    inline f32 label::char_edge() const noexcept {
+        return char_edge_;
+    }
+
+    inline label& label::outline_width(f32 value) noexcept {
+        outline_width_ = value;
+        return *this;
+    }
+
+    inline f32 label::outline_width() const noexcept {
+        return outline_width_;
+    }
+
+    inline label& label::outline_edge(f32 value) noexcept {
+        outline_edge_ = value;
+        return *this;
+    }
+
+    inline f32 label::outline_edge() const noexcept {
+        return outline_edge_;
     }
 
     inline label& label::outline_color(const color32& value) noexcept {
@@ -199,13 +229,22 @@ namespace e2d
         return outline_color_;
     }
 
-    inline label& label::shadow_smoothing(f32 value) noexcept {
-        shadow_smoothing_ = value;
+    inline label& label::shadow_width(f32 value) noexcept {
+        shadow_width_ = value;
         return *this;
     }
 
-    inline f32 label::shadow_smoothing() const noexcept {
-        return shadow_smoothing_;
+    inline f32 label::shadow_width() const noexcept {
+        return shadow_width_;
+    }
+
+    inline label& label::shadow_edge(f32 value) noexcept {
+        shadow_edge_ = value;
+        return *this;
+    }
+
+    inline f32 label::shadow_edge() const noexcept {
+        return shadow_edge_;
     }
 
     inline label& label::shadow_offset(const v2f& value) noexcept {
diff --git a/samples/bin/library/sdf_shader.frag b/samples/bin/library/sdf_shader.frag
index 46e83d8a..c6958018 100644
--- a/samples/bin/library/sdf_shader.frag
+++ b/samples/bin/library/sdf_shader.frag
@@ -1,24 +1,28 @@
 uniform sampler2D u_texture;
-uniform float u_smoothing;
-uniform float u_outline_distance;//between 0 and 0.5, 0 = thick outline, 0.5 = no outline
-uniform float u_shadow_smoothing;//between 0 and 0.5
-uniform vec2 u_shadow_offset;    //between 0 and spread / texture_size
-uniform vec4 u_shadow_color;
+uniform float u_char_width;
+uniform float u_char_edge;
+uniform float u_outline_width;
+uniform float u_outline_edge;
 uniform vec4 u_outline_color;
+uniform float u_shadow_width;
+uniform float u_shadow_edge;
+uniform vec2 u_shadow_offset;
+uniform vec4 u_shadow_color;
 
 varying vec2 v_st0;
 varying vec4 v_color;
 
 void main() {
-    vec2  st = vec2(v_st0.s, 1.0 - v_st0.t);
-    float distance = texture2D(u_texture, st).a;
-    float outline_factor = smoothstep(0.5 - u_smoothing, 0.5 + u_smoothing, distance);
-    vec4  color = mix(u_outline_color, v_color, outline_factor);
-    float alpha = smoothstep(u_outline_distance - u_smoothing, u_outline_distance + u_smoothing, distance);
-    vec4  text = vec4(color.rgb, color.a * alpha);
-    float shadow_distance = texture2D(u_texture, st - u_shadow_offset).a;
-    float shadow_alpha = smoothstep(0.5 - u_shadow_smoothing, 0.5 + u_shadow_smoothing, shadow_distance);
-    vec4  shadow = vec4(u_shadow_color.rgb, u_shadow_color.a * shadow_alpha);
+    float distance = 1.0 - texture2D(u_texture, v_st0).a;
+    float alpha = 1.0 - smoothstep(u_char_width, u_char_width + u_char_edge, distance);
 
-    gl_FragColor = mix(shadow, text, text.a);
+    float outline_alpha = 1.0 - smoothstep(u_outline_width, u_outline_width + u_outline_edge, distance);
+    float overall_alpha = alpha + (1.0 - alpha) * outline_alpha;
+    vec4 overall_color = mix(u_outline_color, v_color, alpha / overall_alpha);
+
+    float distance_shadow = 1.0 - texture2D(u_texture, v_st0 + u_shadow_offset).a;
+    float shadow_alpha = 1.0 - smoothstep(u_shadow_width, u_shadow_width + u_shadow_edge, distance_shadow);
+    vec4  shadow = vec4(u_shadow_color.rgb, shadow_alpha);
+
+    gl_FragColor = mix(shadow, overall_color, overall_alpha);
 }
diff --git a/samples/bin/library/sdf_shader.vert b/samples/bin/library/sdf_shader.vert
index 321b34fe..d0ca286c 100644
--- a/samples/bin/library/sdf_shader.vert
+++ b/samples/bin/library/sdf_shader.vert
@@ -9,7 +9,7 @@ varying vec2 v_st0;
 varying vec4 v_color;
 
 void main() {
-    v_st0 = a_st0;
+    v_st0 = vec2(a_st0.s, 1.0 - a_st0.t);;
     v_color = a_color0;
     gl_Position = vec4(a_vertex, 1.0) * u_matrix_m * u_matrix_vp;
 }
diff --git a/sources/enduro2d/high/components/label.cpp b/sources/enduro2d/high/components/label.cpp
index 7ee187b1..cc39607a 100644
--- a/sources/enduro2d/high/components/label.cpp
+++ b/sources/enduro2d/high/components/label.cpp
@@ -43,10 +43,13 @@ namespace e2d
             "width" : { "type" : "number" },
             "halign" : { "$ref": "#/definitions/haligns" },
             "valign" : { "$ref": "#/definitions/valigns" },
-            "smoothing" : { "type" : "number" },
-            "outline_distance" : { "type" : "number" },
+            "char_width" : { "type" : "number" },
+            "char_edge" : { "type" : "number" },
+            "outline_width" : { "type" : "number" },
+            "outline_edge" : { "type" : "number" },
             "outline_color" : { "$ref": "#/common_definitions/color" },
-            "shadow_smoothing" : { "type" : "number" },
+            "shadow_width" : { "type" : "number" },
+            "shadow_edge" : { "type" : "number" },
             "shadow_offset" : { "$ref": "#/common_definitions/v2" },
             "shadow_color" : { "$ref": "#/common_definitions/color" }
         },
@@ -134,22 +137,40 @@ namespace e2d
             component.valigh(valign);
         }
 
-        if ( ctx.root.HasMember("smoothing") ) {
-            f32 smoothing = component.smoothing();
-            if ( !json_utils::try_parse_value(ctx.root["smoothing"], smoothing) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'smoothing' property");
+        if ( ctx.root.HasMember("char_width") ) {
+            f32 char_width = component.char_width();
+            if ( !json_utils::try_parse_value(ctx.root["char_width"], char_width) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'char_width' property");
                 return false;
             }
-            component.smoothing(smoothing);
+            component.char_width(char_width);
         }
 
-        if ( ctx.root.HasMember("outline_distance") ) {
-            f32 outline_distance = component.outline_distance();
-            if ( !json_utils::try_parse_value(ctx.root["outline_distance"], outline_distance) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'outline_distance' property");
+        if ( ctx.root.HasMember("char_edge") ) {
+            f32 char_edge = component.char_edge();
+            if ( !json_utils::try_parse_value(ctx.root["char_edge"], char_edge) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'char_edge' property");
                 return false;
             }
-            component.outline_distance(outline_distance);
+            component.char_edge(char_edge);
+        }
+
+        if ( ctx.root.HasMember("outline_width") ) {
+            f32 outline_width = component.outline_width();
+            if ( !json_utils::try_parse_value(ctx.root["outline_width"], outline_width) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'outline_width' property");
+                return false;
+            }
+            component.outline_width(outline_width);
+        }
+
+        if ( ctx.root.HasMember("outline_edge") ) {
+            f32 outline_edge = component.outline_edge();
+            if ( !json_utils::try_parse_value(ctx.root["outline_edge"], outline_edge) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'outline_edge' property");
+                return false;
+            }
+            component.outline_edge(outline_edge);
         }
 
         if ( ctx.root.HasMember("outline_color") ) {
@@ -161,13 +182,22 @@ namespace e2d
             component.outline_color(outline_color);
         }
 
-        if ( ctx.root.HasMember("shadow_smoothing") ) {
-            f32 shadow_smoothing = component.shadow_smoothing();
-            if ( !json_utils::try_parse_value(ctx.root["shadow_smoothing"], shadow_smoothing) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'shadow_smoothing' property");
+        if ( ctx.root.HasMember("shadow_width") ) {
+            f32 shadow_width = component.shadow_width();
+            if ( !json_utils::try_parse_value(ctx.root["shadow_width"], shadow_width) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'shadow_width' property");
                 return false;
             }
-            component.shadow_smoothing(shadow_smoothing);
+            component.shadow_width(shadow_width);
+        }
+
+        if ( ctx.root.HasMember("shadow_edge") ) {
+            f32 shadow_edge = component.shadow_edge();
+            if ( !json_utils::try_parse_value(ctx.root["shadow_edge"], shadow_edge) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'shadow_edge' property");
+                return false;
+            }
+            component.shadow_edge(shadow_edge);
         }
 
         if ( ctx.root.HasMember("shadow_offset") ) {
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index 0538d7b6..363f4c5d 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -276,19 +276,26 @@ namespace e2d
                         return;
                     }
 
-                    color sc(l.shadow_color());
+                    vec2 shadow_offset = l.shadow_offset();
+                    shadow_offset.x /= texture_p->content()->size().x;
+                    shadow_offset.y /= texture_p->content()->size().y;
+                    shadow_offset.x = -shadow_offset.x;
                     color oc(l.outline_color());
+                    color sc(l.shadow_color());
                     r.properties(render::property_block()
                         .sampler("u_texture", render::sampler_state()
                             .texture(texture_p->content())
                             .min_filter(render::sampler_min_filter::linear)
                             .mag_filter(render::sampler_mag_filter::linear))
-                        .property("u_smoothing", l.smoothing())
-                        .property("u_outline_distance", l.outline_distance())
-                        .property("u_shadow_smoothing", l.shadow_smoothing())
-                        .property("u_shadow_offset", l.shadow_offset())
-                        .property("u_shadow_color", make_vec4(sc.r, sc.g, sc.b, sc.a))
-                        .property("u_outline_color", make_vec4(oc.r, oc.g, oc.b, oc.a)));
+                        .property("u_char_width", l.char_width())
+                        .property("u_char_edge", l.char_edge())
+                        .property("u_outline_width", l.outline_width())
+                        .property("u_outline_edge", l.outline_edge())
+                        .property("u_outline_color", make_vec4(oc.r, oc.g, oc.b, oc.a))
+                        .property("u_shadow_width", l.shadow_width())
+                        .property("u_shadow_edge", l.shadow_edge())
+                        .property("u_shadow_offset", shadow_offset)
+                        .property("u_shadow_color", make_vec4(sc.r, sc.g, sc.b, sc.a)));
                 }
             });
 

From beb8de2040f41587bf9899261b37e492e89453d0 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Thu, 8 Aug 2019 18:16:04 +0300
Subject: [PATCH 058/108] imporved sdf shader

---
 samples/bin/library/sdf_shader.frag | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/bin/library/sdf_shader.frag b/samples/bin/library/sdf_shader.frag
index c6958018..9047aa37 100644
--- a/samples/bin/library/sdf_shader.frag
+++ b/samples/bin/library/sdf_shader.frag
@@ -14,14 +14,14 @@ varying vec4 v_color;
 
 void main() {
     float distance = 1.0 - texture2D(u_texture, v_st0).a;
-    float alpha = 1.0 - smoothstep(u_char_width, u_char_width + u_char_edge, distance);
+    float alpha = smoothstep(u_char_width + u_char_edge, u_char_width, distance);
 
-    float outline_alpha = 1.0 - smoothstep(u_outline_width, u_outline_width + u_outline_edge, distance);
+    float outline_alpha = smoothstep(u_outline_width + u_outline_edge, u_outline_width, distance);
     float overall_alpha = alpha + (1.0 - alpha) * outline_alpha;
     vec4 overall_color = mix(u_outline_color, v_color, alpha / overall_alpha);
 
     float distance_shadow = 1.0 - texture2D(u_texture, v_st0 + u_shadow_offset).a;
-    float shadow_alpha = 1.0 - smoothstep(u_shadow_width, u_shadow_width + u_shadow_edge, distance_shadow);
+    float shadow_alpha = smoothstep(u_shadow_width + u_shadow_edge, u_shadow_width, distance_shadow);
     vec4  shadow = vec4(u_shadow_color.rgb, shadow_alpha);
 
     gl_FragColor = mix(shadow, overall_color, overall_alpha);

From f9291ae454979f1c40dcc3f5d222fd22061456a7 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksejpincuk@MacBook-Pro-Aleksej.local>
Date: Thu, 8 Aug 2019 18:47:46 +0300
Subject: [PATCH 059/108] fix sdf shader

---
 samples/bin/library/sdf_shader.frag | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/bin/library/sdf_shader.frag b/samples/bin/library/sdf_shader.frag
index 9047aa37..c6958018 100644
--- a/samples/bin/library/sdf_shader.frag
+++ b/samples/bin/library/sdf_shader.frag
@@ -14,14 +14,14 @@ varying vec4 v_color;
 
 void main() {
     float distance = 1.0 - texture2D(u_texture, v_st0).a;
-    float alpha = smoothstep(u_char_width + u_char_edge, u_char_width, distance);
+    float alpha = 1.0 - smoothstep(u_char_width, u_char_width + u_char_edge, distance);
 
-    float outline_alpha = smoothstep(u_outline_width + u_outline_edge, u_outline_width, distance);
+    float outline_alpha = 1.0 - smoothstep(u_outline_width, u_outline_width + u_outline_edge, distance);
     float overall_alpha = alpha + (1.0 - alpha) * outline_alpha;
     vec4 overall_color = mix(u_outline_color, v_color, alpha / overall_alpha);
 
     float distance_shadow = 1.0 - texture2D(u_texture, v_st0 + u_shadow_offset).a;
-    float shadow_alpha = smoothstep(u_shadow_width + u_shadow_edge, u_shadow_width, distance_shadow);
+    float shadow_alpha = 1.0 - smoothstep(u_shadow_width, u_shadow_width + u_shadow_edge, distance_shadow);
     vec4  shadow = vec4(u_shadow_color.rgb, shadow_alpha);
 
     gl_FragColor = mix(shadow, overall_color, overall_alpha);

From e909556c99c9c7e367b6c1742bddcc0df7fce304 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 8 Aug 2019 23:14:02 +0700
Subject: [PATCH 060/108] rewrite dds,pvr loading and saving

add new a8 texture format
remove rgb_dxt1
add image loading and saving tests
---
 headers/enduro2d/core/render.hpp              |   7 +-
 headers/enduro2d/utils/image.hpp              |  17 +-
 sources/enduro2d/core/render.cpp              |   7 +-
 .../core/render_impl/render_opengl.cpp        |   6 +-
 .../core/render_impl/render_opengl_base.cpp   |  52 +-
 sources/enduro2d/utils/image.cpp              |  48 +-
 .../enduro2d/utils/image_impl/image_impl.hpp  |  96 +++-
 .../utils/image_impl/image_impl_dds.hpp       |  80 +++
 .../utils/image_impl/image_impl_pvr.hpp       | 137 +++++
 .../image_impl/image_impl_structures.hpp      | 174 ------
 .../utils/image_impl/image_reader_dds.cpp     | 278 ++++++---
 .../utils/image_impl/image_reader_pvr.cpp     | 243 ++++----
 .../utils/image_impl/image_reader_stb.cpp     |   8 +-
 .../utils/image_impl/image_writer_dds.cpp     | 216 +++----
 .../utils/image_impl/image_writer_pvr.cpp     | 161 +++---
 .../utils/image_impl/image_writer_stb.cpp     |  49 +-
 untests/bin/images/dds/ship_a8.dds            |   3 +
 untests/bin/images/dds/ship_a8l8.dds          |   3 +
 untests/bin/images/dds/ship_a8r8g8b8.dds      |   3 +
 untests/bin/images/dds/ship_dxt1.dds          |   3 +
 untests/bin/images/dds/ship_dxt3.dds          |   3 +
 untests/bin/images/dds/ship_dxt5.dds          |   3 +
 untests/bin/images/dds/ship_l8.dds            |   3 +
 untests/bin/images/dds/ship_r8g8b8.dds        |   3 +
 untests/bin/images/dds/ship_rgba8.dds         |   3 +
 untests/bin/images/dds/ship_x8r8g8b8.dds      |   3 +
 untests/bin/images/pvr/ship_a8.pvr            |   3 +
 untests/bin/images/pvr/ship_bgra8.pvr         |   3 +
 untests/bin/images/pvr/ship_dxt1.pvr          |   3 +
 untests/bin/images/pvr/ship_dxt3.pvr          |   3 +
 untests/bin/images/pvr/ship_dxt5.pvr          |   3 +
 untests/bin/images/pvr/ship_eac_r11.pvr       |   3 +
 .../bin/images/{ => pvr}/ship_eac_rg11.pvr    |   0
 untests/bin/images/pvr/ship_etc1.pvr          |   3 +
 untests/bin/images/pvr/ship_etc2_rgb.pvr      |   3 +
 untests/bin/images/pvr/ship_etc2_rgba.pvr     |   3 +
 untests/bin/images/pvr/ship_etc2_rgba1.pvr    |   3 +
 untests/bin/images/pvr/ship_l8.pvr            |   3 +
 untests/bin/images/pvr/ship_la8.pvr           |   3 +
 untests/bin/images/pvr/ship_pvrtc2_2bpp.pvr   |   3 +
 untests/bin/images/pvr/ship_pvrtc2_4bpp.pvr   |   3 +
 .../bin/images/pvr/ship_pvrtc_2bpp_rgb.pvr    |   3 +
 .../bin/images/pvr/ship_pvrtc_2bpp_rgba.pvr   |   3 +
 .../bin/images/pvr/ship_pvrtc_4bpp_rgb.pvr    |   3 +
 .../bin/images/pvr/ship_pvrtc_4bpp_rgba.pvr   |   3 +
 untests/bin/images/{ => pvr}/ship_rgb8.pvr    |   0
 untests/bin/images/{ => pvr}/ship_rgba8.pvr   |   0
 untests/bin/images/ship_etc1.pvr              |   3 -
 untests/bin/images/ship_etc2.pvr              |   3 -
 untests/bin/images/ship_pvrtc_2bpp_rgb.pvr    |   3 -
 untests/bin/images/ship_pvrtc_2bpp_rgba.pvr   |   3 -
 untests/bin/images/ship_pvrtc_4bpp_rgb.pvr    |   3 -
 untests/bin/images/ship_pvrtc_4bpp_rgba.pvr   |   3 -
 untests/bin/images/ship_pvrtc_ii_2bpp.pvr     |   3 -
 untests/bin/images/ship_pvrtc_ii_4bpp.pvr     |   3 -
 untests/bin/images/ship_r8.pvr                |   3 -
 untests/bin/images/ship_rg8.pvr               |   3 -
 untests/bin/images/ship_rgba.dds              |   3 -
 untests/bin/images/stb/ship.jpg               |   3 +
 untests/bin/images/stb/ship.png               |   3 +
 untests/bin/images/stb/ship.tga               |   3 +
 untests/sources/untests_core/render.cpp       |   4 +-
 untests/sources/untests_utils/image.cpp       | 527 +++++++++++-------
 63 files changed, 1397 insertions(+), 839 deletions(-)
 create mode 100644 sources/enduro2d/utils/image_impl/image_impl_dds.hpp
 create mode 100644 sources/enduro2d/utils/image_impl/image_impl_pvr.hpp
 delete mode 100644 sources/enduro2d/utils/image_impl/image_impl_structures.hpp
 create mode 100644 untests/bin/images/dds/ship_a8.dds
 create mode 100644 untests/bin/images/dds/ship_a8l8.dds
 create mode 100644 untests/bin/images/dds/ship_a8r8g8b8.dds
 create mode 100644 untests/bin/images/dds/ship_dxt1.dds
 create mode 100644 untests/bin/images/dds/ship_dxt3.dds
 create mode 100644 untests/bin/images/dds/ship_dxt5.dds
 create mode 100644 untests/bin/images/dds/ship_l8.dds
 create mode 100644 untests/bin/images/dds/ship_r8g8b8.dds
 create mode 100644 untests/bin/images/dds/ship_rgba8.dds
 create mode 100644 untests/bin/images/dds/ship_x8r8g8b8.dds
 create mode 100644 untests/bin/images/pvr/ship_a8.pvr
 create mode 100644 untests/bin/images/pvr/ship_bgra8.pvr
 create mode 100644 untests/bin/images/pvr/ship_dxt1.pvr
 create mode 100644 untests/bin/images/pvr/ship_dxt3.pvr
 create mode 100644 untests/bin/images/pvr/ship_dxt5.pvr
 create mode 100644 untests/bin/images/pvr/ship_eac_r11.pvr
 rename untests/bin/images/{ => pvr}/ship_eac_rg11.pvr (100%)
 create mode 100644 untests/bin/images/pvr/ship_etc1.pvr
 create mode 100644 untests/bin/images/pvr/ship_etc2_rgb.pvr
 create mode 100644 untests/bin/images/pvr/ship_etc2_rgba.pvr
 create mode 100644 untests/bin/images/pvr/ship_etc2_rgba1.pvr
 create mode 100644 untests/bin/images/pvr/ship_l8.pvr
 create mode 100644 untests/bin/images/pvr/ship_la8.pvr
 create mode 100644 untests/bin/images/pvr/ship_pvrtc2_2bpp.pvr
 create mode 100644 untests/bin/images/pvr/ship_pvrtc2_4bpp.pvr
 create mode 100644 untests/bin/images/pvr/ship_pvrtc_2bpp_rgb.pvr
 create mode 100644 untests/bin/images/pvr/ship_pvrtc_2bpp_rgba.pvr
 create mode 100644 untests/bin/images/pvr/ship_pvrtc_4bpp_rgb.pvr
 create mode 100644 untests/bin/images/pvr/ship_pvrtc_4bpp_rgba.pvr
 rename untests/bin/images/{ => pvr}/ship_rgb8.pvr (100%)
 rename untests/bin/images/{ => pvr}/ship_rgba8.pvr (100%)
 delete mode 100644 untests/bin/images/ship_etc1.pvr
 delete mode 100644 untests/bin/images/ship_etc2.pvr
 delete mode 100644 untests/bin/images/ship_pvrtc_2bpp_rgb.pvr
 delete mode 100644 untests/bin/images/ship_pvrtc_2bpp_rgba.pvr
 delete mode 100644 untests/bin/images/ship_pvrtc_4bpp_rgb.pvr
 delete mode 100644 untests/bin/images/ship_pvrtc_4bpp_rgba.pvr
 delete mode 100644 untests/bin/images/ship_pvrtc_ii_2bpp.pvr
 delete mode 100644 untests/bin/images/ship_pvrtc_ii_4bpp.pvr
 delete mode 100644 untests/bin/images/ship_r8.pvr
 delete mode 100644 untests/bin/images/ship_rg8.pvr
 delete mode 100644 untests/bin/images/ship_rgba.dds
 create mode 100644 untests/bin/images/stb/ship.jpg
 create mode 100755 untests/bin/images/stb/ship.png
 create mode 100644 untests/bin/images/stb/ship.tga

diff --git a/headers/enduro2d/core/render.hpp b/headers/enduro2d/core/render.hpp
index ea0dacef..4e0f5d6f 100644
--- a/headers/enduro2d/core/render.hpp
+++ b/headers/enduro2d/core/render.hpp
@@ -48,19 +48,18 @@ namespace e2d
             depth24,
             depth24_stencil8,
 
-            g8,
-            ga8,
+            a8,
+            l8,
+            la8,
             rgb8,
             rgba8,
 
-            rgb_dxt1,
             rgba_dxt1,
             rgba_dxt3,
             rgba_dxt5,
 
             rgb_pvrtc2,
             rgb_pvrtc4,
-
             rgba_pvrtc2,
             rgba_pvrtc4,
 
diff --git a/headers/enduro2d/utils/image.hpp b/headers/enduro2d/utils/image.hpp
index 877bdaa8..e6dc6bba 100644
--- a/headers/enduro2d/utils/image.hpp
+++ b/headers/enduro2d/utils/image.hpp
@@ -9,7 +9,7 @@
 #include "_utils.hpp"
 
 #include "buffer.hpp"
-#include "color.hpp"
+#include "buffer_view.hpp"
 #include "color32.hpp"
 #include "streams.hpp"
 
@@ -24,19 +24,18 @@ namespace e2d
     };
 
     enum class image_data_format : u8 {
-        g8,
-        ga8,
+        a8,
+        l8,
+        la8,
         rgb8,
         rgba8,
 
-        rgb_dxt1,
         rgba_dxt1,
         rgba_dxt3,
         rgba_dxt5,
 
         rgb_pvrtc2,
         rgb_pvrtc4,
-
         rgba_pvrtc2,
         rgba_pvrtc4,
 
@@ -74,8 +73,6 @@ namespace e2d
         void clear() noexcept;
         bool empty() const noexcept;
 
-        color pixel(u32 u, u32 v) const;
-        color pixel(const v2u& uv) const;
         color32 pixel32(u32 u, u32 v) const;
         color32 pixel32(const v2u& uv) const;
 
@@ -97,7 +94,7 @@ namespace e2d::images
 {
     bool try_load_image(
         image& dst,
-        const buffer& src) noexcept;
+        buffer_view src) noexcept;
 
     bool try_load_image(
         image& dst,
@@ -112,4 +109,8 @@ namespace e2d::images
         const image& src,
         image_file_format format,
         const output_stream_uptr& dst) noexcept;
+
+    bool check_save_image_support(
+        const image& src,
+        image_file_format format) noexcept;
 }
diff --git a/sources/enduro2d/core/render.cpp b/sources/enduro2d/core/render.cpp
index fa4c72f9..0b678c43 100644
--- a/sources/enduro2d/core/render.cpp
+++ b/sources/enduro2d/core/render.cpp
@@ -26,12 +26,13 @@ namespace
         {"depth24",          24, false, true,  false, pixel_declaration::pixel_type::depth24,          false, v2u(1)},
         {"depth24_stencil8", 32, false, true,  true,  pixel_declaration::pixel_type::depth24_stencil8, false, v2u(1)},
 
-        {"g8",                8, true,  false, false, pixel_declaration::pixel_type::g8,               false, v2u(1)},
-        {"ga8",              16, true,  false, false, pixel_declaration::pixel_type::ga8,              false, v2u(1)},
+        {"a8",                8, true,  false, false, pixel_declaration::pixel_type::a8,               false, v2u(1)},
+        {"l8",                8, true,  false, false, pixel_declaration::pixel_type::l8,               false, v2u(1)},
+        {"la8",              16, true,  false, false, pixel_declaration::pixel_type::la8,              false, v2u(1)},
+
         {"rgb8",             24, true,  false, false, pixel_declaration::pixel_type::rgb8,             false, v2u(1)},
         {"rgba8",            32, true,  false, false, pixel_declaration::pixel_type::rgba8,            false, v2u(1)},
 
-        {"rgb_dxt1",          4, true,  false, false, pixel_declaration::pixel_type::rgb_dxt1,         true,  v2u(4,4)},
         {"rgba_dxt1",         4, true,  false, false, pixel_declaration::pixel_type::rgba_dxt1,        true,  v2u(4,4)},
         {"rgba_dxt3",         8, true,  false, false, pixel_declaration::pixel_type::rgba_dxt3,        true,  v2u(4,4)},
         {"rgba_dxt5",         8, true,  false, false, pixel_declaration::pixel_type::rgba_dxt5,        true,  v2u(4,4)},
diff --git a/sources/enduro2d/core/render_impl/render_opengl.cpp b/sources/enduro2d/core/render_impl/render_opengl.cpp
index d1005bc6..512dbcf8 100644
--- a/sources/enduro2d/core/render_impl/render_opengl.cpp
+++ b/sources/enduro2d/core/render_impl/render_opengl.cpp
@@ -1152,12 +1152,12 @@ namespace e2d
             case pixel_declaration::pixel_type::depth24_stencil8:
                 return caps.depth_texture_supported
                     && caps.depth24_stencil8_supported;
-            case pixel_declaration::pixel_type::g8:
-            case pixel_declaration::pixel_type::ga8:
+            case pixel_declaration::pixel_type::a8:
+            case pixel_declaration::pixel_type::l8:
+            case pixel_declaration::pixel_type::la8:
             case pixel_declaration::pixel_type::rgb8:
             case pixel_declaration::pixel_type::rgba8:
                 return true;
-            case pixel_declaration::pixel_type::rgb_dxt1:
             case pixel_declaration::pixel_type::rgba_dxt1:
             case pixel_declaration::pixel_type::rgba_dxt3:
             case pixel_declaration::pixel_type::rgba_dxt5:
diff --git a/sources/enduro2d/core/render_impl/render_opengl_base.cpp b/sources/enduro2d/core/render_impl/render_opengl_base.cpp
index ecab1d62..8a77988b 100644
--- a/sources/enduro2d/core/render_impl/render_opengl_base.cpp
+++ b/sources/enduro2d/core/render_impl/render_opengl_base.cpp
@@ -758,8 +758,9 @@ namespace e2d::opengl
     GLenum convert_image_data_format_to_external_format(image_data_format f) noexcept {
         #define DEFINE_CASE(x,y) case image_data_format::x: return y
         switch ( f ) {
-            DEFINE_CASE(g8, GL_LUMINANCE);
-            DEFINE_CASE(ga8, GL_LUMINANCE_ALPHA);
+            DEFINE_CASE(a8, GL_ALPHA);
+            DEFINE_CASE(l8, GL_LUMINANCE);
+            DEFINE_CASE(la8, GL_LUMINANCE_ALPHA);
             DEFINE_CASE(rgb8, GL_RGB);
             DEFINE_CASE(rgba8, GL_RGBA);
             default:
@@ -772,8 +773,9 @@ namespace e2d::opengl
     GLenum convert_image_data_format_to_external_data_type(image_data_format f) noexcept {
         #define DEFINE_CASE(x,y) case image_data_format::x: return y
         switch ( f ) {
-            DEFINE_CASE(g8, GL_UNSIGNED_BYTE);
-            DEFINE_CASE(ga8, GL_UNSIGNED_BYTE);
+            DEFINE_CASE(a8, GL_UNSIGNED_BYTE);
+            DEFINE_CASE(l8, GL_UNSIGNED_BYTE);
+            DEFINE_CASE(la8, GL_UNSIGNED_BYTE);
             DEFINE_CASE(rgb8, GL_UNSIGNED_BYTE);
             DEFINE_CASE(rgba8, GL_UNSIGNED_BYTE);
             default:
@@ -789,8 +791,9 @@ namespace e2d::opengl
             DEFINE_CASE(depth16, GL_DEPTH_COMPONENT);
             DEFINE_CASE(depth24, GL_DEPTH_COMPONENT);
             DEFINE_CASE(depth24_stencil8, GL_DEPTH_STENCIL);
-            DEFINE_CASE(g8, GL_ALPHA);
-            DEFINE_CASE(ga8, GL_LUMINANCE_ALPHA);
+            DEFINE_CASE(a8, GL_ALPHA);
+            DEFINE_CASE(l8, GL_LUMINANCE);
+            DEFINE_CASE(la8, GL_LUMINANCE_ALPHA);
             DEFINE_CASE(rgb8, GL_RGB);
             DEFINE_CASE(rgba8, GL_RGBA);
             default:
@@ -806,8 +809,9 @@ namespace e2d::opengl
             DEFINE_CASE(depth16, GL_UNSIGNED_SHORT);
             DEFINE_CASE(depth24, GL_UNSIGNED_INT);
             DEFINE_CASE(depth24_stencil8, GL_UNSIGNED_INT_24_8);
-            DEFINE_CASE(g8, GL_UNSIGNED_BYTE);
-            DEFINE_CASE(ga8, GL_UNSIGNED_BYTE);
+            DEFINE_CASE(a8, GL_UNSIGNED_BYTE);
+            DEFINE_CASE(l8, GL_UNSIGNED_BYTE);
+            DEFINE_CASE(la8, GL_UNSIGNED_BYTE);
             DEFINE_CASE(rgb8, GL_UNSIGNED_BYTE);
             DEFINE_CASE(rgba8, GL_UNSIGNED_BYTE);
             default:
@@ -824,19 +828,18 @@ namespace e2d::opengl
             DEFINE_CASE(depth24, GL_DEPTH_COMPONENT24);
             DEFINE_CASE(depth24_stencil8, GL_DEPTH24_STENCIL8);
 
-            DEFINE_CASE(g8, GL_ALPHA);
-            DEFINE_CASE(ga8, GL_LUMINANCE_ALPHA);
+            DEFINE_CASE(a8, GL_ALPHA);
+            DEFINE_CASE(l8, GL_LUMINANCE);
+            DEFINE_CASE(la8, GL_LUMINANCE_ALPHA);
             DEFINE_CASE(rgb8, GL_RGB);
             DEFINE_CASE(rgba8, GL_RGBA);
 
-            DEFINE_CASE(rgb_dxt1, GL_COMPRESSED_RGB_S3TC_DXT1_EXT);
             DEFINE_CASE(rgba_dxt1, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT);
             DEFINE_CASE(rgba_dxt3, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT);
             DEFINE_CASE(rgba_dxt5, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT);
 
             DEFINE_CASE(rgb_pvrtc2, GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG);
             DEFINE_CASE(rgb_pvrtc4, GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG);
-
             DEFINE_CASE(rgba_pvrtc2, GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG);
             DEFINE_CASE(rgba_pvrtc4, GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG);
 
@@ -856,19 +859,18 @@ namespace e2d::opengl
     pixel_declaration convert_image_data_format_to_pixel_declaration(image_data_format f) noexcept {
         #define DEFINE_CASE(x,y) case image_data_format::x: return pixel_declaration::pixel_type::y
         switch ( f ) {
-            DEFINE_CASE(g8, g8);
-            DEFINE_CASE(ga8, ga8);
+            DEFINE_CASE(a8, a8);
+            DEFINE_CASE(l8, l8);
+            DEFINE_CASE(la8, la8);
             DEFINE_CASE(rgb8, rgb8);
             DEFINE_CASE(rgba8, rgba8);
 
-            DEFINE_CASE(rgb_dxt1, rgb_dxt1);
             DEFINE_CASE(rgba_dxt1, rgba_dxt1);
             DEFINE_CASE(rgba_dxt3, rgba_dxt3);
             DEFINE_CASE(rgba_dxt5, rgba_dxt5);
 
             DEFINE_CASE(rgb_pvrtc2, rgb_pvrtc2);
             DEFINE_CASE(rgb_pvrtc4, rgb_pvrtc4);
-
             DEFINE_CASE(rgba_pvrtc2, rgba_pvrtc2);
             DEFINE_CASE(rgba_pvrtc4, rgba_pvrtc4);
 
@@ -1370,7 +1372,7 @@ namespace e2d::opengl
             render::api_profile::opengl_compat;
 
         caps.npot_texture_supported =
-            version >= gl_version::gl_210 ||
+            version >= gl_version::gl_210 || // gl_200
             version >= gl_version::gles_300 ||
             gl_has_any_extension(debug,
                 "GL_OES_texture_npot",
@@ -1381,38 +1383,38 @@ namespace e2d::opengl
             version >= gl_version::gles_300 ||
             gl_has_any_extension(debug,
                 "GL_OES_depth_texture",
-                "GL_ARB_depth_texture");
+                "GL_ARB_depth_texture"); // gl_140
 
         caps.render_target_supported =
-            version >= gl_version::gl_300 ||
+            version >= gl_version::gl_300 || // gl_300
             version >= gl_version::gles_200 ||
             gl_has_any_extension(debug,
                 "GL_OES_framebuffer_object",
-                "GL_ARB_framebuffer_object",
-                "GL_EXT_framebuffer_object");
+                "GL_EXT_framebuffer_object",
+                "GL_ARB_framebuffer_object");
 
         caps.element_index_uint =
-            version >= gl_version::gl_210 ||
+            version >= gl_version::gl_210 || // gl_100
             version >= gl_version::gles_300 ||
             gl_has_any_extension(debug,
                 "GL_OES_element_index_uint");
 
         caps.depth16_supported =
-            version >= gl_version::gl_210 ||
+            version >= gl_version::gl_210 || // gl_140
             version >= gl_version::gles_300 ||
             gl_has_any_extension(debug,
                 "GL_OES_depth_texture",
                 "GL_ARB_depth_texture");
 
         caps.depth24_supported =
-            version >= gl_version::gl_210 ||
+            version >= gl_version::gl_210 || // gl_140
             version >= gl_version::gles_300 ||
             gl_has_any_extension(debug,
                 "GL_OES_depth24",
                 "GL_ARB_depth_texture");
 
         caps.depth24_stencil8_supported =
-            version >= gl_version::gl_300 ||
+            version >= gl_version::gl_300 || // gl_300
             version >= gl_version::gles_300 ||
             gl_has_any_extension(debug,
                 "GL_OES_packed_depth_stencil",
diff --git a/sources/enduro2d/utils/image.cpp b/sources/enduro2d/utils/image.cpp
index 01e9f677..a10da083 100644
--- a/sources/enduro2d/utils/image.cpp
+++ b/sources/enduro2d/utils/image.cpp
@@ -17,12 +17,12 @@ namespace
     };
 
     const data_format_description data_format_descriptions[] = {
-        { 8, image_data_format::g8,             false},
-        {16, image_data_format::ga8,            false},
+        { 8, image_data_format::a8,             false},
+        { 8, image_data_format::l8,             false},
+        {16, image_data_format::la8,            false},
         {24, image_data_format::rgb8,           false},
         {32, image_data_format::rgba8,          false},
 
-        { 4, image_data_format::rgb_dxt1,       true},
         { 4, image_data_format::rgba_dxt1,      true},
         { 8, image_data_format::rgba_dxt3,      true},
         { 8, image_data_format::rgba_dxt5,      true},
@@ -119,14 +119,6 @@ namespace e2d
         return data_.empty();
     }
 
-    color image::pixel(u32 u, u32 v) const {
-        return color(pixel32(u, v));
-    }
-
-    color image::pixel(const v2u& uv) const {
-        return color(pixel32(uv));
-    }
-
     color32 image::pixel32(u32 u, u32 v) const {
         const data_format_description& format_desc =
             get_data_format_description(format_);
@@ -145,15 +137,18 @@ namespace e2d
         const u8* const pixel = data_.data() + pixel_index;
 
         switch ( format_ ) {
-            case image_data_format::g8:
+            case image_data_format::a8:
                 E2D_ASSERT(bytes_per_pixel == 1);
-                return color32(pixel[0], pixel[0], pixel[0]);
-            case image_data_format::ga8:
+                return color32(0, 0, 0, pixel[0]);
+            case image_data_format::l8:
+                E2D_ASSERT(bytes_per_pixel == 1);
+                return color32(pixel[0], pixel[0], pixel[0], 255);
+            case image_data_format::la8:
                 E2D_ASSERT(bytes_per_pixel == 2);
                 return color32(pixel[0], pixel[0], pixel[0], pixel[1]);
             case image_data_format::rgb8:
                 E2D_ASSERT(bytes_per_pixel == 3);
-                return color32(pixel[0], pixel[1], pixel[2]);
+                return color32(pixel[0], pixel[1], pixel[2], 255);
             case image_data_format::rgba8:
                 E2D_ASSERT(bytes_per_pixel == 4);
                 return color32(pixel[0], pixel[1], pixel[2], pixel[3]);
@@ -201,7 +196,7 @@ namespace e2d::images
 {
     bool try_load_image(
         image& dst,
-        const buffer& src) noexcept
+        buffer_view src) noexcept
     {
         try {
             return impl::load_image_dds(dst, src)
@@ -256,4 +251,25 @@ namespace e2d::images
         return try_save_image(src, format, file_data)
             && streams::try_write_tail(file_data, dst);
     }
+
+    bool check_save_image_support(
+        const image& src,
+        image_file_format format) noexcept
+    {
+        switch ( format ) {
+            case image_file_format::dds:
+                return impl::check_save_image_dds(src);
+            case image_file_format::jpg:
+                return impl::check_save_image_jpg(src);
+            case image_file_format::png:
+                return impl::check_save_image_png(src);
+            case image_file_format::pvr:
+                return impl::check_save_image_pvr(src);
+            case image_file_format::tga:
+                return impl::check_save_image_tga(src);
+            default:
+                E2D_ASSERT_MSG(false, "unexpected image file format");
+                return false;
+        }
+    }
 }
diff --git a/sources/enduro2d/utils/image_impl/image_impl.hpp b/sources/enduro2d/utils/image_impl/image_impl.hpp
index ad4f5d64..c1666635 100644
--- a/sources/enduro2d/utils/image_impl/image_impl.hpp
+++ b/sources/enduro2d/utils/image_impl/image_impl.hpp
@@ -8,16 +8,106 @@
 
 #include <enduro2d/utils/image.hpp>
 #include <enduro2d/utils/buffer.hpp>
+#include <enduro2d/utils/buffer_view.hpp>
 
 namespace e2d::images::impl
 {
-    bool load_image_dds(image& dst, const buffer& src);
-    bool load_image_pvr(image& dst, const buffer& src);
-    bool load_image_stb(image& dst, const buffer& src);
+    bool load_image_dds(image& dst, buffer_view src);
+    bool load_image_pvr(image& dst, buffer_view src);
+    bool load_image_stb(image& dst, buffer_view src);
 
     bool save_image_dds(const image& src, buffer& dst);
     bool save_image_jpg(const image& src, buffer& dst);
     bool save_image_png(const image& src, buffer& dst);
     bool save_image_pvr(const image& src, buffer& dst);
     bool save_image_tga(const image& src, buffer& dst);
+
+    bool check_save_image_dds(const image& src) noexcept;
+    bool check_save_image_jpg(const image& src) noexcept;
+    bool check_save_image_png(const image& src) noexcept;
+    bool check_save_image_pvr(const image& src) noexcept;
+    bool check_save_image_tga(const image& src) noexcept;
+}
+
+namespace e2d::images::impl
+{
+    inline std::size_t bgr8_to_rgb8(u8* dst, buffer_view src) noexcept {
+        E2D_ASSERT(src.size() % 3 == 0);
+        const std::size_t dst_size = src.size() / 3 * 3;
+        if ( !dst ) {
+            return dst_size;
+        }
+        const u8* data = static_cast<const u8*>(src.data());
+        for ( std::size_t i = 0; i < dst_size / 3; ++i ) {
+            const u8 b = data[0];
+            const u8 g = data[1];
+            const u8 r = data[2];
+            dst[0] = r;
+            dst[1] = g;
+            dst[2] = b;
+            dst += 3;
+            data += 3;
+        }
+        return dst_size;
+    }
+
+    inline std::size_t bgrx8_to_rgb8(u8* dst, buffer_view src) noexcept {
+        E2D_ASSERT(src.size() % 4 == 0);
+        const std::size_t dst_size = src.size() / 4 * 3;
+        if ( !dst ) {
+            return dst_size;
+        }
+        const u8* data = static_cast<const u8*>(src.data());
+        for ( std::size_t i = 0; i < dst_size / 3; ++i ) {
+            const u8 b = data[0];
+            const u8 g = data[1];
+            const u8 r = data[2];
+            dst[0] = r;
+            dst[1] = g;
+            dst[2] = b;
+            dst += 3;
+            data += 4;
+        }
+        return dst_size;
+    }
+
+    inline std::size_t bgra8_to_rgba8(u8* dst, buffer_view src) noexcept {
+        E2D_ASSERT(src.size() % 4 == 0);
+        const std::size_t dst_size = src.size() / 4 * 4;
+        if ( !dst ) {
+            return dst_size;
+        }
+        const u8* data = static_cast<const u8*>(src.data());
+        for ( std::size_t i = 0; i < dst_size / 4; ++i ) {
+            const u8 b = data[0];
+            const u8 g = data[1];
+            const u8 r = data[2];
+            const u8 a = data[3];
+            dst[0] = r;
+            dst[1] = g;
+            dst[2] = b;
+            dst[3] = a;
+            dst += 4;
+            data += 4;
+        }
+        return dst_size;
+    }
+
+    inline buffer bgr8_to_rgb8(buffer_view src) {
+        buffer result(bgr8_to_rgb8(nullptr, src));
+        bgr8_to_rgb8(result.data(), src);
+        return result;
+    }
+
+    inline buffer bgrx8_to_rgb8(buffer_view src) {
+        buffer result(bgrx8_to_rgb8(nullptr, src));
+        bgrx8_to_rgb8(result.data(), src);
+        return result;
+    }
+
+    inline buffer bgra8_to_rgba8(buffer_view src) {
+        buffer result(bgra8_to_rgba8(nullptr, src));
+        bgra8_to_rgba8(result.data(), src);
+        return result;
+    }
 }
diff --git a/sources/enduro2d/utils/image_impl/image_impl_dds.hpp b/sources/enduro2d/utils/image_impl/image_impl_dds.hpp
new file mode 100644
index 00000000..397dc311
--- /dev/null
+++ b/sources/enduro2d/utils/image_impl/image_impl_dds.hpp
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include <enduro2d/utils/_utils.hpp>
+
+namespace e2d::images::impl::dds
+{
+    // DDS format specification:
+    // https://docs.microsoft.com/en-us/windows/desktop/direct3ddds/dx-graphics-dds-pguide
+
+    // header flags
+    const u32 dds_hf_caps = 0x00000001;
+    const u32 dds_hf_height = 0x00000002;
+    const u32 dds_hf_width = 0x00000004;
+    const u32 dds_hf_pitch = 0x00000008;
+    const u32 dds_hf_pixel_format = 0x00001000;
+    const u32 dds_hf_mipmap_count = 0x00020000;
+    const u32 dds_hf_linear_size = 0x00080000;
+    const u32 dds_hf_depth = 0x00800000;
+
+    // pixel format flags
+    const u32 dds_pff_alphapixels = 0x1;
+    const u32 dds_pff_alpha = 0x2;
+    const u32 dds_pff_fourcc = 0x4;
+    const u32 dds_pff_rgb = 0x40;
+    const u32 dds_pff_yuv = 0x200;
+    const u32 dds_pff_luminance = 0x20000;
+
+    // caps flags
+    const u32 dds_caps_complex = 0x8;
+    const u32 dds_caps_mipmap = 0x400000;
+    const u32 dds_caps_texture = 0x1000;
+
+    // caps2 flags
+    const u32 dds_caps2_cubemap = 0x200;
+    const u32 dds_caps2_volume = 0x200000;
+
+    struct dds_pixel_format {
+        u32 size{0};
+        u32 flags{0};
+        u32 fourcc{0};
+        u32 rgbbit_count{0};
+        u32 rbit_mask{0};
+        u32 gbit_mask{0};
+        u32 bbit_mask{0};
+        u32 abit_mask{0};
+    };
+
+    struct dds_header {
+        u32 magic{0};
+        u32 size{0};
+        u32 flags{0};
+        u32 height{0};
+        u32 width{0};
+        u32 pitch_or_linear_size{0};
+        u32 depth{0};
+        u32 mipmap_count{0};
+        u32 reserved1[11] = {0};
+        dds_pixel_format pf;
+        u32 caps{0};
+        u32 caps2{0};
+        u32 reserved2[3] = {0};
+    };
+
+    static_assert(sizeof(dds_pixel_format) == 32, "invalid dds_pixel_format structure size");
+    static_assert(sizeof(dds_header) == 128, "invalid dds_header structure size");
+
+    inline constexpr u32 make_fourcc(u8 a, u8 b, u8 c, u8 d) noexcept {
+        return
+            (static_cast<u32>(a)) |
+            (static_cast<u32>(b) << 8) |
+            (static_cast<u32>(c) << 16) |
+            (static_cast<u32>(d) << 24);
+    }
+}
diff --git a/sources/enduro2d/utils/image_impl/image_impl_pvr.hpp b/sources/enduro2d/utils/image_impl/image_impl_pvr.hpp
new file mode 100644
index 00000000..17b6ac5b
--- /dev/null
+++ b/sources/enduro2d/utils/image_impl/image_impl_pvr.hpp
@@ -0,0 +1,137 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include <enduro2d/utils/_utils.hpp>
+
+namespace e2d::images::impl::pvr
+{
+    // PVR format specification:
+    // https://cdn.imgtec.com/sdk-documentation/PVR+File+Format.Specification.pdf
+
+    enum class pvr_flags : u32 {
+        none = 0,
+        premultiplied = 0x02,
+    };
+
+    enum class pvr_pixel_format : u64 {
+        pvrtc_2bpp_rgb = 0,
+        pvrtc_2bpp_rgba = 1,
+        pvrtc_4bpp_rgb = 2,
+        pvrtc_4bpp_rgba = 3,
+        pvrtc2_2bpp = 4,
+        pvrtc2_4bpp = 5,
+        etc1 = 6,
+        dxt1 = 7,
+        dxt2 = 8,
+        dxt3 = 9,
+        dxt4 = 10,
+        dxt5 = 11,
+        bc1 = 7,
+        bc2 = 9,
+        bc3 = 11,
+        bc4 = 12,
+        bc5 = 13,
+        bc6 = 14,
+        bc7 = 15,
+        uyvy = 16,
+        yuy2 = 17,
+        bw_1bpp = 18,
+        r9g9b9e5 = 19,
+        rgbg8888 = 20,
+        grgb8888 = 21,
+        etc2_rgb = 22,
+        etc2_rgba = 23,
+        etc2_rgb_a1 = 24,
+        eac_r11 = 25,
+        eac_rg11 = 26,
+        astc_4x4 = 27,
+        astc_5x4 = 28,
+        astc_5x5 = 29,
+        astc_6x5 = 30,
+        astc_6x6 = 31,
+        astc_8x5 = 32,
+        astc_8x6 = 33,
+        astc_8x8 = 34,
+        astc_10x5 = 35,
+        astc_10x6 = 36,
+        astc_10x8 = 37,
+        astc_10x10 = 38,
+        astc_12x10 = 39,
+        astc_12x12 = 40,
+        astc_3x3x3 = 41,
+        astc_4x3x3 = 42,
+        astc_4x4x3 = 43,
+        astc_4x4x4 = 44,
+        astc_5x4x4 = 45,
+        astc_5x5x4 = 46,
+        astc_5x5x5 = 47,
+        astc_6x5x5 = 48,
+        astc_6x6x5 = 49,
+        astc_6x6x6 = 50,
+        a8 = 0x00000008'00000061ull,
+        l8 = 0x00000008'0000006Cull,
+        la8 = 0x00000808'0000616CuLL,
+        rgb8 = 0x00080808'00626772ull,
+        rgba8 = 0x08080808'61626772ull,
+        bgr8 = 0x08080808'00726762ull,
+        bgra8 = 0x08080808'61726762ull,
+    };
+
+    enum class pvr_color_space : u32 {
+        linear = 0,
+        srgb = 1,
+    };
+
+    enum class pvr_channel_type : u32 {
+        byte_unorm = 0,
+        byte_snorm = 1,
+        ubyte = 2,
+        sbyte = 3,
+        short_unorm = 4,
+        short_snorm = 5,
+        ushort = 6,
+        sshort = 7,
+        int_unorm = 8,
+        int_snorm = 9,
+        uint = 10,
+        sint = 11,
+        sfloat = 12,
+    };
+
+    struct pvr_header {
+        u32 version;
+        u32 flags;
+        u32 pixel_format0;
+        u32 pixel_format1;
+        u32 color_space;
+        u32 channel_type;
+        u32 height;
+        u32 width;
+        u32 depth;
+        u32 num_surfaces;
+        u32 num_faces;
+        u32 mipmap_count;
+        u32 meta_data_size;
+    };
+
+    struct pvr_meta_data {
+        u32 fourcc;
+        u32 key;
+        u32 data_size;
+    };
+
+    static_assert(sizeof(pvr_header) == 52, "invalid pvr_header size");
+
+    inline constexpr u32 make_fourcc(u8 a, u8 b, u8 c, u8 d) noexcept {
+        return
+            (static_cast<u32>(a)) |
+            (static_cast<u32>(b) << 8) |
+            (static_cast<u32>(c) << 16) |
+            (static_cast<u32>(d) << 24);
+    }
+}
diff --git a/sources/enduro2d/utils/image_impl/image_impl_structures.hpp b/sources/enduro2d/utils/image_impl/image_impl_structures.hpp
deleted file mode 100644
index 92fc857d..00000000
--- a/sources/enduro2d/utils/image_impl/image_impl_structures.hpp
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * This file is part of the "Enduro2D"
- * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
- ******************************************************************************/
-
-#pragma once
-
-#include <enduro2d/utils/image.hpp>
-#include <enduro2d/utils/buffer.hpp>
-
-namespace e2d::images::impl::dds
-{
-    // pixel format flags
-    const u32 ddsf_alphapixels = 0x00000001;
-    const u32 ddsf_fourcc = 0x00000004;
-    const u32 ddsf_rgb = 0x00000040;
-    const u32 ddsf_rgba = 0x00000041;
-
-    // dwCaps2 flags
-    const u32 ddsf_cubemap = 0x00000200;
-    const u32 ddsf_volume = 0x00200000;
-
-    // compressed texture types
-    const u32 fourcc_dxt1 = 0x31545844; // 'DXT1'
-    const u32 fourcc_dxt3 = 0x33545844; // 'DXT3'
-    const u32 fourcc_dxt5 = 0x35545844; // 'DXT5'
-
-    struct dds_pixel_format {
-        u32 dwSize;
-        u32 dwFlags;
-        u32 dwFourCC;
-        u32 dwRGBBitCount;
-        u32 dwRBitMask;
-        u32 dwGBitMask;
-        u32 dwBBitMask;
-        u32 dwABitMask;
-    };
-
-    struct dds_header {
-        u32 dwMagic;
-        u32 dwSize;
-        u32 dwFlags;
-        u32 dwHeight;
-        u32 dwWidth;
-        u32 dwPitchOrLinearSize;
-        u32 dwDepth;
-        u32 dwMipMapCount;
-        u32 dwReserved1[11];
-        dds_pixel_format ddspf;
-        u32 dwCaps;
-        u32 dwCaps2;
-        u32 dwCaps3;
-        u32 dwCaps4;
-        u32 dwReserved2;
-    };
-
-    // pixel format flags
-    const u32 ddsd_caps = 0x00000001;
-    const u32 ddsd_height = 0x00000002;
-    const u32 ddsd_width = 0x00000004;
-    const u32 ddsd_pitch = 0x00000008;
-    const u32 ddsd_pixelformat = 0x00001000;
-    const u32 ddsd_mipmapcount = 0x00020000;
-    const u32 ddsd_linearsize = 0x00080000;
-    const u32 ddsd_dept = 0x00800000;
-
-    static_assert(sizeof(dds_pixel_format) == 32, "invalid dds_pixel_format structure size");
-    static_assert(sizeof(dds_header) == 128, "invalid dds_header structure size");
-}
-
-namespace e2d::images::impl::pvr
-{
-    enum class pvr_flags : u32 {
-        none = 0,
-        premultiplied = 0x02,
-    };
-
-    enum class pvr_pixel_format : u64 {
-        pvrtc_2bpp_rgb = 0,
-        pvrtc_2bpp_rgba = 1,
-        pvrtc_4bpp_rgb = 2,
-        pvrtc_4bpp_rgba = 3,
-        pvrtc_ii_2bpp = 4,
-        pvrtc_ii_4bpp = 5,
-        etc1 = 6,
-        dxt1 = 7,
-        dxt2 = 8,
-        dxt3 = 9,
-        dxt4 = 10,
-        dxt5 = 11,
-        bc1 = 7,
-        bc2 = 9,
-        bc3 = 11,
-        bc4 = 12,
-        bc5 = 13,
-        bc6 = 14,
-        bc7 = 15,
-        uyvy = 16,
-        yuy2 = 17,
-        bw_1bpp = 18,
-        r9g9b9e5 = 19,
-        rgbg8888 = 20,
-        grgb8888 = 21,
-        etc2_rgb = 22,
-        etc2_rgba = 23,
-        etc2_rgb_a1 = 24,
-        eac_r11 = 25,
-        eac_rg11 = 26,
-        astc_4x4 = 27,
-        astc_5x4 = 28,
-        astc_5x5 = 29,
-        astc_6x5 = 30,
-        astc_6x6 = 31,
-        astc_8x5 = 32,
-        astc_8x6 = 33,
-        astc_8x8 = 34,
-        astc_10x5 = 35,
-        astc_10x6 = 36,
-        astc_10x8 = 37,
-        astc_10x10 = 38,
-        astc_12x10 = 39,
-        astc_12x12 = 40,
-        rgba8 = 0x08080808'61626772ull,
-        r8 = 0x00000008'00000072ull,
-        rg8 = 0x00000808'00006772ull,
-        rgb8 = 0x00080808'00626772ull,
-    };
-
-    enum class pvr_color_space : u32 {
-        linear = 0,
-        srgb = 1,
-    };
-
-    enum class pvr_channel_type : u32 {
-        byte_unorm = 0,
-        byte_snorm = 1,
-        ubyte = 2,
-        sbyte = 3,
-        short_unorm = 4,
-        short_snorm = 5,
-        ushort = 6,
-        sshort = 7,
-        int_unorm = 8,
-        int_snorm = 9,
-        uint = 10,
-        sint = 11,
-        sfloat = 12,
-    };
-
-    struct pvr_header {
-        u32 version;
-        u32 flags;
-        u32 pixelFormat0;
-        u32 pixelFormat1;
-        u32 colorSpace;
-        u32 channelType;
-        u32 height;
-        u32 width;
-        u32 depth;
-        u32 numSurfaces;
-        u32 numFaces;
-        u32 mipMapCount;
-        u32 metaDataSize;
-    };
-
-    struct pvr_meta_data {
-        u32 four_cc{0};
-        u32 key{0};
-        u32 data_size{0};
-    };
-
-    static_assert(sizeof(pvr_header) == 52, "invalid PVR header size");
-}
diff --git a/sources/enduro2d/utils/image_impl/image_reader_dds.cpp b/sources/enduro2d/utils/image_impl/image_reader_dds.cpp
index 6793c168..e9847724 100644
--- a/sources/enduro2d/utils/image_impl/image_reader_dds.cpp
+++ b/sources/enduro2d/utils/image_impl/image_reader_dds.cpp
@@ -5,114 +5,234 @@
  ******************************************************************************/
 
 #include "image_impl.hpp"
-#include "image_impl_structures.hpp"
+#include "image_impl_dds.hpp"
 
 namespace
 {
-    // DDS format specification:
-    // https://docs.microsoft.com/en-us/windows/desktop/direct3ddds/dx-graphics-dds-pguide
-
     using namespace e2d;
+    using namespace e2d::images::impl;
     using namespace e2d::images::impl::dds;
 
-    bool is_dds(const void* data, std::size_t byte_size) noexcept {
-        if ( byte_size > sizeof(dds_header) ) {
-            const auto* hdr = reinterpret_cast<const dds_header*>(data);
-            return hdr->dwMagic == 0x20534444; // 'DDS '
-        }
-        return false;
-    }
+    struct image_info {
+        buffer data;
+        image_data_format format = image_data_format(-1);
+        u32 bytes_per_block = 0;
+        v2u block_size;
 
-    bool get_dds_format(
-        const dds_header& hdr,
-        image_data_format& out_format,
-        u32& out_bytes_per_block,
-        v2u& out_block_size) noexcept
-    {
-        if ( math::check_all_flags(hdr.ddspf.dwFlags, ddsf_fourcc) ) {
-            switch ( hdr.ddspf.dwFourCC ) {
-            case fourcc_dxt1:
-                out_format = math::check_all_flags(hdr.ddspf.dwFlags, ddsf_alphapixels)
-                    ? image_data_format::rgba_dxt1
-                    : image_data_format::rgb_dxt1;
-                out_bytes_per_block = 8;
-                out_block_size = v2u(4,4);
-                break;
-            case fourcc_dxt3:
-                out_format = image_data_format::rgba_dxt3;
-                out_bytes_per_block = 16;
-                out_block_size = v2u(4,4);
-                break;
-            case fourcc_dxt5:
-                out_format = image_data_format::rgba_dxt5;
-                out_bytes_per_block = 16;
-                out_block_size = v2u(4,4);
-                break;
-            default:
-                return false;
-            }
-        } else if ( math::check_all_flags(hdr.ddspf.dwFlags, ddsf_rgba) && (hdr.ddspf.dwRGBBitCount == 32) ) {
-            out_format = image_data_format::rgba8;
-            out_bytes_per_block = 4;
-            out_block_size = v2u(1,1);
-            if ( hdr.ddspf.dwRBitMask == 0x00FF0000 ) {
-                return false; // BGRA format is not supported
-            }
-        } else if ( math::check_all_flags(hdr.ddspf.dwFlags, ddsf_rgb) && (hdr.ddspf.dwRGBBitCount == 24) ) {
-            out_format = image_data_format::rgb8;
-            out_bytes_per_block = 3;
-            out_block_size = v2u(1,1);
-            if (hdr.ddspf.dwRBitMask == 0x00FF0000) {
-                return false; // BGRA format is not supported
-            }
-        } else if ( hdr.ddspf.dwRGBBitCount == 16 ) {
-            return false; // 16-bit format is not supported by engine
-        } else if ( hdr.ddspf.dwRGBBitCount == 8 ) {
-            out_format = image_data_format::g8;
-            out_bytes_per_block = 1;
-            out_block_size = v2u(1,1);
-        } else {
-            return false;
+        image_info() = default;
+        image_info(buffer data, image_data_format format, u32 bytes_per_block, v2u block_size)
+        : data(std::move(data))
+        , format(format)
+        , bytes_per_block(bytes_per_block)
+        , block_size(block_size) {}
+
+        bool valid() const noexcept {
+            return !data.empty()
+                && format != image_data_format(-1)
+                && bytes_per_block > 0
+                && block_size.x > 0
+                && block_size.y > 0;
         }
-        return true;
+    };
+
+    image_info extract_image_info(
+        const dds_header& hdr,
+        buffer_view content)
+    {
+        if ( math::check_all_flags(hdr.pf.flags, dds_pff_fourcc) ) {
+            switch ( hdr.pf.fourcc ) {
+            case make_fourcc('D', 'X', 'T', '1'):
+                return {
+                    buffer(content),
+                    image_data_format::rgba_dxt1,
+                    8,
+                    {4,4}};
+            case make_fourcc('D', 'X', 'T', '2'):
+            case make_fourcc('D', 'X', 'T', '3'):
+                return {
+                    buffer(content),
+                    image_data_format::rgba_dxt3,
+                    16,
+                    {4,4}};
+            case make_fourcc('D', 'X', 'T', '4'):
+            case make_fourcc('D', 'X', 'T', '5'):
+                return {
+                    buffer(content),
+                    image_data_format::rgba_dxt5,
+                    16,
+                    {4,4}};
+            }
+        }
+
+        if ( math::check_all_flags(hdr.pf.flags, dds_pff_alpha) ) {
+            if ( hdr.pf.rgbbit_count == 8 &&
+                 hdr.pf.abit_mask == 0x000000FF )
+            {
+                return {
+                    buffer(content),
+                    image_data_format::a8,
+                    1,
+                    {1,1}};
+            }
+        }
+
+        if ( math::check_all_flags(hdr.pf.flags, dds_pff_luminance | dds_pff_alphapixels) ) {
+            if ( hdr.pf.rgbbit_count == 16 &&
+                 hdr.pf.rbit_mask == 0x000000FF &&
+                 hdr.pf.abit_mask == 0x0000FF00 )
+            {
+                return {
+                    buffer(content),
+                    image_data_format::la8,
+                    2,
+                    {1,1}};
+            }
+        }
+
+        if ( math::check_all_flags(hdr.pf.flags, dds_pff_luminance) ) {
+            if ( hdr.pf.rgbbit_count == 8 &&
+                 hdr.pf.rbit_mask == 0x000000FF )
+            {
+                return {
+                    buffer(content),
+                    image_data_format::l8,
+                    1,
+                    {1,1}};
+            }
+        }
+
+        if ( math::check_all_flags(hdr.pf.flags, dds_pff_rgb | dds_pff_alphapixels) ) {
+            if ( hdr.pf.rgbbit_count == 8 ) {
+                if ( hdr.pf.rbit_mask == 0x00000000 &&
+                     hdr.pf.gbit_mask == 0x00000000 &&
+                     hdr.pf.bbit_mask == 0x00000000 &&
+                     hdr.pf.abit_mask == 0x000000FF )
+                {
+                    return {
+                        buffer(content),
+                        image_data_format::a8,
+                        1,
+                        {1,1}};
+                }
+            }
+
+            if ( hdr.pf.rgbbit_count == 32 ) {
+                if ( hdr.pf.rbit_mask == 0x000000FF &&
+                     hdr.pf.gbit_mask == 0x0000FF00 &&
+                     hdr.pf.bbit_mask == 0x00FF0000 &&
+                     hdr.pf.abit_mask == 0xFF000000 )
+                {
+                    return {
+                        buffer(content),
+                        image_data_format::rgba8,
+                        4,
+                        {1,1}};
+                }
+
+                if ( hdr.pf.rbit_mask == 0x00FF0000 &&
+                     hdr.pf.gbit_mask == 0x0000FF00 &&
+                     hdr.pf.bbit_mask == 0x000000FF &&
+                     hdr.pf.abit_mask == 0xFF000000 )
+                {
+                    return {
+                        bgra8_to_rgba8(content),
+                        image_data_format::rgba8,
+                        4,
+                        {1,1}};
+                }
+            }
+        }
+
+        if ( math::check_all_flags(hdr.pf.flags, dds_pff_rgb) ) {
+            if ( hdr.pf.rgbbit_count == 24 ) {
+                if ( hdr.pf.rbit_mask == 0x000000FF &&
+                     hdr.pf.gbit_mask == 0x0000FF00 &&
+                     hdr.pf.bbit_mask == 0x00FF0000 )
+                {
+                    return {
+                        buffer(content),
+                        image_data_format::rgb8,
+                        3,
+                        {1,1}};
+                }
+
+                if ( hdr.pf.rbit_mask == 0x00FF0000 &&
+                     hdr.pf.gbit_mask == 0x0000FF00 &&
+                     hdr.pf.bbit_mask == 0x000000FF )
+                {
+                    return {
+                        bgr8_to_rgb8(content),
+                        image_data_format::rgb8,
+                        3,
+                        {1,1}};
+                }
+            }
+
+            if ( hdr.pf.rgbbit_count == 32 ) {
+                if ( hdr.pf.rbit_mask == 0x00FF0000 &&
+                     hdr.pf.gbit_mask == 0x0000FF00 &&
+                     hdr.pf.bbit_mask == 0x000000FF )
+                {
+                    return {
+                        bgrx8_to_rgb8(content),
+                        image_data_format::rgb8,
+                        3,
+                        {1,1}};
+                }
+            }
+        }
+
+        return image_info();
     }
 }
 
 namespace e2d::images::impl
 {
-    bool load_image_dds(image& dst, const buffer& src) {
-        if ( !is_dds(src.data(), src.size()) ) {
+    bool load_image_dds(image& dst, buffer_view src) {
+        if ( src.size() < sizeof(dds_header) ) {
             return false;
         }
 
         const dds_header& hdr = *reinterpret_cast<const dds_header*>(src.data());
-        const u8* content = src.data() + sizeof(dds_header);
-        const std::size_t content_size = static_cast<std::size_t>(src.data() + src.size() - content);
 
-        if ( math::check_all_flags(hdr.dwCaps2, ddsf_cubemap) ||
-             math::check_all_flags(hdr.dwCaps2, ddsf_volume) ||
-             (hdr.dwDepth > 0) )
+        if ( hdr.magic != make_fourcc('D', 'D', 'S', ' ') ) {
+            return false;
+        }
+
+        if ( hdr.size != sizeof(dds_header) - sizeof(hdr.magic) ) {
+            return false;
+        }
+
+        if ( hdr.pf.size != sizeof(dds_pixel_format) ) {
+            return false;
+        }
+
+        if ( math::check_any_flags(hdr.caps, dds_caps_complex | dds_caps_mipmap) ||
+             math::check_any_flags(hdr.caps2, dds_caps2_cubemap | dds_caps2_volume) ||
+             hdr.depth > 1 ||
+             hdr.mipmap_count > 1 )
         {
             return false;
         }
 
-        image_data_format format = image_data_format(-1);
-        u32 bytes_per_block = 0;
-        v2u block_size = v2u(1,1);
-        if ( !get_dds_format(hdr, format, bytes_per_block, block_size) ) {
+        image_info info = extract_image_info(hdr, {
+            static_cast<const u8*>(src.data()) + sizeof(dds_header),
+            src.size() - sizeof(dds_header)});
+
+        if ( !info.valid() ) {
             return false;
         }
 
-        const v2u dimension = v2u(hdr.dwWidth, hdr.dwHeight);
-        const std::size_t size = bytes_per_block *
-            ((dimension.x + block_size.x - 1) / block_size.x) *
-            ((dimension.y + block_size.y - 1) / block_size.y);
+        const v2u dimension = v2u(hdr.width, hdr.height);
+        const std::size_t expected_image_data_size = info.bytes_per_block *
+            ((dimension.x + info.block_size.x - 1) / info.block_size.x) *
+            ((dimension.y + info.block_size.y - 1) / info.block_size.y);
 
-        if ( content_size != size ) {
+        if ( info.data.size() != expected_image_data_size ) {
             return false;
         }
 
-        dst = image(dimension, format, buffer(content, size));
+        dst = image(dimension, info.format, std::move(info.data));
         return true;
     }
 }
diff --git a/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp b/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp
index 96eaf887..610c1a60 100644
--- a/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp
+++ b/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp
@@ -5,141 +5,196 @@
  ******************************************************************************/
 
 #include "image_impl.hpp"
-#include "image_impl_structures.hpp"
+#include "image_impl_pvr.hpp"
 
 namespace
 {
-    // PVR format specification:
-    // https://cdn.imgtec.com/sdk-documentation/PVR+File+Format.Specification.pdf
-
     using namespace e2d;
+    using namespace e2d::images::impl;
     using namespace e2d::images::impl::pvr;
 
-    bool is_pvr(const void* data, std::size_t byte_size) noexcept {
-        if ( byte_size > sizeof(pvr_header) ) {
-            const pvr_header* hdr = reinterpret_cast<const pvr_header*>(data);
-            return hdr->version == 0x03525650;
-        }
-        return false;
-    }
+    struct image_info {
+        buffer data;
+        image_data_format format = image_data_format(-1);
+        u32 bytes_per_block = 0;
+        v2u block_size;
 
-    bool get_pvr_format(
+        image_info() = default;
+        image_info(buffer data, image_data_format format, u32 bytes_per_block, v2u block_size)
+        : data(std::move(data))
+        , format(format)
+        , bytes_per_block(bytes_per_block)
+        , block_size(block_size) {}
+
+        bool valid() const noexcept {
+            return !data.empty()
+                && format != image_data_format(-1)
+                && bytes_per_block > 0
+                && block_size.x > 0
+                && block_size.y > 0;
+        }
+    };
+
+    image_info extract_image_info(
         const pvr_header& hdr,
-        image_data_format& out_format,
-        u32& out_bytes_per_block,
-        v2u& out_block_size) noexcept
+        buffer_view content) noexcept
     {
-        if ( pvr_color_space(hdr.colorSpace) != pvr_color_space::linear ) {
-            return false;
+        if ( pvr_color_space(hdr.color_space) != pvr_color_space::linear ) {
+            return image_info();
         }
+
         const pvr_pixel_format fmt = pvr_pixel_format(
-            hdr.pixelFormat0 | (u64(hdr.pixelFormat1) << 32));
-        switch (fmt)
-        {
+            (static_cast<u64>(hdr.pixel_format0)) |
+            (static_cast<u64>(hdr.pixel_format1) << 32));
+
+        switch ( fmt ) {
         case pvr_pixel_format::pvrtc_2bpp_rgb:
-            out_format = image_data_format::rgb_pvrtc2;
-            out_bytes_per_block = 8;
-            out_block_size = v2u(8,4);
-            break;
+            return {
+                buffer(content),
+                image_data_format::rgb_pvrtc2,
+                8,
+                {8,4}};
         case pvr_pixel_format::pvrtc_2bpp_rgba:
-            out_format = image_data_format::rgba_pvrtc2;
-            out_bytes_per_block = 8;
-            out_block_size = v2u(8,4);
-            break;
+            return {
+                buffer(content),
+                image_data_format::rgba_pvrtc2,
+                8,
+                {8,4}};
         case pvr_pixel_format::pvrtc_4bpp_rgb:
-            out_format = image_data_format::rgb_pvrtc4;
-            out_bytes_per_block = 8;
-            out_block_size = v2u(4,4);
-            break;
+            return {
+                buffer(content),
+                image_data_format::rgb_pvrtc4,
+                8,
+                {4,4}};
         case pvr_pixel_format::pvrtc_4bpp_rgba:
-            out_format = image_data_format::rgba_pvrtc4;
-            out_bytes_per_block = 8;
-            out_block_size = v2u(4,4);
-            break;
-        case pvr_pixel_format::pvrtc_ii_2bpp:
-            out_format = image_data_format::rgba_pvrtc2_v2;
-            out_bytes_per_block = 8;
-            out_block_size = v2u(8,4);
-            break;
-        case pvr_pixel_format::pvrtc_ii_4bpp:
-            out_format = image_data_format::rgba_pvrtc4_v2;
-            out_bytes_per_block = 8;
-            out_block_size = v2u(4,4);
-            break;
+            return {
+                buffer(content),
+                image_data_format::rgba_pvrtc4,
+                8,
+                {4,4}};
+        case pvr_pixel_format::pvrtc2_2bpp:
+            return {
+                buffer(content),
+                image_data_format::rgba_pvrtc2_v2,
+                8,
+                {8,4}};
+        case pvr_pixel_format::pvrtc2_4bpp:
+            return {
+                buffer(content),
+                image_data_format::rgba_pvrtc4_v2,
+                8,
+                {4,4}};
         case pvr_pixel_format::dxt1:
-            out_format = image_data_format::rgb_dxt1;
-            out_bytes_per_block = 8;
-            out_block_size = v2u(4,4);
-            break;
+            return {
+                buffer(content),
+                image_data_format::rgba_dxt1,
+                8,
+                {4,4}};
+        case pvr_pixel_format::dxt2:
         case pvr_pixel_format::dxt3:
-            out_format = image_data_format::rgba_dxt3;
-            out_bytes_per_block = 16;
-            out_block_size = v2u(4,4);
-            break;
+            return {
+                buffer(content),
+                image_data_format::rgba_dxt3,
+                16,
+                {4,4}};
+        case pvr_pixel_format::dxt4:
         case pvr_pixel_format::dxt5:
-            out_format = image_data_format::rgba_dxt5;
-            out_bytes_per_block = 16;
-            out_block_size = v2u(4,4);
-            break;
-        case pvr_pixel_format::rgba8:
-            out_format = image_data_format::rgba8;
-            out_bytes_per_block = 4;
-            out_block_size = v2u(1,1);
-            break;
-        case pvr_pixel_format::r8:
-            out_format = image_data_format::g8;
-            out_bytes_per_block = 1;
-            out_block_size = v2u(1,1);
-            break;
-        case pvr_pixel_format::rg8:
-            out_format = image_data_format::ga8;
-            out_bytes_per_block = 2;
-            out_block_size = v2u(1,1);
-            break;
+            return {
+                buffer(content),
+                image_data_format::rgba_dxt5,
+                16,
+                {4,4}};
+        case pvr_pixel_format::a8:
+            return {
+                buffer(content),
+                image_data_format::a8,
+                1,
+                {1,1}};
+        case pvr_pixel_format::l8:
+            return {
+                buffer(content),
+                image_data_format::l8,
+                1,
+                {1,1}};
+        case pvr_pixel_format::la8:
+            return {
+                buffer(content),
+                image_data_format::la8,
+                2,
+                {1,1}};
         case pvr_pixel_format::rgb8:
-            out_format = image_data_format::rgb8;
-            out_bytes_per_block = 3;
-            out_block_size = v2u(1,1);
-            break;
+            return {
+                buffer(content),
+                image_data_format::rgb8,
+                3,
+                {1,1}};
+        case pvr_pixel_format::rgba8:
+            return {
+                buffer(content),
+                image_data_format::rgba8,
+                4,
+                {1,1}};
+        case pvr_pixel_format::bgr8:
+            return {
+                bgr8_to_rgb8(content),
+                image_data_format::rgb8,
+                3,
+                {1,1}};
+        case pvr_pixel_format::bgra8:
+            return {
+                bgra8_to_rgba8(content),
+                image_data_format::rgba8,
+                4,
+                {1,1}};
         default:
-            return false;
+            return image_info();
         }
-        return true;
     }
 }
 
 namespace e2d::images::impl
 {
-    bool load_image_pvr(image& dst, const buffer& src) {
-        if ( !is_pvr(src.data(), src.size()) ) {
+    bool load_image_pvr(image& dst, buffer_view src) {
+        if ( src.size() < sizeof(pvr_header) ) {
             return false;
         }
 
         const pvr_header& hdr = *reinterpret_cast<const pvr_header*>(src.data());
-        const u8* content = src.data() + sizeof(pvr_header) + hdr.metaDataSize;
-        const std::size_t content_size = static_cast<std::size_t>(src.data() + src.size() - content);
 
-        if ( hdr.numSurfaces != 1 || hdr.numFaces != 1 || hdr.depth > 1 ) {
-            return false; // cubemap and volume textures are not supported
+        if ( hdr.version != make_fourcc('P', 'V', 'R', 3) ) {
+            return false;
         }
 
-        image_data_format format = image_data_format(-1);
-        u32 bytes_per_block = 0;
-        v2u block_size = v2u(1,1);
-        if ( !get_pvr_format(hdr, format, bytes_per_block, block_size) ) {
+        if ( src.size() < sizeof(pvr_header) + hdr.meta_data_size ) {
+            return false;
+        }
+
+        if ( hdr.mipmap_count > 1 ||
+             hdr.num_surfaces > 1 ||
+             hdr.num_faces > 1 ||
+             hdr.depth > 1 )
+        {
+            return false;
+        }
+
+        image_info info = extract_image_info(hdr, {
+            static_cast<const u8*>(src.data()) + sizeof(pvr_header) + hdr.meta_data_size,
+            src.size() - sizeof(pvr_header) - hdr.meta_data_size});
+
+        if ( !info.valid() ) {
             return false;
         }
 
         const v2u dimension = v2u(hdr.width, hdr.height);
-        const std::size_t size = bytes_per_block *
-            ((dimension.x + block_size.x - 1) / block_size.x) *
-            ((dimension.y + block_size.y - 1) / block_size.y);
+        const std::size_t expected_image_data_size = info.bytes_per_block *
+            ((dimension.x + info.block_size.x - 1) / info.block_size.x) *
+            ((dimension.y + info.block_size.y - 1) / info.block_size.y);
 
-        if ( content_size != size ) {
+        if ( info.data.size() != expected_image_data_size ) {
             return false;
         }
 
-        dst = image(dimension, format, buffer(content, size));
+        dst = image(dimension, info.format, std::move(info.data));
         return true;
     }
 }
diff --git a/sources/enduro2d/utils/image_impl/image_reader_stb.cpp b/sources/enduro2d/utils/image_impl/image_reader_stb.cpp
index 5505f224..cbac50fe 100644
--- a/sources/enduro2d/utils/image_impl/image_reader_stb.cpp
+++ b/sources/enduro2d/utils/image_impl/image_reader_stb.cpp
@@ -31,7 +31,7 @@ namespace
 
     using stbi_img_uptr = std::unique_ptr<stbi_uc, decltype(&stbi_image_free)>;
 
-    stbi_img_uptr load_stb_image(const buffer& data, v2u& out_size, u32& out_channels) noexcept {
+    stbi_img_uptr load_stb_image(buffer_view data, v2u& out_size, u32& out_channels) noexcept {
         int img_w = 0, img_h = 0, img_c = 0;
         stbi_uc* img = stbi_load_from_memory(
             static_cast<const stbi_uc*>(data.data()),
@@ -48,8 +48,8 @@ namespace
 
     image_data_format image_format_from_stb_channels(u32 channels) noexcept {
         switch ( channels ) {
-            case 1: return image_data_format::g8;
-            case 2: return image_data_format::ga8;
+            case 1: return image_data_format::l8;
+            case 2: return image_data_format::la8;
             case 3: return image_data_format::rgb8;
             case 4: return image_data_format::rgba8;
             default:
@@ -61,7 +61,7 @@ namespace
 
 namespace e2d::images::impl
 {
-    bool load_image_stb(image& dst, const buffer& src) {
+    bool load_image_stb(image& dst, buffer_view src) {
         v2u img_size;
         u32 img_channels = 0;
         const stbi_img_uptr img_ptr = load_stb_image(src, img_size, img_channels);
diff --git a/sources/enduro2d/utils/image_impl/image_writer_dds.cpp b/sources/enduro2d/utils/image_impl/image_writer_dds.cpp
index c3c84467..537d2e7c 100644
--- a/sources/enduro2d/utils/image_impl/image_writer_dds.cpp
+++ b/sources/enduro2d/utils/image_impl/image_writer_dds.cpp
@@ -5,20 +5,24 @@
  ******************************************************************************/
 
 #include "image_impl.hpp"
-#include "image_impl_structures.hpp"
-
+#include "image_impl_dds.hpp"
 
 namespace
 {
     using namespace e2d;
     using namespace e2d::images::impl::dds;
+}
 
-    bool is_save_image_dds_supported(image_data_format data_format) noexcept {
-        switch ( data_format ) {
-            case image_data_format::g8:
+namespace e2d::images::impl
+{
+    bool check_save_image_dds(const image& src) noexcept {
+        switch ( src.format() ) {
+            case image_data_format::a8:
+            case image_data_format::l8:
+            case image_data_format::la8:
             case image_data_format::rgb8:
             case image_data_format::rgba8:
-            case image_data_format::rgb_dxt1:
+                
             case image_data_format::rgba_dxt1:
             case image_data_format::rgba_dxt3:
             case image_data_format::rgba_dxt5:
@@ -28,105 +32,109 @@ namespace
         }
     }
 
-    u32 get_pitch_or_linear_size(image_data_format data_format) noexcept {
-        switch ( data_format ) {
-            case image_data_format::g8:
-                break;
-            case image_data_format::rgb8:
-                break;
-            case image_data_format::rgba8:
-                break;
-            case image_data_format::rgb_dxt1:
-                break;
-            case image_data_format::rgba_dxt1:
-                break;
-            case image_data_format::rgba_dxt3:
-                break;
-            case image_data_format::rgba_dxt5:
-                break;
-            default:
-                E2D_ASSERT_MSG(false, "unused pixel format");
-                break;
-        }
-
-        return 0;
-    }
-}
-
-namespace e2d::images::impl
-{
     bool save_image_dds(const image& src, buffer& dst) {
-        E2D_UNUSED(src, dst);
-        if ( is_save_image_dds_supported(src.format()) ) {
-            dds_header hdr;
-            hdr.dwMagic = 0x20534444;
-            hdr.dwSize = 124;
-            hdr.dwFlags = ddsd_caps | ddsd_height | ddsd_width | ddsd_pixelformat;
-            hdr.dwHeight = src.size().y;
-            hdr.dwWidth = src.size().x;
-            hdr.dwPitchOrLinearSize = get_pitch_or_linear_size(src.format());
-            hdr.dwDepth = 0;
-            hdr.dwMipMapCount = 0;
-            hdr.ddspf.dwSize = 32;
-            hdr.ddspf.dwFlags = 0;
-            hdr.ddspf.dwFourCC = 0;
-            hdr.ddspf.dwRBitMask = 0;
-            hdr.ddspf.dwGBitMask = 0;
-            hdr.ddspf.dwBBitMask = 0;
-            hdr.ddspf.dwABitMask = 0;
-            switch ( src.format() ) {
-                case image_data_format::g8:
-                    hdr.ddspf.dwRGBBitCount = 8;
-                    break;
-                case image_data_format::rgb8:
-                    hdr.ddspf.dwFlags |= ddsf_rgb;
-                    hdr.ddspf.dwRGBBitCount = 24;
-                    hdr.ddspf.dwRBitMask = 0x000000FF;
-                    hdr.ddspf.dwGBitMask = 0x0000FF00;
-                    hdr.ddspf.dwBBitMask = 0x00FF0000;
-                    hdr.ddspf.dwABitMask = 0x00000000;
-                    break;
-                case image_data_format::rgba8:
-                    hdr.ddspf.dwFlags |= ddsf_rgba;
-                    hdr.ddspf.dwRGBBitCount = 32;
-                    hdr.ddspf.dwRBitMask = 0x000000FF;
-                    hdr.ddspf.dwGBitMask = 0x0000FF00;
-                    hdr.ddspf.dwBBitMask = 0x00FF0000;
-                    hdr.ddspf.dwABitMask = 0xFF000000;
-                    break;
-                case image_data_format::rgb_dxt1:
-                    hdr.ddspf.dwFlags |= ddsf_fourcc;
-                    hdr.ddspf.dwFourCC = fourcc_dxt1;
-                    break;
-                case image_data_format::rgba_dxt1:
-                    hdr.ddspf.dwFlags |= ddsf_fourcc | ddsf_alphapixels;
-                    hdr.ddspf.dwFourCC = fourcc_dxt1;
-                    break;
-                case image_data_format::rgba_dxt3:
-                    hdr.ddspf.dwFlags |= ddsf_fourcc;
-                    hdr.ddspf.dwFourCC |= fourcc_dxt3;
-                    break;
-                case image_data_format::rgba_dxt5:
-                    hdr.ddspf.dwFlags |= ddsf_fourcc;
-                    hdr.ddspf.dwFourCC = fourcc_dxt5;
-                    break;
-                default:
-                    E2D_ASSERT_MSG(false, "unused pixel format");
-                    break;;
-            }
-            hdr.dwCaps = 0x1000;//DDSCAPS_TEXTURE
-            hdr.dwCaps2 = 0;
-            hdr.dwCaps3 = 0;
-            hdr.dwCaps4 = 0;
-            hdr.dwReserved2 = 0;
-
-            size_t size = sizeof(hdr) + src.data().size();
-            u8 content[size];
-            std::memcpy(content, &hdr, sizeof(hdr));
-            std::memcpy(content + sizeof(hdr), src.data().data(), src.data().size());
-            dst.assign(content, size);
-            return true;
+        if ( !check_save_image_dds(src) ) {
+            return false;
         }
-        return false;
+
+        dds_header hdr;
+        hdr.magic = make_fourcc('D', 'D', 'S', ' ');
+        hdr.size = sizeof(dds_header) - sizeof(hdr.magic);
+        hdr.flags =
+            dds_hf_caps |
+            dds_hf_width |
+            dds_hf_height |
+            dds_hf_linear_size |
+            dds_hf_pixel_format;
+
+        hdr.width = src.size().x;
+        hdr.height = src.size().y;
+        hdr.pitch_or_linear_size = math::numeric_cast<u32>(src.data().size());
+        hdr.depth = 0;
+        hdr.mipmap_count = 0;
+        hdr.caps = dds_caps_texture;
+        hdr.caps2 = 0;
+
+        hdr.pf.size = sizeof(dds_pixel_format);
+        hdr.pf.flags = 0;
+        hdr.pf.fourcc = 0;
+        hdr.pf.rgbbit_count = 0;
+        hdr.pf.rbit_mask = 0;
+        hdr.pf.gbit_mask = 0;
+        hdr.pf.bbit_mask = 0;
+        hdr.pf.abit_mask = 0;
+
+        switch ( src.format() ) {
+        case image_data_format::a8:
+            hdr.pf.flags = dds_pff_alpha | dds_pff_alphapixels;
+            hdr.pf.rgbbit_count = 8;
+            hdr.pf.rbit_mask = 0x00000000;
+            hdr.pf.gbit_mask = 0x00000000;
+            hdr.pf.bbit_mask = 0x00000000;
+            hdr.pf.abit_mask = 0x000000FF;
+            break;
+        case image_data_format::l8:
+            hdr.pf.flags = dds_pff_luminance;
+            hdr.pf.rgbbit_count = 8;
+            hdr.pf.rbit_mask = 0x000000FF;
+            hdr.pf.gbit_mask = 0x00000000;
+            hdr.pf.bbit_mask = 0x00000000;
+            hdr.pf.abit_mask = 0x00000000;
+            break;
+        case image_data_format::la8:
+            hdr.pf.flags = dds_pff_luminance | dds_pff_alphapixels;
+            hdr.pf.rgbbit_count = 16;
+            hdr.pf.rbit_mask = 0x000000FF;
+            hdr.pf.gbit_mask = 0x00000000;
+            hdr.pf.bbit_mask = 0x00000000;
+            hdr.pf.abit_mask = 0x0000FF00;
+            break;
+        case image_data_format::rgb8:
+            hdr.pf.flags = dds_pff_rgb;
+            hdr.pf.rgbbit_count = 24;
+            hdr.pf.rbit_mask = 0x000000FF;
+            hdr.pf.gbit_mask = 0x0000FF00;
+            hdr.pf.bbit_mask = 0x00FF0000;
+            hdr.pf.abit_mask = 0x00000000;
+            break;
+        case image_data_format::rgba8:
+            hdr.pf.flags = dds_pff_rgb | dds_pff_alphapixels;
+            hdr.pf.rgbbit_count = 32;
+            hdr.pf.rbit_mask = 0x000000FF;
+            hdr.pf.gbit_mask = 0x0000FF00;
+            hdr.pf.bbit_mask = 0x00FF0000;
+            hdr.pf.abit_mask = 0xFF000000;
+            break;
+        case image_data_format::rgba_dxt1:
+            hdr.pf.flags = dds_pff_fourcc;
+            hdr.pf.fourcc = make_fourcc('D', 'X', 'T', '1');
+            break;
+        case image_data_format::rgba_dxt3:
+            hdr.pf.flags = dds_pff_fourcc;
+            hdr.pf.fourcc = make_fourcc('D', 'X', 'T', '3');
+            break;
+        case image_data_format::rgba_dxt5:
+            hdr.pf.flags = dds_pff_fourcc;
+            hdr.pf.fourcc = make_fourcc('D', 'X', 'T', '5');
+            break;
+        default:
+            E2D_ASSERT_MSG(false, "unexpected image data format");
+            return false;
+        }
+
+        buffer image_data(sizeof(dds_header) + src.data().size());
+
+        std::memcpy(
+            image_data.data(),
+            &hdr,
+            sizeof(dds_header));
+
+        std::memcpy(
+            image_data.data() + sizeof(dds_header),
+            src.data().data(),
+            src.data().size());
+
+        dst.assign(std::move(image_data));
+        return true;
     }
 }
diff --git a/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp b/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
index bcc26361..ba053e9a 100644
--- a/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
+++ b/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
@@ -5,26 +5,58 @@
  ******************************************************************************/
 
 #include "image_impl.hpp"
-#include "image_impl_structures.hpp"
+#include "image_impl_pvr.hpp"
 
 namespace
 {
     using namespace e2d;
     using namespace e2d::images::impl::pvr;
 
-    bool is_save_image_pvr_supported(image_data_format data_format) noexcept {
-        switch ( data_format ) {
-            case image_data_format::g8:
-            case image_data_format::ga8:
+    pvr_pixel_format get_pvr_pixel_format(image_data_format fmt) noexcept {
+        switch ( fmt ) {
+        case image_data_format::a8: return pvr_pixel_format::a8;
+        case image_data_format::l8: return pvr_pixel_format::l8;
+        case image_data_format::la8: return pvr_pixel_format::la8;
+        case image_data_format::rgb8: return pvr_pixel_format::rgb8;
+        case image_data_format::rgba8: return pvr_pixel_format::rgba8;
+
+        case image_data_format::rgba_dxt1: return pvr_pixel_format::dxt1;
+        case image_data_format::rgba_dxt3: return pvr_pixel_format::dxt3;
+        case image_data_format::rgba_dxt5: return pvr_pixel_format::dxt5;
+
+        case image_data_format::rgb_pvrtc2: return pvr_pixel_format::pvrtc_2bpp_rgb;
+        case image_data_format::rgb_pvrtc4: return pvr_pixel_format::pvrtc_4bpp_rgb;
+        case image_data_format::rgba_pvrtc2: return pvr_pixel_format::pvrtc_2bpp_rgba;
+        case image_data_format::rgba_pvrtc4: return pvr_pixel_format::pvrtc_4bpp_rgba;
+
+        case image_data_format::rgba_pvrtc2_v2: return pvr_pixel_format::pvrtc2_2bpp;
+        case image_data_format::rgba_pvrtc4_v2: return pvr_pixel_format::pvrtc2_4bpp;
+        default:
+            E2D_ASSERT_MSG(false, "unexpected image data format");
+            return pvr_pixel_format(-1);
+        }
+    }
+}
+
+namespace e2d::images::impl
+{
+    bool check_save_image_pvr(const image& src) noexcept {
+        switch ( src.format() ) {
+            case image_data_format::a8:
+            case image_data_format::l8:
+            case image_data_format::la8:
             case image_data_format::rgb8:
             case image_data_format::rgba8:
-            case image_data_format::rgb_dxt1:
+
+            case image_data_format::rgba_dxt1:
             case image_data_format::rgba_dxt3:
             case image_data_format::rgba_dxt5:
+
             case image_data_format::rgb_pvrtc2:
             case image_data_format::rgb_pvrtc4:
             case image_data_format::rgba_pvrtc2:
             case image_data_format::rgba_pvrtc4:
+                
             case image_data_format::rgba_pvrtc2_v2:
             case image_data_format::rgba_pvrtc4_v2:
                 return true;
@@ -32,89 +64,42 @@ namespace
                 return false;
         }
     }
-
-    u64 get_pvr_pixel_format(image_data_format data_format) noexcept {
-        pvr_pixel_format res;
-        switch ( data_format ) {
-            case image_data_format::g8:
-                res = pvr_pixel_format::r8;
-                break;
-            case image_data_format::ga8:
-                res = pvr_pixel_format::rg8;
-                break;
-            case image_data_format::rgb8:
-                res = pvr_pixel_format::rgb8;
-                break;
-            case image_data_format::rgba8:
-                res = pvr_pixel_format::rgba8;
-                break;
-            case image_data_format::rgb_dxt1:
-                res = pvr_pixel_format::dxt1;
-                break;
-            case image_data_format::rgba_dxt3:
-                res = pvr_pixel_format::dxt3;
-                break;
-            case image_data_format::rgba_dxt5:
-                res = pvr_pixel_format::dxt5;
-                break;
-            case image_data_format::rgb_pvrtc2:
-                res = pvr_pixel_format::pvrtc_2bpp_rgb;
-                break;
-            case image_data_format::rgb_pvrtc4:
-                res = pvr_pixel_format::pvrtc_4bpp_rgb;
-                break;
-            case image_data_format::rgba_pvrtc2:
-                res = pvr_pixel_format::pvrtc_2bpp_rgba;
-                break;
-            case image_data_format::rgba_pvrtc4:
-                res = pvr_pixel_format::pvrtc_4bpp_rgba;
-                break;
-            case image_data_format::rgba_pvrtc2_v2:
-                res = pvr_pixel_format::pvrtc_ii_2bpp;
-                break;
-            case image_data_format::rgba_pvrtc4_v2:
-                res = pvr_pixel_format::pvrtc_ii_4bpp;
-                break;
-            default:
-                E2D_ASSERT_MSG(false, "unused pixel format");
-                break;
-        }
-
-        return static_cast<u64>(res);
-    }
-}
-
-namespace e2d::images::impl
-{
+    
     bool save_image_pvr(const image& src, buffer& dst) {
-        E2D_UNUSED(src, dst);
-        if ( is_save_image_pvr_supported(src.format()) ) {
-            u64 pixel_format = get_pvr_pixel_format(src.format());
-            pvr_header hdr;
-            hdr.version = 0x03525650;
-            hdr.flags = 0;
-            hdr.pixelFormat0 = pixel_format & 0x00000000'FFFFFFFFull;
-            hdr.pixelFormat1 = pixel_format >> 32;
-            hdr.colorSpace = static_cast<u32>(pvr_color_space::linear);
-            hdr.channelType = static_cast<u32>(pvr_channel_type::ubyte);
-            hdr.height = src.size().y;
-            hdr.width = src.size().x;
-            hdr.depth = 0;
-            hdr.numSurfaces = 1;
-            hdr.numFaces = 1;
-            hdr.mipMapCount = 0;
-            hdr.metaDataSize = sizeof(pvr_meta_data);
-
-            pvr_meta_data md;
-
-            size_t size = sizeof(hdr) + sizeof(md) + src.data().size();
-            u8 content[size];
-            std::memcpy(content, &hdr, sizeof(hdr));
-            std::memcpy(content + sizeof(hdr), &md, sizeof(md));
-            std::memcpy(content + sizeof(hdr) + sizeof(md), src.data().data(), src.data().size());
-            dst.assign(content, size);
-            return true;
+        if ( !check_save_image_pvr(src) ) {
+            return false;
         }
-        return false;
+
+        pvr_header hdr;
+        hdr.version = make_fourcc('P', 'V', 'R', 3);
+        hdr.flags = static_cast<u32>(pvr_flags::none);
+        hdr.pixel_format0 = static_cast<u32>(
+            static_cast<u64>(get_pvr_pixel_format(src.format())) & 0xFFFFFFFF);
+        hdr.pixel_format1 = static_cast<u32>(
+            static_cast<u64>(get_pvr_pixel_format(src.format())) >> 32);
+        hdr.color_space = static_cast<u32>(pvr_color_space::linear);
+        hdr.channel_type = static_cast<u32>(pvr_channel_type::ubyte);
+        hdr.height = src.size().y;
+        hdr.width = src.size().x;
+        hdr.depth = 1;
+        hdr.num_surfaces = 1;
+        hdr.num_faces = 1;
+        hdr.mipmap_count = 1;
+        hdr.meta_data_size = 0;
+
+        buffer image_data(sizeof(pvr_header) + src.data().size());
+
+        std::memcpy(
+            image_data.data(),
+            &hdr,
+            sizeof(pvr_header));
+
+        std::memcpy(
+            image_data.data() + sizeof(pvr_header),
+            src.data().data(),
+            src.data().size());
+
+        dst.assign(std::move(image_data));
+        return true;
     }
 }
diff --git a/sources/enduro2d/utils/image_impl/image_writer_stb.cpp b/sources/enduro2d/utils/image_impl/image_writer_stb.cpp
index 29c13538..50a60768 100644
--- a/sources/enduro2d/utils/image_impl/image_writer_stb.cpp
+++ b/sources/enduro2d/utils/image_impl/image_writer_stb.cpp
@@ -42,20 +42,53 @@ namespace
         }
     }
 
+    bool stb_check_save_image_format(image_data_format format) noexcept {
+        switch ( format ) {
+            case image_data_format::l8:
+            case image_data_format::la8:
+            case image_data_format::rgb8:
+            case image_data_format::rgba8:
+                return true;
+            default:
+                return false;
+        }
+    }
+
     int stb_channels_from_image_format(image_data_format format) noexcept {
         switch ( format ) {
-            case image_data_format::g8:    return 1;
-            case image_data_format::ga8:   return 2;
-            case image_data_format::rgb8:  return 3;
+            case image_data_format::l8: return 1;
+            case image_data_format::la8: return 2;
+            case image_data_format::rgb8: return 3;
             case image_data_format::rgba8: return 4;
-            default:                       return 0;
+            default:
+                E2D_ASSERT_MSG(false, "unexpected image data format");
+                return 0;
         }
     }
 }
 
+namespace e2d::images::impl
+{
+    bool check_save_image_jpg(const image& src) noexcept {
+        return stb_check_save_image_format(src.format());
+    }
+
+    bool check_save_image_png(const image& src) noexcept {
+        return stb_check_save_image_format(src.format());
+    }
+
+    bool check_save_image_tga(const image& src) noexcept {
+        return stb_check_save_image_format(src.format());
+    }
+}
+
 namespace e2d::images::impl
 {
     bool save_image_jpg(const image& src, buffer& dst) {
+        if ( !check_save_image_jpg(src) ) {
+            return false;
+        }
+
         int img_w = math::numeric_cast<int>(src.size().x);
         int img_h = math::numeric_cast<int>(src.size().y);
         int img_c = stb_channels_from_image_format(src.format());
@@ -82,6 +115,10 @@ namespace e2d::images::impl
     }
 
     bool save_image_png(const image& src, buffer& dst) {
+        if ( !check_save_image_png(src) ) {
+            return false;
+        }
+
         int img_w = math::numeric_cast<int>(src.size().x);
         int img_h = math::numeric_cast<int>(src.size().y);
         int img_c = stb_channels_from_image_format(src.format());
@@ -108,6 +145,10 @@ namespace e2d::images::impl
     }
 
     bool save_image_tga(const image& src, buffer& dst) {
+        if ( !check_save_image_tga(src) ) {
+            return false;
+        }
+
         int img_w = math::numeric_cast<int>(src.size().x);
         int img_h = math::numeric_cast<int>(src.size().y);
         int img_c = stb_channels_from_image_format(src.format());
diff --git a/untests/bin/images/dds/ship_a8.dds b/untests/bin/images/dds/ship_a8.dds
new file mode 100644
index 00000000..bf26c7ed
--- /dev/null
+++ b/untests/bin/images/dds/ship_a8.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6d2cd928ace63bf0ed4f9e71007fcf435b414c8b34312f1fb5a021ac01ef9876
+size 8320
diff --git a/untests/bin/images/dds/ship_a8l8.dds b/untests/bin/images/dds/ship_a8l8.dds
new file mode 100644
index 00000000..c527ffbb
--- /dev/null
+++ b/untests/bin/images/dds/ship_a8l8.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bf310ae21482921cc00c0b962be7cc109bc28f7bab713528bd84817ebba0e68b
+size 16512
diff --git a/untests/bin/images/dds/ship_a8r8g8b8.dds b/untests/bin/images/dds/ship_a8r8g8b8.dds
new file mode 100644
index 00000000..96c88af5
--- /dev/null
+++ b/untests/bin/images/dds/ship_a8r8g8b8.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2bee89070f7f01c6f3316e3f5faabc8db94202fc8fe6ef4eb0159add01b3304d
+size 32896
diff --git a/untests/bin/images/dds/ship_dxt1.dds b/untests/bin/images/dds/ship_dxt1.dds
new file mode 100644
index 00000000..01a01146
--- /dev/null
+++ b/untests/bin/images/dds/ship_dxt1.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a04f77d73155ddaf20e137005698b7f98d859656d8f02d6d32b767c87dd5370
+size 4224
diff --git a/untests/bin/images/dds/ship_dxt3.dds b/untests/bin/images/dds/ship_dxt3.dds
new file mode 100644
index 00000000..18ff8eb8
--- /dev/null
+++ b/untests/bin/images/dds/ship_dxt3.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0aaac08ab41d31e0c13a1e1b03a9919c33791af29be568912865eedee395a654
+size 8320
diff --git a/untests/bin/images/dds/ship_dxt5.dds b/untests/bin/images/dds/ship_dxt5.dds
new file mode 100644
index 00000000..af4c08e4
--- /dev/null
+++ b/untests/bin/images/dds/ship_dxt5.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fe4a3d42cb22478986d9d8342959b44fe256245be4941e7e8f3cbccc49a5ede2
+size 8320
diff --git a/untests/bin/images/dds/ship_l8.dds b/untests/bin/images/dds/ship_l8.dds
new file mode 100644
index 00000000..8ab632d1
--- /dev/null
+++ b/untests/bin/images/dds/ship_l8.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c75ef2254f7315714f86097bc4b99adfff0bf54569154d028991fb65c5bba8e
+size 8320
diff --git a/untests/bin/images/dds/ship_r8g8b8.dds b/untests/bin/images/dds/ship_r8g8b8.dds
new file mode 100644
index 00000000..3d757111
--- /dev/null
+++ b/untests/bin/images/dds/ship_r8g8b8.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e69ae09fd2e5a0adcbf6301ff55d52ca562a8a93db3a96cc3fd7f61c6f197aac
+size 24704
diff --git a/untests/bin/images/dds/ship_rgba8.dds b/untests/bin/images/dds/ship_rgba8.dds
new file mode 100644
index 00000000..2145ee77
--- /dev/null
+++ b/untests/bin/images/dds/ship_rgba8.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d1c1f816df198d8d41f01455627f52fa40c55e786caff8e0fb4731aa118cb8df
+size 32896
diff --git a/untests/bin/images/dds/ship_x8r8g8b8.dds b/untests/bin/images/dds/ship_x8r8g8b8.dds
new file mode 100644
index 00000000..c8d975fd
--- /dev/null
+++ b/untests/bin/images/dds/ship_x8r8g8b8.dds
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8e6b1c2fce3ae13125353b4334374294362c3cd44a1e2f5f523570d07d1776c0
+size 32896
diff --git a/untests/bin/images/pvr/ship_a8.pvr b/untests/bin/images/pvr/ship_a8.pvr
new file mode 100644
index 00000000..0214fa84
--- /dev/null
+++ b/untests/bin/images/pvr/ship_a8.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:26640127a07a5b7b3e8390bb34791a6926357df07dad0944834527c288eff36e
+size 8259
diff --git a/untests/bin/images/pvr/ship_bgra8.pvr b/untests/bin/images/pvr/ship_bgra8.pvr
new file mode 100644
index 00000000..fa5d3ebd
--- /dev/null
+++ b/untests/bin/images/pvr/ship_bgra8.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1e4727acbfb5e77879b12c64480eea431c339b90017820e6debe6f71c0e3c756
+size 32835
diff --git a/untests/bin/images/pvr/ship_dxt1.pvr b/untests/bin/images/pvr/ship_dxt1.pvr
new file mode 100644
index 00000000..755b338a
--- /dev/null
+++ b/untests/bin/images/pvr/ship_dxt1.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e0adcd804b56aa97d144636481699c49a3a8bac21713953dff72533a47a98b89
+size 4163
diff --git a/untests/bin/images/pvr/ship_dxt3.pvr b/untests/bin/images/pvr/ship_dxt3.pvr
new file mode 100644
index 00000000..645f4698
--- /dev/null
+++ b/untests/bin/images/pvr/ship_dxt3.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b39f3c1fb9ae31b0ee8de9c1af051d90364e4c5a9887fd1631eac45ddf11c174
+size 8259
diff --git a/untests/bin/images/pvr/ship_dxt5.pvr b/untests/bin/images/pvr/ship_dxt5.pvr
new file mode 100644
index 00000000..445daac3
--- /dev/null
+++ b/untests/bin/images/pvr/ship_dxt5.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4ebc3997990b57a35538480c384c6c7722b000c675d389b2bd4d3afd57dc5de7
+size 8259
diff --git a/untests/bin/images/pvr/ship_eac_r11.pvr b/untests/bin/images/pvr/ship_eac_r11.pvr
new file mode 100644
index 00000000..dfb8945c
--- /dev/null
+++ b/untests/bin/images/pvr/ship_eac_r11.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d9170f6956e1686f841bcbf460c589e7e0baf502a072b540b22ea19550fb5f45
+size 4163
diff --git a/untests/bin/images/ship_eac_rg11.pvr b/untests/bin/images/pvr/ship_eac_rg11.pvr
similarity index 100%
rename from untests/bin/images/ship_eac_rg11.pvr
rename to untests/bin/images/pvr/ship_eac_rg11.pvr
diff --git a/untests/bin/images/pvr/ship_etc1.pvr b/untests/bin/images/pvr/ship_etc1.pvr
new file mode 100644
index 00000000..ad2582c2
--- /dev/null
+++ b/untests/bin/images/pvr/ship_etc1.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b2533bb57489a6eefcf05d986eee9e97f7bf6070809748c8aece27fbc199c5a
+size 4163
diff --git a/untests/bin/images/pvr/ship_etc2_rgb.pvr b/untests/bin/images/pvr/ship_etc2_rgb.pvr
new file mode 100644
index 00000000..1039295a
--- /dev/null
+++ b/untests/bin/images/pvr/ship_etc2_rgb.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:198d7a47737c3f16f5c4b9268ebc77c1ea63aa7128d335cc9e0c399b518311a0
+size 4163
diff --git a/untests/bin/images/pvr/ship_etc2_rgba.pvr b/untests/bin/images/pvr/ship_etc2_rgba.pvr
new file mode 100644
index 00000000..692f2cdc
--- /dev/null
+++ b/untests/bin/images/pvr/ship_etc2_rgba.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:000885d3ae07adbcfc9e2ba7aee4f56e7e7d3b9f350755ec580d27ca18ed2490
+size 8259
diff --git a/untests/bin/images/pvr/ship_etc2_rgba1.pvr b/untests/bin/images/pvr/ship_etc2_rgba1.pvr
new file mode 100644
index 00000000..35ac4ad8
--- /dev/null
+++ b/untests/bin/images/pvr/ship_etc2_rgba1.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8cf733d37c4d52720a41786656fd57e7dc554f090824fdf48bc0788a699594e2
+size 4163
diff --git a/untests/bin/images/pvr/ship_l8.pvr b/untests/bin/images/pvr/ship_l8.pvr
new file mode 100644
index 00000000..5992013d
--- /dev/null
+++ b/untests/bin/images/pvr/ship_l8.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89eb84779b83638fb0ab66e001d601ee970a9489b9f7cb1f132aca0b3ee6e8cf
+size 8259
diff --git a/untests/bin/images/pvr/ship_la8.pvr b/untests/bin/images/pvr/ship_la8.pvr
new file mode 100644
index 00000000..ab017399
--- /dev/null
+++ b/untests/bin/images/pvr/ship_la8.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58063363c4966b5c7d1f1003ebcad8e8ed0b71ba0480fd763d53ff0b952ffa74
+size 16451
diff --git a/untests/bin/images/pvr/ship_pvrtc2_2bpp.pvr b/untests/bin/images/pvr/ship_pvrtc2_2bpp.pvr
new file mode 100644
index 00000000..d07316ba
--- /dev/null
+++ b/untests/bin/images/pvr/ship_pvrtc2_2bpp.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1322266525db79e804f569aebb9d9d68ebf8e878212b9dd92d07226d6d3ed4c5
+size 2115
diff --git a/untests/bin/images/pvr/ship_pvrtc2_4bpp.pvr b/untests/bin/images/pvr/ship_pvrtc2_4bpp.pvr
new file mode 100644
index 00000000..03a6846d
--- /dev/null
+++ b/untests/bin/images/pvr/ship_pvrtc2_4bpp.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:446048e908f4147dd43a55b47ed5fe8103e5d2bec24ce61b8e69e176318dfb89
+size 4163
diff --git a/untests/bin/images/pvr/ship_pvrtc_2bpp_rgb.pvr b/untests/bin/images/pvr/ship_pvrtc_2bpp_rgb.pvr
new file mode 100644
index 00000000..c114c92d
--- /dev/null
+++ b/untests/bin/images/pvr/ship_pvrtc_2bpp_rgb.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c51efd4f2782e37a7eb86cfe142e004868b45617b6f3d2b4646135295b422f98
+size 2115
diff --git a/untests/bin/images/pvr/ship_pvrtc_2bpp_rgba.pvr b/untests/bin/images/pvr/ship_pvrtc_2bpp_rgba.pvr
new file mode 100644
index 00000000..2c50ca9e
--- /dev/null
+++ b/untests/bin/images/pvr/ship_pvrtc_2bpp_rgba.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ef1a1165023faff98302bfa809880e5aa8243e47e337bf408b9e2eec6be31b8d
+size 2115
diff --git a/untests/bin/images/pvr/ship_pvrtc_4bpp_rgb.pvr b/untests/bin/images/pvr/ship_pvrtc_4bpp_rgb.pvr
new file mode 100644
index 00000000..b345a70c
--- /dev/null
+++ b/untests/bin/images/pvr/ship_pvrtc_4bpp_rgb.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b644648eaa698b47c11bc21cbb67fe3beff76fa362514c1fd48b90bde909dd0
+size 4163
diff --git a/untests/bin/images/pvr/ship_pvrtc_4bpp_rgba.pvr b/untests/bin/images/pvr/ship_pvrtc_4bpp_rgba.pvr
new file mode 100644
index 00000000..f8766c42
--- /dev/null
+++ b/untests/bin/images/pvr/ship_pvrtc_4bpp_rgba.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fbfe371606b6857368be8abf653a25bb7674c2b4334e9ff054c6a08fe4f81f54
+size 4163
diff --git a/untests/bin/images/ship_rgb8.pvr b/untests/bin/images/pvr/ship_rgb8.pvr
similarity index 100%
rename from untests/bin/images/ship_rgb8.pvr
rename to untests/bin/images/pvr/ship_rgb8.pvr
diff --git a/untests/bin/images/ship_rgba8.pvr b/untests/bin/images/pvr/ship_rgba8.pvr
similarity index 100%
rename from untests/bin/images/ship_rgba8.pvr
rename to untests/bin/images/pvr/ship_rgba8.pvr
diff --git a/untests/bin/images/ship_etc1.pvr b/untests/bin/images/ship_etc1.pvr
deleted file mode 100644
index 6a745f8f..00000000
--- a/untests/bin/images/ship_etc1.pvr
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6b7f41f18f51ec169a9c521cd1177fd49037b200a850aad05a923240c37d8d87
-size 4163
diff --git a/untests/bin/images/ship_etc2.pvr b/untests/bin/images/ship_etc2.pvr
deleted file mode 100644
index 934b99b2..00000000
--- a/untests/bin/images/ship_etc2.pvr
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bd1c2362dc5b0b75d97ca3d5bbdf2cf647b25a5b2f8834a9005e8c9c0a70e82c
-size 8259
diff --git a/untests/bin/images/ship_pvrtc_2bpp_rgb.pvr b/untests/bin/images/ship_pvrtc_2bpp_rgb.pvr
deleted file mode 100644
index cb9dfe4e..00000000
--- a/untests/bin/images/ship_pvrtc_2bpp_rgb.pvr
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7a62a7760e33b7130539c3b6a8b7c287ccdd11edb9dd273be3c1e6ec7b81b47e
-size 2115
diff --git a/untests/bin/images/ship_pvrtc_2bpp_rgba.pvr b/untests/bin/images/ship_pvrtc_2bpp_rgba.pvr
deleted file mode 100644
index a8ea827f..00000000
--- a/untests/bin/images/ship_pvrtc_2bpp_rgba.pvr
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a9b1a7f97b26ff7df0a7275f786e029dbc45aab796247f8063c820140933685
-size 2115
diff --git a/untests/bin/images/ship_pvrtc_4bpp_rgb.pvr b/untests/bin/images/ship_pvrtc_4bpp_rgb.pvr
deleted file mode 100644
index 984cb4e4..00000000
--- a/untests/bin/images/ship_pvrtc_4bpp_rgb.pvr
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:69e2bab57471fbde23d432f77270678e0a28cf809eb079fbb39a61e68abe4059
-size 4163
diff --git a/untests/bin/images/ship_pvrtc_4bpp_rgba.pvr b/untests/bin/images/ship_pvrtc_4bpp_rgba.pvr
deleted file mode 100644
index 9d7727e9..00000000
--- a/untests/bin/images/ship_pvrtc_4bpp_rgba.pvr
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f730702b1075c5a0ef929272106275debf12dbce31a59664038545b5b91d1545
-size 4163
diff --git a/untests/bin/images/ship_pvrtc_ii_2bpp.pvr b/untests/bin/images/ship_pvrtc_ii_2bpp.pvr
deleted file mode 100644
index 7fe1680f..00000000
--- a/untests/bin/images/ship_pvrtc_ii_2bpp.pvr
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7fcf6cb866364b0a8b31bea7407a40aa2dcda1af4f618604aec2249e2e0cc588
-size 2115
diff --git a/untests/bin/images/ship_pvrtc_ii_4bpp.pvr b/untests/bin/images/ship_pvrtc_ii_4bpp.pvr
deleted file mode 100644
index f21a0e77..00000000
--- a/untests/bin/images/ship_pvrtc_ii_4bpp.pvr
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1a928929dc7532d84072e5668e5098b17289fdea1d36bff3ae48fa232294f770
-size 4163
diff --git a/untests/bin/images/ship_r8.pvr b/untests/bin/images/ship_r8.pvr
deleted file mode 100644
index c3206702..00000000
--- a/untests/bin/images/ship_r8.pvr
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e4f93405f3302067a0a1bfc05be48c20ef2e12b649d722574497f6dbd64c3b61
-size 8259
diff --git a/untests/bin/images/ship_rg8.pvr b/untests/bin/images/ship_rg8.pvr
deleted file mode 100644
index d2acc2a2..00000000
--- a/untests/bin/images/ship_rg8.pvr
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:958b8490c189abdebde1f75e8eacbcb8e6ec06dac34baed545e383639e3288d3
-size 16451
diff --git a/untests/bin/images/ship_rgba.dds b/untests/bin/images/ship_rgba.dds
deleted file mode 100644
index 47b7eacb..00000000
--- a/untests/bin/images/ship_rgba.dds
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07b0e533a85a8eef51e9baf6ebca2f5a451f74e712557ef315fd1952dcaef307
-size 8320
diff --git a/untests/bin/images/stb/ship.jpg b/untests/bin/images/stb/ship.jpg
new file mode 100644
index 00000000..5a3843b7
--- /dev/null
+++ b/untests/bin/images/stb/ship.jpg
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:332aff6826f8eb97cf3420112aa6a42655c5e284b46acd2caa80d5dfe4404e46
+size 5438
diff --git a/untests/bin/images/stb/ship.png b/untests/bin/images/stb/ship.png
new file mode 100755
index 00000000..593dbfe8
--- /dev/null
+++ b/untests/bin/images/stb/ship.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:90a41d4bedcd8d388eee4a12c168b1364bd17742c817b2ad532d799731505164
+size 11620
diff --git a/untests/bin/images/stb/ship.tga b/untests/bin/images/stb/ship.tga
new file mode 100644
index 00000000..92fde444
--- /dev/null
+++ b/untests/bin/images/stb/ship.tga
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:823bcbe99c6914db817de30b1a6dd0a64418703462a72c5136ad767bcef50c13
+size 17842
diff --git a/untests/sources/untests_core/render.cpp b/untests/sources/untests_core/render.cpp
index 317024ae..fd93f64e 100644
--- a/untests/sources/untests_core/render.cpp
+++ b/untests/sources/untests_core/render.cpp
@@ -198,7 +198,7 @@ TEST_CASE("render"){
                 REQUIRE_NOTHROW(r.update_texture(tex, src, b2u(0, 0, 128, 128)));
             }
             {
-                texture_ptr tex = r.create_texture(v2u(128,128), pixel_declaration::pixel_type::g8);
+                texture_ptr tex = r.create_texture(v2u(128,128), pixel_declaration::pixel_type::l8);
                 REQUIRE(tex != nullptr);
 
                 buffer src;
@@ -251,7 +251,7 @@ TEST_CASE("render"){
                     c = rand() % 255;
                 }
 
-                image img(v2u(31, 44), image_data_format::ga8, src);
+                image img(v2u(31, 44), image_data_format::la8, src);
                 REQUIRE_THROWS_AS(
                     r.update_texture(tex, img, v2u(11,27)),
                     bad_render_operation);
diff --git a/untests/sources/untests_utils/image.cpp b/untests/sources/untests_utils/image.cpp
index 2ae1dc27..9e8eaea8 100644
--- a/untests/sources/untests_utils/image.cpp
+++ b/untests/sources/untests_utils/image.cpp
@@ -8,219 +8,356 @@
 using namespace e2d;
 
 TEST_CASE("images") {
-    {
-        image i;
-        REQUIRE(i.size() == v2u::zero());
-        REQUIRE(i.format() == image_data_format::rgba8);
-        REQUIRE(i.data().empty());
-        REQUIRE(i.empty());
+    SECTION("image") {
+        {
+            image i;
+            REQUIRE(i.size() == v2u::zero());
+            REQUIRE(i.format() == image_data_format::rgba8);
+            REQUIRE(i.data().empty());
+            REQUIRE(i.empty());
+        }
+        {
+            const u8 img[] = {1,2,3,4,5,6,7,8};
+            image i0(v2u(2,2), image_data_format::a8, {img,4});
+            image i1(v2u(2,2), image_data_format::l8, {img,4});
+            image i2(v2u(2,1), image_data_format::la8, {img,4});
+            image i3(v2u(1,2), image_data_format::la8, {img,4});
+            image i4(v2u(2,1), image_data_format::rgb8, {img,6});
+            image i5(v2u(1,2), image_data_format::rgb8, {img,6});
+            image i6(v2u(2,1), image_data_format::rgba8, {img,8});
+            image i7(v2u(1,2), image_data_format::rgba8, {img,8});
+            REQUIRE(i0.format() == image_data_format::a8);
+            REQUIRE(i1.format() == image_data_format::l8);
+            REQUIRE(i2.format() == image_data_format::la8);
+            REQUIRE(i3.format() == image_data_format::la8);
+            REQUIRE(i4.format() == image_data_format::rgb8);
+            REQUIRE(i5.format() == image_data_format::rgb8);
+            REQUIRE(i6.format() == image_data_format::rgba8);
+            REQUIRE(i7.format() == image_data_format::rgba8);
+        }
     }
-    {
-        const u8 img[] = {1,2,3,4,5,6,7,8};
-        image i0(v2u(2,2), image_data_format::g8, {img,4});
-        image i1(v2u(2,1), image_data_format::ga8, {img,4});
-        image i2(v2u(1,2), image_data_format::ga8, {img,4});
-        image i3(v2u(2,1), image_data_format::rgb8, {img,6});
-        image i4(v2u(1,2), image_data_format::rgb8, {img,6});
-        image i5(v2u(2,1), image_data_format::rgba8, {img,8});
-        image i6(v2u(1,2), image_data_format::rgba8, {img,8});
-        REQUIRE(i0.format() == image_data_format::g8);
-        REQUIRE(i1.format() == image_data_format::ga8);
-        REQUIRE(i2.format() == image_data_format::ga8);
-        REQUIRE(i3.format() == image_data_format::rgb8);
-        REQUIRE(i4.format() == image_data_format::rgb8);
-        REQUIRE(i5.format() == image_data_format::rgba8);
-        REQUIRE(i6.format() == image_data_format::rgba8);
+
+    SECTION("stb") {
+        {
+            REQUIRE(filesystem::remove_file("image_save_test.jpg"));
+            REQUIRE(filesystem::remove_file("image_save_test.png"));
+            REQUIRE(filesystem::remove_file("image_save_test.tga"));
+            const u8 img_data[] = {255,0,0, 0,255,0, 0,0,255};
+            image img(v2u(3,1), image_data_format::rgb8, buffer(img_data, sizeof(img_data)));
+            REQUIRE(images::try_save_image(
+                img,
+                image_file_format::jpg,
+                make_write_file("image_save_test.jpg", false)));
+            REQUIRE(filesystem::file_exists("image_save_test.jpg"));
+            REQUIRE(images::try_save_image(
+                img,
+                image_file_format::png,
+                make_write_file("image_save_test.png", false)));
+            REQUIRE(filesystem::file_exists("image_save_test.png"));
+            REQUIRE(images::try_save_image(
+                img,
+                image_file_format::tga,
+                make_write_file("image_save_test.tga", false)));
+            REQUIRE(filesystem::file_exists("image_save_test.tga"));
+        }
+        {
+            image img;
+
+            REQUIRE(images::try_load_image(img, make_read_file("image_save_test.jpg")));
+            REQUIRE(img.size() == v2u(3,1));
+            REQUIRE(img.format() == image_data_format::rgb8);
+            REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   10u));
+            REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 10u));
+            REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  10u));
+
+            REQUIRE(images::try_load_image(img, make_read_file("image_save_test.png")));
+            REQUIRE(img.size() == v2u(3,1));
+            REQUIRE(img.format() == image_data_format::rgb8);
+            REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0u));
+            REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0u));
+            REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0u));
+
+            REQUIRE(images::try_load_image(img, make_read_file("image_save_test.tga")));
+            REQUIRE(img.size() == v2u(3,1));
+            REQUIRE(img.format() == image_data_format::rgb8);
+            REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0u));
+            REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0u));
+            REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0u));
+        }
+        {
+            REQUIRE(filesystem::remove_file("image_save_test.jpg"));
+            REQUIRE(filesystem::remove_file("image_save_test.png"));
+            REQUIRE(filesystem::remove_file("image_save_test.tga"));
+            const u8 img_data[] = {255,0,0, 0,255,0, 0,0,255};
+            image img(v2u(3,1), image_data_format::rgb8, buffer(img_data, sizeof(img_data)));
+            buffer buf;
+            REQUIRE(images::try_save_image(
+                img,
+                image_file_format::jpg,
+                buf));
+            REQUIRE(filesystem::try_write_all(buf, "image_save_test.jpg", false));
+            REQUIRE(images::try_save_image(
+                img,
+                image_file_format::png,
+                buf));
+            REQUIRE(filesystem::try_write_all(buf, "image_save_test.png", false));
+            REQUIRE(images::try_save_image(
+                img,
+                image_file_format::tga,
+                buf));
+            REQUIRE(filesystem::try_write_all(buf, "image_save_test.tga", false));
+        }
+        {
+            image img;
+            buffer buf;
+
+            REQUIRE(filesystem::try_read_all(buf, "image_save_test.jpg"));
+            REQUIRE(images::try_load_image(img, buf));
+            REQUIRE(img.size() == v2u(3,1));
+            REQUIRE(img.format() == image_data_format::rgb8);
+            REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   10));
+            REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 10));
+            REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  10));
+
+            REQUIRE(filesystem::try_read_all(buf, "image_save_test.png"));
+            REQUIRE(images::try_load_image(img, buf));
+            REQUIRE(img.size() == v2u(3,1));
+            REQUIRE(img.format() == image_data_format::rgb8);
+            REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0));
+            REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0));
+            REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0));
+
+            REQUIRE(filesystem::try_read_all(buf, "image_save_test.tga"));
+            REQUIRE(images::try_load_image(img, buf));
+            REQUIRE(img.size() == v2u(3,1));
+            REQUIRE(img.format() == image_data_format::rgb8);
+            REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0));
+            REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0));
+            REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0));
+        }
     }
-    {
-        REQUIRE(filesystem::remove_file("image_save_test.jpg"));
-        REQUIRE(filesystem::remove_file("image_save_test.png"));
-        REQUIRE(filesystem::remove_file("image_save_test.tga"));
-        const u8 img_data[] = {255,0,0, 0,255,0, 0,0,255};
-        image img(v2u(3,1), image_data_format::rgb8, buffer(img_data, sizeof(img_data)));
-        REQUIRE(images::try_save_image(
-            img,
-            image_file_format::jpg,
-            make_write_file("image_save_test.jpg", false)));
-        REQUIRE(filesystem::file_exists("image_save_test.jpg"));
-        REQUIRE(images::try_save_image(
-            img,
-            image_file_format::png,
-            make_write_file("image_save_test.png", false)));
-        REQUIRE(filesystem::file_exists("image_save_test.png"));
-        REQUIRE(images::try_save_image(
-            img,
-            image_file_format::tga,
-            make_write_file("image_save_test.tga", false)));
-        REQUIRE(filesystem::file_exists("image_save_test.tga"));
-        REQUIRE(images::try_save_image(
-            img,
-            image_file_format::pvr,
-            make_write_file("image_save_test.pvr", false)));
-        REQUIRE(filesystem::file_exists("image_save_test.pvr"));
-        REQUIRE(images::try_save_image(
-            img,
-            image_file_format::dds,
-            make_write_file("image_save_test.dds", false)));
-        REQUIRE(filesystem::file_exists("image_save_test.dds"));
-    }
-    {
-        image img;
 
-        REQUIRE(images::try_load_image(img, make_read_file("image_save_test.jpg")));
-        REQUIRE(img.size() == v2u(3,1));
-        REQUIRE(img.format() == image_data_format::rgb8);
-        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   10u));
-        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 10u));
-        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  10u));
+    str resources;
+    REQUIRE(filesystem::extract_predef_path(
+        resources,
+        filesystem::predef_path::resources));
 
-        REQUIRE(images::try_load_image(img, make_read_file("image_save_test.png")));
-        REQUIRE(img.size() == v2u(3,1));
-        REQUIRE(img.format() == image_data_format::rgb8);
-        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0u));
-        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0u));
-        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0u));
-
-        REQUIRE(images::try_load_image(img, make_read_file("image_save_test.tga")));
-        REQUIRE(img.size() == v2u(3,1));
-        REQUIRE(img.format() == image_data_format::rgb8);
-        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0u));
-        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0u));
-        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0u));
-
-        REQUIRE(images::try_load_image(img, make_read_file("image_save_test.pvr")));
-        REQUIRE(img.size() == v2u(3,1));
-        REQUIRE(img.format() == image_data_format::rgb8);
-        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0u));
-        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0u));
-        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0u));
-
-        REQUIRE(images::try_load_image(img, make_read_file("image_save_test.dds")));
-        REQUIRE(img.size() == v2u(3,1));
-        REQUIRE(img.format() == image_data_format::rgb8);
-        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0u));
-        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0u));
-        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0u));
-    }
-    {
-        REQUIRE(filesystem::remove_file("image_save_test.jpg"));
-        REQUIRE(filesystem::remove_file("image_save_test.png"));
-        REQUIRE(filesystem::remove_file("image_save_test.tga"));
-        REQUIRE(filesystem::remove_file("image_save_test.pvr"));
-        REQUIRE(filesystem::remove_file("image_save_test.dds"));
-        const u8 img_data[] = {255,0,0, 0,255,0, 0,0,255};
-        image img(v2u(3,1), image_data_format::rgb8, buffer(img_data, sizeof(img_data)));
-        buffer buf;
-        REQUIRE(images::try_save_image(
-            img,
-            image_file_format::jpg,
-            buf));
-        REQUIRE(filesystem::try_write_all(buf, "image_save_test.jpg", false));
-        REQUIRE(images::try_save_image(
-            img,
-            image_file_format::png,
-            buf));
-        REQUIRE(filesystem::try_write_all(buf, "image_save_test.png", false));
-        REQUIRE(images::try_save_image(
-            img,
-            image_file_format::tga,
-            buf));
-        REQUIRE(filesystem::try_write_all(buf, "image_save_test.tga", false));
-        REQUIRE(images::try_save_image(
-            img,
-            image_file_format::pvr,
-            buf));
-        REQUIRE(filesystem::try_write_all(buf, "image_save_test.pvr", false));
-        REQUIRE(images::try_save_image(
-            img,
-            image_file_format::dds,
-            buf));
-        REQUIRE(filesystem::try_write_all(buf, "image_save_test.dds", false));
-    }
-    {
-        image img;
-        buffer buf;
-
-        REQUIRE(filesystem::try_read_all(buf, "image_save_test.jpg"));
-        REQUIRE(images::try_load_image(img, buf));
-        REQUIRE(img.size() == v2u(3,1));
-        REQUIRE(img.format() == image_data_format::rgb8);
-        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   10));
-        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 10));
-        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  10));
-
-        REQUIRE(filesystem::try_read_all(buf, "image_save_test.png"));
-        REQUIRE(images::try_load_image(img, buf));
-        REQUIRE(img.size() == v2u(3,1));
-        REQUIRE(img.format() == image_data_format::rgb8);
-        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0));
-        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0));
-        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0));
-
-        REQUIRE(filesystem::try_read_all(buf, "image_save_test.tga"));
-        REQUIRE(images::try_load_image(img, buf));
-        REQUIRE(img.size() == v2u(3,1));
-        REQUIRE(img.format() == image_data_format::rgb8);
-        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0));
-        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0));
-        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0));
-
-        REQUIRE(filesystem::try_read_all(buf, "image_save_test.pvr"));
-        REQUIRE(images::try_load_image(img, buf));
-        REQUIRE(img.size() == v2u(3,1));
-        REQUIRE(img.format() == image_data_format::rgb8);
-        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0));
-        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0));
-        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0));
-
-        REQUIRE(filesystem::try_read_all(buf, "image_save_test.dds"));
-        REQUIRE(images::try_load_image(img, buf));
-        REQUIRE(img.size() == v2u(3,1));
-        REQUIRE(img.format() == image_data_format::rgb8);
-        REQUIRE(math::approximately(img.pixel32(0,0), color32::red(),   0));
-        REQUIRE(math::approximately(img.pixel32(1,0), color32::green(), 0));
-        REQUIRE(math::approximately(img.pixel32(2,0), color32::blue(),  0));
-    }
-    {
+    SECTION("stb") {
         struct img_info {
-            const char* name;
+            const char* path;
+            std::size_t size;
+            image_data_format format;
+        };
+        const img_info test_infos[] = {
+            {"bin/images/stb/ship.jpg", 64 * 128 * 3, image_data_format::rgb8},
+            {"bin/images/stb/ship.png", 64 * 128 * 4, image_data_format::rgba8},
+            {"bin/images/stb/ship.tga", 64 * 128 * 4, image_data_format::rgba8}};
+        for ( const auto& info : test_infos ) {
+            input_stream_uptr stream = make_read_file(path::combine(resources, info.path));
+            REQUIRE(stream);
+            image img;
+            REQUIRE(images::try_load_image(img, stream));
+            REQUIRE(img.format() == info.format);
+            REQUIRE(img.data().size() == info.size);
+            REQUIRE(img.size().x == 64);
+            REQUIRE(img.size().y == 128);
+        }
+    }
+
+    SECTION("dds") {
+        struct img_info {
+            const char* path;
+            std::size_t size;
             bool can_load;
             image_data_format format;
         };
 
-        const img_info test_images[] = {
-            {"bin/images/ship_pvrtc_2bpp_rgba.pvr", true, image_data_format::rgba_pvrtc2},
-            {"bin/images/ship_pvrtc_2bpp_rgb.pvr", true, image_data_format::rgb_pvrtc2},
-            {"bin/images/ship_pvrtc_4bpp_rgba.pvr", true, image_data_format::rgba_pvrtc4},
-            {"bin/images/ship_pvrtc_4bpp_rgb.pvr", true, image_data_format::rgb_pvrtc4},
-            {"bin/images/ship_pvrtc_ii_2bpp.pvr", true, image_data_format::rgba_pvrtc2_v2},
-            {"bin/images/ship_pvrtc_ii_4bpp.pvr", true, image_data_format::rgba_pvrtc4_v2},
-            {"bin/images/ship_etc1.pvr", false, image_data_format(-1)},
-            {"bin/images/ship_etc2.pvr", false, image_data_format(-1)},
-            {"bin/images/ship_eac_rg11.pvr", false, image_data_format(-1)},
-            {"bin/images/ship_rgba8.pvr", true, image_data_format::rgba8},
-            {"bin/images/ship_rgba.dds", true, image_data_format::rgba_dxt5},
-            {"bin/images/ship_r8.pvr", true, image_data_format::g8},
-            {"bin/images/ship_rg8.pvr", true, image_data_format::ga8},
-            {"bin/images/ship_rgb8.pvr", true, image_data_format::rgb8}
+        const img_info test_infos[] = {
+            {"bin/images/dds/ship_a8.dds", 64 * 128 * 1, true, image_data_format::a8},
+            {"bin/images/dds/ship_l8.dds", 64 * 128 * 1, true, image_data_format::l8},
+            {"bin/images/dds/ship_a8l8.dds", 64 * 128 * 2, true, image_data_format::la8},
+
+            {"bin/images/dds/ship_r8g8b8.dds", 64 * 128 * 3, true, image_data_format::rgb8},
+            {"bin/images/dds/ship_x8r8g8b8.dds", 64 * 128 * 3, true, image_data_format::rgb8},
+
+            {"bin/images/dds/ship_rgba8.dds", 64 * 128 * 4, true, image_data_format::rgba8},
+            {"bin/images/dds/ship_a8r8g8b8.dds", 64 * 128 * 4, true, image_data_format::rgba8},
+
+            {"bin/images/dds/ship_dxt1.dds", 64 * 128 * 4 / 8, true, image_data_format::rgba_dxt1},
+            {"bin/images/dds/ship_dxt3.dds", 64 * 128 * 8 / 8, true, image_data_format::rgba_dxt3},
+            {"bin/images/dds/ship_dxt5.dds", 64 * 128 * 8 / 8, true, image_data_format::rgba_dxt5},
         };
 
-        str resources;
-        REQUIRE(filesystem::extract_predef_path(
-            resources,
-            filesystem::predef_path::resources));
+        for ( const auto& info : test_infos ) {
+            CAPTURE(info.path);
 
-        for ( const auto& info : test_images ) {
-            input_stream_uptr stream = make_read_file(path::combine(resources, info.name));
-            REQUIRE(stream);
             image img;
-            REQUIRE(images::try_load_image(img, stream) == info.can_load);
+            REQUIRE(info.can_load == images::try_load_image(
+                img,
+                make_read_file(path::combine(resources, info.path))));
+
             if ( info.can_load ) {
                 REQUIRE(img.format() == info.format);
+                REQUIRE(img.data().size() == info.size);
                 REQUIRE(img.size().x == 64);
                 REQUIRE(img.size().y == 128);
-                REQUIRE(img.data().size() > 0);
             }
         }
+
+        for ( const auto& info : test_infos ) {
+            CAPTURE(info.path);
+
+            if ( !info.can_load ) {
+                continue;
+            }
+
+            image img;
+            REQUIRE(images::try_load_image(
+                img,
+                make_read_file(path::combine(resources, info.path))));
+
+            REQUIRE(filesystem::remove_file("image_save_test.dds"));
+            REQUIRE(images::try_save_image(
+                img,
+                image_file_format::dds, make_write_file("image_save_test.dds", false)));
+
+            image img2;
+            REQUIRE(images::try_load_image(
+                img2,
+                make_read_file("image_save_test.dds")));
+
+            REQUIRE(img == img2);
+        }
+    }
+
+    SECTION("dds_bgr") {
+        {
+            image img;
+            REQUIRE(images::try_load_image(
+                img,
+                make_read_file(path::combine(resources, "bin/images/dds/ship_r8g8b8.dds"))));
+
+            image img2;
+            REQUIRE(images::try_load_image(
+                img2,
+                make_read_file(path::combine(resources, "bin/images/dds/ship_r8g8b8.dds"))));
+
+            image img3;
+            REQUIRE(images::try_load_image(
+                img3,
+                make_read_file(path::combine(resources, "bin/images/dds/ship_x8r8g8b8.dds"))));
+
+            REQUIRE(img == img2);
+            REQUIRE(img2 == img3);
+        }
+        {
+            image img;
+            REQUIRE(images::try_load_image(
+                img,
+                make_read_file(path::combine(resources, "bin/images/dds/ship_rgba8.dds"))));
+
+            image img2;
+            REQUIRE(images::try_load_image(
+                img2,
+                make_read_file(path::combine(resources, "bin/images/dds/ship_a8r8g8b8.dds"))));
+
+            REQUIRE(img == img2);
+        }
+    }
+
+    SECTION("pvr") {
+        struct img_info {
+            const char* path;
+            std::size_t size;
+            bool can_load;
+            image_data_format format;
+        };
+
+        const img_info test_infos[] = {
+            {"bin/images/pvr/ship_a8.pvr", 64 * 128 * 1, true, image_data_format::a8},
+            {"bin/images/pvr/ship_l8.pvr", 64 * 128 * 1, true, image_data_format::l8},
+            {"bin/images/pvr/ship_la8.pvr", 64 * 128 * 2, true, image_data_format::la8},
+
+            {"bin/images/pvr/ship_rgb8.pvr", 64 * 128 * 3, true, image_data_format::rgb8},
+            {"bin/images/pvr/ship_rgba8.pvr", 64 * 128 * 4, true, image_data_format::rgba8},
+            {"bin/images/pvr/ship_bgra8.pvr", 64 * 128 * 4, true, image_data_format::rgba8},
+
+            {"bin/images/pvr/ship_dxt1.pvr", 64 * 128 * 4 / 8, true, image_data_format::rgba_dxt1},
+            {"bin/images/pvr/ship_dxt3.pvr", 64 * 128 * 8 / 8, true, image_data_format::rgba_dxt3},
+            {"bin/images/pvr/ship_dxt5.pvr", 64 * 128 * 8 / 8, true, image_data_format::rgba_dxt5},
+
+            {"bin/images/pvr/ship_pvrtc_2bpp_rgb.pvr", 64 * 128 * 2 / 8, true, image_data_format::rgb_pvrtc2},
+            {"bin/images/pvr/ship_pvrtc_2bpp_rgba.pvr", 64 * 128 * 2 / 8, true, image_data_format::rgba_pvrtc2},
+            {"bin/images/pvr/ship_pvrtc_4bpp_rgb.pvr", 64 * 128 * 4 / 8, true, image_data_format::rgb_pvrtc4},
+            {"bin/images/pvr/ship_pvrtc_4bpp_rgba.pvr", 64 * 128 * 4 / 8, true, image_data_format::rgba_pvrtc4},
+
+            {"bin/images/pvr/ship_pvrtc2_2bpp.pvr", 64 * 128 * 2 / 8, true, image_data_format::rgba_pvrtc2_v2},
+            {"bin/images/pvr/ship_pvrtc2_4bpp.pvr", 64 * 128 * 4 / 8, true, image_data_format::rgba_pvrtc4_v2},
+
+            {"bin/images/pvr/ship_etc1.pvr", 64 * 128 * 4 / 8, false, image_data_format(-1)},
+            {"bin/images/pvr/ship_etc2_rgb.pvr", 64 * 128 * 4 / 8, false, image_data_format(-1)},
+            {"bin/images/pvr/ship_etc2_rgba.pvr", 64 * 128 * 8 / 8, false, image_data_format(-1)},
+            {"bin/images/pvr/ship_etc2_rgba1.pvr", 64 * 128 * 4 / 8, false, image_data_format(-1)},
+
+            {"bin/images/pvr/ship_eac_r11.pvr", 0, false, image_data_format(-1)},
+            {"bin/images/pvr/ship_eac_rg11.pvr", 0, false, image_data_format(-1)},
+        };
+
+        for ( const auto& info : test_infos ) {
+            CAPTURE(info.path);
+
+            image img;
+            REQUIRE(info.can_load == images::try_load_image(
+                img,
+                make_read_file(path::combine(resources, info.path))));
+
+            if ( info.can_load ) {
+                REQUIRE(img.format() == info.format);
+                REQUIRE(img.data().size() == info.size);
+                REQUIRE(img.size().x == 64);
+                REQUIRE(img.size().y == 128);
+            }
+        }
+
+        for ( const auto& info : test_infos ) {
+            CAPTURE(info.path);
+
+            if ( !info.can_load ) {
+                continue;
+            }
+
+            image img;
+            REQUIRE(images::try_load_image(
+                img,
+                make_read_file(path::combine(resources, info.path))));
+
+            REQUIRE(filesystem::remove_file("image_save_test.pvr"));
+            REQUIRE(images::try_save_image(
+                img,
+                image_file_format::pvr, make_write_file("image_save_test.pvr", false)));
+
+            image img2;
+            REQUIRE(images::try_load_image(
+                img2,
+                make_read_file("image_save_test.pvr")));
+
+            REQUIRE(img == img2);
+        }
+    }
+
+    SECTION("pvr_bgr") {
+        {
+            image img;
+            REQUIRE(images::try_load_image(
+                img,
+                make_read_file(path::combine(resources, "bin/images/pvr/ship_rgba8.pvr"))));
+
+            image img2;
+            REQUIRE(images::try_load_image(
+                img2,
+                make_read_file(path::combine(resources, "bin/images/pvr/ship_bgra8.pvr"))));
+
+            REQUIRE(img == img2);
+        }
     }
 }

From f476eee943679e75950460c6d02145da8fbf12ee Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 8 Aug 2019 23:33:27 +0700
Subject: [PATCH 061/108] load mesh and shape from buffer_view

---
 headers/enduro2d/utils/mesh.hpp                    |  3 ++-
 headers/enduro2d/utils/shape.hpp                   |  3 ++-
 sources/enduro2d/utils/mesh.cpp                    |  8 ++++++--
 sources/enduro2d/utils/mesh_impl/mesh_impl.hpp     |  3 ++-
 .../enduro2d/utils/mesh_impl/mesh_reader_e2d.cpp   | 14 +++++---------
 sources/enduro2d/utils/shape.cpp                   |  8 ++++++--
 sources/enduro2d/utils/shape_impl/shape_impl.hpp   |  3 ++-
 .../enduro2d/utils/shape_impl/shape_reader_e2d.cpp | 14 +++++---------
 8 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/headers/enduro2d/utils/mesh.hpp b/headers/enduro2d/utils/mesh.hpp
index 7aaa7dda..6e83e32c 100644
--- a/headers/enduro2d/utils/mesh.hpp
+++ b/headers/enduro2d/utils/mesh.hpp
@@ -9,6 +9,7 @@
 #include "_utils.hpp"
 
 #include "buffer.hpp"
+#include "buffer_view.hpp"
 #include "color32.hpp"
 #include "streams.hpp"
 
@@ -101,7 +102,7 @@ namespace e2d::meshes
 {
     bool try_load_mesh(
         mesh& dst,
-        const buffer& src) noexcept;
+        buffer_view src) noexcept;
 
     bool try_load_mesh(
         mesh& dst,
diff --git a/headers/enduro2d/utils/shape.hpp b/headers/enduro2d/utils/shape.hpp
index 859a5aa6..584bc884 100644
--- a/headers/enduro2d/utils/shape.hpp
+++ b/headers/enduro2d/utils/shape.hpp
@@ -9,6 +9,7 @@
 #include "_utils.hpp"
 
 #include "buffer.hpp"
+#include "buffer_view.hpp"
 #include "color32.hpp"
 #include "streams.hpp"
 
@@ -81,7 +82,7 @@ namespace e2d::shapes
 {
     bool try_load_shape(
         shape& dst,
-        const buffer& src) noexcept;
+        buffer_view src) noexcept;
 
     bool try_load_shape(
         shape& dst,
diff --git a/sources/enduro2d/utils/mesh.cpp b/sources/enduro2d/utils/mesh.cpp
index 393447aa..6579849b 100644
--- a/sources/enduro2d/utils/mesh.cpp
+++ b/sources/enduro2d/utils/mesh.cpp
@@ -299,9 +299,13 @@ namespace e2d::meshes
 {
     bool try_load_mesh(
         mesh& dst,
-        const buffer& src) noexcept
+        buffer_view src) noexcept
     {
-        return impl::try_load_mesh_e2d(dst, src);
+        try {
+            return impl::load_mesh_e2d(dst, src);
+        } catch (...) {
+            return false;
+        }
     }
 
     bool try_load_mesh(
diff --git a/sources/enduro2d/utils/mesh_impl/mesh_impl.hpp b/sources/enduro2d/utils/mesh_impl/mesh_impl.hpp
index 2b93aeb5..e6d43423 100644
--- a/sources/enduro2d/utils/mesh_impl/mesh_impl.hpp
+++ b/sources/enduro2d/utils/mesh_impl/mesh_impl.hpp
@@ -8,8 +8,9 @@
 
 #include <enduro2d/utils/mesh.hpp>
 #include <enduro2d/utils/buffer.hpp>
+#include <enduro2d/utils/buffer_view.hpp>
 
 namespace e2d::meshes::impl
 {
-    bool try_load_mesh_e2d(mesh& dst, const buffer& src) noexcept;
+    bool load_mesh_e2d(mesh& dst, buffer_view src);
 }
diff --git a/sources/enduro2d/utils/mesh_impl/mesh_reader_e2d.cpp b/sources/enduro2d/utils/mesh_impl/mesh_reader_e2d.cpp
index be9d5fe7..d5a8ed0b 100644
--- a/sources/enduro2d/utils/mesh_impl/mesh_reader_e2d.cpp
+++ b/sources/enduro2d/utils/mesh_impl/mesh_reader_e2d.cpp
@@ -114,14 +114,10 @@ namespace
 
 namespace e2d::meshes::impl
 {
-    bool try_load_mesh_e2d(mesh& dst, const buffer& src) noexcept {
-        try {
-            auto stream = make_memory_stream(src);
-            return stream
-                && check_signature(stream)
-                && load_mesh(dst, stream);
-        } catch (...) {
-            return false;
-        }
+    bool load_mesh_e2d(mesh& dst, buffer_view src) {
+        auto stream = make_memory_stream(buffer(src));
+        return stream
+            && check_signature(stream)
+            && load_mesh(dst, stream);
     }
 }
diff --git a/sources/enduro2d/utils/shape.cpp b/sources/enduro2d/utils/shape.cpp
index baf4958c..244bd044 100644
--- a/sources/enduro2d/utils/shape.cpp
+++ b/sources/enduro2d/utils/shape.cpp
@@ -224,9 +224,13 @@ namespace e2d::shapes
 {
     bool try_load_shape(
         shape& dst,
-        const buffer& src) noexcept
+        buffer_view src) noexcept
     {
-        return impl::try_load_shape_e2d(dst, src);
+        try {
+            return impl::load_shape_e2d(dst, src);
+        } catch (...) {
+            return false;
+        }
     }
 
     bool try_load_shape(
diff --git a/sources/enduro2d/utils/shape_impl/shape_impl.hpp b/sources/enduro2d/utils/shape_impl/shape_impl.hpp
index e5e4affa..c368d283 100644
--- a/sources/enduro2d/utils/shape_impl/shape_impl.hpp
+++ b/sources/enduro2d/utils/shape_impl/shape_impl.hpp
@@ -8,8 +8,9 @@
 
 #include <enduro2d/utils/shape.hpp>
 #include <enduro2d/utils/buffer.hpp>
+#include <enduro2d/utils/buffer_view.hpp>
 
 namespace e2d::shapes::impl
 {
-    bool try_load_shape_e2d(shape& dst, const buffer& src) noexcept;
+    bool load_shape_e2d(shape& dst, buffer_view src);
 }
diff --git a/sources/enduro2d/utils/shape_impl/shape_reader_e2d.cpp b/sources/enduro2d/utils/shape_impl/shape_reader_e2d.cpp
index ae9e8b63..204cbde5 100644
--- a/sources/enduro2d/utils/shape_impl/shape_reader_e2d.cpp
+++ b/sources/enduro2d/utils/shape_impl/shape_reader_e2d.cpp
@@ -96,14 +96,10 @@ namespace
 
 namespace e2d::shapes::impl
 {
-    bool try_load_shape_e2d(shape& dst, const buffer& src) noexcept {
-        try {
-            auto stream = make_memory_stream(src);
-            return stream
-                && check_signature(stream)
-                && load_shape(dst, stream);
-        } catch (...) {
-            return false;
-        }
+    bool load_shape_e2d(shape& dst, buffer_view src) {
+        auto stream = make_memory_stream(buffer(src));
+        return stream
+            && check_signature(stream)
+            && load_shape(dst, stream);
     }
 }

From c5dd5ef49a55f6949b45d26f6c92601d25c840a3 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 8 Aug 2019 23:57:38 +0700
Subject: [PATCH 062/108] more buffer_view using

---
 headers/enduro2d/utils/buffer_view.hpp   |  8 ++++++++
 headers/enduro2d/utils/filesystem.hpp    |  7 ++++---
 headers/enduro2d/utils/streams.hpp       | 12 +++++-------
 sources/enduro2d/utils/filesystem.cpp    |  7 +------
 sources/enduro2d/utils/streams.cpp       | 19 ++-----------------
 untests/sources/untests_utils/buffer.cpp |  5 +++++
 6 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/headers/enduro2d/utils/buffer_view.hpp b/headers/enduro2d/utils/buffer_view.hpp
index 7d2b81d1..6f5284e7 100644
--- a/headers/enduro2d/utils/buffer_view.hpp
+++ b/headers/enduro2d/utils/buffer_view.hpp
@@ -27,6 +27,9 @@ namespace e2d
         template < typename T >
         buffer_view(const vector<T>& buffer) noexcept;
 
+        template < typename Char >
+        buffer_view(const basic_string<Char>& buffer) noexcept;
+
         template < typename T, std::size_t N >
         buffer_view(const std::array<T,N>& buffer) noexcept;
 
@@ -57,6 +60,11 @@ namespace e2d
     : data_(buffer.data())
     , size_(buffer.size() * sizeof(T)) {}
 
+    template < typename Char >
+    buffer_view::buffer_view(const basic_string<Char>& buffer) noexcept
+    : data_(buffer.data())
+    , size_(buffer.size() * sizeof(Char)) {}
+
     template < typename T, std::size_t N >
     buffer_view::buffer_view(const std::array<T,N>& buffer) noexcept
     : data_(buffer.data())
diff --git a/headers/enduro2d/utils/filesystem.hpp b/headers/enduro2d/utils/filesystem.hpp
index 8b84dfe6..6c955015 100644
--- a/headers/enduro2d/utils/filesystem.hpp
+++ b/headers/enduro2d/utils/filesystem.hpp
@@ -7,6 +7,9 @@
 #pragma once
 
 #include "_utils.hpp"
+
+#include "buffer.hpp"
+#include "buffer_view.hpp"
 #include "streams.hpp"
 
 namespace e2d
@@ -73,9 +76,7 @@ namespace e2d::filesystem
 
     bool try_read_all(str& dst, str_view path) noexcept;
     bool try_read_all(buffer& dst, str_view path) noexcept;
-
-    bool try_write_all(const str& src, str_view path, bool append) noexcept;
-    bool try_write_all(const buffer& src, str_view path, bool append) noexcept;
+    bool try_write_all(buffer_view src, str_view path, bool append) noexcept;
 
     enum class predef_path {
         home,
diff --git a/headers/enduro2d/utils/streams.hpp b/headers/enduro2d/utils/streams.hpp
index dc0775a8..3b392810 100644
--- a/headers/enduro2d/utils/streams.hpp
+++ b/headers/enduro2d/utils/streams.hpp
@@ -8,6 +8,9 @@
 
 #include "_utils.hpp"
 
+#include "buffer.hpp"
+#include "buffer_view.hpp"
+
 namespace e2d
 {
     class bad_stream_operation final : public exception {
@@ -78,8 +81,7 @@ namespace e2d
 
         output_sequence& seek(std::ptrdiff_t offset, bool relative) noexcept;
         output_sequence& write(const void* src, std::size_t size) noexcept;
-        output_sequence& write_all(const str& src) noexcept;
-        output_sequence& write_all(const buffer& src) noexcept;
+        output_sequence& write_all(buffer_view src) noexcept;
 
         output_sequence& flush() noexcept;
         output_sequence& flush_if(bool yesno) noexcept;
@@ -112,11 +114,7 @@ namespace e2d::streams
         const input_stream_uptr& stream) noexcept;
 
     bool try_write_tail(
-        const str& src,
-        const output_stream_uptr& stream) noexcept;
-
-    bool try_write_tail(
-        const buffer& src,
+        buffer_view src,
         const output_stream_uptr& stream) noexcept;
 }
 
diff --git a/sources/enduro2d/utils/filesystem.cpp b/sources/enduro2d/utils/filesystem.cpp
index de7fa535..c64d8662 100644
--- a/sources/enduro2d/utils/filesystem.cpp
+++ b/sources/enduro2d/utils/filesystem.cpp
@@ -105,12 +105,7 @@ namespace e2d::filesystem
             dst, make_read_file(path));
     }
 
-    bool try_write_all(const str& src, str_view path, bool append) noexcept {
-        return streams::try_write_tail(
-            src, make_write_file(path, append));
-    }
-
-    bool try_write_all(const buffer& src, str_view path, bool append) noexcept {
+    bool try_write_all(buffer_view src, str_view path, bool append) noexcept {
         return streams::try_write_tail(
             src, make_write_file(path, append));
     }
diff --git a/sources/enduro2d/utils/streams.cpp b/sources/enduro2d/utils/streams.cpp
index 820e10b8..4d775f56 100644
--- a/sources/enduro2d/utils/streams.cpp
+++ b/sources/enduro2d/utils/streams.cpp
@@ -5,7 +5,6 @@
  ******************************************************************************/
 
 #include <enduro2d/utils/streams.hpp>
-#include <enduro2d/utils/buffer.hpp>
 
 namespace
 {
@@ -171,18 +170,12 @@ namespace e2d
         return *this;
     }
 
-    output_sequence& output_sequence::write_all(const buffer& src) noexcept {
+    output_sequence& output_sequence::write_all(buffer_view src) noexcept {
         return success_
             ? write(src.data(), src.size())
             : *this;
     }
 
-    output_sequence& output_sequence::write_all(const str& src) noexcept {
-        return success_
-            ? write(src.c_str(), src.size())
-            : *this;
-    }
-
     output_sequence& output_sequence::flush() noexcept {
         try {
             if ( success_ ) {
@@ -229,15 +222,7 @@ namespace e2d::streams
             : false;
     }
 
-    bool try_write_tail(const str& src, const output_stream_uptr& stream) noexcept {
-        return stream
-            ? output_sequence(*stream)
-                .write_all(src)
-                .success()
-            : false;
-    }
-
-    bool try_write_tail(const buffer& src, const output_stream_uptr& stream) noexcept {
+    bool try_write_tail(buffer_view src, const output_stream_uptr& stream) noexcept {
         return stream
             ? output_sequence(*stream)
                 .write_all(src)
diff --git a/untests/sources/untests_utils/buffer.cpp b/untests/sources/untests_utils/buffer.cpp
index f32bc204..3345d160 100644
--- a/untests/sources/untests_utils/buffer.cpp
+++ b/untests/sources/untests_utils/buffer.cpp
@@ -220,6 +220,11 @@ TEST_CASE("buffer_view") {
         buffer_view v5(b2);
         REQUIRE(v5.data() == b2.data());
         REQUIRE(v5.size() == 20);
+
+        str32 b3 = make_utf32("hello");
+        buffer_view v6(b3);
+        REQUIRE(v6.data() == b3.data());
+        REQUIRE(v6.size() == 20);
     }
     {
         const char* s0 = "hell";

From ef9b214d2c8c4b8004d2108d1590ced9d9d36a80 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Fri, 9 Aug 2019 03:49:11 +0700
Subject: [PATCH 063/108] add etc1 and etc2 texture support

---
 headers/enduro2d/core/render.hpp              |  7 ++++++
 headers/enduro2d/utils/image.hpp              |  5 ++++
 sources/enduro2d/core/render.cpp              |  5 ++++
 .../core/render_impl/render_opengl.cpp        |  6 +++++
 .../core/render_impl/render_opengl_base.cpp   | 18 ++++++++++++++
 sources/enduro2d/utils/image.cpp              |  5 ++++
 .../utils/image_impl/image_reader_pvr.cpp     | 24 +++++++++++++++++++
 .../utils/image_impl/image_writer_pvr.cpp     | 10 ++++++++
 ...ip_etc2_rgba1.pvr => ship_etc2_rgb_a1.pvr} |  0
 untests/sources/untests_core/render.cpp       |  2 +-
 untests/sources/untests_utils/image.cpp       | 10 ++++----
 11 files changed, 86 insertions(+), 6 deletions(-)
 rename untests/bin/images/pvr/{ship_etc2_rgba1.pvr => ship_etc2_rgb_a1.pvr} (100%)

diff --git a/headers/enduro2d/core/render.hpp b/headers/enduro2d/core/render.hpp
index 4e0f5d6f..9920365f 100644
--- a/headers/enduro2d/core/render.hpp
+++ b/headers/enduro2d/core/render.hpp
@@ -58,6 +58,11 @@ namespace e2d
             rgba_dxt3,
             rgba_dxt5,
 
+            rgb_etc1,
+            rgb_etc2,
+            rgba_etc2,
+            rgb_a1_etc2,
+
             rgb_pvrtc2,
             rgb_pvrtc4,
             rgba_pvrtc2,
@@ -901,6 +906,8 @@ namespace e2d
             bool depth24_stencil8_supported = false;
 
             bool dxt_compression_supported = false;
+            bool etc1_compression_supported = false;
+            bool etc2_compression_supported = false;
             bool pvrtc_compression_supported = false;
             bool pvrtc2_compression_supported = false;
         };
diff --git a/headers/enduro2d/utils/image.hpp b/headers/enduro2d/utils/image.hpp
index e6dc6bba..4f0b40d0 100644
--- a/headers/enduro2d/utils/image.hpp
+++ b/headers/enduro2d/utils/image.hpp
@@ -34,6 +34,11 @@ namespace e2d
         rgba_dxt3,
         rgba_dxt5,
 
+        rgb_etc1,
+        rgb_etc2,
+        rgba_etc2,
+        rgb_a1_etc2,
+
         rgb_pvrtc2,
         rgb_pvrtc4,
         rgba_pvrtc2,
diff --git a/sources/enduro2d/core/render.cpp b/sources/enduro2d/core/render.cpp
index 0b678c43..f267e699 100644
--- a/sources/enduro2d/core/render.cpp
+++ b/sources/enduro2d/core/render.cpp
@@ -37,6 +37,11 @@ namespace
         {"rgba_dxt3",         8, true,  false, false, pixel_declaration::pixel_type::rgba_dxt3,        true,  v2u(4,4)},
         {"rgba_dxt5",         8, true,  false, false, pixel_declaration::pixel_type::rgba_dxt5,        true,  v2u(4,4)},
 
+        {"rgb_etc1",          4, true,  false, false, pixel_declaration::pixel_type::rgb_etc1,         true,  v2u(4,4)},
+        {"rgb_etc2",          4, true,  false, false, pixel_declaration::pixel_type::rgb_etc2,         true,  v2u(4,4)},
+        {"rgba_etc2",         8, true,  false, false, pixel_declaration::pixel_type::rgba_etc2,        true,  v2u(4,4)},
+        {"rgb_a1_etc2",       4, true,  false, false, pixel_declaration::pixel_type::rgb_a1_etc2,      true,  v2u(4,4)},
+
         {"rgb_pvrtc2",        2, true,  false, false, pixel_declaration::pixel_type::rgb_pvrtc2,       true,  v2u(8,4)},
         {"rgb_pvrtc4",        4, true,  false, false, pixel_declaration::pixel_type::rgb_pvrtc4,       true,  v2u(4,4)},
         {"rgba_pvrtc2",       2, true,  false, false, pixel_declaration::pixel_type::rgba_pvrtc2,      true,  v2u(8,4)},
diff --git a/sources/enduro2d/core/render_impl/render_opengl.cpp b/sources/enduro2d/core/render_impl/render_opengl.cpp
index 512dbcf8..be5e5537 100644
--- a/sources/enduro2d/core/render_impl/render_opengl.cpp
+++ b/sources/enduro2d/core/render_impl/render_opengl.cpp
@@ -1162,6 +1162,12 @@ namespace e2d
             case pixel_declaration::pixel_type::rgba_dxt3:
             case pixel_declaration::pixel_type::rgba_dxt5:
                 return caps.dxt_compression_supported;
+            case pixel_declaration::pixel_type::rgb_etc1:
+                return caps.etc1_compression_supported;
+            case pixel_declaration::pixel_type::rgb_etc2:
+            case pixel_declaration::pixel_type::rgba_etc2:
+            case pixel_declaration::pixel_type::rgb_a1_etc2:
+                return caps.etc2_compression_supported;
             case pixel_declaration::pixel_type::rgb_pvrtc2:
             case pixel_declaration::pixel_type::rgb_pvrtc4:
             case pixel_declaration::pixel_type::rgba_pvrtc2:
diff --git a/sources/enduro2d/core/render_impl/render_opengl_base.cpp b/sources/enduro2d/core/render_impl/render_opengl_base.cpp
index 8a77988b..37eb0c01 100644
--- a/sources/enduro2d/core/render_impl/render_opengl_base.cpp
+++ b/sources/enduro2d/core/render_impl/render_opengl_base.cpp
@@ -838,6 +838,11 @@ namespace e2d::opengl
             DEFINE_CASE(rgba_dxt3, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT);
             DEFINE_CASE(rgba_dxt5, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT);
 
+            DEFINE_CASE(rgb_etc1, GL_ETC1_RGB8_OES);
+            DEFINE_CASE(rgb_etc2, GL_COMPRESSED_RGB8_ETC2);
+            DEFINE_CASE(rgba_etc2, GL_COMPRESSED_RGBA8_ETC2_EAC);
+            DEFINE_CASE(rgb_a1_etc2, GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2);
+
             DEFINE_CASE(rgb_pvrtc2, GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG);
             DEFINE_CASE(rgb_pvrtc4, GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG);
             DEFINE_CASE(rgba_pvrtc2, GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG);
@@ -869,6 +874,11 @@ namespace e2d::opengl
             DEFINE_CASE(rgba_dxt3, rgba_dxt3);
             DEFINE_CASE(rgba_dxt5, rgba_dxt5);
 
+            DEFINE_CASE(rgb_etc1, rgb_etc1);
+            DEFINE_CASE(rgb_etc2, rgb_etc2);
+            DEFINE_CASE(rgba_etc2, rgba_etc2);
+            DEFINE_CASE(rgb_a1_etc2, rgb_a1_etc2);
+
             DEFINE_CASE(rgb_pvrtc2, rgb_pvrtc2);
             DEFINE_CASE(rgb_pvrtc4, rgb_pvrtc4);
             DEFINE_CASE(rgba_pvrtc2, rgba_pvrtc2);
@@ -1424,6 +1434,14 @@ namespace e2d::opengl
             gl_has_any_extension(debug,
                 "GL_EXT_texture_compression_s3tc");
 
+        caps.etc1_compression_supported =
+            gl_has_any_extension(debug,
+                "GL_OES_compressed_ETC1_RGB8_texture");
+
+        caps.etc2_compression_supported =
+            gl_has_any_extension(debug,
+                "GL_ARB_ES3_compatibility");
+
         caps.pvrtc_compression_supported =
             gl_has_any_extension(debug,
                 "GL_IMG_texture_compression_pvrtc");
diff --git a/sources/enduro2d/utils/image.cpp b/sources/enduro2d/utils/image.cpp
index a10da083..51f7a93b 100644
--- a/sources/enduro2d/utils/image.cpp
+++ b/sources/enduro2d/utils/image.cpp
@@ -27,6 +27,11 @@ namespace
         { 8, image_data_format::rgba_dxt3,      true},
         { 8, image_data_format::rgba_dxt5,      true},
 
+        { 4, image_data_format::rgb_etc1,       true},
+        { 4, image_data_format::rgb_etc2,       true},
+        { 8, image_data_format::rgba_etc2,      true},
+        { 4, image_data_format::rgb_a1_etc2,    true},
+
         { 2, image_data_format::rgb_pvrtc2,     true},
         { 4, image_data_format::rgb_pvrtc4,     true},
         { 2, image_data_format::rgba_pvrtc2,    true},
diff --git a/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp b/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp
index 610c1a60..4452a065 100644
--- a/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp
+++ b/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp
@@ -84,6 +84,12 @@ namespace
                 image_data_format::rgba_pvrtc4_v2,
                 8,
                 {4,4}};
+        case pvr_pixel_format::etc1:
+            return {
+                buffer(content),
+                image_data_format::rgb_etc1,
+                8,
+                {4,4}};
         case pvr_pixel_format::dxt1:
             return {
                 buffer(content),
@@ -104,6 +110,24 @@ namespace
                 image_data_format::rgba_dxt5,
                 16,
                 {4,4}};
+        case pvr_pixel_format::etc2_rgb:
+            return {
+                buffer(content),
+                image_data_format::rgb_etc2,
+                8,
+                {4,4}};
+        case pvr_pixel_format::etc2_rgba:
+            return {
+                buffer(content),
+                image_data_format::rgba_etc2,
+                16,
+                {4,4}};
+        case pvr_pixel_format::etc2_rgb_a1:
+            return {
+                buffer(content),
+                image_data_format::rgb_a1_etc2,
+                8,
+                {4,4}};
         case pvr_pixel_format::a8:
             return {
                 buffer(content),
diff --git a/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp b/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
index ba053e9a..5dd0b324 100644
--- a/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
+++ b/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
@@ -24,6 +24,11 @@ namespace
         case image_data_format::rgba_dxt3: return pvr_pixel_format::dxt3;
         case image_data_format::rgba_dxt5: return pvr_pixel_format::dxt5;
 
+        case image_data_format::rgb_etc1: return pvr_pixel_format::etc1;
+        case image_data_format::rgb_etc2: return pvr_pixel_format::etc2_rgb;
+        case image_data_format::rgba_etc2: return pvr_pixel_format::etc2_rgba;
+        case image_data_format::rgb_a1_etc2: return pvr_pixel_format::etc2_rgb_a1;
+
         case image_data_format::rgb_pvrtc2: return pvr_pixel_format::pvrtc_2bpp_rgb;
         case image_data_format::rgb_pvrtc4: return pvr_pixel_format::pvrtc_4bpp_rgb;
         case image_data_format::rgba_pvrtc2: return pvr_pixel_format::pvrtc_2bpp_rgba;
@@ -52,6 +57,11 @@ namespace e2d::images::impl
             case image_data_format::rgba_dxt3:
             case image_data_format::rgba_dxt5:
 
+            case image_data_format::rgb_etc1:
+            case image_data_format::rgb_etc2:
+            case image_data_format::rgba_etc2:
+            case image_data_format::rgb_a1_etc2:
+
             case image_data_format::rgb_pvrtc2:
             case image_data_format::rgb_pvrtc4:
             case image_data_format::rgba_pvrtc2:
diff --git a/untests/bin/images/pvr/ship_etc2_rgba1.pvr b/untests/bin/images/pvr/ship_etc2_rgb_a1.pvr
similarity index 100%
rename from untests/bin/images/pvr/ship_etc2_rgba1.pvr
rename to untests/bin/images/pvr/ship_etc2_rgb_a1.pvr
diff --git a/untests/sources/untests_core/render.cpp b/untests/sources/untests_core/render.cpp
index fd93f64e..f693fb27 100644
--- a/untests/sources/untests_core/render.cpp
+++ b/untests/sources/untests_core/render.cpp
@@ -264,7 +264,7 @@ TEST_CASE("render"){
                     filesystem::predef_path::resources));
 
                 image src;
-                REQUIRE(images::try_load_image(src, make_read_file(path::combine(resources, "bin/images/ship_rgba.dds"))));
+                REQUIRE(images::try_load_image(src, make_read_file(path::combine(resources, "bin/images/dds/ship_dxt5.dds"))));
 
                 texture_ptr tex = r.create_texture(src.size(), pixel_declaration::pixel_type::rgba_dxt5);
                 REQUIRE(tex != nullptr);
diff --git a/untests/sources/untests_utils/image.cpp b/untests/sources/untests_utils/image.cpp
index 9e8eaea8..2b7f0417 100644
--- a/untests/sources/untests_utils/image.cpp
+++ b/untests/sources/untests_utils/image.cpp
@@ -286,6 +286,11 @@ TEST_CASE("images") {
             {"bin/images/pvr/ship_dxt3.pvr", 64 * 128 * 8 / 8, true, image_data_format::rgba_dxt3},
             {"bin/images/pvr/ship_dxt5.pvr", 64 * 128 * 8 / 8, true, image_data_format::rgba_dxt5},
 
+            {"bin/images/pvr/ship_etc1.pvr", 64 * 128 * 4 / 8, true, image_data_format::rgb_etc1},
+            {"bin/images/pvr/ship_etc2_rgb.pvr", 64 * 128 * 4 / 8, true, image_data_format::rgb_etc2},
+            {"bin/images/pvr/ship_etc2_rgba.pvr", 64 * 128 * 8 / 8, true, image_data_format::rgba_etc2},
+            {"bin/images/pvr/ship_etc2_rgb_a1.pvr", 64 * 128 * 4 / 8, true, image_data_format::rgb_a1_etc2},
+
             {"bin/images/pvr/ship_pvrtc_2bpp_rgb.pvr", 64 * 128 * 2 / 8, true, image_data_format::rgb_pvrtc2},
             {"bin/images/pvr/ship_pvrtc_2bpp_rgba.pvr", 64 * 128 * 2 / 8, true, image_data_format::rgba_pvrtc2},
             {"bin/images/pvr/ship_pvrtc_4bpp_rgb.pvr", 64 * 128 * 4 / 8, true, image_data_format::rgb_pvrtc4},
@@ -294,11 +299,6 @@ TEST_CASE("images") {
             {"bin/images/pvr/ship_pvrtc2_2bpp.pvr", 64 * 128 * 2 / 8, true, image_data_format::rgba_pvrtc2_v2},
             {"bin/images/pvr/ship_pvrtc2_4bpp.pvr", 64 * 128 * 4 / 8, true, image_data_format::rgba_pvrtc4_v2},
 
-            {"bin/images/pvr/ship_etc1.pvr", 64 * 128 * 4 / 8, false, image_data_format(-1)},
-            {"bin/images/pvr/ship_etc2_rgb.pvr", 64 * 128 * 4 / 8, false, image_data_format(-1)},
-            {"bin/images/pvr/ship_etc2_rgba.pvr", 64 * 128 * 8 / 8, false, image_data_format(-1)},
-            {"bin/images/pvr/ship_etc2_rgba1.pvr", 64 * 128 * 4 / 8, false, image_data_format(-1)},
-
             {"bin/images/pvr/ship_eac_r11.pvr", 0, false, image_data_format(-1)},
             {"bin/images/pvr/ship_eac_rg11.pvr", 0, false, image_data_format(-1)},
         };

From 2ca47055fbf778bdd5d2f95795dedbcb7ca3edb6 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Fri, 9 Aug 2019 07:14:33 +0700
Subject: [PATCH 064/108] add astc texture support

---
 headers/enduro2d/core/render.hpp              | 13 +++-
 headers/enduro2d/utils/image.hpp              |  7 ++
 sources/enduro2d/core/render.cpp              | 69 +++++++++++--------
 .../core/render_impl/render_opengl.cpp        | 23 ++++++-
 .../core/render_impl/render_opengl_base.cpp   | 20 ++++++
 sources/enduro2d/utils/image.cpp              | 49 +++++++------
 .../utils/image_impl/image_reader_pvr.cpp     | 36 ++++++++++
 .../utils/image_impl/image_writer_pvr.cpp     | 14 ++++
 untests/bin/images/pvr/ship_astc10x10.pvr     |  3 +
 untests/bin/images/pvr/ship_astc12x12.pvr     |  3 +
 untests/bin/images/pvr/ship_astc4x4.pvr       |  3 +
 untests/bin/images/pvr/ship_astc5x5.pvr       |  3 +
 untests/bin/images/pvr/ship_astc6x6.pvr       |  3 +
 untests/bin/images/pvr/ship_astc8x8.pvr       |  3 +
 untests/sources/untests_core/render.cpp       | 18 ++---
 untests/sources/untests_utils/image.cpp       |  7 ++
 16 files changed, 206 insertions(+), 68 deletions(-)
 create mode 100644 untests/bin/images/pvr/ship_astc10x10.pvr
 create mode 100644 untests/bin/images/pvr/ship_astc12x12.pvr
 create mode 100644 untests/bin/images/pvr/ship_astc4x4.pvr
 create mode 100644 untests/bin/images/pvr/ship_astc5x5.pvr
 create mode 100644 untests/bin/images/pvr/ship_astc6x6.pvr
 create mode 100644 untests/bin/images/pvr/ship_astc8x8.pvr

diff --git a/headers/enduro2d/core/render.hpp b/headers/enduro2d/core/render.hpp
index 9920365f..ec116c5b 100644
--- a/headers/enduro2d/core/render.hpp
+++ b/headers/enduro2d/core/render.hpp
@@ -63,6 +63,13 @@ namespace e2d
             rgba_etc2,
             rgb_a1_etc2,
 
+            rgba_astc4x4,
+            rgba_astc5x5,
+            rgba_astc6x6,
+            rgba_astc8x8,
+            rgba_astc10x10,
+            rgba_astc12x12,
+
             rgb_pvrtc2,
             rgb_pvrtc4,
             rgba_pvrtc2,
@@ -86,8 +93,9 @@ namespace e2d
         bool is_depth() const noexcept;
         bool is_stencil() const noexcept;
         bool is_compressed() const noexcept;
-        std::size_t bits_per_pixel() const noexcept;
-        v2u compressed_block_size() const noexcept;
+        v2u block_size() const noexcept;
+        std::size_t bytes_per_block() const noexcept;
+        std::size_t data_size_for_dimension(v2u dim) const noexcept;
     private:
         pixel_type type_ = pixel_type::rgba8;
     };
@@ -908,6 +916,7 @@ namespace e2d
             bool dxt_compression_supported = false;
             bool etc1_compression_supported = false;
             bool etc2_compression_supported = false;
+            bool astc_compression_supported = false;
             bool pvrtc_compression_supported = false;
             bool pvrtc2_compression_supported = false;
         };
diff --git a/headers/enduro2d/utils/image.hpp b/headers/enduro2d/utils/image.hpp
index 4f0b40d0..d355860f 100644
--- a/headers/enduro2d/utils/image.hpp
+++ b/headers/enduro2d/utils/image.hpp
@@ -39,6 +39,13 @@ namespace e2d
         rgba_etc2,
         rgb_a1_etc2,
 
+        rgba_astc4x4,
+        rgba_astc5x5,
+        rgba_astc6x6,
+        rgba_astc8x8,
+        rgba_astc10x10,
+        rgba_astc12x12,
+
         rgb_pvrtc2,
         rgb_pvrtc4,
         rgba_pvrtc2,
diff --git a/sources/enduro2d/core/render.cpp b/sources/enduro2d/core/render.cpp
index f267e699..da57e880 100644
--- a/sources/enduro2d/core/render.cpp
+++ b/sources/enduro2d/core/render.cpp
@@ -12,7 +12,7 @@ namespace
 
     struct pixel_type_description {
         const char* cstr;
-        u32 bits_per_pixel;
+        u32 bytes_per_block;
         bool color;
         bool depth;
         bool stencil;
@@ -22,36 +22,39 @@ namespace
     };
 
     const pixel_type_description pixel_type_descriptions[] = {
-        {"depth16",          16, false, true,  false, pixel_declaration::pixel_type::depth16,          false, v2u(1)},
-        {"depth24",          24, false, true,  false, pixel_declaration::pixel_type::depth24,          false, v2u(1)},
-        {"depth24_stencil8", 32, false, true,  true,  pixel_declaration::pixel_type::depth24_stencil8, false, v2u(1)},
+        {"depth16",           2, false, true,  false, pixel_declaration::pixel_type::depth16,          false, v2u(1,1)},
+        {"depth24",           3, false, true,  false, pixel_declaration::pixel_type::depth24,          false, v2u(1,1)},
+        {"depth24_stencil8",  4, false, true,  true,  pixel_declaration::pixel_type::depth24_stencil8, false, v2u(1,1)},
 
-        {"a8",                8, true,  false, false, pixel_declaration::pixel_type::a8,               false, v2u(1)},
-        {"l8",                8, true,  false, false, pixel_declaration::pixel_type::l8,               false, v2u(1)},
-        {"la8",              16, true,  false, false, pixel_declaration::pixel_type::la8,              false, v2u(1)},
+        {"a8",                1, true,  false, false, pixel_declaration::pixel_type::a8,               false, v2u(1,1)},
+        {"l8",                1, true,  false, false, pixel_declaration::pixel_type::l8,               false, v2u(1,1)},
+        {"la8",               2, true,  false, false, pixel_declaration::pixel_type::la8,              false, v2u(1,1)},
+        {"rgb8",              3, true,  false, false, pixel_declaration::pixel_type::rgb8,             false, v2u(1,1)},
+        {"rgba8",             4, true,  false, false, pixel_declaration::pixel_type::rgba8,            false, v2u(1,1)},
 
-        {"rgb8",             24, true,  false, false, pixel_declaration::pixel_type::rgb8,             false, v2u(1)},
-        {"rgba8",            32, true,  false, false, pixel_declaration::pixel_type::rgba8,            false, v2u(1)},
+        {"rgba_dxt1",         8, true,  false, false, pixel_declaration::pixel_type::rgba_dxt1,        true,  v2u(4,4)},
+        {"rgba_dxt3",        16, true,  false, false, pixel_declaration::pixel_type::rgba_dxt3,        true,  v2u(4,4)},
+        {"rgba_dxt5",        16, true,  false, false, pixel_declaration::pixel_type::rgba_dxt5,        true,  v2u(4,4)},
 
-        {"rgba_dxt1",         4, true,  false, false, pixel_declaration::pixel_type::rgba_dxt1,        true,  v2u(4,4)},
-        {"rgba_dxt3",         8, true,  false, false, pixel_declaration::pixel_type::rgba_dxt3,        true,  v2u(4,4)},
-        {"rgba_dxt5",         8, true,  false, false, pixel_declaration::pixel_type::rgba_dxt5,        true,  v2u(4,4)},
+        {"rgb_etc1",          8, true,  false, false, pixel_declaration::pixel_type::rgb_etc1,         true,  v2u(4,4)},
+        {"rgb_etc2",          8, true,  false, false, pixel_declaration::pixel_type::rgb_etc2,         true,  v2u(4,4)},
+        {"rgba_etc2",        16, true,  false, false, pixel_declaration::pixel_type::rgba_etc2,        true,  v2u(4,4)},
+        {"rgb_a1_etc2",       8, true,  false, false, pixel_declaration::pixel_type::rgb_a1_etc2,      true,  v2u(4,4)},
 
-        {"rgb_etc1",          4, true,  false, false, pixel_declaration::pixel_type::rgb_etc1,         true,  v2u(4,4)},
-        {"rgb_etc2",          4, true,  false, false, pixel_declaration::pixel_type::rgb_etc2,         true,  v2u(4,4)},
-        {"rgba_etc2",         8, true,  false, false, pixel_declaration::pixel_type::rgba_etc2,        true,  v2u(4,4)},
-        {"rgb_a1_etc2",       4, true,  false, false, pixel_declaration::pixel_type::rgb_a1_etc2,      true,  v2u(4,4)},
+        {"rgba_astc4x4",     16, true,  false, false, pixel_declaration::pixel_type::rgba_astc4x4,     true,  v2u(4,4)},
+        {"rgba_astc5x5",     16, true,  false, false, pixel_declaration::pixel_type::rgba_astc5x5,     true,  v2u(5,5)},
+        {"rgba_astc6x6",     16, true,  false, false, pixel_declaration::pixel_type::rgba_astc6x6,     true,  v2u(6,6)},
+        {"rgba_astc8x8",     16, true,  false, false, pixel_declaration::pixel_type::rgba_astc8x8,     true,  v2u(8,8)},
+        {"rgba_astc10x10",   16, true,  false, false, pixel_declaration::pixel_type::rgba_astc10x10,   true,  v2u(10,10)},
+        {"rgba_astc12x12",   16, true,  false, false, pixel_declaration::pixel_type::rgba_astc12x12,   true,  v2u(12,12)},
 
-        {"rgb_pvrtc2",        2, true,  false, false, pixel_declaration::pixel_type::rgb_pvrtc2,       true,  v2u(8,4)},
-        {"rgb_pvrtc4",        4, true,  false, false, pixel_declaration::pixel_type::rgb_pvrtc4,       true,  v2u(4,4)},
-        {"rgba_pvrtc2",       2, true,  false, false, pixel_declaration::pixel_type::rgba_pvrtc2,      true,  v2u(8,4)},
-        {"rgba_pvrtc4",       4, true,  false, false, pixel_declaration::pixel_type::rgba_pvrtc4,      true,  v2u(4,4)},
+        {"rgb_pvrtc2",        8, true,  false, false, pixel_declaration::pixel_type::rgb_pvrtc2,       true,  v2u(8,4)},
+        {"rgb_pvrtc4",        8, true,  false, false, pixel_declaration::pixel_type::rgb_pvrtc4,       true,  v2u(4,4)},
+        {"rgba_pvrtc2",       8, true,  false, false, pixel_declaration::pixel_type::rgba_pvrtc2,      true,  v2u(8,4)},
+        {"rgba_pvrtc4",       8, true,  false, false, pixel_declaration::pixel_type::rgba_pvrtc4,      true,  v2u(4,4)},
 
-        {"rgba_pvrtc2",       2, true,  false, false, pixel_declaration::pixel_type::rgba_pvrtc2,      true,  v2u(8,4)},
-        {"rgba_pvrtc4",       4, true,  false, false, pixel_declaration::pixel_type::rgba_pvrtc4,      true,  v2u(4,4)},
-
-        {"rgba_pvrtc2_v2",    2, true,  false, false, pixel_declaration::pixel_type::rgba_pvrtc2_v2,   true,  v2u(8,4)},
-        {"rgba_pvrtc4_v2",    4, true,  false, false, pixel_declaration::pixel_type::rgba_pvrtc4_v2,   true,  v2u(4,4)}
+        {"rgba_pvrtc2_v2",    8, true,  false, false, pixel_declaration::pixel_type::rgba_pvrtc2_v2,   true,  v2u(8,4)},
+        {"rgba_pvrtc4_v2",    8, true,  false, false, pixel_declaration::pixel_type::rgba_pvrtc4_v2,   true,  v2u(4,4)}
     };
 
     const pixel_type_description& get_pixel_type_description(pixel_declaration::pixel_type type) noexcept {
@@ -165,12 +168,20 @@ namespace e2d
         return get_pixel_type_description(type_).compressed;
     }
 
-    std::size_t pixel_declaration::bits_per_pixel() const noexcept {
-        return get_pixel_type_description(type_).bits_per_pixel;
+    v2u pixel_declaration::block_size() const noexcept {
+        return get_pixel_type_description(type_).block_size;
     }
 
-    v2u pixel_declaration::compressed_block_size() const noexcept {
-        return get_pixel_type_description(type_).block_size;
+    std::size_t pixel_declaration::bytes_per_block() const noexcept {
+        return get_pixel_type_description(type_).bytes_per_block;
+    }
+
+    std::size_t pixel_declaration::data_size_for_dimension(v2u dim) const noexcept {
+        const v2u bs = block_size();
+        const std::size_t bpb = bytes_per_block();
+        return bs.x > 0 && bs.y > 0 && bpb > 0
+            ? bpb * ((dim.x + bs.x - 1u) / bs.x) * ((dim.y + bs.y - 1u) / bs.y)
+            : 0u;
     }
 
     bool operator==(const pixel_declaration& l, const pixel_declaration& r) noexcept {
diff --git a/sources/enduro2d/core/render_impl/render_opengl.cpp b/sources/enduro2d/core/render_impl/render_opengl.cpp
index be5e5537..b0a44868 100644
--- a/sources/enduro2d/core/render_impl/render_opengl.cpp
+++ b/sources/enduro2d/core/render_impl/render_opengl.cpp
@@ -669,7 +669,7 @@ namespace e2d
 
         with_gl_bind_texture(state_->dbg(), id, [this, &id, &size, &decl]() noexcept {
             if ( decl.is_compressed() ) {
-                buffer empty_data(decl.bits_per_pixel() * size.x * size.y / 8);
+                buffer empty_data(decl.data_size_for_dimension(size));
                 GL_CHECK_CODE(state_->dbg(), glCompressedTexImage2D(
                     id.target(),
                     0,
@@ -1096,10 +1096,10 @@ namespace e2d
         E2D_ASSERT(region.position.x < tex->size().x && region.position.y < tex->size().y);
         E2D_ASSERT(region.position.x + region.size.x <= tex->size().x);
         E2D_ASSERT(region.position.y + region.size.y <= tex->size().y);
-        E2D_ASSERT(pixels.size() == region.size.y * ((region.size.x * tex->decl().bits_per_pixel()) / 8u));
+        E2D_ASSERT(pixels.size() == tex->decl().data_size_for_dimension(region.size));
 
         if ( tex->decl().is_compressed() ) {
-            const v2u block_size = tex->decl().compressed_block_size();
+            const v2u block_size = tex->decl().block_size();
             E2D_ASSERT(region.position.x % block_size.x == 0 && region.position.y % block_size.y == 0);
             E2D_ASSERT(region.size.x % block_size.x == 0 && region.size.y % block_size.y == 0);
             opengl::with_gl_bind_texture(state_->dbg(), tex->state().id(),
@@ -1146,36 +1146,53 @@ namespace e2d
             case pixel_declaration::pixel_type::depth16:
                 return caps.depth_texture_supported
                     && caps.depth16_supported;
+
             case pixel_declaration::pixel_type::depth24:
                 return caps.depth_texture_supported
                     && caps.depth24_supported;
+
             case pixel_declaration::pixel_type::depth24_stencil8:
                 return caps.depth_texture_supported
                     && caps.depth24_stencil8_supported;
+
             case pixel_declaration::pixel_type::a8:
             case pixel_declaration::pixel_type::l8:
             case pixel_declaration::pixel_type::la8:
             case pixel_declaration::pixel_type::rgb8:
             case pixel_declaration::pixel_type::rgba8:
                 return true;
+
             case pixel_declaration::pixel_type::rgba_dxt1:
             case pixel_declaration::pixel_type::rgba_dxt3:
             case pixel_declaration::pixel_type::rgba_dxt5:
                 return caps.dxt_compression_supported;
+
             case pixel_declaration::pixel_type::rgb_etc1:
                 return caps.etc1_compression_supported;
+
             case pixel_declaration::pixel_type::rgb_etc2:
             case pixel_declaration::pixel_type::rgba_etc2:
             case pixel_declaration::pixel_type::rgb_a1_etc2:
                 return caps.etc2_compression_supported;
+
+            case pixel_declaration::pixel_type::rgba_astc4x4:
+            case pixel_declaration::pixel_type::rgba_astc5x5:
+            case pixel_declaration::pixel_type::rgba_astc6x6:
+            case pixel_declaration::pixel_type::rgba_astc8x8:
+            case pixel_declaration::pixel_type::rgba_astc10x10:
+            case pixel_declaration::pixel_type::rgba_astc12x12:
+                return caps.astc_compression_supported;
+
             case pixel_declaration::pixel_type::rgb_pvrtc2:
             case pixel_declaration::pixel_type::rgb_pvrtc4:
             case pixel_declaration::pixel_type::rgba_pvrtc2:
             case pixel_declaration::pixel_type::rgba_pvrtc4:
                 return caps.pvrtc_compression_supported;
+
             case pixel_declaration::pixel_type::rgba_pvrtc2_v2:
             case pixel_declaration::pixel_type::rgba_pvrtc4_v2:
                 return caps.pvrtc2_compression_supported;
+
             default:
                 E2D_ASSERT_MSG(false, "unexpected pixel type");
                 return false;
diff --git a/sources/enduro2d/core/render_impl/render_opengl_base.cpp b/sources/enduro2d/core/render_impl/render_opengl_base.cpp
index 37eb0c01..d81ddb98 100644
--- a/sources/enduro2d/core/render_impl/render_opengl_base.cpp
+++ b/sources/enduro2d/core/render_impl/render_opengl_base.cpp
@@ -843,6 +843,13 @@ namespace e2d::opengl
             DEFINE_CASE(rgba_etc2, GL_COMPRESSED_RGBA8_ETC2_EAC);
             DEFINE_CASE(rgb_a1_etc2, GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2);
 
+            DEFINE_CASE(rgba_astc4x4, GL_COMPRESSED_RGBA_ASTC_4x4_KHR);
+            DEFINE_CASE(rgba_astc5x5, GL_COMPRESSED_RGBA_ASTC_5x5_KHR);
+            DEFINE_CASE(rgba_astc6x6, GL_COMPRESSED_RGBA_ASTC_6x6_KHR);
+            DEFINE_CASE(rgba_astc8x8, GL_COMPRESSED_RGBA_ASTC_8x8_KHR);
+            DEFINE_CASE(rgba_astc10x10, GL_COMPRESSED_RGBA_ASTC_10x10_KHR);
+            DEFINE_CASE(rgba_astc12x12, GL_COMPRESSED_RGBA_ASTC_12x12_KHR);
+
             DEFINE_CASE(rgb_pvrtc2, GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG);
             DEFINE_CASE(rgb_pvrtc4, GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG);
             DEFINE_CASE(rgba_pvrtc2, GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG);
@@ -879,6 +886,13 @@ namespace e2d::opengl
             DEFINE_CASE(rgba_etc2, rgba_etc2);
             DEFINE_CASE(rgb_a1_etc2, rgb_a1_etc2);
 
+            DEFINE_CASE(rgba_astc4x4, rgba_astc4x4);
+            DEFINE_CASE(rgba_astc5x5, rgba_astc5x5);
+            DEFINE_CASE(rgba_astc6x6, rgba_astc6x6);
+            DEFINE_CASE(rgba_astc8x8, rgba_astc8x8);
+            DEFINE_CASE(rgba_astc10x10, rgba_astc10x10);
+            DEFINE_CASE(rgba_astc12x12, rgba_astc12x12);
+
             DEFINE_CASE(rgb_pvrtc2, rgb_pvrtc2);
             DEFINE_CASE(rgb_pvrtc4, rgb_pvrtc4);
             DEFINE_CASE(rgba_pvrtc2, rgba_pvrtc2);
@@ -1442,6 +1456,12 @@ namespace e2d::opengl
             gl_has_any_extension(debug,
                 "GL_ARB_ES3_compatibility");
 
+        caps.astc_compression_supported =
+            gl_has_any_extension(debug,
+                "GL_OES_texture_compression_astc",
+                "GL_KHR_texture_compression_astc_ldr",
+                "GL_KHR_texture_compression_astc_hdr");
+
         caps.pvrtc_compression_supported =
             gl_has_any_extension(debug,
                 "GL_IMG_texture_compression_pvrtc");
diff --git a/sources/enduro2d/utils/image.cpp b/sources/enduro2d/utils/image.cpp
index 51f7a93b..ee2d853d 100644
--- a/sources/enduro2d/utils/image.cpp
+++ b/sources/enduro2d/utils/image.cpp
@@ -11,34 +11,41 @@ namespace
     using namespace e2d;
 
     struct data_format_description {
-        u32 bits_per_pixel;
+        u32 uncompressed_bytes_per_pixel;
         image_data_format format;
         bool compressed;
     };
 
     const data_format_description data_format_descriptions[] = {
-        { 8, image_data_format::a8,             false},
-        { 8, image_data_format::l8,             false},
-        {16, image_data_format::la8,            false},
-        {24, image_data_format::rgb8,           false},
-        {32, image_data_format::rgba8,          false},
+        {1, image_data_format::a8,             false},
+        {1, image_data_format::l8,             false},
+        {2, image_data_format::la8,            false},
+        {3, image_data_format::rgb8,           false},
+        {4, image_data_format::rgba8,          false},
 
-        { 4, image_data_format::rgba_dxt1,      true},
-        { 8, image_data_format::rgba_dxt3,      true},
-        { 8, image_data_format::rgba_dxt5,      true},
+        {0, image_data_format::rgba_dxt1,      true},
+        {0, image_data_format::rgba_dxt3,      true},
+        {0, image_data_format::rgba_dxt5,      true},
 
-        { 4, image_data_format::rgb_etc1,       true},
-        { 4, image_data_format::rgb_etc2,       true},
-        { 8, image_data_format::rgba_etc2,      true},
-        { 4, image_data_format::rgb_a1_etc2,    true},
+        {0, image_data_format::rgb_etc1,       true},
+        {0, image_data_format::rgb_etc2,       true},
+        {0, image_data_format::rgba_etc2,      true},
+        {0, image_data_format::rgb_a1_etc2,    true},
 
-        { 2, image_data_format::rgb_pvrtc2,     true},
-        { 4, image_data_format::rgb_pvrtc4,     true},
-        { 2, image_data_format::rgba_pvrtc2,    true},
-        { 4, image_data_format::rgba_pvrtc4,    true},
+        {0, image_data_format::rgba_astc4x4,   true},
+        {0, image_data_format::rgba_astc5x5,   true},
+        {0, image_data_format::rgba_astc6x6,   true},
+        {0, image_data_format::rgba_astc8x8,   true},
+        {0, image_data_format::rgba_astc10x10, true},
+        {0, image_data_format::rgba_astc12x12, true},
 
-        { 2, image_data_format::rgba_pvrtc2_v2, true},
-        { 4, image_data_format::rgba_pvrtc4_v2, true}
+        {0, image_data_format::rgb_pvrtc2,     true},
+        {0, image_data_format::rgb_pvrtc4,     true},
+        {0, image_data_format::rgba_pvrtc2,    true},
+        {0, image_data_format::rgba_pvrtc4,    true},
+
+        {0, image_data_format::rgba_pvrtc2_v2, true},
+        {0, image_data_format::rgba_pvrtc4_v2, true}
     };
 
     const data_format_description& get_data_format_description(image_data_format format) noexcept {
@@ -132,10 +139,8 @@ namespace e2d
             throw bad_image_access();
         }
 
-        const std::size_t bits_per_pixel = format_desc.bits_per_pixel;
-        const std::size_t bytes_per_pixel = bits_per_pixel / 8;
+        const std::size_t bytes_per_pixel = format_desc.uncompressed_bytes_per_pixel;
         const std::size_t stride_in_bytes = size_.x * bytes_per_pixel;
-        E2D_ASSERT(bits_per_pixel % 8 == 0);
 
         const std::size_t pixel_index = v * stride_in_bytes + u * bytes_per_pixel;
         E2D_ASSERT(pixel_index + bytes_per_pixel <= data_.size());
diff --git a/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp b/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp
index 4452a065..10371dfc 100644
--- a/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp
+++ b/sources/enduro2d/utils/image_impl/image_reader_pvr.cpp
@@ -128,6 +128,42 @@ namespace
                 image_data_format::rgb_a1_etc2,
                 8,
                 {4,4}};
+        case pvr_pixel_format::astc_4x4:
+            return {
+                buffer(content),
+                image_data_format::rgba_astc4x4,
+                16,
+                {4,4}};
+        case pvr_pixel_format::astc_5x5:
+            return {
+                buffer(content),
+                image_data_format::rgba_astc5x5,
+                16,
+                {5,5}};
+        case pvr_pixel_format::astc_6x6:
+            return {
+                buffer(content),
+                image_data_format::rgba_astc6x6,
+                16,
+                {6,6}};
+        case pvr_pixel_format::astc_8x8:
+            return {
+                buffer(content),
+                image_data_format::rgba_astc8x8,
+                16,
+                {8,8}};
+        case pvr_pixel_format::astc_10x10:
+            return {
+                buffer(content),
+                image_data_format::rgba_astc10x10,
+                16,
+                {10,10}};
+        case pvr_pixel_format::astc_12x12:
+            return {
+                buffer(content),
+                image_data_format::rgba_astc12x12,
+                16,
+                {12,12}};
         case pvr_pixel_format::a8:
             return {
                 buffer(content),
diff --git a/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp b/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
index 5dd0b324..49f94b3f 100644
--- a/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
+++ b/sources/enduro2d/utils/image_impl/image_writer_pvr.cpp
@@ -29,6 +29,13 @@ namespace
         case image_data_format::rgba_etc2: return pvr_pixel_format::etc2_rgba;
         case image_data_format::rgb_a1_etc2: return pvr_pixel_format::etc2_rgb_a1;
 
+        case image_data_format::rgba_astc4x4: return pvr_pixel_format::astc_4x4;
+        case image_data_format::rgba_astc5x5: return pvr_pixel_format::astc_5x5;
+        case image_data_format::rgba_astc6x6: return pvr_pixel_format::astc_6x6;
+        case image_data_format::rgba_astc8x8: return pvr_pixel_format::astc_8x8;
+        case image_data_format::rgba_astc10x10: return pvr_pixel_format::astc_10x10;
+        case image_data_format::rgba_astc12x12: return pvr_pixel_format::astc_12x12;
+
         case image_data_format::rgb_pvrtc2: return pvr_pixel_format::pvrtc_2bpp_rgb;
         case image_data_format::rgb_pvrtc4: return pvr_pixel_format::pvrtc_4bpp_rgb;
         case image_data_format::rgba_pvrtc2: return pvr_pixel_format::pvrtc_2bpp_rgba;
@@ -62,6 +69,13 @@ namespace e2d::images::impl
             case image_data_format::rgba_etc2:
             case image_data_format::rgb_a1_etc2:
 
+            case image_data_format::rgba_astc4x4:
+            case image_data_format::rgba_astc5x5:
+            case image_data_format::rgba_astc6x6:
+            case image_data_format::rgba_astc8x8:
+            case image_data_format::rgba_astc10x10:
+            case image_data_format::rgba_astc12x12:
+
             case image_data_format::rgb_pvrtc2:
             case image_data_format::rgb_pvrtc4:
             case image_data_format::rgba_pvrtc2:
diff --git a/untests/bin/images/pvr/ship_astc10x10.pvr b/untests/bin/images/pvr/ship_astc10x10.pvr
new file mode 100644
index 00000000..41e9ea8d
--- /dev/null
+++ b/untests/bin/images/pvr/ship_astc10x10.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d1160fde2e2877bb2db8698af35f5e5e58daf4d10711eda1a2ccaa56472aeefe
+size 1523
diff --git a/untests/bin/images/pvr/ship_astc12x12.pvr b/untests/bin/images/pvr/ship_astc12x12.pvr
new file mode 100644
index 00000000..3f224b0c
--- /dev/null
+++ b/untests/bin/images/pvr/ship_astc12x12.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:33ca8d0e768cf02071c59c468da5524d33d03888cd0e13db2a9e380d1ae1de73
+size 1123
diff --git a/untests/bin/images/pvr/ship_astc4x4.pvr b/untests/bin/images/pvr/ship_astc4x4.pvr
new file mode 100644
index 00000000..5bd88c59
--- /dev/null
+++ b/untests/bin/images/pvr/ship_astc4x4.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ab8a200daa2640c60454085835ed19622e0e344fd07c9bcb9f8b51584e4009a
+size 8259
diff --git a/untests/bin/images/pvr/ship_astc5x5.pvr b/untests/bin/images/pvr/ship_astc5x5.pvr
new file mode 100644
index 00000000..cd47682d
--- /dev/null
+++ b/untests/bin/images/pvr/ship_astc5x5.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:682e37f45057fb498dafcbea955bfdb293ad6041f21b0ff03d26038008a4d2e0
+size 5475
diff --git a/untests/bin/images/pvr/ship_astc6x6.pvr b/untests/bin/images/pvr/ship_astc6x6.pvr
new file mode 100644
index 00000000..b2dfbfaa
--- /dev/null
+++ b/untests/bin/images/pvr/ship_astc6x6.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5210127b811bc455dfa13a0b7f572652ec3ae711ce39a18ac1c138c4f230eac
+size 3939
diff --git a/untests/bin/images/pvr/ship_astc8x8.pvr b/untests/bin/images/pvr/ship_astc8x8.pvr
new file mode 100644
index 00000000..1f695bdb
--- /dev/null
+++ b/untests/bin/images/pvr/ship_astc8x8.pvr
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:558f5ca61535e42a3f7823f572f80342f91d30d223e19b081121a69cf6274178
+size 2115
diff --git a/untests/sources/untests_core/render.cpp b/untests/sources/untests_core/render.cpp
index f693fb27..21fa9be1 100644
--- a/untests/sources/untests_core/render.cpp
+++ b/untests/sources/untests_core/render.cpp
@@ -190,8 +190,7 @@ TEST_CASE("render"){
                 texture_ptr tex = r.create_texture(v2u(128,128), pixel_declaration::pixel_type::rgba8);
                 REQUIRE(tex != nullptr);
 
-                buffer src;
-                src.resize(((tex->size().x * tex->decl().bits_per_pixel()) / 8u) * tex->size().y);
+                buffer src(tex->size().x * tex->size().y * 4u);
                 for ( auto& c : src ) {
                     c = rand() % 255;
                 }
@@ -201,8 +200,7 @@ TEST_CASE("render"){
                 texture_ptr tex = r.create_texture(v2u(128,128), pixel_declaration::pixel_type::l8);
                 REQUIRE(tex != nullptr);
 
-                buffer src;
-                src.resize(((tex->size().x * tex->decl().bits_per_pixel()) / 8u) * tex->size().y);
+                buffer src(tex->size().x * tex->size().y * 1u);
                 for ( auto& c : src ) {
                     c = rand() % 255;
                 }
@@ -212,8 +210,7 @@ TEST_CASE("render"){
                 texture_ptr tex = r.create_texture(v2u(128,128), pixel_declaration::pixel_type::rgb8);
                 REQUIRE(tex != nullptr);
 
-                buffer src;
-                src.resize(((tex->size().x * tex->decl().bits_per_pixel()) / 8u) * tex->size().y);
+                buffer src(tex->size().x * tex->size().y * 3u);
                 for ( auto& c : src ) {
                     c = rand() % 255;
                 }
@@ -223,8 +220,7 @@ TEST_CASE("render"){
                 texture_ptr tex = r.create_texture(v2u(57,31), pixel_declaration::pixel_type::rgba8);
                 REQUIRE(tex != nullptr);
 
-                buffer src;
-                src.resize(((tex->size().x * tex->decl().bits_per_pixel()) / 8u) * tex->size().y);
+                buffer src(tex->size().x * tex->size().y * 4u);
                 for ( auto& c : src ) {
                     c = rand() % 255;
                 }
@@ -234,8 +230,7 @@ TEST_CASE("render"){
                 texture_ptr tex = r.create_texture(v2u(128,128), pixel_declaration::pixel_type::rgba8);
                 REQUIRE(tex != nullptr);
 
-                buffer src;
-                src.resize(((31 * tex->decl().bits_per_pixel()) / 8u) * 44);
+                buffer src(31u * 44u * 4u);
                 for ( auto& c : src ) {
                     c = rand() % 255;
                 }
@@ -245,8 +240,7 @@ TEST_CASE("render"){
                 texture_ptr tex = r.create_texture(v2u(128,128), pixel_declaration::pixel_type::rgba8);
                 REQUIRE(tex != nullptr);
 
-                buffer src;
-                src.resize(((31 * tex->decl().bits_per_pixel()) / 8u) * 44);
+                buffer src(31u * 44u * 4u);
                 for ( auto& c : src ) {
                     c = rand() % 255;
                 }
diff --git a/untests/sources/untests_utils/image.cpp b/untests/sources/untests_utils/image.cpp
index 2b7f0417..8507f77c 100644
--- a/untests/sources/untests_utils/image.cpp
+++ b/untests/sources/untests_utils/image.cpp
@@ -291,6 +291,13 @@ TEST_CASE("images") {
             {"bin/images/pvr/ship_etc2_rgba.pvr", 64 * 128 * 8 / 8, true, image_data_format::rgba_etc2},
             {"bin/images/pvr/ship_etc2_rgb_a1.pvr", 64 * 128 * 4 / 8, true, image_data_format::rgb_a1_etc2},
 
+            {"bin/images/pvr/ship_astc4x4.pvr", ((64+3)/4) * ((128+3)/4) * 16, true, image_data_format::rgba_astc4x4},
+            {"bin/images/pvr/ship_astc5x5.pvr", ((64+4)/5) * ((128+4)/5) * 16, true, image_data_format::rgba_astc5x5},
+            {"bin/images/pvr/ship_astc6x6.pvr", ((64+5)/6) * ((128+5)/6) * 16, true, image_data_format::rgba_astc6x6},
+            {"bin/images/pvr/ship_astc8x8.pvr", ((64+7)/8) * ((128+7)/8) * 16, true, image_data_format::rgba_astc8x8},
+            {"bin/images/pvr/ship_astc10x10.pvr", ((64+9)/10) * ((128+9)/10) * 16, true, image_data_format::rgba_astc10x10},
+            {"bin/images/pvr/ship_astc12x12.pvr", ((64+11)/12) * ((128+11)/12) * 16, true, image_data_format::rgba_astc12x12},
+
             {"bin/images/pvr/ship_pvrtc_2bpp_rgb.pvr", 64 * 128 * 2 / 8, true, image_data_format::rgb_pvrtc2},
             {"bin/images/pvr/ship_pvrtc_2bpp_rgba.pvr", 64 * 128 * 2 / 8, true, image_data_format::rgba_pvrtc2},
             {"bin/images/pvr/ship_pvrtc_4bpp_rgb.pvr", 64 * 128 * 4 / 8, true, image_data_format::rgb_pvrtc4},

From ab69ed6f5e1f209014e95b04590a420130aebd6b Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Fri, 9 Aug 2019 07:41:58 +0700
Subject: [PATCH 065/108] fix etc2 texture support detection

---
 sources/enduro2d/core/render_impl/render_opengl_base.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sources/enduro2d/core/render_impl/render_opengl_base.cpp b/sources/enduro2d/core/render_impl/render_opengl_base.cpp
index d81ddb98..01d88caf 100644
--- a/sources/enduro2d/core/render_impl/render_opengl_base.cpp
+++ b/sources/enduro2d/core/render_impl/render_opengl_base.cpp
@@ -1453,6 +1453,7 @@ namespace e2d::opengl
                 "GL_OES_compressed_ETC1_RGB8_texture");
 
         caps.etc2_compression_supported =
+            version >= gl_version::gles_300 ||
             gl_has_any_extension(debug,
                 "GL_ARB_ES3_compatibility");
 

From 56c550d49136ca445dcd614a7254e9f0180490cf Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksei.pinchuk@matryoshka.com>
Date: Mon, 12 Aug 2019 16:37:47 +0300
Subject: [PATCH 066/108] fix read_int

---
 sources/enduro2d/utils/font.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sources/enduro2d/utils/font.cpp b/sources/enduro2d/utils/font.cpp
index fa5d7474..b148a0f5 100644
--- a/sources/enduro2d/utils/font.cpp
+++ b/sources/enduro2d/utils/font.cpp
@@ -52,7 +52,10 @@ namespace
         i32 res{0};
         auto end = buf.find(' ', pos);
         if ( end == str_view::npos ) {
-            end = buf.find('\n', pos);
+            end = buf.find("\r\n", pos);
+            if ( end == str_view::npos ) {
+                end = buf.find('\n', pos);
+            }
         }
 
         if ( end == str_view::npos ) {

From 9e1ccd67867baa5a9ce867f515b71c37fc3a8695 Mon Sep 17 00:00:00 2001
From: Pinchuk Aleksei <aleksei.pinchuk@matryoshka.com>
Date: Mon, 12 Aug 2019 19:49:06 +0300
Subject: [PATCH 067/108] improve font shaders

---
 samples/bin/library/font_shader.frag | 2 +-
 samples/bin/library/font_shader.vert | 2 +-
 samples/bin/library/sdf_shader.vert  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/samples/bin/library/font_shader.frag b/samples/bin/library/font_shader.frag
index c6b20f0a..53c9ff8f 100644
--- a/samples/bin/library/font_shader.frag
+++ b/samples/bin/library/font_shader.frag
@@ -4,6 +4,6 @@ varying vec2 v_st0;
 varying vec4 v_color;
 
 void main() {
-    vec2 st = vec2(v_st0.s, 1.0 - v_st0.t);
+    vec2 st = vec2(v_st0.s, v_st0.t);
     gl_FragColor = texture2D(u_texture, st) * v_color;
 }
diff --git a/samples/bin/library/font_shader.vert b/samples/bin/library/font_shader.vert
index 321b34fe..87daabca 100644
--- a/samples/bin/library/font_shader.vert
+++ b/samples/bin/library/font_shader.vert
@@ -9,7 +9,7 @@ varying vec2 v_st0;
 varying vec4 v_color;
 
 void main() {
-    v_st0 = a_st0;
+    v_st0 = vec2(a_st0.s, 1.0 - a_st0.t);
     v_color = a_color0;
     gl_Position = vec4(a_vertex, 1.0) * u_matrix_m * u_matrix_vp;
 }
diff --git a/samples/bin/library/sdf_shader.vert b/samples/bin/library/sdf_shader.vert
index d0ca286c..87daabca 100644
--- a/samples/bin/library/sdf_shader.vert
+++ b/samples/bin/library/sdf_shader.vert
@@ -9,7 +9,7 @@ varying vec2 v_st0;
 varying vec4 v_color;
 
 void main() {
-    v_st0 = vec2(a_st0.s, 1.0 - a_st0.t);;
+    v_st0 = vec2(a_st0.s, 1.0 - a_st0.t);
     v_color = a_color0;
     gl_Position = vec4(a_vertex, 1.0) * u_matrix_m * u_matrix_vp;
 }

From 6c28999f75ce664e993e7024410d132d4bc44bc2 Mon Sep 17 00:00:00 2001
From: KonH <konh@yandex.ru>
Date: Fri, 16 Aug 2019 22:26:34 +0700
Subject: [PATCH 068/108] change str/str_view length() to size() calls

---
 sources/enduro2d/core/debug.cpp                          | 2 +-
 sources/enduro2d/core/render_impl/render_opengl_base.cpp | 2 +-
 sources/enduro2d/core/vfs.cpp                            | 2 +-
 sources/enduro2d/utils/mesh_impl/mesh_reader_e2d.cpp     | 4 ++--
 sources/enduro2d/utils/path.cpp                          | 4 ++--
 sources/enduro2d/utils/shape_impl/shape_reader_e2d.cpp   | 4 ++--
 sources/enduro2d/utils/strings.cpp                       | 8 ++++----
 sources/enduro2d/utils/url.cpp                           | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sources/enduro2d/core/debug.cpp b/sources/enduro2d/core/debug.cpp
index 54ce5340..2405c982 100644
--- a/sources/enduro2d/core/debug.cpp
+++ b/sources/enduro2d/core/debug.cpp
@@ -95,7 +95,7 @@ namespace e2d
             const str log_text = log_text_format(lvl, text);
             const std::ptrdiff_t rprintf = std::printf("%s", log_text.c_str());
             return rprintf >= 0
-                && math::numeric_cast<std::size_t>(rprintf) == log_text.length();
+                && math::numeric_cast<std::size_t>(rprintf) == log_text.size();
         } catch (...) {
             return false;
         }
diff --git a/sources/enduro2d/core/render_impl/render_opengl_base.cpp b/sources/enduro2d/core/render_impl/render_opengl_base.cpp
index 01d88caf..62f02a05 100644
--- a/sources/enduro2d/core/render_impl/render_opengl_base.cpp
+++ b/sources/enduro2d/core/render_impl/render_opengl_base.cpp
@@ -146,7 +146,7 @@ namespace
         if ( ver ) {
             const str_view ver_str = str_view(reinterpret_cast<const char*>(ver));
             const std::size_t dot = ver_str.find('.');
-            if ( dot > 0 && dot + 1 < ver_str.length() ) {
+            if ( dot > 0 && dot + 1 < ver_str.size() ) {
                 major = ver[dot - 1] - '0';
                 minor = ver[dot + 1] - '0';
             }
diff --git a/sources/enduro2d/core/vfs.cpp b/sources/enduro2d/core/vfs.cpp
index 5fd4b5d5..30ade320 100644
--- a/sources/enduro2d/core/vfs.cpp
+++ b/sources/enduro2d/core/vfs.cpp
@@ -330,7 +330,7 @@ namespace e2d
             mz_zip_archive_file_stat file_stat;
             if ( mz_zip_reader_file_stat(state_->archive.get(), i, &file_stat) ) {
                 const str_view filename{file_stat.m_filename};
-                if ( filename.length() > parent.length() && strings::starts_with(filename, parent) ) {
+                if ( filename.size() > parent.size() && strings::starts_with(filename, parent) ) {
                     func(file_stat.m_filename, !!file_stat.m_is_directory);
                 }
             }
diff --git a/sources/enduro2d/utils/mesh_impl/mesh_reader_e2d.cpp b/sources/enduro2d/utils/mesh_impl/mesh_reader_e2d.cpp
index d5a8ed0b..6df2c6d5 100644
--- a/sources/enduro2d/utils/mesh_impl/mesh_reader_e2d.cpp
+++ b/sources/enduro2d/utils/mesh_impl/mesh_reader_e2d.cpp
@@ -23,9 +23,9 @@ namespace
 
         u32 file_version = 0;
         char* file_signature = static_cast<char*>(E2D_CLEAR_ALLOCA(
-            mesh_file_signature.length() + 1));
+            mesh_file_signature.size() + 1));
 
-        iseq.read(file_signature, mesh_file_signature.length())
+        iseq.read(file_signature, mesh_file_signature.size())
             .read(file_version);
 
         return iseq.success()
diff --git a/sources/enduro2d/utils/path.cpp b/sources/enduro2d/utils/path.cpp
index df1a0923..163dfa99 100644
--- a/sources/enduro2d/utils/path.cpp
+++ b/sources/enduro2d/utils/path.cpp
@@ -55,14 +55,14 @@ namespace e2d::path
         const str name = filename(path);
         return name.empty()
             ? str(path)
-            : str(path.substr(0, path.length() - name.length()));
+            : str(path.substr(0, path.size() - name.size()));
     }
 
     str remove_extension(str_view path) {
         const str ext = extension(path);
         return ext.empty()
             ? str(path)
-            : str(path.substr(0, path.length() - ext.length()));
+            : str(path.substr(0, path.size() - ext.size()));
     }
 
     str replace_filename(str_view path, str_view filename) {
diff --git a/sources/enduro2d/utils/shape_impl/shape_reader_e2d.cpp b/sources/enduro2d/utils/shape_impl/shape_reader_e2d.cpp
index 204cbde5..cafffd4a 100644
--- a/sources/enduro2d/utils/shape_impl/shape_reader_e2d.cpp
+++ b/sources/enduro2d/utils/shape_impl/shape_reader_e2d.cpp
@@ -23,9 +23,9 @@ namespace
 
         u32 file_version = 0;
         char* file_signature = static_cast<char*>(E2D_CLEAR_ALLOCA(
-            shape_file_signature.length() + 1));
+            shape_file_signature.size() + 1));
 
-        iseq.read(file_signature, shape_file_signature.length())
+        iseq.read(file_signature, shape_file_signature.size())
             .read(file_version);
 
         return iseq.success()
diff --git a/sources/enduro2d/utils/strings.cpp b/sources/enduro2d/utils/strings.cpp
index b3152aaa..777639ab 100644
--- a/sources/enduro2d/utils/strings.cpp
+++ b/sources/enduro2d/utils/strings.cpp
@@ -329,12 +329,12 @@ namespace e2d::strings
     }
 
     bool starts_with(str_view input, str_view test) noexcept {
-        return input.length() >= test.length()
-            && 0 == input.compare(0, test.length(), test);
+        return input.size() >= test.size()
+            && 0 == input.compare(0, test.size(), test);
     }
 
     bool ends_with(str_view input, str_view test) noexcept {
-        return input.length() >= test.length()
-            && 0 == input.compare(input.length() - test.length(), test.length(), test);
+        return input.size() >= test.size()
+            && 0 == input.compare(input.size() - test.size(), test.size(), test);
     }
 }
diff --git a/sources/enduro2d/utils/url.cpp b/sources/enduro2d/utils/url.cpp
index b44139ef..ef8b23c8 100644
--- a/sources/enduro2d/utils/url.cpp
+++ b/sources/enduro2d/utils/url.cpp
@@ -46,7 +46,7 @@ namespace
         }
         return std::make_pair(
             str(schemepath.substr(0, sep_pos)),
-            str(schemepath.substr(sep_pos + scheme_separator.length())));
+            str(schemepath.substr(sep_pos + scheme_separator.size())));
     }
 }
 

From d32ad1f895c9620d883ad2bc5652fb46f89157e9 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Sat, 17 Aug 2019 02:45:10 +0700
Subject: [PATCH 069/108] rewrite bmfont parser, remove sample07

---
 headers/3rdparty/ecs.hpp/ecs.hpp              | 2544 -----------------
 headers/enduro2d/base/_base.hpp               |    1 -
 headers/enduro2d/utils/font.hpp               |   85 +-
 samples/CMakeLists.txt                        |    1 -
 samples/sources/sample_07/sample_07.cpp       |   78 -
 .../enduro2d/high/systems/label_system.cpp    |   72 +-
 sources/enduro2d/utils/font.cpp               |  388 +--
 .../enduro2d/utils/font_impl/font_impl.hpp    |   17 +
 .../utils/font_impl/font_reader_bmfont.cpp    |  359 +++
 untests/sources/untests_utils/font.cpp        |   40 +-
 10 files changed, 508 insertions(+), 3077 deletions(-)
 delete mode 100644 headers/3rdparty/ecs.hpp/ecs.hpp
 delete mode 100644 samples/sources/sample_07/sample_07.cpp
 create mode 100644 sources/enduro2d/utils/font_impl/font_impl.hpp
 create mode 100644 sources/enduro2d/utils/font_impl/font_reader_bmfont.cpp

diff --git a/headers/3rdparty/ecs.hpp/ecs.hpp b/headers/3rdparty/ecs.hpp/ecs.hpp
deleted file mode 100644
index faa1969b..00000000
--- a/headers/3rdparty/ecs.hpp/ecs.hpp
+++ /dev/null
@@ -1,2544 +0,0 @@
-/*******************************************************************************
- * This file is part of the "https://github.com/blackmatov/ecs.hpp"
- * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
- ******************************************************************************/
-
-#pragma once
-
-#include <cassert>
-#include <cstddef>
-#include <cstdint>
-
-#include <tuple>
-#include <memory>
-#include <vector>
-#include <limits>
-#include <utility>
-#include <iterator>
-#include <stdexcept>
-#include <algorithm>
-#include <functional>
-#include <type_traits>
-
-// -----------------------------------------------------------------------------
-//
-// config
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    class entity;
-    class const_entity;
-
-    template < typename T >
-    class component;
-    template < typename T >
-    class const_component;
-
-    class prototype;
-
-    class system;
-    class registry;
-
-    class entity_filler;
-    class registry_filler;
-
-    using family_id = std::uint16_t;
-    using entity_id = std::uint32_t;
-    using priority_t = std::int32_t;
-
-    constexpr std::size_t entity_id_index_bits = 22u;
-    constexpr std::size_t entity_id_version_bits = 10u;
-
-    static_assert(
-        std::is_unsigned<family_id>::value,
-        "ecs_hpp (family_id must be an unsigned integer)");
-
-    static_assert(
-        std::is_unsigned<entity_id>::value,
-        "ecs_hpp (entity_id must be an unsigned integer)");
-
-    static_assert(
-        entity_id_index_bits > 0u &&
-        entity_id_version_bits > 0u &&
-        sizeof(entity_id) == (entity_id_index_bits + entity_id_version_bits) / 8u,
-        "ecs_hpp (invalid entity id index and version bits)");
-}
-
-// -----------------------------------------------------------------------------
-//
-// utilities
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    namespace detail
-    {
-        //
-        // as_const
-        //
-
-        template < typename T >
-        constexpr std::add_const_t<T>& as_const(T& t) noexcept {
-            return t;
-        }
-
-        //
-        // hash_combine
-        //
-
-        constexpr std::size_t hash_combine(std::size_t l, std::size_t r) noexcept {
-            return l ^ (r + 0x9e3779b9 + (l << 6) + (l >> 2));
-        }
-
-        //
-        // tuple_tail
-        //
-
-        namespace impl
-        {
-            template < typename T, typename... Ts, std::size_t... Is >
-            std::tuple<Ts...> tuple_tail_impl(
-                std::tuple<T, Ts...>&& t,
-                std::index_sequence<Is...> iseq)
-            {
-                (void)iseq;
-                return std::make_tuple(std::move(std::get<Is + 1u>(t))...);
-            }
-
-            template < typename T, typename... Ts, std::size_t... Is >
-            std::tuple<Ts...> tuple_tail_impl(
-                const std::tuple<T, Ts...>& t,
-                std::index_sequence<Is...> iseq)
-            {
-                (void)iseq;
-                return std::make_tuple(std::get<Is + 1u>(t)...);
-            }
-        }
-
-        template < typename T, typename... Ts >
-        std::tuple<Ts...> tuple_tail(std::tuple<T, Ts...>&& t) {
-            return impl::tuple_tail_impl(
-                std::move(t),
-                std::make_index_sequence<sizeof...(Ts)>());
-        }
-
-        template < typename T, typename... Ts >
-        std::tuple<Ts...> tuple_tail(const std::tuple<T, Ts...>& t) {
-            return impl::tuple_tail_impl(
-                t,
-                std::make_index_sequence<sizeof...(Ts)>());
-        }
-
-        //
-        // tuple_contains
-        //
-
-        namespace impl
-        {
-            template < size_t I, typename V, typename... Ts >
-            std::enable_if_t<I == sizeof...(Ts), bool>
-            tuple_contains_impl(const std::tuple<Ts...>& t, const V& v) {
-                (void)t;
-                (void)v;
-                return false;
-            }
-
-            template < size_t I, typename V, typename... Ts >
-            std::enable_if_t<I != sizeof...(Ts), bool>
-            tuple_contains_impl(const std::tuple<Ts...>& t, const V& v) {
-                if ( std::get<I>(t) == v ) {
-                    return true;
-                }
-                return tuple_contains_impl<I + 1>(t, v);
-            }
-        }
-
-        template < typename V, typename... Ts >
-        bool tuple_contains(const std::tuple<Ts...>& t, const V& v) {
-            return impl::tuple_contains_impl<0>(t, v);
-        }
-
-        //
-        // tiny_tuple_apply
-        //
-
-        namespace impl
-        {
-            template < typename F, typename Tuple, std::size_t... I >
-            void tiny_tuple_apply_impl(F&& f, Tuple&& args, std::index_sequence<I...>) {
-                std::forward<F>(f)(std::get<I>(std::forward<Tuple>(args))...);
-            }
-        }
-
-        template < typename F, typename Tuple >
-        void tiny_tuple_apply(F&& f, Tuple&& args) {
-            impl::tiny_tuple_apply_impl(
-                std::forward<F>(f),
-                std::forward<Tuple>(args),
-                std::make_index_sequence<std::tuple_size<std::decay_t<Tuple>>::value>());
-        }
-
-        //
-        // next_capacity_size
-        //
-
-        inline std::size_t next_capacity_size(
-            std::size_t cur_size,
-            std::size_t min_size,
-            std::size_t max_size)
-        {
-            if ( min_size > max_size ) {
-                throw std::length_error("ecs_hpp::next_capacity_size");
-            }
-            if ( cur_size >= max_size / 2u ) {
-                return max_size;
-            }
-            return std::max(cur_size * 2u, min_size);
-        }
-
-        //
-        // entity_id index/version
-        //
-
-        constexpr std::size_t entity_id_index_mask = (1u << entity_id_index_bits) - 1u;
-        constexpr std::size_t entity_id_version_mask = (1u << entity_id_version_bits) - 1u;
-
-        constexpr inline entity_id entity_id_index(entity_id id) noexcept {
-            return id & entity_id_index_mask;
-        }
-
-        constexpr inline entity_id entity_id_version(entity_id id) noexcept {
-            return (id >> entity_id_index_bits) & entity_id_version_mask;
-        }
-
-        constexpr inline entity_id entity_id_join(entity_id index, entity_id version) noexcept {
-            return index | (version << entity_id_index_bits);
-        }
-
-        constexpr inline entity_id upgrade_entity_id(entity_id id) noexcept {
-            return entity_id_join(
-                entity_id_index(id),
-                entity_id_version(id) + 1u);
-        }
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// detail::type_family
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    namespace detail
-    {
-        template < typename Void = void >
-        class type_family_base {
-            static_assert(
-                std::is_void<Void>::value,
-                "unexpected internal error");
-        protected:
-            static family_id last_id_;
-        };
-
-        template < typename T >
-        class type_family final : public type_family_base<> {
-        public:
-            static family_id id() noexcept {
-                static family_id self_id = ++last_id_;
-                assert(self_id > 0u && "ecs_hpp::family_id overflow");
-                return self_id;
-            }
-        };
-
-        template < typename Void >
-        family_id type_family_base<Void>::last_id_ = 0u;
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// detail::sparse_indexer
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    namespace detail
-    {
-        template < typename T
-                 , bool = std::is_unsigned<T>::value
-                    && sizeof(T) <= sizeof(std::size_t) >
-        struct sparse_unsigned_indexer {
-            std::size_t operator()(const T v) const noexcept {
-                return static_cast<std::size_t>(v);
-            }
-        };
-
-        template < typename T >
-        struct sparse_unsigned_indexer<T, false> {};
-
-        template < typename T >
-        struct sparse_indexer final
-        : public sparse_unsigned_indexer<T> {};
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// detail::sparse_set
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    namespace detail
-    {
-        template < typename T
-                 , typename Indexer = sparse_indexer<T> >
-        class sparse_set final {
-        public:
-            using iterator = typename std::vector<T>::iterator;
-            using const_iterator = typename std::vector<T>::const_iterator;
-        public:
-            static_assert(
-                noexcept(std::declval<Indexer>()(std::declval<T>())),
-                "unsupported sparse_set indexer");
-            static_assert(
-                std::is_nothrow_destructible<T>::value &&
-                std::is_nothrow_move_assignable<T>::value &&
-                noexcept(std::declval<T>() == std::declval<T>()),
-                "unsupported sparse_set value type");
-        public:
-            iterator begin() noexcept {
-                return dense_.begin();
-            }
-
-            iterator end() noexcept {
-                return dense_.end();
-            }
-
-            const_iterator begin() const noexcept {
-                return dense_.begin();
-            }
-
-            const_iterator end() const noexcept {
-                return dense_.end();
-            }
-
-            const_iterator cbegin() const noexcept {
-                return dense_.cbegin();
-            }
-
-            const_iterator cend() const noexcept {
-                return dense_.cend();
-            }
-        public:
-            sparse_set(const Indexer& indexer = Indexer())
-            : indexer_(indexer) {}
-
-            sparse_set(const sparse_set& other) = default;
-            sparse_set& operator=(const sparse_set& other) = default;
-
-            sparse_set(sparse_set&& other) noexcept = default;
-            sparse_set& operator=(sparse_set&& other) noexcept = default;
-
-            void swap(sparse_set& other) noexcept {
-                using std::swap;
-                swap(dense_, other.dense_);
-                swap(sparse_, other.sparse_);
-            }
-
-            template < typename UT >
-            bool insert(UT&& v) {
-                if ( has(v) ) {
-                    return false;
-                }
-                const std::size_t vi = indexer_(v);
-                if ( vi >= sparse_.size() ) {
-                    sparse_.resize(next_capacity_size(
-                        sparse_.size(), vi + 1u, sparse_.max_size()));
-                }
-                dense_.push_back(std::forward<UT>(v));
-                sparse_[vi] = dense_.size() - 1u;
-                return true;
-            }
-
-            template < typename... Args >
-            bool emplace(Args&&... args) {
-                return insert(T(std::forward<Args>(args)...));
-            }
-
-            bool unordered_erase(const T& v) noexcept {
-                if ( !has(v) ) {
-                    return false;
-                }
-                const std::size_t vi = indexer_(v);
-                const std::size_t dense_index = sparse_[vi];
-                if ( dense_index != dense_.size() - 1 ) {
-                    dense_[dense_index] = std::move(dense_.back());
-                    sparse_[indexer_(dense_[dense_index])] = dense_index;
-                }
-                dense_.pop_back();
-                return true;
-            }
-
-            void clear() noexcept {
-                dense_.clear();
-            }
-
-            bool has(const T& v) const noexcept {
-                const std::size_t vi = indexer_(v);
-                return vi < sparse_.size()
-                    && sparse_[vi] < dense_.size()
-                    && dense_[sparse_[vi]] == v;
-            }
-
-            const_iterator find(const T& v) const noexcept {
-                return has(v)
-                    ? begin() + sparse_[indexer_(v)]
-                    : end();
-            }
-
-            std::size_t get_dense_index(const T& v) const {
-                const auto p = find_dense_index(v);
-                if ( p.second ) {
-                    return p.first;
-                }
-                throw std::logic_error("ecs_hpp::sparse_set (value not found)");
-            }
-
-            std::pair<std::size_t,bool> find_dense_index(const T& v) const noexcept {
-                return has(v)
-                    ? std::make_pair(sparse_[indexer_(v)], true)
-                    : std::make_pair(std::size_t(-1), false);
-            }
-
-            bool empty() const noexcept {
-                return dense_.empty();
-            }
-
-            std::size_t size() const noexcept {
-                return dense_.size();
-            }
-
-            std::size_t memory_usage() const noexcept {
-                return dense_.capacity() * sizeof(dense_[0])
-                    + sparse_.capacity() * sizeof(sparse_[0]);
-            }
-        private:
-            Indexer indexer_;
-            std::vector<T> dense_;
-            std::vector<std::size_t> sparse_;
-        };
-
-        template < typename T
-                 , typename Indexer >
-        void swap(
-            sparse_set<T, Indexer>& l,
-            sparse_set<T, Indexer>& r) noexcept
-        {
-            l.swap(r);
-        }
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// detail::sparse_map
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    namespace detail
-    {
-        template < typename K
-                 , typename T
-                 , typename Indexer = sparse_indexer<K> >
-        class sparse_map final {
-        public:
-            using iterator = typename std::vector<K>::iterator;
-            using const_iterator = typename std::vector<K>::const_iterator;
-        public:
-            static_assert(
-                std::is_nothrow_destructible<T>::value &&
-                std::is_nothrow_move_assignable<T>::value,
-                "unsupported sparse_map value type");
-        public:
-            iterator begin() noexcept {
-                return keys_.begin();
-            }
-
-            iterator end() noexcept {
-                return keys_.end();
-            }
-
-            const_iterator begin() const noexcept {
-                return keys_.begin();
-            }
-
-            const_iterator end() const noexcept {
-                return keys_.end();
-            }
-
-            const_iterator cbegin() const noexcept {
-                return keys_.cbegin();
-            }
-
-            const_iterator cend() const noexcept {
-                return keys_.cend();
-            }
-        public:
-            sparse_map(const Indexer& indexer = Indexer())
-            : keys_(indexer) {}
-
-            sparse_map(const sparse_map& other) = default;
-            sparse_map& operator=(const sparse_map& other) = default;
-
-            sparse_map(sparse_map&& other) noexcept = default;
-            sparse_map& operator=(sparse_map&& other) noexcept = default;
-
-            void swap(sparse_map& other) noexcept {
-                using std::swap;
-                swap(keys_, other.keys_);
-                swap(values_, other.values_);
-            }
-
-            template < typename UK, typename UT >
-            bool insert(UK&& k, UT&& v) {
-                if ( keys_.has(k) ) {
-                    return false;
-                }
-                values_.push_back(std::forward<UT>(v));
-                try {
-                    return keys_.insert(std::forward<UK>(k));
-                } catch (...) {
-                    values_.pop_back();
-                    throw;
-                }
-            }
-
-            template < typename UK, typename... Args >
-            bool emplace(UK&& k, Args&&... args) {
-                if ( keys_.has(k) ) {
-                    return false;
-                }
-                values_.emplace_back(std::forward<Args>(args)...);
-                try {
-                    return keys_.insert(std::forward<UK>(k));
-                } catch (...) {
-                    values_.pop_back();
-                    throw;
-                }
-            }
-
-            template < typename UK, typename UT >
-            bool insert_or_assign(UK&& k, UT&& v) {
-                if ( keys_.has(k) ) {
-                    get(k) = std::forward<UT>(v);
-                    return false;
-                } else {
-                    insert(std::forward<UK>(k), std::forward<UT>(v));
-                    return true;
-                }
-            }
-
-            bool unordered_erase(const K& k) noexcept {
-                const auto value_index_p = keys_.find_dense_index(k);
-                if ( !value_index_p.second ) {
-                    return false;
-                }
-                if ( value_index_p.first != values_.size() - 1 ) {
-                    values_[value_index_p.first] = std::move(values_.back());
-                }
-                values_.pop_back();
-                keys_.unordered_erase(k);
-                return true;
-            }
-
-            void clear() noexcept {
-                keys_.clear();
-                values_.clear();
-            }
-
-            bool has(const K& k) const noexcept {
-                return keys_.has(k);
-            }
-
-            T& get(const K& k) {
-                return values_[keys_.get_dense_index(k)];
-            }
-
-            const T& get(const K& k) const {
-                return values_[keys_.get_dense_index(k)];
-            }
-
-            T* find(const K& k) noexcept {
-                const auto value_index_p = keys_.find_dense_index(k);
-                return value_index_p.second
-                    ? &values_[value_index_p.first]
-                    : nullptr;
-            }
-
-            const T* find(const K& k) const noexcept {
-                const auto value_index_p = keys_.find_dense_index(k);
-                return value_index_p.second
-                    ? &values_[value_index_p.first]
-                    : nullptr;
-            }
-
-            bool empty() const noexcept {
-                return values_.empty();
-            }
-
-            std::size_t size() const noexcept {
-                return values_.size();
-            }
-
-            std::size_t memory_usage() const noexcept {
-                return keys_.memory_usage()
-                    + values_.capacity() * sizeof(values_[0]);
-            }
-        private:
-            sparse_set<K, Indexer> keys_;
-            std::vector<T> values_;
-        };
-
-        template < typename K
-                 , typename T
-                 , typename Indexer >
-        void swap(
-            sparse_map<K, T, Indexer>& l,
-            sparse_map<K, T, Indexer>& r) noexcept
-        {
-            l.swap(r);
-        }
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// detail::entity_id_indexer
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    namespace detail
-    {
-        struct entity_id_indexer final {
-            std::size_t operator()(entity_id id) const noexcept {
-                return entity_id_index(id);
-            }
-        };
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// detail::component_storage
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    namespace detail
-    {
-        class component_storage_base {
-        public:
-            virtual ~component_storage_base() = default;
-            virtual bool remove(entity_id id) noexcept = 0;
-            virtual bool has(entity_id id) const noexcept = 0;
-            virtual void clone(entity_id from, entity_id to) = 0;
-            virtual std::size_t memory_usage() const noexcept = 0;
-        };
-
-        template < typename T, bool E = std::is_empty<T>::value >
-        class component_storage final : public component_storage_base {
-        public:
-            component_storage(registry& owner)
-            : owner_(owner) {}
-
-            template < typename... Args >
-            T& assign(entity_id id, Args&&... args) {
-                components_.insert_or_assign(id, T(std::forward<Args>(args)...));
-                return components_.get(id);
-            }
-
-            bool exists(entity_id id) const noexcept {
-                return components_.has(id);
-            }
-
-            bool remove(entity_id id) noexcept override {
-                return components_.unordered_erase(id);
-            }
-
-            std::size_t remove_all() noexcept {
-                const std::size_t count = components_.size();
-                components_.clear();
-                return count;
-            }
-
-            T* find(entity_id id) noexcept {
-                return components_.find(id);
-            }
-
-            const T* find(entity_id id) const noexcept {
-                return components_.find(id);
-            }
-
-            std::size_t count() const noexcept {
-                return components_.size();
-            }
-
-            bool has(entity_id id) const noexcept override {
-                return components_.has(id);
-            }
-
-            void clone(entity_id from, entity_id to) override {
-                const T* c = components_.find(from);
-                if ( c ) {
-                    components_.insert_or_assign(to, *c);
-                }
-            }
-
-            template < typename F >
-            void for_each_component(F&& f) {
-                for ( const entity_id id : components_ ) {
-                    f(id, components_.get(id));
-                }
-            }
-
-            template < typename F >
-            void for_each_component(F&& f) const {
-                for ( const entity_id id : components_ ) {
-                    f(id, components_.get(id));
-                }
-            }
-
-            std::size_t memory_usage() const noexcept override {
-                return components_.memory_usage();
-            }
-        private:
-            registry& owner_;
-            detail::sparse_map<entity_id, T, entity_id_indexer> components_;
-        };
-
-        template < typename T >
-        class component_storage<T, true> final : public component_storage_base {
-        public:
-            component_storage(registry& owner)
-            : owner_(owner) {}
-
-            template < typename... Args >
-            T& assign(entity_id id, Args&&...) {
-                components_.insert(id);
-                return empty_value_;
-            }
-
-            bool exists(entity_id id) const noexcept {
-                return components_.has(id);
-            }
-
-            bool remove(entity_id id) noexcept override {
-                return components_.unordered_erase(id);
-            }
-
-            std::size_t remove_all() noexcept {
-                const std::size_t count = components_.size();
-                components_.clear();
-                return count;
-            }
-
-            T* find(entity_id id) noexcept {
-                return components_.has(id)
-                    ? &empty_value_
-                    : nullptr;
-            }
-
-            const T* find(entity_id id) const noexcept {
-                return components_.has(id)
-                    ? &empty_value_
-                    : nullptr;
-            }
-
-            std::size_t count() const noexcept {
-                return components_.size();
-            }
-
-            bool has(entity_id id) const noexcept override {
-                return components_.has(id);
-            }
-
-            void clone(entity_id from, entity_id to) override {
-                if ( components_.has(from) ) {
-                    components_.insert(to);
-                }
-            }
-
-            template < typename F >
-            void for_each_component(F&& f) {
-                for ( const entity_id id : components_ ) {
-                    f(id, empty_value_);
-                }
-            }
-
-            template < typename F >
-            void for_each_component(F&& f) const {
-                for ( const entity_id id : components_ ) {
-                    f(id, empty_value_);
-                }
-            }
-
-            std::size_t memory_usage() const noexcept override {
-                return components_.memory_usage();
-            }
-        private:
-            registry& owner_;
-            static T empty_value_;
-            detail::sparse_set<entity_id, entity_id_indexer> components_;
-        };
-
-        template < typename T >
-        T component_storage<T, true>::empty_value_;
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// entity
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    class entity final {
-    public:
-        entity(registry& owner) noexcept;
-        entity(registry& owner, entity_id id) noexcept;
-
-        entity(const entity&) = default;
-        entity& operator=(const entity&) = default;
-
-        entity(entity&&) noexcept = default;
-        entity& operator=(entity&&) noexcept = default;
-
-        registry& owner() noexcept;
-        const registry& owner() const noexcept;
-
-        entity_id id() const noexcept;
-
-        entity clone() const;
-        void destroy() noexcept;
-        bool valid() const noexcept;
-
-        template < typename T, typename... Args >
-        T& assign_component(Args&&... args);
-
-        template < typename T >
-        bool remove_component();
-
-        template < typename T >
-        bool exists_component() const noexcept;
-
-        std::size_t remove_all_components() noexcept;
-
-        template < typename T >
-        T& get_component();
-
-        template < typename T >
-        const T& get_component() const;
-
-        template < typename T >
-        T* find_component() noexcept;
-
-        template < typename T >
-        const T* find_component() const noexcept;
-
-        template < typename... Ts >
-        std::tuple<Ts&...> get_components();
-        template < typename... Ts >
-        std::tuple<const Ts&...> get_components() const;
-
-        template < typename... Ts >
-        std::tuple<Ts*...> find_components() noexcept;
-        template < typename... Ts >
-        std::tuple<const Ts*...> find_components() const noexcept;
-
-        std::size_t component_count() const noexcept;
-    private:
-        registry* owner_{nullptr};
-        entity_id id_{0u};
-    };
-
-    bool operator<(const entity& l, const entity& r) noexcept;
-
-    bool operator==(const entity& l, const entity& r) noexcept;
-    bool operator==(const entity& l, const const_entity& r) noexcept;
-
-    bool operator!=(const entity& l, const entity& r) noexcept;
-    bool operator!=(const entity& l, const const_entity& r) noexcept;
-}
-
-namespace std
-{
-    template <>
-    struct hash<ecs_hpp::entity> final {
-        std::size_t operator()(const ecs_hpp::entity& ent) const noexcept {
-            return ecs_hpp::detail::hash_combine(
-                std::hash<const ecs_hpp::registry*>()(&ent.owner()),
-                std::hash<ecs_hpp::entity_id>()(ent.id()));
-        }
-    };
-}
-
-// -----------------------------------------------------------------------------
-//
-// const_entity
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    class const_entity final {
-    public:
-        const_entity(const entity& ent) noexcept;
-
-        const_entity(const registry& owner) noexcept;
-        const_entity(const registry& owner, entity_id id) noexcept;
-
-        const_entity(const const_entity&) = default;
-        const_entity& operator=(const const_entity&) = default;
-
-        const_entity(const_entity&&) noexcept = default;
-        const_entity& operator=(const_entity&&) noexcept = default;
-
-        const registry& owner() const noexcept;
-        entity_id id() const noexcept;
-
-        bool valid() const noexcept;
-
-        template < typename T >
-        bool exists_component() const noexcept;
-
-        template < typename T >
-        const T& get_component() const;
-
-        template < typename T >
-        const T* find_component() const noexcept;
-
-        template < typename... Ts >
-        std::tuple<const Ts&...> get_components() const;
-
-        template < typename... Ts >
-        std::tuple<const Ts*...> find_components() const noexcept;
-
-        std::size_t component_count() const noexcept;
-    private:
-        const registry* owner_{nullptr};
-        entity_id id_{0u};
-    };
-
-    bool operator<(const const_entity& l, const const_entity& r) noexcept;
-
-    bool operator==(const const_entity& l, const entity& r) noexcept;
-    bool operator==(const const_entity& l, const const_entity& r) noexcept;
-
-    bool operator!=(const const_entity& l, const entity& r) noexcept;
-    bool operator!=(const const_entity& l, const const_entity& r) noexcept;
-}
-
-namespace std
-{
-    template <>
-    struct hash<ecs_hpp::const_entity> final {
-        std::size_t operator()(const ecs_hpp::const_entity& ent) const noexcept {
-            return ecs_hpp::detail::hash_combine(
-                std::hash<const ecs_hpp::registry*>()(&ent.owner()),
-                std::hash<ecs_hpp::entity_id>()(ent.id()));
-        }
-    };
-}
-
-// -----------------------------------------------------------------------------
-//
-// component
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    template < typename T >
-    class component final {
-    public:
-        component(const entity& owner) noexcept;
-
-        component(const component&) = default;
-        component& operator=(const component&) = default;
-
-        component(component&&) noexcept = default;
-        component& operator=(component&&) noexcept = default;
-
-        entity& owner() noexcept;
-        const entity& owner() const noexcept;
-
-        bool remove();
-        bool exists() const noexcept;
-
-        template < typename... Args >
-        T& assign(Args&&... args);
-
-        T& get();
-        const T& get() const;
-
-        T* find() noexcept;
-        const T* find() const noexcept;
-
-        T& operator*();
-        const T& operator*() const;
-
-        T* operator->() noexcept;
-        const T* operator->() const noexcept;
-
-        explicit operator bool() const noexcept;
-    private:
-        entity owner_;
-    };
-
-    template < typename T >
-    bool operator<(const component<T>& l, const component<T>& r) noexcept;
-
-    template < typename T >
-    bool operator==(const component<T>& l, const component<T>& r) noexcept;
-    template < typename T >
-    bool operator==(const component<T>& l, const const_component<T>& r) noexcept;
-
-    template < typename T >
-    bool operator!=(const component<T>& l, const component<T>& r) noexcept;
-    template < typename T >
-    bool operator!=(const component<T>& l, const const_component<T>& r) noexcept;
-}
-
-namespace std
-{
-    template < typename T >
-    struct hash<ecs_hpp::component<T>> {
-        std::size_t operator()(const ecs_hpp::component<T>& comp) const noexcept {
-            return std::hash<ecs_hpp::entity>()(comp.owner());
-        }
-    };
-}
-
-// -----------------------------------------------------------------------------
-//
-// const_component
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    template < typename T >
-    class const_component final {
-    public:
-        const_component(const component<T>& comp) noexcept;
-        const_component(const const_entity& owner) noexcept;
-
-        const_component(const const_component&) = default;
-        const_component& operator=(const const_component&) = default;
-
-        const_component(const_component&&) noexcept = default;
-        const_component& operator=(const_component&&) noexcept = default;
-
-        const const_entity& owner() const noexcept;
-
-        bool exists() const noexcept;
-
-        const T& get() const;
-        const T* find() const noexcept;
-
-        const T& operator*() const;
-        const T* operator->() const noexcept;
-        explicit operator bool() const noexcept;
-    private:
-        const_entity owner_;
-    };
-
-    template < typename T >
-    bool operator<(const const_component<T>& l, const const_component<T>& r) noexcept;
-
-    template < typename T >
-    bool operator==(const const_component<T>& l, const component<T>& r) noexcept;
-    template < typename T >
-    bool operator==(const const_component<T>& l, const const_component<T>& r) noexcept;
-
-    template < typename T >
-    bool operator!=(const const_component<T>& l, const component<T>& r) noexcept;
-    template < typename T >
-    bool operator!=(const const_component<T>& l, const const_component<T>& r) noexcept;
-}
-
-namespace std
-{
-    template < typename T >
-    struct hash<ecs_hpp::const_component<T>> {
-        std::size_t operator()(const ecs_hpp::const_component<T>& comp) const noexcept {
-            return std::hash<ecs_hpp::const_entity>()(comp.owner());
-        }
-    };
-}
-
-// -----------------------------------------------------------------------------
-//
-// prototype
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    namespace detail
-    {
-        class applier_base;
-        using applier_uptr = std::unique_ptr<applier_base>;
-
-        class applier_base {
-        public:
-            virtual ~applier_base() = default;
-            virtual applier_uptr clone() const = 0;
-            virtual void apply_to_entity(entity& ent, bool override) const = 0;
-        };
-
-        template < typename T >
-        class typed_applier : public applier_base {
-        public:
-            virtual void apply_to_component(T& component) const = 0;
-        };
-
-        template < typename T, typename... Args >
-        class typed_applier_with_args final : public typed_applier<T> {
-        public:
-            typed_applier_with_args(std::tuple<Args...>&& args);
-            typed_applier_with_args(const std::tuple<Args...>& args);
-            applier_uptr clone() const override;
-            void apply_to_entity(entity& ent, bool override) const override;
-            void apply_to_component(T& component) const override;
-        private:
-            std::tuple<Args...> args_;
-        };
-    }
-
-    class prototype final {
-    public:
-        prototype() = default;
-        ~prototype() noexcept = default;
-
-        prototype(const prototype& other);
-        prototype& operator=(const prototype& other);
-
-        prototype(prototype&& other) noexcept;
-        prototype& operator=(prototype&& other) noexcept;
-
-        void clear() noexcept;
-        bool empty() const noexcept;
-        void swap(prototype& other) noexcept;
-
-        template < typename T >
-        bool has_component() const noexcept;
-
-        template < typename T, typename... Args >
-        prototype& component(Args&&... args) &;
-        template < typename T, typename... Args >
-        prototype&& component(Args&&... args) &&;
-
-        prototype& merge_with(const prototype& other, bool override) &;
-        prototype&& merge_with(const prototype& other, bool override) &&;
-
-        template < typename T >
-        bool apply_to_component(T& component) const;
-        void apply_to_entity(entity& ent, bool override) const;
-    private:
-        detail::sparse_map<
-            family_id,
-            detail::applier_uptr> appliers_;
-    };
-
-    void swap(prototype& l, prototype& r) noexcept;
-}
-
-// -----------------------------------------------------------------------------
-//
-// system
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    class system {
-    public:
-        virtual ~system() = default;
-        virtual void process(registry& owner) = 0;
-    };
-}
-
-// -----------------------------------------------------------------------------
-//
-// registry
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    class registry final {
-    private:
-        class uentity {
-        public:
-            uentity(registry& owner, entity_id id) noexcept;
-
-            uentity(entity_id ent) noexcept;
-            uentity(entity ent) noexcept;
-
-            operator entity_id() const noexcept;
-            operator entity() const noexcept;
-            operator const_entity() const noexcept;
-
-            entity_id id() const noexcept;
-            registry* owner() noexcept;
-            const registry* owner() const noexcept;
-
-            bool check_owner(const registry* owner) const noexcept;
-        private:
-            entity_id id_{0u};
-            registry* owner_{nullptr};
-        };
-
-        class const_uentity {
-        public:
-            const_uentity(const registry& owner, entity_id id) noexcept;
-
-            const_uentity(entity_id ent) noexcept;
-            const_uentity(entity ent) noexcept;
-            const_uentity(const_entity ent) noexcept;
-            const_uentity(const uentity& ent) noexcept;
-
-            operator entity_id() const noexcept;
-            operator const_entity() const noexcept;
-
-            entity_id id() const noexcept;
-            const registry* owner() const noexcept;
-
-            bool check_owner(const registry* owner) const noexcept;
-        private:
-            entity_id id_{0u};
-            const registry* owner_{nullptr};
-        };
-    public:
-        registry() = default;
-        ~registry() noexcept = default;
-
-        registry(const registry& other) = delete;
-        registry& operator=(const registry& other) = delete;
-
-        registry(registry&& other) noexcept = default;
-        registry& operator=(registry&& other) noexcept = default;
-
-        entity wrap_entity(const const_uentity& ent) noexcept;
-        const_entity wrap_entity(const const_uentity& ent) const noexcept;
-
-        template < typename T >
-        component<T> wrap_component(const const_uentity& ent) noexcept;
-        template < typename T >
-        const_component<T> wrap_component(const const_uentity& ent) const noexcept;
-
-        entity create_entity();
-        entity create_entity(const prototype& proto);
-        entity create_entity(const const_uentity& proto);
-
-        void destroy_entity(const uentity& ent) noexcept;
-        bool valid_entity(const const_uentity& ent) const noexcept;
-
-        template < typename T, typename... Args >
-        T& assign_component(const uentity& ent, Args&&... args);
-
-        template < typename T >
-        bool remove_component(const uentity& ent);
-
-        template < typename T >
-        bool exists_component(const const_uentity& ent) const noexcept;
-
-        std::size_t remove_all_components(const uentity& ent) noexcept;
-
-        template < typename T >
-        std::size_t remove_all_components() noexcept;
-
-        template < typename T >
-        T& get_component(const uentity& ent);
-        template < typename T >
-        const T& get_component(const const_uentity& ent) const;
-
-        template < typename T >
-        T* find_component(const uentity& ent) noexcept;
-        template < typename T >
-        const T* find_component(const const_uentity& ent) const noexcept;
-
-        template < typename... Ts >
-        std::tuple<Ts&...> get_components(const uentity& ent);
-        template < typename... Ts >
-        std::tuple<const Ts&...> get_components(const const_uentity& ent) const;
-
-        template < typename... Ts >
-        std::tuple<Ts*...> find_components(const uentity& ent) noexcept;
-        template < typename... Ts >
-        std::tuple<const Ts*...> find_components(const const_uentity& ent) const noexcept;
-
-        template < typename T >
-        std::size_t component_count() const noexcept;
-        std::size_t entity_count() const noexcept;
-        std::size_t entity_component_count(const const_uentity& ent) const noexcept;
-
-        template < typename F >
-        void for_each_entity(F&& f);
-        template < typename F >
-        void for_each_entity(F&& f) const;
-
-        template < typename T, typename F >
-        void for_each_component(F&& f);
-        template < typename T, typename F >
-        void for_each_component(F&& f) const;
-
-        template < typename... Ts, typename F >
-        void for_joined_components(F&& f);
-        template < typename... Ts, typename F >
-        void for_joined_components(F&& f) const;
-
-        template < typename T, typename... Args >
-        void add_system(priority_t priority, Args&&... args);
-
-        void process_all_systems();
-        void process_systems_above(priority_t min);
-        void process_systems_below(priority_t max);
-        void process_systems_in_range(priority_t min, priority_t max);
-
-        struct memory_usage_info {
-            std::size_t entities{0u};
-            std::size_t components{0u};
-        };
-        memory_usage_info memory_usage() const noexcept;
-
-        template < typename T >
-        std::size_t component_memory_usage() const noexcept;
-    private:
-        template < typename T >
-        detail::component_storage<T>* find_storage_() noexcept;
-
-        template < typename T >
-        const detail::component_storage<T>* find_storage_() const noexcept;
-
-        template < typename T >
-        detail::component_storage<T>& get_or_create_storage_();
-
-        template < typename T
-                 , typename... Ts
-                 , typename F
-                 , std::size_t I
-                 , std::size_t... Is >
-        void for_joined_components_impl_(
-            F&& f,
-            std::index_sequence<I, Is...> iseq);
-
-        template < typename T
-                 , typename... Ts
-                 , typename F
-                 , std::size_t I
-                 , std::size_t... Is >
-        void for_joined_components_impl_(
-            F&& f,
-            std::index_sequence<I, Is...> iseq) const;
-
-        template < typename T
-                 , typename... Ts
-                 , typename F
-                 , typename Ss
-                 , typename... Cs >
-        void for_joined_components_impl_(
-            const uentity& e,
-            const F& f,
-            const Ss& ss,
-            Cs&... cs);
-
-        template < typename T
-                 , typename... Ts
-                 , typename F
-                 , typename Ss
-                 , typename... Cs >
-        void for_joined_components_impl_(
-            const const_uentity& e,
-            const F& f,
-            const Ss& ss,
-            const Cs&... cs) const;
-
-        template < typename F, typename... Cs >
-        void for_joined_components_impl_(
-            const uentity& e,
-            const F& f,
-            const std::tuple<>& ss,
-            Cs&... cs);
-
-        template < typename F, typename... Cs >
-        void for_joined_components_impl_(
-            const const_uentity& e,
-            const F& f,
-            const std::tuple<>& ss,
-            const Cs&... cs) const;
-    private:
-        entity_id last_entity_id_{0u};
-        std::vector<entity_id> free_entity_ids_;
-        detail::sparse_set<entity_id, detail::entity_id_indexer> entity_ids_;
-
-        using storage_uptr = std::unique_ptr<detail::component_storage_base>;
-        detail::sparse_map<family_id, storage_uptr> storages_;
-
-        using system_uptr = std::unique_ptr<system>;
-        std::vector<std::pair<priority_t, system_uptr>> systems_;
-    };
-}
-
-// -----------------------------------------------------------------------------
-//
-// fillers
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    class entity_filler final {
-    public:
-        entity_filler(entity& entity) noexcept
-        : entity_(entity) {}
-
-        template < typename T, typename... Args >
-        entity_filler& component(Args&&... args) {
-            entity_.assign_component<T>(std::forward<Args>(args)...);
-            return *this;
-        }
-    private:
-        entity& entity_;
-    };
-
-    class registry_filler final {
-    public:
-        registry_filler(registry& registry) noexcept
-        : registry_(registry) {}
-
-        template < typename T, typename... Args >
-        registry_filler& system(priority_t priority, Args&&... args) {
-            registry_.add_system<T>(
-                priority,
-                std::forward<Args>(args)...);
-            return *this;
-        }
-    private:
-        registry& registry_;
-    };
-}
-
-// -----------------------------------------------------------------------------
-//
-// entity impl
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    inline entity::entity(registry& owner) noexcept
-    : owner_(&owner) {}
-
-    inline entity::entity(registry& owner, entity_id id) noexcept
-    : owner_(&owner)
-    , id_(id) {}
-
-    inline registry& entity::owner() noexcept {
-        return *owner_;
-    }
-
-    inline const registry& entity::owner() const noexcept {
-        return *owner_;
-    }
-
-    inline entity_id entity::id() const noexcept {
-        return id_;
-    }
-
-    inline entity entity::clone() const {
-        return (*owner_).create_entity(id_);
-    }
-
-    inline void entity::destroy() noexcept {
-        (*owner_).destroy_entity(id_);
-    }
-
-    inline bool entity::valid() const noexcept {
-        return detail::as_const(*owner_).valid_entity(id_);
-    }
-
-    template < typename T, typename... Args >
-    T& entity::assign_component(Args&&... args) {
-        return (*owner_).assign_component<T>(
-            id_,
-            std::forward<Args>(args)...);
-    }
-
-    template < typename T >
-    bool entity::remove_component() {
-        return (*owner_).remove_component<T>(id_);
-    }
-
-    template < typename T >
-    bool entity::exists_component() const noexcept {
-        return detail::as_const(*owner_).exists_component<T>(id_);
-    }
-
-    inline std::size_t entity::remove_all_components() noexcept {
-        return (*owner_).remove_all_components(id_);
-    }
-
-    template < typename T >
-    T& entity::get_component() {
-        return (*owner_).get_component<T>(id_);
-    }
-
-    template < typename T >
-    const T& entity::get_component() const {
-        return detail::as_const(*owner_).get_component<T>(id_);
-    }
-
-    template < typename T >
-    T* entity::find_component() noexcept {
-        return (*owner_).find_component<T>(id_);
-    }
-
-    template < typename T >
-    const T* entity::find_component() const noexcept {
-        return detail::as_const(*owner_).find_component<T>(id_);
-    }
-
-    template < typename... Ts >
-    std::tuple<Ts&...> entity::get_components() {
-        return (*owner_).get_components<Ts...>(id_);
-    }
-
-    template < typename... Ts >
-    std::tuple<const Ts&...> entity::get_components() const {
-        return detail::as_const(*owner_).get_components<Ts...>(id_);
-    }
-
-    template < typename... Ts >
-    std::tuple<Ts*...> entity::find_components() noexcept {
-        return (*owner_).find_components<Ts...>(id_);
-    }
-
-    template < typename... Ts >
-    std::tuple<const Ts*...> entity::find_components() const noexcept {
-        return detail::as_const(*owner_).find_components<Ts...>(id_);
-    }
-
-    inline std::size_t entity::component_count() const noexcept {
-        return detail::as_const(*owner_).entity_component_count(id_);
-    }
-
-    inline bool operator<(const entity& l, const entity& r) noexcept {
-        return (&l.owner() < &r.owner())
-            || (&l.owner() == &r.owner() && l.id() < r.id());
-    }
-
-    inline bool operator==(const entity& l, const entity& r) noexcept {
-        return &l.owner() == &r.owner()
-            && l.id() == r.id();
-    }
-
-    inline bool operator==(const entity& l, const const_entity& r) noexcept {
-        return &l.owner() == &r.owner()
-            && l.id() == r.id();
-    }
-
-    inline bool operator!=(const entity& l, const entity& r) noexcept {
-        return !(l == r);
-    }
-
-    inline bool operator!=(const entity& l, const const_entity& r) noexcept {
-        return !(l == r);
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// const_entity impl
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    inline const_entity::const_entity(const entity& ent) noexcept
-    : owner_(&ent.owner())
-    , id_(ent.id()) {}
-
-    inline const_entity::const_entity(const registry& owner) noexcept
-    : owner_(&owner) {}
-
-    inline const_entity::const_entity(const registry& owner, entity_id id) noexcept
-    : owner_(&owner)
-    , id_(id) {}
-
-    inline const registry& const_entity::owner() const noexcept {
-        return *owner_;
-    }
-
-    inline entity_id const_entity::id() const noexcept {
-        return id_;
-    }
-
-    inline bool const_entity::valid() const noexcept {
-        return (*owner_).valid_entity(id_);
-    }
-
-    template < typename T >
-    bool const_entity::exists_component() const noexcept {
-        return (*owner_).exists_component<T>(id_);
-    }
-
-    template < typename T >
-    const T& const_entity::get_component() const {
-        return (*owner_).get_component<T>(id_);
-    }
-
-    template < typename T >
-    const T* const_entity::find_component() const noexcept {
-        return (*owner_).find_component<T>(id_);
-    }
-
-    template < typename... Ts >
-    std::tuple<const Ts&...> const_entity::get_components() const {
-        return (*owner_).get_components<Ts...>(id_);
-    }
-
-    template < typename... Ts >
-    std::tuple<const Ts*...> const_entity::find_components() const noexcept {
-        return (*owner_).find_components<Ts...>(id_);
-    }
-
-    inline std::size_t const_entity::component_count() const noexcept {
-        return (*owner_).entity_component_count(id_);
-    }
-
-    inline bool operator<(const const_entity& l, const const_entity& r) noexcept {
-        return (&l.owner() < &r.owner())
-            || (&l.owner() == &r.owner() && l.id() < r.id());
-    }
-
-    inline bool operator==(const const_entity& l, const entity& r) noexcept {
-        return &l.owner() == &r.owner()
-            && l.id() == r.id();
-    }
-
-    inline bool operator==(const const_entity& l, const const_entity& r) noexcept {
-        return &l.owner() == &r.owner()
-            && l.id() == r.id();
-    }
-
-    inline bool operator!=(const const_entity& l, const entity& r) noexcept {
-        return !(l == r);
-    }
-
-    inline bool operator!=(const const_entity& l, const const_entity& r) noexcept {
-        return !(l == r);
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// component impl
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    template < typename T >
-    component<T>::component(const entity& owner) noexcept
-    : owner_(owner) {}
-
-    template < typename T >
-    entity& component<T>::owner() noexcept {
-        return owner_;
-    }
-
-    template < typename T >
-    const entity& component<T>::owner() const noexcept {
-        return owner_;
-    }
-
-    template < typename T >
-    bool component<T>::remove() {
-        return owner_.remove_component<T>();
-    }
-
-    template < typename T >
-    bool component<T>::exists() const noexcept {
-        return owner_.exists_component<T>();
-    }
-
-    template < typename T >
-    template < typename... Args >
-    T& component<T>::assign(Args&&... args) {
-        return owner_.assign_component<T>(
-            std::forward<Args>(args)...);
-    }
-
-    template < typename T >
-    T& component<T>::get() {
-        return owner_.get_component<T>();
-    }
-
-    template < typename T >
-    const T& component<T>::get() const {
-        return detail::as_const(owner_).template get_component<T>();
-    }
-
-    template < typename T >
-    T* component<T>::find() noexcept {
-        return owner_.find_component<T>();
-    }
-
-    template < typename T >
-    const T* component<T>::find() const noexcept {
-        return detail::as_const(owner_).template find_component<T>();
-    }
-
-    template < typename T >
-    T& component<T>::operator*() {
-        return get();
-    }
-
-    template < typename T >
-    const T& component<T>::operator*() const {
-        return get();
-    }
-
-    template < typename T >
-    T* component<T>::operator->() noexcept {
-        return find();
-    }
-
-    template < typename T >
-    const T* component<T>::operator->() const noexcept {
-        return find();
-    }
-
-    template < typename T >
-    component<T>::operator bool() const noexcept {
-        return exists();
-    }
-
-    template < typename T >
-    bool operator<(const component<T>& l, const component<T>& r) noexcept {
-        return l.owner() < r.owner();
-    }
-
-    template < typename T >
-    bool operator==(const component<T>& l, const component<T>& r) noexcept {
-        return l.owner() == r.owner();
-    }
-
-    template < typename T >
-    bool operator==(const component<T>& l, const const_component<T>& r) noexcept {
-        return l.owner() == r.owner();
-    }
-
-    template < typename T >
-    bool operator!=(const component<T>& l, const component<T>& r) noexcept {
-        return !(l == r);
-    }
-
-    template < typename T >
-    bool operator!=(const component<T>& l, const const_component<T>& r) noexcept {
-        return !(l == r);
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// const_component impl
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    template < typename T >
-    const_component<T>::const_component(const component<T>& comp) noexcept
-    : owner_(comp.owner()) {}
-
-    template < typename T >
-    const_component<T>::const_component(const const_entity& owner) noexcept
-    : owner_(owner) {}
-
-    template < typename T >
-    const const_entity& const_component<T>::owner() const noexcept {
-        return owner_;
-    }
-
-    template < typename T >
-    bool const_component<T>::exists() const noexcept {
-        return detail::as_const(owner_).template exists_component<T>();
-    }
-
-    template < typename T >
-    const T& const_component<T>::get() const {
-        return detail::as_const(owner_).template get_component<T>();
-    }
-
-    template < typename T >
-    const T* const_component<T>::find() const noexcept {
-        return detail::as_const(owner_).template find_component<T>();
-    }
-
-    template < typename T >
-    const T& const_component<T>::operator*() const {
-        return get();
-    }
-
-    template < typename T >
-    const T* const_component<T>::operator->() const noexcept {
-        return find();
-    }
-
-    template < typename T >
-    const_component<T>::operator bool() const noexcept {
-        return exists();
-    }
-
-    template < typename T >
-    bool operator<(const const_component<T>& l, const const_component<T>& r) noexcept {
-        return l.owner() < r.owner();
-    }
-
-    template < typename T >
-    bool operator==(const const_component<T>& l, const component<T>& r) noexcept {
-        return l.owner() == r.owner();
-    }
-
-    template < typename T >
-    bool operator==(const const_component<T>& l, const const_component<T>& r) noexcept {
-        return l.owner() == r.owner();
-    }
-
-    template < typename T >
-    bool operator!=(const const_component<T>& l, const component<T>& r) noexcept {
-        return !(l == r);
-    }
-
-    template < typename T >
-    bool operator!=(const const_component<T>& l, const const_component<T>& r) noexcept {
-        return !(l == r);
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// prototype impl
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    namespace detail
-    {
-        template < typename T, typename... Args >
-        typed_applier_with_args<T, Args...>::typed_applier_with_args(std::tuple<Args...>&& args)
-        : args_(std::move(args)) {}
-
-        template < typename T, typename... Args >
-        typed_applier_with_args<T, Args...>::typed_applier_with_args(const std::tuple<Args...>& args)
-        : args_(args) {}
-
-        template < typename T, typename... Args >
-        applier_uptr typed_applier_with_args<T, Args...>::clone() const {
-            return std::make_unique<typed_applier_with_args>(args_);
-        }
-
-        template < typename T, typename... Args >
-        void typed_applier_with_args<T, Args...>::apply_to_entity(entity& ent, bool override) const {
-            detail::tiny_tuple_apply([&ent, override](const Args&... args){
-                if ( override || !ent.exists_component<T>() ) {
-                    ent.assign_component<T>(args...);
-                }
-            }, args_);
-        }
-
-        template < typename T, typename... Args >
-        void typed_applier_with_args<T, Args...>::apply_to_component(T& component) const {
-            detail::tiny_tuple_apply([&component](const Args&... args){
-                component = T(args...);
-            }, args_);
-        }
-    }
-
-    inline prototype::prototype(const prototype& other) {
-        for ( const family_id family : other.appliers_ ) {
-            appliers_.insert(family, other.appliers_.get(family)->clone());
-        }
-    }
-
-    inline prototype& prototype::operator=(const prototype& other) {
-        if ( this != &other ) {
-            prototype p(other);
-            swap(p);
-        }
-        return *this;
-    }
-
-    inline prototype::prototype(prototype&& other) noexcept
-    : appliers_(std::move(other.appliers_)) {}
-
-    inline prototype& prototype::operator=(prototype&& other) noexcept {
-        if ( this != &other ) {
-            swap(other);
-            other.clear();
-        }
-        return *this;
-    }
-
-    inline void prototype::clear() noexcept {
-        appliers_.clear();
-    }
-
-    inline bool prototype::empty() const noexcept {
-        return appliers_.empty();
-    }
-
-    inline void prototype::swap(prototype& other) noexcept {
-        using std::swap;
-        swap(appliers_, other.appliers_);
-    }
-
-    template < typename T >
-    bool prototype::has_component() const noexcept {
-        const auto family = detail::type_family<T>::id();
-        return appliers_.has(family);
-    }
-
-    template < typename T, typename... Args >
-    prototype& prototype::component(Args&&... args) & {
-        using applier_t = detail::typed_applier_with_args<
-            T,
-            std::decay_t<Args>...>;
-        auto applier = std::make_unique<applier_t>(
-            std::make_tuple(std::forward<Args>(args)...));
-        const auto family = detail::type_family<T>::id();
-        appliers_.insert_or_assign(family, std::move(applier));
-        return *this;
-    }
-
-    template < typename T, typename... Args >
-    prototype&& prototype::component(Args&&... args) && {
-        component<T>(std::forward<Args>(args)...);
-        return std::move(*this);
-    }
-
-    inline prototype& prototype::merge_with(const prototype& other, bool override) & {
-        for ( const auto family : other.appliers_ ) {
-            if ( override || !appliers_.has(family) ) {
-                appliers_.insert_or_assign(
-                    family,
-                    other.appliers_.get(family)->clone());
-            }
-        }
-        return *this;
-    }
-
-    inline prototype&& prototype::merge_with(const prototype& other, bool override) && {
-        merge_with(other, override);
-        return std::move(*this);
-    }
-
-    template < typename T >
-    bool prototype::apply_to_component(T& component) const {
-        const auto family = detail::type_family<T>::id();
-        const auto applier_base_ptr = appliers_.find(family);
-        if ( !applier_base_ptr ) {
-            return false;
-        }
-        using applier_t = detail::typed_applier<T>;
-        const auto applier = static_cast<applier_t*>(applier_base_ptr->get());
-        applier->apply_to_component(component);
-        return true;
-    }
-
-    inline void prototype::apply_to_entity(entity& ent, bool override) const {
-        for ( const auto family : appliers_ ) {
-            appliers_.get(family)->apply_to_entity(ent, override);
-        }
-    }
-
-    inline void swap(prototype& l, prototype& r) noexcept {
-        l.swap(r);
-    }
-}
-
-// -----------------------------------------------------------------------------
-//
-// registry impl
-//
-// -----------------------------------------------------------------------------
-
-namespace ecs_hpp
-{
-    //
-    // registry::uentity
-    //
-
-    inline registry::uentity::uentity(registry& owner, entity_id id) noexcept
-    : id_(id)
-    , owner_(&owner) {}
-
-    inline registry::uentity::uentity(entity_id ent) noexcept
-    : id_(ent) {}
-
-    inline registry::uentity::uentity(entity ent) noexcept
-    : id_(ent.id())
-    , owner_(&ent.owner()) {}
-
-    inline registry::uentity::operator entity_id() const noexcept {
-        return id_;
-    }
-
-    inline registry::uentity::operator entity() const noexcept {
-        assert(owner_);
-        return {*owner_, id_};
-    }
-
-    inline registry::uentity::operator const_entity() const noexcept {
-        assert(owner_);
-        return {*owner_, id_};
-    }
-
-    inline entity_id registry::uentity::id() const noexcept {
-        return id_;
-    }
-
-    inline registry* registry::uentity::owner() noexcept {
-        return owner_;
-    }
-
-    inline const registry* registry::uentity::owner() const noexcept {
-        return owner_;
-    }
-
-    inline bool registry::uentity::check_owner(const registry* owner) const noexcept {
-        return !owner_ || owner_ == owner;
-    }
-
-    //
-    // registry::const_uentity
-    //
-
-    inline registry::const_uentity::const_uentity(const registry& owner, entity_id id) noexcept
-    : id_(id)
-    , owner_(&owner) {}
-
-    inline registry::const_uentity::const_uentity(entity_id ent) noexcept
-    : id_(ent) {}
-
-    inline registry::const_uentity::const_uentity(entity ent) noexcept
-    : id_(ent.id())
-    , owner_(&ent.owner()) {}
-
-    inline registry::const_uentity::const_uentity(const_entity ent) noexcept
-    : id_(ent.id())
-    , owner_(&ent.owner()) {}
-
-    inline registry::const_uentity::const_uentity(const uentity& ent) noexcept
-    : id_(ent.id())
-    , owner_(ent.owner()) {}
-
-    inline registry::const_uentity::operator entity_id() const noexcept {
-        return id_;
-    }
-
-    inline registry::const_uentity::operator const_entity() const noexcept {
-        assert(owner_);
-        return {*owner_, id_};
-    }
-
-    inline entity_id registry::const_uentity::id() const noexcept {
-        return id_;
-    }
-
-    inline const registry* registry::const_uentity::owner() const noexcept {
-        return owner_;
-    }
-
-    inline bool registry::const_uentity::check_owner(const registry* owner) const noexcept {
-        return !owner_ || owner_ == owner;
-    }
-
-    //
-    // registry
-    //
-
-    inline entity registry::wrap_entity(const const_uentity& ent) noexcept {
-        return {*this, ent.id()};
-    }
-
-    inline const_entity registry::wrap_entity(const const_uentity& ent) const noexcept {
-        return {*this, ent.id()};
-    }
-
-    template < typename T >
-    component<T> registry::wrap_component(const const_uentity& ent) noexcept {
-        return {wrap_entity(ent)};
-    }
-
-    template < typename T >
-    const_component<T> registry::wrap_component(const const_uentity& ent) const noexcept {
-        return {wrap_entity(ent)};
-    }
-
-    inline entity registry::create_entity() {
-        if ( !free_entity_ids_.empty() ) {
-            const auto free_ent_id = free_entity_ids_.back();
-            const auto new_ent_id = detail::upgrade_entity_id(free_ent_id);
-            entity_ids_.insert(new_ent_id);
-            free_entity_ids_.pop_back();
-            return wrap_entity(new_ent_id);
-
-        }
-        if ( last_entity_id_ >= detail::entity_id_index_mask ) {
-            throw std::logic_error("ecs_hpp::registry (entity index overlow)");
-        }
-        if ( free_entity_ids_.capacity() <= entity_ids_.size() ) {
-            // ensure free entity ids capacity for safe (noexcept) entity destroying
-            free_entity_ids_.reserve(detail::next_capacity_size(
-                free_entity_ids_.capacity(),
-                entity_ids_.size() + 1,
-                free_entity_ids_.max_size()));
-        }
-        entity_ids_.insert(last_entity_id_ + 1);
-        return wrap_entity(++last_entity_id_);
-    }
-
-    inline entity registry::create_entity(const prototype& proto) {
-        auto ent = create_entity();
-        try {
-            proto.apply_to_entity(ent, true);
-        } catch (...) {
-            destroy_entity(ent);
-            throw;
-        }
-        return ent;
-    }
-
-    inline entity registry::create_entity(const const_uentity& proto) {
-        assert(valid_entity(proto));
-        entity ent = create_entity();
-        try {
-            for ( const auto family : storages_ ) {
-                storages_.get(family)->clone(proto, ent.id());
-            }
-        } catch (...) {
-            destroy_entity(ent);
-            throw;
-        }
-        return ent;
-    }
-
-    inline void registry::destroy_entity(const uentity& ent) noexcept {
-        assert(valid_entity(ent));
-        remove_all_components(ent);
-        if ( entity_ids_.unordered_erase(ent) ) {
-            assert(free_entity_ids_.size() < free_entity_ids_.capacity());
-            free_entity_ids_.push_back(ent);
-        }
-    }
-
-    inline bool registry::valid_entity(const const_uentity& ent) const noexcept {
-        assert(ent.check_owner(this));
-        return entity_ids_.has(ent);
-    }
-
-    template < typename T, typename... Args >
-    T& registry::assign_component(const uentity& ent, Args&&... args) {
-        assert(valid_entity(ent));
-        return get_or_create_storage_<T>().assign(
-            ent,
-            std::forward<Args>(args)...);
-    }
-
-    template < typename T >
-    bool registry::remove_component(const uentity& ent) {
-        assert(valid_entity(ent));
-        detail::component_storage<T>* storage = find_storage_<T>();
-        return storage
-            ? storage->remove(ent)
-            : false;
-    }
-
-    template < typename T >
-    bool registry::exists_component(const const_uentity& ent) const noexcept {
-        assert(valid_entity(ent));
-        const detail::component_storage<T>* storage = find_storage_<T>();
-        return storage
-            ? storage->exists(ent)
-            : false;
-    }
-
-    inline std::size_t registry::remove_all_components(const uentity& ent) noexcept {
-        assert(valid_entity(ent));
-        std::size_t removed_count = 0u;
-        for ( const auto family : storages_ ) {
-            if ( storages_.get(family)->remove(ent) ) {
-                ++removed_count;
-            }
-        }
-        return removed_count;
-    }
-
-    template < typename T >
-    std::size_t registry::remove_all_components() noexcept {
-        detail::component_storage<T>* storage = find_storage_<T>();
-        return storage
-            ? storage->remove_all()
-            : 0u;
-    }
-
-    template < typename T >
-    T& registry::get_component(const uentity& ent) {
-        assert(valid_entity(ent));
-        T* component = find_component<T>(ent);
-        if ( component ) {
-            return *component;
-        }
-        throw std::logic_error("ecs_hpp::registry (component not found)");
-    }
-
-    template < typename T >
-    const T& registry::get_component(const const_uentity& ent) const {
-        assert(valid_entity(ent));
-        const T* component = find_component<T>(ent);
-        if ( component ) {
-            return *component;
-        }
-        throw std::logic_error("ecs_hpp::registry (component not found)");
-    }
-
-    template < typename T >
-    T* registry::find_component(const uentity& ent) noexcept {
-        assert(valid_entity(ent));
-        detail::component_storage<T>* storage = find_storage_<T>();
-        return storage
-            ? storage->find(ent)
-            : nullptr;
-    }
-
-    template < typename T >
-    const T* registry::find_component(const const_uentity& ent) const noexcept {
-        assert(valid_entity(ent));
-        const detail::component_storage<T>* storage = find_storage_<T>();
-        return storage
-            ? storage->find(ent)
-            : nullptr;
-    }
-
-    template < typename... Ts >
-    std::tuple<Ts&...> registry::get_components(const uentity& ent) {
-        assert(valid_entity(ent));
-        return std::make_tuple(std::ref(get_component<Ts>(ent))...);
-    }
-
-    template < typename... Ts >
-    std::tuple<const Ts&...> registry::get_components(const const_uentity& ent) const {
-        assert(valid_entity(ent));
-        return std::make_tuple(std::cref(get_component<Ts>(ent))...);
-    }
-
-    template < typename... Ts >
-    std::tuple<Ts*...> registry::find_components(const uentity& ent) noexcept {
-        assert(valid_entity(ent));
-        return std::make_tuple(find_component<Ts>(ent)...);
-    }
-
-    template < typename... Ts >
-    std::tuple<const Ts*...> registry::find_components(const const_uentity& ent) const noexcept {
-        assert(valid_entity(ent));
-        return std::make_tuple(find_component<Ts>(ent)...);
-    }
-
-    template < typename T >
-    std::size_t registry::component_count() const noexcept {
-        const detail::component_storage<T>* storage = find_storage_<T>();
-        return storage
-            ? storage->count()
-            : 0u;
-    }
-
-    inline std::size_t registry::entity_count() const noexcept {
-        return entity_ids_.size();
-    }
-
-    inline std::size_t registry::entity_component_count(const const_uentity& ent) const noexcept {
-        assert(valid_entity(ent));
-        std::size_t component_count = 0u;
-        for ( const auto family : storages_ ) {
-            if ( storages_.get(family)->has(ent) ) {
-                ++component_count;
-            }
-        }
-        return component_count;
-    }
-
-    template < typename F >
-    void registry::for_each_entity(F&& f) {
-        for ( const auto id : entity_ids_ ) {
-            f({*this, id});
-        }
-    }
-
-    template < typename F >
-    void registry::for_each_entity(F&& f) const {
-        for ( const auto id : entity_ids_ ) {
-            f({*this, id});
-        }
-    }
-
-    template < typename T, typename F >
-    void registry::for_each_component(F&& f) {
-        detail::component_storage<T>* storage = find_storage_<T>();
-        if ( storage ) {
-            storage->for_each_component([this, &f](const entity_id e, T& t){
-                f(uentity{*this, e}, t);
-            });
-        }
-    }
-
-    template < typename T, typename F >
-    void registry::for_each_component(F&& f) const {
-        const detail::component_storage<T>* storage = find_storage_<T>();
-        if ( storage ) {
-            storage->for_each_component([this, &f](const entity_id e, const T& t){
-                f(const_uentity{*this, e}, t);
-            });
-        }
-    }
-
-    template < typename... Ts, typename F >
-    void registry::for_joined_components(F&& f) {
-        for_joined_components_impl_<Ts...>(
-            std::forward<F>(f),
-            std::make_index_sequence<sizeof...(Ts)>());
-    }
-
-    template < typename... Ts, typename F >
-    void registry::for_joined_components(F&& f) const {
-        for_joined_components_impl_<Ts...>(
-            std::forward<F>(f),
-            std::make_index_sequence<sizeof...(Ts)>());
-    }
-
-    template < typename T, typename... Args >
-    void registry::add_system(priority_t priority, Args&&... args) {
-        auto iter = std::upper_bound(
-            systems_.begin(), systems_.end(), priority,
-            [](priority_t pr, const auto& r){
-                return pr < r.first;
-            });
-        systems_.emplace(
-            iter,
-            priority,
-            std::make_unique<T>(std::forward<Args>(args)...));
-    }
-
-    inline void registry::process_all_systems() {
-        process_systems_in_range(
-            std::numeric_limits<priority_t>::min(),
-            std::numeric_limits<priority_t>::max());
-    }
-
-    inline void registry::process_systems_above(priority_t min) {
-        process_systems_in_range(
-            min,
-            std::numeric_limits<priority_t>::max());
-    }
-
-    inline void registry::process_systems_below(priority_t max) {
-        process_systems_in_range(
-            std::numeric_limits<priority_t>::min(),
-            max);
-    }
-
-    inline void registry::process_systems_in_range(priority_t min, priority_t max) {
-        const auto first = std::lower_bound(
-            systems_.begin(), systems_.end(), min,
-            [](const auto& p, priority_t pr) noexcept {
-                return p.first < pr;
-            });
-        for ( auto iter = first; iter != systems_.end() && iter->first <= max; ++iter ) {
-            iter->second->process(*this);
-        }
-    }
-
-    inline registry::memory_usage_info registry::memory_usage() const noexcept {
-        memory_usage_info info;
-        info.entities += free_entity_ids_.capacity() * sizeof(free_entity_ids_[0]);
-        info.entities += entity_ids_.memory_usage();
-        for ( const auto family : storages_ ) {
-            info.components += storages_.get(family)->memory_usage();
-        }
-        return info;
-    }
-
-    template < typename T >
-    std::size_t registry::component_memory_usage() const noexcept {
-        const detail::component_storage<T>* storage = find_storage_<T>();
-        return storage
-            ? storage->memory_usage()
-            : 0u;
-    }
-
-    template < typename T >
-    detail::component_storage<T>* registry::find_storage_() noexcept {
-        const auto family = detail::type_family<T>::id();
-        using raw_storage_ptr = detail::component_storage<T>*;
-        const storage_uptr* storage_uptr_ptr = storages_.find(family);
-        return storage_uptr_ptr && *storage_uptr_ptr
-            ? static_cast<raw_storage_ptr>(storage_uptr_ptr->get())
-            : nullptr;
-    }
-
-    template < typename T >
-    const detail::component_storage<T>* registry::find_storage_() const noexcept {
-        const auto family = detail::type_family<T>::id();
-        using raw_storage_ptr = const detail::component_storage<T>*;
-        const storage_uptr* storage_uptr_ptr = storages_.find(family);
-        return storage_uptr_ptr && *storage_uptr_ptr
-            ? static_cast<raw_storage_ptr>(storage_uptr_ptr->get())
-            : nullptr;
-    }
-
-    template < typename T >
-    detail::component_storage<T>& registry::get_or_create_storage_() {
-        detail::component_storage<T>* storage = find_storage_<T>();
-        if ( storage ) {
-            return *storage;
-        }
-        const auto family = detail::type_family<T>::id();
-        storages_.emplace(
-            family,
-            std::make_unique<detail::component_storage<T>>(*this));
-        return *static_cast<detail::component_storage<T>*>(
-            storages_.get(family).get());
-    }
-
-    template < typename T
-             , typename... Ts
-             , typename F
-             , std::size_t I
-             , std::size_t... Is >
-    void registry::for_joined_components_impl_(
-        F&& f,
-        std::index_sequence<I, Is...> iseq)
-    {
-        (void)iseq;
-        const auto ss = std::make_tuple(find_storage_<Ts>()...);
-        if ( !detail::tuple_contains(ss, nullptr) ) {
-            for_each_component<T>([this, &f, &ss](const uentity& e, T& t) {
-                for_joined_components_impl_<Ts...>(e, f, ss, t);
-            });
-        }
-    }
-
-    template < typename T
-             , typename... Ts
-             , typename F
-             , std::size_t I
-             , std::size_t... Is >
-    void registry::for_joined_components_impl_(
-        F&& f,
-        std::index_sequence<I, Is...> iseq) const
-    {
-        (void)iseq;
-        const auto ss = std::make_tuple(find_storage_<Ts>()...);
-        if ( !detail::tuple_contains(ss, nullptr) ) {
-            for_each_component<T>([this, &f, &ss](const const_uentity& e, const T& t) {
-                detail::as_const(*this).for_joined_components_impl_<Ts...>(e, f, ss, t);
-            });
-        }
-    }
-
-    template < typename T
-             , typename... Ts
-             , typename F
-             , typename Ss
-             , typename... Cs >
-    void registry::for_joined_components_impl_(
-        const uentity& e,
-        const F& f,
-        const Ss& ss,
-        Cs&... cs)
-    {
-        T* c = std::get<0>(ss)->find(e);
-        if ( c ) {
-            for_joined_components_impl_<Ts...>(
-                e,
-                f,
-                detail::tuple_tail(ss),
-                cs...,
-                *c);
-        }
-    }
-
-    template < typename T
-             , typename... Ts
-             , typename F
-             , typename Ss
-             , typename... Cs >
-    void registry::for_joined_components_impl_(
-        const const_uentity& e,
-        const F& f,
-        const Ss& ss,
-        const Cs&... cs) const
-    {
-        const T* c = std::get<0>(ss)->find(e);
-        if ( c ) {
-            for_joined_components_impl_<Ts...>(
-                e,
-                f,
-                detail::tuple_tail(ss),
-                cs...,
-                *c);
-        }
-    }
-
-    template < typename F, typename... Cs >
-    void registry::for_joined_components_impl_(
-        const uentity& e,
-        const F& f,
-        const std::tuple<>& ss,
-        Cs&... cs)
-    {
-        (void)ss;
-        f(e, cs...);
-    }
-
-    template < typename F, typename... Cs >
-    void registry::for_joined_components_impl_(
-        const const_uentity& e,
-        const F& f,
-        const std::tuple<>& ss,
-        const Cs&... cs) const
-    {
-        (void)ss;
-        f(e, cs...);
-    }
-}
diff --git a/headers/enduro2d/base/_base.hpp b/headers/enduro2d/base/_base.hpp
index 850bfdd0..01afedf1 100644
--- a/headers/enduro2d/base/_base.hpp
+++ b/headers/enduro2d/base/_base.hpp
@@ -33,7 +33,6 @@
 #include <chrono>
 #include <memory>
 #include <limits>
-#include <sstream>
 #include <numeric>
 #include <utility>
 #include <iterator>
diff --git a/headers/enduro2d/utils/font.hpp b/headers/enduro2d/utils/font.hpp
index cd447e20..c33679a7 100644
--- a/headers/enduro2d/utils/font.hpp
+++ b/headers/enduro2d/utils/font.hpp
@@ -9,49 +9,31 @@
 #include "_utils.hpp"
 
 #include "buffer.hpp"
+#include "buffer_view.hpp"
 #include "streams.hpp"
 
 namespace e2d
 {
     class font final {
     public:
-        struct info_data {
-            str face;
-            u32 size{0};
-        };
-
-        struct common_data {
-            u32 line{0};
-            u32 base{0};
-            u32 pages{0};
+        struct font_info {
+            str atlas_file;
             v2u atlas_size;
+            u32 font_size{0};
+            u32 line_height{0};
+            u32 glyph_ascent{0};
         };
 
-        struct page_data {
-            u32 id{0};
-            str file;
+        struct glyph_info {
+            v2i offset;
+            b2u tex_rect;
+            i32 advance{0};
         };
 
-        struct char_data {
-            u32 id{0};
-            b2hi rect;
-            v2hi offset;
-            i16 advance{0};
-            u16 page{0};
-            u16 chnl{0};
-        };
-
-        struct kerning_data {
-            std::pair<u32, u32> chars{0,0};
-            i32 amount{0};
-        };
-
-        struct data {
-            info_data info;
-            common_data common;
-            flat_set<page_data> pages;
-            flat_map<u32, char_data> chars;
+        struct content {
+            font_info info;
             flat_map<u64, i32> kernings;
+            flat_map<u32, glyph_info> glyphs;
         };
     public:
         font() = default;
@@ -62,60 +44,43 @@ namespace e2d
         font(const font& other);
         font& operator=(const font& other);
 
-        font(data&& data) noexcept;
-        font(const data& data);
+        font(content&& content) noexcept;
+        font(const content& content);
 
         font& assign(font&& other) noexcept;
         font& assign(const font& other);
 
-        font& assign(data&& data) noexcept;
-        font& assign(const data& data);
+        font& assign(content&& content) noexcept;
+        font& assign(const content& content);
 
         void swap(font& other) noexcept;
         void clear() noexcept;
         bool empty() const noexcept;
 
-        const info_data& info() const noexcept;
-        const common_data& common() const noexcept;
-        const flat_set<page_data>& pages() const noexcept;
-        const flat_map<u32, char_data>& chars() const noexcept;
+        const font_info& info() const noexcept;
         const flat_map<u64, i32>& kernings() const noexcept;
+        const flat_map<u32, glyph_info>& glyphs() const noexcept;
 
-        const page_data* find_page(u32 id) const noexcept;
-        const char_data* find_char(u32 id) const noexcept;
         i32 get_kerning(u32 first, u32 second) const noexcept;
+        const glyph_info* find_glyph(u32 code_point) const noexcept;
     private:
-        data data_;
+        content content_;
     };
 
     void swap(font& l, font& r) noexcept;
     bool operator==(const font& l, const font& r) noexcept;
     bool operator!=(const font& l, const font& r) noexcept;
 
-    bool operator<(u32 l, const font::page_data& r) noexcept;
-    bool operator<(const font::page_data& l, u32 r) noexcept;
-    bool operator<(const font::page_data& l, const font::page_data& r) noexcept;
-
-    bool operator<(u32 l, const font::char_data& r) noexcept;
-    bool operator<(const font::char_data& l, u32 r) noexcept;
-    bool operator<(const font::char_data& l, const font::char_data& r) noexcept;
-
-    bool operator<(const std::pair<u32,u32>& l, const font::kerning_data& r) noexcept;
-    bool operator<(const font::kerning_data& l, const std::pair<u32,u32>& r) noexcept;
-    bool operator<(const font::kerning_data& l, const font::kerning_data& r) noexcept;
-
-    bool operator==(const font::info_data& l, const font::info_data& r) noexcept;
-    bool operator==(const font::common_data& l, const font::common_data& r) noexcept;
-    bool operator==(const font::page_data& l, const font::page_data& r) noexcept;
-    bool operator==(const font::char_data& l, const font::char_data& r) noexcept;
-    bool operator==(const font::kerning_data& l, const font::kerning_data& r) noexcept;
+    bool operator==(const font::font_info& l, const font::font_info& r) noexcept;
+    bool operator==(const font::glyph_info& l, const font::glyph_info& r) noexcept;
+    bool operator==(const font::content& l, const font::content& r) noexcept;
 }
 
 namespace e2d::fonts
 {
     bool try_load_font(
         font& dst,
-        const buffer& src) noexcept;
+        buffer_view src) noexcept;
 
     bool try_load_font(
         font& dst,
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 3cac8bb9..70c5e8db 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -36,5 +36,4 @@ add_e2d_sample(02)
 add_e2d_sample(03)
 add_e2d_sample(04)
 add_e2d_sample(05)
-add_e2d_sample(07)
 
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
deleted file mode 100644
index 2b4e4bb8..00000000
--- a/samples/sources/sample_07/sample_07.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * This file is part of the "Enduro2D"
- * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
- ******************************************************************************/
-
-#include "../common.hpp"
-using namespace e2d;
-
-namespace
-{
-    class game_system final : public ecs::system {
-    public:
-        void process(ecs::registry& owner) override {
-            E2D_UNUSED(owner);
-            const keyboard& k = the<input>().keyboard();
-
-            if ( k.is_key_just_released(keyboard_key::f12) ) {
-                the<dbgui>().toggle_visible(!the<dbgui>().visible());
-            }
-
-            if ( k.is_key_just_released(keyboard_key::escape) ) {
-                the<window>().set_should_close(true);
-            }
-
-            if ( k.is_key_pressed(keyboard_key::lsuper) && k.is_key_just_released(keyboard_key::enter) ) {
-                the<window>().toggle_fullscreen(!the<window>().fullscreen());
-            }
-        }
-    };
-
-    class camera_system final : public ecs::system {
-    public:
-        void process(ecs::registry& owner) override {
-            owner.for_joined_components<camera>(
-            [](const ecs::const_entity&, camera& cam){
-                if ( !cam.target() ) {
-                    cam.viewport(
-                        the<window>().real_size());
-                    cam.projection(math::make_orthogonal_lh_matrix4(
-                        the<window>().real_size().cast_to<f32>(), 0.f, 1000.f));
-                }
-            });
-        }
-    };
-
-    class game final : public starter::application {
-    public:
-        bool initialize() final {
-            return create_scene()
-                && create_systems();
-        }
-    private:
-        bool create_scene() {
-            auto scene_prefab_res = the<library>().load_asset<prefab_asset>("scene_bmf_prefab.json");
-            auto scene_go = scene_prefab_res
-            ? the<world>().instantiate(scene_prefab_res->content())
-            : nullptr;
-            return !!scene_go;
-        }
-        bool create_systems() {
-            ecs::registry_filler(the<world>().registry())
-                .system<game_system>(world::priority_update)
-                .system<camera_system>(world::priority_pre_render);
-            return true;
-        }
-    };
-}
-
-int e2d_main(int argc, char *argv[]) {
-    const auto starter_params = starter::parameters(
-        engine::parameters("sample_07", "enduro2d")
-            .timer_params(engine::timer_parameters()
-                .maximal_framerate(100)));
-    modules::initialize<starter>(argc, argv, starter_params).start<game>();
-    modules::shutdown<starter>();
-    return 0;
-}
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index 363f4c5d..bad2a4c7 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -38,20 +38,20 @@ namespace
 
     f32 get_top_pos(const label& l, u32 strings_count) {
         const auto& f = l.font()->content();
-        f32 label_height = f.common().line * strings_count;
+        f32 label_height = f.info().line_height * strings_count;
         f32 top{0};
         switch ( l.valign() ) {
-            case label::valigns::top :
+            case label::valigns::top:
                 top = label_height;
             break;
-            case label::valigns::center :
+            case label::valigns::center:
                 top = 0.5f * label_height;
             break;
-            case label::valigns::bottom :
+            case label::valigns::bottom:
                 top = 0;
             break;
-            case label::valigns::baseline :
-                top = label_height - (f.common().line - f.common().base);
+            case label::valigns::baseline:
+                top = label_height - (f.info().line_height - f.info().glyph_ascent);
             break;
             default:
                 E2D_ASSERT_MSG(false,"label_system: uncknow vertical align flag");
@@ -94,8 +94,7 @@ namespace e2d
                     return;
                 }
                 const auto& f = l.font()->content();
-                auto common = f.common();
-                v2f texture_size = common.atlas_size.cast_to<f32>();
+                v2f texture_size = f.info().atlas_size.cast_to<f32>();
 
                 if ( l.width() != 0 ) {
                     f32 word_width{0};
@@ -108,13 +107,13 @@ namespace e2d
                             string_width = 0;
                             last_space = -1;
                         } else {
-                            auto data = f.find_char(ch);
-                            if ( data ) {
+                            const font::glyph_info* glyph = f.find_glyph(ch);
+                            if ( glyph ) {
                                 prev_char != 0
-                                    ? kerning = f.get_kerning(prev_char, data->id)
+                                    ? kerning = f.get_kerning(prev_char, ch)
                                     : kerning = 0;
                                 prev_char = ch;
-                                f32 char_width = data->advance + kerning;
+                                f32 char_width = glyph->advance + kerning;
                                 if ( ch == ' ' ) {
                                     if ( string_width + word_width < l.width() ) {
                                         if ( string_width + word_width + char_width < l.width() ) {
@@ -166,13 +165,13 @@ namespace e2d
                 prev_char = 0;
                 for ( size_t i = 0, string_ind = 0; i < text.size(); i++ ) {
                     if ( text[i] != '\n' ) {
-                        auto data = f.find_char(text[i]);
-                        if ( data ) {
+                        const font::glyph_info* glyph = f.find_glyph(text[i]);
+                        if ( glyph ) {
                             letters_size++;
                             prev_char != 0
-                                ? kerning = f.get_kerning(prev_char, data->id)
+                                ? kerning = f.get_kerning(prev_char, text[i])
                                 : kerning = 0;
-                            strings_width[string_ind] += data->advance + kerning;
+                            strings_width[string_ind] += glyph->advance + kerning;
                         }
                     } else {
                         string_ind++;
@@ -190,49 +189,49 @@ namespace e2d
                 for ( size_t i = 0, str_ind = 0; i < text.size(); i++ ) {
                     if ( text[i] == '\n' ) {
                         str_ind++;
-                        y_pos -= common.line;
+                        y_pos -= f.info().line_height;
                         x_pos = get_x_pos(l, strings_width[str_ind]);
                         prev_char = 0;
                         continue;
                     }
-                    auto data = f.find_char(text[i]);
-                    if ( data ) {
-                        offset = data->offset.cast_to<f32>();
+                    const font::glyph_info* glyph = f.find_glyph(text[i]);
+                    if ( glyph ) {
+                        offset = glyph->offset.cast_to<f32>();
                         prev_char != 0
-                            ? kerning = f.get_kerning(prev_char, data->id)
+                            ? kerning = f.get_kerning(prev_char, text[i])
                             : kerning = 0;
                         offset.x += kerning;
-                        prev_char = data->id;
+                        prev_char = text[i];
                         size_t start_vertices = letters_counter * 4;
                         vertices[start_vertices] = v3f(
                             x_pos + offset.x,
-                            y_pos - offset.y - data->rect.size.y,
+                            y_pos - offset.y - glyph->tex_rect.size.y,
                             0);
                         vertices[start_vertices + 1] = v3f(
                             x_pos + offset.x,
                             y_pos - offset.y,
                             0);
                         vertices[start_vertices + 2] = v3f(
-                            x_pos + data->rect.size.x + offset.x,
+                            x_pos + glyph->tex_rect.size.x + offset.x,
                             y_pos - offset.y,
                             0);
                         vertices[start_vertices + 3] = v3f(
-                            x_pos + data->rect.size.x + offset.x,
-                            y_pos - offset.y - data->rect.size.y,
+                            x_pos + glyph->tex_rect.size.x + offset.x,
+                            y_pos - offset.y - glyph->tex_rect.size.y,
                             0);
 
                         uvs[start_vertices] = v2f(
-                            data->rect.position.x / texture_size.x,
-                            data->rect.position.y / texture_size.y);
+                            glyph->tex_rect.position.x / texture_size.x,
+                            glyph->tex_rect.position.y / texture_size.y);
                         uvs[start_vertices + 1] = v2f(
-                            data->rect.position.x / texture_size.x,
-                            (data->rect.position.y + data->rect.size.y) / texture_size.y);
+                            glyph->tex_rect.position.x / texture_size.x,
+                            (glyph->tex_rect.position.y + glyph->tex_rect.size.y) / texture_size.y);
                         uvs[start_vertices + 2] = v2f(
-                            (data->rect.position.x + data->rect.size.x) / texture_size.x,
-                            (data->rect.position.y + data->rect.size.y) / texture_size.y);
+                            (glyph->tex_rect.position.x + glyph->tex_rect.size.x) / texture_size.x,
+                            (glyph->tex_rect.position.y + glyph->tex_rect.size.y) / texture_size.y);
                         uvs[start_vertices + 3] = v2f(
-                            (data->rect.position.x + data->rect.size.x) / texture_size.x,
-                            data->rect.position.y / texture_size.y);
+                            (glyph->tex_rect.position.x + glyph->tex_rect.size.x) / texture_size.x,
+                            glyph->tex_rect.position.y / texture_size.y);
 
                         colors[start_vertices]     = l.tint();
                         colors[start_vertices + 1] = l.tint();
@@ -247,7 +246,7 @@ namespace e2d
                         indices[start_indices + 4] = start_vertices + 3;
                         indices[start_indices + 5] = start_vertices;
 
-                        x_pos += data->advance + kerning;
+                        x_pos += glyph->advance + kerning;
                         letters_counter++;
                     }
                 }
@@ -270,8 +269,7 @@ namespace e2d
 
                 if ( r.materials().size() > 0 &&
                      r.materials().front()->content().properties().sampler_count() == 0 ) {
-                    str page_file = f.find_page(0)->file;
-                    auto texture_p = the<library>().load_asset<texture_asset>(page_file);
+                    auto texture_p = the<library>().load_asset<texture_asset>(f.info().atlas_file);
                     if ( !texture_p ) {
                         return;
                     }
diff --git a/sources/enduro2d/utils/font.cpp b/sources/enduro2d/utils/font.cpp
index b148a0f5..aae2a38a 100644
--- a/sources/enduro2d/utils/font.cpp
+++ b/sources/enduro2d/utils/font.cpp
@@ -4,228 +4,15 @@
  * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
  ******************************************************************************/
 
-#include <enduro2d/utils/font.hpp>
-#include <enduro2d/utils/strings.hpp>
+#include "font_impl/font_impl.hpp"
 
 namespace
 {
     using namespace e2d;
-    using namespace e2d::strings;
 
-    class bmfont_loading_exception : public exception {
-        const char* what() const noexcept override {
-            return "bmfont loading exception";
-        }
-    };
-
-    inline u64 make_kerning_key(u32 first, u32 second) noexcept {
+    u64 make_kerning_key(u32 first, u32 second) noexcept {
         return (static_cast<u64>(first) << 32) | static_cast<u64>(second);
     }
-
-    str_view read_tag(str_view buf, u32& pos) {
-        str_view res;
-        auto end = buf.find(' ', pos);
-        if ( end != str_view::npos ) {
-            res = buf.substr(pos, end - pos);
-            pos = end;
-        }
-
-        return res;
-    }
-
-    bool read_key(str_view buf, u32& pos, str& key) {
-        auto end = buf.find('=', pos);
-        if ( end != str_view::npos ) {
-            auto start = buf.rfind(' ', end);
-            if ( start != str_view::npos ) {
-                start++;
-                key = buf.substr(start, end - start);
-                pos = end + 1;
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    i32 read_int(str_view buf, u32& pos) {
-        i32 res{0};
-        auto end = buf.find(' ', pos);
-        if ( end == str_view::npos ) {
-            end = buf.find("\r\n", pos);
-            if ( end == str_view::npos ) {
-                end = buf.find('\n', pos);
-            }
-        }
-
-        if ( end == str_view::npos ) {
-            throw bmfont_loading_exception();
-        } else {
-            if ( !try_parse(buf.substr(pos, end - pos), res) ) {
-                throw bmfont_loading_exception();
-            }
-            pos = end;
-        }
-
-        return res;
-    }
-
-    str_view read_string(const str_view& buf, u32& pos) {
-        str_view res;
-        auto start = buf.find('"', pos);
-        if ( start == str_view::npos ) {
-            throw bmfont_loading_exception();
-        } else {
-            start++;
-            auto end = buf.find('"', start);
-            if ( end == str_view::npos ) {
-                throw bmfont_loading_exception();
-            } else {
-                res = buf.substr(start, end - start);
-                pos = end + 1;
-            }
-        }
-
-        return res;
-    }
-
-    font::data load_font_data(str_view content) {
-        u32 pos{0};
-        str_view line;
-        str_view tag;
-        str key;
-        font::data data;
-        vector<font::char_data> chars;
-        vector<font::kerning_data> kernings;
-
-        chars.reserve(120);
-        kernings.reserve(120);
-        size_t start_line{0};
-        size_t end_line = content.find('\n', start_line);
-        while ( end_line != str_view::npos ) {
-            pos = 0;
-            line = content.substr(start_line, end_line - start_line + 1);
-            if ( !line.empty() ) {
-                tag = read_tag(line, pos);
-                if ( tag == "info" ) {
-                    // info face="Arial-Black" size=32 bold=0 italic=0 charset=""
-                    //      unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=2,2
-                    while ( read_key(line, pos, key) ) {
-                        if ( key == "face" ) {
-                            data.info.face = read_string(line, pos);
-                        } else if ( key == "size" ) {
-                            data.info.size = read_int(line, pos);
-                        }
-                    }
-                } else if ( tag == "common" ) {
-                    // common lineHeight=54 base=35 scaleW=512 scaleH=512 pages=1 packed=0
-                    while ( read_key(line, pos, key) ) {
-                        if ( key == "lineHeight" ) {
-                            data.common.line = read_int(line, pos);
-                        } else if ( key == "base" ) {
-                            data.common.base = read_int(line, pos);
-                        } else if ( key == "scaleW" ) {
-                            data.common.atlas_size.x = read_int(line, pos);
-                        } else if ( key == "scaleH" ) {
-                            data.common.atlas_size.y = read_int(line, pos);
-                        } else if ( key == "pages" ) {
-                            data.common.pages = read_int(line, pos);
-                        }
-                    }
-                } else if ( tag == "page" ) {
-                    // page id=0 file="arial.png"
-                    font::page_data page_data;
-                    while ( read_key(line, pos, key) ) {
-                        if ( key == "id" ) {
-                            page_data.id = read_int(line, pos);
-                        } else if ( key == "file" ) {
-                            page_data.file = read_string(line, pos);
-                        }
-                    }
-                    data.pages.insert(std::move(page_data));
-                } else if ( tag == "chars" ) {
-                    // chars count=95
-                    while ( read_key(line, pos, key) ) {
-                        if ( key == "count" ) {
-                            chars.reserve(read_int(line, pos));
-                        }
-                    }
-                } else if ( tag == "char" ) {
-                    // char id=123 x=2 y=2 width=38 height=54
-                    //      xoffset=0 yoffset=-3 xadvance=12 page=0 chnl=0
-                    font::char_data c;
-                    while ( read_key(line, pos, key) ) {
-                        if ( key == "id" ) {
-                            c.id = read_int(line, pos);
-                        } else if ( key == "x" ) {
-                            c.rect.position.x = read_int(line, pos);
-                        } else if ( key == "y" ) {
-                            c.rect.position.y = read_int(line, pos);
-                        } else if ( key == "width" ) {
-                            c.rect.size.x = read_int(line, pos);
-                        } else if ( key == "height" ) {
-                            c.rect.size.y = read_int(line, pos);
-                            c.rect.position.y =
-                                data.common.atlas_size.y -
-                                c.rect.position.y -
-                                c.rect.size.y;
-                        } else if ( key == "xoffset" ) {
-                            c.offset.x = read_int(line, pos);
-                        } else if ( key == "yoffset" ) {
-                            c.offset.y = read_int(line, pos);
-                        } else if ( key == "xadvance" ) {
-                            c.advance = read_int(line, pos);
-                        } else if ( key == "page" ) {
-                            c.page = read_int(line, pos);
-                        } else if ( key == "chnl" ) {
-                            c.chnl = read_int(line, pos);
-                        }
-                    }
-                    chars.push_back(std::move(c));
-                } else if ( tag == "kernings" ) {
-                    while ( read_key(line, pos, key) ) {
-                        if ( key == "count" ) {
-                            kernings.reserve(read_int(line, pos));
-                        }
-                    }
-                } else if ( tag == "kerning" ) {
-                    font::kerning_data k;
-                    while ( read_key(line, pos, key) ) {
-                        if ( key == "first" ) {
-                            k.chars.first = read_int(line, pos);
-                        } else if ( key == "second" ) {
-                            k.chars.second = read_int(line, pos);
-                        } else if ( key == "amount" ) {
-                            k.amount = read_int(line, pos);
-                        }
-                    }
-                    kernings.push_back(std::move(k));
-                }
-            }
-            start_line = content.find_first_not_of(' ', end_line + 1);
-            end_line = content.find('\n', start_line);
-        }
-
-        if (chars.empty()) {
-            throw bmfont_loading_exception();
-        }
-
-        data.chars.reserve(chars.size());
-        for ( size_t i = 0; i < chars.size(); i++ ) {
-            data.chars.insert(std::make_pair(chars[i].id, chars[i]));
-        }
-
-        data.kernings.reserve(kernings.size());
-        for ( size_t i = 0; i < kernings.size(); i++ ) {
-            auto& k = kernings[i];
-            data.kernings.insert(
-                std::make_pair(
-                    make_kerning_key(k.chars.first, k.chars.second),
-                    k.amount));
-        }
-
-        return data;
-    }
 }
 
 namespace e2d
@@ -246,12 +33,12 @@ namespace e2d
         return assign(other);
     }
 
-    font::font(data&& data) noexcept {
-        assign(std::move(data));
+    font::font(content&& content) noexcept {
+        assign(std::move(content));
     }
 
-    font::font(const data& data) {
-        assign(data);
+    font::font(const content& content) {
+        assign(content);
     }
 
     font& font::assign(font&& other) noexcept {
@@ -264,79 +51,62 @@ namespace e2d
 
     font& font::assign(const font& other) {
         if ( this != &other ) {
-            data_ = other.data_;
+            content_ = other.content_;
         }
         return *this;
     }
 
-    font& font::assign(data&& data) noexcept {
-        data_ = std::move(data);
+    font& font::assign(content&& content) noexcept {
+        content_ = std::move(content);
         return *this;
     }
 
-    font& font::assign(const data& data) {
-        data_ = data;
+    font& font::assign(const content& content) {
+        content_ = content;
         return *this;
     }
 
     void font::swap(font& other) noexcept {
         using std::swap;
-        swap(data_.info, other.data_.info);
-        swap(data_.common, other.data_.common);
-        swap(data_.pages, other.data_.pages);
-        swap(data_.chars, other.data_.chars);
-        swap(data_.kernings, other.data_.kernings);
+        swap(content_.info, other.content_.info);
+        swap(content_.kernings, other.content_.kernings);
+        swap(content_.glyphs, other.content_.glyphs);
     }
 
     void font::clear() noexcept {
-        data_ = data();
+        content_ = content();
     }
 
     bool font::empty() const noexcept {
-        return data_.pages.empty();
+        return !content_.info.font_size;
     }
 
-    const font::info_data& font::info() const noexcept {
-        return data_.info;
-    }
-
-    const font::common_data& font::common() const noexcept {
-        return data_.common;
-    }
-
-    const flat_set<font::page_data>& font::pages() const noexcept {
-        return data_.pages;
-    }
-
-    const flat_map<u32, font::char_data>& font::chars() const noexcept {
-        return data_.chars;
+    const font::font_info& font::info() const noexcept {
+        return content_.info;
     }
 
     const flat_map<u64, i32>& font::kernings() const noexcept {
-        return data_.kernings;
+        return content_.kernings;
     }
 
-    const font::page_data* font::find_page(u32 id) const noexcept {
-        const auto iter = data_.pages.find(id);
-        return iter != data_.pages.end()
-            ? &*iter
-            : nullptr;
-    }
-
-    const font::char_data* font::find_char(u32 id) const noexcept {
-        const auto iter = data_.chars.find(id);
-        return iter != data_.chars.end()
-            ? &iter->second
-            : nullptr;
+    const flat_map<u32, font::glyph_info>& font::glyphs() const noexcept {
+        return content_.glyphs;
     }
 
     i32 font::get_kerning(u32 first, u32 second) const noexcept {
-        u64 key = make_kerning_key(first, second);
-        const auto iter = data_.kernings.find(key);
-        return iter != data_.kernings.end()
+        const u64 key = make_kerning_key(first, second);
+        const auto iter = content_.kernings.find(key);
+        return iter != content_.kernings.end()
             ? iter->second
             : 0;
     }
+
+    const font::glyph_info* font::find_glyph(u32 code_point) const noexcept {
+        const auto iter = content_.glyphs.find(code_point);
+        return iter != content_.glyphs.end()
+            ? &iter->second
+            : nullptr;
+    }
 }
 
 namespace e2d
@@ -347,98 +117,52 @@ namespace e2d
 
     bool operator==(const font& l, const font& r) noexcept {
         return l.info() == r.info()
-            && l.common() == r.common()
-            && l.pages() == r.pages()
-            && l.chars() == r.chars()
-            && l.kernings() == r.kernings();
+            && l.kernings() == r.kernings()
+            && l.glyphs() == r.glyphs();
     }
 
     bool operator!=(const font& l, const font& r) noexcept {
         return !(l == r);
     }
 
-    bool operator<(u32 l, const font::page_data& r) noexcept {
-        return l < r.id;
+    bool operator==(const font::font_info& l, const font::font_info& r) noexcept {
+        return l.atlas_file == r.atlas_file
+            && l.atlas_size == r.atlas_size
+            && l.font_size == r.font_size
+            && l.line_height == r.line_height
+            && l.glyph_ascent == r.glyph_ascent;
     }
 
-    bool operator<(const font::page_data& l, u32 r) noexcept {
-        return l.id < r;
+    bool operator==(const font::glyph_info& l, const font::glyph_info& r) noexcept {
+        return l.offset == r.offset
+            && l.tex_rect == r.tex_rect
+            && l.advance == r.advance;
     }
 
-    bool operator<(const font::page_data& l, const font::page_data& r) noexcept {
-        return l.id < r.id;
-    }
-
-    bool operator<(u32 l, const font::char_data& r) noexcept {
-        return l < r.id;
-    }
-
-    bool operator<(const font::char_data& l, u32 r) noexcept {
-        return l.id < r;
-    }
-
-    bool operator<(const font::char_data& l, const font::char_data& r) noexcept {
-        return l.id < r.id;
-    }
-
-    bool operator<(const std::pair<u32,u32>& l, const font::kerning_data& r) noexcept {
-        return l < r.chars;
-    }
-
-    bool operator<(const font::kerning_data& l, const std::pair<u32,u32>& r) noexcept {
-        return l.chars < r;
-    }
-
-    bool operator<(const font::kerning_data& l, const font::kerning_data& r) noexcept {
-        return l.chars < r.chars;
-    }
-
-    bool operator==(const font::info_data& l, const font::info_data& r) noexcept {
-        return l.face == r.face
-            && l.size == r.size;
-    }
-
-    bool operator==(const font::common_data& l, const font::common_data& r) noexcept {
-        return l.line == r.line
-            && l.base == r.base
-            && l.pages == r.pages
-            && l.atlas_size == r.atlas_size;
-    }
-
-    bool operator==(const font::page_data& l, const font::page_data& r) noexcept {
-        return l.id == r.id
-            && l.file == r.file;
-    }
-
-    bool operator==(const font::char_data& l, const font::char_data& r) noexcept {
-        return l.id == r.id
-            && l.rect == r.rect
-            && l.offset == r.offset
-            && l.advance == r.advance
-            && l.page == r.page
-            && l.chnl == r.chnl;
-    }
-
-    bool operator==(const font::kerning_data& l, const font::kerning_data& r) noexcept {
-        return l.chars == r.chars
-            && l.amount == r.amount;
+    bool operator==(const font::content& l, const font::content& r) noexcept {
+        return l.info == r.info
+            && l.kernings == r.kernings
+            && l.glyphs == r.glyphs;
     }
 }
 
 namespace e2d::fonts
 {
-    bool try_load_font(font& dst, const buffer& src) noexcept {
+    bool try_load_font(
+        font& dst,
+        buffer_view src) noexcept
+    {
         try {
-            dst = load_font_data(str_view{
-                reinterpret_cast<const char*>(src.data()),
-                src.size()});
-            return true;
+            return impl::load_font_bmfont(dst, src);
         } catch (...) {
             return false;
         }
     }
 
-    bool try_load_font(font& dst, const input_stream_uptr& src) noexcept {
+    bool try_load_font(
+        font& dst,
+        const input_stream_uptr& src) noexcept
+    {
         buffer file_data;
         return streams::try_read_tail(file_data, src)
             && try_load_font(dst, file_data);
diff --git a/sources/enduro2d/utils/font_impl/font_impl.hpp b/sources/enduro2d/utils/font_impl/font_impl.hpp
new file mode 100644
index 00000000..12a8e5bd
--- /dev/null
+++ b/sources/enduro2d/utils/font_impl/font_impl.hpp
@@ -0,0 +1,17 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include <enduro2d/utils/font.hpp>
+#include <enduro2d/utils/buffer.hpp>
+#include <enduro2d/utils/strings.hpp>
+#include <enduro2d/utils/buffer_view.hpp>
+
+namespace e2d::fonts::impl
+{
+    bool load_font_bmfont(font& dst, buffer_view src);
+}
diff --git a/sources/enduro2d/utils/font_impl/font_reader_bmfont.cpp b/sources/enduro2d/utils/font_impl/font_reader_bmfont.cpp
new file mode 100644
index 00000000..f88bc8ed
--- /dev/null
+++ b/sources/enduro2d/utils/font_impl/font_reader_bmfont.cpp
@@ -0,0 +1,359 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include "font_impl.hpp"
+
+namespace
+{
+    using namespace e2d;
+
+    bool read_line(str_view content, std::size_t& pos, str_view& line) {
+        if ( pos > content.size() ) {
+            return false;
+        }
+
+        auto end_of_line = content.find('\n', pos);
+        if ( end_of_line == str_view::npos ) {
+            end_of_line = content.size();
+        }
+
+        line = content.substr(pos, end_of_line - pos);
+        if ( !line.empty() && line.back() == '\r' ) {
+            line.remove_suffix(1u);
+        }
+
+        pos = end_of_line + 1u;
+        return true;
+    }
+
+    bool read_tag(str_view line, std::size_t& pos, str_view& tag) {
+        const auto start = line.find_first_not_of(' ', pos);
+        if ( start == str_view::npos ) {
+            return false;
+        }
+        const auto end = line.find(' ', start);
+        if ( end == str_view::npos || end == line.size() ) {
+            return false;
+        }
+        tag = line.substr(start, end - start);
+        pos = end + 1;
+        return true;
+    }
+
+    bool read_key(str_view line, std::size_t& pos, str_view& key) {
+        const auto eq = line.find('=', pos);
+        if ( eq == str_view::npos || eq == 0u || eq == line.size() ) {
+            return false;
+        }
+        const auto last = line.find_last_not_of(' ', eq - 1u);
+        if ( last == str_view::npos ) {
+            return false;
+        }
+        const auto prestart = line.rfind(' ', last);
+        const auto start = prestart == str_view::npos
+            ? 0u
+            : prestart + 1u;
+        key = line.substr(start, last - prestart);
+        pos = eq + 1;
+        return true;
+    }
+
+    template < typename T >
+    bool read_value(str_view line, std::size_t& pos, T& value) {
+        const auto start = line.find_first_not_of(' ', pos);
+        if ( start == str_view::npos ) {
+            return false;
+        }
+        auto end = line.find(' ', start);
+        if ( end == str_view::npos ) {
+            end = line.size();
+        }
+        if ( !strings::try_parse(line.substr(start, end - start), value) ) {
+            return false;
+        }
+        pos = end + 1;
+        return true;
+    }
+
+    bool read_value(str_view line, std::size_t& pos, str& value) {
+        const auto start = line.find("\"", pos);
+        if ( start == str_view::npos || start == line.size() ) {
+            return false;
+        }
+        const auto end = line.find("\"", start + 1u);
+        if ( end == str_view::npos ) {
+            return false;
+        }
+        value = line.substr(start + 1, end - start - 1u);
+        pos = end + 1;
+        return true;
+    }
+
+    // info face="Arial-Black" size=32 bold=0 italic=0 charset=""
+    //      unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=2,2
+    bool parse_info_line(str_view line, font::content& font_content) {
+        str_view key;
+        std::size_t pos = 0u;
+        while ( read_key(line, pos, key) ) {
+            if ( key == "size" ) {
+                if ( !read_value(line, pos, font_content.info.font_size) ) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    // common lineHeight=54 base=35 scaleW=512 scaleH=512 pages=1 packed=0
+    bool parse_common_line(str_view line, font::content& font_content) {
+        str_view key;
+        std::size_t pos = 0u;
+        while ( read_key(line, pos, key) ) {
+            if ( key == "lineHeight" ) {
+                if ( !read_value(line, pos, font_content.info.line_height) ) {
+                    return false;
+                }
+            } else if ( key == "base" ) {
+                if ( !read_value(line, pos, font_content.info.glyph_ascent) ) {
+                    return false;
+                }
+            } else if ( key == "scaleW" ) {
+                if ( !read_value(line, pos, font_content.info.atlas_size.x) ) {
+                    return false;
+                }
+            } else if ( key == "scaleH" ) {
+                if ( !read_value(line, pos, font_content.info.atlas_size.y) ) {
+                    return false;
+                }
+            } else if ( key == "pages" ) {
+                u32 pages = 0u;
+                if ( !read_value(line, pos, pages) || pages > 1u ) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    // page id=0 file="arial.png"
+    bool parse_page_line(str_view line, font::content& font_content) {
+        str_view key;
+        std::size_t pos = 0u;
+        while ( read_key(line, pos, key) ) {
+            if ( key == "id" ) {
+                u32 id = 0u;
+                if ( !read_value(line, pos, id) || id > 0 ) {
+                    return false;
+                }
+            } else if ( key == "file" ) {
+                if ( !read_value(line, pos, font_content.info.atlas_file) ) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    // chars count=95
+    bool parse_chars_line(str_view line, font::content& font_content) {
+        str_view key;
+        std::size_t pos = 0u;
+        while ( read_key(line, pos, key) ) {
+            if ( key == "count" ) {
+                std::size_t count = 0u;
+                if ( !read_value(line, pos, count) ) {
+                    return false;
+                }
+                font_content.glyphs.reserve(count);
+            }
+        }
+        return true;
+    }
+
+    // char id=123 x=2 y=2 width=38 height=54
+    //      xoffset=0 yoffset=-3 xadvance=12 page=0 chnl=0
+    bool parse_char_line(str_view line, font::content& font_content) {
+        u32 code_point = 0;
+        font::glyph_info glyph;
+
+        str_view key;
+        std::size_t pos = 0u;
+        while ( read_key(line, pos, key) ) {
+            if ( key == "id" ) {
+                if ( !read_value(line, pos, code_point) ) {
+                    return false;
+                }
+            } else if ( key == "x" ) {
+                if ( !read_value(line, pos, glyph.tex_rect.position.x) ) {
+                    return false;
+                }
+            } else if ( key == "y" ) {
+                if ( !read_value(line, pos, glyph.tex_rect.position.y) ) {
+                    return false;
+                }
+            } else if ( key == "width" ) {
+                if ( !read_value(line, pos, glyph.tex_rect.size.x) ) {
+                    return false;
+                }
+            } else if ( key == "height" ) {
+                if ( !read_value(line, pos, glyph.tex_rect.size.y) ) {
+                    return false;
+                }
+            } else if ( key == "xoffset" ) {
+                if ( !read_value(line, pos, glyph.offset.x) ) {
+                    return false;
+                }
+            } else if ( key == "yoffset" ) {
+                if ( !read_value(line, pos, glyph.offset.y) ) {
+                    return false;
+                }
+            } else if ( key == "xadvance" ) {
+                if ( !read_value(line, pos, glyph.advance) ) {
+                    return false;
+                }
+            } else if ( key == "page" ) {
+                u32 page = 0;
+                if ( !read_value(line, pos, page) || page > 0 ) {
+                    return false;
+                }
+            }
+        }
+
+        font_content.glyphs.insert_or_assign(
+            code_point,
+            std::move(glyph));
+
+        return true;
+    }
+
+    // kernings count=343
+    bool parse_kernings_line(str_view line, font::content& font_content) {
+        str_view key;
+        std::size_t pos = 0u;
+        while ( read_key(line, pos, key) ) {
+            if ( key == "count" ) {
+                std::size_t count = 0u;
+                if ( !read_value(line, pos, count) ) {
+                    return false;
+                }
+                font_content.kernings.reserve(count);
+            }
+        }
+        return true;
+    }
+
+    // kerning first=1043 second=1071 amount=-1
+    bool parse_kerning_line(str_view line, font::content& font_content) {
+        u32 first = 0;
+        u32 second = 0;
+        i32 amount = 0;
+
+        str_view key;
+        std::size_t pos = 0u;
+        while ( read_key(line, pos, key) ) {
+            if ( key == "first" ) {
+                if ( !read_value(line, pos, first) ) {
+                    return false;
+                }
+            } else if ( key == "second" ) {
+                if ( !read_value(line, pos, second) ) {
+                    return false;
+                }
+            } else if ( key == "amount" ) {
+                if ( !read_value(line, pos, amount) ) {
+                    return false;
+                }
+            }
+        }
+
+        font_content.kernings.insert_or_assign(
+            (static_cast<u64>(first) << 32) | static_cast<u64>(second),
+            amount);
+
+        return true;
+    }
+}
+
+namespace e2d::fonts::impl
+{
+    bool load_font_bmfont(font& dst, buffer_view src) {
+        const auto text_src = str_view{
+            reinterpret_cast<const char*>(src.data()),
+            src.size()};
+
+        font::content font_content;
+
+        str_view line;
+        std::size_t pos = 0u;
+        while ( read_line(text_src, pos, line) ) {
+            str_view tag;
+            std::size_t tag_pos = 0u;
+            if ( !read_tag(line, tag_pos, tag) ) {
+                continue;
+            }
+
+            line.remove_prefix(tag_pos);
+
+            if ( tag == "info" ) {
+                if ( !parse_info_line(line, font_content) ) {
+                    return false;
+                }
+            } else if ( tag == "common" ) {
+                if ( !parse_common_line(line, font_content) ) {
+                    return false;
+                }
+            } else if ( tag == "page" ) {
+                if ( !parse_page_line(line, font_content) ) {
+                    return false;
+                }
+            } else if ( tag == "chars" ) {
+                if ( !parse_chars_line(line, font_content) ) {
+                    return false;
+                }
+            } else if ( tag == "char" ) {
+                if ( !parse_char_line(line, font_content) ) {
+                    return false;
+                }
+            } else if ( tag == "kernings" ) {
+                if ( !parse_kernings_line(line, font_content) ) {
+                    return false;
+                }
+            } else if ( tag == "kerning" ) {
+                if ( !parse_kerning_line(line, font_content) ) {
+                    return false;
+                }
+            }
+        }
+
+        for ( auto& glyph : font_content.glyphs ) {
+            glyph.second.tex_rect.position.y =
+                font_content.info.atlas_size.y -
+                glyph.second.tex_rect.position.y -
+                glyph.second.tex_rect.size.y;
+        }
+
+        bool info_valid = !font_content.info.atlas_file.empty()
+            && font_content.info.atlas_size.x > 0u
+            && font_content.info.atlas_size.y > 0u
+            && font_content.info.font_size > 0u
+            && font_content.info.line_height > 0u
+            && font_content.info.font_size > 0u
+            && font_content.info.glyph_ascent > 0u;
+
+        bool glyphs_valid = true;
+        for ( const auto& glyph : font_content.glyphs ) {
+            const v2u& mst = glyph.second.tex_rect.position + glyph.second.tex_rect.size;
+            glyphs_valid = glyphs_valid && math::inside(b2u(font_content.info.atlas_size), mst);
+        }
+
+        if ( !info_valid || !glyphs_valid ) {
+            return false;
+        }
+
+        dst = font(font_content);
+        return true;
+    }
+}
diff --git a/untests/sources/untests_utils/font.cpp b/untests/sources/untests_utils/font.cpp
index d8f23981..65baf767 100644
--- a/untests/sources/untests_utils/font.cpp
+++ b/untests/sources/untests_utils/font.cpp
@@ -10,13 +10,15 @@ using namespace e2d;
 namespace
 {
     const char* const mini_fnt = R"fnt(
-        info face="Arial" size=50 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=0,0
-        common lineHeight=58 base=49 scaleW=512 scaleH=512 pages=1 packed=0
+        info face ="Arial" size=  50 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=0,0
+        common  lineHeight  =58   base=  49  scaleW  = 512 scaleH=512 pages=1 packed=0
         page id=0 file="arial.png"
+
         chars count=3
         char id=32 x=342 y=38 width=0 height=0 xoffset=0 yoffset=46 xadvance=14 page=0 chnl=0
         char id=33 x=448 y=386 width=10 height=40 xoffset=5 yoffset=10 xadvance=14 page=0 chnl=0
         char id=34 x=394 y=306 width=18 height=18 xoffset=3 yoffset=8 xadvance=18 page=0 chnl=0
+
         kernings count=2
         kerning first=1059 second=1081 amount=-1
         kerning first=1043 second=1071 amount=-1
@@ -39,32 +41,22 @@ TEST_CASE("font") {
         REQUIRE(fonts::try_load_font(f2, make_memory_stream(buffer(mini_fnt, std::strlen(mini_fnt)))));
         REQUIRE(f == f2);
 
-        REQUIRE(f.info().face == "Arial");
-        REQUIRE(f.info().size == 50);
+        REQUIRE(f.info().atlas_file == "arial.png");
+        REQUIRE(f.info().atlas_size == v2u(512,512));
+        REQUIRE(f.info().font_size == 50);
+        REQUIRE(f.info().line_height == 58);
+        REQUIRE(f.info().glyph_ascent == 49);
 
-        REQUIRE(f.common().line == 58);
-        REQUIRE(f.common().base == 49);
-        REQUIRE(f.common().pages == 1);
-        REQUIRE(f.common().atlas_size == v2u(512,512));
-
-        REQUIRE(f.pages().size() == 1);
-        REQUIRE(f.find_page(0));
-        REQUIRE(f.find_page(0)->id == 0);
-        REQUIRE(f.find_page(0)->file == "arial.png");
-
-        REQUIRE(f.chars().size() == 3);
-        REQUIRE_FALSE(f.find_char(100500));
-        REQUIRE(f.find_char(33));
+        REQUIRE(f.glyphs().size() == 3);
+        REQUIRE_FALSE(f.find_glyph(100500));
+        REQUIRE(f.find_glyph(33));
         {
             // char id=33 x=448 y=386 width=10 height=40 xoffset=5 yoffset=10 xadvance=14 page=0 chnl=0
-            font::char_data c;
-            c.id = 33;
-            c.rect = b2hi(448, 86, 10, 40);
-            c.offset = v2hi(5, 10);
+            font::glyph_info c;
+            c.offset = v2i(5, 10);
+            c.tex_rect = b2u(448, 86, 10, 40);
             c.advance = 14;
-            c.page = 0;
-            c.chnl = 0;
-            REQUIRE(*f.find_char(33) == c);
+            REQUIRE(*f.find_glyph(33) == c);
         }
 
         REQUIRE(f.kernings().size() == 2);

From 9785c91aeba5c03fe27d9cb78ba41af08201bc5c Mon Sep 17 00:00:00 2001
From: KonH <konh@yandex.ru>
Date: Sat, 17 Aug 2019 09:15:57 +0700
Subject: [PATCH 070/108] fix typo in make_look_... function names

---
 headers/enduro2d/math/mat4.hpp          | 8 ++++----
 samples/sources/sample_01/sample_01.cpp | 2 +-
 samples/sources/sample_02/sample_02.cpp | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/headers/enduro2d/math/mat4.hpp b/headers/enduro2d/math/mat4.hpp
index f26b5094..bf120285 100644
--- a/headers/enduro2d/math/mat4.hpp
+++ b/headers/enduro2d/math/mat4.hpp
@@ -512,12 +512,12 @@ namespace e2d::math
     }
 
     //
-    // make_loot_at_lh_matrix4
+    // make_look_at_lh_matrix4
     //
 
     template < typename T >
     std::enable_if_t<std::is_floating_point_v<T>, mat4<T>>
-    make_loot_at_lh_matrix4(const vec3<T>& eye, const vec3<T>& at, const vec3<T>& up) noexcept {
+    make_look_at_lh_matrix4(const vec3<T>& eye, const vec3<T>& at, const vec3<T>& up) noexcept {
         const vec3<T> az = normalized(at - eye);
         const vec3<T> ax = normalized(math::cross(up, az));
         const vec3<T> ay = math::cross(az, ax);
@@ -532,12 +532,12 @@ namespace e2d::math
     }
 
     //
-    // make_loot_at_rh_matrix4
+    // make_look_at_rh_matrix4
     //
 
     template < typename T >
     std::enable_if_t<std::is_floating_point_v<T>, mat4<T>>
-    make_loot_at_rh_matrix4(const vec3<T>& eye, const vec3<T>& at, const vec3<T>& up) noexcept {
+    make_look_at_rh_matrix4(const vec3<T>& eye, const vec3<T>& at, const vec3<T>& up) noexcept {
         const vec3<T> az = normalized(eye - at);
         const vec3<T> ax = normalized(math::cross(up, az));
         const vec3<T> ay = math::cross(az, ax);
diff --git a/samples/sources/sample_01/sample_01.cpp b/samples/sources/sample_01/sample_01.cpp
index fd477224..af3eb4d1 100644
--- a/samples/sources/sample_01/sample_01.cpp
+++ b/samples/sources/sample_01/sample_01.cpp
@@ -244,7 +244,7 @@ namespace
                 math::make_rotation_matrix4(make_rad(the<engine>().time()), 0.f, 1.f, 0.f) *
                 math::make_rotation_matrix4(make_rad(the<engine>().time()), 0.f, 0.f, 1.f) *
                 math::make_translation_matrix4(0.f, 0.f, 0.f) *
-                math::make_loot_at_lh_matrix4({0.f, 0.f, -3.f}, v3f::zero(), v3f::unit_y()) *
+                math::make_look_at_lh_matrix4({0.f, 0.f, -3.f}, v3f::zero(), v3f::unit_y()) *
                 projection;
 
             material_.properties()
diff --git a/samples/sources/sample_02/sample_02.cpp b/samples/sources/sample_02/sample_02.cpp
index 0d9f11cc..8eb82917 100644
--- a/samples/sources/sample_02/sample_02.cpp
+++ b/samples/sources/sample_02/sample_02.cpp
@@ -214,7 +214,7 @@ namespace
                 math::make_rotation_matrix4(make_rad(the<engine>().time()), 0.f, 1.f, 0.f) *
                 math::make_rotation_matrix4(make_rad(the<engine>().time()), 0.f, 0.f, 1.f) *
                 math::make_translation_matrix4(0.f, 0.f, 0.f) *
-                math::make_loot_at_lh_matrix4({0.f, 0.f, -2.f}, v3f::zero(), v3f::unit_y()) *
+                math::make_look_at_lh_matrix4({0.f, 0.f, -2.f}, v3f::zero(), v3f::unit_y()) *
                 projection;
 
             material_.properties()

From 2eecc0ae6e9853dc54d6f37a2a9fa2a823a03829 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Sat, 17 Aug 2019 10:59:34 +0700
Subject: [PATCH 071/108] make_vecX from color and color32

---
 headers/enduro2d/utils/color.hpp          | 3 +++
 headers/enduro2d/utils/color32.hpp        | 3 +++
 sources/enduro2d/utils/color.cpp          | 8 ++++++++
 sources/enduro2d/utils/color32.cpp        | 8 ++++++++
 untests/sources/untests_utils/color.cpp   | 4 ++++
 untests/sources/untests_utils/color32.cpp | 4 ++++
 6 files changed, 30 insertions(+)

diff --git a/headers/enduro2d/utils/color.hpp b/headers/enduro2d/utils/color.hpp
index 228d9999..05db038d 100644
--- a/headers/enduro2d/utils/color.hpp
+++ b/headers/enduro2d/utils/color.hpp
@@ -55,6 +55,9 @@ namespace e2d
 
 namespace e2d
 {
+    vec3<f32> make_vec3(const color& c) noexcept;
+    vec4<f32> make_vec4(const color& c) noexcept;
+
     bool operator<(const color& l, const color& r) noexcept;
     bool operator==(const color& l, const color& r) noexcept;
     bool operator!=(const color& l, const color& r) noexcept;
diff --git a/headers/enduro2d/utils/color32.hpp b/headers/enduro2d/utils/color32.hpp
index 72684e88..8055683f 100644
--- a/headers/enduro2d/utils/color32.hpp
+++ b/headers/enduro2d/utils/color32.hpp
@@ -55,6 +55,9 @@ namespace e2d
 
 namespace e2d
 {
+    vec3<u8> make_vec3(const color32& c) noexcept;
+    vec4<u8> make_vec4(const color32& c) noexcept;
+
     bool operator<(const color32& l, const color32& r) noexcept;
     bool operator==(const color32& l, const color32& r) noexcept;
     bool operator!=(const color32& l, const color32& r) noexcept;
diff --git a/sources/enduro2d/utils/color.cpp b/sources/enduro2d/utils/color.cpp
index 50e2da44..b42d9bf6 100644
--- a/sources/enduro2d/utils/color.cpp
+++ b/sources/enduro2d/utils/color.cpp
@@ -139,6 +139,14 @@ namespace e2d
 
 namespace e2d
 {
+    vec3<f32> make_vec3(const color& c) noexcept {
+        return make_vec3(c.r, c.g, c.b);
+    }
+
+    vec4<f32> make_vec4(const color& c) noexcept {
+        return make_vec4(c.r, c.g, c.b, c.a);
+    }
+
     //
     // color (<,==,!=) color
     //
diff --git a/sources/enduro2d/utils/color32.cpp b/sources/enduro2d/utils/color32.cpp
index 0d7cab2b..02f7f793 100644
--- a/sources/enduro2d/utils/color32.cpp
+++ b/sources/enduro2d/utils/color32.cpp
@@ -139,6 +139,14 @@ namespace e2d
 
 namespace e2d
 {
+    vec3<u8> make_vec3(const color32& c) noexcept {
+        return make_vec3(c.r, c.g, c.b);
+    }
+
+    vec4<u8> make_vec4(const color32& c) noexcept {
+        return make_vec4(c.r, c.g, c.b, c.a);
+    }
+
     //
     // color32 (<,==,!=) color32
     //
diff --git a/untests/sources/untests_utils/color.cpp b/untests/sources/untests_utils/color.cpp
index 5fe0ea0b..0e087cfb 100644
--- a/untests/sources/untests_utils/color.cpp
+++ b/untests/sources/untests_utils/color.cpp
@@ -48,6 +48,10 @@ TEST_CASE("color") {
         c /= color(0.1f,0.2f,0.3f,0.4f);
         REQUIRE(c == color(0.5f,0.6f,0.7f,0.8f));
     }
+    {
+        REQUIRE(make_vec3(color(0.1f,0.2f,0.3f,0.4f)) == v3f(0.1f,0.2f,0.3f));
+        REQUIRE(make_vec4(color(0.1f,0.2f,0.3f,0.4f)) == v4f(0.1f,0.2f,0.3f, 0.4f));
+    }
     {
         REQUIRE(color(0.1f,0.2f,0.3f,0.4f) + 0.1f == color(0.2f,0.3f,0.4f,0.5f));
         REQUIRE(color(0.1f,0.2f,0.3f,0.4f) - 0.1f == color(0.0f,0.1f,0.2f,0.3f));
diff --git a/untests/sources/untests_utils/color32.cpp b/untests/sources/untests_utils/color32.cpp
index 81c61f07..e0fd312d 100644
--- a/untests/sources/untests_utils/color32.cpp
+++ b/untests/sources/untests_utils/color32.cpp
@@ -50,6 +50,10 @@ TEST_CASE("color32") {
         c /= color32(2,3,6,7);
         REQUIRE(c == color32(40,50,40,20));
     }
+    {
+        REQUIRE(make_vec3(color32(10,20,30,40)) == vec3<u8>(10,20,30));
+        REQUIRE(make_vec4(color32(10,20,30,40)) == vec4<u8>(10,20,30,40));
+    }
     {
         REQUIRE(color32(10,20,30,40) + 10 == color32(20,30,40,50));
         REQUIRE(color32(10,20,30,40) - 10 == color32(0,10,20,30));

From 72da71be3712cc72384b5f87fe4380e33a7946b4 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Tue, 20 Aug 2019 07:12:18 +0700
Subject: [PATCH 072/108] label: remove shadow, rename some properties

---
 headers/enduro2d/high/assets/font_asset.hpp   |   2 +-
 headers/enduro2d/high/components/label.hpp    | 102 +++---------------
 sources/enduro2d/high/components/label.cpp    |  74 ++-----------
 .../enduro2d/high/systems/label_system.cpp    |  22 ++--
 4 files changed, 27 insertions(+), 173 deletions(-)

diff --git a/headers/enduro2d/high/assets/font_asset.hpp b/headers/enduro2d/high/assets/font_asset.hpp
index b263fe6b..33567fac 100644
--- a/headers/enduro2d/high/assets/font_asset.hpp
+++ b/headers/enduro2d/high/assets/font_asset.hpp
@@ -14,7 +14,7 @@ namespace e2d
 {
     class font_asset final : public content_asset<font_asset, font> {
     public:
-        static const char* type_name() noexcept { return "bmfont_asset"; }
+        static const char* type_name() noexcept { return "font_asset"; }
         static load_async_result load_async(const library& library, str_view address);
     };
 }
diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
index b589ed66..29327218 100644
--- a/headers/enduro2d/high/components/label.hpp
+++ b/headers/enduro2d/high/components/label.hpp
@@ -52,48 +52,24 @@ namespace e2d
         label& valigh(valigns value) noexcept;
         [[nodiscard]] valigns valign() const noexcept;
 
-        label& char_width(f32 value) noexcept;
-        f32 char_width() const noexcept;
-
-        label& char_edge(f32 value) noexcept;
-        f32 char_edge() const noexcept;
+        label& glyph_dilate(f32 value) noexcept;
+        [[nodiscard]] f32 glyph_dilate() const noexcept;
 
         label& outline_width(f32 value) noexcept;
-        f32 outline_width() const noexcept;
-
-        label& outline_edge(f32 value) noexcept;
-        f32 outline_edge() const noexcept;
+        [[nodiscard]] f32 outline_width() const noexcept;
 
         label& outline_color(const color32& value) noexcept;
-        color32 outline_color() const noexcept;
-
-        label& shadow_width(f32 value) noexcept;
-        f32 shadow_width() const noexcept;
-
-        label& shadow_edge(f32 value) noexcept;
-        f32 shadow_edge() const noexcept;
-
-        label& shadow_offset(const v2f& value) noexcept;
-        v2f shadow_offset() const noexcept;
-
-        label& shadow_color(const color32& value) noexcept;
-        color32 shadow_color() const noexcept;
+        [[nodiscard]] const color32& outline_color() const noexcept;
     private:
         str32 text_;
         font_asset::ptr font_;
         color32 tint_ = color32::white();
         f32 width_ = 0.f;
-        haligns halign_ = haligns::left;
+        haligns halign_ = haligns::center;
         valigns valign_ = valigns::baseline;
-        f32 char_width_ = 0.f;
-        f32 char_edge_ = 0.f;
-        f32 outline_width_ = 0.5f;
-        f32 outline_edge_ = 0.1f;
+        f32 glyph_dilate_ = 0.f;
+        f32 outline_width_ = 0.f;
         color32 outline_color_ = color32::white();
-        f32 shadow_width_ = 0.f;
-        f32 shadow_edge_ = 0.f;
-        v2f shadow_offset_ = v2f::zero();
-        color32 shadow_color_ = color32::white();
     };
 
     template <>
@@ -184,22 +160,13 @@ namespace e2d
         return valign_;
     }
 
-    inline label& label::char_width(f32 value) noexcept {
-        char_width_ = value;
+    inline label& label::glyph_dilate(f32 value) noexcept {
+        glyph_dilate_ = value;
         return *this;
     }
 
-    inline f32 label::char_width() const noexcept {
-        return char_width_;
-    }
-
-    inline label& label::char_edge(f32 value) noexcept {
-        char_edge_ = value;
-        return *this;
-    }
-
-    inline f32 label::char_edge() const noexcept {
-        return char_edge_;
+    inline f32 label::glyph_dilate() const noexcept {
+        return glyph_dilate_;
     }
 
     inline label& label::outline_width(f32 value) noexcept {
@@ -211,57 +178,12 @@ namespace e2d
         return outline_width_;
     }
 
-    inline label& label::outline_edge(f32 value) noexcept {
-        outline_edge_ = value;
-        return *this;
-    }
-
-    inline f32 label::outline_edge() const noexcept {
-        return outline_edge_;
-    }
-
     inline label& label::outline_color(const color32& value) noexcept {
         outline_color_ = value;
         return *this;
     }
 
-    inline color32 label::outline_color() const noexcept {
+    inline const color32& label::outline_color() const noexcept {
         return outline_color_;
     }
-
-    inline label& label::shadow_width(f32 value) noexcept {
-        shadow_width_ = value;
-        return *this;
-    }
-
-    inline f32 label::shadow_width() const noexcept {
-        return shadow_width_;
-    }
-
-    inline label& label::shadow_edge(f32 value) noexcept {
-        shadow_edge_ = value;
-        return *this;
-    }
-
-    inline f32 label::shadow_edge() const noexcept {
-        return shadow_edge_;
-    }
-
-    inline label& label::shadow_offset(const v2f& value) noexcept {
-        shadow_offset_ = value;
-        return *this;
-    }
-
-    inline v2f label::shadow_offset() const noexcept {
-        return shadow_offset_;
-    }
-
-    inline label& label::shadow_color(const color32& value) noexcept {
-        shadow_color_ = value;
-        return *this;
-    }
-
-    inline color32 label::shadow_color() const noexcept {
-        return shadow_color_;
-    }
 }
diff --git a/sources/enduro2d/high/components/label.cpp b/sources/enduro2d/high/components/label.cpp
index cc39607a..3b7baa27 100644
--- a/sources/enduro2d/high/components/label.cpp
+++ b/sources/enduro2d/high/components/label.cpp
@@ -43,15 +43,9 @@ namespace e2d
             "width" : { "type" : "number" },
             "halign" : { "$ref": "#/definitions/haligns" },
             "valign" : { "$ref": "#/definitions/valigns" },
-            "char_width" : { "type" : "number" },
-            "char_edge" : { "type" : "number" },
+            "glyph_dilate" : { "type" : "number" },
             "outline_width" : { "type" : "number" },
-            "outline_edge" : { "type" : "number" },
-            "outline_color" : { "$ref": "#/common_definitions/color" },
-            "shadow_width" : { "type" : "number" },
-            "shadow_edge" : { "type" : "number" },
-            "shadow_offset" : { "$ref": "#/common_definitions/v2" },
-            "shadow_color" : { "$ref": "#/common_definitions/color" }
+            "outline_color" : { "$ref": "#/common_definitions/color" }
         },
         "definitions" : {
             "haligns" : {
@@ -137,22 +131,13 @@ namespace e2d
             component.valigh(valign);
         }
 
-        if ( ctx.root.HasMember("char_width") ) {
-            f32 char_width = component.char_width();
-            if ( !json_utils::try_parse_value(ctx.root["char_width"], char_width) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'char_width' property");
+        if ( ctx.root.HasMember("glyph_dilate") ) {
+            f32 glyph_dilate = component.glyph_dilate();
+            if ( !json_utils::try_parse_value(ctx.root["glyph_dilate"], glyph_dilate) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'glyph_dilate' property");
                 return false;
             }
-            component.char_width(char_width);
-        }
-
-        if ( ctx.root.HasMember("char_edge") ) {
-            f32 char_edge = component.char_edge();
-            if ( !json_utils::try_parse_value(ctx.root["char_edge"], char_edge) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'char_edge' property");
-                return false;
-            }
-            component.char_edge(char_edge);
+            component.glyph_dilate(glyph_dilate);
         }
 
         if ( ctx.root.HasMember("outline_width") ) {
@@ -164,15 +149,6 @@ namespace e2d
             component.outline_width(outline_width);
         }
 
-        if ( ctx.root.HasMember("outline_edge") ) {
-            f32 outline_edge = component.outline_edge();
-            if ( !json_utils::try_parse_value(ctx.root["outline_edge"], outline_edge) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'outline_edge' property");
-                return false;
-            }
-            component.outline_edge(outline_edge);
-        }
-
         if ( ctx.root.HasMember("outline_color") ) {
             color32 outline_color = component.outline_color();
             if ( !json_utils::try_parse_value(ctx.root["outline_color"], outline_color) ) {
@@ -182,42 +158,6 @@ namespace e2d
             component.outline_color(outline_color);
         }
 
-        if ( ctx.root.HasMember("shadow_width") ) {
-            f32 shadow_width = component.shadow_width();
-            if ( !json_utils::try_parse_value(ctx.root["shadow_width"], shadow_width) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'shadow_width' property");
-                return false;
-            }
-            component.shadow_width(shadow_width);
-        }
-
-        if ( ctx.root.HasMember("shadow_edge") ) {
-            f32 shadow_edge = component.shadow_edge();
-            if ( !json_utils::try_parse_value(ctx.root["shadow_edge"], shadow_edge) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'shadow_edge' property");
-                return false;
-            }
-            component.shadow_edge(shadow_edge);
-        }
-
-        if ( ctx.root.HasMember("shadow_offset") ) {
-            v2f shadow_offset = component.shadow_offset();
-            if ( !json_utils::try_parse_value(ctx.root["shadow_offset"], shadow_offset) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'shadow_offset' property");
-                return false;
-            }
-            component.shadow_offset(shadow_offset);
-        }
-
-        if ( ctx.root.HasMember("shadow_color") ) {
-            color32 shadow_color = component.shadow_color();
-            if ( !json_utils::try_parse_value(ctx.root["shadow_color"], shadow_color) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'shadow_color' property");
-                return false;
-            }
-            component.shadow_color(shadow_color);
-        }
-
         return true;
     }
 
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index bad2a4c7..17065466 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -274,26 +274,18 @@ namespace e2d
                         return;
                     }
 
-                    vec2 shadow_offset = l.shadow_offset();
-                    shadow_offset.x /= texture_p->content()->size().x;
-                    shadow_offset.y /= texture_p->content()->size().y;
-                    shadow_offset.x = -shadow_offset.x;
-                    color oc(l.outline_color());
-                    color sc(l.shadow_color());
+                    const f32 glyph_dilate = math::clamp(l.glyph_dilate(), -1.f, 1.0f);
+                    const f32 outline_width = math::clamp(l.outline_width(), 0.f, 1.f - glyph_dilate);
+                    const v4f outline_color = make_vec4(color(l.outline_color()));
+
                     r.properties(render::property_block()
                         .sampler("u_texture", render::sampler_state()
                             .texture(texture_p->content())
                             .min_filter(render::sampler_min_filter::linear)
                             .mag_filter(render::sampler_mag_filter::linear))
-                        .property("u_char_width", l.char_width())
-                        .property("u_char_edge", l.char_edge())
-                        .property("u_outline_width", l.outline_width())
-                        .property("u_outline_edge", l.outline_edge())
-                        .property("u_outline_color", make_vec4(oc.r, oc.g, oc.b, oc.a))
-                        .property("u_shadow_width", l.shadow_width())
-                        .property("u_shadow_edge", l.shadow_edge())
-                        .property("u_shadow_offset", shadow_offset)
-                        .property("u_shadow_color", make_vec4(sc.r, sc.g, sc.b, sc.a)));
+                        .property("u_glyph_dilate", glyph_dilate)
+                        .property("u_outline_width", outline_width)
+                        .property("u_outline_color", outline_color));
                 }
             });
 

From 6af01c9398bb100fe0557866829aa8e98fd565f9 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Tue, 20 Aug 2019 07:13:51 +0700
Subject: [PATCH 073/108] rewrite label shaders

---
 .../bin/library/{arial.fnt => arial_bm.fnt}   |   2 +-
 .../bin/library/{arial.png => arial_bm.png}   |   0
 samples/bin/library/arial_sdf.fnt             | 720 ++++++++++++++++++
 samples/bin/library/arial_sdf.png             |   3 +
 ...df_material.json => font_bm_material.json} |  12 +-
 samples/bin/library/font_bm_shader.frag       |   8 +
 samples/bin/library/font_bm_shader.json       |   4 +
 .../{font_shader.vert => font_bm_shader.vert} |   0
 ...t_material.json => font_sdf_material.json} |  14 +-
 samples/bin/library/font_sdf_shader.frag      |  29 +
 samples/bin/library/font_sdf_shader.json      |   4 +
 .../{sdf_shader.vert => font_sdf_shader.vert} |   0
 samples/bin/library/font_shader.frag          |   9 -
 samples/bin/library/font_shader.json          |   4 -
 samples/bin/library/label_bm_prefab.json      |  15 +
 samples/bin/library/label_sdf_prefab.json     |  15 +
 samples/bin/library/scene_prefab.json         |  28 +-
 samples/bin/library/sdf_shader.frag           |  28 -
 samples/bin/library/sdf_shader.json           |   4 -
 19 files changed, 837 insertions(+), 62 deletions(-)
 rename samples/bin/library/{arial.fnt => arial_bm.fnt} (99%)
 rename samples/bin/library/{arial.png => arial_bm.png} (100%)
 create mode 100644 samples/bin/library/arial_sdf.fnt
 create mode 100644 samples/bin/library/arial_sdf.png
 rename samples/bin/library/{sdf_material.json => font_bm_material.json} (72%)
 create mode 100644 samples/bin/library/font_bm_shader.frag
 create mode 100644 samples/bin/library/font_bm_shader.json
 rename samples/bin/library/{font_shader.vert => font_bm_shader.vert} (100%)
 rename samples/bin/library/{font_material.json => font_sdf_material.json} (61%)
 create mode 100644 samples/bin/library/font_sdf_shader.frag
 create mode 100644 samples/bin/library/font_sdf_shader.json
 rename samples/bin/library/{sdf_shader.vert => font_sdf_shader.vert} (100%)
 delete mode 100644 samples/bin/library/font_shader.frag
 delete mode 100644 samples/bin/library/font_shader.json
 create mode 100644 samples/bin/library/label_bm_prefab.json
 create mode 100644 samples/bin/library/label_sdf_prefab.json
 delete mode 100644 samples/bin/library/sdf_shader.frag
 delete mode 100644 samples/bin/library/sdf_shader.json

diff --git a/samples/bin/library/arial.fnt b/samples/bin/library/arial_bm.fnt
similarity index 99%
rename from samples/bin/library/arial.fnt
rename to samples/bin/library/arial_bm.fnt
index c1caa43d..6375f656 100644
--- a/samples/bin/library/arial.fnt
+++ b/samples/bin/library/arial_bm.fnt
@@ -1,6 +1,6 @@
 info face="Arial" size=50 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=0,0
 common lineHeight=58 base=49 scaleW=512 scaleH=512 pages=1 packed=0
-page id=0 file="arial.png"
+page id=0 file="arial_bm.png"
 chars count=162
 char id=32 x=342 y=38 width=0 height=0 xoffset=0 yoffset=46 xadvance=14 page=0 chnl=0
 char id=33 x=448 y=386 width=10 height=40 xoffset=5 yoffset=10 xadvance=14 page=0 chnl=0
diff --git a/samples/bin/library/arial.png b/samples/bin/library/arial_bm.png
similarity index 100%
rename from samples/bin/library/arial.png
rename to samples/bin/library/arial_bm.png
diff --git a/samples/bin/library/arial_sdf.fnt b/samples/bin/library/arial_sdf.fnt
new file mode 100644
index 00000000..2fd74ced
--- /dev/null
+++ b/samples/bin/library/arial_sdf.fnt
@@ -0,0 +1,720 @@
+info face="Arial" size=50 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=0,0
+common lineHeight=51 base=41 scaleW=512 scaleH=512 pages=1 packed=0 alphaChnl=0 redChnl=0 greenChnl=0 blueChnl=0
+page id=0 file="arial_sdf.png"
+chars count=161
+char id=32 x=0 y=0 width=0 height=0 xoffset=0 yoffset=41 xadvance=12 page=0 chnl=8
+char id=33 x=225 y=312 width=16 height=43 xoffset=-2 yoffset=3 xadvance=12 page=0 chnl=8
+char id=34 x=131 y=423 width=22 height=23 xoffset=-3 yoffset=3 xadvance=16 page=0 chnl=8
+char id=35 x=156 y=96 width=35 height=44 xoffset=-5 yoffset=3 xadvance=25 page=0 chnl=8
+char id=36 x=422 y=0 width=32 height=50 xoffset=-4 yoffset=1 xadvance=25 page=0 chnl=8
+char id=37 x=386 y=50 width=46 height=45 xoffset=-3 yoffset=3 xadvance=40 page=0 chnl=8
+char id=38 x=349 y=95 width=38 height=44 xoffset=-4 yoffset=3 xadvance=30 page=0 chnl=8
+char id=39 x=153 y=423 width=16 height=23 xoffset=-4 yoffset=3 xadvance=9 page=0 chnl=8
+char id=40 x=120 y=0 width=22 height=53 xoffset=-3 yoffset=3 xadvance=15 page=0 chnl=8
+char id=41 x=98 y=0 width=22 height=53 xoffset=-3 yoffset=3 xadvance=15 page=0 chnl=8
+char id=42 x=408 y=422 width=25 height=25 xoffset=-4 yoffset=3 xadvance=17 page=0 chnl=8
+char id=43 x=347 y=422 width=32 height=32 xoffset=-3 yoffset=9 xadvance=26 page=0 chnl=8
+char id=44 x=169 y=423 width=16 height=22 xoffset=-2 yoffset=31 xadvance=12 page=0 chnl=8
+char id=45 x=239 y=423 width=23 height=15 xoffset=-4 yoffset=22 xadvance=15 page=0 chnl=8
+char id=46 x=262 y=423 width=15 height=15 xoffset=-1 yoffset=31 xadvance=12 page=0 chnl=8
+char id=47 x=156 y=140 width=23 height=44 xoffset=-5 yoffset=3 xadvance=12 page=0 chnl=8
+char id=48 x=96 y=97 width=32 height=44 xoffset=-4 yoffset=3 xadvance=25 page=0 chnl=8
+char id=49 x=179 y=312 width=23 height=43 xoffset=-1 yoffset=3 xadvance=25 page=0 chnl=8
+char id=50 x=0 y=270 width=32 height=43 xoffset=-4 yoffset=3 xadvance=25 page=0 chnl=8
+char id=51 x=64 y=97 width=32 height=44 xoffset=-4 yoffset=3 xadvance=25 page=0 chnl=8
+char id=52 x=278 y=269 width=33 height=43 xoffset=-5 yoffset=3 xadvance=25 page=0 chnl=8
+char id=53 x=311 y=269 width=33 height=43 xoffset=-4 yoffset=4 xadvance=25 page=0 chnl=8
+char id=54 x=32 y=97 width=32 height=44 xoffset=-4 yoffset=3 xadvance=25 page=0 chnl=8
+char id=55 x=286 y=312 width=31 height=42 xoffset=-3 yoffset=4 xadvance=25 page=0 chnl=8
+char id=56 x=0 y=97 width=32 height=44 xoffset=-4 yoffset=3 xadvance=25 page=0 chnl=8
+char id=57 x=292 y=96 width=32 height=44 xoffset=-4 yoffset=3 xadvance=25 page=0 chnl=8
+char id=58 x=52 y=417 width=15 height=34 xoffset=-1 yoffset=12 xadvance=12 page=0 chnl=8
+char id=59 x=458 y=312 width=16 height=41 xoffset=-2 yoffset=12 xadvance=12 page=0 chnl=8
+char id=60 x=67 y=417 width=32 height=33 xoffset=-3 yoffset=9 xadvance=26 page=0 chnl=8
+char id=61 x=99 y=423 width=32 height=24 xoffset=-3 yoffset=13 xadvance=26 page=0 chnl=8
+char id=62 x=315 y=422 width=32 height=33 xoffset=-3 yoffset=9 xadvance=26 page=0 chnl=8
+char id=63 x=441 y=269 width=32 height=43 xoffset=-4 yoffset=3 xadvance=25 page=0 chnl=8
+char id=64 x=0 y=0 width=52 height=53 xoffset=-3 yoffset=3 xadvance=45 page=0 chnl=8
+char id=65 x=283 y=140 width=41 height=43 xoffset=-6 yoffset=3 xadvance=30 page=0 chnl=8
+char id=66 x=477 y=226 width=35 height=43 xoffset=-2 yoffset=3 xadvance=30 page=0 chnl=8
+char id=67 x=117 y=53 width=39 height=44 xoffset=-3 yoffset=3 xadvance=32 page=0 chnl=8
+char id=68 x=78 y=184 width=37 height=43 xoffset=-2 yoffset=3 xadvance=32 page=0 chnl=8
+char id=69 x=70 y=227 width=35 height=43 xoffset=-2 yoffset=3 xadvance=30 page=0 chnl=8
+char id=70 x=344 y=269 width=33 height=43 xoffset=-2 yoffset=3 xadvance=27 page=0 chnl=8
+char id=71 x=267 y=52 width=41 height=44 xoffset=-3 yoffset=3 xadvance=35 page=0 chnl=8
+char id=72 x=441 y=226 width=36 height=43 xoffset=-2 yoffset=3 xadvance=32 page=0 chnl=8
+char id=73 x=271 y=312 width=15 height=43 xoffset=-1 yoffset=3 xadvance=12 page=0 chnl=8
+char id=74 x=128 y=97 width=28 height=44 xoffset=-4 yoffset=3 xadvance=22 page=0 chnl=8
+char id=75 x=152 y=226 width=37 height=43 xoffset=-2 yoffset=3 xadvance=30 page=0 chnl=8
+char id=76 x=63 y=270 width=31 height=43 xoffset=-2 yoffset=3 xadvance=25 page=0 chnl=8
+char id=77 x=221 y=183 width=41 height=43 xoffset=-2 yoffset=3 xadvance=37 page=0 chnl=8
+char id=78 x=369 y=226 width=36 height=43 xoffset=-2 yoffset=3 xadvance=32 page=0 chnl=8
+char id=79 x=226 y=52 width=41 height=44 xoffset=-3 yoffset=3 xadvance=35 page=0 chnl=8
+char id=80 x=0 y=227 width=35 height=43 xoffset=-2 yoffset=3 xadvance=30 page=0 chnl=8
+char id=81 x=454 y=49 width=43 height=46 xoffset=-4 yoffset=3 xadvance=35 page=0 chnl=8
+char id=82 x=39 y=184 width=39 height=43 xoffset=-2 yoffset=3 xadvance=32 page=0 chnl=8
+char id=83 x=387 y=95 width=36 height=44 xoffset=-3 yoffset=3 xadvance=30 page=0 chnl=8
+char id=84 x=225 y=226 width=36 height=43 xoffset=-4 yoffset=3 xadvance=27 page=0 chnl=8
+char id=85 x=459 y=95 width=36 height=44 xoffset=-2 yoffset=3 xadvance=32 page=0 chnl=8
+char id=86 x=384 y=183 width=40 height=43 xoffset=-5 yoffset=3 xadvance=30 page=0 chnl=8
+char id=87 x=179 y=140 width=52 height=43 xoffset=-5 yoffset=3 xadvance=42 page=0 chnl=8
+char id=88 x=464 y=183 width=40 height=43 xoffset=-5 yoffset=3 xadvance=30 page=0 chnl=8
+char id=89 x=344 y=183 width=40 height=43 xoffset=-5 yoffset=3 xadvance=30 page=0 chnl=8
+char id=90 x=115 y=184 width=37 height=43 xoffset=-5 yoffset=3 xadvance=27 page=0 chnl=8
+char id=91 x=328 y=0 width=19 height=52 xoffset=-2 yoffset=3 xadvance=12 page=0 chnl=8
+char id=92 x=482 y=139 width=23 height=44 xoffset=-5 yoffset=3 xadvance=12 page=0 chnl=8
+char id=93 x=308 y=0 width=20 height=52 xoffset=-5 yoffset=3 xadvance=12 page=0 chnl=8
+char id=94 x=379 y=422 width=29 height=28 xoffset=-4 yoffset=3 xadvance=21 page=0 chnl=8
+char id=95 x=277 y=423 width=37 height=13 xoffset=-6 yoffset=42 xadvance=25 page=0 chnl=8
+char id=96 x=219 y=423 width=20 height=17 xoffset=-4 yoffset=3 xadvance=15 page=0 chnl=8
+char id=97 x=33 y=348 width=32 height=35 xoffset=-4 yoffset=12 xadvance=25 page=0 chnl=8
+char id=98 x=388 y=139 width=32 height=44 xoffset=-3 yoffset=3 xadvance=25 page=0 chnl=8
+char id=99 x=380 y=353 width=31 height=35 xoffset=-4 yoffset=12 xadvance=22 page=0 chnl=8
+char id=100 x=420 y=139 width=31 height=44 xoffset=-4 yoffset=3 xadvance=25 page=0 chnl=8
+char id=101 x=474 y=347 width=33 height=35 xoffset=-4 yoffset=12 xadvance=25 page=0 chnl=8
+char id=102 x=155 y=312 width=24 height=43 xoffset=-5 yoffset=3 xadvance=12 page=0 chnl=8
+char id=103 x=451 y=139 width=31 height=44 xoffset=-4 yoffset=12 xadvance=25 page=0 chnl=8
+char id=104 x=125 y=312 width=30 height=43 xoffset=-3 yoffset=3 xadvance=25 page=0 chnl=8
+char id=105 x=256 y=312 width=15 height=43 xoffset=-3 yoffset=3 xadvance=10 page=0 chnl=8
+char id=106 x=142 y=0 width=20 height=53 xoffset=-8 yoffset=3 xadvance=10 page=0 chnl=8
+char id=107 x=94 y=270 width=31 height=43 xoffset=-3 yoffset=3 xadvance=22 page=0 chnl=8
+char id=108 x=241 y=312 width=15 height=43 xoffset=-3 yoffset=3 xadvance=10 page=0 chnl=8
+char id=109 x=125 y=355 width=43 height=34 xoffset=-3 yoffset=12 xadvance=37 page=0 chnl=8
+char id=110 x=475 y=416 width=30 height=34 xoffset=-3 yoffset=12 xadvance=25 page=0 chnl=8
+char id=111 x=40 y=313 width=33 height=35 xoffset=-4 yoffset=12 xadvance=25 page=0 chnl=8
+char id=112 x=409 y=269 width=32 height=43 xoffset=-3 yoffset=12 xadvance=25 page=0 chnl=8
+char id=113 x=32 y=270 width=31 height=43 xoffset=-4 yoffset=12 xadvance=25 page=0 chnl=8
+char id=114 x=28 y=417 width=24 height=34 xoffset=-3 yoffset=12 xadvance=15 page=0 chnl=8
+char id=115 x=442 y=353 width=30 height=35 xoffset=-4 yoffset=12 xadvance=22 page=0 chnl=8
+char id=116 x=202 y=312 width=23 height=43 xoffset=-5 yoffset=4 xadvance=12 page=0 chnl=8
+char id=117 x=286 y=354 width=30 height=35 xoffset=-3 yoffset=12 xadvance=25 page=0 chnl=8
+char id=118 x=413 y=388 width=32 height=34 xoffset=-5 yoffset=12 xadvance=22 page=0 chnl=8
+char id=119 x=168 y=355 width=42 height=34 xoffset=-5 yoffset=12 xadvance=32 page=0 chnl=8
+char id=120 x=316 y=388 width=33 height=34 xoffset=-5 yoffset=12 xadvance=22 page=0 chnl=8
+char id=121 x=324 y=139 width=32 height=44 xoffset=-5 yoffset=12 xadvance=22 page=0 chnl=8
+char id=122 x=349 y=388 width=32 height=34 xoffset=-5 yoffset=12 xadvance=22 page=0 chnl=8
+char id=123 x=52 y=0 width=23 height=53 xoffset=-4 yoffset=3 xadvance=15 page=0 chnl=8
+char id=124 x=162 y=0 width=14 height=53 xoffset=-1 yoffset=3 xadvance=12 page=0 chnl=8
+char id=125 x=75 y=0 width=23 height=53 xoffset=-4 yoffset=3 xadvance=15 page=0 chnl=8
+char id=126 x=185 y=423 width=34 height=18 xoffset=-4 yoffset=16 xadvance=26 page=0 chnl=8
+char id=1025 x=454 y=0 width=35 height=49 xoffset=-2 yoffset=-3 xadvance=30 page=0 chnl=8
+char id=1040 x=262 y=183 width=41 height=43 xoffset=-6 yoffset=3 xadvance=30 page=0 chnl=8
+char id=1041 x=140 y=269 width=35 height=43 xoffset=-2 yoffset=3 xadvance=29 page=0 chnl=8
+char id=1042 x=175 y=269 width=35 height=43 xoffset=-2 yoffset=3 xadvance=30 page=0 chnl=8
+char id=1043 x=473 y=269 width=32 height=43 xoffset=-2 yoffset=3 xadvance=24 page=0 chnl=8
+char id=1044 x=347 y=0 width=39 height=51 xoffset=-5 yoffset=3 xadvance=30 page=0 chnl=8
+char id=1045 x=210 y=269 width=35 height=43 xoffset=-2 yoffset=3 xadvance=30 page=0 chnl=8
+char id=1046 x=231 y=140 width=52 height=43 xoffset=-5 yoffset=3 xadvance=41 page=0 chnl=8
+char id=1047 x=191 y=96 width=35 height=44 xoffset=-4 yoffset=3 xadvance=27 page=0 chnl=8
+char id=1048 x=333 y=226 width=36 height=43 xoffset=-2 yoffset=3 xadvance=32 page=0 chnl=8
+char id=1049 x=386 y=0 width=36 height=50 xoffset=-2 yoffset=-4 xadvance=32 page=0 chnl=8
+char id=1050 x=245 y=269 width=33 height=43 xoffset=-2 yoffset=3 xadvance=26 page=0 chnl=8
+char id=1051 x=423 y=95 width=36 height=44 xoffset=-5 yoffset=3 xadvance=29 page=0 chnl=8
+char id=1052 x=303 y=183 width=41 height=43 xoffset=-2 yoffset=3 xadvance=37 page=0 chnl=8
+char id=1053 x=261 y=226 width=36 height=43 xoffset=-2 yoffset=3 xadvance=32 page=0 chnl=8
+char id=1054 x=308 y=52 width=41 height=44 xoffset=-3 yoffset=3 xadvance=35 page=0 chnl=8
+char id=1055 x=405 y=226 width=36 height=43 xoffset=-2 yoffset=3 xadvance=32 page=0 chnl=8
+char id=1056 x=105 y=227 width=35 height=43 xoffset=-2 yoffset=3 xadvance=30 page=0 chnl=8
+char id=1057 x=78 y=53 width=39 height=44 xoffset=-3 yoffset=3 xadvance=32 page=0 chnl=8
+char id=1058 x=189 y=226 width=36 height=43 xoffset=-4 yoffset=3 xadvance=27 page=0 chnl=8
+char id=1059 x=39 y=53 width=39 height=44 xoffset=-5 yoffset=3 xadvance=28 page=0 chnl=8
+char id=1060 x=179 y=183 width=42 height=43 xoffset=-4 yoffset=3 xadvance=34 page=0 chnl=8
+char id=1061 x=424 y=183 width=40 height=43 xoffset=-5 yoffset=3 xadvance=30 page=0 chnl=8
+char id=1062 x=269 y=0 width=39 height=52 xoffset=-2 yoffset=3 xadvance=33 page=0 chnl=8
+char id=1063 x=297 y=226 width=36 height=43 xoffset=-4 yoffset=3 xadvance=30 page=0 chnl=8
+char id=1064 x=0 y=141 width=45 height=43 xoffset=-2 yoffset=3 xadvance=41 page=0 chnl=8
+char id=1065 x=176 y=0 width=48 height=52 xoffset=-2 yoffset=3 xadvance=42 page=0 chnl=8
+char id=1066 x=45 y=141 width=44 height=43 xoffset=-5 yoffset=3 xadvance=35 page=0 chnl=8
+char id=1067 x=89 y=141 width=43 height=43 xoffset=-2 yoffset=3 xadvance=40 page=0 chnl=8
+char id=1068 x=35 y=227 width=35 height=43 xoffset=-2 yoffset=3 xadvance=29 page=0 chnl=8
+char id=1069 x=0 y=53 width=39 height=44 xoffset=-4 yoffset=3 xadvance=32 page=0 chnl=8
+char id=1070 x=176 y=52 width=50 height=44 xoffset=-2 yoffset=3 xadvance=45 page=0 chnl=8
+char id=1071 x=0 y=184 width=39 height=43 xoffset=-5 yoffset=3 xadvance=32 page=0 chnl=8
+char id=1072 x=348 y=353 width=32 height=35 xoffset=-4 yoffset=12 xadvance=25 page=0 chnl=8
+char id=1073 x=259 y=96 width=33 height=44 xoffset=-4 yoffset=3 xadvance=26 page=0 chnl=8
+char id=1074 x=108 y=389 width=31 height=34 xoffset=-3 yoffset=12 xadvance=24 page=0 chnl=8
+char id=1075 x=290 y=389 width=25 height=34 xoffset=-3 yoffset=12 xadvance=16 page=0 chnl=8
+char id=1076 x=391 y=312 width=35 height=41 xoffset=-5 yoffset=12 xadvance=26 page=0 chnl=8
+char id=1077 x=0 y=348 width=33 height=35 xoffset=-4 yoffset=12 xadvance=25 page=0 chnl=8
+char id=1078 x=210 y=355 width=42 height=34 xoffset=-6 yoffset=12 xadvance=30 page=0 chnl=8
+char id=1079 x=97 y=348 width=28 height=35 xoffset=-4 yoffset=12 xadvance=21 page=0 chnl=8
+char id=1080 x=139 y=389 width=31 height=34 xoffset=-3 yoffset=12 xadvance=25 page=0 chnl=8
+char id=1081 x=317 y=312 width=31 height=42 xoffset=-3 yoffset=4 xadvance=25 page=0 chnl=8
+char id=1082 x=0 y=417 width=28 height=34 xoffset=-3 yoffset=12 xadvance=20 page=0 chnl=8
+char id=1083 x=474 y=312 width=34 height=35 xoffset=-5 yoffset=12 xadvance=26 page=0 chnl=8
+char id=1084 x=73 y=383 width=35 height=34 xoffset=-2 yoffset=12 xadvance=31 page=0 chnl=8
+char id=1085 x=260 y=389 width=30 height=34 xoffset=-3 yoffset=12 xadvance=25 page=0 chnl=8
+char id=1086 x=73 y=313 width=33 height=35 xoffset=-4 yoffset=12 xadvance=25 page=0 chnl=8
+char id=1087 x=445 y=416 width=30 height=34 xoffset=-3 yoffset=12 xadvance=24 page=0 chnl=8
+char id=1088 x=377 y=269 width=32 height=43 xoffset=-3 yoffset=12 xadvance=25 page=0 chnl=8
+char id=1089 x=411 y=353 width=31 height=35 xoffset=-4 yoffset=12 xadvance=22 page=0 chnl=8
+char id=1090 x=200 y=389 width=30 height=34 xoffset=-5 yoffset=12 xadvance=20 page=0 chnl=8
+char id=1091 x=356 y=139 width=32 height=44 xoffset=-5 yoffset=12 xadvance=22 page=0 chnl=8
+char id=1092 x=224 y=0 width=45 height=52 xoffset=-4 yoffset=3 xadvance=37 page=0 chnl=8
+char id=1093 x=252 y=355 width=33 height=34 xoffset=-5 yoffset=12 xadvance=22 page=0 chnl=8
+char id=1094 x=426 y=312 width=32 height=41 xoffset=-2 yoffset=12 xadvance=26 page=0 chnl=8
+char id=1095 x=170 y=389 width=30 height=34 xoffset=-4 yoffset=12 xadvance=23 page=0 chnl=8
+char id=1096 x=472 y=382 width=40 height=34 xoffset=-2 yoffset=12 xadvance=36 page=0 chnl=8
+char id=1097 x=348 y=312 width=43 height=41 xoffset=-2 yoffset=12 xadvance=37 page=0 chnl=8
+char id=1098 x=0 y=383 width=37 height=34 xoffset=-5 yoffset=12 xadvance=28 page=0 chnl=8
+char id=1099 x=37 y=383 width=36 height=34 xoffset=-2 yoffset=12 xadvance=32 page=0 chnl=8
+char id=1100 x=230 y=389 width=30 height=34 xoffset=-3 yoffset=12 xadvance=23 page=0 chnl=8
+char id=1101 x=65 y=348 width=32 height=35 xoffset=-5 yoffset=12 xadvance=23 page=0 chnl=8
+char id=1102 x=0 y=313 width=40 height=35 xoffset=-3 yoffset=12 xadvance=34 page=0 chnl=8
+char id=1103 x=381 y=388 width=32 height=34 xoffset=-5 yoffset=12 xadvance=24 page=0 chnl=8
+char id=1105 x=226 y=96 width=33 height=44 xoffset=-4 yoffset=3 xadvance=25 page=0 chnl=8
+kernings count=554
+kerning first=32 second=65 amount=-5
+kerning first=32 second=84 amount=-2
+kerning first=32 second=89 amount=-2
+kerning first=49 second=49 amount=-7
+kerning first=65 second=32 amount=-5
+kerning first=65 second=84 amount=-7
+kerning first=65 second=86 amount=-7
+kerning first=65 second=87 amount=-3
+kerning first=65 second=89 amount=-7
+kerning first=65 second=118 amount=-2
+kerning first=65 second=119 amount=-2
+kerning first=65 second=121 amount=-2
+kerning first=70 second=44 amount=-10
+kerning first=70 second=46 amount=-10
+kerning first=70 second=65 amount=-5
+kerning first=76 second=32 amount=-3
+kerning first=76 second=84 amount=-7
+kerning first=76 second=86 amount=-7
+kerning first=76 second=87 amount=-7
+kerning first=76 second=89 amount=-7
+kerning first=76 second=121 amount=-3
+kerning first=80 second=32 amount=-2
+kerning first=80 second=44 amount=-12
+kerning first=80 second=46 amount=-12
+kerning first=80 second=65 amount=-7
+kerning first=82 second=84 amount=-2
+kerning first=82 second=86 amount=-2
+kerning first=82 second=87 amount=-2
+kerning first=82 second=89 amount=-2
+kerning first=84 second=32 amount=-2
+kerning first=84 second=44 amount=-10
+kerning first=84 second=45 amount=-5
+kerning first=84 second=46 amount=-10
+kerning first=84 second=58 amount=-10
+kerning first=84 second=59 amount=-10
+kerning first=84 second=65 amount=-7
+kerning first=84 second=79 amount=-2
+kerning first=84 second=97 amount=-10
+kerning first=84 second=99 amount=-10
+kerning first=84 second=101 amount=-10
+kerning first=84 second=105 amount=-3
+kerning first=84 second=111 amount=-10
+kerning first=84 second=114 amount=-3
+kerning first=84 second=115 amount=-10
+kerning first=84 second=117 amount=-3
+kerning first=84 second=119 amount=-5
+kerning first=84 second=121 amount=-5
+kerning first=86 second=44 amount=-8
+kerning first=86 second=45 amount=-5
+kerning first=86 second=46 amount=-8
+kerning first=86 second=58 amount=-3
+kerning first=86 second=59 amount=-3
+kerning first=86 second=65 amount=-7
+kerning first=86 second=97 amount=-7
+kerning first=86 second=101 amount=-5
+kerning first=86 second=105 amount=-2
+kerning first=86 second=111 amount=-5
+kerning first=86 second=114 amount=-3
+kerning first=86 second=117 amount=-3
+kerning first=86 second=121 amount=-3
+kerning first=87 second=44 amount=-5
+kerning first=87 second=45 amount=-2
+kerning first=87 second=46 amount=-5
+kerning first=87 second=58 amount=-2
+kerning first=87 second=59 amount=-2
+kerning first=87 second=65 amount=-3
+kerning first=87 second=97 amount=-3
+kerning first=87 second=101 amount=-2
+kerning first=87 second=111 amount=-2
+kerning first=87 second=114 amount=-2
+kerning first=87 second=117 amount=-2
+kerning first=87 second=121 amount=-1
+kerning first=89 second=32 amount=-2
+kerning first=89 second=44 amount=-12
+kerning first=89 second=45 amount=-8
+kerning first=89 second=46 amount=-12
+kerning first=89 second=58 amount=-5
+kerning first=89 second=59 amount=-6
+kerning first=89 second=65 amount=-7
+kerning first=89 second=97 amount=-7
+kerning first=89 second=101 amount=-8
+kerning first=89 second=105 amount=-3
+kerning first=89 second=111 amount=-8
+kerning first=89 second=112 amount=-7
+kerning first=89 second=113 amount=-8
+kerning first=89 second=117 amount=-5
+kerning first=89 second=118 amount=-5
+kerning first=102 second=102 amount=-2
+kerning first=114 second=44 amount=-5
+kerning first=114 second=46 amount=-5
+kerning first=118 second=44 amount=-7
+kerning first=118 second=46 amount=-7
+kerning first=119 second=44 amount=-5
+kerning first=119 second=46 amount=-5
+kerning first=121 second=44 amount=-7
+kerning first=121 second=46 amount=-7
+kerning first=1040 second=1044 amount=3
+kerning first=1040 second=1047 amount=-1
+kerning first=1040 second=1051 amount=2
+kerning first=1040 second=1054 amount=-2
+kerning first=1040 second=1055 amount=-1
+kerning first=1040 second=1057 amount=-2
+kerning first=1040 second=1058 amount=-7
+kerning first=1040 second=1059 amount=-4
+kerning first=1040 second=1060 amount=-3
+kerning first=1040 second=1063 amount=-7
+kerning first=1040 second=1069 amount=-2
+kerning first=1040 second=1072 amount=1
+kerning first=1040 second=1090 amount=-2
+kerning first=1040 second=1091 amount=-1
+kerning first=1040 second=1092 amount=1
+kerning first=1040 second=1101 amount=2
+kerning first=1041 second=1040 amount=-2
+kerning first=1041 second=1047 amount=-1
+kerning first=1041 second=1054 amount=-1
+kerning first=1041 second=1057 amount=-1
+kerning first=1041 second=1058 amount=-4
+kerning first=1041 second=1059 amount=-2
+kerning first=1041 second=1060 amount=-1
+kerning first=1041 second=1061 amount=-2
+kerning first=1041 second=1063 amount=-4
+kerning first=1041 second=1066 amount=-3
+kerning first=1041 second=1069 amount=-1
+kerning first=1041 second=1071 amount=-1
+kerning first=1041 second=1083 amount=-1
+kerning first=1041 second=1091 amount=-2
+kerning first=1042 second=1040 amount=-3
+kerning first=1042 second=1044 amount=-2
+kerning first=1042 second=1046 amount=-2
+kerning first=1042 second=1047 amount=-3
+kerning first=1042 second=1051 amount=-1
+kerning first=1042 second=1054 amount=-3
+kerning first=1042 second=1057 amount=-3
+kerning first=1042 second=1058 amount=-6
+kerning first=1042 second=1059 amount=-3
+kerning first=1042 second=1060 amount=-3
+kerning first=1042 second=1061 amount=-4
+kerning first=1042 second=1063 amount=-4
+kerning first=1042 second=1066 amount=-5
+kerning first=1042 second=1071 amount=-3
+kerning first=1042 second=1076 amount=-1
+kerning first=1042 second=1084 amount=-1
+kerning first=1042 second=1090 amount=-3
+kerning first=1042 second=1091 amount=-1
+kerning first=1042 second=1093 amount=-1
+kerning first=1042 second=1095 amount=-3
+kerning first=1042 second=1103 amount=-1
+kerning first=1043 second=44 amount=-11
+kerning first=1043 second=46 amount=-11
+kerning first=1043 second=1040 amount=-6
+kerning first=1043 second=1044 amount=-6
+kerning first=1043 second=1047 amount=-2
+kerning first=1043 second=1051 amount=-5
+kerning first=1043 second=1052 amount=-2
+kerning first=1043 second=1054 amount=-5
+kerning first=1043 second=1057 amount=-4
+kerning first=1043 second=1071 amount=-3
+kerning first=1043 second=1072 amount=-5
+kerning first=1043 second=1074 amount=-5
+kerning first=1043 second=1076 amount=-6
+kerning first=1043 second=1077 amount=-6
+kerning first=1043 second=1080 amount=-5
+kerning first=1043 second=1083 amount=-5
+kerning first=1043 second=1084 amount=-5
+kerning first=1043 second=1085 amount=-5
+kerning first=1043 second=1086 amount=-6
+kerning first=1043 second=1088 amount=-5
+kerning first=1043 second=1091 amount=-6
+kerning first=1043 second=1099 amount=-5
+kerning first=1043 second=1100 amount=-5
+kerning first=1043 second=1102 amount=-5
+kerning first=1043 second=1103 amount=-6
+kerning first=1044 second=1059 amount=1
+kerning first=1044 second=1060 amount=-2
+kerning first=1044 second=1063 amount=-3
+kerning first=1044 second=1079 amount=3
+kerning first=1044 second=1086 amount=1
+kerning first=1044 second=1091 amount=2
+kerning first=1045 second=1047 amount=-2
+kerning first=1045 second=1089 amount=-1
+kerning first=1046 second=1047 amount=-1
+kerning first=1046 second=1054 amount=-2
+kerning first=1046 second=1057 amount=-1
+kerning first=1046 second=1058 amount=1
+kerning first=1046 second=1059 amount=2
+kerning first=1046 second=1066 amount=2
+kerning first=1046 second=1072 amount=1
+kerning first=1046 second=1077 amount=-1
+kerning first=1046 second=1086 amount=-1
+kerning first=1046 second=1091 amount=-1
+kerning first=1047 second=1051 amount=-1
+kerning first=1047 second=1054 amount=-1
+kerning first=1047 second=1057 amount=-1
+kerning first=1047 second=1058 amount=-2
+kerning first=1047 second=1059 amount=-1
+kerning first=1047 second=1060 amount=-1
+kerning first=1047 second=1063 amount=-2
+kerning first=1047 second=1071 amount=-1
+kerning first=1050 second=1047 amount=-1
+kerning first=1050 second=1054 amount=-1
+kerning first=1050 second=1057 amount=-1
+kerning first=1050 second=1059 amount=1
+kerning first=1050 second=1060 amount=-3
+kerning first=1051 second=1060 amount=-1
+kerning first=1051 second=1073 amount=1
+kerning first=1051 second=1091 amount=1
+kerning first=1052 second=1060 amount=-1
+kerning first=1052 second=1063 amount=-1
+kerning first=1052 second=1072 amount=1
+kerning first=1052 second=1077 amount=1
+kerning first=1052 second=1086 amount=1
+kerning first=1052 second=1089 amount=1
+kerning first=1052 second=1091 amount=1
+kerning first=1052 second=1095 amount=-1
+kerning first=1052 second=1101 amount=1
+kerning first=1054 second=1040 amount=-2
+kerning first=1054 second=1044 amount=-2
+kerning first=1054 second=1046 amount=-2
+kerning first=1054 second=1051 amount=-1
+kerning first=1054 second=1059 amount=-2
+kerning first=1054 second=1061 amount=-4
+kerning first=1054 second=1063 amount=-2
+kerning first=1054 second=1071 amount=-2
+kerning first=1054 second=1076 amount=-2
+kerning first=1054 second=1083 amount=-1
+kerning first=1054 second=1093 amount=-1
+kerning first=1056 second=44 amount=-17
+kerning first=1056 second=46 amount=-17
+kerning first=1056 second=58 amount=-2
+kerning first=1056 second=59 amount=-2
+kerning first=1056 second=1040 amount=-6
+kerning first=1056 second=1044 amount=-6
+kerning first=1056 second=1046 amount=-1
+kerning first=1056 second=1047 amount=-2
+kerning first=1056 second=1051 amount=-5
+kerning first=1056 second=1052 amount=-1
+kerning first=1056 second=1054 amount=-2
+kerning first=1056 second=1057 amount=-1
+kerning first=1056 second=1058 amount=-4
+kerning first=1056 second=1059 amount=-2
+kerning first=1056 second=1060 amount=-1
+kerning first=1056 second=1061 amount=-4
+kerning first=1056 second=1071 amount=-2
+kerning first=1056 second=1072 amount=-3
+kerning first=1056 second=1076 amount=-7
+kerning first=1056 second=1077 amount=-4
+kerning first=1056 second=1086 amount=-4
+kerning first=1056 second=1101 amount=-2
+kerning first=1056 second=1103 amount=-3
+kerning first=1057 second=1040 amount=-2
+kerning first=1057 second=1044 amount=-2
+kerning first=1057 second=1047 amount=-1
+kerning first=1057 second=1051 amount=-3
+kerning first=1057 second=1052 amount=-1
+kerning first=1057 second=1054 amount=-2
+kerning first=1057 second=1058 amount=-3
+kerning first=1057 second=1059 amount=-3
+kerning first=1057 second=1061 amount=-5
+kerning first=1057 second=1063 amount=-3
+kerning first=1057 second=1066 amount=-3
+kerning first=1057 second=1069 amount=-1
+kerning first=1057 second=1072 amount=1
+kerning first=1057 second=1078 amount=2
+kerning first=1057 second=1095 amount=-1
+kerning first=1058 second=44 amount=-10
+kerning first=1058 second=46 amount=-10
+kerning first=1058 second=1040 amount=-3
+kerning first=1058 second=1044 amount=-3
+kerning first=1058 second=1046 amount=1
+kerning first=1058 second=1047 amount=-1
+kerning first=1058 second=1051 amount=-2
+kerning first=1058 second=1054 amount=-4
+kerning first=1058 second=1060 amount=-3
+kerning first=1058 second=1071 amount=-2
+kerning first=1058 second=1072 amount=-4
+kerning first=1058 second=1074 amount=-4
+kerning first=1058 second=1077 amount=-5
+kerning first=1058 second=1080 amount=-4
+kerning first=1058 second=1082 amount=-4
+kerning first=1058 second=1083 amount=-4
+kerning first=1058 second=1084 amount=-4
+kerning first=1058 second=1086 amount=-7
+kerning first=1058 second=1087 amount=-4
+kerning first=1058 second=1088 amount=-5
+kerning first=1058 second=1089 amount=-5
+kerning first=1058 second=1091 amount=-5
+kerning first=1058 second=1093 amount=-4
+kerning first=1058 second=1097 amount=-4
+kerning first=1058 second=1099 amount=-4
+kerning first=1058 second=1100 amount=-4
+kerning first=1058 second=1102 amount=-4
+kerning first=1058 second=1103 amount=-5
+kerning first=1059 second=44 amount=-12
+kerning first=1059 second=46 amount=-12
+kerning first=1059 second=58 amount=-2
+kerning first=1059 second=59 amount=-2
+kerning first=1059 second=1040 amount=-6
+kerning first=1059 second=1044 amount=-4
+kerning first=1059 second=1047 amount=-2
+kerning first=1059 second=1051 amount=-3
+kerning first=1059 second=1054 amount=-3
+kerning first=1059 second=1060 amount=-3
+kerning first=1059 second=1069 amount=-2
+kerning first=1059 second=1071 amount=-2
+kerning first=1059 second=1073 amount=-2
+kerning first=1059 second=1074 amount=-5
+kerning first=1059 second=1075 amount=-4
+kerning first=1059 second=1076 amount=-7
+kerning first=1059 second=1077 amount=-6
+kerning first=1059 second=1078 amount=-3
+kerning first=1059 second=1079 amount=-5
+kerning first=1059 second=1080 amount=-4
+kerning first=1059 second=1081 amount=-3
+kerning first=1059 second=1082 amount=-4
+kerning first=1059 second=1083 amount=-6
+kerning first=1059 second=1084 amount=-4
+kerning first=1059 second=1085 amount=-4
+kerning first=1059 second=1086 amount=-6
+kerning first=1059 second=1087 amount=-4
+kerning first=1059 second=1088 amount=-4
+kerning first=1059 second=1089 amount=-6
+kerning first=1059 second=1093 amount=-4
+kerning first=1059 second=1094 amount=-4
+kerning first=1059 second=1096 amount=-4
+kerning first=1059 second=1097 amount=-4
+kerning first=1059 second=1102 amount=-4
+kerning first=1059 second=1103 amount=-6
+kerning first=1060 second=1040 amount=-2
+kerning first=1060 second=1044 amount=-3
+kerning first=1060 second=1051 amount=-3
+kerning first=1060 second=1058 amount=-5
+kerning first=1060 second=1059 amount=-4
+kerning first=1060 second=1063 amount=-2
+kerning first=1060 second=1071 amount=-3
+kerning first=1060 second=1083 amount=-3
+kerning first=1061 second=1047 amount=-2
+kerning first=1061 second=1054 amount=-3
+kerning first=1061 second=1057 amount=-3
+kerning first=1061 second=1060 amount=-3
+kerning first=1061 second=1069 amount=-3
+kerning first=1061 second=1086 amount=-1
+kerning first=1061 second=1091 amount=-2
+kerning first=1062 second=1054 amount=-2
+kerning first=1062 second=1072 amount=2
+kerning first=1065 second=1072 amount=1
+kerning first=1065 second=1091 amount=2
+kerning first=1066 second=1071 amount=-3
+kerning first=1068 second=1040 amount=-2
+kerning first=1068 second=1044 amount=-2
+kerning first=1068 second=1046 amount=-3
+kerning first=1068 second=1047 amount=-1
+kerning first=1068 second=1051 amount=-3
+kerning first=1068 second=1052 amount=-2
+kerning first=1068 second=1054 amount=-2
+kerning first=1068 second=1057 amount=-2
+kerning first=1068 second=1058 amount=-9
+kerning first=1068 second=1061 amount=-4
+kerning first=1068 second=1063 amount=-7
+kerning first=1068 second=1069 amount=-1
+kerning first=1068 second=1071 amount=-4
+kerning first=1069 second=1044 amount=-3
+kerning first=1069 second=1046 amount=-1
+kerning first=1069 second=1047 amount=-1
+kerning first=1069 second=1051 amount=-3
+kerning first=1069 second=1061 amount=-3
+kerning first=1069 second=1071 amount=-2
+kerning first=1069 second=1076 amount=-3
+kerning first=1069 second=1078 amount=1
+kerning first=1069 second=1083 amount=-3
+kerning first=1069 second=1084 amount=-1
+kerning first=1069 second=1103 amount=-1
+kerning first=1070 second=1040 amount=-3
+kerning first=1070 second=1044 amount=-4
+kerning first=1070 second=1046 amount=-2
+kerning first=1070 second=1051 amount=-4
+kerning first=1070 second=1054 amount=-1
+kerning first=1070 second=1057 amount=-1
+kerning first=1070 second=1058 amount=-5
+kerning first=1070 second=1061 amount=-4
+kerning first=1070 second=1063 amount=-3
+kerning first=1070 second=1076 amount=-4
+kerning first=1070 second=1083 amount=-4
+kerning first=1070 second=1084 amount=-1
+kerning first=1072 second=1079 amount=-1
+kerning first=1072 second=1090 amount=-2
+kerning first=1072 second=1091 amount=-1
+kerning first=1072 second=1095 amount=-2
+kerning first=1073 second=1072 amount=-2
+kerning first=1073 second=1076 amount=-4
+kerning first=1073 second=1077 amount=-1
+kerning first=1073 second=1078 amount=-1
+kerning first=1073 second=1079 amount=-2
+kerning first=1073 second=1083 amount=-4
+kerning first=1073 second=1084 amount=-2
+kerning first=1073 second=1089 amount=-1
+kerning first=1073 second=1091 amount=-2
+kerning first=1073 second=1092 amount=-1
+kerning first=1073 second=1093 amount=-3
+kerning first=1073 second=1095 amount=-3
+kerning first=1073 second=1098 amount=-3
+kerning first=1073 second=1101 amount=-1
+kerning first=1073 second=1103 amount=-2
+kerning first=1074 second=1072 amount=-1
+kerning first=1074 second=1073 amount=-1
+kerning first=1074 second=1076 amount=-1
+kerning first=1074 second=1077 amount=-1
+kerning first=1074 second=1078 amount=-1
+kerning first=1074 second=1079 amount=-1
+kerning first=1074 second=1083 amount=-2
+kerning first=1074 second=1084 amount=-1
+kerning first=1074 second=1086 amount=-1
+kerning first=1074 second=1089 amount=-1
+kerning first=1074 second=1090 amount=-2
+kerning first=1074 second=1091 amount=-2
+kerning first=1074 second=1092 amount=-1
+kerning first=1074 second=1095 amount=-4
+kerning first=1074 second=1098 amount=-3
+kerning first=1074 second=1103 amount=-1
+kerning first=1075 second=44 amount=-11
+kerning first=1075 second=46 amount=-11
+kerning first=1075 second=1072 amount=-2
+kerning first=1075 second=1076 amount=-4
+kerning first=1075 second=1077 amount=-2
+kerning first=1075 second=1079 amount=-1
+kerning first=1075 second=1083 amount=-2
+kerning first=1075 second=1086 amount=-2
+kerning first=1075 second=1089 amount=-2
+kerning first=1075 second=1103 amount=-1
+kerning first=1076 second=1098 amount=-2
+kerning first=1076 second=1101 amount=1
+kerning first=1077 second=1073 amount=-1
+kerning first=1077 second=1076 amount=-2
+kerning first=1077 second=1078 amount=-1
+kerning first=1077 second=1079 amount=-2
+kerning first=1077 second=1083 amount=-3
+kerning first=1077 second=1090 amount=-3
+kerning first=1077 second=1091 amount=-1
+kerning first=1077 second=1093 amount=-2
+kerning first=1077 second=1095 amount=-3
+kerning first=1078 second=1073 amount=1
+kerning first=1078 second=1091 amount=1
+kerning first=1078 second=1095 amount=-1
+kerning first=1078 second=1098 amount=2
+kerning first=1079 second=1073 amount=-1
+kerning first=1079 second=1076 amount=-2
+kerning first=1079 second=1077 amount=-1
+kerning first=1079 second=1079 amount=-1
+kerning first=1079 second=1083 amount=-1
+kerning first=1079 second=1086 amount=-1
+kerning first=1079 second=1089 amount=-1
+kerning first=1079 second=1091 amount=-1
+kerning first=1079 second=1092 amount=-1
+kerning first=1079 second=1095 amount=-3
+kerning first=1079 second=1098 amount=-2
+kerning first=1082 second=1072 amount=2
+kerning first=1082 second=1073 amount=2
+kerning first=1082 second=1077 amount=1
+kerning first=1082 second=1079 amount=1
+kerning first=1082 second=1083 amount=1
+kerning first=1082 second=1086 amount=1
+kerning first=1082 second=1089 amount=1
+kerning first=1082 second=1090 amount=1
+kerning first=1082 second=1091 amount=1
+kerning first=1082 second=1101 amount=1
+kerning first=1083 second=1086 amount=1
+kerning first=1083 second=1095 amount=-2
+kerning first=1084 second=1073 amount=-1
+kerning first=1084 second=1079 amount=-1
+kerning first=1084 second=1091 amount=1
+kerning first=1086 second=1076 amount=-2
+kerning first=1086 second=1078 amount=-1
+kerning first=1086 second=1079 amount=-1
+kerning first=1086 second=1083 amount=-2
+kerning first=1086 second=1090 amount=-2
+kerning first=1086 second=1091 amount=-1
+kerning first=1086 second=1093 amount=-1
+kerning first=1086 second=1095 amount=-2
+kerning first=1088 second=1076 amount=-2
+kerning first=1088 second=1079 amount=-1
+kerning first=1088 second=1083 amount=-3
+kerning first=1088 second=1090 amount=-2
+kerning first=1088 second=1091 amount=-1
+kerning first=1088 second=1093 amount=-1
+kerning first=1088 second=1095 amount=-2
+kerning first=1088 second=1103 amount=-1
+kerning first=1089 second=1078 amount=1
+kerning first=1089 second=1086 amount=1
+kerning first=1089 second=1095 amount=-1
+kerning first=1089 second=1101 amount=1
+kerning first=1090 second=44 amount=-10
+kerning first=1090 second=46 amount=-10
+kerning first=1090 second=1072 amount=-1
+kerning first=1090 second=1076 amount=-3
+kerning first=1090 second=1077 amount=-1
+kerning first=1090 second=1078 amount=3
+kerning first=1090 second=1083 amount=-2
+kerning first=1090 second=1086 amount=-1
+kerning first=1090 second=1089 amount=-1
+kerning first=1090 second=1091 amount=1
+kerning first=1091 second=44 amount=-9
+kerning first=1091 second=46 amount=-9
+kerning first=1091 second=1072 amount=-1
+kerning first=1091 second=1073 amount=1
+kerning first=1091 second=1076 amount=-3
+kerning first=1091 second=1077 amount=-1
+kerning first=1091 second=1078 amount=1
+kerning first=1091 second=1083 amount=-2
+kerning first=1091 second=1084 amount=-1
+kerning first=1091 second=1086 amount=-1
+kerning first=1091 second=1088 amount=-1
+kerning first=1091 second=1089 amount=-1
+kerning first=1091 second=1092 amount=-1
+kerning first=1091 second=1101 amount=-1
+kerning first=1091 second=1103 amount=-1
+kerning first=1092 second=1073 amount=-1
+kerning first=1092 second=1076 amount=-2
+kerning first=1092 second=1083 amount=-2
+kerning first=1092 second=1090 amount=-2
+kerning first=1092 second=1091 amount=-1
+kerning first=1092 second=1095 amount=-2
+kerning first=1092 second=1103 amount=-1
+kerning first=1093 second=1072 amount=-1
+kerning first=1093 second=1073 amount=-1
+kerning first=1093 second=1077 amount=-1
+kerning first=1093 second=1079 amount=-1
+kerning first=1093 second=1086 amount=-1
+kerning first=1093 second=1089 amount=-1
+kerning first=1093 second=1090 amount=-1
+kerning first=1093 second=1092 amount=-1
+kerning first=1093 second=1095 amount=-2
+kerning first=1094 second=1077 amount=-1
+kerning first=1094 second=1079 amount=-1
+kerning first=1094 second=1086 amount=-1
+kerning first=1094 second=1089 amount=-1
+kerning first=1097 second=1077 amount=-1
+kerning first=1097 second=1086 amount=-1
+kerning first=1097 second=1091 amount=1
+kerning first=1100 second=1090 amount=-7
+kerning first=1100 second=1095 amount=-6
+kerning first=1101 second=1076 amount=-2
+kerning first=1101 second=1077 amount=1
+kerning first=1101 second=1079 amount=-1
+kerning first=1101 second=1083 amount=-2
+kerning first=1101 second=1086 amount=1
+kerning first=1101 second=1090 amount=-2
+kerning first=1101 second=1093 amount=-1
+kerning first=1101 second=1103 amount=-1
+kerning first=1102 second=1076 amount=-2
+kerning first=1102 second=1078 amount=-1
+kerning first=1102 second=1083 amount=-2
+kerning first=1102 second=1084 amount=-1
+kerning first=1102 second=1090 amount=-2
+kerning first=1102 second=1093 amount=-1
+kerning first=1102 second=1095 amount=-2
diff --git a/samples/bin/library/arial_sdf.png b/samples/bin/library/arial_sdf.png
new file mode 100644
index 00000000..68480bd6
--- /dev/null
+++ b/samples/bin/library/arial_sdf.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:043be34845f339c693797558450f05022c93c2d8f214842154ebb257e07c38b6
+size 98202
diff --git a/samples/bin/library/sdf_material.json b/samples/bin/library/font_bm_material.json
similarity index 72%
rename from samples/bin/library/sdf_material.json
rename to samples/bin/library/font_bm_material.json
index 153da736..fccdf859 100644
--- a/samples/bin/library/sdf_material.json
+++ b/samples/bin/library/font_bm_material.json
@@ -1,16 +1,14 @@
 {
     "passes" : [{
-        "shader" : "sdf_shader.json",
+        "shader" : "font_bm_shader.json",
         "state_block" : {
-            "capabilities_state" : {
-                "depth_test" : false,
-                "blending" : true
-            },
             "blending_state" : {
                 "src_factor" : "src_alpha",
                 "dst_factor" : "one_minus_src_alpha"
+            },
+            "capabilities_state" : {
+                "blending" : true
             }
         }
-    }],
-    "property_block" : {}
+    }]
 }
diff --git a/samples/bin/library/font_bm_shader.frag b/samples/bin/library/font_bm_shader.frag
new file mode 100644
index 00000000..659abd18
--- /dev/null
+++ b/samples/bin/library/font_bm_shader.frag
@@ -0,0 +1,8 @@
+uniform sampler2D u_texture;
+
+varying vec2 v_st0;
+varying vec4 v_color;
+
+void main() {
+    gl_FragColor = texture2D(u_texture, v_st0) * v_color;
+}
diff --git a/samples/bin/library/font_bm_shader.json b/samples/bin/library/font_bm_shader.json
new file mode 100644
index 00000000..4c34f74d
--- /dev/null
+++ b/samples/bin/library/font_bm_shader.json
@@ -0,0 +1,4 @@
+{
+    "vertex" : "font_bm_shader.vert",
+    "fragment" : "font_bm_shader.frag"
+}
diff --git a/samples/bin/library/font_shader.vert b/samples/bin/library/font_bm_shader.vert
similarity index 100%
rename from samples/bin/library/font_shader.vert
rename to samples/bin/library/font_bm_shader.vert
diff --git a/samples/bin/library/font_material.json b/samples/bin/library/font_sdf_material.json
similarity index 61%
rename from samples/bin/library/font_material.json
rename to samples/bin/library/font_sdf_material.json
index 13216dd9..b3b76807 100644
--- a/samples/bin/library/font_material.json
+++ b/samples/bin/library/font_sdf_material.json
@@ -1,16 +1,14 @@
 {
     "passes" : [{
-        "shader" : "font_shader.json",
+        "shader" : "font_sdf_shader.json",
         "state_block" : {
-            "capabilities_state" : {
-                "depth_test" : false,
-                "blending" : true
-            },
             "blending_state" : {
-                "src_factor" : "src_alpha",
+                "src_factor" : "one",
                 "dst_factor" : "one_minus_src_alpha"
+            },
+            "capabilities_state" : {
+                "blending" : true
             }
         }
-    }],
-    "property_block" : {}
+    }]
 }
diff --git a/samples/bin/library/font_sdf_shader.frag b/samples/bin/library/font_sdf_shader.frag
new file mode 100644
index 00000000..2fb8e219
--- /dev/null
+++ b/samples/bin/library/font_sdf_shader.frag
@@ -0,0 +1,29 @@
+uniform sampler2D u_texture;
+
+uniform float u_glyph_dilate;
+uniform float u_outline_width;
+uniform vec4 u_outline_color;
+
+varying vec2 v_st0;
+varying vec4 v_color;
+
+void main() {
+    float distance = texture2D(u_texture, v_st0).a;
+    float width = fwidth(distance);
+
+    float glyph_center = 0.5 - u_glyph_dilate * 0.5;
+    float outline_center = glyph_center - u_outline_width * 0.5;
+
+    float glyph_alpha = smoothstep(glyph_center - width, glyph_center + width, distance);
+    float outline_alpha = smoothstep(outline_center - width, outline_center + width, distance);
+
+    vec4 glyph_color = vec4(v_color.rgb * v_color.a, v_color.a);
+    vec4 outline_color = vec4(u_outline_color.rgb * u_outline_color.a, u_outline_color.a);
+
+    vec2 layers_mask = vec2(
+        step(0.01, v_color.a),
+        step(0.01, u_outline_color.a * u_outline_width));
+
+    gl_FragColor = glyph_alpha * glyph_color * layers_mask.x +
+        outline_alpha * outline_color * layers_mask.y * (1.0 - glyph_alpha);
+}
diff --git a/samples/bin/library/font_sdf_shader.json b/samples/bin/library/font_sdf_shader.json
new file mode 100644
index 00000000..7b783435
--- /dev/null
+++ b/samples/bin/library/font_sdf_shader.json
@@ -0,0 +1,4 @@
+{
+    "vertex" : "font_sdf_shader.vert",
+    "fragment" : "font_sdf_shader.frag"
+}
diff --git a/samples/bin/library/sdf_shader.vert b/samples/bin/library/font_sdf_shader.vert
similarity index 100%
rename from samples/bin/library/sdf_shader.vert
rename to samples/bin/library/font_sdf_shader.vert
diff --git a/samples/bin/library/font_shader.frag b/samples/bin/library/font_shader.frag
deleted file mode 100644
index 53c9ff8f..00000000
--- a/samples/bin/library/font_shader.frag
+++ /dev/null
@@ -1,9 +0,0 @@
-uniform sampler2D u_texture;
-
-varying vec2 v_st0;
-varying vec4 v_color;
-
-void main() {
-    vec2 st = vec2(v_st0.s, v_st0.t);
-    gl_FragColor = texture2D(u_texture, st) * v_color;
-}
diff --git a/samples/bin/library/font_shader.json b/samples/bin/library/font_shader.json
deleted file mode 100644
index bd0f6615..00000000
--- a/samples/bin/library/font_shader.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "vertex" : "font_shader.vert",
-    "fragment" : "font_shader.frag"
-}
diff --git a/samples/bin/library/label_bm_prefab.json b/samples/bin/library/label_bm_prefab.json
new file mode 100644
index 00000000..bc9a915b
--- /dev/null
+++ b/samples/bin/library/label_bm_prefab.json
@@ -0,0 +1,15 @@
+{
+    "components" : {
+        "renderer" : {
+            "materials" : [
+                "font_bm_material.json"
+            ]
+        },
+        "model_renderer" : {},
+        "label" : {
+            "font" : "arial_bm.fnt",
+            "text" : "Hello World!"
+        },
+        "label.dirty" : {}
+    }
+}
diff --git a/samples/bin/library/label_sdf_prefab.json b/samples/bin/library/label_sdf_prefab.json
new file mode 100644
index 00000000..19c0f738
--- /dev/null
+++ b/samples/bin/library/label_sdf_prefab.json
@@ -0,0 +1,15 @@
+{
+    "components" : {
+        "renderer" : {
+            "materials" : [
+                "font_sdf_material.json"
+            ]
+        },
+        "model_renderer" : {},
+        "label" : {
+            "font" : "arial_sdf.fnt",
+            "text" : "Hello World!"
+        },
+        "label.dirty" : {}
+    }
+}
diff --git a/samples/bin/library/scene_prefab.json b/samples/bin/library/scene_prefab.json
index 5cc9596d..898d737a 100644
--- a/samples/bin/library/scene_prefab.json
+++ b/samples/bin/library/scene_prefab.json
@@ -8,7 +8,7 @@
         "prototype" : "gnome_prefab.json",
         "components" : {
             "actor" : {
-                "translation" : [0,50,0],
+                "translation" : [0,0,0],
                 "scale" : 20
             }
         }
@@ -26,5 +26,31 @@
                 "translation" : [50,-50,0]
             }
         }
+    }, {
+        "prototype" : "label_bm_prefab.json",
+        "components" : {
+            "label" : {
+                "text" : "bm font",
+                "valign" : "center"
+            },
+            "actor" : {
+                "translation" : [0,180,0],
+                "scale" : 3
+            }
+        }
+    }, {
+        "prototype" : "label_sdf_prefab.json",
+        "components" : {
+            "label" : {
+                "text" : "sdf font",
+                "valign" : "center",
+                "outline_width" : 0.2,
+                "outline_color" : [0,0,0,255]
+            },
+            "actor" : {
+                "translation" : [0,-180,0],
+                "scale" : 3
+            }
+        }
     }]
 }
diff --git a/samples/bin/library/sdf_shader.frag b/samples/bin/library/sdf_shader.frag
deleted file mode 100644
index c6958018..00000000
--- a/samples/bin/library/sdf_shader.frag
+++ /dev/null
@@ -1,28 +0,0 @@
-uniform sampler2D u_texture;
-uniform float u_char_width;
-uniform float u_char_edge;
-uniform float u_outline_width;
-uniform float u_outline_edge;
-uniform vec4 u_outline_color;
-uniform float u_shadow_width;
-uniform float u_shadow_edge;
-uniform vec2 u_shadow_offset;
-uniform vec4 u_shadow_color;
-
-varying vec2 v_st0;
-varying vec4 v_color;
-
-void main() {
-    float distance = 1.0 - texture2D(u_texture, v_st0).a;
-    float alpha = 1.0 - smoothstep(u_char_width, u_char_width + u_char_edge, distance);
-
-    float outline_alpha = 1.0 - smoothstep(u_outline_width, u_outline_width + u_outline_edge, distance);
-    float overall_alpha = alpha + (1.0 - alpha) * outline_alpha;
-    vec4 overall_color = mix(u_outline_color, v_color, alpha / overall_alpha);
-
-    float distance_shadow = 1.0 - texture2D(u_texture, v_st0 + u_shadow_offset).a;
-    float shadow_alpha = 1.0 - smoothstep(u_shadow_width, u_shadow_width + u_shadow_edge, distance_shadow);
-    vec4  shadow = vec4(u_shadow_color.rgb, shadow_alpha);
-
-    gl_FragColor = mix(shadow, overall_color, overall_alpha);
-}
diff --git a/samples/bin/library/sdf_shader.json b/samples/bin/library/sdf_shader.json
deleted file mode 100644
index c56b2e8d..00000000
--- a/samples/bin/library/sdf_shader.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "vertex" : "sdf_shader.vert",
-    "fragment" : "sdf_shader.frag"
-}

From f0f18c42490afc651007e8d3ca4b05cdfb3fd632 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Tue, 20 Aug 2019 08:47:42 +0700
Subject: [PATCH 074/108] update ecs.hpp module

---
 modules/ecs.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ecs.hpp b/modules/ecs.hpp
index ebbb5bf3..d32f4386 160000
--- a/modules/ecs.hpp
+++ b/modules/ecs.hpp
@@ -1 +1 @@
-Subproject commit ebbb5bf30ddfcbe8e5828e7ea43b430f777c9b0f
+Subproject commit d32f438684545f29e91c3c5d7159cd583aa91dff

From a812e4882845bef51f191b937a10aa35f9c03023 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Wed, 21 Aug 2019 07:21:23 +0700
Subject: [PATCH 075/108] grayscale png as A8 by default

---
 samples/bin/library/arial_sdf.png                      | 4 ++--
 sources/enduro2d/utils/image_impl/image_reader_stb.cpp | 2 +-
 sources/enduro2d/utils/image_impl/image_writer_stb.cpp | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/samples/bin/library/arial_sdf.png b/samples/bin/library/arial_sdf.png
index 68480bd6..e99b3bd2 100644
--- a/samples/bin/library/arial_sdf.png
+++ b/samples/bin/library/arial_sdf.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:043be34845f339c693797558450f05022c93c2d8f214842154ebb257e07c38b6
-size 98202
+oid sha256:ca1ca296c9b96cfccc469e1fa19f83019b95c77c564119db697595f418820440
+size 89901
diff --git a/sources/enduro2d/utils/image_impl/image_reader_stb.cpp b/sources/enduro2d/utils/image_impl/image_reader_stb.cpp
index cbac50fe..5bc23029 100644
--- a/sources/enduro2d/utils/image_impl/image_reader_stb.cpp
+++ b/sources/enduro2d/utils/image_impl/image_reader_stb.cpp
@@ -48,7 +48,7 @@ namespace
 
     image_data_format image_format_from_stb_channels(u32 channels) noexcept {
         switch ( channels ) {
-            case 1: return image_data_format::l8;
+            case 1: return image_data_format::a8;
             case 2: return image_data_format::la8;
             case 3: return image_data_format::rgb8;
             case 4: return image_data_format::rgba8;
diff --git a/sources/enduro2d/utils/image_impl/image_writer_stb.cpp b/sources/enduro2d/utils/image_impl/image_writer_stb.cpp
index 50a60768..faec106e 100644
--- a/sources/enduro2d/utils/image_impl/image_writer_stb.cpp
+++ b/sources/enduro2d/utils/image_impl/image_writer_stb.cpp
@@ -44,7 +44,7 @@ namespace
 
     bool stb_check_save_image_format(image_data_format format) noexcept {
         switch ( format ) {
-            case image_data_format::l8:
+            case image_data_format::a8:
             case image_data_format::la8:
             case image_data_format::rgb8:
             case image_data_format::rgba8:
@@ -56,7 +56,7 @@ namespace
 
     int stb_channels_from_image_format(image_data_format format) noexcept {
         switch ( format ) {
-            case image_data_format::l8: return 1;
+            case image_data_format::a8: return 1;
             case image_data_format::la8: return 2;
             case image_data_format::rgb8: return 3;
             case image_data_format::rgba8: return 4;

From b7b2b5889f2522ffb9960dc46bc0001ccdcb1937 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Wed, 21 Aug 2019 07:23:27 +0700
Subject: [PATCH 076/108] label: add leading and tracking props

---
 headers/enduro2d/high/components/label.hpp    | 52 ++++++++++++++-----
 sources/enduro2d/high/components/label.cpp    | 40 ++++++++++----
 .../utils/font_impl/font_reader_bmfont.cpp    |  4 ++
 untests/sources/untests_utils/font.cpp        |  2 +-
 4 files changed, 74 insertions(+), 24 deletions(-)

diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
index 29327218..7b10ea18 100644
--- a/headers/enduro2d/high/components/label.hpp
+++ b/headers/enduro2d/high/components/label.hpp
@@ -43,15 +43,21 @@ namespace e2d
         label& tint(const color32& value) noexcept;
         [[nodiscard]] const color32& tint() const noexcept;
 
-        label& width(f32 value) noexcept;
-        [[nodiscard]] f32 width() const noexcept;
-
         label& haligh(haligns value) noexcept;
         [[nodiscard]] haligns halign() const noexcept;
 
         label& valigh(valigns value) noexcept;
         [[nodiscard]] valigns valign() const noexcept;
 
+        label& leading(f32 value) noexcept;
+        [[nodiscard]] f32 leading() const noexcept;
+
+        label& tracking(f32 value) noexcept;
+        [[nodiscard]] f32 tracking() const noexcept;
+
+        label& text_width(f32 value) noexcept;
+        [[nodiscard]] f32 text_width() const noexcept;
+
         label& glyph_dilate(f32 value) noexcept;
         [[nodiscard]] f32 glyph_dilate() const noexcept;
 
@@ -64,9 +70,11 @@ namespace e2d
         str32 text_;
         font_asset::ptr font_;
         color32 tint_ = color32::white();
-        f32 width_ = 0.f;
         haligns halign_ = haligns::center;
         valigns valign_ = valigns::baseline;
+        f32 leading_ = 1.f;
+        f32 tracking_ = 0.f;
+        f32 text_width_ = 0.f;
         f32 glyph_dilate_ = 0.f;
         f32 outline_width_ = 0.f;
         color32 outline_color_ = color32::white();
@@ -133,15 +141,6 @@ namespace e2d
         return tint_;
     }
 
-    inline label& label::width(f32 value) noexcept {
-        width_ = value;
-        return *this;
-    }
-
-    inline f32 label::width() const noexcept {
-        return width_;
-    }
-
     inline label& label::haligh(haligns value) noexcept {
         halign_ = value;
         return *this;
@@ -160,6 +159,33 @@ namespace e2d
         return valign_;
     }
 
+    inline label& label::leading(f32 value) noexcept {
+        leading_ = value;
+        return *this;
+    }
+
+    inline f32 label::leading() const noexcept {
+        return leading_;
+    }
+
+    inline label& label::tracking(f32 value) noexcept {
+        tracking_ = value;
+        return *this;
+    }
+
+    inline f32 label::tracking() const noexcept {
+        return tracking_;
+    }
+
+    inline label& label::text_width(f32 value) noexcept {
+        text_width_ = value;
+        return *this;
+    }
+
+    inline f32 label::text_width() const noexcept {
+        return text_width_;
+    }
+
     inline label& label::glyph_dilate(f32 value) noexcept {
         glyph_dilate_ = value;
         return *this;
diff --git a/sources/enduro2d/high/components/label.cpp b/sources/enduro2d/high/components/label.cpp
index 3b7baa27..6dc76fb8 100644
--- a/sources/enduro2d/high/components/label.cpp
+++ b/sources/enduro2d/high/components/label.cpp
@@ -40,9 +40,11 @@ namespace e2d
             "text" : { "type" : "string" },
             "font" : { "$ref": "#/common_definitions/address" },
             "tint" : { "$ref": "#/common_definitions/color" },
-            "width" : { "type" : "number" },
             "halign" : { "$ref": "#/definitions/haligns" },
             "valign" : { "$ref": "#/definitions/valigns" },
+            "leading" : { "type" : "number" },
+            "tracking" : { "type" : "number" },
+            "text_width" : { "type" : "number" },
             "glyph_dilate" : { "type" : "number" },
             "outline_width" : { "type" : "number" },
             "outline_color" : { "$ref": "#/common_definitions/color" }
@@ -104,15 +106,6 @@ namespace e2d
             component.tint(tint);
         }
 
-        if ( ctx.root.HasMember("width") ) {
-            f32 width = component.width();
-            if ( !json_utils::try_parse_value(ctx.root["width"], width) ) {
-                the<debug>().error("LABEL: Incorrect formatting of 'width' property");
-                return false;
-            }
-            component.width(width);
-        }
-
         if ( ctx.root.HasMember("halign") ) {
             label::haligns halign = component.halign();
             if ( !parse_halign(ctx.root["halign"].GetString(), halign) ) {
@@ -131,6 +124,33 @@ namespace e2d
             component.valigh(valign);
         }
 
+        if ( ctx.root.HasMember("leading") ) {
+            f32 leading = component.leading();
+            if ( !json_utils::try_parse_value(ctx.root["leading"], leading) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'leading' property");
+                return false;
+            }
+            component.leading(leading);
+        }
+
+        if ( ctx.root.HasMember("tracking") ) {
+            f32 tracking = component.tracking();
+            if ( !json_utils::try_parse_value(ctx.root["tracking"], tracking) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'tracking' property");
+                return false;
+            }
+            component.tracking(tracking);
+        }
+
+        if ( ctx.root.HasMember("text_width") ) {
+            f32 text_width = component.text_width();
+            if ( !json_utils::try_parse_value(ctx.root["text_width"], text_width) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'text_width' property");
+                return false;
+            }
+            component.text_width(text_width);
+        }
+
         if ( ctx.root.HasMember("glyph_dilate") ) {
             f32 glyph_dilate = component.glyph_dilate();
             if ( !json_utils::try_parse_value(ctx.root["glyph_dilate"], glyph_dilate) ) {
diff --git a/sources/enduro2d/utils/font_impl/font_reader_bmfont.cpp b/sources/enduro2d/utils/font_impl/font_reader_bmfont.cpp
index f88bc8ed..f11141d0 100644
--- a/sources/enduro2d/utils/font_impl/font_reader_bmfont.cpp
+++ b/sources/enduro2d/utils/font_impl/font_reader_bmfont.cpp
@@ -329,6 +329,10 @@ namespace e2d::fonts::impl
         }
 
         for ( auto& glyph : font_content.glyphs ) {
+            glyph.second.offset.y =
+                0 -
+                glyph.second.offset.y -
+                glyph.second.tex_rect.size.y;
             glyph.second.tex_rect.position.y =
                 font_content.info.atlas_size.y -
                 glyph.second.tex_rect.position.y -
diff --git a/untests/sources/untests_utils/font.cpp b/untests/sources/untests_utils/font.cpp
index 65baf767..94af8ec2 100644
--- a/untests/sources/untests_utils/font.cpp
+++ b/untests/sources/untests_utils/font.cpp
@@ -53,7 +53,7 @@ TEST_CASE("font") {
         {
             // char id=33 x=448 y=386 width=10 height=40 xoffset=5 yoffset=10 xadvance=14 page=0 chnl=0
             font::glyph_info c;
-            c.offset = v2i(5, 10);
+            c.offset = v2i(5, -50);
             c.tex_rect = b2u(448, 86, 10, 40);
             c.advance = 14;
             REQUIRE(*f.find_glyph(33) == c);

From c29c1643f0d3338df2b5260469bfca6604273ff8 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Wed, 21 Aug 2019 07:53:24 +0700
Subject: [PATCH 077/108] rewrite label_system

---
 .../enduro2d/high/systems/label_system.cpp    | 588 ++++++++++--------
 1 file changed, 333 insertions(+), 255 deletions(-)

diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index 17065466..8278fb5b 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -6,59 +6,352 @@
 
 #include <enduro2d/high/systems/label_system.hpp>
 
+#include <enduro2d/high/assets/font_asset.hpp>
+#include <enduro2d/high/assets/texture_asset.hpp>
+
 #include <enduro2d/high/components/label.hpp>
 #include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/model_renderer.hpp>
-#include <enduro2d/high/assets/texture_asset.hpp>
-#include <enduro2d/high/assets/shader_asset.hpp>
 
 namespace
 {
     using namespace e2d;
 
-    f32 get_x_pos(const label& l, f32 string_width) {
-        f32 x_pos{0};
-        switch ( l.halign() ) {
-            case label::haligns::left :
-                x_pos = 0;
-            break;
-            case label::haligns::center :
-                x_pos = -0.5f * string_width;
-            break;
-            case label::haligns::right :
-                x_pos = -string_width;
-            break;
-            default:
-                E2D_ASSERT_MSG(false,"label_system: uncknow horizontal align flag");
-            break;
+    class geometry_builder {
+    public:
+        geometry_builder() = default;
+
+        void add_quad(
+            const b2f& rect,
+            const b2f& texrect,
+            const color32& color)
+        {
+            const std::size_t start_vertex = vertices_.size();
+
+            // Y
+            // ^
+            // | 3 - 2
+            // | | / |
+            // | 0 - 1
+            // +------> X
+
+            {
+                const v2f& gp = rect.position;
+                const v2f& gs = rect.size;
+
+                vertices_.emplace_back(gp.x + 0.0f, gp.y + 0.0f, 0.f);
+                vertices_.emplace_back(gp.x + gs.x, gp.y + 0.0f, 0.f);
+                vertices_.emplace_back(gp.x + gs.x, gp.y + gs.y, 0.f);
+                vertices_.emplace_back(gp.x + 0.0f, gp.y + gs.y, 0.f);
+            }
+
+            {
+                const v2f& tp = texrect.position;
+                const v2f& ts = texrect.size;
+
+                uvs_.emplace_back(tp.x + 0.0f, tp.y + 0.0f);
+                uvs_.emplace_back(tp.x + ts.x, tp.y + 0.0f);
+                uvs_.emplace_back(tp.x + ts.x, tp.y + ts.y);
+                uvs_.emplace_back(tp.x + 0.0f, tp.y + ts.y);
+            }
+
+            {
+                indices_.emplace_back(start_vertex + 0u);
+                indices_.emplace_back(start_vertex + 1u);
+                indices_.emplace_back(start_vertex + 2u);
+                indices_.emplace_back(start_vertex + 2u);
+                indices_.emplace_back(start_vertex + 3u);
+                indices_.emplace_back(start_vertex + 0u);
+            }
+
+            {
+                colors_.emplace_back(color);
+                colors_.emplace_back(color);
+                colors_.emplace_back(color);
+                colors_.emplace_back(color);
+            }
         }
 
-        return x_pos;
+        void update_model(model_renderer& mr) {
+            mesh new_mesh;
+            new_mesh.set_vertices(vertices_);
+            new_mesh.set_indices(0, indices_);
+            new_mesh.set_uvs(0, uvs_);
+            new_mesh.set_colors(0, colors_);
+
+            model new_model;
+            new_model.set_mesh(mesh_asset::create(std::move(new_mesh)));
+            new_model.regenerate_geometry(the<render>());
+
+            if ( mr.model() ) {
+                mr.model()->fill(std::move(new_model));
+            } else {
+                mr.model(model_asset::create(std::move(new_model)));
+            }
+        }
+
+        void clear() noexcept {
+            vertices_.clear();
+            uvs_.clear();
+            indices_.clear();
+            colors_.clear();
+        }
+    private:
+        vector<v3f> vertices_;
+        vector<v2f> uvs_;
+        vector<u32> indices_;
+        vector<color32> colors_;
+    };
+}
+
+namespace
+{
+    using namespace e2d;
+
+    f32 calculate_halign_offset(
+        label::haligns halign,
+        f32 string_width) noexcept
+    {
+        switch ( halign ) {
+        case label::haligns::left:
+            return 0.0f;
+        case label::haligns::center:
+            return -0.5f * string_width;
+        case label::haligns::right:
+            return -1.0f * string_width;
+        default:
+            E2D_ASSERT_MSG(false, "unexpected label halign");
+            return 0.f;
+        }
     }
 
-    f32 get_top_pos(const label& l, u32 strings_count) {
-        const auto& f = l.font()->content();
-        f32 label_height = f.info().line_height * strings_count;
-        f32 top{0};
-        switch ( l.valign() ) {
-            case label::valigns::top:
-                top = label_height;
-            break;
-            case label::valigns::center:
-                top = 0.5f * label_height;
-            break;
-            case label::valigns::bottom:
-                top = 0;
-            break;
-            case label::valigns::baseline:
-                top = label_height - (f.info().line_height - f.info().glyph_ascent);
-            break;
-            default:
-                E2D_ASSERT_MSG(false,"label_system: uncknow vertical align flag");
-            break;
+    f32 calculate_valign_offset(
+        label::valigns valign,
+        f32 leading,
+        u32 glyph_ascent,
+        u32 line_height,
+        std::size_t string_count) noexcept
+    {
+        const f32 label_height = string_count > 1u
+            ? line_height + line_height * leading * (string_count - 1u)
+            : line_height;
+
+        switch ( valign ) {
+        case label::valigns::top:
+            return 0.f;
+        case label::valigns::center:
+            return 0.5f * label_height;
+        case label::valigns::bottom:
+            return 1.0f * label_height;
+        case label::valigns::baseline:
+            return 1.0f * glyph_ascent;
+        default:
+            E2D_ASSERT_MSG(false, "unexpected label valign");
+            return 0.f;
+        }
+    }
+
+    std::size_t calculate_string_count(str32_view text) noexcept {
+        std::size_t count{0u};
+        for ( std::size_t i = 0; i < text.size(); ++i ) {
+            if ( text[i] == '\n' ) {
+                ++count;
+            }
+        }
+        return count;
+    }
+}
+
+namespace
+{
+    using namespace e2d;
+
+    void update_label_material(const label& l, renderer& r) {
+        if ( r.materials().empty() ) {
+            return;
         }
 
-        return top;
+        auto texture_p = the<library>().load_asset<texture_asset>(
+            l.font()->content().info().atlas_file);
+
+        const f32 glyph_dilate = math::clamp(l.glyph_dilate(), -1.f, 1.0f);
+        const f32 outline_width = math::clamp(l.outline_width(), 0.f, 1.f - glyph_dilate);
+        const v4f outline_color = make_vec4(color(l.outline_color()));
+
+        r.properties(render::property_block()
+            .sampler("u_texture", render::sampler_state()
+                .texture(texture_p->content())
+                .min_filter(render::sampler_min_filter::linear)
+                .mag_filter(render::sampler_mag_filter::linear))
+            .property("u_glyph_dilate", glyph_dilate)
+            .property("u_outline_width", outline_width)
+            .property("u_outline_color", outline_color));
+    }
+
+    void update_label_geometry(const label& l, model_renderer& mr, geometry_builder& gb) {
+        if ( !l.font() || l.font()->content().empty() || l.text().empty() ) {
+            gb.update_model(mr);
+            return;
+        }
+
+        const str32& text = l.text();
+        const font& f = l.font()->content();
+
+        //
+        // update glyphs
+        //
+
+        struct glyph_desc {
+            const font::glyph_info* glyph{nullptr};
+            f32 kerning{0.f};
+        };
+
+        vector<glyph_desc> glyphs;
+        glyphs.reserve(text.size());
+
+        for ( std::size_t i = 0, e = text.size(); i < e; ++i ) {
+            glyph_desc desc;
+            desc.glyph = f.find_glyph(text[i]);
+            desc.kerning = i > 0
+                ? f.get_kerning(text[i-1], text[i])
+                : 0.f;
+            glyphs.push_back(std::move(desc));
+
+            if ( !desc.glyph && text[i] != '\n' ) {
+                the<debug>().warning("LABEL: Missing font glyph:\n"
+                    "--> Code Point: %0",
+                    text[i]);
+            }
+        }
+
+        f32 tracking_width = 0.f;
+        if ( const font::glyph_info* sp = f.find_glyph(' '); sp ) {
+            tracking_width = sp->advance * l.tracking();
+        }
+
+        //
+        // update strings
+        //
+
+        struct string_desc {
+            f32 width{0.f};
+            std::size_t start{0};
+            std::size_t length{0};
+
+            string_desc(std::size_t start)
+            : start(start) {}
+        };
+
+        vector<string_desc> strings;
+        strings.reserve(calculate_string_count(text));
+
+        f32 last_space_width = 0.f;
+        std::size_t last_space_index = std::size_t(-1);
+
+        strings.push_back(string_desc(0u));
+
+        for ( std::size_t i = 0, e = text.size(); i < e; ++i ) {
+            const u32 code_point = text[i];
+            const glyph_desc& glyph = glyphs[i];
+
+            if ( code_point == ' ' ) {
+                last_space_width = strings.back().width;
+                last_space_index = i;
+            }
+
+            bool new_line = false;
+
+            if ( code_point == '\n' ) {
+                new_line = true;
+                strings.back().length = i - strings.back().start;
+            } else if ( glyph.glyph ) {
+                strings.back().width +=
+                    glyph.kerning +
+                    glyph.glyph->advance +
+                    tracking_width;
+
+                const bool break_line =
+                    l.text_width() > 0.f &&
+                    last_space_index != std::size_t(-1) &&
+                    strings.back().width > l.text_width();
+
+                if ( break_line ) {
+                    new_line = true;
+                    strings.back().width = last_space_width;
+                    strings.back().length = last_space_index - strings.back().start;
+                    i = last_space_index;
+                }
+            }
+
+            if ( i == e - 1 ) {
+                new_line = true;
+                strings.back().length = i + 1 - strings.back().start;
+            }
+
+            if ( new_line ) {
+                if ( i < e - 1 ) {
+                    strings.push_back(string_desc(i + 1u));
+                }
+                last_space_width = 0.f;
+                last_space_index = std::size_t(-1);
+            }
+        }
+
+        //
+        // update geometry
+        //
+
+        v2f cursor = v2f::unit_y() * calculate_valign_offset(
+            l.valign(),
+            l.leading(),
+            f.info().glyph_ascent,
+            f.info().line_height,
+            strings.size());
+
+        for ( std::size_t i = 0, ie = strings.size(); i < ie; ++i ) {
+            cursor.x = calculate_halign_offset(l.halign(), strings[i].width);
+            for ( std::size_t j = strings[i].start, je = strings[i].start + strings[i].length; j < je; ++j ) {
+                const glyph_desc& glyph = glyphs[j];
+                if ( !glyph.glyph ) {
+                    continue;
+                }
+
+                cursor.x += glyph.kerning;
+
+                b2f rect = make_rect(cursor, glyph.glyph->tex_rect.size.cast_to<f32>());
+                rect.position += glyph.glyph->offset.cast_to<f32>();
+
+                b2f texrect = glyph.glyph->tex_rect.cast_to<f32>();
+                texrect.position /= f.info().atlas_size.cast_to<f32>();
+                texrect.size /= f.info().atlas_size.cast_to<f32>();
+
+                gb.add_quad(rect, texrect, l.tint());
+                cursor.x += glyph.glyph->advance + tracking_width;
+            }
+            cursor.y -= f.info().line_height * l.leading();
+        }
+
+        //
+        // update model
+        //
+
+        gb.update_model(mr);
+    }
+
+    void update_dirty_labels(ecs::registry& owner) {
+        geometry_builder gb;
+        owner.for_joined_components<label::dirty, label, renderer, model_renderer>([&gb](
+            const ecs::const_entity&,
+            const label::dirty&,
+            const label& l,
+            renderer& r,
+            model_renderer& mr
+        ){
+            update_label_material(l, r);
+            update_label_geometry(l, mr, gb);
+            gb.clear();
+        });
+        owner.remove_all_components<label::dirty>();
     }
 }
 
@@ -74,222 +367,7 @@ namespace e2d
         ~internal_state() noexcept = default;
 
         void process(ecs::registry& owner) {
-            owner.for_joined_components<label::dirty, label, renderer, model_renderer>([](
-                const ecs::const_entity&,
-                const label::dirty&,
-                const label& l,
-                renderer& r,
-                model_renderer& mr)
-            {
-                vector<v3f> vertices;
-                vector<u32> indices;
-                vector<v2f> uvs;
-                vector<v3f> normals;
-                vector<color32> colors;
-                v2f offset;
-                f32 kerning{0};
-                u32 prev_char{0};
-                str32 text = l.text();
-                if (text.empty()) {
-                    return;
-                }
-                const auto& f = l.font()->content();
-                v2f texture_size = f.info().atlas_size.cast_to<f32>();
-
-                if ( l.width() != 0 ) {
-                    f32 word_width{0};
-                    f32 string_width{0};
-                    i32 last_space{-1};
-                    for ( size_t i = 0; i < text.size(); i++ ) {
-                        const auto& ch = text[i];
-                        if ( ch == '\n' ) {
-                            word_width = 0;
-                            string_width = 0;
-                            last_space = -1;
-                        } else {
-                            const font::glyph_info* glyph = f.find_glyph(ch);
-                            if ( glyph ) {
-                                prev_char != 0
-                                    ? kerning = f.get_kerning(prev_char, ch)
-                                    : kerning = 0;
-                                prev_char = ch;
-                                f32 char_width = glyph->advance + kerning;
-                                if ( ch == ' ' ) {
-                                    if ( string_width + word_width < l.width() ) {
-                                        if ( string_width + word_width + char_width < l.width() ) {
-                                            string_width += word_width + char_width;
-                                            word_width = 0;
-                                            last_space = i;
-                                        } else {
-                                            text[i] = '\n';
-                                            word_width = 0;
-                                            string_width = 0;
-                                            last_space = -1;
-                                        }
-                                    } else {
-                                        if ( last_space != -1 ) {
-                                            text[last_space] = '\n';
-                                            last_space = -1;
-                                            string_width = 0;
-                                            --i;
-                                        } else {
-                                            text[i] = '\n';
-                                            word_width = 0;
-                                            string_width = 0;
-                                        }
-                                    }
-                                } else {
-                                    word_width += char_width;
-                                    if ( i == text.size() - 1) {
-                                        if ( string_width + word_width > l.width() ) {
-                                            if ( last_space != -1 ) {
-                                                text[last_space] = '\n';
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-
-                size_t strings_count{1};
-                for ( size_t i = 0; i < text.size(); i++ ) {
-                    if ( text[i] == '\n' && i != text.size() - 1) {
-                        strings_count++;
-                    }
-                }
-                size_t letters_size{0};
-                vector<f32> strings_width(strings_count);
-                std::fill(strings_width.begin(), strings_width.end(), 0);
-                prev_char = 0;
-                for ( size_t i = 0, string_ind = 0; i < text.size(); i++ ) {
-                    if ( text[i] != '\n' ) {
-                        const font::glyph_info* glyph = f.find_glyph(text[i]);
-                        if ( glyph ) {
-                            letters_size++;
-                            prev_char != 0
-                                ? kerning = f.get_kerning(prev_char, text[i])
-                                : kerning = 0;
-                            strings_width[string_ind] += glyph->advance + kerning;
-                        }
-                    } else {
-                        string_ind++;
-                    }
-                }
-
-                vertices.resize(letters_size * 4);
-                uvs.resize(vertices.size());
-                colors.resize(vertices.size());
-                indices.resize(text.size() * 6);
-                f32 x_pos = get_x_pos(l, strings_width[0]);
-                f32 y_pos = get_top_pos(l, strings_count);
-                u32 letters_counter{0};
-                prev_char = 0;
-                for ( size_t i = 0, str_ind = 0; i < text.size(); i++ ) {
-                    if ( text[i] == '\n' ) {
-                        str_ind++;
-                        y_pos -= f.info().line_height;
-                        x_pos = get_x_pos(l, strings_width[str_ind]);
-                        prev_char = 0;
-                        continue;
-                    }
-                    const font::glyph_info* glyph = f.find_glyph(text[i]);
-                    if ( glyph ) {
-                        offset = glyph->offset.cast_to<f32>();
-                        prev_char != 0
-                            ? kerning = f.get_kerning(prev_char, text[i])
-                            : kerning = 0;
-                        offset.x += kerning;
-                        prev_char = text[i];
-                        size_t start_vertices = letters_counter * 4;
-                        vertices[start_vertices] = v3f(
-                            x_pos + offset.x,
-                            y_pos - offset.y - glyph->tex_rect.size.y,
-                            0);
-                        vertices[start_vertices + 1] = v3f(
-                            x_pos + offset.x,
-                            y_pos - offset.y,
-                            0);
-                        vertices[start_vertices + 2] = v3f(
-                            x_pos + glyph->tex_rect.size.x + offset.x,
-                            y_pos - offset.y,
-                            0);
-                        vertices[start_vertices + 3] = v3f(
-                            x_pos + glyph->tex_rect.size.x + offset.x,
-                            y_pos - offset.y - glyph->tex_rect.size.y,
-                            0);
-
-                        uvs[start_vertices] = v2f(
-                            glyph->tex_rect.position.x / texture_size.x,
-                            glyph->tex_rect.position.y / texture_size.y);
-                        uvs[start_vertices + 1] = v2f(
-                            glyph->tex_rect.position.x / texture_size.x,
-                            (glyph->tex_rect.position.y + glyph->tex_rect.size.y) / texture_size.y);
-                        uvs[start_vertices + 2] = v2f(
-                            (glyph->tex_rect.position.x + glyph->tex_rect.size.x) / texture_size.x,
-                            (glyph->tex_rect.position.y + glyph->tex_rect.size.y) / texture_size.y);
-                        uvs[start_vertices + 3] = v2f(
-                            (glyph->tex_rect.position.x + glyph->tex_rect.size.x) / texture_size.x,
-                            glyph->tex_rect.position.y / texture_size.y);
-
-                        colors[start_vertices]     = l.tint();
-                        colors[start_vertices + 1] = l.tint();
-                        colors[start_vertices + 2] = l.tint();
-                        colors[start_vertices + 3] = l.tint();
-
-                        size_t start_indices = i * 6;
-                        indices[start_indices]     = start_vertices;
-                        indices[start_indices + 1] = start_vertices + 1;
-                        indices[start_indices + 2] = start_vertices + 2;
-                        indices[start_indices + 3] = start_vertices + 2;
-                        indices[start_indices + 4] = start_vertices + 3;
-                        indices[start_indices + 5] = start_vertices;
-
-                        x_pos += glyph->advance + kerning;
-                        letters_counter++;
-                    }
-                }
-
-                mesh m;
-                m.set_vertices(std::move(vertices));
-                m.set_indices(0, std::move(indices));
-                m.set_uvs(0, std::move(uvs));
-                m.set_colors(0, std::move(colors));
-
-                model content;
-                content.set_mesh(mesh_asset::create(m));
-                content.regenerate_geometry(the<render>());
-
-                if ( !mr.model() ) {
-                    mr.model(model_asset::create(content));
-                } else {
-                    mr.model()->fill(content);
-                }
-
-                if ( r.materials().size() > 0 &&
-                     r.materials().front()->content().properties().sampler_count() == 0 ) {
-                    auto texture_p = the<library>().load_asset<texture_asset>(f.info().atlas_file);
-                    if ( !texture_p ) {
-                        return;
-                    }
-
-                    const f32 glyph_dilate = math::clamp(l.glyph_dilate(), -1.f, 1.0f);
-                    const f32 outline_width = math::clamp(l.outline_width(), 0.f, 1.f - glyph_dilate);
-                    const v4f outline_color = make_vec4(color(l.outline_color()));
-
-                    r.properties(render::property_block()
-                        .sampler("u_texture", render::sampler_state()
-                            .texture(texture_p->content())
-                            .min_filter(render::sampler_min_filter::linear)
-                            .mag_filter(render::sampler_mag_filter::linear))
-                        .property("u_glyph_dilate", glyph_dilate)
-                        .property("u_outline_width", outline_width)
-                        .property("u_outline_color", outline_color));
-                }
-            });
-
-            owner.remove_all_components<label::dirty>();
+            update_dirty_labels(owner);
         }
     };
 

From 687574bf8397cfd9b306e30b07d129fd7f4cab2f Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Wed, 21 Aug 2019 09:21:29 +0700
Subject: [PATCH 078/108] font atlas as nested asset of font_asset

---
 sources/enduro2d/high/assets/font_asset.cpp   | 28 ++++++++++++++++++-
 .../enduro2d/high/systems/label_system.cpp    | 13 +++++----
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/sources/enduro2d/high/assets/font_asset.cpp b/sources/enduro2d/high/assets/font_asset.cpp
index 603a2c6a..79e07cf4 100644
--- a/sources/enduro2d/high/assets/font_asset.cpp
+++ b/sources/enduro2d/high/assets/font_asset.cpp
@@ -5,7 +5,9 @@
  ******************************************************************************/
 
 #include <enduro2d/high/assets/font_asset.hpp>
+
 #include <enduro2d/high/assets/binary_asset.hpp>
+#include <enduro2d/high/assets/texture_asset.hpp>
 
 namespace
 {
@@ -30,8 +32,32 @@ namespace e2d
                 if ( !fonts::try_load_font(content, font_data->content()) ) {
                     throw font_asset_loading_exception();
                 }
-                return font_asset::create(std::move(content));
+                return content;
             });
+        })
+        .then([
+            &library,
+            parent_address = path::parent_path(address)
+        ](const font& content){
+            return stdex::make_tuple_promise(std::make_tuple(
+                stdex::make_resolved_promise(content),
+                library.load_asset_async<texture_asset>(
+                    path::combine(parent_address, content.info().atlas_file))
+            ));
+        })
+        .then([](const std::tuple<
+            font,
+            texture_asset::load_result
+        >& results){
+            font content = std::get<0>(results);
+            texture_asset::load_result texture_res = std::get<1>(results);
+            if ( content.info().atlas_size != texture_res->content()->size() ) {
+                throw font_asset_loading_exception();
+            }
+            nested_content ncontent{{
+                make_hash(content.info().atlas_file),
+                std::move(texture_res)}};
+            return font_asset::create(std::move(content), std::move(ncontent));
         });
     }
 }
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index 8278fb5b..2aae797e 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -167,12 +167,13 @@ namespace
     using namespace e2d;
 
     void update_label_material(const label& l, renderer& r) {
-        if ( r.materials().empty() ) {
-            return;
-        }
+        auto texture_res = l.font() && !l.font()->content().empty()
+            ? l.font()->find_nested_asset<texture_asset>(l.font()->content().info().atlas_file)
+            : nullptr;
 
-        auto texture_p = the<library>().load_asset<texture_asset>(
-            l.font()->content().info().atlas_file);
+        auto texture = texture_res
+            ? texture_res->content()
+            : nullptr;
 
         const f32 glyph_dilate = math::clamp(l.glyph_dilate(), -1.f, 1.0f);
         const f32 outline_width = math::clamp(l.outline_width(), 0.f, 1.f - glyph_dilate);
@@ -180,7 +181,7 @@ namespace
 
         r.properties(render::property_block()
             .sampler("u_texture", render::sampler_state()
-                .texture(texture_p->content())
+                .texture(texture)
                 .min_filter(render::sampler_min_filter::linear)
                 .mag_filter(render::sampler_mag_filter::linear))
             .property("u_glyph_dilate", glyph_dilate)

From 8e0de94895daceec660a5c655dccbbae13a73bd4 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Wed, 21 Aug 2019 09:30:20 +0700
Subject: [PATCH 079/108] hold utf8 string in label instead utf32

---
 headers/enduro2d/high/components/label.hpp     | 10 +++++-----
 sources/enduro2d/high/components/label.cpp     |  2 +-
 sources/enduro2d/high/systems/label_system.cpp |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
index 7b10ea18..6bbc4f05 100644
--- a/headers/enduro2d/high/components/label.hpp
+++ b/headers/enduro2d/high/components/label.hpp
@@ -34,8 +34,8 @@ namespace e2d
         label() = default;
         label(const font_asset::ptr& font);
 
-        label& text(str32 value) noexcept;
-        [[nodiscard]] const str32& text() const noexcept;
+        label& text(str value) noexcept;
+        [[nodiscard]] const str& text() const noexcept;
 
         label& font(const font_asset::ptr& value) noexcept;
         [[nodiscard]] const font_asset::ptr& font() const noexcept;
@@ -67,7 +67,7 @@ namespace e2d
         label& outline_color(const color32& value) noexcept;
         [[nodiscard]] const color32& outline_color() const noexcept;
     private:
-        str32 text_;
+        str text_;
         font_asset::ptr font_;
         color32 tint_ = color32::white();
         haligns halign_ = haligns::center;
@@ -114,12 +114,12 @@ namespace e2d
     inline label::label(const font_asset::ptr& value)
     : font_(value) {}
 
-    inline label& label::text(str32 value) noexcept {
+    inline label& label::text(str value) noexcept {
         text_ = std::move(value);
         return *this;
     }
 
-    inline const str32& label::text() const noexcept {
+    inline const str& label::text() const noexcept {
         return text_;
     }
 
diff --git a/sources/enduro2d/high/components/label.cpp b/sources/enduro2d/high/components/label.cpp
index 6dc76fb8..93c6ae6b 100644
--- a/sources/enduro2d/high/components/label.cpp
+++ b/sources/enduro2d/high/components/label.cpp
@@ -75,7 +75,7 @@ namespace e2d
         const fill_context& ctx) const
     {
         if ( ctx.root.HasMember("text") ) {
-            str32 text = component.text();
+            str text = component.text();
             if ( !json_utils::try_parse_value(ctx.root["text"], text) ) {
                 the<debug>().error("LABEL: Incorrect formatting of 'text' property");
                 return false;
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index 2aae797e..318e7da7 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -195,8 +195,8 @@ namespace
             return;
         }
 
-        const str32& text = l.text();
         const font& f = l.font()->content();
+        const str32& text = make_utf32(l.text());
 
         //
         // update glyphs

From 9d0dfb614b3bc146db9cf993082102bd59c26345 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Wed, 21 Aug 2019 11:30:00 +0700
Subject: [PATCH 080/108] temporary manual copy/move label ctors for successful
 CI build

---
 headers/enduro2d/high/components/label.hpp | 66 ++++++++++++++++++++++
 1 file changed, 66 insertions(+)

diff --git a/headers/enduro2d/high/components/label.hpp b/headers/enduro2d/high/components/label.hpp
index 6bbc4f05..4c35aac6 100644
--- a/headers/enduro2d/high/components/label.hpp
+++ b/headers/enduro2d/high/components/label.hpp
@@ -34,6 +34,12 @@ namespace e2d
         label() = default;
         label(const font_asset::ptr& font);
 
+        label(label&& other) noexcept;
+        label& operator=(label&& other) noexcept;
+
+        label(const label& other);
+        label& operator=(const label& other);
+
         label& text(str value) noexcept;
         [[nodiscard]] const str& text() const noexcept;
 
@@ -114,6 +120,66 @@ namespace e2d
     inline label::label(const font_asset::ptr& value)
     : font_(value) {}
 
+    inline label::label(label&& other) noexcept
+    : text_(std::move(other.text_))
+    , font_(std::move(other.font_))
+    , tint_(other.tint_)
+    , halign_(other.halign_)
+    , valign_(other.valign_)
+    , leading_(other.leading_)
+    , tracking_(other.tracking_)
+    , text_width_(other.text_width_)
+    , glyph_dilate_(other.glyph_dilate_)
+    , outline_width_(other.outline_width_)
+    , outline_color_(other.outline_color_) {}
+
+    inline label& label::operator=(label&& other) noexcept {
+        if ( this != &other ) {
+            text_ = std::move(other.text_);
+            font_ = std::move(other.font_);
+            tint_ = other.tint_;
+            halign_ = other.halign_;
+            valign_ = other.valign_;
+            leading_ = other.leading_;
+            tracking_ = other.tracking_;
+            text_width_ = other.text_width_;
+            glyph_dilate_ = other.glyph_dilate_;
+            outline_width_ = other.outline_width_;
+            outline_color_ = other.outline_color_;
+        }
+        return *this;
+    }
+
+    inline label::label(const label& other)
+    : text_(other.text_)
+    , font_(other.font_)
+    , tint_(other.tint_)
+    , halign_(other.halign_)
+    , valign_(other.valign_)
+    , leading_(other.leading_)
+    , tracking_(other.tracking_)
+    , text_width_(other.text_width_)
+    , glyph_dilate_(other.glyph_dilate_)
+    , outline_width_(other.outline_width_)
+    , outline_color_(other.outline_color_) {}
+
+    inline label& label::operator=(const label& other) {
+        if ( this != &other ) {
+            text_ = other.text_;
+            font_ = other.font_;
+            tint_ = other.tint_;
+            halign_ = other.halign_;
+            valign_ = other.valign_;
+            leading_ = other.leading_;
+            tracking_ = other.tracking_;
+            text_width_ = other.text_width_;
+            glyph_dilate_ = other.glyph_dilate_;
+            outline_width_ = other.outline_width_;
+            outline_color_ = other.outline_color_;
+        }
+        return *this;
+    }
+
     inline label& label::text(str value) noexcept {
         text_ = std::move(value);
         return *this;

From 87e2231f5c8fc1305f495cb18e3ace8307015880 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Wed, 21 Aug 2019 11:30:28 +0700
Subject: [PATCH 081/108] fix miniz linux io warnings

---
 sources/3rdparty/miniz/miniz_export.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sources/3rdparty/miniz/miniz_export.h b/sources/3rdparty/miniz/miniz_export.h
index 7732271f..b74eb6de 100644
--- a/sources/3rdparty/miniz/miniz_export.h
+++ b/sources/3rdparty/miniz/miniz_export.h
@@ -1,3 +1,4 @@
 #pragma once
 
 #define MINIZ_EXPORT
+#define MINIZ_NO_STDIO

From bbefa65d98c689c9e08b4a43da83292cf5d66824 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 22 Aug 2019 08:00:17 +0700
Subject: [PATCH 082/108] premult alpha for sprites and bitmap fonts, bm font
 outline support, optional vertex snapping

---
 samples/bin/library/arial_bm.fnt              | 1223 ++++++++++-------
 samples/bin/library/arial_bm.png              |    4 +-
 samples/bin/library/font_bm_material.json     |    2 +-
 samples/bin/library/font_bm_shader.frag       |   22 +-
 samples/bin/library/font_bm_shader.vert       |   30 +-
 samples/bin/library/font_sdf_shader.frag      |   17 +-
 samples/bin/library/font_sdf_shader.vert      |   30 +-
 samples/bin/library/model_shader.frag         |    3 +-
 samples/bin/library/model_shader.vert         |   10 +-
 samples/bin/library/scene_prefab.json         |   11 +-
 samples/bin/library/sprite_material.json      |    2 +-
 samples/bin/library/sprite_shader.frag        |    9 +-
 samples/bin/library/sprite_shader.vert        |   36 +-
 .../enduro2d/high/systems/render_system.cpp   |    2 +-
 .../render_system_impl/render_system_base.hpp |    4 +-
 .../render_system_drawer.cpp                  |    8 +-
 .../render_system_drawer.hpp                  |    6 +-
 17 files changed, 866 insertions(+), 553 deletions(-)

diff --git a/samples/bin/library/arial_bm.fnt b/samples/bin/library/arial_bm.fnt
index 6375f656..26dc80ec 100644
--- a/samples/bin/library/arial_bm.fnt
+++ b/samples/bin/library/arial_bm.fnt
@@ -1,510 +1,713 @@
-info face="Arial" size=50 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=0,0
-common lineHeight=58 base=49 scaleW=512 scaleH=512 pages=1 packed=0
-page id=0 file="arial_bm.png"
-chars count=162
-char id=32 x=342 y=38 width=0 height=0 xoffset=0 yoffset=46 xadvance=14 page=0 chnl=0
-char id=33 x=448 y=386 width=10 height=40 xoffset=5 yoffset=10 xadvance=14 page=0 chnl=0
-char id=34 x=394 y=306 width=18 height=18 xoffset=3 yoffset=8 xadvance=18 page=0 chnl=0
-char id=35 x=178 y=180 width=32 height=42 xoffset=1 yoffset=8 xadvance=28 page=0 chnl=0
-char id=36 x=278 y=444 width=28 height=50 xoffset=2 yoffset=5 xadvance=28 page=0 chnl=0
-char id=37 x=4 y=204 width=44 height=42 xoffset=3 yoffset=9 xadvance=45 page=0 chnl=0
-char id=38 x=102 y=364 width=36 height=42 xoffset=3 yoffset=8 xadvance=34 page=0 chnl=0
-char id=39 x=416 y=306 width=10 height=18 xoffset=3 yoffset=8 xadvance=10 page=0 chnl=0
-char id=40 x=392 y=442 width=16 height=52 xoffset=4 yoffset=8 xadvance=17 page=0 chnl=0
-char id=41 x=392 y=386 width=16 height=52 xoffset=4 yoffset=8 xadvance=17 page=0 chnl=0
-char id=42 x=368 y=306 width=22 height=20 xoffset=2 yoffset=8 xadvance=20 page=0 chnl=0
-char id=43 x=178 y=476 width=28 height=28 xoffset=3 yoffset=16 xadvance=30 page=0 chnl=0
-char id=44 x=492 y=226 width=10 height=18 xoffset=5 yoffset=39 xadvance=14 page=0 chnl=0
-char id=45 x=4 y=492 width=18 height=10 xoffset=2 yoffset=29 xadvance=17 page=0 chnl=0
-char id=46 x=26 y=492 width=10 height=10 xoffset=5 yoffset=40 xadvance=14 page=0 chnl=0
-char id=47 x=436 y=340 width=18 height=42 xoffset=0 yoffset=8 xadvance=14 page=0 chnl=0
-char id=48 x=278 y=398 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0
-char id=49 x=414 y=340 width=18 height=40 xoffset=6 yoffset=10 xadvance=28 page=0 chnl=0
-char id=50 x=342 y=262 width=28 height=40 xoffset=2 yoffset=10 xadvance=28 page=0 chnl=0
-char id=51 x=278 y=352 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0
-char id=52 x=178 y=432 width=30 height=40 xoffset=1 yoffset=10 xadvance=28 page=0 chnl=0
-char id=53 x=310 y=262 width=28 height=40 xoffset=3 yoffset=10 xadvance=28 page=0 chnl=0
-char id=54 x=278 y=306 width=28 height=42 xoffset=2 yoffset=8 xadvance=28 page=0 chnl=0
-char id=55 x=278 y=262 width=28 height=40 xoffset=3 yoffset=10 xadvance=28 page=0 chnl=0
-char id=56 x=246 y=444 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0
-char id=57 x=246 y=398 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0
-char id=58 x=46 y=444 width=10 height=30 xoffset=5 yoffset=20 xadvance=14 page=0 chnl=0
-char id=59 x=486 y=340 width=10 height=38 xoffset=5 yoffset=19 xadvance=14 page=0 chnl=0
-char id=60 x=310 y=226 width=28 height=30 xoffset=3 yoffset=14 xadvance=30 page=0 chnl=0
-char id=61 x=452 y=48 width=28 height=20 xoffset=3 yoffset=19 xadvance=30 page=0 chnl=0
-char id=62 x=420 y=48 width=28 height=30 xoffset=3 yoffset=14 xadvance=30 page=0 chnl=0
-char id=63 x=246 y=352 width=28 height=42 xoffset=3 yoffset=8 xadvance=28 page=0 chnl=0
-char id=64 x=4 y=48 width=52 height=52 xoffset=3 yoffset=8 xadvance=51 page=0 chnl=0
-char id=65 x=60 y=448 width=38 height=40 xoffset=0 yoffset=10 xadvance=34 page=0 chnl=0
-char id=66 x=142 y=452 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
-char id=67 x=102 y=318 width=36 height=42 xoffset=3 yoffset=8 xadvance=37 page=0 chnl=0
-char id=68 x=256 y=126 width=34 height=40 xoffset=4 yoffset=10 xadvance=37 page=0 chnl=0
-char id=69 x=142 y=408 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
-char id=70 x=178 y=388 width=30 height=40 xoffset=5 yoffset=10 xadvance=31 page=0 chnl=0
-char id=71 x=60 y=402 width=38 height=42 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0
-char id=72 x=218 y=126 width=34 height=40 xoffset=5 yoffset=10 xadvance=37 page=0 chnl=0
-char id=73 x=472 y=340 width=10 height=40 xoffset=5 yoffset=10 xadvance=14 page=0 chnl=0
-char id=74 x=340 y=376 width=24 height=42 xoffset=2 yoffset=8 xadvance=25 page=0 chnl=0
-char id=75 x=448 y=82 width=34 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
-char id=76 x=246 y=308 width=28 height=40 xoffset=4 yoffset=10 xadvance=28 page=0 chnl=0
-char id=77 x=430 y=4 width=40 height=40 xoffset=4 yoffset=10 xadvance=42 page=0 chnl=0
-char id=78 x=410 y=82 width=34 height=40 xoffset=4 yoffset=10 xadvance=37 page=0 chnl=0
-char id=79 x=4 y=398 width=40 height=42 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0
-char id=80 x=142 y=364 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
-char id=81 x=4 y=350 width=40 height=44 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0
-char id=82 x=142 y=82 width=36 height=40 xoffset=4 yoffset=10 xadvance=37 page=0 chnl=0
-char id=83 x=180 y=126 width=34 height=42 xoffset=3 yoffset=8 xadvance=34 page=0 chnl=0
-char id=84 x=372 y=82 width=34 height=40 xoffset=2 yoffset=10 xadvance=31 page=0 chnl=0
-char id=85 x=102 y=456 width=34 height=42 xoffset=4 yoffset=8 xadvance=37 page=0 chnl=0
-char id=86 x=60 y=358 width=38 height=40 xoffset=1 yoffset=10 xadvance=34 page=0 chnl=0
-char id=87 x=4 y=4 width=52 height=40 xoffset=1 yoffset=10 xadvance=48 page=0 chnl=0
-char id=88 x=60 y=314 width=38 height=40 xoffset=1 yoffset=10 xadvance=34 page=0 chnl=0
-char id=89 x=60 y=270 width=38 height=40 xoffset=1 yoffset=10 xadvance=34 page=0 chnl=0
-char id=90 x=334 y=82 width=34 height=40 xoffset=2 yoffset=10 xadvance=31 page=0 chnl=0
-char id=91 x=430 y=386 width=14 height=50 xoffset=4 yoffset=9 xadvance=14 page=0 chnl=0
-char id=92 x=392 y=340 width=18 height=42 xoffset=0 yoffset=8 xadvance=14 page=0 chnl=0
-char id=93 x=412 y=442 width=14 height=50 xoffset=1 yoffset=9 xadvance=14 page=0 chnl=0
-char id=94 x=310 y=466 width=26 height=24 xoffset=2 yoffset=9 xadvance=24 page=0 chnl=0
-char id=95 x=4 y=480 width=34 height=8 xoffset=0 yoffset=51 xadvance=28 page=0 chnl=0
-char id=96 x=42 y=480 width=14 height=12 xoffset=3 yoffset=8 xadvance=17 page=0 chnl=0
-char id=97 x=278 y=226 width=28 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
-char id=98 x=246 y=262 width=28 height=42 xoffset=4 yoffset=8 xadvance=28 page=0 chnl=0
-char id=99 x=246 y=226 width=28 height=32 xoffset=2 yoffset=18 xadvance=25 page=0 chnl=0
-char id=100 x=214 y=446 width=28 height=42 xoffset=2 yoffset=8 xadvance=28 page=0 chnl=0
-char id=101 x=214 y=410 width=28 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
-char id=102 x=368 y=432 width=20 height=42 xoffset=1 yoffset=8 xadvance=14 page=0 chnl=0
-char id=103 x=214 y=364 width=28 height=42 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
-char id=104 x=310 y=422 width=26 height=40 xoffset=4 yoffset=10 xadvance=28 page=0 chnl=0
-char id=105 x=458 y=340 width=10 height=40 xoffset=4 yoffset=10 xadvance=12 page=0 chnl=0
-char id=106 x=412 y=386 width=14 height=52 xoffset=-2 yoffset=8 xadvance=12 page=0 chnl=0
-char id=107 x=310 y=378 width=26 height=40 xoffset=4 yoffset=10 xadvance=25 page=0 chnl=0
-char id=108 x=494 y=262 width=10 height=40 xoffset=4 yoffset=10 xadvance=12 page=0 chnl=0
-char id=109 x=386 y=4 width=40 height=32 xoffset=4 yoffset=18 xadvance=42 page=0 chnl=0
-char id=110 x=310 y=342 width=26 height=32 xoffset=4 yoffset=18 xadvance=28 page=0 chnl=0
-char id=111 x=178 y=352 width=30 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
-char id=112 x=214 y=318 width=28 height=42 xoffset=4 yoffset=17 xadvance=28 page=0 chnl=0
-char id=113 x=214 y=272 width=28 height=42 xoffset=2 yoffset=17 xadvance=28 page=0 chnl=0
-char id=114 x=368 y=396 width=20 height=32 xoffset=4 yoffset=18 xadvance=17 page=0 chnl=0
-char id=115 x=310 y=306 width=26 height=32 xoffset=2 yoffset=18 xadvance=25 page=0 chnl=0
-char id=116 x=486 y=82 width=18 height=40 xoffset=1 yoffset=10 xadvance=14 page=0 chnl=0
-char id=117 x=464 y=262 width=26 height=32 xoffset=4 yoffset=18 xadvance=28 page=0 chnl=0
-char id=118 x=388 y=48 width=28 height=30 xoffset=1 yoffset=20 xadvance=25 page=0 chnl=0
-char id=119 x=342 y=4 width=40 height=30 xoffset=1 yoffset=20 xadvance=37 page=0 chnl=0
-char id=120 x=290 y=48 width=30 height=30 xoffset=1 yoffset=20 xadvance=25 page=0 chnl=0
-char id=121 x=214 y=226 width=28 height=42 xoffset=1 yoffset=18 xadvance=25 page=0 chnl=0
-char id=122 x=356 y=48 width=28 height=30 xoffset=1 yoffset=20 xadvance=25 page=0 chnl=0
-char id=123 x=368 y=340 width=20 height=52 xoffset=2 yoffset=8 xadvance=17 page=0 chnl=0
-char id=124 x=430 y=440 width=8 height=52 xoffset=5 yoffset=8 xadvance=13 page=0 chnl=0
-char id=125 x=340 y=422 width=20 height=52 xoffset=2 yoffset=8 xadvance=17 page=0 chnl=0
-char id=126 x=256 y=48 width=30 height=14 xoffset=3 yoffset=22 xadvance=30 page=0 chnl=0
-char id=127 x=350 y=38 width=0 height=0 xoffset=0 yoffset=0 xadvance=0 page=0 chnl=0
-char id=1025 x=142 y=312 width=32 height=48 xoffset=4 yoffset=2 xadvance=34 page=0 chnl=0
-char id=1040 x=60 y=226 width=38 height=40 xoffset=0 yoffset=10 xadvance=34 page=0 chnl=0
-char id=1041 x=142 y=268 width=32 height=40 xoffset=5 yoffset=10 xadvance=33 page=0 chnl=0
-char id=1042 x=142 y=224 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
-char id=1043 x=470 y=180 width=28 height=40 xoffset=4 yoffset=10 xadvance=28 page=0 chnl=0
-char id=1044 x=60 y=172 width=38 height=50 xoffset=0 yoffset=8 xadvance=34 page=0 chnl=0
-char id=1045 x=142 y=180 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
-char id=1046 x=60 y=4 width=50 height=40 xoffset=1 yoffset=10 xadvance=47 page=0 chnl=0
-char id=1047 x=438 y=126 width=32 height=42 xoffset=2 yoffset=8 xadvance=31 page=0 chnl=0
-char id=1048 x=296 y=82 width=34 height=40 xoffset=4 yoffset=10 xadvance=36 page=0 chnl=0
-char id=1049 x=142 y=126 width=34 height=50 xoffset=4 yoffset=0 xadvance=36 page=0 chnl=0
-char id=1050 x=178 y=308 width=30 height=40 xoffset=4 yoffset=10 xadvance=30 page=0 chnl=0
-char id=1051 x=102 y=410 width=34 height=42 xoffset=1 yoffset=8 xadvance=33 page=0 chnl=0
-char id=1052 x=298 y=4 width=40 height=40 xoffset=4 yoffset=10 xadvance=42 page=0 chnl=0
-char id=1053 x=258 y=82 width=34 height=40 xoffset=5 yoffset=10 xadvance=37 page=0 chnl=0
-char id=1054 x=4 y=304 width=40 height=42 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0
-char id=1055 x=220 y=82 width=34 height=40 xoffset=4 yoffset=10 xadvance=36 page=0 chnl=0
-char id=1056 x=402 y=126 width=32 height=40 xoffset=4 yoffset=10 xadvance=34 page=0 chnl=0
-char id=1057 x=102 y=272 width=36 height=42 xoffset=3 yoffset=8 xadvance=37 page=0 chnl=0
-char id=1058 x=182 y=82 width=34 height=40 xoffset=2 yoffset=10 xadvance=31 page=0 chnl=0
-char id=1059 x=102 y=226 width=36 height=42 xoffset=1 yoffset=8 xadvance=32 page=0 chnl=0
-char id=1060 x=60 y=126 width=38 height=42 xoffset=3 yoffset=8 xadvance=39 page=0 chnl=0
-char id=1061 x=60 y=82 width=38 height=40 xoffset=1 yoffset=10 xadvance=34 page=0 chnl=0
-char id=1062 x=102 y=172 width=36 height=50 xoffset=4 yoffset=9 xadvance=37 page=0 chnl=0
-char id=1063 x=366 y=126 width=32 height=40 xoffset=3 yoffset=10 xadvance=34 page=0 chnl=0
-char id=1064 x=252 y=4 width=42 height=40 xoffset=4 yoffset=10 xadvance=46 page=0 chnl=0
-char id=1065 x=4 y=150 width=46 height=50 xoffset=4 yoffset=9 xadvance=47 page=0 chnl=0
-char id=1066 x=206 y=4 width=42 height=40 xoffset=0 yoffset=10 xadvance=40 page=0 chnl=0
-char id=1067 x=160 y=4 width=42 height=40 xoffset=5 yoffset=10 xadvance=45 page=0 chnl=0
-char id=1068 x=330 y=126 width=32 height=40 xoffset=5 yoffset=10 xadvance=33 page=0 chnl=0
-char id=1069 x=102 y=126 width=36 height=42 xoffset=3 yoffset=8 xadvance=36 page=0 chnl=0
-char id=1070 x=4 y=104 width=48 height=42 xoffset=5 yoffset=8 xadvance=51 page=0 chnl=0
-char id=1071 x=102 y=82 width=36 height=40 xoffset=1 yoffset=10 xadvance=37 page=0 chnl=0
-char id=1072 x=438 y=180 width=28 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
-char id=1073 x=178 y=262 width=30 height=42 xoffset=3 yoffset=8 xadvance=29 page=0 chnl=0
-char id=1074 x=434 y=262 width=26 height=30 xoffset=4 yoffset=20 xadvance=27 page=0 chnl=0
-char id=1075 x=484 y=48 width=20 height=30 xoffset=4 yoffset=20 xadvance=19 page=0 chnl=0
-char id=1076 x=294 y=126 width=32 height=38 xoffset=0 yoffset=19 xadvance=30 page=0 chnl=0
-char id=1077 x=406 y=180 width=28 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
-char id=1078 x=102 y=48 width=38 height=30 xoffset=0 yoffset=20 xadvance=34 page=0 chnl=0
-char id=1079 x=340 y=340 width=24 height=32 xoffset=2 yoffset=18 xadvance=23 page=0 chnl=0
-char id=1080 x=404 y=262 width=26 height=30 xoffset=4 yoffset=20 xadvance=28 page=0 chnl=0
-char id=1081 x=374 y=262 width=26 height=40 xoffset=4 yoffset=10 xadvance=28 page=0 chnl=0
-char id=1082 x=340 y=306 width=24 height=30 xoffset=4 yoffset=20 xadvance=22 page=0 chnl=0
-char id=1083 x=178 y=226 width=30 height=32 xoffset=1 yoffset=18 xadvance=30 page=0 chnl=0
-char id=1084 x=220 y=48 width=32 height=30 xoffset=4 yoffset=20 xadvance=35 page=0 chnl=0
-char id=1085 x=462 y=226 width=26 height=30 xoffset=4 yoffset=20 xadvance=28 page=0 chnl=0
-char id=1086 x=474 y=126 width=30 height=32 xoffset=2 yoffset=18 xadvance=28 page=0 chnl=0
-char id=1087 x=432 y=226 width=26 height=30 xoffset=4 yoffset=20 xadvance=28 page=0 chnl=0
-char id=1088 x=374 y=180 width=28 height=42 xoffset=4 yoffset=17 xadvance=28 page=0 chnl=0
-char id=1089 x=342 y=180 width=28 height=32 xoffset=2 yoffset=18 xadvance=25 page=0 chnl=0
-char id=1090 x=402 y=226 width=26 height=30 xoffset=1 yoffset=20 xadvance=23 page=0 chnl=0
-char id=1091 x=310 y=180 width=28 height=42 xoffset=1 yoffset=18 xadvance=25 page=0 chnl=0
-char id=1092 x=4 y=250 width=42 height=50 xoffset=2 yoffset=9 xadvance=42 page=0 chnl=0
-char id=1093 x=474 y=4 width=30 height=30 xoffset=1 yoffset=20 xadvance=25 page=0 chnl=0
-char id=1094 x=278 y=180 width=28 height=38 xoffset=4 yoffset=19 xadvance=29 page=0 chnl=0
-char id=1095 x=372 y=226 width=26 height=30 xoffset=2 yoffset=20 xadvance=27 page=0 chnl=0
-char id=1096 x=60 y=48 width=38 height=30 xoffset=4 yoffset=20 xadvance=41 page=0 chnl=0
-char id=1097 x=114 y=4 width=42 height=38 xoffset=4 yoffset=19 xadvance=42 page=0 chnl=0
-char id=1098 x=182 y=48 width=34 height=30 xoffset=1 yoffset=20 xadvance=32 page=0 chnl=0
-char id=1099 x=144 y=48 width=34 height=30 xoffset=4 yoffset=20 xadvance=36 page=0 chnl=0
-char id=1100 x=342 y=226 width=26 height=30 xoffset=4 yoffset=20 xadvance=27 page=0 chnl=0
-char id=1101 x=246 y=180 width=28 height=32 xoffset=2 yoffset=18 xadvance=26 page=0 chnl=0
-char id=1102 x=4 y=444 width=38 height=32 xoffset=4 yoffset=18 xadvance=38 page=0 chnl=0
-char id=1103 x=324 y=48 width=28 height=30 xoffset=1 yoffset=20 xadvance=28 page=0 chnl=0
-char id=1105 x=214 y=180 width=28 height=42 xoffset=2 yoffset=8 xadvance=28 page=0 chnl=0
-kernings count=343
-kerning first=1059 second=1081 amount=-1
-kerning first=1043 second=1071 amount=-1
-kerning first=86 second=117 amount=-1
-kerning first=1059 second=44 amount=-6
-kerning first=84 second=97 amount=-5
-kerning first=1047 second=1063 amount=-1
-kerning first=1059 second=1096 amount=-2
-kerning first=1070 second=1046 amount=-1
-kerning first=1042 second=1090 amount=-1
-kerning first=1043 second=1086 amount=-3
-kerning first=1100 second=1090 amount=-3
-kerning first=1041 second=1061 amount=-1
-kerning first=1042 second=1057 amount=-1
-kerning first=1058 second=1100 amount=-2
-kerning first=1075 second=1072 amount=-1
-kerning first=1060 second=1058 amount=-2
-kerning first=1043 second=1091 amount=-3
-kerning first=1070 second=1051 amount=-2
-kerning first=1074 second=1091 amount=-1
-kerning first=1086 second=1076 amount=-1
-kerning first=84 second=99 amount=-5
-kerning first=87 second=65 amount=-1
-kerning first=1058 second=1072 amount=-2
-kerning first=1078 second=1098 amount=1
-kerning first=1069 second=1061 amount=-1
-kerning first=1046 second=1054 amount=-1
-kerning first=1058 second=1087 amount=-2
-kerning first=1069 second=1076 amount=-1
-kerning first=1060 second=1063 amount=-1
-kerning first=1056 second=58 amount=-1
-kerning first=1057 second=1058 amount=-1
-kerning first=1056 second=1077 amount=-2
-kerning first=80 second=65 amount=-3
-kerning first=1059 second=1073 amount=-1
-kerning first=1050 second=1060 amount=-1
-kerning first=86 second=101 amount=-2
-kerning first=1059 second=1088 amount=-2
-kerning first=1058 second=1044 amount=-1
-kerning first=1075 second=44 amount=-6
-kerning first=1057 second=1063 amount=-1
-kerning first=1091 second=1083 amount=-1
-kerning first=1060 second=1083 amount=-1
-kerning first=1068 second=1052 amount=-1
-kerning first=1057 second=1078 amount=1
-kerning first=1059 second=1093 amount=-2
-kerning first=1074 second=1083 amount=-1
-kerning first=1043 second=1083 amount=-2
-kerning first=1044 second=1079 amount=1
-kerning first=1101 second=1083 amount=-1
-kerning first=1070 second=1058 amount=-2
-kerning first=1074 second=1098 amount=-1
-kerning first=1042 second=1054 amount=-1
-kerning first=1088 second=1083 amount=-1
-kerning first=1060 second=1040 amount=-1
-kerning first=1056 second=1054 amount=-1
-kerning first=1040 second=1044 amount=1
-kerning first=1079 second=1076 amount=-1
-kerning first=1043 second=1040 amount=-3
-kerning first=1070 second=1063 amount=-1
-kerning first=1040 second=1059 amount=-2
-kerning first=1059 second=46 amount=-6
-kerning first=1054 second=1044 amount=-1
-kerning first=1058 second=1084 amount=-2
-kerning first=89 second=111 amount=-4
-kerning first=1057 second=1040 amount=-1
-kerning first=1043 second=1103 amount=-3
-kerning first=1046 second=1066 amount=1
-kerning first=1054 second=1059 amount=-1
-kerning first=1058 second=1099 amount=-2
-kerning first=1068 second=1044 amount=-1
-kerning first=1058 second=44 amount=-5
-kerning first=87 second=44 amount=-2
-kerning first=1091 second=44 amount=-5
-kerning first=1070 second=1083 amount=-2
-kerning first=84 second=111 amount=-5
-kerning first=1059 second=1085 amount=-2
-kerning first=89 second=112 amount=-3
-kerning first=84 second=65 amount=-3
-kerning first=1092 second=1076 amount=-1
-kerning first=1042 second=1046 amount=-1
-kerning first=80 second=44 amount=-6
-kerning first=87 second=46 amount=-2
-kerning first=1070 second=1040 amount=-1
-kerning first=1075 second=1076 amount=-2
-kerning first=1043 second=1080 amount=-2
-kerning first=1082 second=1073 amount=1
-kerning first=1102 second=1076 amount=-1
-kerning first=1074 second=1095 amount=-2
-kerning first=1043 second=1047 amount=-1
-kerning first=89 second=113 amount=-4
-kerning first=1042 second=1066 amount=-2
-kerning first=1088 second=1095 amount=-1
-kerning first=1075 second=46 amount=-6
-kerning first=76 second=84 amount=-3
-kerning first=80 second=46 amount=-6
-kerning first=1056 second=1051 amount=-2
-kerning first=1043 second=1052 amount=-1
-kerning first=1059 second=1077 amount=-3
-kerning first=1042 second=1071 amount=-1
-kerning first=1043 second=1100 amount=-2
-kerning first=76 second=121 amount=-1
-kerning first=1072 second=1090 amount=-1
-kerning first=76 second=86 amount=-3
-kerning first=1056 second=1071 amount=-1
-kerning first=1086 second=1090 amount=-1
-kerning first=1056 second=1086 amount=-2
-kerning first=1059 second=1082 amount=-2
-kerning first=1043 second=1072 amount=-2
-kerning first=84 second=114 amount=-1
-kerning first=1054 second=1061 amount=-2
-kerning first=76 second=87 amount=-3
-kerning first=1059 second=1097 amount=-2
-kerning first=1062 second=1054 amount=-1
-kerning first=1073 second=1091 amount=-1
-kerning first=1077 second=1083 amount=-1
-kerning first=1054 second=1076 amount=-1
-kerning first=1042 second=1058 amount=-3
-kerning first=1068 second=1061 amount=-2
-kerning first=1060 second=1044 amount=-1
-kerning first=1058 second=46 amount=-5
-kerning first=1060 second=1059 amount=-2
-kerning first=1056 second=1058 amount=-2
-kerning first=1090 second=1078 amount=1
-kerning first=84 second=58 amount=-5
-kerning first=84 second=44 amount=-5
-kerning first=1091 second=46 amount=-5
-kerning first=1043 second=44 amount=-6
-kerning first=84 second=115 amount=-5
-kerning first=1043 second=1044 amount=-3
-kerning first=1059 second=1054 amount=-1
-kerning first=76 second=89 amount=-3
-kerning first=1059 second=1069 amount=-1
-kerning first=1042 second=1063 amount=-2
-kerning first=1059 second=1102 amount=-2
-kerning first=1058 second=1088 amount=-2
-kerning first=1057 second=1044 amount=-1
-kerning first=1090 second=44 amount=-5
-kerning first=1057 second=1059 amount=-1
-kerning first=1090 second=1083 amount=-1
-kerning first=1059 second=1074 amount=-2
-kerning first=84 second=46 amount=-5
-kerning first=1040 second=1101 amount=1
-kerning first=1066 second=1071 amount=-1
-kerning first=1058 second=1093 amount=-2
-kerning first=1059 second=1089 amount=-3
-kerning first=1073 second=1083 amount=-2
-kerning first=89 second=117 amount=-2
-kerning first=1073 second=1098 amount=-1
-kerning first=1070 second=1044 amount=-2
-kerning first=1059 second=1094 amount=-2
-kerning first=89 second=97 amount=-3
-kerning first=1043 second=1084 amount=-2
-kerning first=119 second=44 amount=-2
-kerning first=84 second=117 amount=-1
-kerning first=1042 second=1040 amount=-1
-kerning first=1043 second=1099 amount=-2
-kerning first=1077 second=1095 amount=-1
-kerning first=89 second=118 amount=-2
-kerning first=114 second=44 amount=-2
-kerning first=1056 second=1040 amount=-3
-kerning first=1073 second=1103 amount=-1
-kerning first=1059 second=1051 amount=-1
-kerning first=1056 second=1103 amount=-1
-kerning first=1092 second=1090 amount=-1
-kerning first=1042 second=1060 amount=-1
-kerning first=1061 second=1057 amount=-1
-kerning first=89 second=101 amount=-4
-kerning first=1091 second=1076 amount=-1
-kerning first=49 second=49 amount=-3
-kerning first=86 second=121 amount=-1
-kerning first=1102 second=1090 amount=-1
-kerning first=1059 second=1071 amount=-1
-kerning first=1059 second=1086 amount=-3
-kerning first=1043 second=46 amount=-6
-kerning first=119 second=46 amount=-2
-kerning first=1043 second=1076 amount=-3
-kerning first=84 second=119 amount=-2
-kerning first=1101 second=1076 amount=-1
-kerning first=84 second=101 amount=-5
-kerning first=1073 second=1095 amount=-1
-kerning first=1042 second=1095 amount=-1
-kerning first=1057 second=1061 amount=-2
-kerning first=1100 second=1095 amount=-3
-kerning first=1042 second=1047 amount=-1
-kerning first=1088 second=1076 amount=-1
-kerning first=114 second=46 amount=-2
-kerning first=1090 second=46 amount=-5
-kerning first=1041 second=1066 amount=-1
-kerning first=1056 second=1047 amount=-1
-kerning first=1075 second=1077 amount=-1
-kerning first=1056 second=44 amount=-9
-kerning first=1069 second=1051 amount=-1
-kerning first=1058 second=1077 amount=-2
-kerning first=1046 second=1059 amount=1
-kerning first=1040 second=1090 amount=-1
-kerning first=1059 second=58 amount=-1
-kerning first=1070 second=1061 amount=-2
-kerning first=1040 second=1057 amount=-1
-kerning first=1070 second=1076 amount=-2
-kerning first=1058 second=1082 amount=-2
-kerning first=1059 second=1078 amount=-1
-kerning first=1073 second=1072 amount=-1
-kerning first=86 second=97 amount=-3
-kerning first=1069 second=1071 amount=-1
-kerning first=1061 second=1054 amount=-1
-kerning first=1058 second=1097 amount=-2
-kerning first=1041 second=1091 amount=-1
-kerning first=1077 second=1079 amount=-1
-kerning first=1061 second=1069 amount=-1
-kerning first=1056 second=1072 amount=-1
-kerning first=1076 second=1098 amount=-1
-kerning first=1083 second=1095 amount=-1
-kerning first=1041 second=1058 amount=-2
-kerning first=1068 second=1057 amount=-1
-kerning first=1059 second=1083 amount=-3
-kerning first=1043 second=1088 amount=-2
-kerning first=1058 second=1054 amount=-2
-kerning first=89 second=65 amount=-3
-kerning first=1042 second=1044 amount=-1
-kerning first=1041 second=1063 amount=-2
-kerning first=1042 second=1059 amount=-1
-kerning first=89 second=105 amount=-1
-kerning first=118 second=44 amount=-3
-kerning first=1058 second=1102 amount=-2
-kerning first=65 second=84 amount=-3
-kerning first=1056 second=1044 amount=-3
-kerning first=1059 second=1040 amount=-3
-kerning first=1056 second=1059 amount=-1
-kerning first=1075 second=1089 amount=-1
-kerning first=1058 second=1074 amount=-2
-kerning first=84 second=105 amount=-1
-kerning first=1059 second=1103 amount=-3
-kerning first=1058 second=1089 amount=-2
-kerning first=1073 second=1079 amount=-1
-kerning first=65 second=86 amount=-3
-kerning first=1040 second=1054 amount=-1
-kerning first=1059 second=1060 amount=-1
-kerning first=1086 second=1083 amount=-1
-kerning first=1040 second=1069 amount=-1
-kerning first=1056 second=46 amount=-9
-kerning first=1059 second=1075 amount=-2
-kerning first=1093 second=1095 amount=-1
-kerning first=1065 second=1091 amount=1
-kerning first=1073 second=1084 amount=-1
-kerning first=65 second=87 amount=-1
-kerning first=1041 second=1040 amount=-1
-kerning first=1069 second=1083 amount=-1
-kerning first=1077 second=1076 amount=-1
-kerning first=118 second=46 amount=-3
-kerning first=1068 second=1054 amount=-1
-kerning first=1045 second=1047 amount=-1
-kerning first=1059 second=1080 amount=-2
-kerning first=1043 second=1085 amount=-2
-kerning first=1058 second=1051 amount=-1
-kerning first=1059 second=1047 amount=-1
-kerning first=65 second=89 amount=-3
-kerning first=70 second=65 amount=-2
-kerning first=1074 second=1090 amount=-1
-kerning first=1075 second=1086 amount=-1
-kerning first=1090 second=1076 amount=-1
-kerning first=1101 second=1090 amount=-1
-kerning first=89 second=58 amount=-2
-kerning first=89 second=44 amount=-6
-kerning first=1062 second=1072 amount=1
-kerning first=1058 second=1071 amount=-1
-kerning first=1042 second=1061 amount=-2
-kerning first=1043 second=1057 amount=-2
-kerning first=1061 second=1091 amount=-1
-kerning first=1088 second=1090 amount=-1
-kerning first=1054 second=1046 amount=-1
-kerning first=1058 second=1086 amount=-3
-kerning first=1073 second=1076 amount=-2
-kerning first=86 second=65 amount=-3
-kerning first=1072 second=1095 amount=-1
-kerning first=1056 second=1061 amount=-2
-kerning first=1040 second=1051 amount=1
-kerning first=1044 second=1091 amount=1
-kerning first=1068 second=1046 amount=-1
-kerning first=1056 second=1076 amount=-3
-kerning first=86 second=111 amount=-2
-kerning first=1079 second=1098 amount=-1
-kerning first=1086 second=1095 amount=-1
-kerning first=89 second=46 amount=-6
-kerning first=1043 second=1077 amount=-3
-kerning first=1058 second=1091 amount=-2
-kerning first=1059 second=1087 amount=-2
-kerning first=1068 second=1051 amount=-1
-kerning first=1044 second=1063 amount=-1
-kerning first=1059 second=1044 amount=-2
-kerning first=1054 second=1071 amount=-1
-kerning first=1077 second=1093 amount=-1
-kerning first=1092 second=1083 amount=-1
-kerning first=121 second=44 amount=-3
-kerning first=1068 second=1071 amount=-2
-kerning first=1075 second=1083 amount=-1
-kerning first=1102 second=1083 amount=-1
-kerning first=87 second=97 amount=-1
-kerning first=1040 second=1058 amount=-3
-kerning first=1056 second=1101 amount=-1
-kerning first=1043 second=1054 amount=-2
-kerning first=1058 second=1083 amount=-2
-kerning first=1059 second=1079 amount=-2
-kerning first=70 second=44 amount=-5
-kerning first=1043 second=1102 amount=-2
-kerning first=1057 second=1054 amount=-1
-kerning first=1040 second=1063 amount=-3
-kerning first=1041 second=1059 amount=-1
-kerning first=84 second=121 amount=-2
-kerning first=1068 second=1058 amount=-5
-kerning first=1079 second=1095 amount=-1
-kerning first=86 second=114 amount=-1
-kerning first=1059 second=1084 amount=-2
-kerning first=1043 second=1074 amount=-2
-kerning first=1058 second=1040 amount=-1
-kerning first=86 second=58 amount=-1
-kerning first=86 second=44 amount=-4
-kerning first=1054 second=1063 amount=-1
-kerning first=1061 second=1060 amount=-1
-kerning first=1073 second=1093 amount=-1
-kerning first=70 second=46 amount=-5
-kerning first=121 second=46 amount=-3
-kerning first=1069 second=1044 amount=-1
-kerning first=1058 second=1103 amount=-2
-kerning first=1068 second=1063 amount=-3
-kerning first=1044 second=1060 amount=-1
-kerning first=1082 second=1072 amount=1
-kerning first=1058 second=1060 amount=-1
-kerning first=1077 second=1090 amount=-1
-kerning first=86 second=46 amount=-4
-kerning first=1092 second=1095 amount=-1
-kerning first=1060 second=1051 amount=-1
-kerning first=1061 second=1047 amount=-1
-kerning first=1102 second=1095 amount=-1
-kerning first=1043 second=1051 amount=-2
-kerning first=1054 second=1040 amount=-1
-kerning first=1058 second=1080 amount=-2
-kerning first=1059 second=1076 amount=-3
-kerning first=1047 second=1058 amount=-1
-kerning first=1057 second=1051 amount=-1
-kerning first=1060 second=1071 amount=-1
-kerning first=1068 second=1040 amount=-1
-kerning first=1057 second=1066 amount=-1
-kerning first=1040 second=1060 amount=-1
+info face="Arial" size=50 bold=0 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=1,1,1,1 spacing=1,1 outline=3
+common lineHeight=50 base=40 scaleW=512 scaleH=512 pages=1 packed=0 alphaChnl=0 redChnl=1 greenChnl=3 blueChnl=3
+page id=0 file="arial_bm.png"
+chars count=161
+char id=32   x=0     y=395   width=11    height=9     xoffset=-5    yoffset=45    xadvance=12    page=0  chnl=15
+char id=33   x=350   y=255   width=14    height=40    xoffset=0     yoffset=4     xadvance=14    page=0  chnl=15
+char id=34   x=343   y=361   width=21    height=19    xoffset=-3    yoffset=4     xadvance=16    page=0  chnl=15
+char id=35   x=68    y=216   width=33    height=40    xoffset=-5    yoffset=4     xadvance=24    page=0  chnl=15
+char id=36   x=446   y=0     width=30    height=46    xoffset=-3    yoffset=2     xadvance=24    page=0  chnl=15
+char id=37   x=347   y=49    width=43    height=40    xoffset=-2    yoffset=4     xadvance=39    page=0  chnl=15
+char id=38   x=229   y=132   width=36    height=40    xoffset=-3    yoffset=4     xadvance=29    page=0  chnl=15
+char id=39   x=494   y=323   width=14    height=19    xoffset=-3    yoffset=4     xadvance=8     page=0  chnl=15
+char id=40   x=225   y=0     width=20    height=49    xoffset=-2    yoffset=4     xadvance=15    page=0  chnl=15
+char id=41   x=246   y=0     width=20    height=49    xoffset=-2    yoffset=4     xadvance=15    page=0  chnl=15
+char id=42   x=319   y=361   width=23    height=21    xoffset=-3    yoffset=4     xadvance=17    page=0  chnl=15
+char id=43   x=167   y=363   width=30    height=30    xoffset=-2    yoffset=10    xadvance=26    page=0  chnl=15
+char id=44   x=365   y=361   width=14    height=19    xoffset=-1    yoffset=32    xadvance=12    page=0  chnl=15
+char id=45   x=466   y=358   width=21    height=12    xoffset=-3    yoffset=23    xadvance=15    page=0  chnl=15
+char id=46   x=488   y=358   width=14    height=12    xoffset=-1    yoffset=32    xadvance=12    page=0  chnl=15
+char id=47   x=267   y=255   width=22    height=40    xoffset=-5    yoffset=4     xadvance=12    page=0  chnl=15
+char id=48   x=326   y=214   width=30    height=40    xoffset=-3    yoffset=4     xadvance=24    page=0  chnl=15
+char id=49   x=313   y=255   width=21    height=40    xoffset=0     yoffset=4     xadvance=24    page=0  chnl=15
+char id=50   x=93    y=257   width=29    height=40    xoffset=-3    yoffset=4     xadvance=24    page=0  chnl=15
+char id=51   x=295   y=214   width=30    height=40    xoffset=-3    yoffset=4     xadvance=24    page=0  chnl=15
+char id=52   x=168   y=215   width=31    height=40    xoffset=-4    yoffset=4     xadvance=24    page=0  chnl=15
+char id=53   x=357   y=214   width=30    height=40    xoffset=-3    yoffset=4     xadvance=24    page=0  chnl=15
+char id=54   x=419   y=212   width=30    height=40    xoffset=-3    yoffset=4     xadvance=24    page=0  chnl=15
+char id=55   x=450   y=212   width=30    height=40    xoffset=-3    yoffset=4     xadvance=24    page=0  chnl=15
+char id=56   x=481   y=211   width=30    height=40    xoffset=-3    yoffset=4     xadvance=24    page=0  chnl=15
+char id=57   x=0     y=257   width=30    height=40    xoffset=-3    yoffset=4     xadvance=24    page=0  chnl=15
+char id=58   x=497   y=252   width=14    height=31    xoffset=-1    yoffset=13    xadvance=12    page=0  chnl=15
+char id=59   x=447   y=253   width=14    height=38    xoffset=-1    yoffset=13    xadvance=12    page=0  chnl=15
+char id=60   x=198   y=362   width=30    height=29    xoffset=-2    yoffset=10    xadvance=26    page=0  chnl=15
+char id=61   x=288   y=361   width=30    height=21    xoffset=-2    yoffset=14    xadvance=26    page=0  chnl=15
+char id=62   x=229   y=362   width=30    height=29    xoffset=-2    yoffset=10    xadvance=26    page=0  chnl=15
+char id=63   x=388   y=213   width=30    height=40    xoffset=-3    yoffset=4     xadvance=24    page=0  chnl=15
+char id=64   x=0     y=0     width=50    height=49    xoffset=-2    yoffset=4     xadvance=45    page=0  chnl=15
+char id=65   x=286   y=91    width=39    height=40    xoffset=-5    yoffset=4     xadvance=29    page=0  chnl=15
+char id=66   x=315   y=173   width=33    height=40    xoffset=-2    yoffset=4     xadvance=29    page=0  chnl=15
+char id=67   x=444   y=88    width=38    height=40    xoffset=-3    yoffset=4     xadvance=32    page=0  chnl=15
+char id=68   x=376   y=131   width=35    height=40    xoffset=-1    yoffset=4     xadvance=32    page=0  chnl=15
+char id=69   x=102   y=216   width=32    height=40    xoffset=-1    yoffset=4     xadvance=29    page=0  chnl=15
+char id=70   x=232   y=215   width=31    height=40    xoffset=-1    yoffset=4     xadvance=27    page=0  chnl=15
+char id=71   x=405   y=89    width=38    height=40    xoffset=-2    yoffset=4     xadvance=34    page=0  chnl=15
+char id=72   x=245   y=173   width=34    height=40    xoffset=-1    yoffset=4     xadvance=32    page=0  chnl=15
+char id=73   x=335   y=255   width=14    height=40    xoffset=-1    yoffset=4     xadvance=12    page=0  chnl=15
+char id=74   x=485   y=165   width=26    height=40    xoffset=-3    yoffset=4     xadvance=22    page=0  chnl=15
+char id=75   x=340   y=132   width=35    height=40    xoffset=-2    yoffset=4     xadvance=29    page=0  chnl=15
+char id=76   x=123   y=257   width=29    height=40    xoffset=-2    yoffset=4     xadvance=24    page=0  chnl=15
+char id=77   x=166   y=92    width=39    height=40    xoffset=-1    yoffset=4     xadvance=37    page=0  chnl=15
+char id=78   x=140   y=174   width=34    height=40    xoffset=-1    yoffset=4     xadvance=32    page=0  chnl=15
+char id=79   x=84    y=92    width=40    height=40    xoffset=-3    yoffset=4     xadvance=34    page=0  chnl=15
+char id=80   x=0     y=216   width=33    height=40    xoffset=-1    yoffset=4     xadvance=29    page=0  chnl=15
+char id=81   x=0     y=50    width=40    height=42    xoffset=-3    yoffset=4     xadvance=34    page=0  chnl=15
+char id=82   x=115   y=133   width=37    height=40    xoffset=-1    yoffset=4     xadvance=32    page=0  chnl=15
+char id=83   x=448   y=129   width=34    height=40    xoffset=-3    yoffset=4     xadvance=29    page=0  chnl=15
+char id=84   x=0     y=175   width=34    height=40    xoffset=-4    yoffset=4     xadvance=26    page=0  chnl=15
+char id=85   x=35    y=175   width=34    height=40    xoffset=-1    yoffset=4     xadvance=32    page=0  chnl=15
+char id=86   x=0     y=134   width=38    height=40    xoffset=-4    yoffset=4     xadvance=29    page=0  chnl=15
+char id=87   x=194   y=50    width=52    height=40    xoffset=-4    yoffset=4     xadvance=44    page=0  chnl=15
+char id=88   x=39    y=134   width=37    height=40    xoffset=-4    yoffset=4     xadvance=29    page=0  chnl=15
+char id=89   x=303   y=132   width=36    height=40    xoffset=-4    yoffset=4     xadvance=28    page=0  chnl=15
+char id=90   x=412   y=130   width=35    height=40    xoffset=-4    yoffset=4     xadvance=27    page=0  chnl=15
+char id=91   x=306   y=0     width=18    height=49    xoffset=-2    yoffset=4     xadvance=12    page=0  chnl=15
+char id=92   x=290   y=255   width=22    height=40    xoffset=-5    yoffset=4     xadvance=12    page=0  chnl=15
+char id=93   x=287   y=0     width=18    height=49    xoffset=-4    yoffset=4     xadvance=12    page=0  chnl=15
+char id=94   x=260   y=362   width=27    height=25    xoffset=-4    yoffset=4     xadvance=19    page=0  chnl=15
+char id=95   x=431   y=361   width=34    height=12    xoffset=-5    yoffset=41    xadvance=24    page=0  chnl=15
+char id=96   x=413   y=361   width=17    height=14    xoffset=-2    yoffset=4     xadvance=15    page=0  chnl=15
+char id=97   x=144   y=298   width=30    height=32    xoffset=-3    yoffset=12    xadvance=24    page=0  chnl=15
+char id=98   x=264   y=214   width=30    height=40    xoffset=-2    yoffset=4     xadvance=25    page=0  chnl=15
+char id=99   x=268   y=296   width=29    height=32    xoffset=-3    yoffset=12    xadvance=22    page=0  chnl=15
+char id=100  x=213   y=256   width=29    height=40    xoffset=-3    yoffset=4     xadvance=24    page=0  chnl=15
+char id=101  x=82    y=298   width=30    height=32    xoffset=-3    yoffset=12    xadvance=24    page=0  chnl=15
+char id=102  x=243   y=256   width=23    height=40    xoffset=-4    yoffset=4     xadvance=13    page=0  chnl=15
+char id=103  x=134   y=50    width=29    height=41    xoffset=-3    yoffset=12    xadvance=25    page=0  chnl=15
+char id=104  x=483   y=83    width=28    height=40    xoffset=-2    yoffset=4     xadvance=24    page=0  chnl=15
+char id=105  x=380   y=255   width=14    height=40    xoffset=-2    yoffset=4     xadvance=10    page=0  chnl=15
+char id=106  x=267   y=0     width=19    height=49    xoffset=-7    yoffset=4     xadvance=10    page=0  chnl=15
+char id=107  x=483   y=124   width=28    height=40    xoffset=-2    yoffset=4     xadvance=22    page=0  chnl=15
+char id=108  x=365   y=255   width=14    height=40    xoffset=-2    yoffset=4     xadvance=10    page=0  chnl=15
+char id=109  x=0     y=298   width=42    height=32    xoffset=-2    yoffset=12    xadvance=38    page=0  chnl=15
+char id=110  x=387   y=296   width=28    height=32    xoffset=-2    yoffset=12    xadvance=24    page=0  chnl=15
+char id=111  x=206   y=297   width=30    height=32    xoffset=-3    yoffset=12    xadvance=24    page=0  chnl=15
+char id=112  x=72    y=50    width=30    height=41    xoffset=-2    yoffset=12    xadvance=25    page=0  chnl=15
+char id=113  x=41    y=50    width=30    height=41    xoffset=-3    yoffset=12    xadvance=25    page=0  chnl=15
+char id=114  x=443   y=293   width=22    height=32    xoffset=-2    yoffset=12    xadvance=15    page=0  chnl=15
+char id=115  x=358   y=296   width=28    height=32    xoffset=-3    yoffset=12    xadvance=22    page=0  chnl=15
+char id=116  x=426   y=253   width=20    height=39    xoffset=-4    yoffset=5     xadvance=12    page=0  chnl=15
+char id=117  x=29    y=363   width=28    height=31    xoffset=-2    yoffset=13    xadvance=24    page=0  chnl=15
+char id=118  x=221   y=330   width=31    height=31    xoffset=-4    yoffset=13    xadvance=23    page=0  chnl=15
+char id=119  x=466   y=291   width=41    height=31    xoffset=-4    yoffset=13    xadvance=33    page=0  chnl=15
+char id=120  x=284   y=329   width=30    height=31    xoffset=-4    yoffset=13    xadvance=22    page=0  chnl=15
+char id=121  x=153   y=256   width=29    height=40    xoffset=-4    yoffset=13    xadvance=21    page=0  chnl=15
+char id=122  x=315   y=329   width=30    height=31    xoffset=-4    yoffset=13    xadvance=22    page=0  chnl=15
+char id=123  x=178   y=0     width=23    height=49    xoffset=-4    yoffset=4     xadvance=15    page=0  chnl=15
+char id=124  x=325   y=0     width=13    height=49    xoffset=-1    yoffset=4     xadvance=11    page=0  chnl=15
+char id=125  x=202   y=0     width=22    height=49    xoffset=-4    yoffset=4     xadvance=15    page=0  chnl=15
+char id=126  x=380   y=361   width=32    height=16    xoffset=-3    yoffset=17    xadvance=26    page=0  chnl=15
+char id=1025 x=413   y=0     width=32    height=46    xoffset=-1    yoffset=-2    xadvance=29    page=0  chnl=15
+char id=1040 x=326   y=91    width=39    height=40    xoffset=-5    yoffset=4     xadvance=29    page=0  chnl=15
+char id=1041 x=34    y=216   width=33    height=40    xoffset=-1    yoffset=4     xadvance=29    page=0  chnl=15
+char id=1042 x=451   y=170   width=33    height=40    xoffset=-2    yoffset=4     xadvance=29    page=0  chnl=15
+char id=1043 x=31    y=257   width=30    height=40    xoffset=-1    yoffset=4     xadvance=24    page=0  chnl=15
+char id=1044 x=374   y=0     width=38    height=47    xoffset=-5    yoffset=4     xadvance=30    page=0  chnl=15
+char id=1045 x=135   y=215   width=32    height=40    xoffset=-1    yoffset=4     xadvance=29    page=0  chnl=15
+char id=1046 x=247   y=50    width=50    height=40    xoffset=-4    yoffset=4     xadvance=41    page=0  chnl=15
+char id=1047 x=383   y=172   width=33    height=40    xoffset=-3    yoffset=4     xadvance=27    page=0  chnl=15
+char id=1048 x=210   y=174   width=34    height=40    xoffset=-1    yoffset=4     xadvance=32    page=0  chnl=15
+char id=1049 x=339   y=0     width=34    height=48    xoffset=-1    yoffset=-4    xadvance=32    page=0  chnl=15
+char id=1050 x=200   y=215   width=31    height=40    xoffset=-1    yoffset=4     xadvance=26    page=0  chnl=15
+char id=1051 x=70    y=175   width=34    height=40    xoffset=-4    yoffset=4     xadvance=29    page=0  chnl=15
+char id=1052 x=206   y=91    width=39    height=40    xoffset=-1    yoffset=4     xadvance=37    page=0  chnl=15
+char id=1053 x=105   y=174   width=34    height=40    xoffset=-1    yoffset=4     xadvance=32    page=0  chnl=15
+char id=1054 x=125   y=92    width=40    height=40    xoffset=-3    yoffset=4     xadvance=34    page=0  chnl=15
+char id=1055 x=175   y=174   width=34    height=40    xoffset=-1    yoffset=4     xadvance=32    page=0  chnl=15
+char id=1056 x=478   y=42    width=33    height=40    xoffset=-1    yoffset=4     xadvance=29    page=0  chnl=15
+char id=1057 x=366   y=90    width=38    height=40    xoffset=-3    yoffset=4     xadvance=32    page=0  chnl=15
+char id=1058 x=280   y=173   width=34    height=40    xoffset=-4    yoffset=4     xadvance=26    page=0  chnl=15
+char id=1059 x=266   y=132   width=36    height=40    xoffset=-4    yoffset=4     xadvance=28    page=0  chnl=15
+char id=1060 x=246   y=91    width=39    height=40    xoffset=-3    yoffset=4     xadvance=33    page=0  chnl=15
+char id=1061 x=77    y=133   width=37    height=40    xoffset=-4    yoffset=4     xadvance=29    page=0  chnl=15
+char id=1062 x=140   y=0     width=37    height=49    xoffset=-1    yoffset=4     xadvance=33    page=0  chnl=15
+char id=1063 x=349   y=173   width=33    height=40    xoffset=-3    yoffset=4     xadvance=29    page=0  chnl=15
+char id=1064 x=435   y=47    width=42    height=40    xoffset=-1    yoffset=4     xadvance=40    page=0  chnl=15
+char id=1065 x=51    y=0     width=45    height=49    xoffset=-1    yoffset=4     xadvance=41    page=0  chnl=15
+char id=1066 x=391   y=48    width=43    height=40    xoffset=-5    yoffset=4     xadvance=35    page=0  chnl=15
+char id=1067 x=42    y=92    width=41    height=40    xoffset=-1    yoffset=4     xadvance=39    page=0  chnl=15
+char id=1068 x=417   y=171   width=33    height=40    xoffset=-1    yoffset=4     xadvance=29    page=0  chnl=15
+char id=1069 x=153   y=133   width=37    height=40    xoffset=-3    yoffset=4     xadvance=32    page=0  chnl=15
+char id=1070 x=298   y=50    width=48    height=40    xoffset=-1    yoffset=4     xadvance=44    page=0  chnl=15
+char id=1071 x=191   y=133   width=37    height=40    xoffset=-4    yoffset=4     xadvance=32    page=0  chnl=15
+char id=1072 x=237   y=297   width=30    height=32    xoffset=-3    yoffset=12    xadvance=24    page=0  chnl=15
+char id=1073 x=477   y=0     width=31    height=41    xoffset=-3    yoffset=3     xadvance=25    page=0  chnl=15
+char id=1074 x=465   y=326   width=28    height=31    xoffset=-2    yoffset=13    xadvance=23    page=0  chnl=15
+char id=1075 x=143   y=363   width=23    height=31    xoffset=-2    yoffset=13    xadvance=16    page=0  chnl=15
+char id=1076 x=462   y=253   width=34    height=37    xoffset=-5    yoffset=13    xadvance=26    page=0  chnl=15
+char id=1077 x=175   y=297   width=30    height=32    xoffset=-3    yoffset=12    xadvance=24    page=0  chnl=15
+char id=1078 x=40    y=331   width=39    height=31    xoffset=-5    yoffset=13    xadvance=29    page=0  chnl=15
+char id=1079 x=416   y=294   width=26    height=32    xoffset=-3    yoffset=12    xadvance=20    page=0  chnl=15
+char id=1080 x=377   y=329   width=29    height=31    xoffset=-2    yoffset=13    xadvance=25    page=0  chnl=15
+char id=1081 x=164   y=50    width=29    height=41    xoffset=-2    yoffset=3     xadvance=25    page=0  chnl=15
+char id=1082 x=116   y=363   width=26    height=31    xoffset=-2    yoffset=13    xadvance=19    page=0  chnl=15
+char id=1083 x=188   y=330   width=32    height=31    xoffset=-4    yoffset=13    xadvance=26    page=0  chnl=15
+char id=1084 x=153   y=331   width=34    height=31    xoffset=-2    yoffset=13    xadvance=30    page=0  chnl=15
+char id=1085 x=58    y=363   width=28    height=31    xoffset=-2    yoffset=13    xadvance=24    page=0  chnl=15
+char id=1086 x=113   y=298   width=30    height=32    xoffset=-3    yoffset=12    xadvance=24    page=0  chnl=15
+char id=1087 x=87    y=363   width=28    height=31    xoffset=-2    yoffset=13    xadvance=24    page=0  chnl=15
+char id=1088 x=103   y=50    width=30    height=41    xoffset=-2    yoffset=12    xadvance=25    page=0  chnl=15
+char id=1089 x=298   y=296   width=29    height=32    xoffset=-3    yoffset=12    xadvance=22    page=0  chnl=15
+char id=1090 x=436   y=327   width=28    height=31    xoffset=-4    yoffset=13    xadvance=20    page=0  chnl=15
+char id=1091 x=183   y=256   width=29    height=40    xoffset=-4    yoffset=13    xadvance=21    page=0  chnl=15
+char id=1092 x=97    y=0     width=42    height=49    xoffset=-3    yoffset=4     xadvance=36    page=0  chnl=15
+char id=1093 x=253   y=330   width=30    height=31    xoffset=-4    yoffset=13    xadvance=22    page=0  chnl=15
+char id=1094 x=62    y=257   width=30    height=40    xoffset=-2    yoffset=13    xadvance=25    page=0  chnl=15
+char id=1095 x=407   y=329   width=28    height=31    xoffset=-3    yoffset=13    xadvance=23    page=0  chnl=15
+char id=1096 x=0     y=331   width=39    height=31    xoffset=-2    yoffset=13    xadvance=35    page=0  chnl=15
+char id=1097 x=0     y=93    width=41    height=40    xoffset=-2    yoffset=13    xadvance=36    page=0  chnl=15
+char id=1098 x=117   y=331   width=35    height=31    xoffset=-4    yoffset=13    xadvance=28    page=0  chnl=15
+char id=1099 x=80    y=331   width=36    height=31    xoffset=-2    yoffset=13    xadvance=32    page=0  chnl=15
+char id=1100 x=0     y=363   width=28    height=31    xoffset=-2    yoffset=13    xadvance=23    page=0  chnl=15
+char id=1101 x=328   y=296   width=29    height=32    xoffset=-4    yoffset=12    xadvance=22    page=0  chnl=15
+char id=1102 x=43    y=298   width=38    height=32    xoffset=-2    yoffset=12    xadvance=33    page=0  chnl=15
+char id=1103 x=346   y=329   width=30    height=31    xoffset=-4    yoffset=13    xadvance=24    page=0  chnl=15
+char id=1105 x=395   y=254   width=30    height=39    xoffset=-3    yoffset=5     xadvance=24    page=0  chnl=15
+kernings count=547
+kerning first=32  second=65  amount=-2
+kerning first=32  second=84  amount=-1
+kerning first=32  second=89  amount=-1
+kerning first=1102 second=1095 amount=-1
+kerning first=1102 second=1093 amount=-1
+kerning first=1102 second=1090 amount=-1
+kerning first=1102 second=1084 amount=-1
+kerning first=1102 second=1083 amount=-1
+kerning first=1102 second=1078 amount=-1
+kerning first=1102 second=1076 amount=-1
+kerning first=49  second=49  amount=-3
+kerning first=65  second=32  amount=-2
+kerning first=65  second=84  amount=-3
+kerning first=65  second=86  amount=-3
+kerning first=65  second=87  amount=-2
+kerning first=65  second=89  amount=-3
+kerning first=65  second=118 amount=-1
+kerning first=65  second=119 amount=-1
+kerning first=65  second=121 amount=-1
+kerning first=1101 second=1103 amount=-1
+kerning first=70  second=44  amount=-5
+kerning first=70  second=46  amount=-5
+kerning first=70  second=65  amount=-2
+kerning first=76  second=32  amount=-2
+kerning first=76  second=84  amount=-3
+kerning first=76  second=86  amount=-3
+kerning first=76  second=87  amount=-3
+kerning first=76  second=89  amount=-3
+kerning first=76  second=121 amount=-2
+kerning first=1101 second=1093 amount=-1
+kerning first=80  second=32  amount=-1
+kerning first=80  second=44  amount=-6
+kerning first=80  second=46  amount=-6
+kerning first=80  second=65  amount=-3
+kerning first=82  second=84  amount=-1
+kerning first=82  second=86  amount=-1
+kerning first=82  second=87  amount=-1
+kerning first=82  second=89  amount=-1
+kerning first=84  second=32  amount=-1
+kerning first=84  second=44  amount=-5
+kerning first=84  second=45  amount=-2
+kerning first=84  second=46  amount=-5
+kerning first=84  second=58  amount=-5
+kerning first=1101 second=1090 amount=-1
+kerning first=84  second=65  amount=-3
+kerning first=84  second=79  amount=-1
+kerning first=84  second=97  amount=-5
+kerning first=84  second=99  amount=-5
+kerning first=84  second=101 amount=-5
+kerning first=84  second=105 amount=-2
+kerning first=84  second=111 amount=-5
+kerning first=84  second=114 amount=-2
+kerning first=84  second=115 amount=-5
+kerning first=84  second=117 amount=-2
+kerning first=84  second=119 amount=-2
+kerning first=84  second=121 amount=-2
+kerning first=86  second=44  amount=-4
+kerning first=86  second=45  amount=-2
+kerning first=86  second=46  amount=-4
+kerning first=86  second=58  amount=-2
+kerning first=1101 second=1086 amount=1
+kerning first=86  second=65  amount=-3
+kerning first=86  second=97  amount=-3
+kerning first=86  second=101 amount=-2
+kerning first=86  second=105 amount=-1
+kerning first=86  second=111 amount=-2
+kerning first=86  second=114 amount=-2
+kerning first=86  second=117 amount=-2
+kerning first=86  second=121 amount=-2
+kerning first=87  second=44  amount=-2
+kerning first=87  second=45  amount=-1
+kerning first=87  second=46  amount=-2
+kerning first=87  second=58  amount=-1
+kerning first=1101 second=1083 amount=-1
+kerning first=87  second=65  amount=-2
+kerning first=87  second=97  amount=-2
+kerning first=87  second=101 amount=-1
+kerning first=1101 second=1079 amount=-1
+kerning first=87  second=111 amount=-1
+kerning first=87  second=114 amount=-1
+kerning first=87  second=117 amount=-1
+kerning first=1101 second=1077 amount=1
+kerning first=89  second=32  amount=-1
+kerning first=89  second=44  amount=-6
+kerning first=89  second=45  amount=-4
+kerning first=89  second=46  amount=-6
+kerning first=89  second=58  amount=-2
+kerning first=1101 second=1076 amount=-1
+kerning first=89  second=65  amount=-3
+kerning first=89  second=97  amount=-3
+kerning first=89  second=101 amount=-4
+kerning first=89  second=105 amount=-2
+kerning first=89  second=111 amount=-4
+kerning first=89  second=112 amount=-3
+kerning first=89  second=113 amount=-4
+kerning first=89  second=117 amount=-2
+kerning first=89  second=118 amount=-2
+kerning first=102 second=102 amount=-1
+kerning first=1100 second=1095 amount=-3
+kerning first=114 second=44  amount=-2
+kerning first=114 second=46  amount=-2
+kerning first=1100 second=1090 amount=-3
+kerning first=118 second=44  amount=-3
+kerning first=118 second=46  amount=-3
+kerning first=119 second=44  amount=-2
+kerning first=119 second=46  amount=-2
+kerning first=121 second=44  amount=-3
+kerning first=121 second=46  amount=-3
+kerning first=1097 second=1091 amount=1
+kerning first=1097 second=1086 amount=-1
+kerning first=1097 second=1077 amount=-1
+kerning first=1094 second=1089 amount=-1
+kerning first=1094 second=1086 amount=-1
+kerning first=1094 second=1079 amount=-1
+kerning first=1094 second=1077 amount=-1
+kerning first=1093 second=1095 amount=-1
+kerning first=1093 second=1092 amount=-1
+kerning first=1093 second=1090 amount=-1
+kerning first=1093 second=1089 amount=-1
+kerning first=1093 second=1086 amount=-1
+kerning first=1093 second=1079 amount=-1
+kerning first=1093 second=1077 amount=-1
+kerning first=1093 second=1073 amount=-1
+kerning first=1093 second=1072 amount=-1
+kerning first=1092 second=1103 amount=-1
+kerning first=1092 second=1095 amount=-1
+kerning first=1092 second=1091 amount=-1
+kerning first=1092 second=1090 amount=-1
+kerning first=1092 second=1083 amount=-1
+kerning first=1092 second=1076 amount=-1
+kerning first=1092 second=1073 amount=-1
+kerning first=1091 second=1103 amount=-1
+kerning first=1091 second=1101 amount=-1
+kerning first=1091 second=1092 amount=-1
+kerning first=1091 second=1089 amount=-1
+kerning first=1091 second=1088 amount=-1
+kerning first=1091 second=1086 amount=-1
+kerning first=1091 second=1084 amount=-1
+kerning first=1091 second=1083 amount=-1
+kerning first=1091 second=1078 amount=1
+kerning first=1091 second=1077 amount=-1
+kerning first=1091 second=1076 amount=-1
+kerning first=1091 second=1073 amount=1
+kerning first=1091 second=1072 amount=-1
+kerning first=1091 second=46  amount=-4
+kerning first=1091 second=44  amount=-4
+kerning first=1090 second=1091 amount=1
+kerning first=1090 second=1089 amount=-1
+kerning first=1090 second=1086 amount=-1
+kerning first=1090 second=1083 amount=-1
+kerning first=1090 second=1078 amount=1
+kerning first=1090 second=1077 amount=-1
+kerning first=1090 second=1076 amount=-1
+kerning first=1090 second=1072 amount=-1
+kerning first=1090 second=46  amount=-5
+kerning first=1090 second=44  amount=-5
+kerning first=1089 second=1101 amount=1
+kerning first=1089 second=1095 amount=-1
+kerning first=1089 second=1086 amount=1
+kerning first=1089 second=1078 amount=1
+kerning first=1088 second=1103 amount=-1
+kerning first=1088 second=1095 amount=-1
+kerning first=1088 second=1093 amount=-1
+kerning first=1088 second=1091 amount=-1
+kerning first=1088 second=1090 amount=-1
+kerning first=1088 second=1083 amount=-2
+kerning first=1088 second=1079 amount=-1
+kerning first=1088 second=1076 amount=-1
+kerning first=1086 second=1095 amount=-1
+kerning first=1086 second=1093 amount=-1
+kerning first=1086 second=1091 amount=-1
+kerning first=1086 second=1090 amount=-1
+kerning first=1086 second=1083 amount=-1
+kerning first=1086 second=1079 amount=-1
+kerning first=1086 second=1078 amount=-1
+kerning first=1086 second=1076 amount=-1
+kerning first=1084 second=1091 amount=1
+kerning first=1084 second=1079 amount=-1
+kerning first=1084 second=1073 amount=-1
+kerning first=1083 second=1095 amount=-1
+kerning first=1083 second=1086 amount=1
+kerning first=1082 second=1101 amount=1
+kerning first=1082 second=1091 amount=1
+kerning first=1082 second=1090 amount=1
+kerning first=1082 second=1089 amount=1
+kerning first=1082 second=1086 amount=1
+kerning first=1082 second=1083 amount=1
+kerning first=1082 second=1079 amount=1
+kerning first=1082 second=1077 amount=1
+kerning first=1082 second=1073 amount=1
+kerning first=1082 second=1072 amount=1
+kerning first=1079 second=1098 amount=-1
+kerning first=1079 second=1095 amount=-1
+kerning first=1079 second=1092 amount=-1
+kerning first=1079 second=1091 amount=-1
+kerning first=1079 second=1089 amount=-1
+kerning first=1079 second=1086 amount=-1
+kerning first=1079 second=1083 amount=-1
+kerning first=1079 second=1079 amount=-1
+kerning first=1079 second=1077 amount=-1
+kerning first=1079 second=1076 amount=-1
+kerning first=1079 second=1073 amount=-1
+kerning first=1078 second=1098 amount=1
+kerning first=1078 second=1095 amount=-1
+kerning first=1078 second=1091 amount=1
+kerning first=1078 second=1073 amount=1
+kerning first=1077 second=1095 amount=-1
+kerning first=1077 second=1093 amount=-1
+kerning first=1077 second=1091 amount=-1
+kerning first=1077 second=1090 amount=-1
+kerning first=1077 second=1083 amount=-1
+kerning first=1077 second=1079 amount=-1
+kerning first=1077 second=1078 amount=-1
+kerning first=1077 second=1076 amount=-1
+kerning first=1077 second=1073 amount=-1
+kerning first=1076 second=1101 amount=1
+kerning first=1076 second=1098 amount=-1
+kerning first=1075 second=1103 amount=-1
+kerning first=1075 second=1089 amount=-1
+kerning first=1075 second=1086 amount=-1
+kerning first=1075 second=1083 amount=-1
+kerning first=1075 second=1079 amount=-1
+kerning first=1075 second=1077 amount=-1
+kerning first=1075 second=1076 amount=-2
+kerning first=1075 second=1072 amount=-1
+kerning first=1075 second=46  amount=-5
+kerning first=1075 second=44  amount=-5
+kerning first=1074 second=1103 amount=-1
+kerning first=1074 second=1098 amount=-1
+kerning first=1074 second=1095 amount=-2
+kerning first=1074 second=1092 amount=-1
+kerning first=1074 second=1091 amount=-1
+kerning first=1074 second=1090 amount=-1
+kerning first=1074 second=1089 amount=-1
+kerning first=1074 second=1086 amount=-1
+kerning first=1074 second=1084 amount=-1
+kerning first=1074 second=1083 amount=-1
+kerning first=1074 second=1079 amount=-1
+kerning first=1074 second=1078 amount=-1
+kerning first=1074 second=1077 amount=-1
+kerning first=1074 second=1076 amount=-1
+kerning first=1074 second=1073 amount=-1
+kerning first=1074 second=1072 amount=-1
+kerning first=1073 second=1103 amount=-1
+kerning first=1073 second=1101 amount=-1
+kerning first=1073 second=1098 amount=-1
+kerning first=1073 second=1095 amount=-1
+kerning first=1073 second=1093 amount=-1
+kerning first=1073 second=1092 amount=-1
+kerning first=1073 second=1091 amount=-1
+kerning first=1073 second=1089 amount=-1
+kerning first=1073 second=1084 amount=-1
+kerning first=1073 second=1083 amount=-2
+kerning first=1073 second=1079 amount=-1
+kerning first=1073 second=1078 amount=-1
+kerning first=1073 second=1077 amount=-1
+kerning first=1073 second=1076 amount=-2
+kerning first=1073 second=1072 amount=-1
+kerning first=1072 second=1095 amount=-1
+kerning first=1072 second=1091 amount=-1
+kerning first=1072 second=1090 amount=-1
+kerning first=1072 second=1079 amount=-1
+kerning first=1070 second=1084 amount=-1
+kerning first=1070 second=1083 amount=-2
+kerning first=1070 second=1076 amount=-2
+kerning first=1070 second=1063 amount=-1
+kerning first=1070 second=1061 amount=-2
+kerning first=1070 second=1058 amount=-3
+kerning first=1070 second=1057 amount=-1
+kerning first=1070 second=1054 amount=-1
+kerning first=1070 second=1051 amount=-2
+kerning first=1070 second=1046 amount=-1
+kerning first=1070 second=1044 amount=-2
+kerning first=1070 second=1040 amount=-1
+kerning first=1069 second=1103 amount=-1
+kerning first=1069 second=1084 amount=-1
+kerning first=1069 second=1083 amount=-1
+kerning first=1069 second=1078 amount=1
+kerning first=1069 second=1076 amount=-1
+kerning first=1069 second=1071 amount=-1
+kerning first=1069 second=1061 amount=-2
+kerning first=1069 second=1051 amount=-1
+kerning first=1069 second=1047 amount=-1
+kerning first=1069 second=1046 amount=-1
+kerning first=1069 second=1044 amount=-1
+kerning first=1068 second=1071 amount=-2
+kerning first=1068 second=1069 amount=-1
+kerning first=1068 second=1063 amount=-3
+kerning first=1068 second=1061 amount=-2
+kerning first=1068 second=1058 amount=-4
+kerning first=1068 second=1057 amount=-1
+kerning first=1068 second=1054 amount=-1
+kerning first=1068 second=1052 amount=-1
+kerning first=1068 second=1051 amount=-2
+kerning first=1068 second=1047 amount=-1
+kerning first=1068 second=1046 amount=-1
+kerning first=1068 second=1044 amount=-1
+kerning first=1068 second=1040 amount=-1
+kerning first=1066 second=1071 amount=-1
+kerning first=1065 second=1091 amount=1
+kerning first=1065 second=1072 amount=1
+kerning first=1062 second=1072 amount=1
+kerning first=1062 second=1054 amount=-1
+kerning first=1061 second=1091 amount=-1
+kerning first=1061 second=1086 amount=-1
+kerning first=1061 second=1069 amount=-2
+kerning first=1061 second=1060 amount=-1
+kerning first=1061 second=1057 amount=-1
+kerning first=1061 second=1054 amount=-1
+kerning first=1061 second=1047 amount=-1
+kerning first=1060 second=1083 amount=-1
+kerning first=1060 second=1071 amount=-2
+kerning first=1060 second=1063 amount=-1
+kerning first=1060 second=1059 amount=-2
+kerning first=1060 second=1058 amount=-3
+kerning first=1060 second=1051 amount=-1
+kerning first=1060 second=1044 amount=-1
+kerning first=1060 second=1040 amount=-1
+kerning first=1059 second=1103 amount=-3
+kerning first=1059 second=1102 amount=-2
+kerning first=1059 second=1097 amount=-2
+kerning first=1059 second=1096 amount=-2
+kerning first=1059 second=1094 amount=-2
+kerning first=1059 second=1093 amount=-2
+kerning first=1059 second=1089 amount=-3
+kerning first=1059 second=1088 amount=-2
+kerning first=1059 second=1087 amount=-2
+kerning first=1059 second=1086 amount=-3
+kerning first=1059 second=1085 amount=-2
+kerning first=1059 second=1084 amount=-2
+kerning first=1059 second=1083 amount=-3
+kerning first=1059 second=1082 amount=-2
+kerning first=1059 second=1081 amount=-1
+kerning first=1059 second=1080 amount=-2
+kerning first=1059 second=1079 amount=-3
+kerning first=1059 second=1078 amount=-1
+kerning first=1059 second=1077 amount=-3
+kerning first=1059 second=1076 amount=-3
+kerning first=1059 second=1075 amount=-2
+kerning first=1059 second=1074 amount=-3
+kerning first=1059 second=1073 amount=-1
+kerning first=1059 second=1071 amount=-1
+kerning first=1059 second=1069 amount=-1
+kerning first=1059 second=1060 amount=-1
+kerning first=1059 second=1054 amount=-1
+kerning first=1059 second=1051 amount=-1
+kerning first=1059 second=1047 amount=-1
+kerning first=1059 second=1044 amount=-2
+kerning first=1059 second=1040 amount=-3
+kerning first=1059 second=58  amount=-1
+kerning first=1059 second=46  amount=-6
+kerning first=1059 second=44  amount=-6
+kerning first=1058 second=1103 amount=-3
+kerning first=1058 second=1102 amount=-2
+kerning first=1058 second=1100 amount=-2
+kerning first=1058 second=1099 amount=-2
+kerning first=1058 second=1097 amount=-2
+kerning first=1058 second=1093 amount=-2
+kerning first=1058 second=1091 amount=-3
+kerning first=1058 second=1089 amount=-3
+kerning first=1058 second=1088 amount=-3
+kerning first=1058 second=1087 amount=-2
+kerning first=1058 second=1086 amount=-3
+kerning first=1058 second=1084 amount=-2
+kerning first=1058 second=1083 amount=-2
+kerning first=1058 second=1082 amount=-2
+kerning first=1058 second=1080 amount=-2
+kerning first=1058 second=1077 amount=-3
+kerning first=1058 second=1074 amount=-2
+kerning first=1058 second=1072 amount=-2
+kerning first=1058 second=1071 amount=-1
+kerning first=1058 second=1060 amount=-1
+kerning first=1058 second=1054 amount=-2
+kerning first=1058 second=1051 amount=-1
+kerning first=1058 second=1047 amount=-1
+kerning first=1058 second=1046 amount=1
+kerning first=1058 second=1044 amount=-1
+kerning first=1058 second=1040 amount=-1
+kerning first=1058 second=46  amount=-5
+kerning first=1058 second=44  amount=-5
+kerning first=1057 second=1095 amount=-1
+kerning first=1057 second=1078 amount=1
+kerning first=1057 second=1072 amount=1
+kerning first=1057 second=1069 amount=-1
+kerning first=1057 second=1066 amount=-2
+kerning first=1057 second=1063 amount=-1
+kerning first=1057 second=1061 amount=-3
+kerning first=1057 second=1059 amount=-1
+kerning first=1057 second=1058 amount=-1
+kerning first=1057 second=1054 amount=-1
+kerning first=1057 second=1052 amount=-1
+kerning first=1057 second=1051 amount=-1
+kerning first=1057 second=1047 amount=-1
+kerning first=1057 second=1044 amount=-1
+kerning first=1057 second=1040 amount=-1
+kerning first=1056 second=1103 amount=-1
+kerning first=1056 second=1101 amount=-1
+kerning first=1056 second=1086 amount=-2
+kerning first=1056 second=1077 amount=-2
+kerning first=1056 second=1076 amount=-3
+kerning first=1056 second=1072 amount=-1
+kerning first=1056 second=1071 amount=-1
+kerning first=1056 second=1061 amount=-2
+kerning first=1056 second=1060 amount=-1
+kerning first=1056 second=1059 amount=-1
+kerning first=1056 second=1058 amount=-2
+kerning first=1056 second=1057 amount=-1
+kerning first=1056 second=1054 amount=-1
+kerning first=1056 second=1052 amount=-1
+kerning first=1056 second=1051 amount=-3
+kerning first=1056 second=1047 amount=-1
+kerning first=1056 second=1046 amount=-1
+kerning first=1056 second=1044 amount=-3
+kerning first=1056 second=1040 amount=-3
+kerning first=1056 second=58  amount=-1
+kerning first=1056 second=46  amount=-8
+kerning first=1056 second=44  amount=-8
+kerning first=1054 second=1093 amount=-1
+kerning first=1054 second=1083 amount=-1
+kerning first=1054 second=1076 amount=-1
+kerning first=1040 second=1044 amount=1
+kerning first=1040 second=1047 amount=-1
+kerning first=1040 second=1051 amount=1
+kerning first=1040 second=1054 amount=-1
+kerning first=1040 second=1055 amount=-1
+kerning first=1040 second=1057 amount=-1
+kerning first=1040 second=1058 amount=-3
+kerning first=1040 second=1059 amount=-2
+kerning first=1040 second=1060 amount=-1
+kerning first=1040 second=1063 amount=-3
+kerning first=1040 second=1069 amount=-1
+kerning first=1040 second=1072 amount=1
+kerning first=1040 second=1090 amount=-1
+kerning first=1040 second=1091 amount=-1
+kerning first=1040 second=1092 amount=1
+kerning first=1040 second=1101 amount=1
+kerning first=1041 second=1040 amount=-1
+kerning first=1041 second=1047 amount=-1
+kerning first=1041 second=1054 amount=-1
+kerning first=1041 second=1057 amount=-1
+kerning first=1041 second=1058 amount=-2
+kerning first=1041 second=1059 amount=-1
+kerning first=1041 second=1060 amount=-1
+kerning first=1041 second=1061 amount=-1
+kerning first=1041 second=1063 amount=-2
+kerning first=1041 second=1066 amount=-1
+kerning first=1041 second=1069 amount=-1
+kerning first=1041 second=1071 amount=-1
+kerning first=1041 second=1083 amount=-1
+kerning first=1041 second=1091 amount=-1
+kerning first=1042 second=1040 amount=-1
+kerning first=1042 second=1044 amount=-1
+kerning first=1042 second=1046 amount=-1
+kerning first=1042 second=1047 amount=-1
+kerning first=1042 second=1051 amount=-1
+kerning first=1042 second=1054 amount=-1
+kerning first=1042 second=1057 amount=-1
+kerning first=1042 second=1058 amount=-3
+kerning first=1042 second=1059 amount=-1
+kerning first=1042 second=1060 amount=-1
+kerning first=1042 second=1061 amount=-2
+kerning first=1042 second=1063 amount=-2
+kerning first=1042 second=1066 amount=-3
+kerning first=1042 second=1071 amount=-1
+kerning first=1042 second=1076 amount=-1
+kerning first=1042 second=1084 amount=-1
+kerning first=1042 second=1090 amount=-1
+kerning first=1042 second=1091 amount=-1
+kerning first=1042 second=1093 amount=-1
+kerning first=1042 second=1095 amount=-1
+kerning first=1042 second=1103 amount=-1
+kerning first=1043 second=44  amount=-5
+kerning first=1043 second=46  amount=-5
+kerning first=1054 second=1071 amount=-1
+kerning first=1054 second=1063 amount=-1
+kerning first=1054 second=1061 amount=-2
+kerning first=1043 second=1040 amount=-3
+kerning first=1043 second=1044 amount=-3
+kerning first=1043 second=1047 amount=-1
+kerning first=1043 second=1051 amount=-3
+kerning first=1043 second=1052 amount=-1
+kerning first=1043 second=1054 amount=-3
+kerning first=1043 second=1057 amount=-2
+kerning first=1043 second=1071 amount=-1
+kerning first=1043 second=1072 amount=-3
+kerning first=1043 second=1074 amount=-3
+kerning first=1043 second=1076 amount=-3
+kerning first=1043 second=1077 amount=-3
+kerning first=1043 second=1080 amount=-3
+kerning first=1043 second=1083 amount=-3
+kerning first=1043 second=1084 amount=-3
+kerning first=1043 second=1085 amount=-3
+kerning first=1043 second=1086 amount=-3
+kerning first=1043 second=1088 amount=-3
+kerning first=1043 second=1091 amount=-3
+kerning first=1043 second=1099 amount=-3
+kerning first=1043 second=1100 amount=-3
+kerning first=1043 second=1102 amount=-3
+kerning first=1043 second=1103 amount=-3
+kerning first=1044 second=1059 amount=1
+kerning first=1044 second=1060 amount=-1
+kerning first=1044 second=1063 amount=-2
+kerning first=1044 second=1079 amount=1
+kerning first=1044 second=1086 amount=1
+kerning first=1044 second=1091 amount=1
+kerning first=1045 second=1047 amount=-1
+kerning first=1045 second=1089 amount=-1
+kerning first=1046 second=1047 amount=-1
+kerning first=1046 second=1054 amount=-1
+kerning first=1046 second=1057 amount=-1
+kerning first=1046 second=1058 amount=1
+kerning first=1046 second=1059 amount=1
+kerning first=1046 second=1066 amount=1
+kerning first=1046 second=1072 amount=1
+kerning first=1046 second=1077 amount=-1
+kerning first=1046 second=1086 amount=-1
+kerning first=1046 second=1091 amount=-1
+kerning first=1047 second=1051 amount=-1
+kerning first=1047 second=1054 amount=-1
+kerning first=1047 second=1057 amount=-1
+kerning first=1047 second=1058 amount=-1
+kerning first=1047 second=1059 amount=-1
+kerning first=1047 second=1060 amount=-1
+kerning first=1047 second=1063 amount=-1
+kerning first=1047 second=1071 amount=-1
+kerning first=1050 second=1047 amount=-1
+kerning first=1050 second=1054 amount=-1
+kerning first=1050 second=1057 amount=-1
+kerning first=1050 second=1059 amount=1
+kerning first=1050 second=1060 amount=-2
+kerning first=1051 second=1060 amount=-1
+kerning first=1051 second=1073 amount=1
+kerning first=1051 second=1091 amount=1
+kerning first=1052 second=1060 amount=-1
+kerning first=1052 second=1063 amount=-1
+kerning first=1052 second=1072 amount=1
+kerning first=1052 second=1077 amount=1
+kerning first=1052 second=1086 amount=1
+kerning first=1052 second=1089 amount=1
+kerning first=1052 second=1091 amount=1
+kerning first=1052 second=1095 amount=-1
+kerning first=1052 second=1101 amount=1
+kerning first=1054 second=1040 amount=-1
+kerning first=1054 second=1044 amount=-1
+kerning first=1054 second=1046 amount=-1
+kerning first=1054 second=1051 amount=-1
+kerning first=1054 second=1059 amount=-1
diff --git a/samples/bin/library/arial_bm.png b/samples/bin/library/arial_bm.png
index 692e7e72..51356b05 100644
--- a/samples/bin/library/arial_bm.png
+++ b/samples/bin/library/arial_bm.png
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2f1044cd99d8bd2b0576b06928493cf7cdad421bae5d71c56a436cc33f59c30a
-size 217444
+oid sha256:cdd1e2d175c5109ec5840ea37093e7f745fbf618b709ee334b7459ef1567960a
+size 61729
diff --git a/samples/bin/library/font_bm_material.json b/samples/bin/library/font_bm_material.json
index fccdf859..044249a8 100644
--- a/samples/bin/library/font_bm_material.json
+++ b/samples/bin/library/font_bm_material.json
@@ -3,7 +3,7 @@
         "shader" : "font_bm_shader.json",
         "state_block" : {
             "blending_state" : {
-                "src_factor" : "src_alpha",
+                "src_factor" : "one",
                 "dst_factor" : "one_minus_src_alpha"
             },
             "capabilities_state" : {
diff --git a/samples/bin/library/font_bm_shader.frag b/samples/bin/library/font_bm_shader.frag
index 659abd18..0ce58914 100644
--- a/samples/bin/library/font_bm_shader.frag
+++ b/samples/bin/library/font_bm_shader.frag
@@ -1,8 +1,26 @@
 uniform sampler2D u_texture;
 
+uniform float u_glyph_dilate;
+uniform float u_outline_width;
+uniform vec4 u_outline_color;
+
 varying vec2 v_st0;
-varying vec4 v_color;
+varying vec4 v_color0;
 
 void main() {
-    gl_FragColor = texture2D(u_texture, v_st0) * v_color;
+    vec4 t = texture2D(u_texture, v_st0);
+
+    float glyph_alpha = t.a;
+    float outline_alpha = t.r;
+
+    vec4 glyph_color = vec4(v_color0.rgb * v_color0.a, v_color0.a);
+    vec4 outline_color = vec4(u_outline_color.rgb * u_outline_color.a, u_outline_color.a);
+
+    vec2 layers_mask = vec2(
+        step(0.0001, v_color0.a),
+        step(0.0001, u_outline_color.a * u_outline_width));
+
+    gl_FragColor =
+        layers_mask.x * glyph_alpha * glyph_color +
+        layers_mask.y * outline_alpha * outline_color * (1.0 - glyph_alpha);
 }
diff --git a/samples/bin/library/font_bm_shader.vert b/samples/bin/library/font_bm_shader.vert
index 87daabca..ec285d22 100644
--- a/samples/bin/library/font_bm_shader.vert
+++ b/samples/bin/library/font_bm_shader.vert
@@ -1,3 +1,4 @@
+uniform vec2 u_screen_s;
 uniform mat4 u_matrix_m;
 uniform mat4 u_matrix_vp;
 
@@ -6,10 +7,33 @@ attribute vec2 a_st0;
 attribute vec4 a_color0;
 
 varying vec2 v_st0;
-varying vec4 v_color;
+varying vec4 v_color0;
+
+#define VERTEX_SNAPPING_ON
+
+vec2 round(vec2 v) {
+    return vec2(
+        floor(v.x + 0.5),
+        floor(v.y + 0.5));
+}
+
+vec4 pixel_snap(vec4 pos) {
+    vec2 hpc = u_screen_s * 0.5;
+    vec2 pixel_pos = round((pos.xy / pos.w) * hpc);
+    pos.xy = pixel_pos / hpc * pos.w;
+    return pos;
+}
+
+vec4 vertex_to_homo(vec3 pos) {
+    return vec4(pos, 1.0) * u_matrix_m * u_matrix_vp;
+}
 
 void main() {
     v_st0 = vec2(a_st0.s, 1.0 - a_st0.t);
-    v_color = a_color0;
-    gl_Position = vec4(a_vertex, 1.0) * u_matrix_m * u_matrix_vp;
+    v_color0 = a_color0;
+#ifndef VERTEX_SNAPPING_ON
+    gl_Position = vertex_to_homo(a_vertex);
+#else
+    gl_Position = pixel_snap(vertex_to_homo(a_vertex));
+#endif
 }
diff --git a/samples/bin/library/font_sdf_shader.frag b/samples/bin/library/font_sdf_shader.frag
index 2fb8e219..1b1ab26d 100644
--- a/samples/bin/library/font_sdf_shader.frag
+++ b/samples/bin/library/font_sdf_shader.frag
@@ -1,3 +1,7 @@
+#ifdef GL_OES_standard_derivatives
+#  extension GL_OES_standard_derivatives : require
+#endif
+
 uniform sampler2D u_texture;
 
 uniform float u_glyph_dilate;
@@ -5,7 +9,7 @@ uniform float u_outline_width;
 uniform vec4 u_outline_color;
 
 varying vec2 v_st0;
-varying vec4 v_color;
+varying vec4 v_color0;
 
 void main() {
     float distance = texture2D(u_texture, v_st0).a;
@@ -17,13 +21,14 @@ void main() {
     float glyph_alpha = smoothstep(glyph_center - width, glyph_center + width, distance);
     float outline_alpha = smoothstep(outline_center - width, outline_center + width, distance);
 
-    vec4 glyph_color = vec4(v_color.rgb * v_color.a, v_color.a);
+    vec4 glyph_color = vec4(v_color0.rgb * v_color0.a, v_color0.a);
     vec4 outline_color = vec4(u_outline_color.rgb * u_outline_color.a, u_outline_color.a);
 
     vec2 layers_mask = vec2(
-        step(0.01, v_color.a),
-        step(0.01, u_outline_color.a * u_outline_width));
+        step(0.0001, v_color0.a),
+        step(0.0001, u_outline_color.a * u_outline_width));
 
-    gl_FragColor = glyph_alpha * glyph_color * layers_mask.x +
-        outline_alpha * outline_color * layers_mask.y * (1.0 - glyph_alpha);
+    gl_FragColor =
+        layers_mask.x * glyph_alpha * glyph_color +
+        layers_mask.y * outline_alpha * outline_color * (1.0 - glyph_alpha);
 }
diff --git a/samples/bin/library/font_sdf_shader.vert b/samples/bin/library/font_sdf_shader.vert
index 87daabca..ec285d22 100644
--- a/samples/bin/library/font_sdf_shader.vert
+++ b/samples/bin/library/font_sdf_shader.vert
@@ -1,3 +1,4 @@
+uniform vec2 u_screen_s;
 uniform mat4 u_matrix_m;
 uniform mat4 u_matrix_vp;
 
@@ -6,10 +7,33 @@ attribute vec2 a_st0;
 attribute vec4 a_color0;
 
 varying vec2 v_st0;
-varying vec4 v_color;
+varying vec4 v_color0;
+
+#define VERTEX_SNAPPING_ON
+
+vec2 round(vec2 v) {
+    return vec2(
+        floor(v.x + 0.5),
+        floor(v.y + 0.5));
+}
+
+vec4 pixel_snap(vec4 pos) {
+    vec2 hpc = u_screen_s * 0.5;
+    vec2 pixel_pos = round((pos.xy / pos.w) * hpc);
+    pos.xy = pixel_pos / hpc * pos.w;
+    return pos;
+}
+
+vec4 vertex_to_homo(vec3 pos) {
+    return vec4(pos, 1.0) * u_matrix_m * u_matrix_vp;
+}
 
 void main() {
     v_st0 = vec2(a_st0.s, 1.0 - a_st0.t);
-    v_color = a_color0;
-    gl_Position = vec4(a_vertex, 1.0) * u_matrix_m * u_matrix_vp;
+    v_color0 = a_color0;
+#ifndef VERTEX_SNAPPING_ON
+    gl_Position = vertex_to_homo(a_vertex);
+#else
+    gl_Position = pixel_snap(vertex_to_homo(a_vertex));
+#endif
 }
diff --git a/samples/bin/library/model_shader.frag b/samples/bin/library/model_shader.frag
index 64fab438..3fa39a3e 100644
--- a/samples/bin/library/model_shader.frag
+++ b/samples/bin/library/model_shader.frag
@@ -3,6 +3,5 @@ uniform sampler2D u_texture;
 varying vec2 v_st0;
 
 void main() {
-    vec2 st = vec2(v_st0.s, 1.0 - v_st0.t);
-    gl_FragColor = texture2D(u_texture, st);
+    gl_FragColor = texture2D(u_texture, v_st0);
 }
diff --git a/samples/bin/library/model_shader.vert b/samples/bin/library/model_shader.vert
index 0e1f4a33..e1e64ba6 100644
--- a/samples/bin/library/model_shader.vert
+++ b/samples/bin/library/model_shader.vert
@@ -6,7 +6,11 @@ attribute vec2 a_st0;
 
 varying vec2 v_st0;
 
-void main() {
-    v_st0 = a_st0;
-    gl_Position = vec4(a_vertex, 1.0) * u_matrix_m * u_matrix_vp;
+vec4 vertex_to_homo(vec3 pos) {
+    return vec4(pos, 1.0) * u_matrix_m * u_matrix_vp;
+}
+
+void main() {
+    v_st0 = vec2(a_st0.s, 1.0 - a_st0.t);
+    gl_Position = vertex_to_homo(a_vertex);
 }
diff --git a/samples/bin/library/scene_prefab.json b/samples/bin/library/scene_prefab.json
index 898d737a..8f79ef67 100644
--- a/samples/bin/library/scene_prefab.json
+++ b/samples/bin/library/scene_prefab.json
@@ -22,6 +22,9 @@
     }, {
         "prototype" : "ship_prefab.json",
         "components" : {
+            "sprite_renderer" : {
+                "tint" : [255,0,0,255]
+            },
             "actor" : {
                 "translation" : [50,-50,0]
             }
@@ -31,7 +34,9 @@
         "components" : {
             "label" : {
                 "text" : "bm font",
-                "valign" : "center"
+                "valign" : "center",
+                "outline_width" : 0.5,
+                "outline_color" : [0,0,0,255]
             },
             "actor" : {
                 "translation" : [0,180,0],
@@ -44,11 +49,11 @@
             "label" : {
                 "text" : "sdf font",
                 "valign" : "center",
-                "outline_width" : 0.2,
+                "outline_width" : 0.5,
                 "outline_color" : [0,0,0,255]
             },
             "actor" : {
-                "translation" : [0,-180,0],
+                "translation" : [0.5,-180.5,0],
                 "scale" : 3
             }
         }
diff --git a/samples/bin/library/sprite_material.json b/samples/bin/library/sprite_material.json
index e2f9770f..58a6a793 100644
--- a/samples/bin/library/sprite_material.json
+++ b/samples/bin/library/sprite_material.json
@@ -3,7 +3,7 @@
         "shader" : "sprite_shader.json",
         "state_block" : {
             "blending_state" : {
-                "src_factor" : "src_alpha",
+                "src_factor" : "one",
                 "dst_factor" : "one_minus_src_alpha"
             },
             "capabilities_state" : {
diff --git a/samples/bin/library/sprite_shader.frag b/samples/bin/library/sprite_shader.frag
index 7efd0b8b..7ea012bd 100644
--- a/samples/bin/library/sprite_shader.frag
+++ b/samples/bin/library/sprite_shader.frag
@@ -1,9 +1,10 @@
 uniform sampler2D u_texture;
 
-varying vec4 v_tint;
-varying vec2 v_st;
+varying vec2 v_st0;
+varying vec4 v_color0;
 
 void main() {
-    vec2 st = vec2(v_st.s, 1.0 - v_st.t);
-    gl_FragColor = texture2D(u_texture, st) * v_tint;
+    vec4 c = texture2D(u_texture, v_st0) * v_color0;
+    c.rgb *= c.a;
+    gl_FragColor = c;
 }
diff --git a/samples/bin/library/sprite_shader.vert b/samples/bin/library/sprite_shader.vert
index 193f5f04..72a7ae2f 100644
--- a/samples/bin/library/sprite_shader.vert
+++ b/samples/bin/library/sprite_shader.vert
@@ -1,14 +1,36 @@
+uniform vec2 u_screen_s;
 uniform mat4 u_matrix_vp;
 
 attribute vec3 a_vertex;
-attribute vec4 a_tint;
-attribute vec2 a_st;
+attribute vec2 a_st0;
+attribute vec4 a_color0;
 
-varying vec4 v_tint;
-varying vec2 v_st;
+varying vec2 v_st0;
+varying vec4 v_color0;
+
+vec2 round(vec2 v) {
+    return vec2(
+        floor(v.x + 0.5),
+        floor(v.y + 0.5));
+}
+
+vec4 pixel_snap(vec4 pos) {
+    vec2 hpc = u_screen_s * 0.5;
+    vec2 pixel_pos = round((pos.xy / pos.w) * hpc);
+    pos.xy = pixel_pos / hpc * pos.w;
+    return pos;
+}
+
+vec4 vertex_to_homo(vec3 pos) {
+    return vec4(pos, 1.0) * u_matrix_vp;
+}
 
 void main() {
-    v_st = a_st;
-    v_tint = a_tint;
-    gl_Position = vec4(a_vertex, 1.0) * u_matrix_vp;
+    v_st0 = vec2(a_st0.s, 1.0 - a_st0.t);
+    v_color0 = a_color0;
+#ifndef VERTEX_SNAPPING_ON
+    gl_Position = vertex_to_homo(a_vertex);
+#else
+    gl_Position = pixel_snap(vertex_to_homo(a_vertex));
+#endif
 }
diff --git a/sources/enduro2d/high/systems/render_system.cpp b/sources/enduro2d/high/systems/render_system.cpp
index f7ddfac4..9be52781 100644
--- a/sources/enduro2d/high/systems/render_system.cpp
+++ b/sources/enduro2d/high/systems/render_system.cpp
@@ -99,7 +99,7 @@ namespace e2d
     class render_system::internal_state final : private noncopyable {
     public:
         internal_state()
-        : drawer_(the<engine>(), the<debug>(), the<render>()) {}
+        : drawer_(the<engine>(), the<debug>(), the<render>(), the<window>()) {}
         ~internal_state() noexcept = default;
 
         void process(ecs::registry& owner) {
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_base.hpp b/sources/enduro2d/high/systems/render_system_impl/render_system_base.hpp
index 81900f63..27bcfd3b 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_base.hpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_base.hpp
@@ -40,8 +40,8 @@ namespace e2d::render_system_impl
         static vertex_declaration decl() noexcept {
             return vertex_declaration()
                 .add_attribute<v3f>("a_vertex")
-                .add_attribute<v2f>("a_st")
-                .add_attribute<color32>("a_tint").normalized();
+                .add_attribute<v2f>("a_st0")
+                .add_attribute<color32>("a_color0").normalized();
         }
     };
 }
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index 751ec273..42f75ad6 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -14,6 +14,7 @@ namespace
 {
     using namespace e2d;
 
+    const str_hash screen_s_property_hash = "u_screen_s";
     const str_hash matrix_v_property_hash = "u_matrix_v";
     const str_hash matrix_p_property_hash = "u_matrix_p";
     const str_hash matrix_vp_property_hash = "u_matrix_vp";
@@ -32,6 +33,7 @@ namespace e2d::render_system_impl
         const const_node_iptr& cam_n,
         engine& engine,
         render& render,
+        window& window,
         batcher_type& batcher)
     : render_(render)
     , batcher_(batcher)
@@ -47,6 +49,9 @@ namespace e2d::render_system_impl
         const m4f& m_p = cam.projection();
 
         batcher_.flush()
+            .property(screen_s_property_hash, cam.target()
+                ? cam.target()->size().cast_to<f32>()
+                : window.framebuffer_size().cast_to<f32>())
             .property(matrix_v_property_hash, m_v)
             .property(matrix_p_property_hash, m_p)
             .property(matrix_vp_property_hash, m_v * m_p)
@@ -219,8 +224,9 @@ namespace e2d::render_system_impl
     // drawer
     //
 
-    drawer::drawer(engine& e, debug& d, render& r)
+    drawer::drawer(engine& e, debug& d, render& r, window& w)
     : engine_(e)
     , render_(r)
+    , window_(w)
     , batcher_(d, r) {}
 }
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
index 641e8136..036a47ca 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
@@ -36,6 +36,7 @@ namespace e2d::render_system_impl
                 const const_node_iptr& cam_n,
                 engine& engine,
                 render& render,
+                window& window,
                 batcher_type& batcher);
             ~context() noexcept;
 
@@ -59,13 +60,14 @@ namespace e2d::render_system_impl
             render::property_block property_cache_;
         };
     public:
-        drawer(engine& e, debug& d, render& r);
+        drawer(engine& e, debug& d, render& r, window& w);
 
         template < typename F >
         void with(const camera& cam, const const_node_iptr& cam_n, F&& f);
     private:
         engine& engine_;
         render& render_;
+        window& window_;
         batcher_type batcher_;
     };
 }
@@ -74,7 +76,7 @@ namespace e2d::render_system_impl
 {
     template < typename F >
     void drawer::with(const camera& cam, const const_node_iptr& cam_n, F&& f) {
-        context ctx{cam, cam_n, engine_, render_, batcher_};
+        context ctx{cam, cam_n, engine_, render_, window_, batcher_};
         std::forward<F>(f)(ctx);
         ctx.flush();
     }

From 63cd712bd22aec39b7cac715bb706fe076b94b52 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 22 Aug 2019 09:29:52 +0700
Subject: [PATCH 083/108] fix uninitialized value warning

---
 .../enduro2d/high/assets/material_asset.cpp   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/sources/enduro2d/high/assets/material_asset.cpp b/sources/enduro2d/high/assets/material_asset.cpp
index 245aa798..daa5d50c 100644
--- a/sources/enduro2d/high/assets/material_asset.cpp
+++ b/sources/enduro2d/high/assets/material_asset.cpp
@@ -164,7 +164,7 @@ namespace
                 },
                 "sampler" : {
                     "type" : "object",
-                    "required" : [ "name" ],
+                    "required" : [ "name", "texture" ],
                     "additionalProperties" : false,
                     "properties" : {
                         "name" : {
@@ -201,7 +201,7 @@ namespace
                 },
                 "property" : {
                     "type" : "object",
-                    "required" : [ "name", "type" ],
+                    "required" : [ "name", "type", "value" ],
                     "additionalProperties" : false,
                     "properties" : {
                         "name" : { "$ref" : "#/common_definitions/name" },
@@ -514,11 +514,10 @@ namespace
         render::sampler_state content;
 
         E2D_ASSERT(root.HasMember("name") && root["name"].IsString());
-        auto name_hash = make_hash(root["name"].GetString());
+        E2D_ASSERT(root.HasMember("texture") && root["texture"].IsString());
 
-        auto texture_p = root.HasMember("texture")
-            ? parse_texture_block(library, parent_address, root["texture"])
-            : stdex::make_resolved_promise<texture_ptr>(nullptr);
+        auto name_hash = make_hash(root["name"].GetString());
+        auto texture_p = parse_texture_block(library, parent_address, root["texture"]);
 
         if ( root.HasMember("wrap") ) {
             const auto& wrap_json = root["wrap"];
@@ -609,15 +608,14 @@ namespace
 
             E2D_ASSERT(property_json.HasMember("name") && property_json["name"].IsString());
             E2D_ASSERT(property_json.HasMember("type") && property_json["type"].IsString());
+            E2D_ASSERT(property_json.HasMember("value"));
 
         #define DEFINE_CASE(x)\
             if ( 0 == std::strcmp(property_json["type"].GetString(), #x) ) {\
                 x value;\
-                if ( property_json.HasMember("value") ) {\
-                    if ( !json_utils::try_parse_value(property_json["value"], value) ) {\
-                        E2D_ASSERT_MSG(false, "unexpected property value");\
-                        return false;\
-                    }\
+                if ( !json_utils::try_parse_value(property_json["value"], value) ) {\
+                    E2D_ASSERT_MSG(false, "unexpected property value");\
+                    return false;\
                 }\
                 props.property(property_json["name"].GetString(), value);\
                 continue;\

From 3847dd7f6679741d861c5891fd6954ada162bdd6 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 22 Aug 2019 09:52:39 +0700
Subject: [PATCH 084/108] update modules

---
 headers/3rdparty/variant/config.hpp        |    2 +-
 modules/catch2                             |    2 +-
 modules/glew                               |    2 +-
 modules/glfw                               |    2 +-
 modules/imgui                              |    2 +-
 modules/miniz                              |    2 +-
 modules/promise.hpp                        |    2 +-
 modules/pugixml                            |    2 +-
 modules/rapidjson                          |    2 +-
 modules/stb                                |    2 +-
 modules/utfcpp                             |    2 +-
 modules/variant                            |    2 +-
 sources/3rdparty/bass/linux/bass.h         |    0
 sources/3rdparty/bass/linux/x64/libbass.so |    0
 sources/3rdparty/bass/linux/x86/libbass.so |    0
 sources/3rdparty/bass/macosx/bass.h        |    0
 sources/3rdparty/bass/macosx/libbass.dylib |    0
 sources/3rdparty/bass/windows/bass.h       |    0
 sources/3rdparty/bass/windows/x64/bass.dll |    0
 sources/3rdparty/bass/windows/x64/bass.lib |    0
 sources/3rdparty/bass/windows/x86/bass.dll |    0
 sources/3rdparty/bass/windows/x86/bass.lib |    0
 sources/3rdparty/imgui/imgui.cpp           | 1069 ++++++++------------
 sources/3rdparty/imgui/imgui.h             |   31 +-
 sources/3rdparty/imgui/imgui_demo.cpp      |  136 +--
 sources/3rdparty/imgui/imgui_draw.cpp      |   16 +-
 sources/3rdparty/imgui/imgui_internal.h    |  116 ++-
 sources/3rdparty/imgui/imgui_widgets.cpp   |  575 +++++++++--
 sources/3rdparty/stb/stb_image.h           |   20 +-
 sources/3rdparty/stb/stb_image_write.h     |    6 +-
 sources/3rdparty/stb/stb_truetype.h        |   30 +-
 untests/catch/catch.hpp                    |  490 ++++++---
 32 files changed, 1510 insertions(+), 1003 deletions(-)
 mode change 100755 => 100644 sources/3rdparty/bass/linux/bass.h
 mode change 100755 => 100644 sources/3rdparty/bass/linux/x64/libbass.so
 mode change 100755 => 100644 sources/3rdparty/bass/linux/x86/libbass.so
 mode change 100755 => 100644 sources/3rdparty/bass/macosx/bass.h
 mode change 100755 => 100644 sources/3rdparty/bass/macosx/libbass.dylib
 mode change 100755 => 100644 sources/3rdparty/bass/windows/bass.h
 mode change 100755 => 100644 sources/3rdparty/bass/windows/x64/bass.dll
 mode change 100755 => 100644 sources/3rdparty/bass/windows/x64/bass.lib
 mode change 100755 => 100644 sources/3rdparty/bass/windows/x86/bass.dll
 mode change 100755 => 100644 sources/3rdparty/bass/windows/x86/bass.lib

diff --git a/headers/3rdparty/variant/config.hpp b/headers/3rdparty/variant/config.hpp
index e411d687..f85ffb55 100644
--- a/headers/3rdparty/variant/config.hpp
+++ b/headers/3rdparty/variant/config.hpp
@@ -76,7 +76,7 @@
 #define MPARK_INTEGER_SEQUENCE
 #endif
 
-#if defined(__cpp_return_type_deduction) || defined(_MSC_VER)
+#if (defined(__cpp_decltype_auto) && defined(__cpp_return_type_deduction)) || defined(_MSC_VER)
 #define MPARK_RETURN_TYPE_DEDUCTION
 #endif
 
diff --git a/modules/catch2 b/modules/catch2
index f0b7b0ca..ce42deb7 160000
--- a/modules/catch2
+++ b/modules/catch2
@@ -1 +1 @@
-Subproject commit f0b7b0ca119d8cf58c2b89dea663f921dbdbd332
+Subproject commit ce42deb72fab2be85a862f559984580c24cb76c4
diff --git a/modules/glew b/modules/glew
index 8c420822..41c88953 160000
--- a/modules/glew
+++ b/modules/glew
@@ -1 +1 @@
-Subproject commit 8c4208224239bcff18d7840d14d23f07d580c0cd
+Subproject commit 41c88953cdafc4c9aeaa1d66e0e302fb85d1c0e1
diff --git a/modules/glfw b/modules/glfw
index d834f01c..2c7ef5b4 160000
--- a/modules/glfw
+++ b/modules/glfw
@@ -1 +1 @@
-Subproject commit d834f01ca43c0f5ddd31b00a7fc2f48abbafa3da
+Subproject commit 2c7ef5b480d7780455deed43aedc177b9fe3ac61
diff --git a/modules/imgui b/modules/imgui
index a8eb64fc..a33cedda 160000
--- a/modules/imgui
+++ b/modules/imgui
@@ -1 +1 @@
-Subproject commit a8eb64fc5471e05e17760083b696362b3efb36e2
+Subproject commit a33cedda142f6e96a9bd2d665290830362671566
diff --git a/modules/miniz b/modules/miniz
index e71344bd..e0c964c4 160000
--- a/modules/miniz
+++ b/modules/miniz
@@ -1 +1 @@
-Subproject commit e71344bdd7e8e6c18fb67721db7a634ffa202f9e
+Subproject commit e0c964c4a3e1487c9dd9bf1ed861911db9634645
diff --git a/modules/promise.hpp b/modules/promise.hpp
index c7aeff37..b550f830 160000
--- a/modules/promise.hpp
+++ b/modules/promise.hpp
@@ -1 +1 @@
-Subproject commit c7aeff3710a2c1d7bf1d5b07d4890df5ebbc7da3
+Subproject commit b550f83099a5c74e33e294360556bde9c06b4c26
diff --git a/modules/pugixml b/modules/pugixml
index fcb7c8d3..fdf02957 160000
--- a/modules/pugixml
+++ b/modules/pugixml
@@ -1 +1 @@
-Subproject commit fcb7c8d3e5335c76bd2aa81f40a153f9b2b05647
+Subproject commit fdf02957533645069bbea7cd2ed85a3014b42cf3
diff --git a/modules/rapidjson b/modules/rapidjson
index 4b3d7c2f..d87b698d 160000
--- a/modules/rapidjson
+++ b/modules/rapidjson
@@ -1 +1 @@
-Subproject commit 4b3d7c2f42142f10b888e580c515f60ca98e2ee9
+Subproject commit d87b698d0fcc10a5f632ecbc80a9cb2a8fa094a5
diff --git a/modules/stb b/modules/stb
index 1034f5e5..052dce11 160000
--- a/modules/stb
+++ b/modules/stb
@@ -1 +1 @@
-Subproject commit 1034f5e5c4809ea0a7f4387e0cd37c5184de3cdd
+Subproject commit 052dce117ed989848a950308bd99eef55525dfb1
diff --git a/modules/utfcpp b/modules/utfcpp
index 088dd3ad..170e2d11 160000
--- a/modules/utfcpp
+++ b/modules/utfcpp
@@ -1 +1 @@
-Subproject commit 088dd3ad77cbecd57a346f210f27fbceca8204e7
+Subproject commit 170e2d11f516539d18bf39f552fa204dbf41d9ce
diff --git a/modules/variant b/modules/variant
index 00590420..0467c3ca 160000
--- a/modules/variant
+++ b/modules/variant
@@ -1 +1 @@
-Subproject commit 00590420f8d067f67d60b5de15d94b26558164c1
+Subproject commit 0467c3caa408c7fccb09deafad29347bfd3d765a
diff --git a/sources/3rdparty/bass/linux/bass.h b/sources/3rdparty/bass/linux/bass.h
old mode 100755
new mode 100644
diff --git a/sources/3rdparty/bass/linux/x64/libbass.so b/sources/3rdparty/bass/linux/x64/libbass.so
old mode 100755
new mode 100644
diff --git a/sources/3rdparty/bass/linux/x86/libbass.so b/sources/3rdparty/bass/linux/x86/libbass.so
old mode 100755
new mode 100644
diff --git a/sources/3rdparty/bass/macosx/bass.h b/sources/3rdparty/bass/macosx/bass.h
old mode 100755
new mode 100644
diff --git a/sources/3rdparty/bass/macosx/libbass.dylib b/sources/3rdparty/bass/macosx/libbass.dylib
old mode 100755
new mode 100644
diff --git a/sources/3rdparty/bass/windows/bass.h b/sources/3rdparty/bass/windows/bass.h
old mode 100755
new mode 100644
diff --git a/sources/3rdparty/bass/windows/x64/bass.dll b/sources/3rdparty/bass/windows/x64/bass.dll
old mode 100755
new mode 100644
diff --git a/sources/3rdparty/bass/windows/x64/bass.lib b/sources/3rdparty/bass/windows/x64/bass.lib
old mode 100755
new mode 100644
diff --git a/sources/3rdparty/bass/windows/x86/bass.dll b/sources/3rdparty/bass/windows/x86/bass.dll
old mode 100755
new mode 100644
diff --git a/sources/3rdparty/bass/windows/x86/bass.lib b/sources/3rdparty/bass/windows/x86/bass.lib
old mode 100755
new mode 100644
diff --git a/sources/3rdparty/imgui/imgui.cpp b/sources/3rdparty/imgui/imgui.cpp
index 22a3ec45..36121398 100644
--- a/sources/3rdparty/imgui/imgui.cpp
+++ b/sources/3rdparty/imgui/imgui.cpp
@@ -1,4 +1,4 @@
-// dear imgui, v1.72 WIP
+// dear imgui, v1.73 WIP
 // (main code and documentation)
 
 // Call and read ImGui::ShowDemoWindow() in imgui_demo.cpp for demo code.
@@ -6,7 +6,7 @@
 // Get latest version at https://github.com/ocornut/imgui
 // Releases change-log at https://github.com/ocornut/imgui/releases
 // Technical Support for Getting Started https://discourse.dearimgui.org/c/getting-started
-// Gallery (please post your screenshots/video there!): https://github.com/ocornut/imgui/issues/1269
+// Gallery (please post your screenshots/video there!): https://github.com/ocornut/imgui/issues/2529
 
 // Developed by Omar Cornut and every direct or indirect contributors to the GitHub.
 // See LICENSE.txt for copyright and licensing details (standard MIT License).
@@ -72,10 +72,10 @@ CODE
 // [SECTION] ImGuiListClipper
 // [SECTION] RENDER HELPERS
 // [SECTION] MAIN CODE (most of the code! lots of stuff, needs tidying up!)
+// [SECTION] SCROLLING
 // [SECTION] TOOLTIPS
 // [SECTION] POPUPS
 // [SECTION] KEYBOARD/GAMEPAD NAVIGATION
-// [SECTION] COLUMNS
 // [SECTION] DRAG AND DROP
 // [SECTION] LOGGING/CAPTURING
 // [SECTION] SETTINGS
@@ -369,7 +369,8 @@ CODE
  When you are not sure about a old symbol or function name, try using the Search/Find function of your IDE to look for comments or references in all imgui files.
  You can read releases logs https://github.com/ocornut/imgui/releases for more details.
 
- - 2019/07/12 (1.72) - renamed ImFontAtlas::CustomRect to ImFontAtlasCustomRect. Keep redirection typedef (will obsolete).
+ - 2019/07/15 (1.72) - removed TreeAdvanceToLabelPos() which is rarely used and only does SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()). Kept redirection function (will obsolete).
+ - 2019/07/12 (1.72) - renamed ImFontAtlas::CustomRect to ImFontAtlasCustomRect. Kept redirection typedef (will obsolete).
  - 2019/06/14 (1.72) - removed redirecting functions/enums names that were marked obsolete in 1.51 (June 2017): ImGuiCol_Column*, ImGuiSetCond_*, IsItemHoveredRect(), IsPosHoveringAnyWindow(), IsMouseHoveringAnyWindow(), IsMouseHoveringWindow(), IMGUI_ONCE_UPON_A_FRAME. Grep this log for details and new names.
  - 2019/06/07 (1.71) - rendering of child window outer decorations (bg color, border, scrollbars) is now performed as part of the parent window. If you have
                        overlapping child windows in a same parent, and relied on their relative z-order to be mapped to their submission order, this will affect your rendering.
@@ -384,7 +385,7 @@ CODE
  - 2019/02/14 (1.68) - made it illegal/assert when io.DisplayTime == 0.0f (with an exception for the first frame). If for some reason your time step calculation gives you a zero value, replace it with a dummy small value!
  - 2019/02/01 (1.68) - removed io.DisplayVisibleMin/DisplayVisibleMax (which were marked obsolete and removed from viewport/docking branch already).
  - 2019/01/06 (1.67) - renamed io.InputCharacters[], marked internal as was always intended. Please don't access directly, and use AddInputCharacter() instead!
- - 2019/01/06 (1.67) - renamed ImFontAtlas::GlyphRangesBuilder to ImFontGlyphRangesBuilder. Keep redirection typedef (will obsolete).
+ - 2019/01/06 (1.67) - renamed ImFontAtlas::GlyphRangesBuilder to ImFontGlyphRangesBuilder. Kept redirection typedef (will obsolete).
  - 2018/12/20 (1.67) - made it illegal to call Begin("") with an empty string. This somehow half-worked before but had various undesirable side-effects.
  - 2018/12/10 (1.67) - renamed io.ConfigResizeWindowsFromEdges to io.ConfigWindowsResizeFromEdges as we are doing a large pass on configuration flags.
  - 2018/10/12 (1.66) - renamed misc/stl/imgui_stl.* to misc/cpp/imgui_stdlib.* in prevision for other C++ helper files.
@@ -457,7 +458,7 @@ CODE
                          IsMouseHoveringWindow()    --> IsWindowHovered(ImGuiHoveredFlags_AllowWhenBlockedByPopup | ImGuiHoveredFlags_AllowWhenBlockedByActiveItem) [weird, old behavior]
  - 2017/10/17 (1.52) - marked the old 5-parameters version of Begin() as obsolete (still available). Use SetNextWindowSize()+Begin() instead!
  - 2017/10/11 (1.52) - renamed AlignFirstTextHeightToWidgets() to AlignTextToFramePadding(). Kept inline redirection function (will obsolete).
- - 2017/09/26 (1.52) - renamed ImFont::Glyph to ImFontGlyph. Keep redirection typedef (will obsolete).
+ - 2017/09/26 (1.52) - renamed ImFont::Glyph to ImFontGlyph. Kept redirection typedef (will obsolete).
  - 2017/09/25 (1.52) - removed SetNextWindowPosCenter() because SetNextWindowPos() now has the optional pivot information to do the same and more. Kept redirection function (will obsolete).
  - 2017/08/25 (1.52) - io.MousePos needs to be set to ImVec2(-FLT_MAX,-FLT_MAX) when mouse is unavailable/missing. Previously ImVec2(-1,-1) was enough but we now accept negative mouse coordinates. In your binding if you need to support unavailable mouse, make sure to replace "io.MousePos = ImVec2(-1,-1)" with "io.MousePos = ImVec2(-FLT_MAX,-FLT_MAX)".
  - 2017/08/22 (1.51) - renamed IsItemHoveredRect() to IsItemRectHovered(). Kept inline redirection function (will obsolete). -> (1.52) use IsItemHovered(ImGuiHoveredFlags_RectOnly)!
@@ -998,6 +999,7 @@ CODE
 // Debug options
 #define IMGUI_DEBUG_NAV_SCORING     0   // Display navigation scoring preview when hovering items. Display last moving direction matches when holding CTRL
 #define IMGUI_DEBUG_NAV_RECTS       0   // Display the reference navigation rectangle for each window
+#define IMGUI_DEBUG_INI_SETTINGS    0   // Save additional comments in .ini file
 
 // Visual Studio warnings
 #ifdef _MSC_VER
@@ -1042,6 +1044,7 @@ static const float NAV_WINDOWING_LIST_APPEAR_DELAY          = 0.15f;    // Time
 // Window resizing from edges (when io.ConfigWindowsResizeFromEdges = true and ImGuiBackendFlags_HasMouseCursors is set in io.BackendFlags by back-end)
 static const float WINDOWS_RESIZE_FROM_EDGES_HALF_THICKNESS = 4.0f;     // Extend outside and inside windows. Affect FindHoveredWindow().
 static const float WINDOWS_RESIZE_FROM_EDGES_FEEDBACK_TIMER = 0.04f;    // Reduce visual noise by only highlighting the border after a certain time.
+static const float WINDOWS_MOUSE_WHEEL_SCROLL_LOCK_TIMER    = 2.00f;    // Lock scrolled window (so it doesn't pick child windows that are scrolling through) for a certaint time, unless mouse moved.
 
 //-------------------------------------------------------------------------
 // [SECTION] FORWARD DECLARATIONS
@@ -1089,6 +1092,7 @@ static int              FindWindowFocusIndex(ImGuiWindow* window);
 static void             UpdateMouseInputs();
 static void             UpdateMouseWheel();
 static bool             UpdateManualResize(ImGuiWindow* window, const ImVec2& size_auto_fit, int* border_held, int resize_grip_count, ImU32 resize_grip_col[4]);
+static void             UpdateDebugToolItemPicker();
 static void             RenderWindowOuterBorders(ImGuiWindow* window);
 static void             RenderWindowDecorations(ImGuiWindow* window, const ImRect& title_bar_rect, bool title_bar_is_highlight, int resize_grip_count, const ImU32 resize_grip_col[4], float resize_grip_draw_size);
 static void             RenderWindowTitleBarContents(ImGuiWindow* window, const ImRect& title_bar_rect, const char* name, bool* p_open);
@@ -1163,6 +1167,7 @@ ImGuiStyle::ImGuiStyle()
     GrabRounding            = 0.0f;             // Radius of grabs corners rounding. Set to 0.0f to have rectangular slider grabs.
     TabRounding             = 4.0f;             // Radius of upper corners of a tab. Set to 0.0f to have rectangular tabs.
     TabBorderSize           = 0.0f;             // Thickness of border around tabs.
+    ColorButtonPosition     = ImGuiDir_Right;   // Side of the color button in the ColorEdit4 widget (left/right). Defaults to ImGuiDir_Right.
     ButtonTextAlign         = ImVec2(0.5f,0.5f);// Alignment of button text when button is larger than text.
     SelectableTextAlign     = ImVec2(0.0f,0.0f);// Alignment of selectable text when button is larger than text.
     DisplayWindowPadding    = ImVec2(19,19);    // Window position are clamped to be visible within the display area by at least this amount. Only applies to regular windows.
@@ -2968,6 +2973,15 @@ bool ImGui::ItemAdd(const ImRect& bb, ImGuiID id, const ImRect* nav_bb_arg)
             if (g.NavWindow->RootWindowForNav == window->RootWindowForNav)
                 if (window == g.NavWindow || ((window->Flags | g.NavWindow->Flags) & ImGuiWindowFlags_NavFlattened))
                     NavProcessItem(window, nav_bb_arg ? *nav_bb_arg : bb, id);
+
+        // [DEBUG] Item Picker tool, when enabling the "extended" version we perform the check in ItemAdd()
+#ifdef IMGUI_DEBUG_TOOL_ITEM_PICKER_EX
+        if (id == g.DebugItemPickerBreakID)
+        {
+            IM_DEBUG_BREAK();
+            g.DebugItemPickerBreakID = 0;
+        }
+#endif
     }
 
     window->DC.LastItemId = id;
@@ -3056,6 +3070,17 @@ bool ImGui::ItemHoverable(const ImRect& bb, ImGuiID id)
         return false;
 
     SetHoveredID(id);
+
+    // [DEBUG] Item Picker tool!
+    // We perform the check here because SetHoveredID() is not frequently called (1~ time a frame), making
+    // the cost of this tool near-zero. We can get slightly better call-stack and support picking non-hovered
+    // items if we perform the test in ItemAdd(), but that would incur a small runtime cost.
+    // #define IMGUI_DEBUG_TOOL_ITEM_PICKER_EX in imconfig.h if you want this check to also be performed in ItemAdd().
+    if (g.DebugItemPickerActive && g.HoveredIdPreviousFrame == id)
+        GetForegroundDrawList()->AddRect(bb.Min, bb.Max, IM_COL32(255, 255, 0, 255));
+    if (g.DebugItemPickerBreakID == id)
+        IM_DEBUG_BREAK();
+
     return true;
 }
 
@@ -3147,13 +3172,15 @@ void ImGui::MemFree(void* ptr)
 
 const char* ImGui::GetClipboardText()
 {
-    return GImGui->IO.GetClipboardTextFn ? GImGui->IO.GetClipboardTextFn(GImGui->IO.ClipboardUserData) : "";
+    ImGuiContext& g = *GImGui;
+    return g.IO.GetClipboardTextFn ? g.IO.GetClipboardTextFn(g.IO.ClipboardUserData) : "";
 }
 
 void ImGui::SetClipboardText(const char* text)
 {
-    if (GImGui->IO.SetClipboardTextFn)
-        GImGui->IO.SetClipboardTextFn(GImGui->IO.ClipboardUserData, text);
+    ImGuiContext& g = *GImGui;
+    if (g.IO.SetClipboardTextFn)
+        g.IO.SetClipboardTextFn(g.IO.ClipboardUserData, text);
 }
 
 const char* ImGui::GetVersion()
@@ -3443,19 +3470,45 @@ static void ImGui::UpdateMouseInputs()
     }
 }
 
+static void StartLockWheelingWindow(ImGuiWindow* window)
+{
+    ImGuiContext& g = *GImGui;
+    if (g.WheelingWindow == window)
+        return;
+    g.WheelingWindow = window;
+    g.WheelingWindowRefMousePos = g.IO.MousePos;
+    g.WheelingWindowTimer = WINDOWS_MOUSE_WHEEL_SCROLL_LOCK_TIMER;
+}
+
 void ImGui::UpdateMouseWheel()
 {
     ImGuiContext& g = *GImGui;
-    if (!g.HoveredWindow || g.HoveredWindow->Collapsed)
-        return;
+
+    // Reset the locked window if we move the mouse or after the timer elapses
+    if (g.WheelingWindow != NULL)
+    {
+        g.WheelingWindowTimer -= g.IO.DeltaTime;
+        if (IsMousePosValid() && ImLengthSqr(g.IO.MousePos - g.WheelingWindowRefMousePos) > g.IO.MouseDragThreshold * g.IO.MouseDragThreshold)
+            g.WheelingWindowTimer = 0.0f;
+        if (g.WheelingWindowTimer <= 0.0f)
+        {
+            g.WheelingWindow = NULL;
+            g.WheelingWindowTimer = 0.0f;
+        }
+    }
+
     if (g.IO.MouseWheel == 0.0f && g.IO.MouseWheelH == 0.0f)
         return;
 
+    ImGuiWindow* window = g.WheelingWindow ? g.WheelingWindow : g.HoveredWindow;
+    if (!window || window->Collapsed)
+        return;
+
     // Zoom / Scale window
     // FIXME-OBSOLETE: This is an old feature, it still works but pretty much nobody is using it and may be best redesigned.
-    if (g.IO.MouseWheel != 0.0f && g.IO.KeyCtrl && g.IO.FontAllowUserScaling && !g.HoveredWindow->Collapsed)
+    if (g.IO.MouseWheel != 0.0f && g.IO.KeyCtrl && g.IO.FontAllowUserScaling)
     {
-        ImGuiWindow* window = g.HoveredWindow;
+        StartLockWheelingWindow(window);
         const float new_font_scale = ImClamp(window->FontWindowScale + g.IO.MouseWheel * 0.10f, 0.50f, 2.50f);
         const float scale = new_font_scale / window->FontWindowScale;
         window->FontWindowScale = new_font_scale;
@@ -3471,20 +3524,19 @@ void ImGui::UpdateMouseWheel()
 
     // Mouse wheel scrolling
     // If a child window has the ImGuiWindowFlags_NoScrollWithMouse flag, we give a chance to scroll its parent
-    // FIXME: Lock scrolling window while not moving (see #2604)
 
     // Vertical Mouse Wheel scrolling
     const float wheel_y = (g.IO.MouseWheel != 0.0f && !g.IO.KeyShift) ? g.IO.MouseWheel : 0.0f;
     if (wheel_y != 0.0f && !g.IO.KeyCtrl)
     {
-        ImGuiWindow* window = g.HoveredWindow;
+        StartLockWheelingWindow(window);
         while ((window->Flags & ImGuiWindowFlags_ChildWindow) && ((window->ScrollMax.y == 0.0f) || ((window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs))))
             window = window->ParentWindow;
         if (!(window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs))
         {
             float max_step = window->InnerRect.GetHeight() * 0.67f;
             float scroll_step = ImFloor(ImMin(5 * window->CalcFontSize(), max_step));
-            SetWindowScrollY(window, window->Scroll.y - wheel_y * scroll_step);
+            SetScrollY(window, window->Scroll.y - wheel_y * scroll_step);
         }
     }
 
@@ -3492,14 +3544,14 @@ void ImGui::UpdateMouseWheel()
     const float wheel_x = (g.IO.MouseWheelH != 0.0f && !g.IO.KeyShift) ? g.IO.MouseWheelH : (g.IO.MouseWheel != 0.0f && g.IO.KeyShift) ? g.IO.MouseWheel : 0.0f;
     if (wheel_x != 0.0f && !g.IO.KeyCtrl)
     {
-        ImGuiWindow* window = g.HoveredWindow;
+        StartLockWheelingWindow(window);
         while ((window->Flags & ImGuiWindowFlags_ChildWindow) && ((window->ScrollMax.x == 0.0f) || ((window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs))))
             window = window->ParentWindow;
         if (!(window->Flags & ImGuiWindowFlags_NoScrollWithMouse) && !(window->Flags & ImGuiWindowFlags_NoMouseInputs))
         {
             float max_step = window->InnerRect.GetWidth() * 0.67f;
             float scroll_step = ImFloor(ImMin(2 * window->CalcFontSize(), max_step));
-            SetWindowScrollX(window, window->Scroll.x - wheel_x * scroll_step);
+            SetScrollX(window, window->Scroll.x - wheel_x * scroll_step);
         }
     }
 }
@@ -3563,15 +3615,10 @@ void ImGui::UpdateHoveredWindowAndCaptureFlags()
     g.IO.WantTextInput = (g.WantTextInputNextFrame != -1) ? (g.WantTextInputNextFrame != 0) : false;
 }
 
-void ImGui::NewFrame()
+static void NewFrameSanityChecks()
 {
-    IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?");
     ImGuiContext& g = *GImGui;
 
-#ifdef IMGUI_ENABLE_TEST_ENGINE
-    ImGuiTestEngineHook_PreNewFrame(&g);
-#endif
-
     // Check user data
     // (We pass an error message in the assert expression to make it visible to programmers who are not using a debugger, as most assert handlers display their argument)
     IM_ASSERT(g.Initialized);
@@ -3584,7 +3631,6 @@ void ImGui::NewFrame()
     IM_ASSERT(g.Style.Alpha >= 0.0f && g.Style.Alpha <= 1.0f            && "Invalid style setting. Alpha cannot be negative (allows us to avoid a few clamps in color computations)!");
     IM_ASSERT(g.Style.WindowMinSize.x >= 1.0f && g.Style.WindowMinSize.y >= 1.0f && "Invalid style setting.");
     IM_ASSERT(g.Style.WindowMenuButtonPosition == ImGuiDir_Left || g.Style.WindowMenuButtonPosition == ImGuiDir_Right);
-
     for (int n = 0; n < ImGuiKey_COUNT; n++)
         IM_ASSERT(g.IO.KeyMap[n] >= -1 && g.IO.KeyMap[n] < IM_ARRAYSIZE(g.IO.KeysDown) && "io.KeyMap[] contains an out of bound value (need to be 0..512, or -1 for unmapped key)");
 
@@ -3595,6 +3641,19 @@ void ImGui::NewFrame()
     // Perform simple check: the beta io.ConfigWindowsResizeFromEdges option requires back-end to honor mouse cursor changes and set the ImGuiBackendFlags_HasMouseCursors flag accordingly.
     if (g.IO.ConfigWindowsResizeFromEdges && !(g.IO.BackendFlags & ImGuiBackendFlags_HasMouseCursors))
         g.IO.ConfigWindowsResizeFromEdges = false;
+}
+
+void ImGui::NewFrame()
+{
+    IM_ASSERT(GImGui != NULL && "No current context. Did you call ImGui::CreateContext() and ImGui::SetCurrentContext() ?");
+    ImGuiContext& g = *GImGui;
+
+#ifdef IMGUI_ENABLE_TEST_ENGINE
+    ImGuiTestEngineHook_PreNewFrame(&g);
+#endif
+
+    // Check and assert for various common IO and Configuration mistakes
+    NewFrameSanityChecks();
 
     // Load settings on first frame (if not explicitly loaded manually before)
     if (!g.SettingsLoaded)
@@ -3776,6 +3835,9 @@ void ImGui::NewFrame()
     g.BeginPopupStack.resize(0);
     ClosePopupsOverWindow(g.NavWindow, false);
 
+    // [DEBUG] Item picker tool - start with DebugStartItemPicker() - useful to visually select an item and break into its call-stack.
+    UpdateDebugToolItemPicker();
+
     // Create implicit/fallback window - which we will only render it if the user has added something to it.
     // We don't use "Debug" to avoid colliding with user trying to create a "Debug" window with custom flags.
     // This fallback is particularly important as it avoid ImGui:: calls from crashing.
@@ -3788,6 +3850,31 @@ void ImGui::NewFrame()
 #endif
 }
 
+// [DEBUG] Item picker tool - start with DebugStartItemPicker() - useful to visually select an item and break into its call-stack.
+void ImGui::UpdateDebugToolItemPicker()
+{
+    ImGuiContext& g = *GImGui;
+    g.DebugItemPickerBreakID = 0;
+    if (g.DebugItemPickerActive)
+    {
+        const ImGuiID hovered_id = g.HoveredIdPreviousFrame;
+        ImGui::SetMouseCursor(ImGuiMouseCursor_Hand);
+        if (ImGui::IsKeyPressedMap(ImGuiKey_Escape))
+            g.DebugItemPickerActive = false;
+        if (ImGui::IsMouseClicked(0) && hovered_id)
+        {
+            g.DebugItemPickerBreakID = hovered_id;
+            g.DebugItemPickerActive = false;
+        }
+        ImGui::SetNextWindowBgAlpha(0.60f);
+        ImGui::BeginTooltip();
+        ImGui::Text("HoveredId: 0x%08X", hovered_id);
+        ImGui::Text("Press ESC to abort picking.");
+        ImGui::TextColored(GetStyleColorVec4(hovered_id ? ImGuiCol_Text : ImGuiCol_TextDisabled), "Click to break in debugger!");
+        ImGui::EndTooltip();
+    }
+}
+
 void ImGui::Initialize(ImGuiContext* context)
 {
     ImGuiContext& g = *context;
@@ -3851,6 +3938,11 @@ void ImGui::Shutdown(ImGuiContext* context)
     g.DrawDataBuilder.ClearFreeMemory();
     g.BackgroundDrawList.ClearFreeMemory();
     g.ForegroundDrawList.ClearFreeMemory();
+
+    g.TabBars.Clear();
+    g.CurrentTabBarStack.clear();
+    g.ShrinkWidthBuffer.clear();
+
     g.PrivateClipboard.clear();
     g.InputTextState.ClearFreeMemory();
 
@@ -4242,15 +4334,18 @@ bool ImGui::IsMouseHoveringRect(const ImVec2& r_min, const ImVec2& r_max, bool c
 int ImGui::GetKeyIndex(ImGuiKey imgui_key)
 {
     IM_ASSERT(imgui_key >= 0 && imgui_key < ImGuiKey_COUNT);
-    return GImGui->IO.KeyMap[imgui_key];
+    ImGuiContext& g = *GImGui;
+    return g.IO.KeyMap[imgui_key];
 }
 
 // Note that imgui doesn't know the semantic of each entry of io.KeysDown[]. Use your own indices/enums according to how your back-end/engine stored them into io.KeysDown[]!
 bool ImGui::IsKeyDown(int user_key_index)
 {
-    if (user_key_index < 0) return false;
-    IM_ASSERT(user_key_index >= 0 && user_key_index < IM_ARRAYSIZE(GImGui->IO.KeysDown));
-    return GImGui->IO.KeysDown[user_key_index];
+    if (user_key_index < 0) 
+        return false;
+    ImGuiContext& g = *GImGui;
+    IM_ASSERT(user_key_index >= 0 && user_key_index < IM_ARRAYSIZE(g.IO.KeysDown));
+    return g.IO.KeysDown[user_key_index];
 }
 
 int ImGui::CalcTypematicPressedRepeatAmount(float t, float t_prev, float repeat_delay, float repeat_rate)
@@ -4344,15 +4439,23 @@ bool ImGui::IsMouseDoubleClicked(int button)
     return g.IO.MouseDoubleClicked[button];
 }
 
+// [Internal] This doesn't test if the button is pressed
+bool ImGui::IsMouseDragPastThreshold(int button, float lock_threshold)
+{
+    ImGuiContext& g = *GImGui;
+    IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
+    if (lock_threshold < 0.0f)
+        lock_threshold = g.IO.MouseDragThreshold;
+    return g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold;
+}
+
 bool ImGui::IsMouseDragging(int button, float lock_threshold)
 {
     ImGuiContext& g = *GImGui;
     IM_ASSERT(button >= 0 && button < IM_ARRAYSIZE(g.IO.MouseDown));
     if (!g.IO.MouseDown[button])
         return false;
-    if (lock_threshold < 0.0f)
-        lock_threshold = g.IO.MouseDragThreshold;
-    return g.IO.MouseDragMaxDistanceSqr[button] >= lock_threshold * lock_threshold;
+    return IsMouseDragPastThreshold(button, lock_threshold);
 }
 
 ImVec2 ImGui::GetMousePos()
@@ -4707,6 +4810,7 @@ ImGuiWindow* ImGui::FindWindowByName(const char* name)
 static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFlags flags)
 {
     ImGuiContext& g = *GImGui;
+    //IMGUI_DEBUG_LOG("CreateNewWindow '%s', flags = 0x%08X\n", name, flags);
 
     // Create window the first time
     ImGuiWindow* window = IM_NEW(ImGuiWindow)(&g, name);
@@ -4753,7 +4857,7 @@ static ImGuiWindow* CreateNewWindow(const char* name, ImVec2 size, ImGuiWindowFl
     return window;
 }
 
-static ImVec2 CalcSizeAfterConstraint(ImGuiWindow* window, ImVec2 new_size)
+static ImVec2 CalcWindowSizeAfterConstraint(ImGuiWindow* window, ImVec2 new_size)
 {
     ImGuiContext& g = *GImGui;
     if (g.NextWindowData.Flags & ImGuiNextWindowDataFlags_HasSizeConstraint)
@@ -4785,7 +4889,7 @@ static ImVec2 CalcSizeAfterConstraint(ImGuiWindow* window, ImVec2 new_size)
     return new_size;
 }
 
-static ImVec2 CalcContentSize(ImGuiWindow* window)
+static ImVec2 CalcWindowContentSize(ImGuiWindow* window)
 {
     if (window->Collapsed)
         if (window->AutoFitFramesX <= 0 && window->AutoFitFramesY <= 0)
@@ -4799,7 +4903,7 @@ static ImVec2 CalcContentSize(ImGuiWindow* window)
     return sz;
 }
 
-static ImVec2 CalcSizeAutoFit(ImGuiWindow* window, const ImVec2& size_contents)
+static ImVec2 CalcWindowAutoFitSize(ImGuiWindow* window, const ImVec2& size_contents)
 {
     ImGuiContext& g = *GImGui;
     ImGuiStyle& style = g.Style;
@@ -4823,7 +4927,7 @@ static ImVec2 CalcSizeAutoFit(ImGuiWindow* window, const ImVec2& size_contents)
 
         // When the window cannot fit all contents (either because of constraints, either because screen is too small),
         // we are growing the size on the other axis to compensate for expected scrollbar. FIXME: Might turn bigger than ViewportSize-WindowPadding.
-        ImVec2 size_auto_fit_after_constraint = CalcSizeAfterConstraint(window, size_auto_fit);
+        ImVec2 size_auto_fit_after_constraint = CalcWindowSizeAfterConstraint(window, size_auto_fit);
         bool will_have_scrollbar_x = (size_auto_fit_after_constraint.x - size_pad.x - size_decorations.x < size_contents.x && !(window->Flags & ImGuiWindowFlags_NoScrollbar) && (window->Flags & ImGuiWindowFlags_HorizontalScrollbar)) || (window->Flags & ImGuiWindowFlags_AlwaysHorizontalScrollbar);
         bool will_have_scrollbar_y = (size_auto_fit_after_constraint.y - size_pad.y - size_decorations.y < size_contents.y && !(window->Flags & ImGuiWindowFlags_NoScrollbar)) || (window->Flags & ImGuiWindowFlags_AlwaysVerticalScrollbar);
         if (will_have_scrollbar_x)
@@ -4836,42 +4940,10 @@ static ImVec2 CalcSizeAutoFit(ImGuiWindow* window, const ImVec2& size_contents)
 
 ImVec2 ImGui::CalcWindowExpectedSize(ImGuiWindow* window)
 {
-    ImVec2 size_contents = CalcContentSize(window);
-    return CalcSizeAfterConstraint(window, CalcSizeAutoFit(window, size_contents));
-}
-
-static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window, bool snap_on_edges)
-{
-    ImGuiContext& g = *GImGui;
-    ImVec2 scroll = window->Scroll;
-    if (window->ScrollTarget.x < FLT_MAX)
-    {
-        float cr_x = window->ScrollTargetCenterRatio.x;
-        float target_x = window->ScrollTarget.x;
-        if (snap_on_edges && cr_x <= 0.0f && target_x <= window->WindowPadding.x)
-            target_x = 0.0f;
-        else if (snap_on_edges && cr_x >= 1.0f && target_x >= window->ContentSize.x + window->WindowPadding.x + GImGui->Style.ItemSpacing.x)
-            target_x = window->ContentSize.x + window->WindowPadding.x * 2.0f;
-        scroll.x = target_x - cr_x * window->InnerRect.GetWidth();
-    }
-    if (window->ScrollTarget.y < FLT_MAX)
-    {
-        // 'snap_on_edges' allows for a discontinuity at the edge of scrolling limits to take account of WindowPadding so that scrolling to make the last item visible scroll far enough to see the padding.
-        float cr_y = window->ScrollTargetCenterRatio.y;
-        float target_y = window->ScrollTarget.y;
-        if (snap_on_edges && cr_y <= 0.0f && target_y <= window->WindowPadding.y)
-            target_y = 0.0f;
-        if (snap_on_edges && cr_y >= 1.0f && target_y >= window->ContentSize.y + window->WindowPadding.y + g.Style.ItemSpacing.y)
-            target_y = window->ContentSize.y + window->WindowPadding.y * 2.0f;
-        scroll.y = target_y - cr_y * window->InnerRect.GetHeight();
-    }
-    scroll = ImMax(scroll, ImVec2(0.0f, 0.0f));
-    if (!window->Collapsed && !window->SkipItems)
-    {
-        scroll.x = ImMin(scroll.x, window->ScrollMax.x);
-        scroll.y = ImMin(scroll.y, window->ScrollMax.y);
-    }
-    return scroll;
+    ImVec2 size_contents = CalcWindowContentSize(window);
+    ImVec2 size_auto_fit = CalcWindowAutoFitSize(window, size_contents);
+    ImVec2 size_final = CalcWindowSizeAfterConstraint(window, size_auto_fit);
+    return size_final;
 }
 
 static ImGuiCol GetWindowBgColorIdxFromFlags(ImGuiWindowFlags flags)
@@ -4888,7 +4960,7 @@ static void CalcResizePosSizeFromAnyCorner(ImGuiWindow* window, const ImVec2& co
     ImVec2 pos_min = ImLerp(corner_target, window->Pos, corner_norm);                // Expected window upper-left
     ImVec2 pos_max = ImLerp(window->Pos + window->Size, corner_target, corner_norm); // Expected window lower-right
     ImVec2 size_expected = pos_max - pos_min;
-    ImVec2 size_constrained = CalcSizeAfterConstraint(window, size_expected);
+    ImVec2 size_constrained = CalcWindowSizeAfterConstraint(window, size_expected);
     *out_pos = pos_min;
     if (corner_norm.x == 0.0f)
         out_pos->x -= (size_constrained.x - size_expected.x);
@@ -4969,7 +5041,7 @@ static bool ImGui::UpdateManualResize(ImGuiWindow* window, const ImVec2& size_au
         if (held && g.IO.MouseDoubleClicked[0] && resize_grip_n == 0)
         {
             // Manual auto-fit when double-clicking
-            size_target = CalcSizeAfterConstraint(window, size_auto_fit);
+            size_target = CalcWindowSizeAfterConstraint(window, size_auto_fit);
             ret_auto_fit = true;
             ClearActiveID();
         }
@@ -5024,7 +5096,7 @@ static bool ImGui::UpdateManualResize(ImGuiWindow* window, const ImVec2& size_au
             g.NavDisableMouseHover = true;
             resize_grip_col[0] = GetColorU32(ImGuiCol_ResizeGripActive);
             // FIXME-NAV: Should store and accumulate into a separate size buffer to handle sizing constraints properly, right now a constraint will make us stuck.
-            size_target = CalcSizeAfterConstraint(window, window->SizeFull + nav_resize_delta);
+            size_target = CalcWindowSizeAfterConstraint(window, window->SizeFull + nav_resize_delta);
         }
     }
 
@@ -5411,7 +5483,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
         // UPDATE CONTENTS SIZE, UPDATE HIDDEN STATUS
 
         // Update contents size from last frame for auto-fitting (or use explicit size)
-        window->ContentSize = CalcContentSize(window);
+        window->ContentSize = CalcWindowContentSize(window);
         if (window->HiddenFramesCanSkipItems > 0)
             window->HiddenFramesCanSkipItems--;
         if (window->HiddenFramesCannotSkipItems > 0)
@@ -5475,7 +5547,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
         // SIZE
 
         // Calculate auto-fit size, handle automatic resize
-        const ImVec2 size_auto_fit = CalcSizeAutoFit(window, window->ContentSize);
+        const ImVec2 size_auto_fit = CalcWindowAutoFitSize(window, window->ContentSize);
         bool use_current_size_for_scrollbar_x = window_just_created;
         bool use_current_size_for_scrollbar_y = window_just_created;
         if ((flags & ImGuiWindowFlags_AlwaysAutoResize) && !window->Collapsed)
@@ -5511,7 +5583,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
         }
 
         // Apply minimum/maximum window size constraints and final size
-        window->SizeFull = CalcSizeAfterConstraint(window, window->SizeFull);
+        window->SizeFull = CalcWindowSizeAfterConstraint(window, window->SizeFull);
         window->Size = window->Collapsed && !(flags & ImGuiWindowFlags_ChildWindow) ? window->TitleBarRect().GetSize() : window->SizeFull;
 
         // Decoration size
@@ -5539,7 +5611,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
 
         const bool window_pos_with_pivot = (window->SetWindowPosVal.x != FLT_MAX && window->HiddenFramesCannotSkipItems == 0);
         if (window_pos_with_pivot)
-            SetWindowPos(window, ImMax(style.DisplaySafeAreaPadding, window->SetWindowPosVal - window->SizeFull * window->SetWindowPosPivot), 0); // Position given a pivot (e.g. for centering)
+            SetWindowPos(window, window->SetWindowPosVal - window->SizeFull * window->SetWindowPosPivot, 0); // Position given a pivot (e.g. for centering)
         else if ((flags & ImGuiWindowFlags_ChildMenu) != 0)
             window->Pos = FindBestWindowPosForPopup(window);
         else if ((flags & ImGuiWindowFlags_Popup) != 0 && !window_pos_set_by_api && window_just_appearing_after_hidden_for_resize)
@@ -5622,7 +5694,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
         // Inner rectangle
         // Not affected by window border size. Used by: 
         // - InnerClipRect
-        // - NavScrollToBringItemIntoView()
+        // - ScrollToBringRectIntoView()
         // - NavUpdatePageUpPageDown()
         // - Scrollbar()
         window->InnerRect.Min.x = window->Pos.x;
@@ -5699,6 +5771,7 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
         if (render_decorations_in_parent)
             window->DrawList = parent_window->DrawList;
         
+        // Handle title bar, scrollbar, resize grips and resize borders
         const ImGuiWindow* window_to_highlight = g.NavWindowingTarget ? g.NavWindowingTarget : g.NavWindow;
         const bool title_bar_is_highlight = want_focus || (window_to_highlight && window->RootWindowForTitleBarHighlight == window_to_highlight->RootWindowForTitleBarHighlight);
         RenderWindowDecorations(window, title_bar_rect, title_bar_is_highlight, resize_grip_count, resize_grip_col, resize_grip_draw_size);
@@ -6040,7 +6113,7 @@ void ImGui::PushMultiItemsWidths(int components, float w_full)
 {
     ImGuiContext& g = *GImGui;
     ImGuiWindow* window = g.CurrentWindow;
-    const ImGuiStyle& style = GImGui->Style;
+    const ImGuiStyle& style = g.Style;
     const float w_item_one  = ImMax(1.0f, (float)(int)((w_full - (style.ItemInnerSpacing.x) * (components-1)) / (float)components));
     const float w_item_last = ImMax(1.0f, (float)(int)(w_full - (w_item_one + style.ItemInnerSpacing.x) * (components-1)));
     window->DC.ItemWidthStack.push_back(w_item_last);
@@ -6466,16 +6539,6 @@ ImVec2 ImGui::GetWindowPos()
     return window->Pos;
 }
 
-void ImGui::SetWindowScrollX(ImGuiWindow* window, float new_scroll_x)
-{
-    window->Scroll.x = new_scroll_x;
-}
-
-void ImGui::SetWindowScrollY(ImGuiWindow* window, float new_scroll_y)
-{
-    window->Scroll.y = new_scroll_y;
-}
-
 void ImGui::SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond)
 {
     // Test condition (NB: bit 0 is always true) and clear flags for next time
@@ -6670,7 +6733,8 @@ void ImGui::SetNextWindowBgAlpha(float alpha)
 // FIXME: This is in window space (not screen space!). We should try to obsolete all those functions.
 ImVec2 ImGui::GetContentRegionMax()
 {
-    ImGuiWindow* window = GImGui->CurrentWindow;
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = g.CurrentWindow;
     ImVec2 mx = window->ContentsRegionRect.Max - window->Pos;
     if (window->DC.CurrentColumns)
         mx.x = window->WorkRect.Max.x - window->Pos.x;
@@ -6680,7 +6744,8 @@ ImVec2 ImGui::GetContentRegionMax()
 // [Internal] Absolute coordinate. Saner. This is not exposed until we finishing refactoring work rect features.
 ImVec2 ImGui::GetContentRegionMaxAbs()
 {
-    ImGuiWindow* window = GImGui->CurrentWindow;
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = g.CurrentWindow;
     ImVec2 mx = window->ContentsRegionRect.Max;
     if (window->DC.CurrentColumns)
         mx.x = window->WorkRect.Max.x;
@@ -6825,81 +6890,6 @@ void ImGui::SetCursorScreenPos(const ImVec2& pos)
     window->DC.CursorMaxPos = ImMax(window->DC.CursorMaxPos, window->DC.CursorPos);
 }
 
-float ImGui::GetScrollX()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->Scroll.x;
-}
-
-float ImGui::GetScrollY()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->Scroll.y;
-}
-
-float ImGui::GetScrollMaxX()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->ScrollMax.x;
-}
-
-float ImGui::GetScrollMaxY()
-{
-    ImGuiWindow* window = GImGui->CurrentWindow;
-    return window->ScrollMax.y;
-}
-
-void ImGui::SetScrollX(float scroll_x)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    window->ScrollTarget.x = scroll_x;
-    window->ScrollTargetCenterRatio.x = 0.0f;
-}
-
-void ImGui::SetScrollY(float scroll_y)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    window->ScrollTarget.y = scroll_y;
-    window->ScrollTargetCenterRatio.y = 0.0f;
-}
-
-void ImGui::SetScrollFromPosX(float local_x, float center_x_ratio)
-{
-    // We store a target position so centering can occur on the next frame when we are guaranteed to have a known window size
-    ImGuiWindow* window = GetCurrentWindow();
-    IM_ASSERT(center_x_ratio >= 0.0f && center_x_ratio <= 1.0f);
-    window->ScrollTarget.x = (float)(int)(local_x + window->Scroll.x);
-    window->ScrollTargetCenterRatio.x = center_x_ratio;
-}
-
-void ImGui::SetScrollFromPosY(float local_y, float center_y_ratio)
-{
-    // We store a target position so centering can occur on the next frame when we are guaranteed to have a known window size
-    ImGuiWindow* window = GetCurrentWindow();
-    IM_ASSERT(center_y_ratio >= 0.0f && center_y_ratio <= 1.0f);
-    window->ScrollTarget.y = (float)(int)(local_y + window->Scroll.y);
-    window->ScrollTargetCenterRatio.y = center_y_ratio;
-}
-
-// center_x_ratio: 0.0f left of last item, 0.5f horizontal center of last item, 1.0f right of last item.
-void ImGui::SetScrollHereX(float center_x_ratio)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    float target_x = window->DC.LastItemRect.Min.x - window->Pos.x; // Left of last item, in window space
-    float last_item_width = window->DC.LastItemRect.GetWidth();
-    target_x += (last_item_width * center_x_ratio) + (GImGui->Style.ItemSpacing.x * (center_x_ratio - 0.5f) * 2.0f); // Precisely aim before, in the middle or after the last item.
-    SetScrollFromPosX(target_x, center_x_ratio);
-}
-
-// center_y_ratio: 0.0f top of last item, 0.5f vertical center of last item, 1.0f bottom of last item.
-void ImGui::SetScrollHereY(float center_y_ratio)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    float target_y = window->DC.CursorPosPrevLine.y - window->Pos.y; // Top of last item, in window space
-    target_y += (window->DC.PrevLineSize.y * center_y_ratio) + (GImGui->Style.ItemSpacing.y * (center_y_ratio - 0.5f) * 2.0f); // Precisely aim above, in the middle or below the last line.
-    SetScrollFromPosY(target_y, center_y_ratio);
-}
-
 void ImGui::ActivateItem(ImGuiID id)
 {
     ImGuiContext& g = *GImGui;
@@ -7136,6 +7126,178 @@ void ImGui::Unindent(float indent_w)
     window->DC.CursorPos.x = window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x;
 }
 
+
+//-----------------------------------------------------------------------------
+// [SECTION] SCROLLING
+//-----------------------------------------------------------------------------
+
+static ImVec2 CalcNextScrollFromScrollTargetAndClamp(ImGuiWindow* window, bool snap_on_edges)
+{
+    ImGuiContext& g = *GImGui;
+    ImVec2 scroll = window->Scroll;
+    if (window->ScrollTarget.x < FLT_MAX)
+    {
+        float cr_x = window->ScrollTargetCenterRatio.x;
+        float target_x = window->ScrollTarget.x;
+        if (snap_on_edges && cr_x <= 0.0f && target_x <= window->WindowPadding.x)
+            target_x = 0.0f;
+        else if (snap_on_edges && cr_x >= 1.0f && target_x >= window->ContentSize.x + window->WindowPadding.x + g.Style.ItemSpacing.x)
+            target_x = window->ContentSize.x + window->WindowPadding.x * 2.0f;
+        scroll.x = target_x - cr_x * (window->SizeFull.x - window->ScrollbarSizes.x);
+    }
+    if (window->ScrollTarget.y < FLT_MAX)
+    {
+        // 'snap_on_edges' allows for a discontinuity at the edge of scrolling limits to take account of WindowPadding so that scrolling to make the last item visible scroll far enough to see the padding.
+        float decoration_up_height = window->TitleBarHeight() + window->MenuBarHeight();
+        float cr_y = window->ScrollTargetCenterRatio.y;
+        float target_y = window->ScrollTarget.y;
+        if (snap_on_edges && cr_y <= 0.0f && target_y <= window->WindowPadding.y)
+            target_y = 0.0f;
+        if (snap_on_edges && cr_y >= 1.0f && target_y >= window->ContentSize.y + window->WindowPadding.y + g.Style.ItemSpacing.y)
+            target_y = window->ContentSize.y + window->WindowPadding.y * 2.0f;
+        scroll.y = target_y - cr_y * (window->SizeFull.y - window->ScrollbarSizes.y - decoration_up_height);
+    }
+    scroll = ImMax(scroll, ImVec2(0.0f, 0.0f));
+    if (!window->Collapsed && !window->SkipItems)
+    {
+        scroll.x = ImMin(scroll.x, window->ScrollMax.x);
+        scroll.y = ImMin(scroll.y, window->ScrollMax.y);
+    }
+    return scroll;
+}
+
+// Scroll to keep newly navigated item fully into view
+ImVec2 ImGui::ScrollToBringRectIntoView(ImGuiWindow* window, const ImRect& item_rect)
+{
+    ImGuiContext& g = *GImGui;
+    ImRect window_rect(window->InnerRect.Min - ImVec2(1, 1), window->InnerRect.Max + ImVec2(1, 1));
+    //GetForegroundDrawList(window)->AddRect(window_rect.Min, window_rect.Max, IM_COL32_WHITE); // [DEBUG]
+
+    ImVec2 delta_scroll;
+    if (!window_rect.Contains(item_rect))
+    {
+        if (window->ScrollbarX && item_rect.Min.x < window_rect.Min.x)
+            SetScrollFromPosX(window, item_rect.Min.x - window->Pos.x + g.Style.ItemSpacing.x, 0.0f);
+        else if (window->ScrollbarX && item_rect.Max.x >= window_rect.Max.x)
+            SetScrollFromPosX(window, item_rect.Max.x - window->Pos.x + g.Style.ItemSpacing.x, 1.0f);
+        if (item_rect.Min.y < window_rect.Min.y)
+            SetScrollFromPosY(window, item_rect.Min.y - window->Pos.y - g.Style.ItemSpacing.y, 0.0f);
+        else if (item_rect.Max.y >= window_rect.Max.y)
+            SetScrollFromPosY(window, item_rect.Max.y - window->Pos.y + g.Style.ItemSpacing.y, 1.0f);
+
+        ImVec2 next_scroll = CalcNextScrollFromScrollTargetAndClamp(window, false);
+        delta_scroll = next_scroll - window->Scroll;
+    }
+
+    // Also scroll parent window to keep us into view if necessary
+    if (window->Flags & ImGuiWindowFlags_ChildWindow)
+        delta_scroll += ScrollToBringRectIntoView(window->ParentWindow, ImRect(item_rect.Min - delta_scroll, item_rect.Max - delta_scroll));
+
+    return delta_scroll;
+}
+
+float ImGui::GetScrollX()
+{
+    ImGuiWindow* window = GImGui->CurrentWindow;
+    return window->Scroll.x;
+}
+
+float ImGui::GetScrollY()
+{
+    ImGuiWindow* window = GImGui->CurrentWindow;
+    return window->Scroll.y;
+}
+
+float ImGui::GetScrollMaxX()
+{
+    ImGuiWindow* window = GImGui->CurrentWindow;
+    return window->ScrollMax.x;
+}
+
+float ImGui::GetScrollMaxY()
+{
+    ImGuiWindow* window = GImGui->CurrentWindow;
+    return window->ScrollMax.y;
+}
+
+void ImGui::SetScrollX(float scroll_x)
+{
+    ImGuiWindow* window = GetCurrentWindow();
+    window->ScrollTarget.x = scroll_x;
+    window->ScrollTargetCenterRatio.x = 0.0f;
+}
+
+void ImGui::SetScrollY(float scroll_y)
+{
+    ImGuiWindow* window = GetCurrentWindow();
+    window->ScrollTarget.y = scroll_y;
+    window->ScrollTargetCenterRatio.y = 0.0f;
+}
+
+void ImGui::SetScrollX(ImGuiWindow* window, float new_scroll_x)
+{
+    window->ScrollTarget.x = new_scroll_x;
+    window->ScrollTargetCenterRatio.x = 0.0f;
+}
+
+void ImGui::SetScrollY(ImGuiWindow* window, float new_scroll_y)
+{
+    window->ScrollTarget.y = new_scroll_y;
+    window->ScrollTargetCenterRatio.y = 0.0f;
+}
+
+
+void ImGui::SetScrollFromPosX(ImGuiWindow* window, float local_x, float center_x_ratio)
+{
+    // We store a target position so centering can occur on the next frame when we are guaranteed to have a known window size
+    IM_ASSERT(center_x_ratio >= 0.0f && center_x_ratio <= 1.0f);
+    window->ScrollTarget.x = (float)(int)(local_x + window->Scroll.x);
+    window->ScrollTargetCenterRatio.x = center_x_ratio;
+}
+
+void ImGui::SetScrollFromPosY(ImGuiWindow* window, float local_y, float center_y_ratio)
+{
+    // We store a target position so centering can occur on the next frame when we are guaranteed to have a known window size
+    IM_ASSERT(center_y_ratio >= 0.0f && center_y_ratio <= 1.0f);
+    const float decoration_up_height = window->TitleBarHeight() + window->MenuBarHeight();
+    local_y -= decoration_up_height;
+    window->ScrollTarget.y = (float)(int)(local_y + window->Scroll.y);
+    window->ScrollTargetCenterRatio.y = center_y_ratio;
+}
+
+void ImGui::SetScrollFromPosX(float local_x, float center_x_ratio)
+{
+    ImGuiContext& g = *GImGui;
+    SetScrollFromPosX(g.CurrentWindow, local_x, center_x_ratio);
+}
+
+void ImGui::SetScrollFromPosY(float local_y, float center_y_ratio)
+{
+    ImGuiContext& g = *GImGui;
+    SetScrollFromPosY(g.CurrentWindow, local_y, center_y_ratio);
+}
+
+// center_x_ratio: 0.0f left of last item, 0.5f horizontal center of last item, 1.0f right of last item.
+void ImGui::SetScrollHereX(float center_x_ratio)
+{
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = g.CurrentWindow;
+    float target_x = window->DC.LastItemRect.Min.x - window->Pos.x; // Left of last item, in window space
+    float last_item_width = window->DC.LastItemRect.GetWidth();
+    target_x += (last_item_width * center_x_ratio) + (g.Style.ItemSpacing.x * (center_x_ratio - 0.5f) * 2.0f); // Precisely aim before, in the middle or after the last item.
+    SetScrollFromPosX(target_x, center_x_ratio);
+}
+
+// center_y_ratio: 0.0f top of last item, 0.5f vertical center of last item, 1.0f bottom of last item.
+void ImGui::SetScrollHereY(float center_y_ratio)
+{
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = g.CurrentWindow;
+    float target_y = window->DC.CursorPosPrevLine.y - window->Pos.y; // Top of last item, in window space
+    target_y += (window->DC.PrevLineSize.y * center_y_ratio) + (g.Style.ItemSpacing.y * (center_y_ratio - 0.5f) * 2.0f); // Precisely aim above, in the middle or below the last line.
+    SetScrollFromPosY(target_y, center_y_ratio);
+}
+
 //-----------------------------------------------------------------------------
 // [SECTION] TOOLTIPS
 //-----------------------------------------------------------------------------
@@ -7658,7 +7820,7 @@ static bool NavScoreItem(ImGuiNavMoveResult* result, ImRect cand)
     if (window->ParentWindow == g.NavWindow)
     {
         IM_ASSERT((window->Flags | g.NavWindow->Flags) & ImGuiWindowFlags_NavFlattened);
-        if (!window->ClipRect.Contains(cand))
+        if (!window->ClipRect.Overlaps(cand))
             return false;
         cand.ClipWithFull(window->ClipRect); // This allows the scored item to not overlap other candidates in the parent window
     }
@@ -8026,38 +8188,6 @@ ImVec2 ImGui::GetNavInputAmount2d(ImGuiNavDirSourceFlags dir_sources, ImGuiInput
     return delta;
 }
 
-// Scroll to keep newly navigated item fully into view
-// NB: We modify rect_rel by the amount we scrolled for, so it is immediately updated.
-static void NavScrollToBringItemIntoView(ImGuiWindow* window, const ImRect& item_rect)
-{
-    ImRect window_rect(window->InnerRect.Min - ImVec2(1, 1), window->InnerRect.Max + ImVec2(1, 1));
-    //GetForegroundDrawList(window)->AddRect(window_rect.Min, window_rect.Max, IM_COL32_WHITE); // [DEBUG]
-    if (window_rect.Contains(item_rect))
-        return;
-
-    ImGuiContext& g = *GImGui;
-    if (window->ScrollbarX && item_rect.Min.x < window_rect.Min.x)
-    {
-        window->ScrollTarget.x = item_rect.Min.x - window->Pos.x + window->Scroll.x - g.Style.ItemSpacing.x;
-        window->ScrollTargetCenterRatio.x = 0.0f;
-    }
-    else if (window->ScrollbarX && item_rect.Max.x >= window_rect.Max.x)
-    {
-        window->ScrollTarget.x = item_rect.Max.x - window->Pos.x + window->Scroll.x + g.Style.ItemSpacing.x;
-        window->ScrollTargetCenterRatio.x = 1.0f;
-    }
-    if (item_rect.Min.y < window_rect.Min.y)
-    {
-        window->ScrollTarget.y = item_rect.Min.y - window->Pos.y + window->Scroll.y - g.Style.ItemSpacing.y;
-        window->ScrollTargetCenterRatio.y = 0.0f;
-    }
-    else if (item_rect.Max.y >= window_rect.Max.y)
-    {
-        window->ScrollTarget.y = item_rect.Max.y - window->Pos.y + window->Scroll.y + g.Style.ItemSpacing.y;
-        window->ScrollTargetCenterRatio.y = 1.0f;
-    }
-}
-
 static void ImGui::NavUpdate()
 {
     ImGuiContext& g = *GImGui;
@@ -8076,7 +8206,7 @@ static void ImGui::NavUpdate()
     // Update Keyboard->Nav inputs mapping
     if (nav_keyboard_active)
     {
-        #define NAV_MAP_KEY(_KEY, _NAV_INPUT) if (IsKeyDown(g.IO.KeyMap[_KEY])) { g.IO.NavInputs[_NAV_INPUT] = 1.0f; g.NavInputSource = ImGuiInputSource_NavKeyboard; }
+        #define NAV_MAP_KEY(_KEY, _NAV_INPUT)  do { if (IsKeyDown(g.IO.KeyMap[_KEY])) { g.IO.NavInputs[_NAV_INPUT] = 1.0f; g.NavInputSource = ImGuiInputSource_NavKeyboard; } } while (0)
         NAV_MAP_KEY(ImGuiKey_Space,     ImGuiNavInput_Activate );
         NAV_MAP_KEY(ImGuiKey_Enter,     ImGuiNavInput_Input    );
         NAV_MAP_KEY(ImGuiKey_Escape,    ImGuiNavInput_Cancel   );
@@ -8275,9 +8405,9 @@ static void ImGui::NavUpdate()
         if (window->DC.NavLayerActiveMask == 0x00 && window->DC.NavHasScroll && g.NavMoveRequest)
         {
             if (g.NavMoveDir == ImGuiDir_Left || g.NavMoveDir == ImGuiDir_Right)
-                SetWindowScrollX(window, ImFloor(window->Scroll.x + ((g.NavMoveDir == ImGuiDir_Left) ? -1.0f : +1.0f) * scroll_speed));
+                SetScrollX(window, ImFloor(window->Scroll.x + ((g.NavMoveDir == ImGuiDir_Left) ? -1.0f : +1.0f) * scroll_speed));
             if (g.NavMoveDir == ImGuiDir_Up || g.NavMoveDir == ImGuiDir_Down)
-                SetWindowScrollY(window, ImFloor(window->Scroll.y + ((g.NavMoveDir == ImGuiDir_Up) ? -1.0f : +1.0f) * scroll_speed));
+                SetScrollY(window, ImFloor(window->Scroll.y + ((g.NavMoveDir == ImGuiDir_Up) ? -1.0f : +1.0f) * scroll_speed));
         }
 
         // *Normal* Manual scroll with NavScrollXXX keys
@@ -8285,12 +8415,12 @@ static void ImGui::NavUpdate()
         ImVec2 scroll_dir = GetNavInputAmount2d(ImGuiNavDirSourceFlags_PadLStick, ImGuiInputReadMode_Down, 1.0f/10.0f, 10.0f);
         if (scroll_dir.x != 0.0f && window->ScrollbarX)
         {
-            SetWindowScrollX(window, ImFloor(window->Scroll.x + scroll_dir.x * scroll_speed));
+            SetScrollX(window, ImFloor(window->Scroll.x + scroll_dir.x * scroll_speed));
             g.NavMoveFromClampedRefRect = true;
         }
         if (scroll_dir.y != 0.0f)
         {
-            SetWindowScrollY(window, ImFloor(window->Scroll.y + scroll_dir.y * scroll_speed));
+            SetScrollY(window, ImFloor(window->Scroll.y + scroll_dir.y * scroll_speed));
             g.NavMoveFromClampedRefRect = true;
         }
     }
@@ -8367,16 +8497,11 @@ static void ImGui::NavUpdateMoveResult()
     if (g.NavLayer == 0)
     {
         ImRect rect_abs = ImRect(result->RectRel.Min + result->Window->Pos, result->RectRel.Max + result->Window->Pos);
-        NavScrollToBringItemIntoView(result->Window, rect_abs);
+        ImVec2 delta_scroll = ScrollToBringRectIntoView(result->Window, rect_abs);
 
-        // Estimate upcoming scroll so we can offset our result position so mouse position can be applied immediately after in NavUpdate()
-        ImVec2 next_scroll = CalcNextScrollFromScrollTargetAndClamp(result->Window, false);
-        ImVec2 delta_scroll = result->Window->Scroll - next_scroll;
-        result->RectRel.Translate(delta_scroll);
-
-        // Also scroll parent window to keep us into view if necessary (we could/should technically recurse back the whole the parent hierarchy).
-        if (result->Window->Flags & ImGuiWindowFlags_ChildWindow)
-            NavScrollToBringItemIntoView(result->Window->ParentWindow, ImRect(rect_abs.Min + delta_scroll, rect_abs.Max + delta_scroll));
+        // Offset our result position so mouse position can be applied immediately after in NavUpdate()
+        result->RectRel.TranslateX(-delta_scroll.x);
+        result->RectRel.TranslateY(-delta_scroll.y);
     }
 
     ClearActiveID();
@@ -8394,42 +8519,44 @@ static void ImGui::NavUpdateMoveResult()
 static float ImGui::NavUpdatePageUpPageDown(int allowed_dir_flags)
 {
     ImGuiContext& g = *GImGui;
-    if (g.NavMoveDir == ImGuiDir_None && g.NavWindow && !(g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs) && !g.NavWindowingTarget && g.NavLayer == 0)
+    if (g.NavMoveDir != ImGuiDir_None || g.NavWindow == NULL)
+        return 0.0f;
+    if ((g.NavWindow->Flags & ImGuiWindowFlags_NoNavInputs) || g.NavWindowingTarget != NULL || g.NavLayer != 0)
+        return 0.0f;
+
+    ImGuiWindow* window = g.NavWindow;
+    bool page_up_held = IsKeyDown(g.IO.KeyMap[ImGuiKey_PageUp]) && (allowed_dir_flags & (1 << ImGuiDir_Up));
+    bool page_down_held = IsKeyDown(g.IO.KeyMap[ImGuiKey_PageDown]) && (allowed_dir_flags & (1 << ImGuiDir_Down));
+    if (page_up_held != page_down_held) // If either (not both) are pressed
     {
-        ImGuiWindow* window = g.NavWindow;
-        bool page_up_held = IsKeyDown(g.IO.KeyMap[ImGuiKey_PageUp]) && (allowed_dir_flags & (1 << ImGuiDir_Up));
-        bool page_down_held = IsKeyDown(g.IO.KeyMap[ImGuiKey_PageDown]) && (allowed_dir_flags & (1 << ImGuiDir_Down));
-        if (page_up_held != page_down_held) // If either (not both) are pressed
+        if (window->DC.NavLayerActiveMask == 0x00 && window->DC.NavHasScroll)
         {
-            if (window->DC.NavLayerActiveMask == 0x00 && window->DC.NavHasScroll)
+            // Fallback manual-scroll when window has no navigable item
+            if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageUp], true))
+                SetScrollY(window, window->Scroll.y - window->InnerRect.GetHeight());
+            else if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageDown], true))
+                SetScrollY(window, window->Scroll.y + window->InnerRect.GetHeight());
+        }
+        else
+        {
+            const ImRect& nav_rect_rel = window->NavRectRel[g.NavLayer];
+            const float page_offset_y = ImMax(0.0f, window->InnerRect.GetHeight() - window->CalcFontSize() * 1.0f + nav_rect_rel.GetHeight());
+            float nav_scoring_rect_offset_y = 0.0f;
+            if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageUp], true))
             {
-                // Fallback manual-scroll when window has no navigable item
-                if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageUp], true))
-                    SetWindowScrollY(window, window->Scroll.y - window->InnerRect.GetHeight());
-                else if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageDown], true))
-                    SetWindowScrollY(window, window->Scroll.y + window->InnerRect.GetHeight());
+                nav_scoring_rect_offset_y = -page_offset_y;
+                g.NavMoveDir = ImGuiDir_Down; // Because our scoring rect is offset, we intentionally request the opposite direction (so we can always land on the last item)
+                g.NavMoveClipDir = ImGuiDir_Up;
+                g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet;
             }
-            else
+            else if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageDown], true))
             {
-                const ImRect& nav_rect_rel = window->NavRectRel[g.NavLayer];
-                const float page_offset_y = ImMax(0.0f, window->InnerRect.GetHeight() - window->CalcFontSize() * 1.0f + nav_rect_rel.GetHeight());
-                float nav_scoring_rect_offset_y = 0.0f;
-                if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageUp], true))
-                {
-                    nav_scoring_rect_offset_y = -page_offset_y;
-                    g.NavMoveDir = ImGuiDir_Down; // Because our scoring rect is offset, we intentionally request the opposite direction (so we can always land on the last item)
-                    g.NavMoveClipDir = ImGuiDir_Up;
-                    g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet;
-                }
-                else if (IsKeyPressed(g.IO.KeyMap[ImGuiKey_PageDown], true))
-                {
-                    nav_scoring_rect_offset_y = +page_offset_y;
-                    g.NavMoveDir = ImGuiDir_Up; // Because our scoring rect is offset, we intentionally request the opposite direction (so we can always land on the last item)
-                    g.NavMoveClipDir = ImGuiDir_Down;
-                    g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet;
-                }
-                return nav_scoring_rect_offset_y;
+                nav_scoring_rect_offset_y = +page_offset_y;
+                g.NavMoveDir = ImGuiDir_Up; // Because our scoring rect is offset, we intentionally request the opposite direction (so we can always land on the last item)
+                g.NavMoveClipDir = ImGuiDir_Down;
+                g.NavMoveRequestFlags = ImGuiNavMoveFlags_AllowCurrentNavId | ImGuiNavMoveFlags_AlsoScoreVisibleSet;
             }
+            return nav_scoring_rect_offset_y;
         }
     }
     return 0.0f;
@@ -8652,394 +8779,6 @@ void ImGui::NavUpdateWindowingList()
     PopStyleVar();
 }
 
-//-----------------------------------------------------------------------------
-// [SECTION] COLUMNS
-// In the current version, Columns are very weak. Needs to be replaced with a more full-featured system.
-//-----------------------------------------------------------------------------
-
-void ImGui::NextColumn()
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    if (window->SkipItems || window->DC.CurrentColumns == NULL)
-        return;
-
-    ImGuiContext& g = *GImGui;
-    ImGuiColumns* columns = window->DC.CurrentColumns;
-
-    if (columns->Count == 1)
-    {
-        window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
-        IM_ASSERT(columns->Current == 0);
-        return;
-    }
-
-    PopItemWidth();
-    PopClipRect();
-
-    columns->LineMaxY = ImMax(columns->LineMaxY, window->DC.CursorPos.y);
-    if (++columns->Current < columns->Count)
-    {
-        // Columns 1+ cancel out IndentX
-        // FIXME-COLUMNS: Unnecessary, could be locked?
-        window->DC.ColumnsOffset.x = GetColumnOffset(columns->Current) - window->DC.Indent.x + g.Style.ItemSpacing.x;
-        window->DrawList->ChannelsSetCurrent(columns->Current + 1);
-    }
-    else
-    {
-        // New row/line
-        window->DC.ColumnsOffset.x = 0.0f;
-        window->DrawList->ChannelsSetCurrent(1);
-        columns->Current = 0;
-        columns->LineMinY = columns->LineMaxY;
-    }
-    window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
-    window->DC.CursorPos.y = columns->LineMinY;
-    window->DC.CurrLineSize = ImVec2(0.0f, 0.0f);
-    window->DC.CurrLineTextBaseOffset = 0.0f;
-
-    PushColumnClipRect(columns->Current);     // FIXME-COLUMNS: Could it be an overwrite?
-
-    // FIXME-COLUMNS: Share code with BeginColumns() - move code on columns setup.
-    float offset_0 = GetColumnOffset(columns->Current);
-    float offset_1 = GetColumnOffset(columns->Current + 1);
-    float width = offset_1 - offset_0;
-    PushItemWidth(width * 0.65f);
-    window->WorkRect.Max.x = window->Pos.x + offset_1 - window->WindowPadding.x;
-}
-
-int ImGui::GetColumnIndex()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->DC.CurrentColumns ? window->DC.CurrentColumns->Current : 0;
-}
-
-int ImGui::GetColumnsCount()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    return window->DC.CurrentColumns ? window->DC.CurrentColumns->Count : 1;
-}
-
-static float OffsetNormToPixels(const ImGuiColumns* columns, float offset_norm)
-{
-    return offset_norm * (columns->OffMaxX - columns->OffMinX);
-}
-
-static float PixelsToOffsetNorm(const ImGuiColumns* columns, float offset)
-{
-    return offset / (columns->OffMaxX - columns->OffMinX);
-}
-
-static const float COLUMNS_HIT_RECT_HALF_WIDTH = 4.0f;
-
-static float GetDraggedColumnOffset(ImGuiColumns* columns, int column_index)
-{
-    // Active (dragged) column always follow mouse. The reason we need this is that dragging a column to the right edge of an auto-resizing
-    // window creates a feedback loop because we store normalized positions. So while dragging we enforce absolute positioning.
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    IM_ASSERT(column_index > 0); // We are not supposed to drag column 0.
-    IM_ASSERT(g.ActiveId == columns->ID + ImGuiID(column_index));
-
-    float x = g.IO.MousePos.x - g.ActiveIdClickOffset.x + COLUMNS_HIT_RECT_HALF_WIDTH - window->Pos.x;
-    x = ImMax(x, ImGui::GetColumnOffset(column_index - 1) + g.Style.ColumnsMinSpacing);
-    if ((columns->Flags & ImGuiColumnsFlags_NoPreserveWidths))
-        x = ImMin(x, ImGui::GetColumnOffset(column_index + 1) - g.Style.ColumnsMinSpacing);
-
-    return x;
-}
-
-float ImGui::GetColumnOffset(int column_index)
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    ImGuiColumns* columns = window->DC.CurrentColumns;
-    IM_ASSERT(columns != NULL);
-
-    if (column_index < 0)
-        column_index = columns->Current;
-    IM_ASSERT(column_index < columns->Columns.Size);
-
-    const float t = columns->Columns[column_index].OffsetNorm;
-    const float x_offset = ImLerp(columns->OffMinX, columns->OffMaxX, t);
-    return x_offset;
-}
-
-static float GetColumnWidthEx(ImGuiColumns* columns, int column_index, bool before_resize = false)
-{
-    if (column_index < 0)
-        column_index = columns->Current;
-
-    float offset_norm;
-    if (before_resize)
-        offset_norm = columns->Columns[column_index + 1].OffsetNormBeforeResize - columns->Columns[column_index].OffsetNormBeforeResize;
-    else
-        offset_norm = columns->Columns[column_index + 1].OffsetNorm - columns->Columns[column_index].OffsetNorm;
-    return OffsetNormToPixels(columns, offset_norm);
-}
-
-float ImGui::GetColumnWidth(int column_index)
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    ImGuiColumns* columns = window->DC.CurrentColumns;
-    IM_ASSERT(columns != NULL);
-
-    if (column_index < 0)
-        column_index = columns->Current;
-    return OffsetNormToPixels(columns, columns->Columns[column_index + 1].OffsetNorm - columns->Columns[column_index].OffsetNorm);
-}
-
-void ImGui::SetColumnOffset(int column_index, float offset)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = g.CurrentWindow;
-    ImGuiColumns* columns = window->DC.CurrentColumns;
-    IM_ASSERT(columns != NULL);
-
-    if (column_index < 0)
-        column_index = columns->Current;
-    IM_ASSERT(column_index < columns->Columns.Size);
-
-    const bool preserve_width = !(columns->Flags & ImGuiColumnsFlags_NoPreserveWidths) && (column_index < columns->Count-1);
-    const float width = preserve_width ? GetColumnWidthEx(columns, column_index, columns->IsBeingResized) : 0.0f;
-
-    if (!(columns->Flags & ImGuiColumnsFlags_NoForceWithinWindow))
-        offset = ImMin(offset, columns->OffMaxX - g.Style.ColumnsMinSpacing * (columns->Count - column_index));
-    columns->Columns[column_index].OffsetNorm = PixelsToOffsetNorm(columns, offset - columns->OffMinX);
-
-    if (preserve_width)
-        SetColumnOffset(column_index + 1, offset + ImMax(g.Style.ColumnsMinSpacing, width));
-}
-
-void ImGui::SetColumnWidth(int column_index, float width)
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    ImGuiColumns* columns = window->DC.CurrentColumns;
-    IM_ASSERT(columns != NULL);
-
-    if (column_index < 0)
-        column_index = columns->Current;
-    SetColumnOffset(column_index + 1, GetColumnOffset(column_index) + width);
-}
-
-void ImGui::PushColumnClipRect(int column_index)
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    ImGuiColumns* columns = window->DC.CurrentColumns;
-    if (column_index < 0)
-        column_index = columns->Current;
-
-    ImGuiColumnData* column = &columns->Columns[column_index];
-    PushClipRect(column->ClipRect.Min, column->ClipRect.Max, false);
-}
-
-// Get into the columns background draw command (which is generally the same draw command as before we called BeginColumns)
-void ImGui::PushColumnsBackground()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    ImGuiColumns* columns = window->DC.CurrentColumns;
-    window->DrawList->ChannelsSetCurrent(0);
-    int cmd_size = window->DrawList->CmdBuffer.Size;
-    PushClipRect(columns->HostClipRect.Min, columns->HostClipRect.Max, false); 
-    IM_UNUSED(cmd_size);
-    IM_ASSERT(cmd_size == window->DrawList->CmdBuffer.Size); // Being in channel 0 this should not have created an ImDrawCmd
-}
-
-void ImGui::PopColumnsBackground()
-{
-    ImGuiWindow* window = GetCurrentWindowRead();
-    ImGuiColumns* columns = window->DC.CurrentColumns;
-    window->DrawList->ChannelsSetCurrent(columns->Current + 1);
-    PopClipRect();
-}
-
-ImGuiColumns* ImGui::FindOrCreateColumns(ImGuiWindow* window, ImGuiID id)
-{
-    // We have few columns per window so for now we don't need bother much with turning this into a faster lookup.
-    for (int n = 0; n < window->ColumnsStorage.Size; n++)
-        if (window->ColumnsStorage[n].ID == id)
-            return &window->ColumnsStorage[n];
-
-    window->ColumnsStorage.push_back(ImGuiColumns());
-    ImGuiColumns* columns = &window->ColumnsStorage.back();
-    columns->ID = id;
-    return columns;
-}
-
-ImGuiID ImGui::GetColumnsID(const char* str_id, int columns_count)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-
-    // Differentiate column ID with an arbitrary prefix for cases where users name their columns set the same as another widget.
-    // In addition, when an identifier isn't explicitly provided we include the number of columns in the hash to make it uniquer.
-    PushID(0x11223347 + (str_id ? 0 : columns_count));
-    ImGuiID id = window->GetID(str_id ? str_id : "columns");
-    PopID();
-
-    return id;
-}
-
-void ImGui::BeginColumns(const char* str_id, int columns_count, ImGuiColumnsFlags flags)
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
-
-    IM_ASSERT(columns_count >= 1);
-    IM_ASSERT(window->DC.CurrentColumns == NULL); // Nested columns are currently not supported
-
-    // Acquire storage for the columns set
-    ImGuiID id = GetColumnsID(str_id, columns_count);
-    ImGuiColumns* columns = FindOrCreateColumns(window, id);
-    IM_ASSERT(columns->ID == id);
-    columns->Current = 0;
-    columns->Count = columns_count;
-    columns->Flags = flags;
-    window->DC.CurrentColumns = columns;
-
-    // Set state for first column
-    columns->OffMinX = window->DC.Indent.x - g.Style.ItemSpacing.x;
-    columns->OffMaxX = ImMax(window->WorkRect.Max.x - window->Pos.x, columns->OffMinX + 1.0f);
-    columns->HostCursorPosY = window->DC.CursorPos.y;
-    columns->HostCursorMaxPosX = window->DC.CursorMaxPos.x;
-    columns->HostClipRect = window->ClipRect;
-    columns->HostWorkRect = window->WorkRect;
-    columns->LineMinY = columns->LineMaxY = window->DC.CursorPos.y;
-    window->DC.ColumnsOffset.x = 0.0f;
-    window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
-
-    // Clear data if columns count changed
-    if (columns->Columns.Size != 0 && columns->Columns.Size != columns_count + 1)
-        columns->Columns.resize(0);
-
-    // Initialize default widths
-    columns->IsFirstFrame = (columns->Columns.Size == 0);
-    if (columns->Columns.Size == 0)
-    {
-        columns->Columns.reserve(columns_count + 1);
-        for (int n = 0; n < columns_count + 1; n++)
-        {
-            ImGuiColumnData column;
-            column.OffsetNorm = n / (float)columns_count;
-            columns->Columns.push_back(column);
-        }
-    }
-
-    for (int n = 0; n < columns_count; n++)
-    {
-        // Compute clipping rectangle
-        ImGuiColumnData* column = &columns->Columns[n];
-        float clip_x1 = ImFloor(0.5f + window->Pos.x + GetColumnOffset(n));
-        float clip_x2 = ImFloor(0.5f + window->Pos.x + GetColumnOffset(n + 1) - 1.0f);
-        column->ClipRect = ImRect(clip_x1, -FLT_MAX, clip_x2, +FLT_MAX);
-        column->ClipRect.ClipWith(window->ClipRect);
-    }
-
-    if (columns->Count > 1)
-    {
-        window->DrawList->ChannelsSplit(1 + columns->Count);
-        window->DrawList->ChannelsSetCurrent(1);
-        PushColumnClipRect(0);
-    }
-
-    float offset_0 = GetColumnOffset(columns->Current);
-    float offset_1 = GetColumnOffset(columns->Current + 1);
-    float width = offset_1 - offset_0;
-    PushItemWidth(width * 0.65f);
-    window->WorkRect.Max.x = window->Pos.x + offset_1 - window->WindowPadding.x;
-}
-
-void ImGui::EndColumns()
-{
-    ImGuiContext& g = *GImGui;
-    ImGuiWindow* window = GetCurrentWindow();
-    ImGuiColumns* columns = window->DC.CurrentColumns;
-    IM_ASSERT(columns != NULL);
-
-    PopItemWidth();
-    if (columns->Count > 1)
-    {
-        PopClipRect();
-        window->DrawList->ChannelsMerge();
-    }
-
-    const ImGuiColumnsFlags flags = columns->Flags;
-    columns->LineMaxY = ImMax(columns->LineMaxY, window->DC.CursorPos.y);
-    window->DC.CursorPos.y = columns->LineMaxY;
-    if (!(flags & ImGuiColumnsFlags_GrowParentContentsSize))
-        window->DC.CursorMaxPos.x = columns->HostCursorMaxPosX;  // Restore cursor max pos, as columns don't grow parent
-
-    // Draw columns borders and handle resize
-    // The IsBeingResized flag ensure we preserve pre-resize columns width so back-and-forth are not lossy
-    bool is_being_resized = false;
-    if (!(flags & ImGuiColumnsFlags_NoBorder) && !window->SkipItems)
-    {
-        // We clip Y boundaries CPU side because very long triangles are mishandled by some GPU drivers.
-        const float y1 = ImMax(columns->HostCursorPosY, window->ClipRect.Min.y);
-        const float y2 = ImMin(window->DC.CursorPos.y, window->ClipRect.Max.y);
-        int dragging_column = -1;
-        for (int n = 1; n < columns->Count; n++)
-        {
-            ImGuiColumnData* column = &columns->Columns[n];
-            float x = window->Pos.x + GetColumnOffset(n);
-            const ImGuiID column_id = columns->ID + ImGuiID(n);
-            const float column_hit_hw = COLUMNS_HIT_RECT_HALF_WIDTH;
-            const ImRect column_hit_rect(ImVec2(x - column_hit_hw, y1), ImVec2(x + column_hit_hw, y2));
-            KeepAliveID(column_id);
-            if (IsClippedEx(column_hit_rect, column_id, false))
-                continue;
-
-            bool hovered = false, held = false;
-            if (!(flags & ImGuiColumnsFlags_NoResize))
-            {
-                ButtonBehavior(column_hit_rect, column_id, &hovered, &held);
-                if (hovered || held)
-                    g.MouseCursor = ImGuiMouseCursor_ResizeEW;
-                if (held && !(column->Flags & ImGuiColumnsFlags_NoResize))
-                    dragging_column = n;
-            }
-
-            // Draw column
-            const ImU32 col = GetColorU32(held ? ImGuiCol_SeparatorActive : hovered ? ImGuiCol_SeparatorHovered : ImGuiCol_Separator);
-            const float xi = (float)(int)x;
-            window->DrawList->AddLine(ImVec2(xi, y1 + 1.0f), ImVec2(xi, y2), col);
-        }
-
-        // Apply dragging after drawing the column lines, so our rendered lines are in sync with how items were displayed during the frame.
-        if (dragging_column != -1)
-        {
-            if (!columns->IsBeingResized)
-                for (int n = 0; n < columns->Count + 1; n++)
-                    columns->Columns[n].OffsetNormBeforeResize = columns->Columns[n].OffsetNorm;
-            columns->IsBeingResized = is_being_resized = true;
-            float x = GetDraggedColumnOffset(columns, dragging_column);
-            SetColumnOffset(dragging_column, x);
-        }
-    }
-    columns->IsBeingResized = is_being_resized;
-
-    window->WorkRect = columns->HostWorkRect;
-    window->DC.CurrentColumns = NULL;
-    window->DC.ColumnsOffset.x = 0.0f;
-    window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
-}
-
-// [2018-03: This is currently the only public API, while we are working on making BeginColumns/EndColumns user-facing]
-void ImGui::Columns(int columns_count, const char* id, bool border)
-{
-    ImGuiWindow* window = GetCurrentWindow();
-    IM_ASSERT(columns_count >= 1);
-
-    ImGuiColumnsFlags flags = (border ? 0 : ImGuiColumnsFlags_NoBorder);
-    //flags |= ImGuiColumnsFlags_NoPreserveWidths; // NB: Legacy behavior
-    ImGuiColumns* columns = window->DC.CurrentColumns;
-    if (columns != NULL && columns->Count == columns_count && columns->Flags == flags)
-        return;
-
-    if (columns != NULL)
-        EndColumns();
-
-    if (columns_count != 1)
-        BeginColumns(id, columns_count, flags);
-}
-
 
 //-----------------------------------------------------------------------------
 // [SECTION] DRAG AND DROP
@@ -9558,8 +9297,12 @@ ImGuiWindowSettings* ImGui::CreateNewWindowSettings(const char* name)
     ImGuiContext& g = *GImGui;
     g.SettingsWindows.push_back(ImGuiWindowSettings());
     ImGuiWindowSettings* settings = &g.SettingsWindows.back();
-    if (const char* p = strstr(name, "###"))  // Skip to the "###" marker if any. We don't skip past to match the behavior of GetID()
+#if !IMGUI_DEBUG_INI_SETTINGS
+    // Skip to the "###" marker if any. We don't skip past to match the behavior of GetID()
+    // Preserve the full string when IMGUI_DEBUG_INI_SETTINGS is set to make .ini inspection easier.
+    if (const char* p = strstr(name, "###"))
         name = p;
+#endif
     settings->Name = ImStrdup(name);
     settings->ID = ImHashStr(name);
     return settings;
@@ -9835,12 +9578,13 @@ static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
     ::CloseClipboard();
 }
 
-#elif defined(__APPLE__) && TARGET_OS_OSX && !defined(IMGUI_DISABLE_OSX_FUNCTIONS)
+#elif defined(__APPLE__) && TARGET_OS_OSX && defined(IMGUI_ENABLE_OSX_DEFAULT_CLIPBOARD_FUNCTIONS)
 
 #include <Carbon/Carbon.h>  // Use old API to avoid need for separate .mm file
 static PasteboardRef main_clipboard = 0;
 
 // OSX clipboard implementation
+// If you enable this you will need to add '-framework ApplicationServices' to your linker command-line!
 static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
 {
     if (!main_clipboard)
@@ -9918,7 +9662,8 @@ static void SetClipboardTextFn_DefaultImpl(void*, const char* text)
 static void ImeSetInputScreenPosFn_DefaultImpl(int x, int y)
 {
     // Notify OS Input Method Editor of text input position
-    if (HWND hwnd = (HWND)GImGui->IO.ImeWindowHandle)
+    ImGuiIO& io = ImGui::GetIO();
+    if (HWND hwnd = (HWND)io.ImeWindowHandle)
         if (HIMC himc = ::ImmGetContext(hwnd))
         {
             COMPOSITIONFORM cf;
@@ -9949,14 +9694,16 @@ void ImGui::ShowMetricsWindow(bool* p_open)
         return;
     }
 
+    // State
     enum { WRT_OuterRect, WRT_OuterRectClipped, WRT_InnerRect, WRT_InnerClipRect, WRT_WorkRect, WRT_Contents, WRT_ContentsRegionRect, WRT_Count }; // Windows Rect Type
     const char* wrt_rects_names[WRT_Count] = { "OuterRect", "OuterRectClipped", "InnerRect", "InnerClipRect", "WorkRect", "Contents", "ContentsRegionRect" };
-
-    static bool show_windows_begin_order = false;
     static bool show_windows_rects = false;
     static int  show_windows_rect_type = WRT_WorkRect;
+    static bool show_windows_begin_order = false;
     static bool show_drawcmd_clip_rects = true;
 
+    // Basic info
+    ImGuiContext& g = *GImGui;
     ImGuiIO& io = ImGui::GetIO();
     ImGui::Text("Dear ImGui %s", ImGui::GetVersion());
     ImGui::Text("Application average %.3f ms/frame (%.1f FPS)", 1000.0f / io.Framerate, io.Framerate);
@@ -9965,6 +9712,12 @@ void ImGui::ShowMetricsWindow(bool* p_open)
     ImGui::Text("%d active allocations", io.MetricsActiveAllocations);
     ImGui::Separator();
 
+    // Helper functions to display common structures:
+    // - NodeDrawList
+    // - NodeColumns
+    // - NodeWindow
+    // - NodeWindows
+    // - NodeTabBar
     struct Funcs
     {
         static ImRect GetWindowRect(ImGuiWindow* window, int rect_type)
@@ -9997,6 +9750,9 @@ void ImGui::ShowMetricsWindow(bool* p_open)
             if (!node_open)
                 return;
 
+            if (window && !window->WasActive)
+                ImGui::Text("(Note: owning Window is inactive: DrawList is not being rendered!)");
+
             int elem_offset = 0;
             for (const ImDrawCmd* pcmd = draw_list->CmdBuffer.begin(); pcmd < draw_list->CmdBuffer.end(); elem_offset += pcmd->ElemCount, pcmd++)
             {
@@ -10060,7 +9816,7 @@ void ImGui::ShowMetricsWindow(bool* p_open)
                 return;
             ImGui::BulletText("Width: %.1f (MinX: %.1f, MaxX: %.1f)", columns->OffMaxX - columns->OffMinX, columns->OffMinX, columns->OffMaxX);
             for (int column_n = 0; column_n < columns->Columns.Size; column_n++)
-                ImGui::BulletText("Column %02d: OffsetNorm %.3f (= %.1f px)", column_n, columns->Columns[column_n].OffsetNorm, OffsetNormToPixels(columns, columns->Columns[column_n].OffsetNorm));
+                ImGui::BulletText("Column %02d: OffsetNorm %.3f (= %.1f px)", column_n, columns->Columns[column_n].OffsetNorm, GetColumnOffsetFromNorm(columns, columns->Columns[column_n].OffsetNorm));
             ImGui::TreePop();
         }
 
@@ -10075,7 +9831,12 @@ void ImGui::ShowMetricsWindow(bool* p_open)
 
         static void NodeWindow(ImGuiWindow* window, const char* label)
         {
-            if (!ImGui::TreeNode(window, "%s '%s', %d @ 0x%p", label, window->Name, window->Active || window->WasActive, window))
+            if (window == NULL)
+            {
+                ImGui::BulletText("%s: NULL", label);
+                return;
+            }
+            if (!ImGui::TreeNode(window, "%s '%s', %d @ 0x%p", label, window->Name, (window->Active || window->WasActive), window))
                 return;
             ImGuiWindowFlags flags = window->Flags;
             NodeDrawList(window, window->DrawList, "DrawList");
@@ -10129,8 +9890,6 @@ void ImGui::ShowMetricsWindow(bool* p_open)
         }
     };
 
-    // Access private state, we are going to display the draw lists from last frame
-    ImGuiContext& g = *GImGui;
     Funcs::NodeWindows(g.Windows, "Windows");
     if (ImGui::TreeNode("DrawList", "Active DrawLists (%d)", g.DrawDataBuilder.Layers[0].Size))
     {
@@ -10156,6 +9915,20 @@ void ImGui::ShowMetricsWindow(bool* p_open)
         ImGui::TreePop();
     }
 
+#if 0
+    if (ImGui::TreeNode("Docking"))
+    {
+        ImGui::TreePop();
+    }
+#endif
+
+#if 0
+    if (ImGui::TreeNode("Tables", "Tables (%d)", g.Tables.Data.Size))
+    {
+        ImGui::TreePop();
+    }
+#endif
+
     if (ImGui::TreeNode("Internal state"))
     {
         const char* input_source_names[] = { "None", "Mouse", "Nav", "NavKeyboard", "NavGamepad" }; IM_ASSERT(IM_ARRAYSIZE(input_source_names) == ImGuiInputSource_COUNT);
@@ -10178,6 +9951,10 @@ void ImGui::ShowMetricsWindow(bool* p_open)
 
     if (ImGui::TreeNode("Tools"))
     {
+        // The Item Picker tool is super useful to visually select an item and break into the call-stack of where it was submitted.
+        if (ImGui::Button("Item Picker.."))
+            ImGui::DebugStartItemPicker();
+
         ImGui::Checkbox("Show windows begin order", &show_windows_begin_order);
         ImGui::Checkbox("Show windows rectangles", &show_windows_rects);
         ImGui::SameLine();
@@ -10198,6 +9975,7 @@ void ImGui::ShowMetricsWindow(bool* p_open)
         ImGui::TreePop();
     }
 
+    // Tool: Display windows Rectangles and Begin Order
     if (show_windows_rects || show_windows_begin_order)
     {
         for (int n = 0; n < g.Windows.Size; n++)
@@ -10223,10 +10001,11 @@ void ImGui::ShowMetricsWindow(bool* p_open)
     }
     ImGui::End();
 }
+
 #else
-void ImGui::ShowMetricsWindow(bool*)
-{
-}
+
+void ImGui::ShowMetricsWindow(bool*) { }
+
 #endif
 
 //-----------------------------------------------------------------------------
diff --git a/sources/3rdparty/imgui/imgui.h b/sources/3rdparty/imgui/imgui.h
index 3aa10abf..f5810519 100644
--- a/sources/3rdparty/imgui/imgui.h
+++ b/sources/3rdparty/imgui/imgui.h
@@ -1,4 +1,4 @@
-// dear imgui, v1.72 WIP
+// dear imgui, v1.73 WIP
 // (headers)
 
 // See imgui.cpp file for documentation.
@@ -46,8 +46,8 @@ Index of this file:
 
 // Version
 // (Integer encoded as XYYZZ for use in #if preprocessor conditionals. Work in progress versions typically starts at XYY99 then bounce up to XYY00, XYY01 etc. when release tagging happens)
-#define IMGUI_VERSION               "1.72 WIP"
-#define IMGUI_VERSION_NUM           17101
+#define IMGUI_VERSION               "1.73 WIP"
+#define IMGUI_VERSION_NUM           17203
 #define IMGUI_CHECKVERSION()        ImGui::DebugCheckVersionAndDataLayout(IMGUI_VERSION, sizeof(ImGuiIO), sizeof(ImGuiStyle), sizeof(ImVec2), sizeof(ImVec4), sizeof(ImDrawVert), sizeof(ImDrawIdx))
 
 // Define attributes of all API symbols declarations (e.g. for DLL under Windows)
@@ -138,7 +138,6 @@ typedef int ImDrawListFlags;        // -> enum ImDrawListFlags_      // Flags: f
 typedef int ImFontAtlasFlags;       // -> enum ImFontAtlasFlags_     // Flags: for ImFontAtlas
 typedef int ImGuiBackendFlags;      // -> enum ImGuiBackendFlags_    // Flags: for io.BackendFlags
 typedef int ImGuiColorEditFlags;    // -> enum ImGuiColorEditFlags_  // Flags: for ColorEdit4(), ColorPicker4() etc.
-typedef int ImGuiColumnsFlags;      // -> enum ImGuiColumnsFlags_    // Flags: for Columns(), BeginColumns()
 typedef int ImGuiConfigFlags;       // -> enum ImGuiConfigFlags_     // Flags: for io.ConfigFlags
 typedef int ImGuiComboFlags;        // -> enum ImGuiComboFlags_      // Flags: for BeginCombo()
 typedef int ImGuiDragDropFlags;     // -> enum ImGuiDragDropFlags_   // Flags: for BeginDragDropSource(), AcceptDragDropPayload()
@@ -281,7 +280,7 @@ namespace ImGui
     IMGUI_API void          SetWindowSize(const ImVec2& size, ImGuiCond cond = 0);                      // (not recommended) set current window size - call within Begin()/End(). set to ImVec2(0,0) to force an auto-fit. prefer using SetNextWindowSize(), as this may incur tearing and minor side-effects.
     IMGUI_API void          SetWindowCollapsed(bool collapsed, ImGuiCond cond = 0);                     // (not recommended) set current window collapsed state. prefer using SetNextWindowCollapsed().
     IMGUI_API void          SetWindowFocus();                                                           // (not recommended) set current window to be focused / top-most. prefer using SetNextWindowFocus().
-    IMGUI_API void          SetWindowFontScale(float scale);                                            // set font scale. Adjust IO.FontGlobalScale if you want to scale all windows
+    IMGUI_API void          SetWindowFontScale(float scale);                                            // set font scale. Adjust IO.FontGlobalScale if you want to scale all windows. This is an old API! For correct scaling, prefer to reload font + rebuild ImFontAtlas + call style.ScaleAllSizes().
     IMGUI_API void          SetWindowPos(const char* name, const ImVec2& pos, ImGuiCond cond = 0);      // set named window position.
     IMGUI_API void          SetWindowSize(const char* name, const ImVec2& size, ImGuiCond cond = 0);    // set named window size. set axis to 0.0f to force an auto-fit on this axis.
     IMGUI_API void          SetWindowCollapsed(const char* name, bool collapsed, ImGuiCond cond = 0);   // set named window collapsed state
@@ -328,7 +327,7 @@ namespace ImGui
     IMGUI_API void          PushItemWidth(float item_width);                                // set width of items for common large "item+label" widgets. >0.0f: width in pixels, <0.0f align xx pixels to the right of window (so -1.0f always align width to the right side). 0.0f = default to ~2/3 of windows width, 
     IMGUI_API void          PopItemWidth();
     IMGUI_API void          SetNextItemWidth(float item_width);                             // set width of the _next_ common large "item+label" widget. >0.0f: width in pixels, <0.0f align xx pixels to the right of window (so -1.0f always align width to the right side)
-    IMGUI_API float         CalcItemWidth();                                                // width of item given pushed settings and current cursor position
+    IMGUI_API float         CalcItemWidth();                                                // width of item given pushed settings and current cursor position. NOT necessarily the width of last item unlike most 'Item' functions.
     IMGUI_API void          PushTextWrapPos(float wrap_local_pos_x = 0.0f);                 // word-wrapping for Text*() commands. < 0.0f: no wrapping; 0.0f: wrap to end of window (or column); > 0.0f: wrap at 'wrap_pos_x' position in window local space
     IMGUI_API void          PopTextWrapPos();
     IMGUI_API void          PushAllowKeyboardFocus(bool allow_keyboard_focus);              // allow focusing using TAB/Shift-TAB, enabled by default but you can disable it for certain widgets
@@ -497,7 +496,6 @@ namespace ImGui
     IMGUI_API void          TreePush(const char* str_id);                                       // ~ Indent()+PushId(). Already called by TreeNode() when returning true, but you can call TreePush/TreePop yourself if desired.
     IMGUI_API void          TreePush(const void* ptr_id = NULL);                                // "
     IMGUI_API void          TreePop();                                                          // ~ Unindent()+PopId()
-    IMGUI_API void          TreeAdvanceToLabelPos();                                            // advance cursor x position by GetTreeNodeToLabelSpacing()
     IMGUI_API float         GetTreeNodeToLabelSpacing();                                        // horizontal distance preceding label when using TreeNode*() or Bullet() == (g.FontSize + style.FramePadding.x*2) for a regular unframed TreeNode
     IMGUI_API bool          CollapsingHeader(const char* label, ImGuiTreeNodeFlags flags = 0);  // if returning 'true' the header is open. doesn't indent nor push on ID stack. user doesn't have to call TreePop().
     IMGUI_API bool          CollapsingHeader(const char* label, bool* p_open, ImGuiTreeNodeFlags flags = 0); // when 'p_open' isn't NULL, display an additional small close button on upper right of the header
@@ -943,6 +941,7 @@ enum ImGuiKey_
     ImGuiKey_Space,
     ImGuiKey_Enter,
     ImGuiKey_Escape,
+    ImGuiKey_KeyPadEnter,
     ImGuiKey_A,         // for text edit CTRL+A: select all
     ImGuiKey_C,         // for text edit CTRL+C: copy
     ImGuiKey_V,         // for text edit CTRL+V: paste
@@ -1041,7 +1040,7 @@ enum ImGuiCol_
     ImGuiCol_Button,
     ImGuiCol_ButtonHovered,
     ImGuiCol_ButtonActive,
-    ImGuiCol_Header,
+    ImGuiCol_Header,                // Header* colors are used for CollapsingHeader, TreeNode, Selectable, MenuItem
     ImGuiCol_HeaderHovered,
     ImGuiCol_HeaderActive,
     ImGuiCol_Separator,
@@ -1303,6 +1302,7 @@ struct ImGuiStyle
     float       GrabRounding;               // Radius of grabs corners rounding. Set to 0.0f to have rectangular slider grabs.
     float       TabRounding;                // Radius of upper corners of a tab. Set to 0.0f to have rectangular tabs.
     float       TabBorderSize;              // Thickness of border around tabs.
+    ImGuiDir    ColorButtonPosition;        // Side of the color button in the ColorEdit4 widget (left/right). Defaults to ImGuiDir_Right.
     ImVec2      ButtonTextAlign;            // Alignment of button text when button is larger than text. Defaults to (0.5f, 0.5f) (centered).
     ImVec2      SelectableTextAlign;        // Alignment of selectable text when selectable is larger than text. Defaults to (0.0f, 0.0f) (top-left aligned).
     ImVec2      DisplayWindowPadding;       // Window position are clamped to be visible within the display area by at least this amount. Only applies to regular windows.
@@ -1532,8 +1532,10 @@ struct ImGuiPayload
 #ifndef IMGUI_DISABLE_OBSOLETE_FUNCTIONS
 namespace ImGui
 {
+    // OBSOLETED in 1.72 (from July 2019)
+    static inline void  TreeAdvanceToLabelPos()               { SetCursorPosX(GetCursorPosX() + GetTreeNodeToLabelSpacing()); }
     // OBSOLETED in 1.71 (from June 2019)
-    static inline void SetNextTreeNodeOpen(bool open, ImGuiCond cond = 0)   { SetNextItemOpen(open, cond); }
+    static inline void  SetNextTreeNodeOpen(bool open, ImGuiCond cond = 0) { SetNextItemOpen(open, cond); }
     // OBSOLETED in 1.70 (from May 2019)
     static inline float GetContentRegionAvailWidth()          { return GetContentRegionAvail().x; }
     // OBSOLETED in 1.69 (from Mar 2019)
@@ -1611,7 +1613,7 @@ struct ImGuiTextFilter
 struct ImGuiTextBuffer
 {
     ImVector<char>      Buf;
-    static char         EmptyString[1];
+    IMGUI_API static char EmptyString[1];
 
     ImGuiTextBuffer()   { }
     inline char         operator[](int i)       { IM_ASSERT(Buf.Data != NULL); return Buf.Data[i]; }
@@ -1835,6 +1837,7 @@ struct ImDrawListSplitter
 
 enum ImDrawCornerFlags_
 {
+    ImDrawCornerFlags_None      = 0,
     ImDrawCornerFlags_TopLeft   = 1 << 0, // 0x1
     ImDrawCornerFlags_TopRight  = 1 << 1, // 0x2
     ImDrawCornerFlags_BotLeft   = 1 << 2, // 0x4
@@ -1895,8 +1898,8 @@ struct ImDrawList
 
     // Primitives
     IMGUI_API void  AddLine(const ImVec2& a, const ImVec2& b, ImU32 col, float thickness = 1.0f);
-    IMGUI_API void  AddRect(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding = 0.0f, int rounding_corners_flags = ImDrawCornerFlags_All, float thickness = 1.0f);   // a: upper-left, b: lower-right (== upper-left + size), rounding_corners_flags: 4-bits corresponding to which corner to round
-    IMGUI_API void  AddRectFilled(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding = 0.0f, int rounding_corners_flags = ImDrawCornerFlags_All);                     // a: upper-left, b: lower-right (== upper-left + size)
+    IMGUI_API void  AddRect(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding = 0.0f, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All, float thickness = 1.0f);   // a: upper-left, b: lower-right (== upper-left + size), rounding_corners_flags: 4-bits corresponding to which corner to round
+    IMGUI_API void  AddRectFilled(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding = 0.0f, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All);                     // a: upper-left, b: lower-right (== upper-left + size)
     IMGUI_API void  AddRectFilledMultiColor(const ImVec2& a, const ImVec2& b, ImU32 col_upr_left, ImU32 col_upr_right, ImU32 col_bot_right, ImU32 col_bot_left);
     IMGUI_API void  AddQuad(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, ImU32 col, float thickness = 1.0f);
     IMGUI_API void  AddQuadFilled(const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, ImU32 col);
@@ -1908,7 +1911,7 @@ struct ImDrawList
     IMGUI_API void  AddText(const ImFont* font, float font_size, const ImVec2& pos, ImU32 col, const char* text_begin, const char* text_end = NULL, float wrap_width = 0.0f, const ImVec4* cpu_fine_clip_rect = NULL);
     IMGUI_API void  AddImage(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a = ImVec2(0,0), const ImVec2& uv_b = ImVec2(1,1), ImU32 col = IM_COL32_WHITE);
     IMGUI_API void  AddImageQuad(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& c, const ImVec2& d, const ImVec2& uv_a = ImVec2(0,0), const ImVec2& uv_b = ImVec2(1,0), const ImVec2& uv_c = ImVec2(1,1), const ImVec2& uv_d = ImVec2(0,1), ImU32 col = IM_COL32_WHITE);
-    IMGUI_API void  AddImageRounded(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, ImU32 col, float rounding, int rounding_corners = ImDrawCornerFlags_All);
+    IMGUI_API void  AddImageRounded(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All);
     IMGUI_API void  AddPolyline(const ImVec2* points, int num_points, ImU32 col, bool closed, float thickness);
     IMGUI_API void  AddConvexPolyFilled(const ImVec2* points, int num_points, ImU32 col); // Note: Anti-aliased filling requires points to be in clockwise order.
     IMGUI_API void  AddBezierCurve(const ImVec2& pos0, const ImVec2& cp0, const ImVec2& cp1, const ImVec2& pos1, ImU32 col, float thickness, int num_segments = 0);
@@ -1922,7 +1925,7 @@ struct ImDrawList
     IMGUI_API void  PathArcTo(const ImVec2& centre, float radius, float a_min, float a_max, int num_segments = 10);
     IMGUI_API void  PathArcToFast(const ImVec2& centre, float radius, int a_min_of_12, int a_max_of_12);                                            // Use precomputed angles for a 12 steps circle
     IMGUI_API void  PathBezierCurveTo(const ImVec2& p1, const ImVec2& p2, const ImVec2& p3, int num_segments = 0);
-    IMGUI_API void  PathRect(const ImVec2& rect_min, const ImVec2& rect_max, float rounding = 0.0f, int rounding_corners_flags = ImDrawCornerFlags_All);
+    IMGUI_API void  PathRect(const ImVec2& rect_min, const ImVec2& rect_max, float rounding = 0.0f, ImDrawCornerFlags rounding_corners = ImDrawCornerFlags_All);
 
     // Advanced
     IMGUI_API void  AddCallback(ImDrawCallback callback, void* callback_data);  // Your rendering function must check for 'UserCallback' in ImDrawCmd and call the function instead of rendering triangles.
diff --git a/sources/3rdparty/imgui/imgui_demo.cpp b/sources/3rdparty/imgui/imgui_demo.cpp
index a8d72f2e..5a4259fd 100644
--- a/sources/3rdparty/imgui/imgui_demo.cpp
+++ b/sources/3rdparty/imgui/imgui_demo.cpp
@@ -1,4 +1,4 @@
-// dear imgui, v1.72 WIP
+// dear imgui, v1.73 WIP
 // (demo code)
 
 // Message to the person tempted to delete this file when integrating Dear ImGui into their code base:
@@ -539,8 +539,19 @@ static void ShowDemoWindowWidgets()
             static float f1=0.123f, f2=0.0f;
             ImGui::SliderFloat("slider float", &f1, 0.0f, 1.0f, "ratio = %.3f");
             ImGui::SliderFloat("slider float (curve)", &f2, -10.0f, 10.0f, "%.4f", 2.0f);
+
             static float angle = 0.0f;
             ImGui::SliderAngle("slider angle", &angle);
+
+            // Using the format string to display a name instead of an integer.
+            // Here we completely omit '%d' from the format string, so it'll only display a name.
+            // This technique can also be used with DragInt().
+            enum Element { Element_Fire, Element_Earth, Element_Air, Element_Water, Element_COUNT };
+            const char* element_names[Element_COUNT] = { "Fire", "Earth", "Air", "Water" };
+            static int current_element = Element_Fire;
+            const char* current_element_name = (current_element >= 0 && current_element < Element_COUNT) ? element_names[current_element] : "Unknown";
+            ImGui::SliderInt("slider enum", &current_element, 0, Element_COUNT - 1, current_element_name);
+            ImGui::SameLine(); HelpMarker("Using the format string parameter to display a name instead of the underlying integer.");
         }
 
         {
@@ -628,7 +639,7 @@ static void ShowDemoWindowWidgets()
                 {
                     // Items 3..5 are Tree Leaves
                     // The only reason we use TreeNode at all is to allow selection of the leaf.
-                    // Otherwise we can use BulletText() or TreeAdvanceToLabelPos()+Text().
+                    // Otherwise we can use BulletText() or advance the cursor by GetTreeNodeToLabelSpacing() and call Text().
                     node_flags |= ImGuiTreeNodeFlags_Leaf | ImGuiTreeNodeFlags_NoTreePushOnOpen; // ImGuiTreeNodeFlags_Bullet
                     ImGui::TreeNodeEx((void*)(intptr_t)i, node_flags, "Selectable Leaf %d", i);
                     if (ImGui::IsItemClicked())
@@ -1112,7 +1123,7 @@ static void ShowDemoWindowWidgets()
         ImGui::Checkbox("With Drag and Drop", &drag_and_drop);
         ImGui::Checkbox("With Options Menu", &options_menu); ImGui::SameLine(); HelpMarker("Right-click on the individual color widget to show options.");
         ImGui::Checkbox("With HDR", &hdr); ImGui::SameLine(); HelpMarker("Currently all this does is to lift the 0..1 limits on dragging widgets.");
-        int misc_flags = (hdr ? ImGuiColorEditFlags_HDR : 0) | (drag_and_drop ? 0 : ImGuiColorEditFlags_NoDragDrop) | (alpha_half_preview ? ImGuiColorEditFlags_AlphaPreviewHalf : (alpha_preview ? ImGuiColorEditFlags_AlphaPreview : 0)) | (options_menu ? 0 : ImGuiColorEditFlags_NoOptions);
+        ImGuiColorEditFlags misc_flags = (hdr ? ImGuiColorEditFlags_HDR : 0) | (drag_and_drop ? 0 : ImGuiColorEditFlags_NoDragDrop) | (alpha_half_preview ? ImGuiColorEditFlags_AlphaPreviewHalf : (alpha_preview ? ImGuiColorEditFlags_AlphaPreview : 0)) | (options_menu ? 0 : ImGuiColorEditFlags_NoOptions);
 
         ImGui::Text("Color widget:");
         ImGui::SameLine(); HelpMarker("Click on the colored square to open a color picker.\nCTRL+click on individual component to input value.\n");
@@ -1145,7 +1156,7 @@ static void ShowDemoWindowWidgets()
 
         static ImVec4 backup_color;
         bool open_popup = ImGui::ColorButton("MyColor##3b", color, misc_flags);
-        ImGui::SameLine();
+        ImGui::SameLine(0, ImGui::GetStyle().ItemInnerSpacing.x);
         open_popup |= ImGui::Button("Palette");
         if (open_popup)
         {
@@ -1545,28 +1556,22 @@ static void ShowDemoWindowWidgets()
         static bool b = false;
         static float col4f[4] = { 1.0f, 0.5, 0.0f, 1.0f };
         static char str[16] = {};
-        ImGui::RadioButton("Text", &item_type, 0);
-        ImGui::RadioButton("Button", &item_type, 1);
-        ImGui::RadioButton("Checkbox", &item_type, 2);
-        ImGui::RadioButton("SliderFloat", &item_type, 3);
-        ImGui::RadioButton("InputText", &item_type, 4);
-        ImGui::RadioButton("InputFloat3", &item_type, 5);
-        ImGui::RadioButton("ColorEdit4", &item_type, 6);
-        ImGui::RadioButton("MenuItem", &item_type, 7);
-        ImGui::RadioButton("TreeNode (w/ double-click)", &item_type, 8);
-        ImGui::RadioButton("ListBox", &item_type, 9);
-        ImGui::Separator();
+        ImGui::Combo("Item Type", &item_type, "Text\0Button\0Button (w/ repeat)\0Checkbox\0SliderFloat\0InputText\0InputFloat\0InputFloat3\0ColorEdit4\0MenuItem\0TreeNode (w/ double-click)\0ListBox\0");
+        ImGui::SameLine();
+        HelpMarker("Testing how various types of items are interacting with the IsItemXXX functions.");
         bool ret = false;
         if (item_type == 0) { ImGui::Text("ITEM: Text"); }                                              // Testing text items with no identifier/interaction
         if (item_type == 1) { ret = ImGui::Button("ITEM: Button"); }                                    // Testing button
-        if (item_type == 2) { ret = ImGui::Checkbox("ITEM: Checkbox", &b); }                            // Testing checkbox
-        if (item_type == 3) { ret = ImGui::SliderFloat("ITEM: SliderFloat", &col4f[0], 0.0f, 1.0f); }   // Testing basic item
-        if (item_type == 4) { ret = ImGui::InputText("ITEM: InputText", &str[0], IM_ARRAYSIZE(str)); }  // Testing input text (which handles tabbing)
-        if (item_type == 5) { ret = ImGui::InputFloat3("ITEM: InputFloat3", col4f); }                   // Testing multi-component items (IsItemXXX flags are reported merged)
-        if (item_type == 6) { ret = ImGui::ColorEdit4("ITEM: ColorEdit4", col4f); }                     // Testing multi-component items (IsItemXXX flags are reported merged)
-        if (item_type == 7) { ret = ImGui::MenuItem("ITEM: MenuItem"); }                                // Testing menu item (they use ImGuiButtonFlags_PressedOnRelease button policy)
-        if (item_type == 8) { ret = ImGui::TreeNodeEx("ITEM: TreeNode w/ ImGuiTreeNodeFlags_OpenOnDoubleClick", ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_NoTreePushOnOpen); } // Testing tree node with ImGuiButtonFlags_PressedOnDoubleClick button policy.
-        if (item_type == 9) { const char* items[] = { "Apple", "Banana", "Cherry", "Kiwi" }; static int current = 1; ret = ImGui::ListBox("ITEM: ListBox", &current, items, IM_ARRAYSIZE(items), IM_ARRAYSIZE(items)); }
+        if (item_type == 2) { ImGui::PushButtonRepeat(true);  ret = ImGui::Button("ITEM: Button"); ImGui::PopButtonRepeat(); } // Testing button (with repeater)
+        if (item_type == 3) { ret = ImGui::Checkbox("ITEM: Checkbox", &b); }                            // Testing checkbox
+        if (item_type == 4) { ret = ImGui::SliderFloat("ITEM: SliderFloat", &col4f[0], 0.0f, 1.0f); }   // Testing basic item
+        if (item_type == 5) { ret = ImGui::InputText("ITEM: InputText", &str[0], IM_ARRAYSIZE(str)); }  // Testing input text (which handles tabbing)
+        if (item_type == 6) { ret = ImGui::InputFloat("ITEM: InputFloat", col4f, 1.0f); }               // Testing +/- buttons on scalar input
+        if (item_type == 7) { ret = ImGui::InputFloat3("ITEM: InputFloat3", col4f); }                   // Testing multi-component items (IsItemXXX flags are reported merged)
+        if (item_type == 8) { ret = ImGui::ColorEdit4("ITEM: ColorEdit4", col4f); }                     // Testing multi-component items (IsItemXXX flags are reported merged)
+        if (item_type == 9) { ret = ImGui::MenuItem("ITEM: MenuItem"); }                                // Testing menu item (they use ImGuiButtonFlags_PressedOnRelease button policy)
+        if (item_type == 10){ ret = ImGui::TreeNodeEx("ITEM: TreeNode w/ ImGuiTreeNodeFlags_OpenOnDoubleClick", ImGuiTreeNodeFlags_OpenOnDoubleClick | ImGuiTreeNodeFlags_NoTreePushOnOpen); } // Testing tree node with ImGuiButtonFlags_PressedOnDoubleClick button policy.
+        if (item_type == 11){ const char* items[] = { "Apple", "Banana", "Cherry", "Kiwi" }; static int current = 1; ret = ImGui::ListBox("ITEM: ListBox", &current, items, IM_ARRAYSIZE(items), IM_ARRAYSIZE(items)); }
         ImGui::BulletText(
             "Return value = %d\n"
             "IsItemFocused() = %d\n"
@@ -1788,9 +1793,9 @@ static void ShowDemoWindowLayout()
         ImGui::Text("SetNextItemWidth/PushItemWidth(-1)");
         ImGui::SameLine(); HelpMarker("Align to right edge");
         ImGui::PushItemWidth(-1);
-        ImGui::DragFloat("float##5a", &f);
-        ImGui::DragFloat("float##5b", &f);
-        ImGui::DragFloat("float##5c", &f);
+        ImGui::DragFloat("##float5a", &f);
+        ImGui::DragFloat("##float5b", &f);
+        ImGui::DragFloat("##float5c", &f);
         ImGui::PopItemWidth();
 
         ImGui::TreePop();
@@ -2059,23 +2064,29 @@ static void ShowDemoWindowLayout()
         // Vertical scroll functions
         HelpMarker("Use SetScrollHereY() or SetScrollFromPosY() to scroll to a given vertical position.");
 
-        static bool track = true;
         static int track_item = 50;
+        static bool enable_track = true;
+        static bool enable_extra_decorations = false;
         static float scroll_to_off_px = 0.0f;
         static float scroll_to_pos_px = 200.0f;
-        ImGui::Checkbox("Track", &track);
+
+        ImGui::Checkbox("Decoration", &enable_extra_decorations);
+        ImGui::SameLine();
+        HelpMarker("We expose this for testing because scrolling sometimes had issues with window decoration such as menu-bars.");
+
+        ImGui::Checkbox("Track", &enable_track);
         ImGui::PushItemWidth(100);
-        ImGui::SameLine(140); track |= ImGui::DragInt("##item", &track_item, 0.25f, 0, 99, "Item = %d");
+        ImGui::SameLine(140); enable_track |= ImGui::DragInt("##item", &track_item, 0.25f, 0, 99, "Item = %d");
 
         bool scroll_to_off = ImGui::Button("Scroll Offset");
         ImGui::SameLine(140); scroll_to_off |= ImGui::DragFloat("##off", &scroll_to_off_px, 1.00f, 0, 9999, "+%.0f px");
 
         bool scroll_to_pos = ImGui::Button("Scroll To Pos");
-        ImGui::SameLine(140); scroll_to_pos |= ImGui::DragFloat("##pos", &scroll_to_pos_px, 1.00f, 0, 9999, "X/Y = %.0f px");
-
+        ImGui::SameLine(140); scroll_to_pos |= ImGui::DragFloat("##pos", &scroll_to_pos_px, 1.00f, -10, 9999, "X/Y = %.0f px");
         ImGui::PopItemWidth();
+
         if (scroll_to_off || scroll_to_pos)
-            track = false;
+            enable_track = false;
 
         ImGuiStyle& style = ImGui::GetStyle();
         float child_w = (ImGui::GetContentRegionAvail().x - 4 * style.ItemSpacing.x) / 5;
@@ -2089,14 +2100,20 @@ static void ShowDemoWindowLayout()
             const char* names[] = { "Top", "25%", "Center", "75%", "Bottom" };
             ImGui::TextUnformatted(names[i]);
 
-            ImGui::BeginChild(ImGui::GetID((void*)(intptr_t)i), ImVec2(child_w, 200.0f), true, ImGuiWindowFlags_None);
+            ImGuiWindowFlags child_flags = enable_extra_decorations ? ImGuiWindowFlags_MenuBar : 0;
+            ImGui::BeginChild(ImGui::GetID((void*)(intptr_t)i), ImVec2(child_w, 200.0f), true, child_flags);
+            if (ImGui::BeginMenuBar())
+            {
+                ImGui::TextUnformatted("abc");
+                ImGui::EndMenuBar();
+            }
             if (scroll_to_off)
                 ImGui::SetScrollY(scroll_to_off_px);
             if (scroll_to_pos)
                 ImGui::SetScrollFromPosY(ImGui::GetCursorStartPos().y + scroll_to_pos_px, i * 0.25f);
             for (int item = 0; item < 100; item++)
             {
-                if (track && item == track_item)
+                if (enable_track && item == track_item)
                 {
                     ImGui::TextColored(ImVec4(1,1,0,1), "Item %d", item);
                     ImGui::SetScrollHereY(i * 0.25f); // 0.0f:top, 0.5f:center, 1.0f:bottom
@@ -2121,14 +2138,15 @@ static void ShowDemoWindowLayout()
         for (int i = 0; i < 5; i++)
         {
             float child_height = ImGui::GetTextLineHeight() + style.ScrollbarSize + style.WindowPadding.y * 2.0f;
-            ImGui::BeginChild(ImGui::GetID((void*)(intptr_t)i), ImVec2(-100, child_height), true, ImGuiWindowFlags_HorizontalScrollbar);
+            ImGuiWindowFlags child_flags = ImGuiWindowFlags_HorizontalScrollbar | (enable_extra_decorations ? ImGuiWindowFlags_AlwaysVerticalScrollbar : 0);
+            ImGui::BeginChild(ImGui::GetID((void*)(intptr_t)i), ImVec2(-100, child_height), true, child_flags);
             if (scroll_to_off)
                 ImGui::SetScrollX(scroll_to_off_px);
             if (scroll_to_pos)
                 ImGui::SetScrollFromPosX(ImGui::GetCursorStartPos().x + scroll_to_pos_px, i * 0.25f);
             for (int item = 0; item < 100; item++)
             {
-                if (track && item == track_item)
+                if (enable_track && item == track_item)
                 {
                     ImGui::TextColored(ImVec4(1, 1, 0, 1), "Item %d", item);
                     ImGui::SetScrollHereX(i * 0.25f); // 0.0f:left, 0.5f:center, 1.0f:right
@@ -2596,16 +2614,24 @@ static void ShowDemoWindowColumns()
         // NB: Future columns API should allow automatic horizontal borders.
         static bool h_borders = true;
         static bool v_borders = true;
+        static int columns_count = 4;
+        const int lines_count = 3;
+        ImGui::SetNextItemWidth(ImGui::GetFontSize() * 8);
+        ImGui::DragInt("##columns_count", &columns_count, 0.1f, 2, 10, "%d columns");
+        if (columns_count < 2)
+            columns_count = 2;
+        ImGui::SameLine();
         ImGui::Checkbox("horizontal", &h_borders);
         ImGui::SameLine();
         ImGui::Checkbox("vertical", &v_borders);
-        ImGui::Columns(4, NULL, v_borders);
-        for (int i = 0; i < 4 * 3; i++)
+        ImGui::Columns(columns_count, NULL, v_borders);
+        for (int i = 0; i < columns_count * lines_count; i++)
         {
             if (h_borders && ImGui::GetColumnIndex() == 0)
                 ImGui::Separator();
             ImGui::Text("%c%c%c", 'a' + i, 'a' + i, 'a' + i);
             ImGui::Text("Width %.2f", ImGui::GetColumnWidth());
+            ImGui::Text("Avail %.2f", ImGui::GetContentRegionAvail().x);
             ImGui::Text("Offset %.2f", ImGui::GetColumnOffset());
             ImGui::Text("Long text that is likely to clip");
             ImGui::Button("Button", ImVec2(-FLT_MIN, 0.0f));
@@ -3150,6 +3176,7 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref)
             ImGui::Text("Alignment");
             ImGui::SliderFloat2("WindowTitleAlign", (float*)&style.WindowTitleAlign, 0.0f, 1.0f, "%.2f");
             ImGui::Combo("WindowMenuButtonPosition", (int*)&style.WindowMenuButtonPosition, "Left\0Right\0");
+            ImGui::Combo("ColorButtonPosition", (int*)&style.ColorButtonPosition, "Left\0Right\0");
             ImGui::SliderFloat2("ButtonTextAlign", (float*)&style.ButtonTextAlign, 0.0f, 1.0f, "%.2f"); ImGui::SameLine(); HelpMarker("Alignment applies when a button is larger than its text content.");
             ImGui::SliderFloat2("SelectableTextAlign", (float*)&style.SelectableTextAlign, 0.0f, 1.0f, "%.2f"); ImGui::SameLine(); HelpMarker("Alignment applies when a selectable is larger than its text content.");
             ImGui::Text("Safe Area Padding"); ImGui::SameLine(); HelpMarker("Adjust if you cannot see the edges of your screen (e.g. on a TV where scaling has not been configured).");
@@ -3293,8 +3320,9 @@ void ImGui::ShowStyleEditor(ImGuiStyle* ref)
                 ImGui::TreePop();
             }
 
+            HelpMarker("Those are old settings provided for convenience.\nHowever, the _correct_ way of scaling your UI is currently to reload your font at the designed size, rebuild the font atlas, and call style.ScaleAllSizes() on a reference ImGuiStyle structure.");
             static float window_scale = 1.0f;
-            if (ImGui::DragFloat("this window scale", &window_scale, 0.005f, 0.3f, 2.0f, "%.2f"))   // scale only this window
+            if (ImGui::DragFloat("window scale", &window_scale, 0.005f, 0.3f, 2.0f, "%.2f"))   // scale only this window
                 ImGui::SetWindowFontScale(window_scale);
             ImGui::DragFloat("global scale", &io.FontGlobalScale, 0.005f, 0.3f, 2.0f, "%.2f");      // scale everything
             ImGui::PopItemWidth();
@@ -3445,7 +3473,7 @@ struct ExampleAppConsole
         Commands.push_back("CLEAR");
         Commands.push_back("CLASSIFY");  // "classify" is only here to provide an example of "C"+[tab] completing to "CL" and displaying matches.
         AutoScroll = true;
-        ScrollToBottom = true;
+        ScrollToBottom = false;
         AddLog("Welcome to Dear ImGui!");
     }
     ~ExampleAppConsole()
@@ -3466,7 +3494,6 @@ struct ExampleAppConsole
         for (int i = 0; i < Items.Size; i++)
             free(Items[i]);
         Items.clear();
-        ScrollToBottom = true;
     }
 
     void    AddLog(const char* fmt, ...) IM_FMTARGS(2)
@@ -3479,8 +3506,6 @@ struct ExampleAppConsole
         buf[IM_ARRAYSIZE(buf)-1] = 0;
         va_end(args);
         Items.push_back(Strdup(buf));
-        if (AutoScroll)
-            ScrollToBottom = true;
     }
 
     void    Draw(const char* title, bool* p_open)
@@ -3509,8 +3534,7 @@ struct ExampleAppConsole
         if (ImGui::SmallButton("Add Dummy Text"))  { AddLog("%d some text", Items.Size); AddLog("some more text"); AddLog("display very important message here!"); } ImGui::SameLine();
         if (ImGui::SmallButton("Add Dummy Error")) { AddLog("[error] something went wrong"); } ImGui::SameLine();
         if (ImGui::SmallButton("Clear")) { ClearLog(); } ImGui::SameLine();
-        bool copy_to_clipboard = ImGui::SmallButton("Copy"); ImGui::SameLine();
-        if (ImGui::SmallButton("Scroll to bottom")) ScrollToBottom = true;
+        bool copy_to_clipboard = ImGui::SmallButton("Copy");
         //static float t = 0.0f; if (ImGui::GetTime() - t > 0.02f) { t = ImGui::GetTime(); AddLog("Spam %f", t); }
 
         ImGui::Separator();
@@ -3518,9 +3542,7 @@ struct ExampleAppConsole
         // Options menu
         if (ImGui::BeginPopup("Options"))
         {
-            if (ImGui::Checkbox("Auto-scroll", &AutoScroll))
-                if (AutoScroll)
-                    ScrollToBottom = true;
+            ImGui::Checkbox("Auto-scroll", &AutoScroll);
             ImGui::EndPopup();
         }
 
@@ -3569,9 +3591,11 @@ struct ExampleAppConsole
         }
         if (copy_to_clipboard)
             ImGui::LogFinish();
-        if (ScrollToBottom)
+
+        if (ScrollToBottom || (AutoScroll && ImGui::GetScrollY() >= ImGui::GetScrollMaxY()))
             ImGui::SetScrollHereY(1.0f);
         ScrollToBottom = false;
+
         ImGui::PopStyleVar();
         ImGui::EndChild();
         ImGui::Separator();
@@ -3763,13 +3787,11 @@ struct ExampleAppLog
     ImGuiTextBuffer     Buf;
     ImGuiTextFilter     Filter;
     ImVector<int>       LineOffsets;        // Index to lines offset. We maintain this with AddLog() calls, allowing us to have a random access on lines
-    bool                AutoScroll;
-    bool                ScrollToBottom;
+    bool                AutoScroll;     // Keep scrolling if already at the bottom
 
     ExampleAppLog()
     {
         AutoScroll = true;
-        ScrollToBottom = false;
         Clear();
     }
 
@@ -3790,8 +3812,6 @@ struct ExampleAppLog
         for (int new_size = Buf.size(); old_size < new_size; old_size++)
             if (Buf[old_size] == '\n')
                 LineOffsets.push_back(old_size + 1);
-        if (AutoScroll)
-            ScrollToBottom = true;
     }
 
     void    Draw(const char* title, bool* p_open = NULL)
@@ -3805,9 +3825,7 @@ struct ExampleAppLog
         // Options menu
         if (ImGui::BeginPopup("Options"))
         {
-            if (ImGui::Checkbox("Auto-scroll", &AutoScroll))
-                if (AutoScroll)
-                    ScrollToBottom = true;
+            ImGui::Checkbox("Auto-scroll", &AutoScroll);
             ImGui::EndPopup();
         }
 
@@ -3872,9 +3890,9 @@ struct ExampleAppLog
         }
         ImGui::PopStyleVar();
 
-        if (ScrollToBottom)
+        if (AutoScroll && ImGui::GetScrollY() >= ImGui::GetScrollMaxY())
             ImGui::SetScrollHereY(1.0f);
-        ScrollToBottom = false;
+
         ImGui::EndChild();
         ImGui::End();
     }
diff --git a/sources/3rdparty/imgui/imgui_draw.cpp b/sources/3rdparty/imgui/imgui_draw.cpp
index e7c5e82e..3e5ca061 100644
--- a/sources/3rdparty/imgui/imgui_draw.cpp
+++ b/sources/3rdparty/imgui/imgui_draw.cpp
@@ -1,4 +1,4 @@
-// dear imgui, v1.72 WIP
+// dear imgui, v1.73 WIP
 // (drawing and font code)
 
 /*
@@ -943,7 +943,7 @@ void ImDrawList::PathBezierCurveTo(const ImVec2& p2, const ImVec2& p3, const ImV
     }
 }
 
-void ImDrawList::PathRect(const ImVec2& a, const ImVec2& b, float rounding, int rounding_corners)
+void ImDrawList::PathRect(const ImVec2& a, const ImVec2& b, float rounding, ImDrawCornerFlags rounding_corners)
 {
     rounding = ImMin(rounding, ImFabs(b.x - a.x) * ( ((rounding_corners & ImDrawCornerFlags_Top)  == ImDrawCornerFlags_Top)  || ((rounding_corners & ImDrawCornerFlags_Bot)   == ImDrawCornerFlags_Bot)   ? 0.5f : 1.0f ) - 1.0f);
     rounding = ImMin(rounding, ImFabs(b.y - a.y) * ( ((rounding_corners & ImDrawCornerFlags_Left) == ImDrawCornerFlags_Left) || ((rounding_corners & ImDrawCornerFlags_Right) == ImDrawCornerFlags_Right) ? 0.5f : 1.0f ) - 1.0f);
@@ -978,24 +978,24 @@ void ImDrawList::AddLine(const ImVec2& a, const ImVec2& b, ImU32 col, float thic
 }
 
 // a: upper-left, b: lower-right. we don't render 1 px sized rectangles properly.
-void ImDrawList::AddRect(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding, int rounding_corners_flags, float thickness)
+void ImDrawList::AddRect(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners, float thickness)
 {
     if ((col & IM_COL32_A_MASK) == 0)
         return;
     if (Flags & ImDrawListFlags_AntiAliasedLines)
-        PathRect(a + ImVec2(0.5f,0.5f), b - ImVec2(0.50f,0.50f), rounding, rounding_corners_flags);
+        PathRect(a + ImVec2(0.5f,0.5f), b - ImVec2(0.50f,0.50f), rounding, rounding_corners);
     else
-        PathRect(a + ImVec2(0.5f,0.5f), b - ImVec2(0.49f,0.49f), rounding, rounding_corners_flags); // Better looking lower-right corner and rounded non-AA shapes.
+        PathRect(a + ImVec2(0.5f,0.5f), b - ImVec2(0.49f,0.49f), rounding, rounding_corners); // Better looking lower-right corner and rounded non-AA shapes.
     PathStroke(col, true, thickness);
 }
 
-void ImDrawList::AddRectFilled(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding, int rounding_corners_flags)
+void ImDrawList::AddRectFilled(const ImVec2& a, const ImVec2& b, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners)
 {
     if ((col & IM_COL32_A_MASK) == 0)
         return;
     if (rounding > 0.0f)
     {
-        PathRect(a, b, rounding, rounding_corners_flags);
+        PathRect(a, b, rounding, rounding_corners);
         PathFillConvex(col);
     }
     else
@@ -1164,7 +1164,7 @@ void ImDrawList::AddImageQuad(ImTextureID user_texture_id, const ImVec2& a, cons
         PopTextureID();
 }
 
-void ImDrawList::AddImageRounded(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, ImU32 col, float rounding, int rounding_corners)
+void ImDrawList::AddImageRounded(ImTextureID user_texture_id, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, ImU32 col, float rounding, ImDrawCornerFlags rounding_corners)
 {
     if ((col & IM_COL32_A_MASK) == 0)
         return;
diff --git a/sources/3rdparty/imgui/imgui_internal.h b/sources/3rdparty/imgui/imgui_internal.h
index 3b96116e..cac70f04 100644
--- a/sources/3rdparty/imgui/imgui_internal.h
+++ b/sources/3rdparty/imgui/imgui_internal.h
@@ -1,4 +1,4 @@
-// dear imgui, v1.72 WIP
+// dear imgui, v1.73 WIP
 // (internal structures/api)
 
 // You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility!
@@ -91,6 +91,7 @@ struct ImGuiWindowSettings;         // Storage for window settings stored in .in
 // Use your programming IDE "Go to definition" facility on the names of the center columns to find the actual flags/enum lists.
 typedef int ImGuiLayoutType;            // -> enum ImGuiLayoutType_         // Enum: Horizontal or vertical
 typedef int ImGuiButtonFlags;           // -> enum ImGuiButtonFlags_        // Flags: for ButtonEx(), ButtonBehavior()
+typedef int ImGuiColumnsFlags;          // -> enum ImGuiColumnsFlags_       // Flags: BeginColumns()
 typedef int ImGuiDragFlags;             // -> enum ImGuiDragFlags_          // Flags: for DragBehavior()
 typedef int ImGuiItemFlags;             // -> enum ImGuiItemFlags_          // Flags: for PushItemFlag()
 typedef int ImGuiItemStatusFlags;       // -> enum ImGuiItemStatusFlags_    // Flags: for DC.LastItemStatusFlags
@@ -140,12 +141,15 @@ extern IMGUI_API ImGuiContext* GImGui;  // Current implicit context pointer
 #define IM_NEWLINE      "\n"
 #endif
 #define IM_TABSIZE      (4)
-
-#define IMGUI_DEBUG_LOG(_FMT,...)       printf("[%05d] " _FMT, GImGui->FrameCount, __VA_ARGS__)
 #define IM_STATIC_ASSERT(_COND)         typedef char static_assertion_##__line__[(_COND)?1:-1]
 #define IM_F32_TO_INT8_UNBOUND(_VAL)    ((int)((_VAL) * 255.0f + ((_VAL)>=0 ? 0.5f : -0.5f)))   // Unsaturated, for display purpose
 #define IM_F32_TO_INT8_SAT(_VAL)        ((int)(ImSaturate(_VAL) * 255.0f + 0.5f))               // Saturated, always output 0..255
 
+// Debug Logging
+#ifndef IMGUI_DEBUG_LOG
+#define IMGUI_DEBUG_LOG(_FMT,...)       printf("[%05d] " _FMT, GImGui->FrameCount, __VA_ARGS__)
+#endif
+
 // Enforce cdecl calling convention for functions called by the standard library, in case compilation settings changed the default to e.g. __vectorcall
 #ifdef _MSC_VER
 #define IMGUI_CDECL __cdecl
@@ -357,7 +361,9 @@ enum ImGuiSelectableFlagsPrivate_
     ImGuiSelectableFlags_PressedOnClick     = 1 << 21,
     ImGuiSelectableFlags_PressedOnRelease   = 1 << 22,
     ImGuiSelectableFlags_DrawFillAvailWidth = 1 << 23,  // FIXME: We may be able to remove this (added in 6251d379 for menus)
-    ImGuiSelectableFlags_AllowItemOverlap   = 1 << 24
+    ImGuiSelectableFlags_AllowItemOverlap   = 1 << 24,
+    ImGuiSelectableFlags_DrawHoveredWhenHeld= 1 << 25,  // Always show active when held, even is not hovered. This concept could probably be renamed/formalized somehow.
+    ImGuiSelectableFlags_SetNavIdOnHover    = 1 << 26
 };
 
 // Extend ImGuiTreeNodeFlags_
@@ -400,7 +406,7 @@ enum ImGuiItemStatusFlags_
     ImGuiItemStatusFlags_Deactivated        = 1 << 5    // Only valid if ImGuiItemStatusFlags_HasDeactivated is set.
 
 #ifdef IMGUI_ENABLE_TEST_ENGINE
-    , // [imgui-test only]
+    , // [imgui_tests only]
     ImGuiItemStatusFlags_Openable           = 1 << 10,  //
     ImGuiItemStatusFlags_Opened             = 1 << 11,  //
     ImGuiItemStatusFlags_Checkable          = 1 << 12,  //
@@ -625,22 +631,23 @@ struct IMGUI_API ImGuiInputTextState
     float                   CursorAnim;             // timer for cursor blink, reset on every user action so the cursor reappears immediately
     bool                    CursorFollow;           // set when we want scrolling to follow the current cursor position (not always!)
     bool                    SelectedAllMouseLock;   // after a double-click to select all, we ignore further mouse drags to update selection
+    ImGuiInputTextFlags     UserFlags;              // Temporarily set while we call user's callback
+    ImGuiInputTextCallback  UserCallback;           // "
+    void*                   UserCallbackData;       // "
 
-    // Temporarily set when active
-    ImGuiInputTextFlags     UserFlags;
-    ImGuiInputTextCallback  UserCallback;
-    void*                   UserCallbackData;
+    ImGuiInputTextState()                   { memset(this, 0, sizeof(*this)); }
+    void        ClearText()                 { CurLenW = CurLenA = 0; TextW[0] = 0; TextA[0] = 0; CursorClamp(); }
+    void        ClearFreeMemory()           { TextW.clear(); TextA.clear(); InitialTextA.clear(); }
+    int         GetUndoAvailCount() const   { return Stb.undostate.undo_point; }
+    int         GetRedoAvailCount() const   { return STB_TEXTEDIT_UNDOSTATECOUNT - Stb.undostate.redo_point; }
+    void        OnKeyPressed(int key);      // Cannot be inline because we call in code in stb_textedit.h implementation
 
-    ImGuiInputTextState()                           { memset(this, 0, sizeof(*this)); }
-    void                ClearFreeMemory()           { TextW.clear(); TextA.clear(); InitialTextA.clear(); }
-    void                CursorAnimReset()           { CursorAnim = -0.30f; }                                   // After a user-input the cursor stays on for a while without blinking
-    void                CursorClamp()               { Stb.cursor = ImMin(Stb.cursor, CurLenW); Stb.select_start = ImMin(Stb.select_start, CurLenW); Stb.select_end = ImMin(Stb.select_end, CurLenW); }
-    bool                HasSelection() const        { return Stb.select_start != Stb.select_end; }
-    void                ClearSelection()            { Stb.select_start = Stb.select_end = Stb.cursor; }
-    void                SelectAll()                 { Stb.select_start = 0; Stb.cursor = Stb.select_end = CurLenW; Stb.has_preferred_x = 0; }
-    int                 GetUndoAvailCount() const   { return Stb.undostate.undo_point; }
-    int                 GetRedoAvailCount() const   { return STB_TEXTEDIT_UNDOSTATECOUNT - Stb.undostate.redo_point; }
-    void                OnKeyPressed(int key);      // Cannot be inline because we call in code in stb_textedit.h implementation
+    // Cursor & Selection
+    void        CursorAnimReset()           { CursorAnim = -0.30f; }                                   // After a user-input the cursor stays on for a while without blinking
+    void        CursorClamp()               { Stb.cursor = ImMin(Stb.cursor, CurLenW); Stb.select_start = ImMin(Stb.select_start, CurLenW); Stb.select_end = ImMin(Stb.select_end, CurLenW); }
+    bool        HasSelection() const        { return Stb.select_start != Stb.select_end; }
+    void        ClearSelection()            { Stb.select_start = Stb.select_end = Stb.cursor; }
+    void        SelectAll()                 { Stb.select_start = 0; Stb.cursor = Stb.select_end = CurLenW; Stb.has_preferred_x = 0; }
 };
 
 // Windows data saved in imgui.ini file
@@ -826,13 +833,13 @@ struct ImGuiShrinkWidthItem
     float           Width;
 };
 
-struct ImGuiTabBarRef
+struct ImGuiPtrOrIndex
 {
-    ImGuiTabBar*    Ptr;                    // Either field can be set, not both. Dock node tab bars are loose while BeginTabBar() ones are in a pool.
-    int             IndexInMainPool;
+    void*           Ptr;                // Either field can be set, not both. e.g. Dock node tab bars are loose while BeginTabBar() ones are in a pool.
+    int             Index;              // Usually index in a main pool.
 
-    ImGuiTabBarRef(ImGuiTabBar* ptr)        { Ptr = ptr; IndexInMainPool = -1; }
-    ImGuiTabBarRef(int index_in_main_pool)  { Ptr = NULL; IndexInMainPool = index_in_main_pool; }
+    ImGuiPtrOrIndex(void* ptr)          { Ptr = ptr; Index = -1; }
+    ImGuiPtrOrIndex(int index)          { Ptr = NULL; Index = index; }
 };
 
 //-----------------------------------------------------------------------------
@@ -867,6 +874,9 @@ struct ImGuiContext
     ImGuiWindow*            HoveredWindow;                      // Will catch mouse inputs
     ImGuiWindow*            HoveredRootWindow;                  // Will catch mouse inputs (for focus/move only)
     ImGuiWindow*            MovingWindow;                       // Track the window we clicked on (in order to preserve focus). The actually window that is moved is generally MovingWindow->RootWindow.
+    ImGuiWindow*            WheelingWindow;
+    ImVec2                  WheelingWindowRefMousePos;
+    float                   WheelingWindowTimer;
 
     // Item/widgets state and tracking information
     ImGuiID                 HoveredId;                          // Hovered widget
@@ -982,9 +992,9 @@ struct ImGuiContext
     unsigned char           DragDropPayloadBufLocal[8];         // Local buffer for small payloads
 
     // Tab bars
-    ImPool<ImGuiTabBar>             TabBars;
     ImGuiTabBar*                    CurrentTabBar;
-    ImVector<ImGuiTabBarRef>        CurrentTabBarStack;
+    ImPool<ImGuiTabBar>             TabBars;
+    ImVector<ImGuiPtrOrIndex>       CurrentTabBarStack;
     ImVector<ImGuiShrinkWidthItem>  ShrinkWidthBuffer;
 
     // Widget state
@@ -1027,6 +1037,10 @@ struct ImGuiContext
     int                     LogDepthToExpand;
     int                     LogDepthToExpandDefault;            // Default/stored value for LogDepthMaxExpand if not specified in the LogXXX function call.
 
+    // Debug Tools
+    bool                    DebugItemPickerActive;
+    ImGuiID                 DebugItemPickerBreakID;             // Will call IM_DEBUG_BREAK() when encountering this id
+
     // Misc
     float                   FramerateSecPerFrame[120];          // Calculate estimate of framerate for user over the last 2 seconds.
     int                     FramerateSecPerFrameIdx;
@@ -1053,6 +1067,8 @@ struct ImGuiContext
         HoveredWindow = NULL;
         HoveredRootWindow = NULL;
         MovingWindow = NULL;
+        WheelingWindow = NULL;
+        WheelingWindowTimer = 0.0f;
 
         HoveredId = 0;
         HoveredIdAllowOverlap = false;
@@ -1152,6 +1168,9 @@ struct ImGuiContext
         LogDepthRef = 0;
         LogDepthToExpand = LogDepthToExpandDefault = 2;
 
+        DebugItemPickerActive = false;
+        DebugItemPickerBreakID = 0;
+
         memset(FramerateSecPerFrame, 0, sizeof(FramerateSecPerFrame));
         FramerateSecPerFrameIdx = 0;
         FramerateSecPerFrameAccum = 0.0f;
@@ -1311,7 +1330,7 @@ struct IMGUI_API ImGuiWindow
     ImGuiMenuColumns        MenuColumns;                        // Simplified columns storage for menu items
     ImGuiStorage            StateStorage;
     ImVector<ImGuiColumns>  ColumnsStorage;
-    float                   FontWindowScale;                    // User scale multiplier per-window
+    float                   FontWindowScale;                    // User scale multiplier per-window, via SetWindowFontScale()
     int                     SettingsIdx;                        // Index into SettingsWindow[] (indices are always valid as we only grow the array from the back)
 
     ImDrawList*             DrawList;                           // == &DrawListInst (for backward compatibility reason with code using imgui_internal.h we keep this a pointer)
@@ -1338,12 +1357,12 @@ public:
     ImGuiID     GetIDFromRectangle(const ImRect& r_abs);
 
     // We don't use g.FontSize because the window may be != g.CurrentWidow.
-    ImRect      Rect() const                            { return ImRect(Pos.x, Pos.y, Pos.x+Size.x, Pos.y+Size.y); }
-    float       CalcFontSize() const                    { return GImGui->FontBaseSize * FontWindowScale; }
-    float       TitleBarHeight() const                  { return (Flags & ImGuiWindowFlags_NoTitleBar) ? 0.0f : CalcFontSize() + GImGui->Style.FramePadding.y * 2.0f; }
-    ImRect      TitleBarRect() const                    { return ImRect(Pos, ImVec2(Pos.x + SizeFull.x, Pos.y + TitleBarHeight())); }
-    float       MenuBarHeight() const                   { return (Flags & ImGuiWindowFlags_MenuBar) ? DC.MenuBarOffset.y + CalcFontSize() + GImGui->Style.FramePadding.y * 2.0f : 0.0f; }
-    ImRect      MenuBarRect() const                     { float y1 = Pos.y + TitleBarHeight(); return ImRect(Pos.x, y1, Pos.x + SizeFull.x, y1 + MenuBarHeight()); }
+    ImRect      Rect() const                { return ImRect(Pos.x, Pos.y, Pos.x+Size.x, Pos.y+Size.y); }
+    float       CalcFontSize() const        { ImGuiContext& g = *GImGui; float scale = g.FontBaseSize * FontWindowScale; if (ParentWindow) scale *= ParentWindow->FontWindowScale; return scale; }
+    float       TitleBarHeight() const      { ImGuiContext& g = *GImGui; return (Flags & ImGuiWindowFlags_NoTitleBar) ? 0.0f : CalcFontSize() + g.Style.FramePadding.y * 2.0f; }
+    ImRect      TitleBarRect() const        { return ImRect(Pos, ImVec2(Pos.x + SizeFull.x, Pos.y + TitleBarHeight())); }
+    float       MenuBarHeight() const       { ImGuiContext& g = *GImGui; return (Flags & ImGuiWindowFlags_MenuBar) ? DC.MenuBarOffset.y + CalcFontSize() + g.Style.FramePadding.y * 2.0f : 0.0f; }
+    ImRect      MenuBarRect() const         { float y1 = Pos.y + TitleBarHeight(); return ImRect(Pos.x, y1, Pos.x + SizeFull.x, y1 + MenuBarHeight()); }
 };
 
 // Backup and restore just enough data to be able to use IsItemHovered() on item A after another B in the same window has overwritten the data.
@@ -1412,7 +1431,7 @@ struct ImGuiTabBar
     float               ScrollingSpeed;
     ImGuiTabBarFlags    Flags;
     ImGuiID             ReorderRequestTabId;
-    int                 ReorderRequestDir;
+    ImS8                ReorderRequestDir;
     bool                WantLayout;
     bool                VisibleTabWasSubmitted;
     short               LastTabItemIdx;         // For BeginTabItem()/EndTabItem()
@@ -1452,8 +1471,6 @@ namespace ImGui
     IMGUI_API ImVec2        CalcWindowExpectedSize(ImGuiWindow* window);
     IMGUI_API bool          IsWindowChildOf(ImGuiWindow* window, ImGuiWindow* potential_parent);
     IMGUI_API bool          IsWindowNavFocusable(ImGuiWindow* window);
-    IMGUI_API void          SetWindowScrollX(ImGuiWindow* window, float new_scroll_x);
-    IMGUI_API void          SetWindowScrollY(ImGuiWindow* window, float new_scroll_y);
     IMGUI_API ImRect        GetWindowAllowedExtentRect(ImGuiWindow* window);
     IMGUI_API void          SetWindowPos(ImGuiWindow* window, const ImVec2& pos, ImGuiCond cond = 0);
     IMGUI_API void          SetWindowSize(ImGuiWindow* window, const ImVec2& size, ImGuiCond cond = 0);
@@ -1480,6 +1497,13 @@ namespace ImGui
     IMGUI_API ImGuiWindowSettings*  FindOrCreateWindowSettings(const char* name);
     IMGUI_API ImGuiSettingsHandler* FindSettingsHandler(const char* type_name);
 
+    // Scrolling
+    IMGUI_API void          SetScrollX(ImGuiWindow* window, float new_scroll_x);
+    IMGUI_API void          SetScrollY(ImGuiWindow* window, float new_scroll_y);
+    IMGUI_API void          SetScrollFromPosX(ImGuiWindow* window, float local_x, float center_x_ratio = 0.5f);
+    IMGUI_API void          SetScrollFromPosY(ImGuiWindow* window, float local_y, float center_y_ratio = 0.5f);
+    IMGUI_API ImVec2        ScrollToBringRectIntoView(ImGuiWindow* window, const ImRect& item_rect);
+
     // Basic Accessors
     inline ImGuiID          GetItemID()     { ImGuiContext& g = *GImGui; return g.CurrentWindow->DC.LastItemId; }
     inline ImGuiID          GetActiveID()   { ImGuiContext& g = *GImGui; return g.ActiveId; }
@@ -1539,6 +1563,7 @@ namespace ImGui
     IMGUI_API void          SetNavIDWithRectRel(ImGuiID id, int nav_layer, const ImRect& rect_rel);
 
     // Inputs
+    inline bool             IsMouseDragPastThreshold(int button, float lock_threshold = -1.0f);
     inline bool             IsKeyPressedMap(ImGuiKey key, bool repeat = true)           { const int key_index = GImGui->IO.KeyMap[key]; return (key_index >= 0) ? IsKeyPressed(key_index, repeat) : false; }
     inline bool             IsNavInputDown(ImGuiNavInput n)                             { return GImGui->IO.NavInputs[n] > 0.0f; }
     inline bool             IsNavInputPressed(ImGuiNavInput n, ImGuiInputReadMode mode) { return GetNavInputAmount(n, mode) > 0.0f; }
@@ -1557,6 +1582,8 @@ namespace ImGui
     IMGUI_API void          PopColumnsBackground();
     IMGUI_API ImGuiID       GetColumnsID(const char* str_id, int count);
     IMGUI_API ImGuiColumns* FindOrCreateColumns(ImGuiWindow* window, ImGuiID id);
+    IMGUI_API float         GetColumnOffsetFromNorm(const ImGuiColumns* columns, float offset_norm);
+    IMGUI_API float         GetColumnNormFromOffset(const ImGuiColumns* columns, float offset);
 
     // Tab Bars
     IMGUI_API bool          BeginTabBarEx(ImGuiTabBar* tab_bar, const ImRect& bb, ImGuiTabBarFlags flags);
@@ -1650,6 +1677,9 @@ namespace ImGui
     IMGUI_API void          ShadeVertsLinearColorGradientKeepAlpha(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, ImVec2 gradient_p0, ImVec2 gradient_p1, ImU32 col0, ImU32 col1);
     IMGUI_API void          ShadeVertsLinearUV(ImDrawList* draw_list, int vert_start_idx, int vert_end_idx, const ImVec2& a, const ImVec2& b, const ImVec2& uv_a, const ImVec2& uv_b, bool clamp);
 
+    // Debug Tools
+    inline void             DebugStartItemPicker() { GImGui->DebugItemPickerActive = true; }
+
 } // namespace ImGui
 
 // ImFontAtlas internals
@@ -1661,7 +1691,19 @@ IMGUI_API void              ImFontAtlasBuildFinish(ImFontAtlas* atlas);
 IMGUI_API void              ImFontAtlasBuildMultiplyCalcLookupTable(unsigned char out_table[256], float in_multiply_factor);
 IMGUI_API void              ImFontAtlasBuildMultiplyRectAlpha8(const unsigned char table[256], unsigned char* pixels, int x, int y, int w, int h, int stride);
 
-// Test engine hooks (imgui-test)
+// Debug Tools
+// Use 'Metrics->Tools->Item Picker' to break into the call-stack of a specific item.
+#ifndef IM_DEBUG_BREAK      
+#if defined(__clang__)
+#define IM_DEBUG_BREAK()    __builtin_debugtrap()
+#elif defined (_MSC_VER)
+#define IM_DEBUG_BREAK()    __debugbreak()
+#else
+#define IM_DEBUG_BREAK()    IM_ASSERT(0)    // It is expected that you define IM_DEBUG_BREAK() into something that will break nicely in a debugger!
+#endif
+#endif // #ifndef IM_DEBUG_BREAK
+
+// Test Engine Hooks (imgui_tests)
 //#define IMGUI_ENABLE_TEST_ENGINE
 #ifdef IMGUI_ENABLE_TEST_ENGINE
 extern void                 ImGuiTestEngineHook_PreNewFrame(ImGuiContext* ctx);
diff --git a/sources/3rdparty/imgui/imgui_widgets.cpp b/sources/3rdparty/imgui/imgui_widgets.cpp
index e59836c1..3e4f08a9 100644
--- a/sources/3rdparty/imgui/imgui_widgets.cpp
+++ b/sources/3rdparty/imgui/imgui_widgets.cpp
@@ -1,4 +1,4 @@
-// dear imgui, v1.72 WIP
+// dear imgui, v1.73 WIP
 // (widgets code)
 
 /*
@@ -24,6 +24,7 @@ Index of this file:
 // [SECTION] Widgets: MenuItem, BeginMenu, EndMenu, etc.
 // [SECTION] Widgets: BeginTabBar, EndTabBar, etc.
 // [SECTION] Widgets: BeginTabItem, EndTabItem, etc.
+// [SECTION] Widgets: Columns, BeginColumns, EndColumns, etc.
 
 */
 
@@ -625,8 +626,6 @@ bool ImGui::ButtonEx(const char* label, const ImVec2& size_arg, ImGuiButtonFlags
         flags |= ImGuiButtonFlags_Repeat;
     bool hovered, held;
     bool pressed = ButtonBehavior(bb, id, &hovered, &held, flags);
-    if (pressed)
-        MarkItemEdited(id);
 
     // Render
     const ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_ButtonActive : hovered ? ImGuiCol_ButtonHovered : ImGuiCol_Button);
@@ -1089,6 +1088,7 @@ bool ImGui::RadioButton(const char* label, bool active)
     return pressed;
 }
 
+// FIXME: This would work nicely if it was a public template, e.g. 'template<T> RadioButton(const char* label, T* v, T v_button)', but I'm not sure how we would expose it..
 bool ImGui::RadioButton(const char* label, int* v, int v_button)
 {
     const bool pressed = RadioButton(label, *v == v_button);
@@ -3123,7 +3123,7 @@ namespace ImStb
 
 static int     STB_TEXTEDIT_STRINGLEN(const STB_TEXTEDIT_STRING* obj)                             { return obj->CurLenW; }
 static ImWchar STB_TEXTEDIT_GETCHAR(const STB_TEXTEDIT_STRING* obj, int idx)                      { return obj->TextW[idx]; }
-static float   STB_TEXTEDIT_GETWIDTH(STB_TEXTEDIT_STRING* obj, int line_start_idx, int char_idx)  { ImWchar c = obj->TextW[line_start_idx+char_idx]; if (c == '\n') return STB_TEXTEDIT_GETWIDTH_NEWLINE; return GImGui->Font->GetCharAdvance(c) * (GImGui->FontSize / GImGui->Font->FontSize); }
+static float   STB_TEXTEDIT_GETWIDTH(STB_TEXTEDIT_STRING* obj, int line_start_idx, int char_idx)  { ImWchar c = obj->TextW[line_start_idx + char_idx]; if (c == '\n') return STB_TEXTEDIT_GETWIDTH_NEWLINE; ImGuiContext& g = *GImGui; return g.Font->GetCharAdvance(c) * (g.FontSize / g.Font->FontSize); }
 static int     STB_TEXTEDIT_KEYTOTEXT(int key)                                                    { return key >= 0x10000 ? 0 : key; }
 static ImWchar STB_TEXTEDIT_NEWLINE = '\n';
 static void    STB_TEXTEDIT_LAYOUTROW(StbTexteditRow* r, STB_TEXTEDIT_STRING* obj, int line_start_idx)
@@ -3638,8 +3638,8 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
 
         if (IsKeyPressedMap(ImGuiKey_LeftArrow))                        { state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_LINESTART : is_wordmove_key_down ? STB_TEXTEDIT_K_WORDLEFT : STB_TEXTEDIT_K_LEFT) | k_mask); }
         else if (IsKeyPressedMap(ImGuiKey_RightArrow))                  { state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_LINEEND : is_wordmove_key_down ? STB_TEXTEDIT_K_WORDRIGHT : STB_TEXTEDIT_K_RIGHT) | k_mask); }
-        else if (IsKeyPressedMap(ImGuiKey_UpArrow) && is_multiline)     { if (io.KeyCtrl) SetWindowScrollY(draw_window, ImMax(draw_window->Scroll.y - g.FontSize, 0.0f)); else state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_TEXTSTART : STB_TEXTEDIT_K_UP) | k_mask); }
-        else if (IsKeyPressedMap(ImGuiKey_DownArrow) && is_multiline)   { if (io.KeyCtrl) SetWindowScrollY(draw_window, ImMin(draw_window->Scroll.y + g.FontSize, GetScrollMaxY())); else state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_TEXTEND : STB_TEXTEDIT_K_DOWN) | k_mask); }
+        else if (IsKeyPressedMap(ImGuiKey_UpArrow) && is_multiline)     { if (io.KeyCtrl) SetScrollY(draw_window, ImMax(draw_window->Scroll.y - g.FontSize, 0.0f)); else state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_TEXTSTART : STB_TEXTEDIT_K_UP) | k_mask); }
+        else if (IsKeyPressedMap(ImGuiKey_DownArrow) && is_multiline)   { if (io.KeyCtrl) SetScrollY(draw_window, ImMin(draw_window->Scroll.y + g.FontSize, GetScrollMaxY())); else state->OnKeyPressed((is_startend_key_down ? STB_TEXTEDIT_K_TEXTEND : STB_TEXTEDIT_K_DOWN) | k_mask); }
         else if (IsKeyPressedMap(ImGuiKey_Home))                        { state->OnKeyPressed(io.KeyCtrl ? STB_TEXTEDIT_K_TEXTSTART | k_mask : STB_TEXTEDIT_K_LINESTART | k_mask); }
         else if (IsKeyPressedMap(ImGuiKey_End))                         { state->OnKeyPressed(io.KeyCtrl ? STB_TEXTEDIT_K_TEXTEND | k_mask : STB_TEXTEDIT_K_LINEEND | k_mask); }
         else if (IsKeyPressedMap(ImGuiKey_Delete) && !is_readonly)      { state->OnKeyPressed(STB_TEXTEDIT_K_DELETE | k_mask); }
@@ -3654,7 +3654,7 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
             }
             state->OnKeyPressed(STB_TEXTEDIT_K_BACKSPACE | k_mask);
         }
-        else if (IsKeyPressedMap(ImGuiKey_Enter))
+        else if (IsKeyPressedMap(ImGuiKey_Enter) || IsKeyPressedMap(ImGuiKey_KeyPadEnter))
         {
             bool ctrl_enter_for_new_line = (flags & ImGuiInputTextFlags_CtrlEnterForNewLine) != 0;
             if (!is_multiline || (ctrl_enter_for_new_line && !io.KeyCtrl) || (!ctrl_enter_for_new_line && io.KeyCtrl))
@@ -3994,9 +3994,8 @@ bool ImGui::InputTextEx(const char* label, const char* hint, char* buf, int buf_
                     scroll_y = ImMax(0.0f, cursor_offset.y - g.FontSize);
                 else if (cursor_offset.y - size.y >= scroll_y)
                     scroll_y = cursor_offset.y - size.y;
-                draw_window->DC.CursorPos.y += (draw_window->Scroll.y - scroll_y);   // Manipulate cursor pos immediately avoid a frame of lag
+                draw_pos.y += (draw_window->Scroll.y - scroll_y);   // Manipulate cursor pos immediately avoid a frame of lag
                 draw_window->Scroll.y = scroll_y;
-                draw_pos.y = draw_window->DC.CursorPos.y;
             }
 
             state->CursorFollow = false;
@@ -4137,8 +4136,9 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag
     ImGuiContext& g = *GImGui;
     const ImGuiStyle& style = g.Style;
     const float square_sz = GetFrameHeight();
-    const float w_extra = (flags & ImGuiColorEditFlags_NoSmallPreview) ? 0.0f : (square_sz + style.ItemInnerSpacing.x);
-    const float w_items_all = CalcItemWidth() - w_extra;
+    const float w_full = CalcItemWidth();
+    const float w_button = (flags & ImGuiColorEditFlags_NoSmallPreview) ? 0.0f : (square_sz + style.ItemInnerSpacing.x);
+    const float w_inputs = w_full - w_button;
     const char* label_display_end = FindRenderedTextEnd(label);
     g.NextItemData.ClearFlags();
 
@@ -4182,11 +4182,15 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag
     bool value_changed = false;
     bool value_changed_as_float = false;
 
+    const ImVec2 pos = window->DC.CursorPos;
+    const float inputs_offset_x = (style.ColorButtonPosition == ImGuiDir_Left) ? w_button : 0.0f;
+    window->DC.CursorPos.x = pos.x + inputs_offset_x;
+
     if ((flags & (ImGuiColorEditFlags_DisplayRGB | ImGuiColorEditFlags_DisplayHSV)) != 0 && (flags & ImGuiColorEditFlags_NoInputs) == 0)
     {
         // RGB/HSV 0..255 Sliders
-        const float w_item_one  = ImMax(1.0f, (float)(int)((w_items_all - (style.ItemInnerSpacing.x) * (components-1)) / (float)components));
-        const float w_item_last = ImMax(1.0f, (float)(int)(w_items_all - (w_item_one + style.ItemInnerSpacing.x) * (components-1)));
+        const float w_item_one  = ImMax(1.0f, (float)(int)((w_inputs - (style.ItemInnerSpacing.x) * (components-1)) / (float)components));
+        const float w_item_last = ImMax(1.0f, (float)(int)(w_inputs - (w_item_one + style.ItemInnerSpacing.x) * (components-1)));
 
         const bool hide_prefix = (w_item_one <= CalcTextSize((flags & ImGuiColorEditFlags_Float) ? "M:0.000" : "M:000").x);
         static const char* ids[4] = { "##X", "##Y", "##Z", "##W" };
@@ -4230,7 +4234,7 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag
             ImFormatString(buf, IM_ARRAYSIZE(buf), "#%02X%02X%02X%02X", ImClamp(i[0],0,255), ImClamp(i[1],0,255), ImClamp(i[2],0,255), ImClamp(i[3],0,255));
         else
             ImFormatString(buf, IM_ARRAYSIZE(buf), "#%02X%02X%02X", ImClamp(i[0],0,255), ImClamp(i[1],0,255), ImClamp(i[2],0,255));
-        SetNextItemWidth(w_items_all);
+        SetNextItemWidth(w_inputs);
         if (InputText("##Text", buf, IM_ARRAYSIZE(buf), ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_CharsUppercase))
         {
             value_changed = true;
@@ -4250,8 +4254,8 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag
     ImGuiWindow* picker_active_window = NULL;
     if (!(flags & ImGuiColorEditFlags_NoSmallPreview))
     {
-        if (!(flags & ImGuiColorEditFlags_NoInputs))
-            SameLine(0, style.ItemInnerSpacing.x);
+        const float button_offset_x = ((flags & ImGuiColorEditFlags_NoInputs) || (style.ColorButtonPosition == ImGuiDir_Left)) ? 0.0f : w_inputs + style.ItemInnerSpacing.x;
+        window->DC.CursorPos = ImVec2(pos.x + button_offset_x, pos.y);
 
         const ImVec4 col_v4(col[0], col[1], col[2], alpha ? col[3] : 1.0f);
         if (ColorButton("##ColorButton", col_v4, flags))
@@ -4285,7 +4289,7 @@ bool ImGui::ColorEdit4(const char* label, float col[4], ImGuiColorEditFlags flag
 
     if (label != label_display_end && !(flags & ImGuiColorEditFlags_NoLabel))
     {
-        SameLine(0, style.ItemInnerSpacing.x);
+        window->DC.CursorPos = ImVec2(pos.x + w_full + style.ItemInnerSpacing.x, pos.y + style.FramePadding.y);
         TextEx(label, label_display_end);
     }
 
@@ -4398,17 +4402,19 @@ void ImGui::RenderColorRectWithAlphaCheckerboard(ImVec2 p_min, ImVec2 p_max, ImU
 }
 
 // Helper for ColorPicker4()
-static void RenderArrowsForVerticalBar(ImDrawList* draw_list, ImVec2 pos, ImVec2 half_sz, float bar_w)
+static void RenderArrowsForVerticalBar(ImDrawList* draw_list, ImVec2 pos, ImVec2 half_sz, float bar_w, float alpha)
 {
-    ImGui::RenderArrowPointingAt(draw_list, ImVec2(pos.x + half_sz.x + 1,         pos.y), ImVec2(half_sz.x + 2, half_sz.y + 1), ImGuiDir_Right, IM_COL32_BLACK);
-    ImGui::RenderArrowPointingAt(draw_list, ImVec2(pos.x + half_sz.x,             pos.y), half_sz,                              ImGuiDir_Right, IM_COL32_WHITE);
-    ImGui::RenderArrowPointingAt(draw_list, ImVec2(pos.x + bar_w - half_sz.x - 1, pos.y), ImVec2(half_sz.x + 2, half_sz.y + 1), ImGuiDir_Left,  IM_COL32_BLACK);
-    ImGui::RenderArrowPointingAt(draw_list, ImVec2(pos.x + bar_w - half_sz.x,     pos.y), half_sz,                              ImGuiDir_Left,  IM_COL32_WHITE);
+    ImU32 alpha8 = IM_F32_TO_INT8_SAT(alpha);
+    ImGui::RenderArrowPointingAt(draw_list, ImVec2(pos.x + half_sz.x + 1,         pos.y), ImVec2(half_sz.x + 2, half_sz.y + 1), ImGuiDir_Right, IM_COL32(0,0,0,alpha8));
+    ImGui::RenderArrowPointingAt(draw_list, ImVec2(pos.x + half_sz.x,             pos.y), half_sz,                              ImGuiDir_Right, IM_COL32(255,255,255,alpha8));
+    ImGui::RenderArrowPointingAt(draw_list, ImVec2(pos.x + bar_w - half_sz.x - 1, pos.y), ImVec2(half_sz.x + 2, half_sz.y + 1), ImGuiDir_Left,  IM_COL32(0,0,0,alpha8));
+    ImGui::RenderArrowPointingAt(draw_list, ImVec2(pos.x + bar_w - half_sz.x,     pos.y), half_sz,                              ImGuiDir_Left,  IM_COL32(255,255,255,alpha8));
 }
 
 // Note: ColorPicker4() only accesses 3 floats if ImGuiColorEditFlags_NoAlpha flag is set.
 // (In C++ the 'float col[4]' notation for a function argument is equivalent to 'float* col', we only specify a size to facilitate understanding of the code.)
 // FIXME: we adjust the big color square height based on item width, which may cause a flickering feedback loop (if automatic height makes a vertical scrollbar appears, affecting automatic width..)
+// FIXME: this is trying to be aware of style.Alpha but not fully correct. Also, the color wheel will have overlapping glitches with (style.Alpha < 1.0)
 bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags flags, const float* ref_col)
 {
     ImGuiContext& g = *GImGui;
@@ -4658,17 +4664,22 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
         }
     }
 
-    ImVec4 hue_color_f(1, 1, 1, 1); ColorConvertHSVtoRGB(H, 1, 1, hue_color_f.x, hue_color_f.y, hue_color_f.z);
-    ImU32 hue_color32 = ColorConvertFloat4ToU32(hue_color_f);
-    ImU32 col32_no_alpha = ColorConvertFloat4ToU32(ImVec4(R, G, B, 1.0f));
+    const int style_alpha8 = IM_F32_TO_INT8_SAT(style.Alpha);
+    const ImU32 col_black = IM_COL32(0,0,0,style_alpha8);
+    const ImU32 col_white = IM_COL32(255,255,255,style_alpha8);
+    const ImU32 col_midgrey = IM_COL32(128,128,128,style_alpha8);
+    const ImU32 col_hues[6 + 1] = { IM_COL32(255,0,0,style_alpha8), IM_COL32(255,255,0,style_alpha8), IM_COL32(0,255,0,style_alpha8), IM_COL32(0,255,255,style_alpha8), IM_COL32(0,0,255,style_alpha8), IM_COL32(255,0,255,style_alpha8), IM_COL32(255,0,0,style_alpha8) };
+
+    ImVec4 hue_color_f(1, 1, 1, style.Alpha); ColorConvertHSVtoRGB(H, 1, 1, hue_color_f.x, hue_color_f.y, hue_color_f.z);
+    ImU32 hue_color32 = ColorConvertFloat4ToU32(hue_color_f);
+    ImU32 user_col32_striped_of_alpha = ColorConvertFloat4ToU32(ImVec4(R, G, B, style.Alpha)); // Important: this is still including the main rendering/style alpha!!
 
-    const ImU32 hue_colors[6+1] = { IM_COL32(255,0,0,255), IM_COL32(255,255,0,255), IM_COL32(0,255,0,255), IM_COL32(0,255,255,255), IM_COL32(0,0,255,255), IM_COL32(255,0,255,255), IM_COL32(255,0,0,255) };
     ImVec2 sv_cursor_pos;
 
     if (flags & ImGuiColorEditFlags_PickerHueWheel)
     {
         // Render Hue Wheel
-        const float aeps = 1.5f / wheel_r_outer; // Half a pixel arc length in radians (2pi cancels out).
+        const float aeps = 0.5f / wheel_r_outer; // Half a pixel arc length in radians (2pi cancels out).
         const int segment_per_arc = ImMax(4, (int)wheel_r_outer / 12);
         for (int n = 0; n < 6; n++)
         {
@@ -4676,13 +4687,13 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
             const float a1 = (n+1.0f)/6.0f * 2.0f * IM_PI + aeps;
             const int vert_start_idx = draw_list->VtxBuffer.Size;
             draw_list->PathArcTo(wheel_center, (wheel_r_inner + wheel_r_outer)*0.5f, a0, a1, segment_per_arc);
-            draw_list->PathStroke(IM_COL32_WHITE, false, wheel_thickness);
+            draw_list->PathStroke(col_white, false, wheel_thickness);
             const int vert_end_idx = draw_list->VtxBuffer.Size;
 
             // Paint colors over existing vertices
             ImVec2 gradient_p0(wheel_center.x + ImCos(a0) * wheel_r_inner, wheel_center.y + ImSin(a0) * wheel_r_inner);
             ImVec2 gradient_p1(wheel_center.x + ImCos(a1) * wheel_r_inner, wheel_center.y + ImSin(a1) * wheel_r_inner);
-            ShadeVertsLinearColorGradientKeepAlpha(draw_list, vert_start_idx, vert_end_idx, gradient_p0, gradient_p1, hue_colors[n], hue_colors[n+1]);
+            ShadeVertsLinearColorGradientKeepAlpha(draw_list, vert_start_idx, vert_end_idx, gradient_p0, gradient_p1, col_hues[n], col_hues[n+1]);
         }
 
         // Render Cursor + preview on Hue Wheel
@@ -4692,8 +4703,8 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
         float hue_cursor_rad = value_changed_h ? wheel_thickness * 0.65f : wheel_thickness * 0.55f;
         int hue_cursor_segments = ImClamp((int)(hue_cursor_rad / 1.4f), 9, 32);
         draw_list->AddCircleFilled(hue_cursor_pos, hue_cursor_rad, hue_color32, hue_cursor_segments);
-        draw_list->AddCircle(hue_cursor_pos, hue_cursor_rad+1, IM_COL32(128,128,128,255), hue_cursor_segments);
-        draw_list->AddCircle(hue_cursor_pos, hue_cursor_rad, IM_COL32_WHITE, hue_cursor_segments);
+        draw_list->AddCircle(hue_cursor_pos, hue_cursor_rad+1, col_midgrey, hue_cursor_segments);
+        draw_list->AddCircle(hue_cursor_pos, hue_cursor_rad, col_white, hue_cursor_segments);
 
         // Render SV triangle (rotated according to hue)
         ImVec2 tra = wheel_center + ImRotate(triangle_pa, cos_hue_angle, sin_hue_angle);
@@ -4703,46 +4714,46 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
         draw_list->PrimReserve(6, 6);
         draw_list->PrimVtx(tra, uv_white, hue_color32);
         draw_list->PrimVtx(trb, uv_white, hue_color32);
-        draw_list->PrimVtx(trc, uv_white, IM_COL32_WHITE);
-        draw_list->PrimVtx(tra, uv_white, IM_COL32_BLACK_TRANS);
-        draw_list->PrimVtx(trb, uv_white, IM_COL32_BLACK);
-        draw_list->PrimVtx(trc, uv_white, IM_COL32_BLACK_TRANS);
-        draw_list->AddTriangle(tra, trb, trc, IM_COL32(128,128,128,255), 1.5f);
+        draw_list->PrimVtx(trc, uv_white, col_white);
+        draw_list->PrimVtx(tra, uv_white, 0);
+        draw_list->PrimVtx(trb, uv_white, col_white);
+        draw_list->PrimVtx(trc, uv_white, 0);
+        draw_list->AddTriangle(tra, trb, trc, col_midgrey, 1.5f);
         sv_cursor_pos = ImLerp(ImLerp(trc, tra, ImSaturate(S)), trb, ImSaturate(1 - V));
     }
     else if (flags & ImGuiColorEditFlags_PickerHueBar)
     {
         // Render SV Square
-        draw_list->AddRectFilledMultiColor(picker_pos, picker_pos + ImVec2(sv_picker_size,sv_picker_size), IM_COL32_WHITE, hue_color32, hue_color32, IM_COL32_WHITE);
-        draw_list->AddRectFilledMultiColor(picker_pos, picker_pos + ImVec2(sv_picker_size,sv_picker_size), IM_COL32_BLACK_TRANS, IM_COL32_BLACK_TRANS, IM_COL32_BLACK, IM_COL32_BLACK);
-        RenderFrameBorder(picker_pos, picker_pos + ImVec2(sv_picker_size,sv_picker_size), 0.0f);
+        draw_list->AddRectFilledMultiColor(picker_pos, picker_pos + ImVec2(sv_picker_size, sv_picker_size), col_white, hue_color32, hue_color32, col_white);
+        draw_list->AddRectFilledMultiColor(picker_pos, picker_pos + ImVec2(sv_picker_size, sv_picker_size), 0, 0, col_black, col_black);
+        RenderFrameBorder(picker_pos, picker_pos + ImVec2(sv_picker_size, sv_picker_size), 0.0f);
         sv_cursor_pos.x = ImClamp((float)(int)(picker_pos.x + ImSaturate(S)     * sv_picker_size + 0.5f), picker_pos.x + 2, picker_pos.x + sv_picker_size - 2); // Sneakily prevent the circle to stick out too much
         sv_cursor_pos.y = ImClamp((float)(int)(picker_pos.y + ImSaturate(1 - V) * sv_picker_size + 0.5f), picker_pos.y + 2, picker_pos.y + sv_picker_size - 2);
 
         // Render Hue Bar
         for (int i = 0; i < 6; ++i)
-            draw_list->AddRectFilledMultiColor(ImVec2(bar0_pos_x, picker_pos.y + i * (sv_picker_size / 6)), ImVec2(bar0_pos_x + bars_width, picker_pos.y + (i + 1) * (sv_picker_size / 6)), hue_colors[i], hue_colors[i], hue_colors[i + 1], hue_colors[i + 1]);
+            draw_list->AddRectFilledMultiColor(ImVec2(bar0_pos_x, picker_pos.y + i * (sv_picker_size / 6)), ImVec2(bar0_pos_x + bars_width, picker_pos.y + (i + 1) * (sv_picker_size / 6)), col_hues[i], col_hues[i], col_hues[i + 1], col_hues[i + 1]);
         float bar0_line_y = (float)(int)(picker_pos.y + H * sv_picker_size + 0.5f);
         RenderFrameBorder(ImVec2(bar0_pos_x, picker_pos.y), ImVec2(bar0_pos_x + bars_width, picker_pos.y + sv_picker_size), 0.0f);
-        RenderArrowsForVerticalBar(draw_list, ImVec2(bar0_pos_x - 1, bar0_line_y), ImVec2(bars_triangles_half_sz + 1, bars_triangles_half_sz), bars_width + 2.0f);
+        RenderArrowsForVerticalBar(draw_list, ImVec2(bar0_pos_x - 1, bar0_line_y), ImVec2(bars_triangles_half_sz + 1, bars_triangles_half_sz), bars_width + 2.0f, style.Alpha);
     }
 
     // Render cursor/preview circle (clamp S/V within 0..1 range because floating points colors may lead HSV values to be out of range)
     float sv_cursor_rad = value_changed_sv ? 10.0f : 6.0f;
-    draw_list->AddCircleFilled(sv_cursor_pos, sv_cursor_rad, col32_no_alpha, 12);
-    draw_list->AddCircle(sv_cursor_pos, sv_cursor_rad+1, IM_COL32(128,128,128,255), 12);
-    draw_list->AddCircle(sv_cursor_pos, sv_cursor_rad, IM_COL32_WHITE, 12);
+    draw_list->AddCircleFilled(sv_cursor_pos, sv_cursor_rad, user_col32_striped_of_alpha, 12);
+    draw_list->AddCircle(sv_cursor_pos, sv_cursor_rad+1, col_midgrey, 12);
+    draw_list->AddCircle(sv_cursor_pos, sv_cursor_rad, col_white, 12);
 
     // Render alpha bar
     if (alpha_bar)
     {
         float alpha = ImSaturate(col[3]);
         ImRect bar1_bb(bar1_pos_x, picker_pos.y, bar1_pos_x + bars_width, picker_pos.y + sv_picker_size);
-        RenderColorRectWithAlphaCheckerboard(bar1_bb.Min, bar1_bb.Max, IM_COL32(0,0,0,0), bar1_bb.GetWidth() / 2.0f, ImVec2(0.0f, 0.0f));
-        draw_list->AddRectFilledMultiColor(bar1_bb.Min, bar1_bb.Max, col32_no_alpha, col32_no_alpha, col32_no_alpha & ~IM_COL32_A_MASK, col32_no_alpha & ~IM_COL32_A_MASK);
+        RenderColorRectWithAlphaCheckerboard(bar1_bb.Min, bar1_bb.Max, 0, bar1_bb.GetWidth() / 2.0f, ImVec2(0.0f, 0.0f));
+        draw_list->AddRectFilledMultiColor(bar1_bb.Min, bar1_bb.Max, user_col32_striped_of_alpha, user_col32_striped_of_alpha, user_col32_striped_of_alpha & ~IM_COL32_A_MASK, user_col32_striped_of_alpha & ~IM_COL32_A_MASK);
         float bar1_line_y = (float)(int)(picker_pos.y + (1.0f - alpha) * sv_picker_size + 0.5f);
         RenderFrameBorder(bar1_bb.Min, bar1_bb.Max, 0.0f);
-        RenderArrowsForVerticalBar(draw_list, ImVec2(bar1_pos_x - 1, bar1_line_y), ImVec2(bars_triangles_half_sz + 1, bars_triangles_half_sz), bars_width + 2.0f);
+        RenderArrowsForVerticalBar(draw_list, ImVec2(bar1_pos_x - 1, bar1_line_y), ImVec2(bars_triangles_half_sz + 1, bars_triangles_half_sz), bars_width + 2.0f, style.Alpha);
     }
 
     EndGroup();
@@ -4834,9 +4845,6 @@ bool ImGui::ColorButton(const char* desc_id, const ImVec4& col, ImGuiColorEditFl
     if (!(flags & ImGuiColorEditFlags_NoTooltip) && hovered)
         ColorTooltip(desc_id, &col.x, flags & (ImGuiColorEditFlags__InputMask | ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_AlphaPreview | ImGuiColorEditFlags_AlphaPreviewHalf));
 
-    if (pressed)
-        MarkItemEdited(id);
-
     return pressed;
 }
 
@@ -4990,7 +4998,6 @@ void ImGui::ColorPickerOptionsPopup(const float* ref_col, ImGuiColorEditFlags fl
 // - TreeNodeBehavior() [Internal]
 // - TreePush()
 // - TreePop()
-// - TreeAdvanceToLabelPos()
 // - GetTreeNodeToLabelSpacing()
 // - SetNextItemOpen()
 // - CollapsingHeader()
@@ -5238,13 +5245,13 @@ bool ImGui::TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* l
         window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_ToggledSelection;
 
     // Render
-    const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header);
     const ImU32 text_col = GetColorU32(ImGuiCol_Text);
     const ImVec2 text_pos = frame_bb.Min + ImVec2(text_offset_x, text_base_offset_y);
     ImGuiNavHighlightFlags nav_highlight_flags = ImGuiNavHighlightFlags_TypeThin;
     if (display_frame)
     {
         // Framed type
+        const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header);
         RenderFrame(frame_bb.Min, frame_bb.Max, bg_col, true, style.FrameRounding);
         RenderNavHighlight(frame_bb, id, nav_highlight_flags);
         RenderArrow(window->DrawList, frame_bb.Min + ImVec2(padding.x, text_base_offset_y), text_col, is_open ? ImGuiDir_Down : ImGuiDir_Right, 1.0f);
@@ -5269,6 +5276,7 @@ bool ImGui::TreeNodeBehavior(ImGuiID id, ImGuiTreeNodeFlags flags, const char* l
         // Unframed typed for tree nodes
         if (hovered || selected)
         {
+            const ImU32 bg_col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header);
             RenderFrame(frame_bb.Min, frame_bb.Max, bg_col, false);
             RenderNavHighlight(frame_bb, id, nav_highlight_flags);
         }
@@ -5331,12 +5339,6 @@ void ImGui::TreePop()
     PopID();
 }
 
-void ImGui::TreeAdvanceToLabelPos()
-{
-    ImGuiContext& g = *GImGui;
-    g.CurrentWindow->DC.CursorPos.x += GetTreeNodeToLabelSpacing();
-}
-
 // Horizontal distance preceding label when using TreeNode() or Bullet()
 float ImGui::GetTreeNodeToLabelSpacing()
 {
@@ -5477,13 +5479,16 @@ bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags fl
     const bool was_selected = selected;
     bool hovered, held;
     bool pressed = ButtonBehavior(bb, id, &hovered, &held, button_flags);
-    // Hovering selectable with mouse updates NavId accordingly so navigation can be resumed with gamepad/keyboard (this doesn't happen on most widgets)
-    if (pressed || hovered)
+
+    // Update NavId when clicking or when Hovering (this doesn't happen on most widgets), so navigation can be resumed with gamepad/keyboard 
+    if (pressed || (hovered && (flags & ImGuiSelectableFlags_SetNavIdOnHover)))
+    {
         if (!g.NavDisableMouseHover && g.NavWindow == window && g.NavLayer == window->DC.NavLayerCurrent)
         {
             g.NavDisableHighlight = true;
             SetNavID(id, window->DC.NavLayerCurrent);
         }
+    }
     if (pressed)
         MarkItemEdited(id);
 
@@ -5495,6 +5500,8 @@ bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags fl
         window->DC.LastItemStatusFlags |= ImGuiItemStatusFlags_ToggledSelection;
 
     // Render
+    if (held && (flags & ImGuiSelectableFlags_DrawHoveredWhenHeld))
+        hovered = true;
     if (hovered || selected)
     {
         const ImU32 col = GetColorU32((held && hovered) ? ImGuiCol_HeaderActive : hovered ? ImGuiCol_HeaderHovered : ImGuiCol_Header);
@@ -5938,6 +5945,10 @@ void ImGui::EndMainMenuBar()
     End();
 }
 
+// FIXME: Provided a rectangle perhaps e.g. a BeginMenuBarEx() could be used anywhere..
+// Currently the main responsibility of this function being to setup clip-rect + horizontal layout + menu navigation layer.
+// Ideally we also want this to be responsible for claiming space out of the main window scrolling rectangle, in which case ImGuiWindowFlags_MenuBar will become unnecessary.
+// Then later the same system could be used for multiple menu-bars, scrollbars, side-bars.
 bool ImGui::BeginMenuBar()
 {
     ImGuiWindow* window = GetCurrentWindow();
@@ -5947,7 +5958,7 @@ bool ImGui::BeginMenuBar()
         return false;
 
     IM_ASSERT(!window->DC.MenuBarAppending);
-    BeginGroup(); // Backup position on layer 0
+    BeginGroup(); // Backup position on layer 0 // FIXME: Misleading to use a group for that backup/restore
     PushID("##menubar");
 
     // We don't clip with current window clipping rectangle as it is already set to the area below. However we clip with window full rect.
@@ -6177,7 +6188,9 @@ bool ImGui::MenuItem(const char* label, const char* shortcut, bool selected, boo
     ImVec2 pos = window->DC.CursorPos;
     ImVec2 label_size = CalcTextSize(label, NULL, true);
 
-    ImGuiSelectableFlags flags = ImGuiSelectableFlags_PressedOnRelease | (enabled ? 0 : ImGuiSelectableFlags_Disabled);
+    // We've been using the equivalent of ImGuiSelectableFlags_SetNavIdOnHover on all Selectable() since early Nav system days (commit 43ee5d73),
+    // but I am unsure whether this should be kept at all. For now moved it to be an opt-in feature used by menus only.
+    ImGuiSelectableFlags flags = ImGuiSelectableFlags_PressedOnRelease | ImGuiSelectableFlags_SetNavIdOnHover | (enabled ? 0 : ImGuiSelectableFlags_Disabled);
     bool pressed;
     if (window->DC.LayoutType == ImGuiLayoutType_Horizontal)
     {
@@ -6276,18 +6289,18 @@ static int IMGUI_CDECL TabItemComparerByVisibleOffset(const void* lhs, const voi
     return (int)(a->Offset - b->Offset);
 }
 
-static ImGuiTabBar* GetTabBarFromTabBarRef(const ImGuiTabBarRef& ref)
+static ImGuiTabBar* GetTabBarFromTabBarRef(const ImGuiPtrOrIndex& ref)
 {
     ImGuiContext& g = *GImGui;
-    return ref.Ptr ? ref.Ptr : g.TabBars.GetByIndex(ref.IndexInMainPool);
+    return ref.Ptr ? (ImGuiTabBar*)ref.Ptr : g.TabBars.GetByIndex(ref.Index);
 }
 
-static ImGuiTabBarRef GetTabBarRefFromTabBar(ImGuiTabBar* tab_bar)
+static ImGuiPtrOrIndex GetTabBarRefFromTabBar(ImGuiTabBar* tab_bar)
 {
     ImGuiContext& g = *GImGui;
     if (g.TabBars.Contains(tab_bar))
-        return ImGuiTabBarRef(g.TabBars.GetIndex(tab_bar));
-    return ImGuiTabBarRef(tab_bar);
+        return ImGuiPtrOrIndex(g.TabBars.GetIndex(tab_bar));
+    return ImGuiPtrOrIndex(tab_bar);
 }
 
 bool    ImGui::BeginTabBar(const char* str_id, ImGuiTabBarFlags flags)
@@ -6346,7 +6359,7 @@ bool    ImGui::BeginTabBarEx(ImGuiTabBar* tab_bar, const ImRect& tab_bar_bb, ImG
     window->DC.CursorPos.x = tab_bar->BarRect.Min.x;
 
     // Draw separator
-    const ImU32 col = GetColorU32((flags & ImGuiTabBarFlags_IsFocused) ? ImGuiCol_TabActive : ImGuiCol_Tab);
+    const ImU32 col = GetColorU32((flags & ImGuiTabBarFlags_IsFocused) ? ImGuiCol_TabActive : ImGuiCol_TabUnfocusedActive);
     const float y = tab_bar->BarRect.Max.y - 1.0f;
     {
         const float separator_min_x = tab_bar->BarRect.Min.x - ImFloor(window->WindowPadding.x * 0.5f);
@@ -6625,7 +6638,7 @@ static void ImGui::TabBarScrollToTab(ImGuiTabBar* tab_bar, ImGuiTabItem* tab)
     float tab_x1 = tab->Offset + (order > 0 ? -margin : 0.0f);
     float tab_x2 = tab->Offset + tab->Width + (order + 1 < tab_bar->Tabs.Size ? margin : 1.0f);
     tab_bar->ScrollingTargetDistToVisibility = 0.0f;
-    if (tab_bar->ScrollingTarget > tab_x1)
+    if (tab_bar->ScrollingTarget > tab_x1 || (tab_x2 - tab_x1 >= tab_bar->BarRect.GetWidth()))
     {
         tab_bar->ScrollingTargetDistToVisibility = ImMax(tab_bar->ScrollingAnim - tab_x2, 0.0f);
         tab_bar->ScrollingTarget = tab_x1;
@@ -6642,7 +6655,7 @@ void ImGui::TabBarQueueChangeTabOrder(ImGuiTabBar* tab_bar, const ImGuiTabItem*
     IM_ASSERT(dir == -1 || dir == +1);
     IM_ASSERT(tab_bar->ReorderRequestTabId == 0);
     tab_bar->ReorderRequestTabId = tab->ID;
-    tab_bar->ReorderRequestDir = dir;
+    tab_bar->ReorderRequestDir = (ImS8)dir;
 }
 
 static ImGuiTabItem* ImGui::TabBarScrollingButtons(ImGuiTabBar* tab_bar)
@@ -7089,3 +7102,425 @@ bool ImGui::TabItemLabelAndCloseButton(ImDrawList* draw_list, const ImRect& bb,
 
     return close_button_pressed;
 }
+
+
+//-------------------------------------------------------------------------
+// [SECTION] Widgets: Columns, BeginColumns, EndColumns, etc.
+// In the current version, Columns are very weak. Needs to be replaced with a more full-featured system.
+//-------------------------------------------------------------------------
+// - GetColumnIndex()
+// - GetColumnCount()
+// - GetColumnOffset()
+// - GetColumnWidth()
+// - SetColumnOffset()
+// - SetColumnWidth()
+// - PushColumnClipRect() [Internal]
+// - PushColumnsBackground() [Internal]
+// - PopColumnsBackground() [Internal]
+// - FindOrCreateColumns() [Internal]
+// - GetColumnsID() [Internal]
+// - BeginColumns()
+// - NextColumn()
+// - EndColumns()
+// - Columns()
+//-------------------------------------------------------------------------
+
+int ImGui::GetColumnIndex()
+{
+    ImGuiWindow* window = GetCurrentWindowRead();
+    return window->DC.CurrentColumns ? window->DC.CurrentColumns->Current : 0;
+}
+
+int ImGui::GetColumnsCount()
+{
+    ImGuiWindow* window = GetCurrentWindowRead();
+    return window->DC.CurrentColumns ? window->DC.CurrentColumns->Count : 1;
+}
+
+float ImGui::GetColumnOffsetFromNorm(const ImGuiColumns* columns, float offset_norm)
+{
+    return offset_norm * (columns->OffMaxX - columns->OffMinX);
+}
+
+float ImGui::GetColumnNormFromOffset(const ImGuiColumns* columns, float offset)
+{
+    return offset / (columns->OffMaxX - columns->OffMinX);
+}
+
+static const float COLUMNS_HIT_RECT_HALF_WIDTH = 4.0f;
+
+static float GetDraggedColumnOffset(ImGuiColumns* columns, int column_index)
+{
+    // Active (dragged) column always follow mouse. The reason we need this is that dragging a column to the right edge of an auto-resizing
+    // window creates a feedback loop because we store normalized positions. So while dragging we enforce absolute positioning.
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = g.CurrentWindow;
+    IM_ASSERT(column_index > 0); // We are not supposed to drag column 0.
+    IM_ASSERT(g.ActiveId == columns->ID + ImGuiID(column_index));
+
+    float x = g.IO.MousePos.x - g.ActiveIdClickOffset.x + COLUMNS_HIT_RECT_HALF_WIDTH - window->Pos.x;
+    x = ImMax(x, ImGui::GetColumnOffset(column_index - 1) + g.Style.ColumnsMinSpacing);
+    if ((columns->Flags & ImGuiColumnsFlags_NoPreserveWidths))
+        x = ImMin(x, ImGui::GetColumnOffset(column_index + 1) - g.Style.ColumnsMinSpacing);
+
+    return x;
+}
+
+float ImGui::GetColumnOffset(int column_index)
+{
+    ImGuiWindow* window = GetCurrentWindowRead();
+    ImGuiColumns* columns = window->DC.CurrentColumns;
+    if (columns == NULL)
+        return 0.0f;
+
+    if (column_index < 0)
+        column_index = columns->Current;
+    IM_ASSERT(column_index < columns->Columns.Size);
+
+    const float t = columns->Columns[column_index].OffsetNorm;
+    const float x_offset = ImLerp(columns->OffMinX, columns->OffMaxX, t);
+    return x_offset;
+}
+
+static float GetColumnWidthEx(ImGuiColumns* columns, int column_index, bool before_resize = false)
+{
+    if (column_index < 0)
+        column_index = columns->Current;
+
+    float offset_norm;
+    if (before_resize)
+        offset_norm = columns->Columns[column_index + 1].OffsetNormBeforeResize - columns->Columns[column_index].OffsetNormBeforeResize;
+    else
+        offset_norm = columns->Columns[column_index + 1].OffsetNorm - columns->Columns[column_index].OffsetNorm;
+    return ImGui::GetColumnOffsetFromNorm(columns, offset_norm);
+}
+
+float ImGui::GetColumnWidth(int column_index)
+{
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = g.CurrentWindow;
+    ImGuiColumns* columns = window->DC.CurrentColumns;
+    if (columns == NULL)
+        return GetContentRegionAvail().x;
+
+    if (column_index < 0)
+        column_index = columns->Current;
+    return GetColumnOffsetFromNorm(columns, columns->Columns[column_index + 1].OffsetNorm - columns->Columns[column_index].OffsetNorm);
+}
+
+void ImGui::SetColumnOffset(int column_index, float offset)
+{
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = g.CurrentWindow;
+    ImGuiColumns* columns = window->DC.CurrentColumns;
+    IM_ASSERT(columns != NULL);
+
+    if (column_index < 0)
+        column_index = columns->Current;
+    IM_ASSERT(column_index < columns->Columns.Size);
+
+    const bool preserve_width = !(columns->Flags & ImGuiColumnsFlags_NoPreserveWidths) && (column_index < columns->Count-1);
+    const float width = preserve_width ? GetColumnWidthEx(columns, column_index, columns->IsBeingResized) : 0.0f;
+
+    if (!(columns->Flags & ImGuiColumnsFlags_NoForceWithinWindow))
+        offset = ImMin(offset, columns->OffMaxX - g.Style.ColumnsMinSpacing * (columns->Count - column_index));
+    columns->Columns[column_index].OffsetNorm = GetColumnNormFromOffset(columns, offset - columns->OffMinX);
+
+    if (preserve_width)
+        SetColumnOffset(column_index + 1, offset + ImMax(g.Style.ColumnsMinSpacing, width));
+}
+
+void ImGui::SetColumnWidth(int column_index, float width)
+{
+    ImGuiWindow* window = GetCurrentWindowRead();
+    ImGuiColumns* columns = window->DC.CurrentColumns;
+    IM_ASSERT(columns != NULL);
+
+    if (column_index < 0)
+        column_index = columns->Current;
+    SetColumnOffset(column_index + 1, GetColumnOffset(column_index) + width);
+}
+
+void ImGui::PushColumnClipRect(int column_index)
+{
+    ImGuiWindow* window = GetCurrentWindowRead();
+    ImGuiColumns* columns = window->DC.CurrentColumns;
+    if (column_index < 0)
+        column_index = columns->Current;
+
+    ImGuiColumnData* column = &columns->Columns[column_index];
+    PushClipRect(column->ClipRect.Min, column->ClipRect.Max, false);
+}
+
+// Get into the columns background draw command (which is generally the same draw command as before we called BeginColumns)
+void ImGui::PushColumnsBackground()
+{
+    ImGuiWindow* window = GetCurrentWindowRead();
+    ImGuiColumns* columns = window->DC.CurrentColumns;
+    if (columns->Count == 1)
+        return;
+    window->DrawList->ChannelsSetCurrent(0);
+    int cmd_size = window->DrawList->CmdBuffer.Size;
+    PushClipRect(columns->HostClipRect.Min, columns->HostClipRect.Max, false); 
+    IM_UNUSED(cmd_size);
+    IM_ASSERT(cmd_size == window->DrawList->CmdBuffer.Size); // Being in channel 0 this should not have created an ImDrawCmd
+}
+
+void ImGui::PopColumnsBackground()
+{
+    ImGuiWindow* window = GetCurrentWindowRead();
+    ImGuiColumns* columns = window->DC.CurrentColumns;
+    if (columns->Count == 1)
+        return;
+    window->DrawList->ChannelsSetCurrent(columns->Current + 1);
+    PopClipRect();
+}
+
+ImGuiColumns* ImGui::FindOrCreateColumns(ImGuiWindow* window, ImGuiID id)
+{
+    // We have few columns per window so for now we don't need bother much with turning this into a faster lookup.
+    for (int n = 0; n < window->ColumnsStorage.Size; n++)
+        if (window->ColumnsStorage[n].ID == id)
+            return &window->ColumnsStorage[n];
+
+    window->ColumnsStorage.push_back(ImGuiColumns());
+    ImGuiColumns* columns = &window->ColumnsStorage.back();
+    columns->ID = id;
+    return columns;
+}
+
+ImGuiID ImGui::GetColumnsID(const char* str_id, int columns_count)
+{
+    ImGuiWindow* window = GetCurrentWindow();
+
+    // Differentiate column ID with an arbitrary prefix for cases where users name their columns set the same as another widget.
+    // In addition, when an identifier isn't explicitly provided we include the number of columns in the hash to make it uniquer.
+    PushID(0x11223347 + (str_id ? 0 : columns_count));
+    ImGuiID id = window->GetID(str_id ? str_id : "columns");
+    PopID();
+
+    return id;
+}
+
+void ImGui::BeginColumns(const char* str_id, int columns_count, ImGuiColumnsFlags flags)
+{
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = GetCurrentWindow();
+
+    IM_ASSERT(columns_count >= 1);
+    IM_ASSERT(window->DC.CurrentColumns == NULL); // Nested columns are currently not supported
+
+    // Acquire storage for the columns set
+    ImGuiID id = GetColumnsID(str_id, columns_count);
+    ImGuiColumns* columns = FindOrCreateColumns(window, id);
+    IM_ASSERT(columns->ID == id);
+    columns->Current = 0;
+    columns->Count = columns_count;
+    columns->Flags = flags;
+    window->DC.CurrentColumns = columns;
+
+    columns->HostCursorPosY = window->DC.CursorPos.y;
+    columns->HostCursorMaxPosX = window->DC.CursorMaxPos.x;
+    columns->HostClipRect = window->ClipRect;
+    columns->HostWorkRect = window->WorkRect;
+
+    // Set state for first column
+    // We aim so that the right-most column will have the same clipping width as other after being clipped by parent ClipRect
+    const float column_padding = g.Style.ItemSpacing.x;
+    const float half_clip_extend_x = ImFloor(ImMax(window->WindowPadding.x * 0.5f, window->WindowBorderSize));
+    const float max_1 = window->WorkRect.Max.x + column_padding - ImMax(column_padding - window->WindowPadding.x, 0.0f);
+    const float max_2 = window->WorkRect.Max.x + half_clip_extend_x;
+    columns->OffMinX = window->DC.Indent.x - column_padding + ImMax(column_padding - window->WindowPadding.x, 0.0f);
+    columns->OffMaxX = ImMax(ImMin(max_1, max_2) - window->Pos.x, columns->OffMinX + 1.0f);
+    columns->LineMinY = columns->LineMaxY = window->DC.CursorPos.y;
+
+    // Clear data if columns count changed
+    if (columns->Columns.Size != 0 && columns->Columns.Size != columns_count + 1)
+        columns->Columns.resize(0);
+
+    // Initialize default widths
+    columns->IsFirstFrame = (columns->Columns.Size == 0);
+    if (columns->Columns.Size == 0)
+    {
+        columns->Columns.reserve(columns_count + 1);
+        for (int n = 0; n < columns_count + 1; n++)
+        {
+            ImGuiColumnData column;
+            column.OffsetNorm = n / (float)columns_count;
+            columns->Columns.push_back(column);
+        }
+    }
+
+    for (int n = 0; n < columns_count; n++)
+    {
+        // Compute clipping rectangle
+        ImGuiColumnData* column = &columns->Columns[n];
+        float clip_x1 = ImFloor(0.5f + window->Pos.x + GetColumnOffset(n));
+        float clip_x2 = ImFloor(0.5f + window->Pos.x + GetColumnOffset(n + 1) - 1.0f);
+        column->ClipRect = ImRect(clip_x1, -FLT_MAX, clip_x2, +FLT_MAX);
+        column->ClipRect.ClipWith(window->ClipRect);
+    }
+
+    if (columns->Count > 1)
+    {
+        window->DrawList->ChannelsSplit(1 + columns->Count);
+        window->DrawList->ChannelsSetCurrent(1);
+        PushColumnClipRect(0);
+    }
+
+    // We don't generally store Indent.x inside ColumnsOffset because it may be manipulated by the user.
+    float offset_0 = GetColumnOffset(columns->Current);
+    float offset_1 = GetColumnOffset(columns->Current + 1);
+    float width = offset_1 - offset_0;
+    PushItemWidth(width * 0.65f);
+    window->DC.ColumnsOffset.x = ImMax(column_padding - window->WindowPadding.x, 0.0f);
+    window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
+    window->WorkRect.Max.x = window->Pos.x + offset_1 - column_padding;
+}
+
+void ImGui::NextColumn()
+{
+    ImGuiWindow* window = GetCurrentWindow();
+    if (window->SkipItems || window->DC.CurrentColumns == NULL)
+        return;
+
+    ImGuiContext& g = *GImGui;
+    ImGuiColumns* columns = window->DC.CurrentColumns;
+
+    if (columns->Count == 1)
+    {
+        window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
+        IM_ASSERT(columns->Current == 0);
+        return;
+    }
+    PopItemWidth();
+    PopClipRect();
+
+    const float column_padding = g.Style.ItemSpacing.x;
+    columns->LineMaxY = ImMax(columns->LineMaxY, window->DC.CursorPos.y);
+    if (++columns->Current < columns->Count)
+    {
+        // Columns 1+ ignore IndentX (by canceling it out)
+        // FIXME-COLUMNS: Unnecessary, could be locked?
+        window->DC.ColumnsOffset.x = GetColumnOffset(columns->Current) - window->DC.Indent.x + column_padding;
+        window->DrawList->ChannelsSetCurrent(columns->Current + 1);
+    }
+    else
+    {
+        // New row/line
+        // Column 0 honor IndentX
+        window->DC.ColumnsOffset.x = ImMax(column_padding - window->WindowPadding.x, 0.0f);
+        window->DrawList->ChannelsSetCurrent(1);
+        columns->Current = 0;
+        columns->LineMinY = columns->LineMaxY;
+    }
+    window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
+    window->DC.CursorPos.y = columns->LineMinY;
+    window->DC.CurrLineSize = ImVec2(0.0f, 0.0f);
+    window->DC.CurrLineTextBaseOffset = 0.0f;
+
+    PushColumnClipRect(columns->Current);     // FIXME-COLUMNS: Could it be an overwrite?
+
+    // FIXME-COLUMNS: Share code with BeginColumns() - move code on columns setup.
+    float offset_0 = GetColumnOffset(columns->Current);
+    float offset_1 = GetColumnOffset(columns->Current + 1);
+    float width = offset_1 - offset_0;
+    PushItemWidth(width * 0.65f);
+    window->WorkRect.Max.x = window->Pos.x + offset_1 - column_padding;
+}
+
+void ImGui::EndColumns()
+{
+    ImGuiContext& g = *GImGui;
+    ImGuiWindow* window = GetCurrentWindow();
+    ImGuiColumns* columns = window->DC.CurrentColumns;
+    IM_ASSERT(columns != NULL);
+
+    PopItemWidth();
+    if (columns->Count > 1)
+    {
+        PopClipRect();
+        window->DrawList->ChannelsMerge();
+    }
+
+    const ImGuiColumnsFlags flags = columns->Flags;
+    columns->LineMaxY = ImMax(columns->LineMaxY, window->DC.CursorPos.y);
+    window->DC.CursorPos.y = columns->LineMaxY;
+    if (!(flags & ImGuiColumnsFlags_GrowParentContentsSize))
+        window->DC.CursorMaxPos.x = columns->HostCursorMaxPosX;  // Restore cursor max pos, as columns don't grow parent
+
+    // Draw columns borders and handle resize
+    // The IsBeingResized flag ensure we preserve pre-resize columns width so back-and-forth are not lossy
+    bool is_being_resized = false;
+    if (!(flags & ImGuiColumnsFlags_NoBorder) && !window->SkipItems)
+    {
+        // We clip Y boundaries CPU side because very long triangles are mishandled by some GPU drivers.
+        const float y1 = ImMax(columns->HostCursorPosY, window->ClipRect.Min.y);
+        const float y2 = ImMin(window->DC.CursorPos.y, window->ClipRect.Max.y);
+        int dragging_column = -1;
+        for (int n = 1; n < columns->Count; n++)
+        {
+            ImGuiColumnData* column = &columns->Columns[n];
+            float x = window->Pos.x + GetColumnOffset(n);
+            const ImGuiID column_id = columns->ID + ImGuiID(n);
+            const float column_hit_hw = COLUMNS_HIT_RECT_HALF_WIDTH;
+            const ImRect column_hit_rect(ImVec2(x - column_hit_hw, y1), ImVec2(x + column_hit_hw, y2));
+            KeepAliveID(column_id);
+            if (IsClippedEx(column_hit_rect, column_id, false))
+                continue;
+
+            bool hovered = false, held = false;
+            if (!(flags & ImGuiColumnsFlags_NoResize))
+            {
+                ButtonBehavior(column_hit_rect, column_id, &hovered, &held);
+                if (hovered || held)
+                    g.MouseCursor = ImGuiMouseCursor_ResizeEW;
+                if (held && !(column->Flags & ImGuiColumnsFlags_NoResize))
+                    dragging_column = n;
+            }
+
+            // Draw column
+            const ImU32 col = GetColorU32(held ? ImGuiCol_SeparatorActive : hovered ? ImGuiCol_SeparatorHovered : ImGuiCol_Separator);
+            const float xi = (float)(int)x;
+            window->DrawList->AddLine(ImVec2(xi, y1 + 1.0f), ImVec2(xi, y2), col);
+        }
+
+        // Apply dragging after drawing the column lines, so our rendered lines are in sync with how items were displayed during the frame.
+        if (dragging_column != -1)
+        {
+            if (!columns->IsBeingResized)
+                for (int n = 0; n < columns->Count + 1; n++)
+                    columns->Columns[n].OffsetNormBeforeResize = columns->Columns[n].OffsetNorm;
+            columns->IsBeingResized = is_being_resized = true;
+            float x = GetDraggedColumnOffset(columns, dragging_column);
+            SetColumnOffset(dragging_column, x);
+        }
+    }
+    columns->IsBeingResized = is_being_resized;
+
+    window->WorkRect = columns->HostWorkRect;
+    window->DC.CurrentColumns = NULL;
+    window->DC.ColumnsOffset.x = 0.0f;
+    window->DC.CursorPos.x = (float)(int)(window->Pos.x + window->DC.Indent.x + window->DC.ColumnsOffset.x);
+}
+
+// [2018-03: This is currently the only public API, while we are working on making BeginColumns/EndColumns user-facing]
+void ImGui::Columns(int columns_count, const char* id, bool border)
+{
+    ImGuiWindow* window = GetCurrentWindow();
+    IM_ASSERT(columns_count >= 1);
+
+    ImGuiColumnsFlags flags = (border ? 0 : ImGuiColumnsFlags_NoBorder);
+    //flags |= ImGuiColumnsFlags_NoPreserveWidths; // NB: Legacy behavior
+    ImGuiColumns* columns = window->DC.CurrentColumns;
+    if (columns != NULL && columns->Count == columns_count && columns->Flags == flags)
+        return;
+
+    if (columns != NULL)
+        EndColumns();
+
+    if (columns_count != 1)
+        BeginColumns(id, columns_count, flags);
+}
+
+//-------------------------------------------------------------------------
diff --git a/sources/3rdparty/stb/stb_image.h b/sources/3rdparty/stb/stb_image.h
index a6202a31..196dfd5c 100644
--- a/sources/3rdparty/stb/stb_image.h
+++ b/sources/3rdparty/stb/stb_image.h
@@ -1,4 +1,4 @@
-/* stb_image - v2.22 - public domain image loader - http://nothings.org/stb
+/* stb_image - v2.23 - public domain image loader - http://nothings.org/stb
                                   no warranty implied; use at your own risk
 
    Do this:
@@ -48,6 +48,7 @@ LICENSE
 
 RECENT REVISION HISTORY:
 
+      2.23  (2019-08-11) fix clang static analysis warning
       2.22  (2019-03-04) gif fixes, fix warnings
       2.21  (2019-02-25) fix typo in comment
       2.20  (2019-02-07) support utf8 filenames in Windows; fix warnings and platform ifdefs 
@@ -5079,7 +5080,7 @@ static int stbi__high_bit(unsigned int z)
    if (z >= 0x00100) { n +=  8; z >>=  8; }
    if (z >= 0x00010) { n +=  4; z >>=  4; }
    if (z >= 0x00004) { n +=  2; z >>=  2; }
-   if (z >= 0x00002) { n +=  1; z >>=  1; }
+   if (z >= 0x00002) { n +=  1;/* >>=  1;*/ }
    return n;
 }
 
@@ -5237,7 +5238,10 @@ static void *stbi__bmp_load(stbi__context *s, int *x, int *y, int *comp, int req
          psize = (info.offset - 14 - info.hsz) >> 2;
    }
 
-   s->img_n = ma ? 4 : 3;
+   if (info.bpp == 24 && ma == 0xff000000)
+      s->img_n = 3;
+   else
+      s->img_n = ma ? 4 : 3;
    if (req_comp && req_comp >= 3) // we can directly decode 3 or 4
       target = req_comp;
    else
@@ -5547,6 +5551,8 @@ static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req
    int RLE_repeating = 0;
    int read_next_pixel = 1;
    STBI_NOTUSED(ri);
+   STBI_NOTUSED(tga_x_origin); // @TODO
+   STBI_NOTUSED(tga_y_origin); // @TODO
 
    //   do a tiny bit of precessing
    if ( tga_image_type >= 8 )
@@ -5710,6 +5716,7 @@ static void *stbi__tga_load(stbi__context *s, int *x, int *y, int *comp, int req
    //   Microsoft's C compilers happy... [8^(
    tga_palette_start = tga_palette_len = tga_palette_bits =
          tga_x_origin = tga_y_origin = 0;
+   STBI_NOTUSED(tga_palette_start);
    //   OK, done
    return tga_data;
 }
@@ -6936,7 +6943,12 @@ static int stbi__bmp_info(stbi__context *s, int *x, int *y, int *comp)
       return 0;
    if (x) *x = s->img_x;
    if (y) *y = s->img_y;
-   if (comp) *comp = info.ma ? 4 : 3;
+   if (comp) {
+      if (info.bpp == 24 && info.ma == 0xff000000)
+         *comp = 3;
+      else
+         *comp = info.ma ? 4 : 3;
+   }
    return 1;
 }
 #endif
diff --git a/sources/3rdparty/stb/stb_image_write.h b/sources/3rdparty/stb/stb_image_write.h
index 082eb69d..a9bf66c1 100644
--- a/sources/3rdparty/stb/stb_image_write.h
+++ b/sources/3rdparty/stb/stb_image_write.h
@@ -1,4 +1,4 @@
-/* stb_image_write - v1.13 - public domain - http://nothings.org/stb/stb_image_write.h
+/* stb_image_write - v1.13 - public domain - http://nothings.org/stb
    writes out PNG/BMP/TGA/JPEG/HDR images to C stdio - Sean Barrett 2010-2015
                                      no warranty implied; use at your own risk
 
@@ -868,7 +868,7 @@ STBIWDEF unsigned char * stbi_zlib_compress(unsigned char *data, int data_len, i
    unsigned int bitbuf=0;
    int i,j, bitcount=0;
    unsigned char *out = NULL;
-   unsigned char ***hash_table = (unsigned char***) STBIW_MALLOC(stbiw__ZHASH * sizeof(char**));
+   unsigned char ***hash_table = (unsigned char***) STBIW_MALLOC(stbiw__ZHASH * sizeof(unsigned char**));
    if (hash_table == NULL)
       return NULL;
    if (quality < 5) quality = 5;
@@ -1530,6 +1530,8 @@ STBIWDEF int stbi_write_jpg(char const *filename, int x, int y, int comp, const
 #endif // STB_IMAGE_WRITE_IMPLEMENTATION
 
 /* Revision history
+      1.11  (2019-08-11)
+             
       1.10  (2019-02-07)
              support utf8 filenames in Windows; fix warnings and platform ifdefs 
       1.09  (2018-02-11)
diff --git a/sources/3rdparty/stb/stb_truetype.h b/sources/3rdparty/stb/stb_truetype.h
index 767f005a..4a3ad33d 100644
--- a/sources/3rdparty/stb/stb_truetype.h
+++ b/sources/3rdparty/stb/stb_truetype.h
@@ -1,5 +1,5 @@
-// stb_truetype.h - v1.21 - public domain
-// authored from 2009-2016 by Sean Barrett / RAD Game Tools
+// stb_truetype.h - v1.22 - public domain
+// authored from 2009-2019 by Sean Barrett / RAD Game Tools
 //
 //   This library processes TrueType files:
 //        parse files
@@ -46,9 +46,11 @@
 //       Rob Loach                  Cort Stratton
 //       Kenney Phillis Jr.         github:oyvindjam
 //       Brian Costabile            github:vassvik
+//       Ken Voskuil (kaesve)       Ryan Griege
 //       
 // VERSION HISTORY
 //
+//   1.22 (2019-08-11) minimize missing-glyph duplication; fix kerning if both 'GPOS' and 'kern' are defined 
 //   1.21 (2019-02-25) fix warning
 //   1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics()
 //   1.19 (2018-02-11) GPOS kerning, STBTT_fmod
@@ -2540,8 +2542,7 @@ STBTT_DEF int  stbtt_GetGlyphKernAdvance(const stbtt_fontinfo *info, int g1, int
 
    if (info->gpos)
       xAdvance += stbtt__GetGlyphGPOSInfoAdvance(info, g1, g2);
-
-   if (info->kern)
+   else if (info->kern)
       xAdvance += stbtt__GetGlyphKernInfoAdvance(info, g1, g2);
 
    return xAdvance;
@@ -3968,6 +3969,7 @@ static float stbtt__oversample_shift(int oversample)
 STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects)
 {
    int i,j,k;
+   int missing_glyph_added = 0;
 
    k=0;
    for (i=0; i < num_ranges; ++i) {
@@ -3979,7 +3981,7 @@ STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stb
          int x0,y0,x1,y1;
          int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j];
          int glyph = stbtt_FindGlyphIndex(info, codepoint);
-         if (glyph == 0 && spc->skip_missing) {
+         if (glyph == 0 && (spc->skip_missing || missing_glyph_added)) {
             rects[k].w = rects[k].h = 0;
          } else {
             stbtt_GetGlyphBitmapBoxSubpixel(info,glyph,
@@ -3989,6 +3991,8 @@ STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stb
                                             &x0,&y0,&x1,&y1);
             rects[k].w = (stbrp_coord) (x1-x0 + spc->padding + spc->h_oversample-1);
             rects[k].h = (stbrp_coord) (y1-y0 + spc->padding + spc->v_oversample-1);
+            if (glyph == 0)
+               missing_glyph_added = 1;
          }
          ++k;
       }
@@ -4023,7 +4027,7 @@ STBTT_DEF void stbtt_MakeGlyphBitmapSubpixelPrefilter(const stbtt_fontinfo *info
 // rects array must be big enough to accommodate all characters in the given ranges
 STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const stbtt_fontinfo *info, stbtt_pack_range *ranges, int num_ranges, stbrp_rect *rects)
 {
-   int i,j,k, return_value = 1;
+   int i,j,k, missing_glyph = -1, return_value = 1;
 
    // save current values
    int old_h_over = spc->h_oversample;
@@ -4088,6 +4092,13 @@ STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const
             bc->yoff     =       (float)  y0 * recip_v + sub_y;
             bc->xoff2    =                (x0 + r->w) * recip_h + sub_x;
             bc->yoff2    =                (y0 + r->h) * recip_v + sub_y;
+
+            if (glyph == 0)
+               missing_glyph = j;
+         } else if (spc->skip_missing) {
+            return_value = 0;
+         } else if (r->was_packed && r->w == 0 && r->h == 0 && missing_glyph >= 0) {
+            ranges[i].chardata_for_range[j] = ranges[i].chardata_for_range[missing_glyph];
          } else {
             return_value = 0; // if any fail, report failure
          }
@@ -4389,12 +4400,7 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc
    int w,h;
    unsigned char *data;
 
-   // if one scale is 0, use same scale for both
-   if (scale_x == 0) scale_x = scale_y;
-   if (scale_y == 0) {
-      if (scale_x == 0) return NULL;  // if both scales are 0, return NULL
-      scale_y = scale_x;
-   }
+   if (scale == 0) return NULL;
 
    stbtt_GetGlyphBitmapBoxSubpixel(info, glyph, scale, scale, 0.0f,0.0f, &ix0,&iy0,&ix1,&iy1);
 
diff --git a/untests/catch/catch.hpp b/untests/catch/catch.hpp
index 303f664f..5feb2a4b 100644
--- a/untests/catch/catch.hpp
+++ b/untests/catch/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  Catch v2.9.1
- *  Generated: 2019-06-17 11:59:24.363643
+ *  Catch v2.9.2
+ *  Generated: 2019-08-08 13:35:12.279703
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2019 Two Blue Cubes Ltd. All rights reserved.
@@ -15,7 +15,7 @@
 
 #define CATCH_VERSION_MAJOR 2
 #define CATCH_VERSION_MINOR 9
-#define CATCH_VERSION_PATCH 1
+#define CATCH_VERSION_PATCH 2
 
 #ifdef __clang__
 #    pragma clang system_header
@@ -275,6 +275,17 @@ namespace Catch {
     #define CATCH_INTERNAL_CONFIG_COUNTER
 #endif
 
+////////////////////////////////////////////////////////////////////////////////
+
+// RTX is a special version of Windows that is real time.
+// This means that it is detected as Windows, but does not provide
+// the same set of capabilities as real Windows does.
+#if defined(UNDER_RTSS) || defined(RTX64_BUILD)
+    #define CATCH_INTERNAL_CONFIG_NO_WINDOWS_SEH
+    #define CATCH_INTERNAL_CONFIG_NO_ASYNC
+    #define CATCH_CONFIG_COLOUR_NONE
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 // Check if string_view is available and usable
 // The check is split apart to work around v140 (VS2015) preprocessor issue...
@@ -292,6 +303,14 @@ namespace Catch {
 #  endif // __has_include(<optional>) && defined(CATCH_CPP17_OR_GREATER)
 #endif // __has_include
 
+////////////////////////////////////////////////////////////////////////////////
+// Check if byte is available and usable
+#if defined(__has_include)
+#  if __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+#    define CATCH_INTERNAL_CONFIG_CPP17_BYTE
+#  endif // __has_include(<cstddef>) && defined(CATCH_CPP17_OR_GREATER)
+#endif // __has_include
+
 ////////////////////////////////////////////////////////////////////////////////
 // Check if variant is available and usable
 #if defined(__has_include)
@@ -346,6 +365,10 @@ namespace Catch {
 #  define CATCH_CONFIG_CPP17_VARIANT
 #endif
 
+#if defined(CATCH_INTERNAL_CONFIG_CPP17_BYTE) && !defined(CATCH_CONFIG_NO_CPP17_BYTE) && !defined(CATCH_CONFIG_CPP17_BYTE)
+#  define CATCH_CONFIG_CPP17_BYTE
+#endif
+
 #if defined(CATCH_CONFIG_EXPERIMENTAL_REDIRECT)
 #  define CATCH_INTERNAL_CONFIG_NEW_CAPTURE
 #endif
@@ -362,7 +385,7 @@ namespace Catch {
 #  define CATCH_CONFIG_POLYFILL_ISNAN
 #endif
 
-#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
+#if defined(CATCH_INTERNAL_CONFIG_USE_ASYNC)  && !defined(CATCH_INTERNAL_CONFIG_NO_ASYNC) && !defined(CATCH_CONFIG_NO_USE_ASYNC) && !defined(CATCH_CONFIG_USE_ASYNC)
 #  define CATCH_CONFIG_USE_ASYNC
 #endif
 
@@ -515,6 +538,7 @@ namespace Catch {
         virtual std::vector<TestCase> const& getAllTestsSorted( IConfig const& config ) const = 0;
     };
 
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
     bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
     std::vector<TestCase> filterTests( std::vector<TestCase> const& testCases, TestSpec const& testSpec, IConfig const& config );
     std::vector<TestCase> const& getAllTestCasesSorted( IConfig const& config );
@@ -1153,7 +1177,7 @@ struct AutoReg : NonCopyable {
             }                                                     \
         };\
         static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){ \
-                using TestInit = decltype(convert<TestName>(TmplList {})); \
+                using TestInit = decltype(convert<TestName>(std::declval<TmplList>())); \
                 TestInit t;                                           \
                 t.reg_tests();                                        \
                 return 0;                                             \
@@ -1279,7 +1303,7 @@ struct AutoReg : NonCopyable {
                 }\
             };\
             static int INTERNAL_CATCH_UNIQUE_NAME( globalRegistrar ) = [](){\
-                using TestInit = decltype(convert<TestNameClass>(TmplList {}));\
+                using TestInit = decltype(convert<TestNameClass>(std::declval<TmplList>()));\
                 TestInit t;\
                 t.reg_tests();\
                 return 0;\
@@ -1679,6 +1703,12 @@ namespace Catch {
         }
     };
 
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+    template<>
+    struct StringMaker<std::byte> {
+        static std::string convert(std::byte value);
+    };
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
     template<>
     struct StringMaker<int> {
         static std::string convert(int value);
@@ -3180,6 +3210,15 @@ namespace Matchers {
             virtual bool match( ObjectT const& arg ) const = 0;
         };
 
+#if defined(__OBJC__)
+        // Hack to fix Catch GH issue #1661. Could use id for generic Object support.
+        // use of const for Object pointers is very uncommon and under ARC it causes some kind of signature mismatch that breaks compilation
+        template<>
+        struct MatcherMethod<NSString*> {
+            virtual bool match( NSString* arg ) const = 0;
+        };
+#endif
+
 #ifdef __clang__
 #    pragma clang diagnostic pop
 #endif
@@ -3829,6 +3868,9 @@ namespace Generators {
 
     template<typename T>
     class FixedValuesGenerator final : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "ValuesGenerator does not support bools because of std::vector<bool>"
+            "specialization, use SingleValue Generator instead.");
         std::vector<T> m_values;
         size_t m_idx = 0;
     public:
@@ -4048,6 +4090,9 @@ namespace Generators {
 
     template <typename T>
     class RepeatGenerator : public IGenerator<T> {
+        static_assert(!std::is_same<T, bool>::value,
+            "RepeatGenerator currently does not support bools"
+            "because of std::vector<bool> specialization");
         GeneratorWrapper<T> m_generator;
         mutable std::vector<T> m_returned;
         size_t m_target_repeats;
@@ -4162,12 +4207,14 @@ namespace Generators {
             m_chunk_size(size), m_generator(std::move(generator))
         {
             m_chunk.reserve(m_chunk_size);
-            m_chunk.push_back(m_generator.get());
-            for (size_t i = 1; i < m_chunk_size; ++i) {
-                if (!m_generator.next()) {
-                    Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
-                }
+            if (m_chunk_size != 0) {
                 m_chunk.push_back(m_generator.get());
+                for (size_t i = 1; i < m_chunk_size; ++i) {
+                    if (!m_generator.next()) {
+                        Catch::throw_exception(GeneratorException("Not enough values to initialize the first chunk"));
+                    }
+                    m_chunk.push_back(m_generator.get());
+                }
             }
         }
         std::vector<T> const& get() const override {
@@ -4711,7 +4758,7 @@ namespace Catch {
                     arcSafeRelease( m_substr );
                 }
 
-                bool match( NSString* const& str ) const override {
+                bool match( NSString* str ) const override {
                     return false;
                 }
 
@@ -4721,7 +4768,7 @@ namespace Catch {
             struct Equals : StringHolder {
                 Equals( NSString* substr ) : StringHolder( substr ){}
 
-                bool match( NSString* const& str ) const override {
+                bool match( NSString* str ) const override {
                     return  (str != nil || m_substr == nil ) &&
                             [str isEqualToString:m_substr];
                 }
@@ -4734,7 +4781,7 @@ namespace Catch {
             struct Contains : StringHolder {
                 Contains( NSString* substr ) : StringHolder( substr ){}
 
-                bool match( NSString* const& str ) const override {
+                bool match( NSString* str ) const override {
                     return  (str != nil || m_substr == nil ) &&
                             [str rangeOfString:m_substr].location != NSNotFound;
                 }
@@ -4747,7 +4794,7 @@ namespace Catch {
             struct StartsWith : StringHolder {
                 StartsWith( NSString* substr ) : StringHolder( substr ){}
 
-                bool match( NSString* const& str ) const override {
+                bool match( NSString* str ) const override {
                     return  (str != nil || m_substr == nil ) &&
                             [str rangeOfString:m_substr].location == 0;
                 }
@@ -4759,7 +4806,7 @@ namespace Catch {
             struct EndsWith : StringHolder {
                 EndsWith( NSString* substr ) : StringHolder( substr ){}
 
-                bool match( NSString* const& str ) const override {
+                bool match( NSString* str ) const override {
                     return  (str != nil || m_substr == nil ) &&
                             [str rangeOfString:m_substr].location == [str length] - [m_substr length];
                 }
@@ -4867,17 +4914,23 @@ namespace Catch
 
 namespace Catch {
 
+    struct IConfig;
+
     class TestSpec {
-        struct Pattern {
+        class Pattern {
+        public:
+            explicit Pattern( std::string const& name );
             virtual ~Pattern();
             virtual bool matches( TestCaseInfo const& testCase ) const = 0;
+            std::string const& name() const;
+        private:
+            std::string const m_name;
         };
         using PatternPtr = std::shared_ptr<Pattern>;
 
         class NamePattern : public Pattern {
         public:
-            NamePattern( std::string const& name );
-            virtual ~NamePattern();
+            explicit NamePattern( std::string const& name, std::string const& filterString );
             bool matches( TestCaseInfo const& testCase ) const override;
         private:
             WildcardPattern m_wildcardPattern;
@@ -4885,8 +4938,7 @@ namespace Catch {
 
         class TagPattern : public Pattern {
         public:
-            TagPattern( std::string const& tag );
-            virtual ~TagPattern();
+            explicit TagPattern( std::string const& tag, std::string const& filterString );
             bool matches( TestCaseInfo const& testCase ) const override;
         private:
             std::string m_tag;
@@ -4894,8 +4946,7 @@ namespace Catch {
 
         class ExcludedPattern : public Pattern {
         public:
-            ExcludedPattern( PatternPtr const& underlyingPattern );
-            virtual ~ExcludedPattern();
+            explicit ExcludedPattern( PatternPtr const& underlyingPattern );
             bool matches( TestCaseInfo const& testCase ) const override;
         private:
             PatternPtr m_underlyingPattern;
@@ -4905,11 +4956,19 @@ namespace Catch {
             std::vector<PatternPtr> m_patterns;
 
             bool matches( TestCaseInfo const& testCase ) const;
+            std::string name() const;
         };
 
     public:
+        struct FilterMatch {
+            std::string name;
+            std::vector<TestCase const*> tests;
+        };
+        using Matches = std::vector<FilterMatch>;
+
         bool hasFilters() const;
         bool matches( TestCaseInfo const& testCase ) const;
+        Matches matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const;
 
     private:
         std::vector<Filter> m_filters;
@@ -4949,8 +5008,10 @@ namespace Catch {
         enum Mode{ None, Name, QuotedName, Tag, EscapedName };
         Mode m_mode = None;
         bool m_exclusion = false;
-        std::size_t m_start = std::string::npos, m_pos = 0;
+        std::size_t m_pos = 0;
         std::string m_arg;
+        std::string m_substring;
+        std::string m_patternName;
         std::vector<std::size_t> m_escapeChars;
         TestSpec::Filter m_currentFilter;
         TestSpec m_testSpec;
@@ -4964,26 +5025,32 @@ namespace Catch {
 
     private:
         void visitChar( char c );
-        void startNewMode( Mode mode, std::size_t start );
+        void startNewMode( Mode mode );
+        bool processNoneChar( char c );
+        void processNameChar( char c );
+        bool processOtherChar( char c );
+        void endMode();
         void escape();
-        std::string subString() const;
+        bool isControlChar( char c ) const;
 
         template<typename T>
         void addPattern() {
-            std::string token = subString();
+            std::string token = m_patternName;
             for( std::size_t i = 0; i < m_escapeChars.size(); ++i )
-                token = token.substr( 0, m_escapeChars[i]-m_start-i ) + token.substr( m_escapeChars[i]-m_start-i+1 );
+                token = token.substr( 0, m_escapeChars[i] - i ) + token.substr( m_escapeChars[i] -i +1 );
             m_escapeChars.clear();
             if( startsWith( token, "exclude:" ) ) {
                 m_exclusion = true;
                 token = token.substr( 8 );
             }
             if( !token.empty() ) {
-                TestSpec::PatternPtr pattern = std::make_shared<T>( token );
+                TestSpec::PatternPtr pattern = std::make_shared<T>( token, m_substring );
                 if( m_exclusion )
                     pattern = std::make_shared<TestSpec::ExcludedPattern>( pattern );
                 m_currentFilter.m_patterns.push_back( pattern );
             }
+            m_substring.clear();
+            m_patternName.clear();
             m_exclusion = false;
             m_mode = None;
         }
@@ -6126,6 +6193,7 @@ namespace Catch {
         void testRunEnded(TestRunStats const& testRunStats) override;
 
 #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
+        void benchmarkPreparing(std::string const& name) override;
         void benchmarkStarting(BenchmarkInfo const&) override;
         void benchmarkEnded(BenchmarkStats<> const&) override;
         void benchmarkFailed(std::string const&) override;
@@ -9919,7 +9987,16 @@ namespace Catch {
 }
 
 // end catch_debug_console.h
-#ifdef CATCH_PLATFORM_WINDOWS
+#if defined(__ANDROID__)
+#include <android/log.h>
+
+    namespace Catch {
+        void writeToDebugConsole( std::string const& text ) {
+            __android_log_print( ANDROID_LOG_DEBUG, "Catch", text.c_str() );
+        }
+    }
+
+#elif defined(CATCH_PLATFORM_WINDOWS)
 
     namespace Catch {
         void writeToDebugConsole( std::string const& text ) {
@@ -10373,7 +10450,7 @@ namespace Catch {
 
     // 32kb for the alternate stack seems to be sufficient. However, this value
     // is experimentally determined, so that's not guaranteed.
-    constexpr static std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
+    static constexpr std::size_t sigStackSize = 32768 >= MINSIGSTKSZ ? 32768 : MINSIGSTKSZ;
 
     static SignalDefs signalDefs[] = {
         { SIGINT,  "SIGINT - Terminal interrupt signal" },
@@ -10811,9 +10888,18 @@ namespace Catch {
     }
 
     std::string TagInfo::all() const {
-        std::string out;
-        for( auto const& spelling : spellings )
-            out += "[" + spelling + "]";
+        size_t size = 0;
+        for (auto const& spelling : spellings) {
+            // Add 2 for the brackes
+            size += spelling.size() + 2;
+        }
+
+        std::string out; out.reserve(size);
+        for (auto const& spelling : spellings) {
+            out += '[';
+            out += spelling;
+            out += ']';
+        }
         return out;
     }
 
@@ -11660,6 +11746,8 @@ namespace Catch {
     struct IConfig;
 
     std::vector<TestCase> sortTests( IConfig const& config, std::vector<TestCase> const& unsortedTestCases );
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config );
     bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config );
 
     void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions );
@@ -12503,7 +12591,7 @@ namespace Catch {
         void libIdentify();
 
         int applyCommandLine( int argc, char const * const * argv );
-    #if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(UNICODE)
+    #if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
         int applyCommandLine( int argc, wchar_t const * const * argv );
     #endif
 
@@ -12570,6 +12658,8 @@ namespace Catch {
 // end catch_version.h
 #include <cstdlib>
 #include <iomanip>
+#include <set>
+#include <iterator>
 
 namespace Catch {
 
@@ -12603,45 +12693,53 @@ namespace Catch {
             return ret;
         }
 
-        Catch::Totals runTests(std::shared_ptr<Config> const& config) {
-            auto reporter = makeReporter(config);
+        class TestGroup {
+        public:
+            explicit TestGroup(std::shared_ptr<Config> const& config)
+            : m_config{config}
+            , m_context{config, makeReporter(config)}
+            {
+                auto const& allTestCases = getAllTestCasesSorted(*m_config);
+                m_matches = m_config->testSpec().matchesByFilter(allTestCases, *m_config);
 
-            RunContext context(config, std::move(reporter));
-
-            Totals totals;
-
-            context.testGroupStarting(config->name(), 1, 1);
-
-            TestSpec testSpec = config->testSpec();
-
-            auto const& allTestCases = getAllTestCasesSorted(*config);
-            for (auto const& testCase : allTestCases) {
-                bool matching = (!testSpec.hasFilters() && !testCase.isHidden()) ||
-                                 (testSpec.hasFilters() && matchTest(testCase, testSpec, *config));
-
-                if (!context.aborting() && matching)
-                    totals += context.runTest(testCase);
-                else
-                    context.reporter().skipTest(testCase);
+                if (m_matches.empty()) {
+                    for (auto const& test : allTestCases)
+                        if (!test.isHidden())
+                            m_tests.emplace(&test);
+                } else {
+                    for (auto const& match : m_matches)
+                        m_tests.insert(match.tests.begin(), match.tests.end());
+                }
             }
 
-            if (config->warnAboutNoTests() && totals.testCases.total() == 0) {
-                ReusableStringStream testConfig;
-
-                bool first = true;
-                for (const auto& input : config->getTestsOrTags()) {
-                    if (!first) { testConfig << ' '; }
-                    first = false;
-                    testConfig << input;
+            Totals execute() {
+                Totals totals;
+                m_context.testGroupStarting(m_config->name(), 1, 1);
+                for (auto const& testCase : m_tests) {
+                    if (!m_context.aborting())
+                        totals += m_context.runTest(*testCase);
+                    else
+                        m_context.reporter().skipTest(*testCase);
                 }
 
-                context.reporter().noMatchingTestCases(testConfig.str());
-                totals.error = -1;
+                for (auto const& match : m_matches) {
+                    if (match.tests.empty()) {
+                        m_context.reporter().noMatchingTestCases(match.name);
+                        totals.error = -1;
+                    }
+                }
+                m_context.testGroupEnded(m_config->name(), totals, 1, 1);
+                return totals;
             }
 
-            context.testGroupEnded(config->name(), totals, 1, 1);
-            return totals;
-        }
+        private:
+            using Tests = std::set<TestCase const*>;
+
+            std::shared_ptr<Config> m_config;
+            RunContext m_context;
+            Tests m_tests;
+            TestSpec::Matches m_matches;
+        };
 
         void applyFilenamesAsTags(Catch::IConfig const& config) {
             auto& tests = const_cast<std::vector<TestCase>&>(getAllTestCasesSorted(config));
@@ -12741,7 +12839,7 @@ namespace Catch {
         return 0;
     }
 
-#if defined(CATCH_CONFIG_WCHAR) && defined(WIN32) && defined(UNICODE)
+#if defined(CATCH_CONFIG_WCHAR) && defined(_WIN32) && defined(UNICODE)
     int Session::applyCommandLine( int argc, wchar_t const * const * argv ) {
 
         char **utf8Argv = new char *[ argc ];
@@ -12818,7 +12916,12 @@ namespace Catch {
             if( Option<std::size_t> listed = list( m_config ) )
                 return static_cast<int>( *listed );
 
-            auto totals = runTests( m_config );
+            TestGroup tests { m_config };
+            auto const totals = tests.execute();
+
+            if( m_config->warnAboutNoTests() && totals.error == -1 )
+                return 2;
+
             // Note that on unices only the lower 8 bits are usually used, clamping
             // the return value to 255 prevents false negative when some multiple
             // of 256 tests has failed
@@ -13529,8 +13632,13 @@ namespace Catch {
         }
         return sorted;
     }
+
+    bool isThrowSafe( TestCase const& testCase, IConfig const& config ) {
+        return !testCase.throws() || config.allowThrows();
+    }
+
     bool matchTest( TestCase const& testCase, TestSpec const& testSpec, IConfig const& config ) {
-        return testSpec.matches( testCase ) && ( config.allowThrows() || !testCase.throws() );
+        return testSpec.matches( testCase ) && isThrowSafe( testCase, config );
     }
 
     void enforceNoDuplicateTestCases( std::vector<TestCase> const& functions ) {
@@ -13733,7 +13841,7 @@ namespace TestCaseTracking {
                 m_runState = CompletedSuccessfully;
                 break;
             case ExecutingChildren:
-                if( m_children.empty() || m_children.back()->isComplete() )
+                if( std::all_of(m_children.begin(), m_children.end(), [](ITrackerPtr const& t){ return t->isComplete(); }) )
                     m_runState = CompletedSuccessfully;
                 break;
 
@@ -13876,47 +13984,77 @@ namespace Catch {
 
 namespace Catch {
 
-    TestSpec::Pattern::~Pattern() = default;
-    TestSpec::NamePattern::~NamePattern() = default;
-    TestSpec::TagPattern::~TagPattern() = default;
-    TestSpec::ExcludedPattern::~ExcludedPattern() = default;
-
-    TestSpec::NamePattern::NamePattern( std::string const& name )
-    : m_wildcardPattern( toLower( name ), CaseSensitive::No )
+    TestSpec::Pattern::Pattern( std::string const& name )
+    : m_name( name )
     {}
+
+    TestSpec::Pattern::~Pattern() = default;
+
+    std::string const& TestSpec::Pattern::name() const {
+        return m_name;
+    }
+
+    TestSpec::NamePattern::NamePattern( std::string const& name, std::string const& filterString )
+    : Pattern( filterString )
+    , m_wildcardPattern( toLower( name ), CaseSensitive::No )
+    {}
+
     bool TestSpec::NamePattern::matches( TestCaseInfo const& testCase ) const {
         return m_wildcardPattern.matches( toLower( testCase.name ) );
     }
 
-    TestSpec::TagPattern::TagPattern( std::string const& tag ) : m_tag( toLower( tag ) ) {}
+    TestSpec::TagPattern::TagPattern( std::string const& tag, std::string const& filterString )
+    : Pattern( filterString )
+    , m_tag( toLower( tag ) )
+    {}
+
     bool TestSpec::TagPattern::matches( TestCaseInfo const& testCase ) const {
         return std::find(begin(testCase.lcaseTags),
                          end(testCase.lcaseTags),
                          m_tag) != end(testCase.lcaseTags);
     }
 
-    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern ) : m_underlyingPattern( underlyingPattern ) {}
-    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const { return !m_underlyingPattern->matches( testCase ); }
+    TestSpec::ExcludedPattern::ExcludedPattern( PatternPtr const& underlyingPattern )
+    : Pattern( underlyingPattern->name() )
+    , m_underlyingPattern( underlyingPattern )
+    {}
+
+    bool TestSpec::ExcludedPattern::matches( TestCaseInfo const& testCase ) const {
+        return !m_underlyingPattern->matches( testCase );
+    }
 
     bool TestSpec::Filter::matches( TestCaseInfo const& testCase ) const {
-        // All patterns in a filter must match for the filter to be a match
-        for( auto const& pattern : m_patterns ) {
-            if( !pattern->matches( testCase ) )
-                return false;
-        }
-        return true;
+        return std::all_of( m_patterns.begin(), m_patterns.end(), [&]( PatternPtr const& p ){ return p->matches( testCase ); } );
+    }
+
+    std::string TestSpec::Filter::name() const {
+        std::string name;
+        for( auto const& p : m_patterns )
+            name += p->name();
+        return name;
     }
 
     bool TestSpec::hasFilters() const {
         return !m_filters.empty();
     }
+
     bool TestSpec::matches( TestCaseInfo const& testCase ) const {
-        // A TestSpec matches if any filter matches
-        for( auto const& filter : m_filters )
-            if( filter.matches( testCase ) )
-                return true;
-        return false;
+        return std::any_of( m_filters.begin(), m_filters.end(), [&]( Filter const& f ){ return f.matches( testCase ); } );
     }
+
+    TestSpec::Matches TestSpec::matchesByFilter( std::vector<TestCase> const& testCases, IConfig const& config ) const
+    {
+        Matches matches( m_filters.size() );
+        std::transform( m_filters.begin(), m_filters.end(), matches.begin(), [&]( Filter const& filter ){
+            std::vector<TestCase const*> currentMatches;
+            for( auto const& test : testCases )
+                if( isThrowSafe( test, config ) && filter.matches( test ) )
+                    currentMatches.emplace_back( &test );
+            return FilterMatch{ filter.name(), currentMatches };
+        } );
+        return matches;
+    }
+
 }
 // end catch_test_spec.cpp
 // start catch_test_spec_parser.cpp
@@ -13928,64 +14066,125 @@ namespace Catch {
     TestSpecParser& TestSpecParser::parse( std::string const& arg ) {
         m_mode = None;
         m_exclusion = false;
-        m_start = std::string::npos;
         m_arg = m_tagAliases->expandAliases( arg );
         m_escapeChars.clear();
+        m_substring.reserve(m_arg.size());
+        m_patternName.reserve(m_arg.size());
         for( m_pos = 0; m_pos < m_arg.size(); ++m_pos )
             visitChar( m_arg[m_pos] );
-        if( m_mode == Name )
-            addPattern<TestSpec::NamePattern>();
+        endMode();
         return *this;
     }
     TestSpec TestSpecParser::testSpec() {
         addFilter();
         return m_testSpec;
     }
-
     void TestSpecParser::visitChar( char c ) {
-        if( m_mode == None ) {
-            switch( c ) {
-            case ' ': return;
-            case '~': m_exclusion = true; return;
-            case '[': return startNewMode( Tag, ++m_pos );
-            case '"': return startNewMode( QuotedName, ++m_pos );
-            case '\\': return escape();
-            default: startNewMode( Name, m_pos ); break;
-            }
+        if( c == ',' ) {
+            endMode();
+            addFilter();
+            return;
         }
-        if( m_mode == Name ) {
-            if( c == ',' ) {
-                addPattern<TestSpec::NamePattern>();
-                addFilter();
-            }
-            else if( c == '[' ) {
-                if( subString() == "exclude:" )
-                    m_exclusion = true;
-                else
-                    addPattern<TestSpec::NamePattern>();
-                startNewMode( Tag, ++m_pos );
-            }
-            else if( c == '\\' )
-                escape();
+
+        switch( m_mode ) {
+        case None:
+            if( processNoneChar( c ) )
+                return;
+            break;
+        case Name:
+            processNameChar( c );
+            break;
+        case EscapedName:
+            endMode();
+            break;
+        default:
+        case Tag:
+        case QuotedName:
+            if( processOtherChar( c ) )
+                return;
+            break;
         }
-        else if( m_mode == EscapedName )
-            m_mode = Name;
-        else if( m_mode == QuotedName && c == '"' )
-            addPattern<TestSpec::NamePattern>();
-        else if( m_mode == Tag && c == ']' )
-            addPattern<TestSpec::TagPattern>();
+
+        m_substring += c;
+        if( !isControlChar( c ) )
+            m_patternName += c;
     }
-    void TestSpecParser::startNewMode( Mode mode, std::size_t start ) {
+    // Two of the processing methods return true to signal the caller to return
+    // without adding the given character to the current pattern strings
+    bool TestSpecParser::processNoneChar( char c ) {
+        switch( c ) {
+        case ' ':
+            return true;
+        case '~':
+            m_exclusion = true;
+            return false;
+        case '[':
+            startNewMode( Tag );
+            return false;
+        case '"':
+            startNewMode( QuotedName );
+            return false;
+        case '\\':
+            escape();
+            return true;
+        default:
+            startNewMode( Name );
+            return false;
+        }
+    }
+    void TestSpecParser::processNameChar( char c ) {
+        if( c == '[' ) {
+            if( m_substring == "exclude:" )
+                m_exclusion = true;
+            else
+                endMode();
+            startNewMode( Tag );
+        }
+    }
+    bool TestSpecParser::processOtherChar( char c ) {
+        if( !isControlChar( c ) )
+            return false;
+        m_substring += c;
+        endMode();
+        return true;
+    }
+    void TestSpecParser::startNewMode( Mode mode ) {
         m_mode = mode;
-        m_start = start;
+    }
+    void TestSpecParser::endMode() {
+        switch( m_mode ) {
+        case Name:
+        case QuotedName:
+            return addPattern<TestSpec::NamePattern>();
+        case Tag:
+            return addPattern<TestSpec::TagPattern>();
+        case EscapedName:
+            return startNewMode( Name );
+        case None:
+        default:
+            return startNewMode( None );
+        }
     }
     void TestSpecParser::escape() {
-        if( m_mode == None )
-            m_start = m_pos;
         m_mode = EscapedName;
         m_escapeChars.push_back( m_pos );
     }
-    std::string TestSpecParser::subString() const { return m_arg.substr( m_start, m_pos - m_start ); }
+    bool TestSpecParser::isControlChar( char c ) const {
+        switch( m_mode ) {
+            default:
+                return false;
+            case None:
+                return c == '~';
+            case Name:
+                return c == '[';
+            case EscapedName:
+                return true;
+            case QuotedName:
+                return c == '"';
+            case Tag:
+                return c == '[' || c == ']';
+        }
+    }
 
     void TestSpecParser::addFilter() {
         if( !m_currentFilter.m_patterns.empty() ) {
@@ -14225,6 +14424,13 @@ std::string StringMaker<wchar_t *>::convert(wchar_t * str) {
 }
 #endif
 
+#if defined(CATCH_CONFIG_CPP17_BYTE)
+#include <cstddef>
+std::string StringMaker<std::byte>::convert(std::byte value) {
+    return ::Catch::Detail::stringify(std::to_integer<unsigned long long>(value));
+}
+#endif // defined(CATCH_CONFIG_CPP17_BYTE)
+
 std::string StringMaker<int>::convert(int value) {
     return ::Catch::Detail::stringify(static_cast<long long>(value));
 }
@@ -14414,7 +14620,7 @@ namespace Catch {
     }
 
     Version const& libraryVersion() {
-        static Version version( 2, 9, 1, "", 0 );
+        static Version version( 2, 9, 2, "", 0 );
         return version;
     }
 
@@ -15001,24 +15207,25 @@ private:
         if (itMessage == messages.end())
             return;
 
-        // using messages.end() directly yields (or auto) compilation error:
-        std::vector<MessageInfo>::const_iterator itEnd = messages.end();
-        const std::size_t N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
+        const auto itEnd = messages.cend();
+        const auto N = static_cast<std::size_t>(std::distance(itMessage, itEnd));
 
         {
             Colour colourGuard(colour);
             stream << " with " << pluralise(N, "message") << ':';
         }
 
-        for (; itMessage != itEnd; ) {
+        while (itMessage != itEnd) {
             // If this assertion is a warning ignore any INFO messages
             if (printInfoMessages || itMessage->type != ResultWas::Info) {
-                stream << " '" << itMessage->message << '\'';
-                if (++itMessage != itEnd) {
+                printMessage();
+                if (itMessage != itEnd) {
                     Colour colourGuard(dimColour());
                     stream << " and";
                 }
+                continue;
             }
+            ++itMessage;
         }
     }
 
@@ -16355,10 +16562,13 @@ namespace Catch {
     }
 
 #if defined(CATCH_CONFIG_ENABLE_BENCHMARKING)
-    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
+    void XmlReporter::benchmarkPreparing(std::string const& name) {
         m_xml.startElement("BenchmarkResults")
-            .writeAttribute("name", info.name)
-            .writeAttribute("samples", info.samples)
+            .writeAttribute("name", name);
+    }
+
+    void XmlReporter::benchmarkStarting(BenchmarkInfo const &info) {
+        m_xml.writeAttribute("samples", info.samples)
             .writeAttribute("resamples", info.resamples)
             .writeAttribute("iterations", info.iterations)
             .writeAttribute("clockResolution", static_cast<uint64_t>(info.clockResolution))

From c9337bf7386028ac5d9f057ffcafaad2fa731994 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 22 Aug 2019 10:08:02 +0700
Subject: [PATCH 085/108] fix 3rdparty warnings

---
 sources/3rdparty/bass/macosx/bass.h | 8 ++++----
 sources/3rdparty/stb/stb_image.h    | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sources/3rdparty/bass/macosx/bass.h b/sources/3rdparty/bass/macosx/bass.h
index 388d4068..f7377974 100644
--- a/sources/3rdparty/bass/macosx/bass.h
+++ b/sources/3rdparty/bass/macosx/bass.h
@@ -724,7 +724,7 @@ typedef struct {
 	BYTE Reserved[190];
 #if defined(__GNUC__) && __GNUC__<3
 	char CodingHistory[0];			// history
-#elif 1 // change to 0 if compiler fails the following line
+#elif 0 // change to 0 if compiler fails the following line
 	char CodingHistory[];			// history
 #else
 	char CodingHistory[1];			// history
@@ -762,7 +762,7 @@ typedef struct
 	char URL[1024];					// uniform resource locator
 #if defined(__GNUC__) && __GNUC__<3
 	char TagText[0];				// free form text for scripts or tags
-#elif 1 // change to 0 if compiler fails the following line
+#elif 0 // change to 0 if compiler fails the following line
 	char TagText[];					// free form text for scripts or tags
 #else
 	char TagText[1];				// free form text for scripts or tags
@@ -785,7 +785,7 @@ typedef struct
 	DWORD dwCuePoints;
 #if defined(__GNUC__) && __GNUC__<3
 	TAG_CUE_POINT CuePoints[0];
-#elif 1 // change to 0 if compiler fails the following line
+#elif 0 // change to 0 if compiler fails the following line
 	TAG_CUE_POINT CuePoints[];
 #else
 	TAG_CUE_POINT CuePoints[1];
@@ -816,7 +816,7 @@ typedef struct
 	DWORD cbSamplerData;
 #if defined(__GNUC__) && __GNUC__<3
 	TAG_SMPL_LOOP SampleLoops[0];
-#elif 1 // change to 0 if compiler fails the following line
+#elif 0 // change to 0 if compiler fails the following line
 	TAG_SMPL_LOOP SampleLoops[];
 #else
 	TAG_SMPL_LOOP SampleLoops[1];
diff --git a/sources/3rdparty/stb/stb_image.h b/sources/3rdparty/stb/stb_image.h
index 196dfd5c..acc18855 100644
--- a/sources/3rdparty/stb/stb_image.h
+++ b/sources/3rdparty/stb/stb_image.h
@@ -881,11 +881,13 @@ STBIDEF const char *stbi_failure_reason(void)
    return stbi__g_failure_reason;
 }
 
+#ifndef STBI_NO_FAILURE_STRINGS
 static int stbi__err(const char *str)
 {
    stbi__g_failure_reason = str;
    return 0;
 }
+#endif
 
 static void *stbi__malloc(size_t size)
 {
@@ -1023,6 +1025,8 @@ static void *stbi__load_main(stbi__context *s, int *x, int *y, int *comp, int re
    #endif
    #ifndef STBI_NO_PSD
    if (stbi__psd_test(s))  return stbi__psd_load(s,x,y,comp,req_comp, ri, bpc);
+   #else
+   (void)bpc;
    #endif
    #ifndef STBI_NO_PIC
    if (stbi__pic_test(s))  return stbi__pic_load(s,x,y,comp,req_comp, ri);

From 87584e493ae79a8754242532e55aad0444d97b18 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Fri, 23 Aug 2019 01:09:51 +0700
Subject: [PATCH 086/108] fix spine shaders after merge

---
 samples/bin/library/spine_shader.frag   |  8 +++-----
 samples/bin/library/spine_shader.vert   | 20 +++++++++++---------
 samples/sources/sample_07/sample_07.cpp |  4 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/samples/bin/library/spine_shader.frag b/samples/bin/library/spine_shader.frag
index c48ba948..878cc4cc 100644
--- a/samples/bin/library/spine_shader.frag
+++ b/samples/bin/library/spine_shader.frag
@@ -1,10 +1,8 @@
-#version 120
-
 uniform sampler2D u_texture;
 
-varying vec4 v_tint;
-varying vec2 v_st;
+varying vec2 v_st0;
+varying vec4 v_color0;
 
 void main() {
-    gl_FragColor = texture2D(u_texture, v_st) * v_tint;
+    gl_FragColor = texture2D(u_texture, v_st0) * v_color0;
 }
diff --git a/samples/bin/library/spine_shader.vert b/samples/bin/library/spine_shader.vert
index 57e41375..4c704e6e 100644
--- a/samples/bin/library/spine_shader.vert
+++ b/samples/bin/library/spine_shader.vert
@@ -1,16 +1,18 @@
-#version 120
-
 uniform mat4 u_matrix_vp;
 
 attribute vec3 a_vertex;
-attribute vec4 a_tint;
-attribute vec2 a_st;
+attribute vec2 a_st0;
+attribute vec4 a_color0;
 
-varying vec4 v_tint;
-varying vec2 v_st;
+varying vec2 v_st0;
+varying vec4 v_color0;
+
+vec4 vertex_to_homo(vec3 pos) {
+    return vec4(pos, 1.0) * u_matrix_vp;
+}
 
 void main() {
-    v_st = a_st;
-    v_tint = a_tint;
-    gl_Position = vec4(a_vertex, 1.0) * u_matrix_vp;
+    v_st0 = a_st0;
+    v_color0 = a_color0;
+    gl_Position = vertex_to_homo(a_vertex);
 }
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index 7cffc429..cf6515da 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -112,8 +112,8 @@ namespace
                     .set_animation(0, "animation", true));
             
             node_iptr coin_n = coin_i->get_component<actor>().get().node();
-            coin_n->scale(v3f(0.125f));
-            coin_n->translation(v3f{200.0f, 200.0f, 0.0f});
+            coin_n->scale(v3f(0.25f));
+            coin_n->translation(v3f{200.0f, 180.0f, 0.0f});
 
             raptor_gobj_ = the<world>().instantiate();
             raptor_gobj_->entity_filler()

From 5b68c7430cbf3af55775bb6b248e99fbe29b577e Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Fri, 23 Aug 2019 01:16:10 +0700
Subject: [PATCH 087/108] register spine system in the starter instead sample
 source

---
 samples/sources/sample_07/sample_07.cpp |  3 +--
 sources/enduro2d/high/starter.cpp       | 10 ++++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index cf6515da..a31c79d0 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -143,8 +143,7 @@ namespace
         bool create_systems() {
             ecs::registry_filler(the<world>().registry())
                 .system<game_system>(world::priority_update, raptor_gobj_)
-                .system<camera_system>(world::priority_pre_render)
-                .system<spine_system>(world::priority_update);
+                .system<camera_system>(world::priority_pre_render);
             return true;
         }
 
diff --git a/sources/enduro2d/high/starter.cpp b/sources/enduro2d/high/starter.cpp
index 8935293f..c9f6eee7 100644
--- a/sources/enduro2d/high/starter.cpp
+++ b/sources/enduro2d/high/starter.cpp
@@ -18,13 +18,14 @@
 #include <enduro2d/high/components/model_renderer.hpp>
 #include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/scene.hpp>
-#include <enduro2d/high/components/sprite_renderer.hpp>
 #include <enduro2d/high/components/spine_player.hpp>
 #include <enduro2d/high/components/spine_renderer.hpp>
+#include <enduro2d/high/components/sprite_renderer.hpp>
 
 #include <enduro2d/high/systems/flipbook_system.hpp>
 #include <enduro2d/high/systems/label_system.hpp>
 #include <enduro2d/high/systems/render_system.hpp>
+#include <enduro2d/high/systems/spine_system.hpp>
 
 namespace
 {
@@ -46,7 +47,8 @@ namespace
             ecs::registry_filler(the<world>().registry())
                 .system<flipbook_system>(world::priority_update)
                 .system<label_system>(world::priority_update)
-                .system<render_system>(world::priority_render);
+                .system<render_system>(world::priority_render)
+                .system<spine_system>(world::priority_update);
             return !application_ || application_->initialize();
         }
 
@@ -140,9 +142,9 @@ namespace e2d
             .register_component<model_renderer>("model_renderer")
             .register_component<renderer>("renderer")
             .register_component<scene>("scene")
-            .register_component<sprite_renderer>("sprite_renderer")
+            .register_component<spine_player>("spine_player")
             .register_component<spine_renderer>("spine_renderer")
-            .register_component<spine_player>("spine_player");
+            .register_component<sprite_renderer>("sprite_renderer");
         safe_module_initialize<library>(params.library_root(), the<deferrer>());
         safe_module_initialize<world>();
     }

From 1ab974455b4f8d39ba0680b1aed726e4c695792a Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Sat, 24 Aug 2019 19:19:57 +0700
Subject: [PATCH 088/108] json_utils: try_parse_value for unit<T>

---
 headers/enduro2d/utils/json_utils.hpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/headers/enduro2d/utils/json_utils.hpp b/headers/enduro2d/utils/json_utils.hpp
index dc9307f4..be3d6d67 100644
--- a/headers/enduro2d/utils/json_utils.hpp
+++ b/headers/enduro2d/utils/json_utils.hpp
@@ -113,6 +113,13 @@ namespace e2d::json_utils
         v = math::numeric_cast<T>(root.GetFloat());
         return true;
     }
+
+    template < typename T, typename Tag >
+    std::enable_if_t<
+        std::is_arithmetic_v<T>, bool>
+    try_parse_value(const rapidjson::Value& root, unit<T, Tag>& v) noexcept {
+        return try_parse_value(root, v.value);
+    }
 }
 
 namespace e2d::json_utils

From c7afd46c2b0d395a8ee35b48a24a8000f567cd14 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Mon, 26 Aug 2019 09:18:22 +0700
Subject: [PATCH 089/108] rewrite spine model loading to async method

---
 headers/enduro2d/high/_all.hpp                |   5 +-
 headers/enduro2d/high/_high.hpp               |   5 +-
 headers/enduro2d/high/spine_model.hpp         |  33 +-
 modules/spine                                 |   2 +-
 samples/bin/library/spine_coin.json           |   7 +-
 samples/bin/library/spine_raptor.json         |  32 +-
 .../high/assets/spine_model_asset.cpp         | 459 +++++++++++-------
 sources/enduro2d/high/spine_model.cpp         |  91 ++--
 .../render_system_drawer.cpp                  |   3 +-
 9 files changed, 376 insertions(+), 261 deletions(-)

diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index adc1d28f..5fc9cc6a 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -21,6 +21,7 @@
 #include "assets/shader_asset.hpp"
 #include "assets/shape_asset.hpp"
 #include "assets/sound_asset.hpp"
+#include "assets/spine_model_asset.hpp"
 #include "assets/sprite_asset.hpp"
 #include "assets/text_asset.hpp"
 #include "assets/texture_asset.hpp"
@@ -34,9 +35,9 @@
 #include "components/model_renderer.hpp"
 #include "components/renderer.hpp"
 #include "components/scene.hpp"
-#include "components/sprite_renderer.hpp"
-#include "components/spine_renderer.hpp"
 #include "components/spine_player.hpp"
+#include "components/spine_renderer.hpp"
+#include "components/sprite_renderer.hpp"
 
 #include "systems/flipbook_system.hpp"
 #include "systems/label_system.hpp"
diff --git a/headers/enduro2d/high/_high.hpp b/headers/enduro2d/high/_high.hpp
index c861e830..b5ffc9ad 100644
--- a/headers/enduro2d/high/_high.hpp
+++ b/headers/enduro2d/high/_high.hpp
@@ -33,6 +33,7 @@ namespace e2d
     class shader_asset;
     class shape_asset;
     class sound_asset;
+    class spine_model_asset;
     class sprite_asset;
     class text_asset;
     class texture_asset;
@@ -46,9 +47,9 @@ namespace e2d
     class model_renderer;
     class renderer;
     class scene;
-    class sprite_renderer;
-    class spine_renderer;
     class spine_player;
+    class spine_renderer;
+    class sprite_renderer;
 
     class flipbook_system;
     class label_system;
diff --git a/headers/enduro2d/high/spine_model.hpp b/headers/enduro2d/high/spine_model.hpp
index b82d6d62..41e28f1b 100644
--- a/headers/enduro2d/high/spine_model.hpp
+++ b/headers/enduro2d/high/spine_model.hpp
@@ -8,20 +8,26 @@
 
 #include "_high.hpp"
 
-struct spAnimationStateData;
-struct spSkeletonData;
 struct spAtlas;
+struct spSkeletonData;
+struct spAnimationStateData;
 
 namespace e2d
 {
+    class bad_spine_model_access final : public exception {
+    public:
+        const char* what() const noexcept final {
+            return "bad spine model access";
+        }
+    };
 
     class spine_model final {
     public:
-        using animation_data_ptr = std::shared_ptr<spAnimationStateData>;
-        using skeleton_data_ptr = std::shared_ptr<spSkeletonData>;
         using atlas_ptr = std::shared_ptr<spAtlas>;
+        using skeleton_data_ptr = std::shared_ptr<spSkeletonData>;
+        using animation_data_ptr = std::shared_ptr<spAnimationStateData>;
     public:
-        spine_model() noexcept = default;
+        spine_model() = default;
         ~spine_model() noexcept = default;
 
         spine_model(spine_model&& other) noexcept;
@@ -36,21 +42,22 @@ namespace e2d
         spine_model& assign(spine_model&& other) noexcept;
         spine_model& assign(const spine_model& other);
 
-        spine_model& set_skeleton(skeleton_data_ptr data);
-        spine_model& set_atlas(atlas_ptr atlas, bool premultiplied_alpha);
+        spine_model& set_atlas(atlas_ptr atlas);
+        spine_model& set_skeleton(skeleton_data_ptr skeleton);
 
-        spine_model& mix_animations(const str& from, const str& to, secf duration);
         spine_model& set_default_mix(secf duration);
+        spine_model& set_animation_mix(
+            const str& from,
+            const str& to,
+            secf duration);
 
         const atlas_ptr& atlas() const noexcept;
-        const animation_data_ptr& animation() const noexcept;
         const skeleton_data_ptr& skeleton() const noexcept;
-        bool premultiplied_alpha() const noexcept;
+        const animation_data_ptr& animation() const noexcept;
     private:
-        animation_data_ptr animation_;
-        skeleton_data_ptr skeleton_;
         atlas_ptr atlas_;
-        bool premultiplied_alpha_ = false;
+        skeleton_data_ptr skeleton_;
+        animation_data_ptr animation_;
     };
 
     void swap(spine_model& l, spine_model& r) noexcept;
diff --git a/modules/spine b/modules/spine
index 3432d163..45b8125a 160000
--- a/modules/spine
+++ b/modules/spine
@@ -1 +1 @@
-Subproject commit 3432d16374e3c857b33462f2793a4bc40d04d60c
+Subproject commit 45b8125a8eb2f69e692d835b0147e4e4775607a9
diff --git a/samples/bin/library/spine_coin.json b/samples/bin/library/spine_coin.json
index 9e56fa47..7df2f2c7 100644
--- a/samples/bin/library/spine_coin.json
+++ b/samples/bin/library/spine_coin.json
@@ -1,6 +1,5 @@
 {
-    "skeleton" : "coin/coin-pro.skel",
     "atlas" : "coin/coin-pma.atlas",
-    "scale" : 1.0,
-    "premultiplied_alpha" : true
-}
\ No newline at end of file
+    "skeleton" : "coin/coin-pro.skel",
+    "skeleton_scale" : 1.0
+}
diff --git a/samples/bin/library/spine_raptor.json b/samples/bin/library/spine_raptor.json
index 93f11198..3e86aa10 100644
--- a/samples/bin/library/spine_raptor.json
+++ b/samples/bin/library/spine_raptor.json
@@ -1,37 +1,37 @@
 {
-    "skeleton": "raptor/raptor-pro.json-large",
     "atlas": "raptor/raptor.atlas",
-    "scale": 1.0,
-    "premultiplied_alpha": false,
-    "mix_animations": [
+    "skeleton": "raptor/raptor-pro.json-large",
+    "skeleton_scale": 1.0,
+    "default_animation_mix" : 0.5,
+    "animation_mixes": [
         {
-            "from_anim": "walk",
-            "to_anim": "roar",
+            "from": "walk",
+            "to": "roar",
             "duration": 0.5
         },
         {
-            "from_anim": "roar",
-            "to_anim": "walk",
+            "from": "roar",
+            "to": "walk",
             "duration": 0.5
         },
         {
-            "from_anim": "walk",
-            "to_anim": "jump",
+            "from": "walk",
+            "to": "jump",
             "duration": 0.5
         },
         {
-            "from_anim": "jump",
-            "to_anim": "walk",
+            "from": "jump",
+            "to": "walk",
             "duration": 0.5
         },
         {
-            "from_anim": "roar",
-            "to_anim": "jump",
+            "from": "roar",
+            "to": "jump",
             "duration": 0.5
         },
         {
-            "from_anim": "jump",
-            "to_anim": "roar",
+            "from": "jump",
+            "to": "roar",
             "duration": 0.5
         }
     ]
diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
index 13a05043..9324c375 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -5,18 +5,18 @@
  ******************************************************************************/
 
 #include <enduro2d/high/assets/spine_model_asset.hpp>
+
 #include <enduro2d/high/assets/json_asset.hpp>
 #include <enduro2d/high/assets/binary_asset.hpp>
 #include <enduro2d/high/assets/texture_asset.hpp>
 
-#include <spine/SkeletonJson.h>
-#include <spine/SkeletonBinary.h>
+#include <spine/spine.h>
 #include <spine/extension.h>
 
-using namespace e2d;
-
 namespace
 {
+    using namespace e2d;
+
     class spine_model_asset_loading_exception final : public asset_loading_exception {
         const char* what() const noexcept final {
             return "spine model asset loading exception";
@@ -25,28 +25,27 @@ namespace
 
     const char* spine_model_asset_schema_source = R"json({
         "type" : "object",
-        "required" : [ "skeleton", "atlas" ],
+        "required" : [ "atlas", "skeleton" ],
         "additionalProperties" : false,
         "properties" : {
-            "skeleton" : { "$ref" : "#/common_definitions/address" },
-            "scale" : { "type" : "number" },
             "atlas" : { "$ref" : "#/common_definitions/address" },
-            "premultiplied_alpha" : { "type" : "boolean" },
-            "default_mix" : { "type" : "number" },
-            "mix_animations" : { "$ref": "#/definitions/spine_animation_mix_array" }
+            "skeleton" : { "$ref" : "#/common_definitions/address" },
+            "skeleton_scale" : { "type" : "number" },
+            "default_animation_mix" : { "type" : "number" },
+            "animation_mixes" : { "$ref": "#/definitions/animation_mixes" }
         },
         "definitions" : {
-            "spine_animation_mix_array" : {
+            "animation_mixes" : {
                 "type" : "array",
-                "items" : { "$ref": "#/definitions/spine_animation_mix" }
+                "items" : { "$ref": "#/definitions/animation_mix" }
             },
-            "spine_animation_mix" : {
+            "animation_mix" : {
                 "type" : "object",
-                "required" : [ "from_anim", "to_anim", "duration" ],
+                "required" : [ "from", "to", "duration" ],
                 "additionalProperties" : false,
                 "properties" : {
-                    "from_anim" : { "$ref": "#/common_definitions/name" },
-                    "to_anim" : { "$ref": "#/common_definitions/name" },
+                    "from" : { "$ref": "#/common_definitions/name" },
+                    "to" : { "$ref": "#/common_definitions/name" },
                     "duration" : { "type" : "number" }
                 }
             }
@@ -71,40 +70,182 @@ namespace
         return *schema;
     }
 
-    bool parse_mix_animations(
-        const rapidjson::Value& root,
-        spine_model& model)
-    {
-        E2D_ASSERT(root.IsArray());
-        str from_anim;
-        str to_anim;
+    struct animation_mix {
+        str from;
+        str to;
         secf duration;
+    };
 
-        for ( rapidjson::SizeType i = 0; i < root.Size(); ++i ) {
-            E2D_ASSERT(root[i].IsObject());
-            const auto& item_json = root[i];
+    animation_mix parse_animation_mix(const rapidjson::Value& root) {
+        animation_mix mix;
 
-            E2D_ASSERT(item_json.HasMember("from_anim"));
-            if ( !json_utils::try_parse_value(item_json["from_anim"], from_anim) ) {
-                the<debug>().error("SPINE: Incorrect formatting of 'from_anim' property");
-                return false;
-            }
-
-            E2D_ASSERT(item_json.HasMember("to_anim"));
-            if ( !json_utils::try_parse_value(item_json["to_anim"], to_anim) ) {
-                the<debug>().error("SPINE: Incorrect formatting of 'to_anim' property");
-                return false;
-            }
-
-            E2D_ASSERT(item_json.HasMember("duration"));
-            if ( !json_utils::try_parse_value(item_json["duration"], duration.value) ) {
-                the<debug>().error("SPINE: Incorrect formatting of 'duration' property");
-                return false;
-            }
-
-            model.mix_animations(from_anim, to_anim, duration);
+        E2D_ASSERT(root.HasMember("from") && root["from"].IsString());
+        if ( !json_utils::try_parse_value(root["from"], mix.from) ) {
+            the<debug>().error("SPINE: Incorrect formating of 'from' property");
+            throw spine_model_asset_loading_exception();
         }
-        return true;
+
+        E2D_ASSERT(root.HasMember("to") && root["to"].IsString());
+        if ( !json_utils::try_parse_value(root["to"], mix.to) ) {
+            the<debug>().error("SPINE: Incorrect formating of 'to' property");
+            throw spine_model_asset_loading_exception();
+        }
+
+        E2D_ASSERT(root.HasMember("duration") && root["duration"].IsNumber());
+        if ( !json_utils::try_parse_value(root["duration"], mix.duration) ) {
+            the<debug>().error("SPINE: Incorrect formating of 'duration' property");
+            throw spine_model_asset_loading_exception();
+        }
+
+        return mix;
+    }
+
+    struct atlas_internal_state {
+        asset_group loaded;
+        asset_dependencies loading;
+    };
+
+    stdex::promise<spine_model::atlas_ptr> load_atlas(
+        const library& library,
+        const str& parent_address,
+        const str& atlas_address)
+    {
+        return library.load_asset_async<binary_asset>(
+            path::combine(parent_address, atlas_address))
+        .then([
+            &library,
+            parent_address
+        ](const binary_asset::load_result& atlas_data){
+            auto atlas_internal = std::make_unique<atlas_internal_state>();
+
+            spine_model::atlas_ptr atlas(
+                spAtlas_create(
+                    reinterpret_cast<const char*>(atlas_data->content().data()),
+                    math::numeric_cast<int>(atlas_data->content().size()),
+                    parent_address.c_str(),
+                    atlas_internal.get()),
+                spAtlas_dispose);
+
+            if ( !atlas ) {
+                the<debug>().error("SPINE: Failed to create preload atlas");
+                throw spine_model_asset_loading_exception();
+            }
+
+            return stdex::make_tuple_promise(std::make_tuple(
+                atlas_internal->loading.load_async(library),
+                stdex::make_resolved_promise(atlas_data)));
+        })
+        .then([
+            parent_address
+        ](const std::tuple<
+            asset_group,
+            binary_asset::load_result
+        >& results){
+            auto atlas_internal = std::make_unique<atlas_internal_state>();
+            atlas_internal->loaded = std::get<0>(results);
+
+            spine_model::atlas_ptr atlas(
+                spAtlas_create(
+                    reinterpret_cast<const char*>(std::get<1>(results)->content().data()),
+                    math::numeric_cast<int>(std::get<1>(results)->content().size()),
+                    parent_address.c_str(),
+                    atlas_internal.get()),
+                spAtlas_dispose);
+
+            if ( !atlas ) {
+                the<debug>().error("SPINE: Failed to create preloaded atlas");
+                throw spine_model_asset_loading_exception();
+            }
+
+            for ( const spAtlasPage* page = atlas->pages; page; page = page->next ) {
+                if ( !page->rendererObject ) {
+                    the<debug>().error("SPINE: Failed to create preloaded atlas");
+                    throw spine_model_asset_loading_exception();
+                }
+            }
+
+            atlas->rendererObject = nullptr;
+            return atlas;
+        });
+    }
+
+    stdex::promise<spine_model::skeleton_data_ptr> load_skeleton_data(
+        const library& library,
+        const str& parent_address,
+        const str& skeleton_address,
+        f32 skeleton_scale,
+        const spine_model::atlas_ptr& atlas)
+    {
+        return library.load_asset_async<binary_asset>(
+            path::combine(parent_address, skeleton_address))
+        .then([
+            atlas,
+            skeleton_scale,
+            skeleton_address
+        ](const binary_asset::load_result& skeleton_data){
+            if ( strings::ends_with(skeleton_address, ".skel") ) {
+                using skeleton_bin_ptr = std::unique_ptr<
+                    spSkeletonBinary,
+                    decltype(&::spSkeletonBinary_dispose)>;
+
+                skeleton_bin_ptr binary_skeleton(
+                    spSkeletonBinary_create(atlas.get()),
+                    spSkeletonBinary_dispose);
+
+                if ( !binary_skeleton ) {
+                    the<debug>().error("SPINE: Failed to create binary skeleton");
+                    throw spine_model_asset_loading_exception();
+                }
+
+                binary_skeleton->scale = skeleton_scale;
+
+                spine_model::skeleton_data_ptr data_skeleton(
+                    spSkeletonBinary_readSkeletonData(
+                        binary_skeleton.get(),
+                        reinterpret_cast<const unsigned char*>(skeleton_data->content().data()),
+                        math::numeric_cast<int>(skeleton_data->content().size())),
+                    spSkeletonData_dispose);
+
+                if ( !data_skeleton ) {
+                    the<debug>().error("SPINE: Failed to read binary skeleton data:\n"
+                        "--> Error: %0",
+                        binary_skeleton->error);
+                    throw spine_model_asset_loading_exception();
+                }
+
+                return data_skeleton;
+            } else {
+                using skeleton_json_ptr = std::unique_ptr<
+                    spSkeletonJson,
+                    decltype(&::spSkeletonJson_dispose)>;
+
+                skeleton_json_ptr json_skeleton(
+                    spSkeletonJson_create(atlas.get()),
+                    spSkeletonJson_dispose);
+
+                if ( !json_skeleton ) {
+                    the<debug>().error("SPINE: Failed to create json skeleton");
+                    throw spine_model_asset_loading_exception();
+                }
+
+                json_skeleton->scale = skeleton_scale;
+
+                spine_model::skeleton_data_ptr data_skeleton(
+                    spSkeletonJson_readSkeletonData(
+                        json_skeleton.get(),
+                        reinterpret_cast<const char*>(skeleton_data->content().data())),
+                    spSkeletonData_dispose);
+
+                if ( !data_skeleton ) {
+                    the<debug>().error("SPINE: Failed to read json skeleton data:\n"
+                        "--> Error: %0",
+                        json_skeleton->error);
+                    throw spine_model_asset_loading_exception();
+                }
+
+                return data_skeleton;
+            }
+        });
     }
 
     stdex::promise<spine_model> parse_spine_model(
@@ -112,150 +253,77 @@ namespace
         const str& parent_address,
         const rapidjson::Value& root)
     {
-        using skeleton_json_ptr = std::unique_ptr<spSkeletonJson, void(*)(spSkeletonJson*)>;
-        using skeleton_bin_ptr = std::unique_ptr<spSkeletonBinary, void(*)(spSkeletonBinary*)>;
+        f32 skeleton_scale{1.0f};
+        if ( root.HasMember("skeleton_scale") ) {
+            if ( !json_utils::try_parse_value(root["skeleton_scale"], skeleton_scale) ) {
+                the<debug>().error("SPINE: Incorrect formating of 'skeleton_scale' property");
+            }
+        }
+
+        secf default_animation_mix{0.5f};
+        if ( root.HasMember("default_animation_mix") ) {
+            if ( !json_utils::try_parse_value(root["default_animation_mix"], default_animation_mix) ) {
+                the<debug>().error("SPINE: Incorrect formating of 'default_animation_mix' property");
+            }
+        }
+
+        vector<animation_mix> animation_mixes;
+        if ( root.HasMember("animation_mixes") ) {
+            E2D_ASSERT(root["animation_mixes"].IsArray());
+            const auto& mixes_json = root["animation_mixes"];
+            animation_mixes.reserve(mixes_json.Size());
+            for ( rapidjson::SizeType i = 0; i < mixes_json.Size(); ++i ) {
+                E2D_ASSERT(mixes_json[i].IsObject());
+                animation_mixes.push_back(
+                    parse_animation_mix(mixes_json[i]));
+            }
+        }
 
         E2D_ASSERT(root.HasMember("atlas") && root["atlas"].IsString());
-        binary_asset::load_result atlas_data = library.load_asset<binary_asset>(
-            path::combine(parent_address, root["atlas"].GetString()));
-        spine_model::atlas_ptr atlas(
-            spAtlas_create(
-                reinterpret_cast<const char*>(atlas_data->content().data()),
-                math::numeric_cast<int>(atlas_data->content().size()),
-                parent_address.data(),
-                nullptr),
-            spAtlas_dispose);
-
-        float skeleton_scale = 1.0f;
-        if ( root.HasMember("scale") ) {
-            if ( !json_utils::try_parse_value(root["scale"], skeleton_scale) ) {
-                the<debug>().error("SPINE: Incorrect formating of 'scale' property");
-            }
-        }
+        const str atlas_address = root["atlas"].GetString();
 
         E2D_ASSERT(root.HasMember("skeleton") && root["skeleton"].IsString());
-        const str ext = path::extension(root["skeleton"].GetString());
-        spine_model::skeleton_data_ptr skeleton;
+        const str skeleton_address = root["skeleton"].GetString();
 
-        if ( ext == ".skel" ) {
-	        skeleton_bin_ptr skeleton_binary(
-                spSkeletonBinary_create(atlas.get()),
-                spSkeletonBinary_dispose);
-            skeleton_binary->scale = skeleton_scale;
-
-            binary_asset::load_result skeleton_data = library.load_asset<binary_asset>(
-                path::combine(parent_address, root["skeleton"].GetString()));
-            skeleton = spine_model::skeleton_data_ptr(
-                spSkeletonBinary_readSkeletonData(
-                    skeleton_binary.get(),
-                    reinterpret_cast<const unsigned char*>(skeleton_data->content().data()),
-                    math::numeric_cast<int>(skeleton_data->content().size())),
-                spSkeletonData_dispose);
-
-            if ( !skeleton ) {
-                the<debug>().error("SPINE: Failed to read skeleton binary data:\n"
-                    "--> Error: $s",
-                    skeleton_binary->error);
-                return stdex::make_rejected_promise<spine_model>(
-                    spine_model_asset_loading_exception());
+        return load_atlas(
+            library,
+            parent_address,
+            atlas_address)
+        .then([
+            &library,
+            parent_address,
+            atlas_address,
+            skeleton_scale,
+            skeleton_address
+        ](const spine_model::atlas_ptr& atlas){
+            return stdex::make_tuple_promise(std::make_tuple(
+                stdex::make_resolved_promise(atlas),
+                load_skeleton_data(
+                    library,
+                    parent_address,
+                    skeleton_address,
+                    skeleton_scale,
+                    atlas)));
+        })
+        .then([
+            default_animation_mix,
+            animation_mixes = std::move(animation_mixes)
+        ](const std::tuple<
+            spine_model::atlas_ptr,
+            spine_model::skeleton_data_ptr
+        >& results){
+            spine_model content;
+            content.set_atlas(std::get<0>(results));
+            content.set_skeleton(std::get<1>(results));
+            content.set_default_mix(default_animation_mix);
+            for ( const animation_mix& mix : animation_mixes ) {
+                content.set_animation_mix(mix.from, mix.to, mix.duration);
             }
-        } else {
-            skeleton_json_ptr skeleton_json(
-                spSkeletonJson_create(atlas.get()),
-                spSkeletonJson_dispose);
-            skeleton_json->scale = skeleton_scale;
-
-            binary_asset::load_result skeleton_data = library.load_asset<binary_asset>(
-                path::combine(parent_address, root["skeleton"].GetString()));
-            skeleton = spine_model::skeleton_data_ptr(
-                spSkeletonJson_readSkeletonData(
-                    skeleton_json.get(),
-                    reinterpret_cast<const char*>(skeleton_data->content().data())),
-                spSkeletonData_dispose);
-
-            if ( !skeleton ) {
-                the<debug>().error("SPINE: Failed to read skeleton json data:\n"
-                    "--> Error: $s",
-                    skeleton_json->error);
-                return stdex::make_rejected_promise<spine_model>(
-                    spine_model_asset_loading_exception());
-            }
-        }
-
-
-        bool pma = false;
-        if ( root.HasMember("premultiplied_alpha") ) {
-            if ( !json_utils::try_parse_value(root["premultiplied_alpha"], pma) ) {
-                the<debug>().error("SPINE: Incorrect formating of 'premultiplied_alpha' property");
-            }
-        }
-        
-        spine_model content;
-        content.set_atlas(atlas, pma);
-        content.set_skeleton(skeleton);
-
-        secf default_mix(0.0f);
-        if ( root.HasMember("default_mix") ) {
-            if ( json_utils::try_parse_value(root["default_mix"], default_mix.value) ) {
-                content.set_default_mix(default_mix);
-            } else {
-                the<debug>().error("SPINE: Incorrect formating of 'default_mix' property");
-            } 
-        }
-
-        if ( root.HasMember("mix_animations") ) {
-            const auto& mix_animations_json = root["mix_animations"];
-            if ( !parse_mix_animations(mix_animations_json, content) ) {
-                return stdex::make_rejected_promise<spine_model>(
-                    spine_model_asset_loading_exception());
-            }
-        }
-
-        return stdex::make_resolved_promise(std::move(content));
+            return content;
+        });
     }
 }
 
-extern "C" void _spAtlasPage_createTexture (spAtlasPage* self, const char* path) {
-    try {
-        texture_asset::load_result texture = the<library>().load_asset<texture_asset>(path);
-        if ( !texture ) {
-            throw;
-        }
-        self->width = texture->content()->size().x;
-        self->height = texture->content()->size().y;
-        self->rendererObject = texture.release();
-    } catch(...) {
-        the<debug>().error("SPINE: Failed to load atlas texture");
-    }
-}
-
-extern "C" void _spAtlasPage_disposeTexture (spAtlasPage* self) {
-    // decrease ref counter
-    E2D_UNUSED(texture_asset::ptr(static_cast<texture_asset*>(self->rendererObject), false));
-}
-
-extern "C" char* _spUtil_readFile (const char* path, int* length) {
-    try {
-        binary_asset::load_result file = the<library>().load_asset<binary_asset>(path);
-        if ( !file ) {
-            throw;
-        }
-        if ( file->content().size() > std::numeric_limits<int>::max() ) {
-            throw;
-        }
-        *length = math::numeric_cast<int>(file->content().size());
-	    char*  data = MALLOC(char, *length);
-        if ( !data ) {
-            throw;
-        }
-        memcpy(data, file->content().data(), *length);
-        return data;
-    } catch(...) {
-        the<debug>().error("SPINE: Failed to read file");
-    }
-    return nullptr;
-}
-
 namespace e2d
 {
     spine_model_asset::load_async_result spine_model_asset::load_async(
@@ -301,3 +369,32 @@ namespace e2d
         });
     }
 }
+
+extern "C" void _spAtlasPage_createTexture(spAtlasPage* self, const char* path) {
+    try {
+        E2D_ASSERT(self->atlas->rendererObject);
+        atlas_internal_state& atlas_internal =
+            *static_cast<atlas_internal_state*>(self->atlas->rendererObject);
+        auto texture_res = atlas_internal.loaded.find_asset<texture_asset>(path);
+        if ( texture_res ) {
+            self->width = math::numeric_cast<int>(texture_res->content()->size().x);
+            self->height = math::numeric_cast<int>(texture_res->content()->size().y);
+            self->rendererObject = texture_res.release();
+        } else {
+            atlas_internal.loading.add_dependency<texture_asset>(path);
+        }
+    } catch(...) {
+        // nothing
+    }
+}
+
+extern "C" void _spAtlasPage_disposeTexture(spAtlasPage* self) {
+    E2D_UNUSED(texture_asset::load_result(
+        static_cast<texture_asset*>(self->rendererObject), false));
+}
+
+extern "C" char* _spUtil_readFile(const char* path, int* length) {
+    E2D_ASSERT_MSG(false, "unimplemented by design");
+    E2D_UNUSED(path, length);
+    return nullptr;
+}
diff --git a/sources/enduro2d/high/spine_model.cpp b/sources/enduro2d/high/spine_model.cpp
index 0575e647..08af0451 100644
--- a/sources/enduro2d/high/spine_model.cpp
+++ b/sources/enduro2d/high/spine_model.cpp
@@ -5,9 +5,8 @@
  ******************************************************************************/
 
 #include <enduro2d/high/spine_model.hpp>
-#include <spine/AnimationStateData.h>
-#include <spine/SkeletonData.h>
-#include <spine/Atlas.h>
+
+#include <spine/spine.h>
 
 namespace e2d
 {
@@ -28,17 +27,16 @@ namespace e2d
     }
 
     void spine_model::clear() noexcept {
-        animation_.reset();
-        skeleton_.reset();
         atlas_.reset();
+        skeleton_.reset();
+        animation_.reset();
     }
 
     void spine_model::swap(spine_model& other) noexcept {
         using std::swap;
-        swap(animation_, other.animation_);
-        swap(skeleton_, other.skeleton_);
         swap(atlas_, other.atlas_);
-        swap(premultiplied_alpha_, other.premultiplied_alpha_);
+        swap(skeleton_, other.skeleton_);
+        swap(animation_, other.animation_);
     }
 
     spine_model& spine_model::assign(spine_model&& other) noexcept {
@@ -52,61 +50,73 @@ namespace e2d
     spine_model& spine_model::assign(const spine_model& other) {
         if ( this != &other ) {
             spine_model m;
-            m.animation_ = other.animation_;
-            m.skeleton_ = other.skeleton_;
             m.atlas_ = other.atlas_;
-            m.premultiplied_alpha_ = other.premultiplied_alpha_;
+            m.skeleton_ = other.skeleton_;
+            m.animation_ = other.animation_;
             swap(m);
         }
         return *this;
     }
 
-    spine_model& spine_model::set_skeleton(skeleton_data_ptr data) {
-        animation_.reset();
-        skeleton_ = std::move(data);
-        if ( skeleton_ ) {
-            animation_ = animation_data_ptr(
-                spAnimationStateData_create(skeleton_.get()),
-                spAnimationStateData_dispose);
-        }
-        return *this;
-    }
-
-    spine_model& spine_model::set_atlas(atlas_ptr atlas, bool premultiplied_alpha) {
+    spine_model& spine_model::set_atlas(atlas_ptr atlas) {
         atlas_ = std::move(atlas);
-        premultiplied_alpha_ = premultiplied_alpha;
         return *this;
     }
 
-    spine_model& spine_model::mix_animations(const str& from, const str& to, secf duration) {
-        E2D_ASSERT(animation_);
-        E2D_ASSERT(spSkeletonData_findAnimation(animation_->skeletonData, from.c_str()));
-        E2D_ASSERT(spSkeletonData_findAnimation(animation_->skeletonData, to.c_str()));
-
-        spAnimationStateData_setMixByName(animation_.get(), from.c_str(), to.c_str(), duration.value);
+    spine_model& spine_model::set_skeleton(skeleton_data_ptr skeleton) {
+        animation_data_ptr animation;
+        if ( skeleton ) {
+            animation.reset(
+                spAnimationStateData_create(skeleton.get()),
+                spAnimationStateData_dispose);
+            if ( !animation ) {
+                throw std::bad_alloc();
+            }
+        }
+        skeleton_ = std::move(skeleton);
+        animation_ = std::move(animation);
         return *this;
     }
-    
+
     spine_model& spine_model::set_default_mix(secf duration) {
-        E2D_ASSERT(animation_);
+        if ( !animation_ ) {
+            throw bad_spine_model_access();
+        }
         animation_->defaultMix = duration.value;
         return *this;
     }
 
+    spine_model& spine_model::set_animation_mix(
+        const str& from,
+        const str& to,
+        secf duration)
+    {
+        spAnimation* from_anim = animation_
+            ? spSkeletonData_findAnimation(animation_->skeletonData, from.c_str())
+            : nullptr;
+
+        spAnimation* to_anim = animation_
+            ? spSkeletonData_findAnimation(animation_->skeletonData, to.c_str())
+            : nullptr;
+
+        if ( !from_anim || !to_anim ) {
+            throw bad_spine_model_access();
+        }
+
+        spAnimationStateData_setMix(animation_.get(), from_anim, to_anim, duration.value);
+        return *this;
+    }
+
     const spine_model::atlas_ptr& spine_model::atlas() const noexcept {
         return atlas_;
     }
 
-    const spine_model::animation_data_ptr& spine_model::animation() const noexcept {
-        return animation_;
-    }
-
     const spine_model::skeleton_data_ptr& spine_model::skeleton() const noexcept {
         return skeleton_;
     }
-    
-    bool spine_model::premultiplied_alpha() const noexcept {
-        return premultiplied_alpha_;
+
+    const spine_model::animation_data_ptr& spine_model::animation() const noexcept {
+        return animation_;
     }
 }
 
@@ -118,9 +128,8 @@ namespace e2d
     
     bool operator==(const spine_model& l, const spine_model& r) noexcept {
         return l.atlas() == r.atlas()
-            && l.animation() == r.animation()
             && l.skeleton() == r.skeleton()
-            && l.premultiplied_alpha() == r.premultiplied_alpha();
+            && l.animation() == r.animation();
     }
 
     bool operator!=(const spine_model& l, const spine_model& r) noexcept {
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index cf964c02..735dfb6d 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -269,7 +269,8 @@ namespace e2d::render_system_impl
         spSkeletonClipping* clipper = spine_r.clipper().operator->();
         spVertexEffect* effect = spine_r.effect().operator->();
         const material_asset::ptr& src_mat = node_r.materials().front();
-        const bool use_premultiplied_alpha = spine_r.model()->content().premultiplied_alpha();
+        //const bool use_premultiplied_alpha = spine_r.model()->content().premultiplied_alpha();
+        const bool use_premultiplied_alpha = false; // TODO: pma is not supported
 
         if ( !skeleton || !clipper || !src_mat ) {
             return;

From a53060f4231a690a5bb001a452036092d929cf2c Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Mon, 26 Aug 2019 18:33:35 +0300
Subject: [PATCH 090/108] fixed component loading

---
 sources/enduro2d/high/components/spine_player.cpp   | 10 +++-------
 sources/enduro2d/high/components/spine_renderer.cpp | 13 ++++---------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/sources/enduro2d/high/components/spine_player.cpp b/sources/enduro2d/high/components/spine_player.cpp
index 743907f3..302689e2 100644
--- a/sources/enduro2d/high/components/spine_player.cpp
+++ b/sources/enduro2d/high/components/spine_player.cpp
@@ -120,14 +120,10 @@ namespace e2d
             "model" : { "$ref": "#/common_definitions/address" },
             "animations" : {
                 "type" : "array",
-                "items" : { "$ref": "#/definitions/spine_animation_array" }
+                "items" : { "$ref": "#/definitions/spine_animation" }
             }
         },
         "definitions" : {
-            "spine_animation_array" : {
-                "type" : "array",
-                "items" : { "$ref": "#/definitions/spine_animation" }
-            },
             "spine_animation" : {
                 "type" : "object",
                 "required" : [ "track", "name" ],
@@ -151,8 +147,8 @@ namespace e2d
                 path::combine(ctx.parent_address, ctx.root["model"].GetString()));
             if ( !model ) {
                 the<debug>().error("SPINE_PLAYER: Dependency 'model' is not found:\n"
-                    "--> Parent address: %s\n"
-                    "--> Dependency address: $s",
+                    "--> Parent address: %0\n"
+                    "--> Dependency address: %1",
                     ctx.parent_address,
                     ctx.root["model"].GetString());
                 return false;
diff --git a/sources/enduro2d/high/components/spine_renderer.cpp b/sources/enduro2d/high/components/spine_renderer.cpp
index afbbef13..d36fa850 100644
--- a/sources/enduro2d/high/components/spine_renderer.cpp
+++ b/sources/enduro2d/high/components/spine_renderer.cpp
@@ -97,8 +97,8 @@ namespace e2d
                 path::combine(ctx.parent_address, ctx.root["model"].GetString()));
             if ( !model ) {
                 the<debug>().error("SPINE RENDERER: Dependency 'model' is not found:\n"
-                    "--> Parent address: %s\n"
-                    "--> Dependency address: $s",
+                    "--> Parent address: %0\n"
+                    "--> Dependency address: %1",
                     ctx.parent_address,
                     ctx.root["model"].GetString());
                 return false;
@@ -115,7 +115,7 @@ namespace e2d
             component.skin(skin);
         }
 
-        return false;
+        return true;
     }
 
     bool factory_loader<spine_renderer>::operator()(
@@ -126,12 +126,7 @@ namespace e2d
             dependencies.add_dependency<spine_model_asset>(
                 path::combine(ctx.parent_address, ctx.root["model"].GetString()));
         }
-        
-        if ( ctx.root.HasMember("skin") ) {
-            dependencies.add_dependency<spine_model_asset>(
-                path::combine(ctx.parent_address, ctx.root["skin"].GetString()));
-        }
 
-        return false;
+        return true;
     }
 }

From 79bd643b5581a1dd7394a44bb4441ee66724541f Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Tue, 27 Aug 2019 10:04:42 +0300
Subject: [PATCH 091/108] spine_renderer united with spine_player

---
 headers/enduro2d/high/_all.hpp                |   1 -
 headers/enduro2d/high/_high.hpp               |   1 -
 .../enduro2d/high/components/spine_player.hpp |  16 +++
 .../high/components/spine_renderer.hpp        |  58 --------
 .../enduro2d/high/components/spine_player.cpp | 114 +++++++++++++--
 .../high/components/spine_renderer.cpp        | 132 ------------------
 sources/enduro2d/high/starter.cpp             |   2 -
 .../render_system_drawer.cpp                  |   5 +-
 .../render_system_drawer.hpp                  |   2 +-
 .../enduro2d/high/systems/spine_system.cpp    |   7 +-
 10 files changed, 122 insertions(+), 216 deletions(-)
 delete mode 100644 headers/enduro2d/high/components/spine_renderer.hpp
 delete mode 100644 sources/enduro2d/high/components/spine_renderer.cpp

diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index 5fc9cc6a..aac67fd5 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -36,7 +36,6 @@
 #include "components/renderer.hpp"
 #include "components/scene.hpp"
 #include "components/spine_player.hpp"
-#include "components/spine_renderer.hpp"
 #include "components/sprite_renderer.hpp"
 
 #include "systems/flipbook_system.hpp"
diff --git a/headers/enduro2d/high/_high.hpp b/headers/enduro2d/high/_high.hpp
index b5ffc9ad..7eda45b2 100644
--- a/headers/enduro2d/high/_high.hpp
+++ b/headers/enduro2d/high/_high.hpp
@@ -48,7 +48,6 @@ namespace e2d
     class renderer;
     class scene;
     class spine_player;
-    class spine_renderer;
     class sprite_renderer;
 
     class flipbook_system;
diff --git a/headers/enduro2d/high/components/spine_player.hpp b/headers/enduro2d/high/components/spine_player.hpp
index c60bd059..bf7ae847 100644
--- a/headers/enduro2d/high/components/spine_player.hpp
+++ b/headers/enduro2d/high/components/spine_player.hpp
@@ -12,15 +12,25 @@
 #include "../assets/spine_model_asset.hpp"
 
 struct spAnimationState;
+struct spSkeleton;
+struct spSkeletonClipping;
+struct spVertexEffect;
 
 namespace e2d
 {
     class spine_player final {
     public:
         using animation_ptr = std::shared_ptr<spAnimationState>;
+        using skeleton_ptr = std::shared_ptr<spSkeleton>;
+        using clipping_ptr = std::shared_ptr<spSkeletonClipping>;
+        using effect_ptr = std::shared_ptr<spVertexEffect>;
     public:
         spine_player() = default;
         spine_player(const spine_model_asset::ptr& model);
+        
+        spine_player& model(const spine_model_asset::ptr& value) noexcept;
+        spine_player& skin(const str& value) noexcept;
+        spine_player& attachment(const str& slot, const str& name) noexcept;
 
         spine_player& time_scale(float value) noexcept;
         [[nodiscard]] float time_scale() const noexcept;
@@ -38,10 +48,16 @@ namespace e2d
         spine_player& clear() noexcept;
         
         const animation_ptr& animation() const noexcept;
+        const skeleton_ptr& skeleton() const noexcept;
+        const clipping_ptr& clipper() const noexcept;
+        const effect_ptr& effect() const noexcept;
         const spine_model_asset::ptr& model() const noexcept;
     private:
         animation_ptr animation_;
         spine_model_asset::ptr model_;
+        skeleton_ptr skeleton_;
+        clipping_ptr clipping_;
+        effect_ptr effect_;
     };
 
     template <>
diff --git a/headers/enduro2d/high/components/spine_renderer.hpp b/headers/enduro2d/high/components/spine_renderer.hpp
deleted file mode 100644
index f7b6ab8d..00000000
--- a/headers/enduro2d/high/components/spine_renderer.hpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * This file is part of the "Enduro2D"
- * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
- ******************************************************************************/
-
-#pragma once
-
-#include "../_high.hpp"
-
-#include "../factory.hpp"
-#include "../assets/spine_model_asset.hpp"
-
-struct spSkeleton;
-struct spSkeletonClipping;
-struct spVertexEffect;
-
-namespace e2d
-{
-
-    class spine_renderer final {
-    public:
-        using skeleton_ptr = std::shared_ptr<spSkeleton>;
-        using clipping_ptr = std::shared_ptr<spSkeletonClipping>;
-        using effect_ptr = std::shared_ptr<spVertexEffect>;
-    public:
-        spine_renderer() = default;
-        spine_renderer(const spine_model_asset::ptr& model);
-        
-        spine_renderer& model(const spine_model_asset::ptr& value) noexcept;
-        spine_renderer& skin(const str& value) noexcept;
-        spine_renderer& attachment(const str& slot, const str& name) noexcept;
-
-        const skeleton_ptr& skeleton() const noexcept;
-        const clipping_ptr& clipper() const noexcept;
-        const effect_ptr& effect() const noexcept;
-        const spine_model_asset::ptr& model() const noexcept;
-    private:
-        skeleton_ptr skeleton_;
-        clipping_ptr clipping_;
-        effect_ptr effect_;
-        spine_model_asset::ptr model_;
-    };
-
-    template <>
-    class factory_loader<spine_renderer> final : factory_loader<> {
-    public:
-        static const char* schema_source;
-
-        bool operator()(
-            spine_renderer& component,
-            const fill_context& ctx) const;
-            
-        bool operator()(
-            asset_dependencies& dependencies,
-            const collect_context& ctx) const;
-    };
-}
diff --git a/sources/enduro2d/high/components/spine_player.cpp b/sources/enduro2d/high/components/spine_player.cpp
index 302689e2..336d48af 100644
--- a/sources/enduro2d/high/components/spine_player.cpp
+++ b/sources/enduro2d/high/components/spine_player.cpp
@@ -5,8 +5,7 @@
  ******************************************************************************/
 
 #include <enduro2d/high/components/spine_player.hpp>
-
-#include <spine/AnimationState.h>
+#include <spine/spine.h>
 
 namespace
 {
@@ -16,16 +15,55 @@ namespace
 
 namespace e2d
 {
-    spine_player::spine_player(const spine_model_asset::ptr& model)
-    : model_(model) {
-        E2D_ASSERT(model_);
-        E2D_ASSERT(model_->content().animation());
-
-        animation_ = animation_ptr(
-            spAnimationState_create(model_->content().animation().get()),
-            spAnimationState_dispose);
+    spine_player::spine_player(const spine_model_asset::ptr& model) {
+        this->model(model);
     }
     
+    spine_player& spine_player::model(const spine_model_asset::ptr& value) noexcept {
+        E2D_ASSERT(value);
+        E2D_ASSERT(value->content().skeleton());
+        E2D_ASSERT(value->content().atlas());
+        model_ = value;
+
+        skeleton_ = skeleton_ptr(spSkeleton_create(model_->content().skeleton().get()), spSkeleton_dispose);
+        clipping_ = clipping_ptr(spSkeletonClipping_create(), spSkeletonClipping_dispose);
+
+        if ( model_->content().animation() ) {
+            animation_ = animation_ptr(
+                spAnimationState_create(model_->content().animation().get()),
+                spAnimationState_dispose);
+        } else {
+            animation_.reset();
+        }
+        return *this;
+    }
+
+    spine_player& spine_player::skin(const str& value) noexcept {
+        spSkeleton_setSkinByName(skeleton_.get(), value.empty() ? nullptr : value.c_str());
+        return *this;
+    }
+
+    spine_player& spine_player::attachment(const str& slot, const str& name) noexcept {
+        E2D_ASSERT(!slot.empty());
+        E2D_ASSERT(!name.empty());
+        if ( !spSkeleton_setAttachment(skeleton_.get(), slot.c_str(), name.c_str()) ) {
+            the<debug>().error("SPINE_RENDERER: can't set attachment '%0' to slot '%1'", name, slot);
+        }
+        return *this;
+    }
+
+    const spine_player::skeleton_ptr& spine_player::skeleton() const noexcept {
+        return skeleton_;
+    }
+    
+    const spine_player::clipping_ptr& spine_player::clipper() const noexcept {
+        return clipping_;
+    }
+
+    const spine_player::effect_ptr& spine_player::effect() const noexcept {
+        return effect_;
+    }
+
     spine_player& spine_player::time_scale(float value) noexcept {
         E2D_ASSERT(animation_);
         animation_->timeScale = value;
@@ -118,6 +156,11 @@ namespace e2d
         "additionalProperties" : false,
         "properties" : {
             "model" : { "$ref": "#/common_definitions/address" },
+            "skin" : { "$ref": "#/common_definitions/name" },
+            "attachments" : {
+                "type" : "array",
+                "items" : { "$ref": "#/definitions/spine_attachment" }
+            },
             "animations" : {
                 "type" : "array",
                 "items" : { "$ref": "#/definitions/spine_animation" }
@@ -134,6 +177,15 @@ namespace e2d
                     "loop" : { "type" : "boolean" },
                     "delay" : { "type" : "number" }
                 }
+            },
+            "spine_attachment" : {
+                "type" : "object",
+                "required" : [ "slot", "name" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "slot" : { "$ref": "#/common_definitions/name" },
+                    "name" : { "$ref": "#/common_definitions/name" }
+                }
             }
         }
     })json";
@@ -158,6 +210,36 @@ namespace e2d
             the<debug>().error("SPINE_PLAYER: Property 'model' is not found");
             return false;
         }
+        
+        if ( ctx.root.HasMember("skin") ) {
+            str skin;
+            if ( !json_utils::try_parse_value(ctx.root["skin"], skin) ) {
+                the<debug>().error("SPINE RENDERER: Incorrect formatting of 'skin' property");
+                return false;
+            }
+            component.skin(skin);
+        }
+
+        if ( ctx.root.HasMember("attachments") ) {
+            const auto& attachments_json = ctx.root["attachments"];
+            E2D_ASSERT(attachments_json.IsArray());
+            
+            for ( rapidjson::SizeType i = 0; i < attachments_json.Size(); ++i ) {
+                E2D_ASSERT(attachments_json[i].IsObject());
+                const auto& item_json = attachments_json[i];
+
+                if ( !item_json.HasMember("slot") ) {
+                    the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'attachments.slot' property");
+                    return false;
+                }
+                if ( !item_json.HasMember("name") ) {
+                    the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'attachments.name' property");
+                    return false;
+                }
+
+                component.attachment(item_json["slot"].GetString(), item_json["name"].GetString());
+            }
+        }
 
         if ( ctx.root.HasMember("animations") ) {
             const auto& animations_json = ctx.root["animations"];
@@ -179,21 +261,21 @@ namespace e2d
 
                 if ( item_json.HasMember("track") ) {
                     if ( !json_utils::try_parse_value(item_json["track"], track) ) {
-                        the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'track' property");
+                        the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'animations.track' property");
                         return false;
                     }
                 }
 
                 if ( item_json.HasMember("delay") ) {
                     if ( !json_utils::try_parse_value(item_json["delay"], delay.value) ) {
-                        the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'delay' property");
+                        the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'animations.delay' property");
                         return false;
                     }
                 }
 
                 if ( item_json.HasMember("loop") ) {
                     if ( !json_utils::try_parse_value(item_json["loop"], loop) ) {
-                        the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'loop' property");
+                        the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'animations.loop' property");
                         return false;
                     }
                 }
@@ -201,6 +283,7 @@ namespace e2d
                 component.add_animation(track, name, loop, delay);
             }
         }
+
         return true;
     }
     
@@ -208,7 +291,10 @@ namespace e2d
         asset_dependencies& dependencies,
         const collect_context& ctx) const
     {
-        E2D_UNUSED(dependencies, ctx);
+        if ( ctx.root.HasMember("model") ) {
+            dependencies.add_dependency<spine_model_asset>(
+                path::combine(ctx.parent_address, ctx.root["model"].GetString()));
+        }
         return true;
     }
 }
diff --git a/sources/enduro2d/high/components/spine_renderer.cpp b/sources/enduro2d/high/components/spine_renderer.cpp
deleted file mode 100644
index d36fa850..00000000
--- a/sources/enduro2d/high/components/spine_renderer.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * This file is part of the "Enduro2D"
- * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
- ******************************************************************************/
-
-#include <enduro2d/high/components/spine_renderer.hpp>
-#include <spine/Skeleton.h>
-#include <spine/VertexEffect.h>
-#include <spine/SkeletonClipping.h>
-
-namespace e2d
-{
-    spine_renderer::spine_renderer(const spine_model_asset::ptr& model) {
-        this->model(model);
-    }
-    
-    spine_renderer& spine_renderer::model(const spine_model_asset::ptr& value) noexcept {
-        E2D_ASSERT(value);
-        E2D_ASSERT(value->content().skeleton());
-        E2D_ASSERT(value->content().atlas());
-        model_ = value;
-
-        skeleton_ = skeleton_ptr(spSkeleton_create(model_->content().skeleton().get()), spSkeleton_dispose);
-        clipping_ = clipping_ptr(spSkeletonClipping_create(), spSkeletonClipping_dispose);
-        return *this;
-    }
-
-    spine_renderer& spine_renderer::skin(const str& value) noexcept {
-        spSkeleton_setSkinByName(skeleton_.get(), value.empty() ? nullptr : value.c_str());
-        return *this;
-    }
-
-    spine_renderer& spine_renderer::attachment(const str& slot, const str& name) noexcept {
-        E2D_ASSERT(!slot.empty());
-        E2D_ASSERT(!name.empty());
-        if ( !spSkeleton_setAttachment(skeleton_.get(), slot.c_str(), name.c_str()) ) {
-            the<debug>().error("SPINE_RENDERER: can't set attachment '%0' to slot '%1'", name, slot);
-        }
-        return *this;
-    }
-
-    const spine_renderer::skeleton_ptr& spine_renderer::skeleton() const noexcept {
-        return skeleton_;
-    }
-    
-    const spine_renderer::clipping_ptr& spine_renderer::clipper() const noexcept {
-        return clipping_;
-    }
-
-    const spine_renderer::effect_ptr& spine_renderer::effect() const noexcept {
-        return effect_;
-    }
-
-    const spine_model_asset::ptr& spine_renderer::model() const noexcept {
-        return model_;
-    }
-}
-
-namespace e2d
-{
-    const char* factory_loader<spine_renderer>::schema_source = R"json({
-        "type" : "object",
-        "required" : [ "model" ],
-        "additionalProperties" : false,
-        "properties" : {
-            "model" : { "$ref": "#/common_definitions/address" },
-            "skin" : { "$ref": "#/common_definitions/name" },
-            "attachments" : {
-                "type" : "array",
-                "items" : { "$ref": "#/definitions/spine_attachment_array" }
-            }
-        },
-        "definitions" : {
-            "spine_attachment_array" : {
-                "type" : "array",
-                "items" : { "$ref": "#/definitions/spine_attachment" }
-            },
-            "spine_attachment" : {
-                "type" : "object",
-                "required" : [ "slot", "name" ],
-                "additionalProperties" : false,
-                "properties" : {
-                    "slot" : { "$ref": "#/common_definitions/name" },
-                    "name" : { "$ref": "#/common_definitions/name" }
-                }
-            }
-        }
-    })json";
-    
-    bool factory_loader<spine_renderer>::operator()(
-        spine_renderer& component,
-        const fill_context& ctx) const
-    {
-        if ( ctx.root.HasMember("model") ) {
-            auto model = ctx.dependencies.find_asset<spine_model_asset>(
-                path::combine(ctx.parent_address, ctx.root["model"].GetString()));
-            if ( !model ) {
-                the<debug>().error("SPINE RENDERER: Dependency 'model' is not found:\n"
-                    "--> Parent address: %0\n"
-                    "--> Dependency address: %1",
-                    ctx.parent_address,
-                    ctx.root["model"].GetString());
-                return false;
-            }
-            component.model(model);
-        }
-
-        if ( ctx.root.HasMember("skin") ) {
-            str skin;
-            if ( !json_utils::try_parse_value(ctx.root["skin"], skin) ) {
-                the<debug>().error("SPINE RENDERER: Incorrect formatting of 'skin' property");
-                return false;
-            }
-            component.skin(skin);
-        }
-
-        return true;
-    }
-
-    bool factory_loader<spine_renderer>::operator()(
-        asset_dependencies& dependencies,
-        const collect_context& ctx) const
-    {
-        if ( ctx.root.HasMember("model") ) {
-            dependencies.add_dependency<spine_model_asset>(
-                path::combine(ctx.parent_address, ctx.root["model"].GetString()));
-        }
-
-        return true;
-    }
-}
diff --git a/sources/enduro2d/high/starter.cpp b/sources/enduro2d/high/starter.cpp
index c9f6eee7..c589944e 100644
--- a/sources/enduro2d/high/starter.cpp
+++ b/sources/enduro2d/high/starter.cpp
@@ -19,7 +19,6 @@
 #include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/scene.hpp>
 #include <enduro2d/high/components/spine_player.hpp>
-#include <enduro2d/high/components/spine_renderer.hpp>
 #include <enduro2d/high/components/sprite_renderer.hpp>
 
 #include <enduro2d/high/systems/flipbook_system.hpp>
@@ -143,7 +142,6 @@ namespace e2d
             .register_component<renderer>("renderer")
             .register_component<scene>("scene")
             .register_component<spine_player>("spine_player")
-            .register_component<spine_renderer>("spine_renderer")
             .register_component<sprite_renderer>("sprite_renderer");
         safe_module_initialize<library>(params.library_root(), the<deferrer>());
         safe_module_initialize<world>();
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index 735dfb6d..6cfaf4d7 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -9,7 +9,6 @@
 #include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/model_renderer.hpp>
 #include <enduro2d/high/components/sprite_renderer.hpp>
-#include <enduro2d/high/components/spine_renderer.hpp>
 #include <enduro2d/high/components/spine_player.hpp>
 
 #include <spine/AnimationState.h>
@@ -116,7 +115,7 @@ namespace e2d::render_system_impl
             if ( spr_r ) {
                 draw(node, *node_r, *spr_r);
             }
-            const spine_renderer* spine_r = node_e.find_component<spine_renderer>();
+            const spine_player* spine_r = node_e.find_component<spine_player>();
             if ( spine_r ) {
                 draw(node, *node_r, *spine_r);
             }
@@ -251,7 +250,7 @@ namespace e2d::render_system_impl
     void drawer::context::draw(
         const const_node_iptr& node,
         const renderer& node_r,
-        const spine_renderer& spine_r)
+        const spine_player& spine_r)
     {
         constexpr int stride = 2;
         std::vector<batcher_type::vertex_type> batch_vertices; // TODO: optimize
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
index 26c5b48a..2f9edeb6 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.hpp
@@ -56,7 +56,7 @@ namespace e2d::render_system_impl
             void draw(
                 const const_node_iptr& node,
                 const renderer& node_r,
-                const spine_renderer& spine_r);
+                const spine_player& spine_r);
 
             void flush();
         private:
diff --git a/sources/enduro2d/high/systems/spine_system.cpp b/sources/enduro2d/high/systems/spine_system.cpp
index deaa31e6..91321d24 100644
--- a/sources/enduro2d/high/systems/spine_system.cpp
+++ b/sources/enduro2d/high/systems/spine_system.cpp
@@ -22,12 +22,11 @@ namespace e2d
 
     void spine_system::process(ecs::registry& owner) {
         float dt = the<engine>().delta_time();
-        owner.for_joined_components<spine_player, spine_renderer>([dt](
+        owner.for_each_component<spine_player>([dt](
             const ecs::const_entity&,
-            spine_player& player,
-            const spine_renderer& renderer)
+            spine_player& player)
         {
-            spSkeleton* skeleton = renderer.skeleton().operator->();
+            spSkeleton* skeleton = player.skeleton().operator->();
             spAnimationState* anim_state = player.animation().operator->();
             
             if ( !skeleton || !anim_state ) {

From 26ab51c366202ba6ab45aa7230e6431ba33da561 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Tue, 27 Aug 2019 12:17:37 +0300
Subject: [PATCH 092/108] fixed parent address for atlas loading

---
 samples/bin/library/coin/coin-pma.atlas            | 4 ++--
 samples/bin/library/raptor/raptor.atlas            | 4 ++--
 sources/enduro2d/high/assets/spine_model_asset.cpp | 9 +++++----
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/samples/bin/library/coin/coin-pma.atlas b/samples/bin/library/coin/coin-pma.atlas
index 8e6be350..63ddfbec 100644
--- a/samples/bin/library/coin/coin-pma.atlas
+++ b/samples/bin/library/coin/coin-pma.atlas
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b8338ca1b86be5b333b5a1ebd331e48687101f7358149e804070685ed148f8f6
-size 895
+oid sha256:710b5d8aa292bf75c778d960a63f3b63857d2a7ab15541020cadf5bc5239656a
+size 890
diff --git a/samples/bin/library/raptor/raptor.atlas b/samples/bin/library/raptor/raptor.atlas
index f14d752d..3ea64517 100644
--- a/samples/bin/library/raptor/raptor.atlas
+++ b/samples/bin/library/raptor/raptor.atlas
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a7b7c681d1cc80b52f0a501810405f44cbe9159fb348e3af155bcd9948267896
-size 4217
+oid sha256:dd001b421b535adb21c74148790d8b576d17aedaeecf0f2ac6318619b94a932b
+size 4210
diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
index 9324c375..80b55501 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -110,11 +110,12 @@ namespace
         const str& parent_address,
         const str& atlas_address)
     {
-        return library.load_asset_async<binary_asset>(
-            path::combine(parent_address, atlas_address))
+        const str atlas_path = path::combine(parent_address, atlas_address);
+        const str atlas_folder = path::parent_path(atlas_path);
+        return library.load_asset_async<binary_asset>(atlas_path)
         .then([
             &library,
-            parent_address
+            parent_address = atlas_folder
         ](const binary_asset::load_result& atlas_data){
             auto atlas_internal = std::make_unique<atlas_internal_state>();
 
@@ -136,7 +137,7 @@ namespace
                 stdex::make_resolved_promise(atlas_data)));
         })
         .then([
-            parent_address
+            parent_address = atlas_folder
         ](const std::tuple<
             asset_group,
             binary_asset::load_result

From c355291adee7fde74b83e196e0db66ebb367cc32 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Tue, 27 Aug 2019 14:10:18 +0300
Subject: [PATCH 093/108] added ability to use atlas with premultiplied alpha

---
 headers/enduro2d/high/spine_model.hpp              |  4 +++-
 samples/bin/library/spine_coin.json                |  1 +
 samples/sources/sample_07/sample_07.cpp            |  2 --
 sources/enduro2d/high/assets/spine_model_asset.cpp | 13 +++++++++++--
 sources/enduro2d/high/spine_model.cpp              |  9 ++++++++-
 .../render_system_impl/render_system_drawer.cpp    | 14 ++++++++++----
 sources/enduro2d/high/systems/spine_system.cpp     |  1 -
 7 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/headers/enduro2d/high/spine_model.hpp b/headers/enduro2d/high/spine_model.hpp
index 41e28f1b..c482d459 100644
--- a/headers/enduro2d/high/spine_model.hpp
+++ b/headers/enduro2d/high/spine_model.hpp
@@ -42,7 +42,7 @@ namespace e2d
         spine_model& assign(spine_model&& other) noexcept;
         spine_model& assign(const spine_model& other);
 
-        spine_model& set_atlas(atlas_ptr atlas);
+        spine_model& set_atlas(atlas_ptr atlas, bool premultiplied_alpha);
         spine_model& set_skeleton(skeleton_data_ptr skeleton);
 
         spine_model& set_default_mix(secf duration);
@@ -54,10 +54,12 @@ namespace e2d
         const atlas_ptr& atlas() const noexcept;
         const skeleton_data_ptr& skeleton() const noexcept;
         const animation_data_ptr& animation() const noexcept;
+        bool premultiplied_alpha() const noexcept;
     private:
         atlas_ptr atlas_;
         skeleton_data_ptr skeleton_;
         animation_data_ptr animation_;
+        bool premultiplied_alpha_ = false;
     };
 
     void swap(spine_model& l, spine_model& r) noexcept;
diff --git a/samples/bin/library/spine_coin.json b/samples/bin/library/spine_coin.json
index 7df2f2c7..c6876a53 100644
--- a/samples/bin/library/spine_coin.json
+++ b/samples/bin/library/spine_coin.json
@@ -1,5 +1,6 @@
 {
     "atlas" : "coin/coin-pma.atlas",
+    "premultiplied_alpha" : true,
     "skeleton" : "coin/coin-pro.skel",
     "skeleton_scale" : 1.0
 }
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index a31c79d0..4aeb8bc6 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -107,7 +107,6 @@ namespace
                 .component<actor>(node::create(coin_i, scene_r))
                 .component<renderer>(renderer()
                     .materials({spine_mat}))
-                .component<spine_renderer>(spine_renderer(spine_coin))
                 .component<spine_player>(spine_player(spine_coin)
                     .set_animation(0, "animation", true));
             
@@ -120,7 +119,6 @@ namespace
                 .component<actor>(node::create(raptor_gobj_, scene_r))
                 .component<renderer>(renderer()
                     .materials({spine_mat}))
-                .component<spine_renderer>(spine_renderer(spine_raptor))
                 .component<spine_player>(spine_player(spine_raptor)
                     .set_animation(0, "walk", true));
             
diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
index 80b55501..77df24d5 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -29,6 +29,7 @@ namespace
         "additionalProperties" : false,
         "properties" : {
             "atlas" : { "$ref" : "#/common_definitions/address" },
+            "premultiplied_alpha" : { "type" : "boolean" },
             "skeleton" : { "$ref" : "#/common_definitions/address" },
             "skeleton_scale" : { "type" : "number" },
             "default_animation_mix" : { "type" : "number" },
@@ -279,6 +280,13 @@ namespace
                     parse_animation_mix(mixes_json[i]));
             }
         }
+        
+        bool pma = false;
+        if ( root.HasMember("premultiplied_alpha") ) {
+            if ( !json_utils::try_parse_value(root["premultiplied_alpha"], pma) ) {
+                the<debug>().error("SPINE: Incorrect formating of 'premultiplied_alpha' property");
+            }
+        }
 
         E2D_ASSERT(root.HasMember("atlas") && root["atlas"].IsString());
         const str atlas_address = root["atlas"].GetString();
@@ -308,13 +316,14 @@ namespace
         })
         .then([
             default_animation_mix,
-            animation_mixes = std::move(animation_mixes)
+            animation_mixes = std::move(animation_mixes),
+            pma
         ](const std::tuple<
             spine_model::atlas_ptr,
             spine_model::skeleton_data_ptr
         >& results){
             spine_model content;
-            content.set_atlas(std::get<0>(results));
+            content.set_atlas(std::get<0>(results), pma);
             content.set_skeleton(std::get<1>(results));
             content.set_default_mix(default_animation_mix);
             for ( const animation_mix& mix : animation_mixes ) {
diff --git a/sources/enduro2d/high/spine_model.cpp b/sources/enduro2d/high/spine_model.cpp
index 08af0451..ae815632 100644
--- a/sources/enduro2d/high/spine_model.cpp
+++ b/sources/enduro2d/high/spine_model.cpp
@@ -35,6 +35,7 @@ namespace e2d
     void spine_model::swap(spine_model& other) noexcept {
         using std::swap;
         swap(atlas_, other.atlas_);
+        swap(premultiplied_alpha_, other.premultiplied_alpha_);
         swap(skeleton_, other.skeleton_);
         swap(animation_, other.animation_);
     }
@@ -51,6 +52,7 @@ namespace e2d
         if ( this != &other ) {
             spine_model m;
             m.atlas_ = other.atlas_;
+            m.premultiplied_alpha_ = other.premultiplied_alpha_;
             m.skeleton_ = other.skeleton_;
             m.animation_ = other.animation_;
             swap(m);
@@ -58,8 +60,9 @@ namespace e2d
         return *this;
     }
 
-    spine_model& spine_model::set_atlas(atlas_ptr atlas) {
+    spine_model& spine_model::set_atlas(atlas_ptr atlas, bool premultiplied_alpha) {
         atlas_ = std::move(atlas);
+        premultiplied_alpha_ = premultiplied_alpha;
         return *this;
     }
 
@@ -118,6 +121,10 @@ namespace e2d
     const spine_model::animation_data_ptr& spine_model::animation() const noexcept {
         return animation_;
     }
+
+    bool spine_model::premultiplied_alpha() const noexcept {
+        return premultiplied_alpha_;
+    }
 }
 
 namespace e2d
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index 6cfaf4d7..331b1ee5 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -268,8 +268,7 @@ namespace e2d::render_system_impl
         spSkeletonClipping* clipper = spine_r.clipper().operator->();
         spVertexEffect* effect = spine_r.effect().operator->();
         const material_asset::ptr& src_mat = node_r.materials().front();
-        //const bool use_premultiplied_alpha = spine_r.model()->content().premultiplied_alpha();
-        const bool use_premultiplied_alpha = false; // TODO: pma is not supported
+        const bool use_premultiplied_alpha = spine_r.model()->content().premultiplied_alpha();
 
         if ( !skeleton || !clipper || !src_mat ) {
             return;
@@ -351,10 +350,17 @@ namespace e2d::render_system_impl
                 continue;
             }
 
-            const color32 vert_color(
+            color vert_colorf = 
                 color(skeleton->color.r, skeleton->color.g, skeleton->color.b, skeleton->color.a) *
                 color(slot->color.r, slot->color.g, slot->color.b, slot->color.a) *
-                color(attachment_color->r, attachment_color->g, attachment_color->b, attachment_color->a));
+                color(attachment_color->r, attachment_color->g, attachment_color->b, attachment_color->a);
+
+            if ( use_premultiplied_alpha ) {
+                vert_colorf.r *= vert_colorf.a;
+                vert_colorf.g *= vert_colorf.a;
+                vert_colorf.b *= vert_colorf.a;
+            }
+            const color32 vert_color(vert_colorf);
 
             render::blending_state blend_mode;
             switch ( slot->data->blendMode ) {
diff --git a/sources/enduro2d/high/systems/spine_system.cpp b/sources/enduro2d/high/systems/spine_system.cpp
index 91321d24..605695ca 100644
--- a/sources/enduro2d/high/systems/spine_system.cpp
+++ b/sources/enduro2d/high/systems/spine_system.cpp
@@ -7,7 +7,6 @@
 #include <enduro2d/high/systems/spine_system.hpp>
 
 #include <enduro2d/high/components/spine_player.hpp>
-#include <enduro2d/high/components/spine_renderer.hpp>
 
 #include <spine/AnimationState.h>
 #include <spine/Skeleton.h>

From 4289ea804f0b7ee29b5c815e2af21f332a5c91e4 Mon Sep 17 00:00:00 2001
From: "andrey.zhirnov" <andrey.zhirnov@matryoshka.com>
Date: Wed, 28 Aug 2019 12:39:54 +0300
Subject: [PATCH 094/108] spine events as components

---
 headers/enduro2d/high/_all.hpp                |   1 +
 .../high/components/spine_animation_event.hpp |  70 +++++++
 .../enduro2d/high/components/spine_player.hpp |  24 +--
 .../enduro2d/high/systems/spine_system.hpp    |   3 +
 samples/bin/library/scene_spine_prefab.json   |  24 +++
 samples/bin/library/spine_coin_prefab.json    |  17 ++
 samples/bin/library/spine_raptor_prefab.json  |  17 ++
 samples/sources/sample_07/sample_07.cpp       | 114 ++++-------
 .../high/components/spine_animation_event.cpp |  94 +++++++++
 .../enduro2d/high/components/spine_player.cpp | 129 +------------
 sources/enduro2d/high/starter.cpp             |   2 +
 .../render_system_drawer.cpp                  |  13 +-
 .../enduro2d/high/systems/spine_system.cpp    | 180 ++++++++++++++++--
 13 files changed, 453 insertions(+), 235 deletions(-)
 create mode 100644 headers/enduro2d/high/components/spine_animation_event.hpp
 create mode 100644 samples/bin/library/scene_spine_prefab.json
 create mode 100644 samples/bin/library/spine_coin_prefab.json
 create mode 100644 samples/bin/library/spine_raptor_prefab.json
 create mode 100644 sources/enduro2d/high/components/spine_animation_event.cpp

diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index aac67fd5..0df2fd6c 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -36,6 +36,7 @@
 #include "components/renderer.hpp"
 #include "components/scene.hpp"
 #include "components/spine_player.hpp"
+#include "components/spine_animation_event.hpp"
 #include "components/sprite_renderer.hpp"
 
 #include "systems/flipbook_system.hpp"
diff --git a/headers/enduro2d/high/components/spine_animation_event.hpp b/headers/enduro2d/high/components/spine_animation_event.hpp
new file mode 100644
index 00000000..12e39b1c
--- /dev/null
+++ b/headers/enduro2d/high/components/spine_animation_event.hpp
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include "../_high.hpp"
+
+#include "../factory.hpp"
+
+namespace e2d
+{
+    class spine_animation_event final {
+    public:
+        struct clear_track {
+            u32 track;
+        };
+
+        struct set_anim {
+            u32 track;
+            str name;
+            bool loop;
+            str on_complete;
+        };
+
+        struct add_anim {
+            u32 track;
+            str name;
+            bool loop;
+            secf delay;
+            str on_complete;
+        };
+
+        struct empty_anim {
+            u32 track;
+            secf duration;
+            secf delay;
+            str on_complete;
+        };
+
+        using commands_t = stdex::variant<
+            clear_track,
+            set_anim,
+            add_anim,
+            empty_anim>;
+    public:
+        spine_animation_event() = default;
+
+        std::vector<commands_t>& commands() noexcept { return commands_; }
+        const std::vector<commands_t>& commands() const noexcept { return commands_; }
+    private:
+        std::vector<commands_t> commands_;
+    };
+    
+    template <>
+    class factory_loader<spine_animation_event> final : factory_loader<> {
+    public:
+        static const char* schema_source;
+
+        bool operator()(
+            spine_animation_event& component,
+            const fill_context& ctx) const;
+            
+        bool operator()(
+            asset_dependencies& dependencies,
+            const collect_context& ctx) const;
+    };
+}
diff --git a/headers/enduro2d/high/components/spine_player.hpp b/headers/enduro2d/high/components/spine_player.hpp
index bf7ae847..25e40190 100644
--- a/headers/enduro2d/high/components/spine_player.hpp
+++ b/headers/enduro2d/high/components/spine_player.hpp
@@ -15,11 +15,23 @@ struct spAnimationState;
 struct spSkeleton;
 struct spSkeletonClipping;
 struct spVertexEffect;
+struct spTrackEntry;
+struct spEvent;
 
 namespace e2d
 {
     class spine_player final {
     public:
+        class on_complete_event final {
+        public:
+            on_complete_event() = default;
+
+            std::vector<str>& completed() noexcept { return completed_; }
+            const std::vector<str>& completed() const noexcept { return completed_; }
+        private:
+            std::vector<str> completed_;
+        };
+
         using animation_ptr = std::shared_ptr<spAnimationState>;
         using skeleton_ptr = std::shared_ptr<spSkeleton>;
         using clipping_ptr = std::shared_ptr<spSkeletonClipping>;
@@ -37,27 +49,15 @@ namespace e2d
 
         [[nodiscard]] bool has_animation(const str& name) const noexcept;
         
-        spine_player& set_animation(u32 track, const str& name, bool loop = false) noexcept;
-
-        spine_player& add_animation(u32 track, const str& name, bool loop, secf delay = secf(0.0f)) noexcept;
-        spine_player& add_animation(u32 track, const str& name, secf delay = secf(0.0f)) noexcept;
-
-        spine_player& add_empty_animation(u32 track, secf duration, secf delay = secf(0.0f)) noexcept;
-
-        spine_player& clear(u32 track) noexcept;
-        spine_player& clear() noexcept;
-        
         const animation_ptr& animation() const noexcept;
         const skeleton_ptr& skeleton() const noexcept;
         const clipping_ptr& clipper() const noexcept;
-        const effect_ptr& effect() const noexcept;
         const spine_model_asset::ptr& model() const noexcept;
     private:
         animation_ptr animation_;
         spine_model_asset::ptr model_;
         skeleton_ptr skeleton_;
         clipping_ptr clipping_;
-        effect_ptr effect_;
     };
 
     template <>
diff --git a/headers/enduro2d/high/systems/spine_system.hpp b/headers/enduro2d/high/systems/spine_system.hpp
index eee98595..0bdefa68 100644
--- a/headers/enduro2d/high/systems/spine_system.hpp
+++ b/headers/enduro2d/high/systems/spine_system.hpp
@@ -15,5 +15,8 @@ namespace e2d
         spine_system();
         ~spine_system() noexcept final;
         void process(ecs::registry& owner) override;
+    private:
+        class internal_state;
+        std::unique_ptr<internal_state> state_;
     };
 }
diff --git a/samples/bin/library/scene_spine_prefab.json b/samples/bin/library/scene_spine_prefab.json
new file mode 100644
index 00000000..7808c5ae
--- /dev/null
+++ b/samples/bin/library/scene_spine_prefab.json
@@ -0,0 +1,24 @@
+{
+    "components" : {
+        "scene" : {}
+    },
+    "children" : [{
+        "prototype" : "camera_prefab.json"
+    },{
+        "prototype" : "spine_coin_prefab.json",
+        "components" : {
+            "actor" : {
+                "translation" : [200,180,0],
+                "scale" : 0.25
+            }
+        }
+    }, {
+        "prototype" : "spine_raptor_prefab.json",
+        "components" : {
+            "actor" : {
+                "translation" : [-80,-100,0],
+                "scale" : 0.25
+            }
+        }
+    }]
+}
diff --git a/samples/bin/library/spine_coin_prefab.json b/samples/bin/library/spine_coin_prefab.json
new file mode 100644
index 00000000..e3ef44fb
--- /dev/null
+++ b/samples/bin/library/spine_coin_prefab.json
@@ -0,0 +1,17 @@
+{
+    "components" : {
+        "renderer" : {
+            "materials" : ["spine_material.json"]
+        },
+        "spine_player" : {
+            "model" : "spine_coin.json"
+        },
+        "spine_animation" : {
+            "animations" : [{
+                "track" : 0,
+                "name" : "animation",
+                "loop" : true
+            }]
+        }
+    }
+}
diff --git a/samples/bin/library/spine_raptor_prefab.json b/samples/bin/library/spine_raptor_prefab.json
new file mode 100644
index 00000000..e7d57053
--- /dev/null
+++ b/samples/bin/library/spine_raptor_prefab.json
@@ -0,0 +1,17 @@
+{
+    "components" : {
+        "renderer" : {
+            "materials" : ["spine_material.json"]
+        },
+        "spine_player" : {
+            "model" : "spine_raptor.json"
+        },
+        "spine_animation" : {
+            "animations" : [{
+                "track" : 0,
+                "name" : "walk",
+                "loop" : true
+            }]
+        }
+    }
+}
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index 4aeb8bc6..e82a80e1 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -11,11 +11,6 @@ namespace
 {
     class game_system final : public ecs::system {
     public:
-        game_system(gobject_iptr raptor)
-        : raptor_gobj_(raptor) {}
-
-        ~game_system() noexcept override {}
-
         void process(ecs::registry& owner) override {
             E2D_UNUSED(owner);
             const keyboard& k = the<input>().keyboard();
@@ -33,33 +28,39 @@ namespace
             }
             
             // use keys R, J, G to start animations
-            if ( raptor_gobj_ ) {
-                if ( k.is_key_just_pressed(keyboard_key::r) ) {
-                    auto player = raptor_gobj_->get_component<spine_player>();
-                    if ( player ) {
-                        (*player).set_animation(0, "roar")
-                            .add_animation(0, "walk", true);
-                    }
-                }
-                if ( k.is_key_just_pressed(keyboard_key::j) ) {
-                    auto player = raptor_gobj_->get_component<spine_player>();
-                    if ( player ) {
-                        (*player).set_animation(0, "jump")
-                            .add_animation(0, "walk", true);
-                    }
-                }
-                if ( k.is_key_just_pressed(keyboard_key::g) ) {
-                    auto player = raptor_gobj_->get_component<spine_player>();
-                    if ( player ) {
-                        (*player).set_animation(1, "gun-grab")
-                            .add_animation(1, "gun-holster", secf(3.0f));
-                    }
-                }
-            }
-        }
+            const bool roar = k.is_key_just_pressed(keyboard_key::r);
+            const bool jump = k.is_key_just_pressed(keyboard_key::j);
+            const bool gun_grab = k.is_key_just_pressed(keyboard_key::g);
 
-    private:
-        gobject_iptr raptor_gobj_;
+            if ( roar || jump || gun_grab ) {
+                owner.for_each_component<spine_player>(
+                [&owner, roar, jump, gun_grab] (ecs::entity_id e, const spine_player& player) {
+                    if ( !player.has_animation("walk") ) {
+                        return;
+                    }
+                    auto& events = ecs::entity(owner, e).assign_component<spine_animation_event>();
+                    if ( roar ) {
+                        events.commands().push_back(spine_animation_event::set_anim{0, "roar", false, "1"});
+                    } else if ( jump ) {
+                        events.commands().push_back(spine_animation_event::set_anim{0, "jump", false, "1"});
+                    } else if ( gun_grab ) {
+                        events.commands().push_back(spine_animation_event::set_anim{1, "gun-grab", false, ""});
+                        events.commands().push_back(spine_animation_event::add_anim{1, "gun-holster", false, secf(3.0f), ""});
+                    }
+                });
+            }
+            
+            owner.for_joined_components<spine_player::on_complete_event, spine_player>(
+            [&owner](ecs::entity_id e, const spine_player::on_complete_event& events, spine_player& player) {
+                auto& new_events = ecs::entity(owner, e).assign_component<spine_animation_event>();
+
+                for ( auto& ev : events.completed() ) {
+                    if ( ev == "1" ) {
+                        new_events.commands().push_back(spine_animation_event::add_anim{0, "walk", true, secf(), ""});
+                    }
+                }
+            });
+        }
     };
     
     class camera_system final : public ecs::system {
@@ -86,47 +87,11 @@ namespace
         }
     private:
         bool create_scene() {
-            auto spine_raptor = the<library>().load_asset<spine_model_asset>("spine_raptor.json");
-            auto spine_coin = the<library>().load_asset<spine_model_asset>("spine_coin.json");
-            auto spine_mat = the<library>().load_asset<material_asset>("spine_material.json");
-
-            if ( !spine_raptor || !spine_coin || !spine_mat ) {
-                return false;
-            }
-            
-            auto scene_i = the<world>().instantiate();
-
-            scene_i->entity_filler()
-                .component<scene>()
-                .component<actor>(node::create(scene_i));
-
-            node_iptr scene_r = scene_i->get_component<actor>().get().node();
-            
-            auto coin_i = the<world>().instantiate();
-            coin_i->entity_filler()
-                .component<actor>(node::create(coin_i, scene_r))
-                .component<renderer>(renderer()
-                    .materials({spine_mat}))
-                .component<spine_player>(spine_player(spine_coin)
-                    .set_animation(0, "animation", true));
-            
-            node_iptr coin_n = coin_i->get_component<actor>().get().node();
-            coin_n->scale(v3f(0.25f));
-            coin_n->translation(v3f{200.0f, 180.0f, 0.0f});
-
-            raptor_gobj_ = the<world>().instantiate();
-            raptor_gobj_->entity_filler()
-                .component<actor>(node::create(raptor_gobj_, scene_r))
-                .component<renderer>(renderer()
-                    .materials({spine_mat}))
-                .component<spine_player>(spine_player(spine_raptor)
-                    .set_animation(0, "walk", true));
-            
-            node_iptr raptor_n = raptor_gobj_->get_component<actor>().get().node();
-            raptor_n->scale(v3f(0.25f));
-            raptor_n->translation(v3f{-80.f, -100.f, 0.0f});
-
-            return true;
+            auto scene_prefab_res = the<library>().load_asset<prefab_asset>("scene_spine_prefab.json");
+            auto scene_go = scene_prefab_res
+                ? the<world>().instantiate(scene_prefab_res->content())
+                : nullptr;
+            return !!scene_go;
         }
 
         bool create_camera() {
@@ -140,13 +105,10 @@ namespace
 
         bool create_systems() {
             ecs::registry_filler(the<world>().registry())
-                .system<game_system>(world::priority_update, raptor_gobj_)
+                .system<game_system>(world::priority_update)
                 .system<camera_system>(world::priority_pre_render);
             return true;
         }
-
-    private:
-        gobject_iptr raptor_gobj_;
     };
 }
 
diff --git a/sources/enduro2d/high/components/spine_animation_event.cpp b/sources/enduro2d/high/components/spine_animation_event.cpp
new file mode 100644
index 00000000..958054f7
--- /dev/null
+++ b/sources/enduro2d/high/components/spine_animation_event.cpp
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/components/spine_animation_event.hpp>
+
+namespace e2d
+{
+    const char* factory_loader<spine_animation_event>::schema_source = R"json({
+        "type" : "object",
+        "required" : [],
+        "additionalProperties" : false,
+        "properties" : {
+            "animations" : {
+                "type" : "array",
+                "items" : { "$ref": "#/definitions/spine_animation" }
+            }
+        },
+        "definitions" : {
+            "spine_animation" : {
+                "type" : "object",
+                "required" : [ "track", "name" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "track" : { "type" : "integer", "minimum" : 0, "maximum": 8 },
+                    "name" : { "$ref": "#/common_definitions/name" },
+                    "loop" : { "type" : "boolean" },
+                    "delay" : { "type" : "number" }
+                }
+            }
+        }
+    })json";
+    
+    bool factory_loader<spine_animation_event>::operator()(
+        spine_animation_event& component,
+        const fill_context& ctx) const
+    {
+        if ( ctx.root.HasMember("animations") ) {
+            const auto& animations_json = ctx.root["animations"];
+            E2D_ASSERT(animations_json.IsArray());
+            
+            for ( rapidjson::SizeType i = 0; i < animations_json.Size(); ++i ) {
+                E2D_ASSERT(animations_json[i].IsObject());
+                const auto& item_json = animations_json[i];
+
+                E2D_ASSERT(item_json.HasMember("track") && item_json.HasMember("name"));
+                u32 track = 0;
+                secf delay;
+                bool loop = false;
+                const char* name = "";
+
+                if ( item_json.HasMember("name") ) {
+                    name = item_json["name"].GetString();
+                }
+
+                if ( item_json.HasMember("track") ) {
+                    if ( !json_utils::try_parse_value(item_json["track"], track) ) {
+                        the<debug>().error("SPINE_ANIMATION: Incorrect formatting of 'animations.track' property");
+                        return false;
+                    }
+                }
+
+                if ( item_json.HasMember("delay") ) {
+                    if ( !json_utils::try_parse_value(item_json["delay"], delay.value) ) {
+                        the<debug>().error("SPINE_ANIMATION: Incorrect formatting of 'animations.delay' property");
+                        return false;
+                    }
+                }
+
+                if ( item_json.HasMember("loop") ) {
+                    if ( !json_utils::try_parse_value(item_json["loop"], loop) ) {
+                        the<debug>().error("SPINE_ANIMATION: Incorrect formatting of 'animations.loop' property");
+                        return false;
+                    }
+                }
+
+                component.commands().emplace_back(spine_animation_event::add_anim{
+                    track, name, loop, delay, ""});
+            }
+        }
+
+        return true;
+    }
+    
+    bool factory_loader<spine_animation_event>::operator()(
+        asset_dependencies& dependencies,
+        const collect_context& ctx) const
+    {
+        E2D_UNUSED(dependencies, ctx);
+        return true;
+    }
+}
diff --git a/sources/enduro2d/high/components/spine_player.cpp b/sources/enduro2d/high/components/spine_player.cpp
index 336d48af..a1c94647 100644
--- a/sources/enduro2d/high/components/spine_player.cpp
+++ b/sources/enduro2d/high/components/spine_player.cpp
@@ -7,12 +7,6 @@
 #include <enduro2d/high/components/spine_player.hpp>
 #include <spine/spine.h>
 
-namespace
-{
-    // spine will allocate storage for each track, so keep number of track as small as possible
-    constexpr e2d::u32 max_track_count = 8;
-}
-
 namespace e2d
 {
     spine_player::spine_player(const spine_model_asset::ptr& model) {
@@ -32,6 +26,7 @@ namespace e2d
             animation_ = animation_ptr(
                 spAnimationState_create(model_->content().animation().get()),
                 spAnimationState_dispose);
+            E2D_ASSERT(animation_); // TODO exception?
         } else {
             animation_.reset();
         }
@@ -42,7 +37,7 @@ namespace e2d
         spSkeleton_setSkinByName(skeleton_.get(), value.empty() ? nullptr : value.c_str());
         return *this;
     }
-
+    
     spine_player& spine_player::attachment(const str& slot, const str& name) noexcept {
         E2D_ASSERT(!slot.empty());
         E2D_ASSERT(!name.empty());
@@ -51,7 +46,7 @@ namespace e2d
         }
         return *this;
     }
-
+    
     const spine_player::skeleton_ptr& spine_player::skeleton() const noexcept {
         return skeleton_;
     }
@@ -60,10 +55,6 @@ namespace e2d
         return clipping_;
     }
 
-    const spine_player::effect_ptr& spine_player::effect() const noexcept {
-        return effect_;
-    }
-
     spine_player& spine_player::time_scale(float value) noexcept {
         E2D_ASSERT(animation_);
         animation_->timeScale = value;
@@ -80,65 +71,11 @@ namespace e2d
             return false;
         }
         spAnimation* anim = spSkeletonData_findAnimation(
-            model_->content().skeleton().operator->(),
+            model_->content().skeleton().get(),
             name.c_str());
         return anim != nullptr;
     }
 
-    spine_player& spine_player::set_animation(u32 track, const str& name, bool loop) noexcept {
-        E2D_ASSERT(model_ && animation_);
-        E2D_ASSERT(track < max_track_count);
-        spAnimation* anim = spSkeletonData_findAnimation(
-            model_->content().skeleton().operator->(),
-            name.c_str());
-
-        if ( !anim ) {
-            the<debug>().error("SPINE_PLAYER: animation '%0' is not found", name);
-            return *this;
-        }
-        spAnimationState_setAnimation(animation_.get(), track, anim, loop);
-        return *this;
-    }
-
-    spine_player& spine_player::add_animation(u32 track, const str& name, secf delay) noexcept {
-        return add_animation(track, name, false, delay);
-    }
-
-    spine_player& spine_player::add_animation(u32 track, const str& name, bool loop, secf delay) noexcept {
-        E2D_ASSERT(model_ && animation_);
-        E2D_ASSERT(track < max_track_count);
-        spAnimation* anim = spSkeletonData_findAnimation(
-            model_->content().skeleton().operator->(),
-            name.c_str());
-
-        if ( !anim ) {
-            the<debug>().error("SPINE_PLAYER: animation '%0' is not found", name);
-            return *this;
-        }
-        spAnimationState_addAnimation(animation_.get(), track, anim, loop, delay.value);
-        return *this;
-    }
-    
-    spine_player& spine_player::add_empty_animation(u32 track, secf duration, secf delay) noexcept {
-        E2D_ASSERT(animation_);
-        E2D_ASSERT(track < max_track_count);
-        spAnimationState_addEmptyAnimation(animation_.get(), track, duration.value, delay.value);
-        return *this;
-    }
-    
-    spine_player& spine_player::clear(u32 track) noexcept {
-        E2D_ASSERT(animation_);
-        E2D_ASSERT(track < max_track_count);
-        spAnimationState_clearTrack(animation_.get(), track);
-        return *this;
-    }
-    
-    spine_player& spine_player::clear() noexcept {
-        E2D_ASSERT(animation_);
-        spAnimationState_clearTracks(animation_.get());
-        return *this;
-    }
-
     const spine_player::animation_ptr& spine_player::animation() const noexcept {
         return animation_;
     }
@@ -160,24 +97,9 @@ namespace e2d
             "attachments" : {
                 "type" : "array",
                 "items" : { "$ref": "#/definitions/spine_attachment" }
-            },
-            "animations" : {
-                "type" : "array",
-                "items" : { "$ref": "#/definitions/spine_animation" }
             }
         },
         "definitions" : {
-            "spine_animation" : {
-                "type" : "object",
-                "required" : [ "track", "name" ],
-                "additionalProperties" : false,
-                "properties" : {
-                    "track" : { "type" : "integer", "minimum" : 0, "maximum": 8 },
-                    "name" : { "$ref": "#/common_definitions/name" },
-                    "loop" : { "type" : "boolean" },
-                    "delay" : { "type" : "number" }
-                }
-            },
             "spine_attachment" : {
                 "type" : "object",
                 "required" : [ "slot", "name" ],
@@ -241,49 +163,6 @@ namespace e2d
             }
         }
 
-        if ( ctx.root.HasMember("animations") ) {
-            const auto& animations_json = ctx.root["animations"];
-            E2D_ASSERT(animations_json.IsArray());
-            
-            for ( rapidjson::SizeType i = 0; i < animations_json.Size(); ++i ) {
-                E2D_ASSERT(animations_json[i].IsObject());
-                const auto& item_json = animations_json[i];
-
-                E2D_ASSERT(item_json.HasMember("track") && item_json.HasMember("name"));
-                u32 track = 0;
-                secf delay;
-                bool loop = false;
-                const char* name = "";
-
-                if ( item_json.HasMember("name") ) {
-                    name = item_json["name"].GetString();
-                }
-
-                if ( item_json.HasMember("track") ) {
-                    if ( !json_utils::try_parse_value(item_json["track"], track) ) {
-                        the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'animations.track' property");
-                        return false;
-                    }
-                }
-
-                if ( item_json.HasMember("delay") ) {
-                    if ( !json_utils::try_parse_value(item_json["delay"], delay.value) ) {
-                        the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'animations.delay' property");
-                        return false;
-                    }
-                }
-
-                if ( item_json.HasMember("loop") ) {
-                    if ( !json_utils::try_parse_value(item_json["loop"], loop) ) {
-                        the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'animations.loop' property");
-                        return false;
-                    }
-                }
-
-                component.add_animation(track, name, loop, delay);
-            }
-        }
-
         return true;
     }
     
diff --git a/sources/enduro2d/high/starter.cpp b/sources/enduro2d/high/starter.cpp
index c589944e..60d67ba5 100644
--- a/sources/enduro2d/high/starter.cpp
+++ b/sources/enduro2d/high/starter.cpp
@@ -19,6 +19,7 @@
 #include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/scene.hpp>
 #include <enduro2d/high/components/spine_player.hpp>
+#include <enduro2d/high/components/spine_animation_event.hpp>
 #include <enduro2d/high/components/sprite_renderer.hpp>
 
 #include <enduro2d/high/systems/flipbook_system.hpp>
@@ -142,6 +143,7 @@ namespace e2d
             .register_component<renderer>("renderer")
             .register_component<scene>("scene")
             .register_component<spine_player>("spine_player")
+            .register_component<spine_animation_event>("spine_animation")
             .register_component<sprite_renderer>("sprite_renderer");
         safe_module_initialize<library>(params.library_root(), the<deferrer>());
         safe_module_initialize<world>();
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index 331b1ee5..f5a7983d 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -264,9 +264,8 @@ namespace e2d::render_system_impl
             return;
         }
 
-        spSkeleton* skeleton = spine_r.skeleton().operator->();
-        spSkeletonClipping* clipper = spine_r.clipper().operator->();
-        spVertexEffect* effect = spine_r.effect().operator->();
+        spSkeleton* skeleton = spine_r.skeleton().get();
+        spSkeletonClipping* clipper = spine_r.clipper().get();
         const material_asset::ptr& src_mat = node_r.materials().front();
         const bool use_premultiplied_alpha = spine_r.model()->content().premultiplied_alpha();
 
@@ -279,10 +278,6 @@ namespace e2d::render_system_impl
         if ( skeleton->color.a == 0 ) {
             return;
         }
-
-        if ( effect ) {
-            effect->begin(effect, skeleton);
-        }
         
         const m4f& sm = node->world_matrix();
 
@@ -431,10 +426,6 @@ namespace e2d::render_system_impl
         }
 
         spSkeletonClipping_clipEnd2(clipper);
-
-        if ( effect ) {
-            effect->end(effect);
-        }
         
         property_cache_.clear();
     }
diff --git a/sources/enduro2d/high/systems/spine_system.cpp b/sources/enduro2d/high/systems/spine_system.cpp
index 605695ca..56884c62 100644
--- a/sources/enduro2d/high/systems/spine_system.cpp
+++ b/sources/enduro2d/high/systems/spine_system.cpp
@@ -7,26 +7,170 @@
 #include <enduro2d/high/systems/spine_system.hpp>
 
 #include <enduro2d/high/components/spine_player.hpp>
+#include <enduro2d/high/components/spine_animation_event.hpp>
 
-#include <spine/AnimationState.h>
-#include <spine/Skeleton.h>
+#include <spine/spine.h>
+
+namespace
+{
+    // spine will allocate storage for each track, so keep number of track as small as possible
+    constexpr e2d::u32 max_track_count = 8;
+}
 
 namespace e2d
 {
-    spine_system::spine_system() {}
+    //
+    // internal_state
+    //
 
-    spine_system::~spine_system() noexcept {
-        spAnimationState_disposeStatics();
+    class spine_system::internal_state final {
+    public:
+        void clear_events(ecs::registry& owner) const;
+        void process_new_animations(ecs::registry& owner);
+        void update_animations(ecs::registry& owner);
+
+        void add_event(spTrackEntry* entry, const str& ev_name);
+    private:
+        struct animation_visitor_;
+        static void event_listener_(spAnimationState* state, spEventType type, spTrackEntry* entry, spEvent* event);
+    private:
+        flat_map<const spTrackEntry*, str> anim_events_;
+        ecs::registry* owner_ = nullptr;
+    };
+    
+    //
+    // animation_visitor_
+    //
+
+    struct spine_system::internal_state::animation_visitor_ {
+        animation_visitor_(
+            spSkeletonData* skeleton,
+            spAnimationState* anim_state,
+            internal_state& state)
+        : skeleton_(skeleton)
+        , anim_state_(anim_state)
+        , state_(state) {}
+
+        void operator()(const spine_animation_event::clear_track& cmd) const noexcept {
+            E2D_ASSERT(cmd.track < max_track_count);
+            spAnimationState_clearTrack(anim_state_, cmd.track);
+        }
+
+        void operator()(const spine_animation_event::set_anim& cmd) const noexcept {
+            E2D_ASSERT(cmd.track < max_track_count);
+
+            spAnimation* anim = spSkeletonData_findAnimation(skeleton_, cmd.name.c_str());
+            if ( !anim ) {
+                the<debug>().error("SPINE_PLAYER: animation '%0' is not found", cmd.name);
+                return;
+            }
+            spTrackEntry* entry = spAnimationState_setAnimation(anim_state_, cmd.track, anim, cmd.loop);
+            if ( entry && !cmd.on_complete.empty() ) {
+                state_.add_event(entry, cmd.on_complete);
+            }
+        }
+        
+        void operator()(const spine_animation_event::add_anim& cmd) const noexcept {
+            E2D_ASSERT(cmd.track < max_track_count);
+            
+            spAnimation* anim = spSkeletonData_findAnimation(skeleton_, cmd.name.c_str());
+            if ( !anim ) {
+                the<debug>().error("SPINE_PLAYER: animation '%0' is not found", cmd.name);
+                return;
+            }
+            spTrackEntry* entry = spAnimationState_addAnimation(anim_state_, cmd.track, anim, cmd.loop, cmd.delay.value);
+            if ( entry && !cmd.on_complete.empty() ) {
+                state_.add_event(entry, cmd.on_complete);
+            }
+        }
+
+        void operator()(const spine_animation_event::empty_anim& cmd) const noexcept {
+            E2D_ASSERT(cmd.track < max_track_count);
+            spTrackEntry* entry = spAnimationState_addEmptyAnimation(anim_state_, cmd.track, cmd.duration.value, cmd.delay.value);
+            if ( entry && !cmd.on_complete.empty() ) {
+                state_.add_event(entry, cmd.on_complete);
+            }
+        }
+    private:
+        spSkeletonData* skeleton_;
+        spAnimationState* anim_state_;
+        internal_state& state_;
+    };
+    
+    void spine_system::internal_state::add_event(spTrackEntry* entry, const str& ev_name) {
+        anim_events_.insert_or_assign(entry, ev_name);
+        entry->listener = &event_listener_;
+        entry->userData = this;
+    }
+    
+    void spine_system::internal_state::event_listener_(spAnimationState* state, spEventType type, spTrackEntry* entry, spEvent* event) {
+        if ( !entry || !entry->userData || type == SP_ANIMATION_DISPOSE ) {
+            return;
+        }
+
+        internal_state* self = reinterpret_cast<internal_state*>(entry->userData);
+        auto entry_to_event = self->anim_events_.find(entry);
+        if ( entry_to_event == self->anim_events_.end() ) {
+            return;
+        }
+
+        ecs::entity_id id(size_t(state->userData));
+        ecs::entity ent(*self->owner_, id);
+
+        switch ( type ) {
+            case SP_ANIMATION_COMPLETE: {
+                auto* comp = ent.find_component<spine_player::on_complete_event>();
+                if ( !comp ) {
+                    comp = &ent.assign_component<spine_player::on_complete_event>();
+                }
+                comp->completed().push_back(std::move(entry_to_event->second));
+
+                self->anim_events_.erase(entry_to_event);
+                break;
+            }
+        }
+    }
+    
+    void spine_system::internal_state::clear_events(ecs::registry& owner) const {
+        owner.remove_all_components<spine_player::on_complete_event>();
     }
 
-    void spine_system::process(ecs::registry& owner) {
-        float dt = the<engine>().delta_time();
-        owner.for_each_component<spine_player>([dt](
-            const ecs::const_entity&,
+    void spine_system::internal_state::process_new_animations(ecs::registry& owner) {
+        owner_ = &owner;
+        owner.for_joined_components<spine_animation_event, spine_player>(
+        [this, &owner](
+            ecs::entity_id id,
+            const spine_animation_event& events,
             spine_player& player)
         {
-            spSkeleton* skeleton = player.skeleton().operator->();
-            spAnimationState* anim_state = player.animation().operator->();
+            spSkeleton* skeleton = player.skeleton().get();
+            spAnimationState* anim_state = player.animation().get();
+            
+            if ( !skeleton || !anim_state ) {
+                return;
+            }
+
+            anim_state->userData = reinterpret_cast<void*>(size_t(id));
+
+            animation_visitor_ vis(skeleton->data, anim_state, *this);
+            for ( auto& ev : events.commands() ) {
+                stdex::visit(vis, ev);
+            }
+        });
+        owner.remove_all_components<spine_animation_event>();
+        owner_ = nullptr;
+    }
+
+    void spine_system::internal_state::update_animations(ecs::registry& owner) {
+        const float dt = the<engine>().delta_time();
+        owner_ = &owner;
+        owner.for_each_component<spine_player>(
+        [dt](
+            ecs::entity_id id,
+            spine_player& player)
+        {
+            spSkeleton* skeleton = player.skeleton().get();
+            spAnimationState* anim_state = player.animation().get();
             
             if ( !skeleton || !anim_state ) {
                 return;
@@ -37,5 +181,19 @@ namespace e2d
             spAnimationState_apply(anim_state, skeleton);
             spSkeleton_updateWorldTransform(skeleton);
         });
+        owner_ = nullptr;
+    }
+
+    spine_system::spine_system()
+    : state_(new internal_state()) {}
+
+    spine_system::~spine_system() noexcept {
+        spAnimationState_disposeStatics();
+    }
+
+    void spine_system::process(ecs::registry& owner) {
+        state_->clear_events(owner);
+        state_->process_new_animations(owner);
+        state_->update_animations(owner);
     }
 }

From f07a3583f49c0bd6c2334f8b016da07418d0cbf4 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Sat, 31 Aug 2019 04:21:22 +0700
Subject: [PATCH 095/108] remove atlas pma flag

---
 headers/enduro2d/high/spine_model.hpp         |  4 +---
 samples/bin/library/spine_coin.json           |  1 -
 .../high/assets/spine_model_asset.cpp         | 22 ++++++-------------
 sources/enduro2d/high/spine_model.cpp         |  9 +-------
 .../render_system_drawer.cpp                  |  2 +-
 5 files changed, 10 insertions(+), 28 deletions(-)

diff --git a/headers/enduro2d/high/spine_model.hpp b/headers/enduro2d/high/spine_model.hpp
index c482d459..41e28f1b 100644
--- a/headers/enduro2d/high/spine_model.hpp
+++ b/headers/enduro2d/high/spine_model.hpp
@@ -42,7 +42,7 @@ namespace e2d
         spine_model& assign(spine_model&& other) noexcept;
         spine_model& assign(const spine_model& other);
 
-        spine_model& set_atlas(atlas_ptr atlas, bool premultiplied_alpha);
+        spine_model& set_atlas(atlas_ptr atlas);
         spine_model& set_skeleton(skeleton_data_ptr skeleton);
 
         spine_model& set_default_mix(secf duration);
@@ -54,12 +54,10 @@ namespace e2d
         const atlas_ptr& atlas() const noexcept;
         const skeleton_data_ptr& skeleton() const noexcept;
         const animation_data_ptr& animation() const noexcept;
-        bool premultiplied_alpha() const noexcept;
     private:
         atlas_ptr atlas_;
         skeleton_data_ptr skeleton_;
         animation_data_ptr animation_;
-        bool premultiplied_alpha_ = false;
     };
 
     void swap(spine_model& l, spine_model& r) noexcept;
diff --git a/samples/bin/library/spine_coin.json b/samples/bin/library/spine_coin.json
index c6876a53..7df2f2c7 100644
--- a/samples/bin/library/spine_coin.json
+++ b/samples/bin/library/spine_coin.json
@@ -1,6 +1,5 @@
 {
     "atlas" : "coin/coin-pma.atlas",
-    "premultiplied_alpha" : true,
     "skeleton" : "coin/coin-pro.skel",
     "skeleton_scale" : 1.0
 }
diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_model_asset.cpp
index 77df24d5..61ff571c 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_model_asset.cpp
@@ -29,7 +29,6 @@ namespace
         "additionalProperties" : false,
         "properties" : {
             "atlas" : { "$ref" : "#/common_definitions/address" },
-            "premultiplied_alpha" : { "type" : "boolean" },
             "skeleton" : { "$ref" : "#/common_definitions/address" },
             "skeleton_scale" : { "type" : "number" },
             "default_animation_mix" : { "type" : "number" },
@@ -113,10 +112,11 @@ namespace
     {
         const str atlas_path = path::combine(parent_address, atlas_address);
         const str atlas_folder = path::parent_path(atlas_path);
+
         return library.load_asset_async<binary_asset>(atlas_path)
         .then([
             &library,
-            parent_address = atlas_folder
+            atlas_folder
         ](const binary_asset::load_result& atlas_data){
             auto atlas_internal = std::make_unique<atlas_internal_state>();
 
@@ -124,7 +124,7 @@ namespace
                 spAtlas_create(
                     reinterpret_cast<const char*>(atlas_data->content().data()),
                     math::numeric_cast<int>(atlas_data->content().size()),
-                    parent_address.c_str(),
+                    atlas_folder.c_str(),
                     atlas_internal.get()),
                 spAtlas_dispose);
 
@@ -138,7 +138,7 @@ namespace
                 stdex::make_resolved_promise(atlas_data)));
         })
         .then([
-            parent_address = atlas_folder
+            atlas_folder
         ](const std::tuple<
             asset_group,
             binary_asset::load_result
@@ -150,7 +150,7 @@ namespace
                 spAtlas_create(
                     reinterpret_cast<const char*>(std::get<1>(results)->content().data()),
                     math::numeric_cast<int>(std::get<1>(results)->content().size()),
-                    parent_address.c_str(),
+                    atlas_folder.c_str(),
                     atlas_internal.get()),
                 spAtlas_dispose);
 
@@ -280,13 +280,6 @@ namespace
                     parse_animation_mix(mixes_json[i]));
             }
         }
-        
-        bool pma = false;
-        if ( root.HasMember("premultiplied_alpha") ) {
-            if ( !json_utils::try_parse_value(root["premultiplied_alpha"], pma) ) {
-                the<debug>().error("SPINE: Incorrect formating of 'premultiplied_alpha' property");
-            }
-        }
 
         E2D_ASSERT(root.HasMember("atlas") && root["atlas"].IsString());
         const str atlas_address = root["atlas"].GetString();
@@ -316,14 +309,13 @@ namespace
         })
         .then([
             default_animation_mix,
-            animation_mixes = std::move(animation_mixes),
-            pma
+            animation_mixes = std::move(animation_mixes)
         ](const std::tuple<
             spine_model::atlas_ptr,
             spine_model::skeleton_data_ptr
         >& results){
             spine_model content;
-            content.set_atlas(std::get<0>(results), pma);
+            content.set_atlas(std::get<0>(results));
             content.set_skeleton(std::get<1>(results));
             content.set_default_mix(default_animation_mix);
             for ( const animation_mix& mix : animation_mixes ) {
diff --git a/sources/enduro2d/high/spine_model.cpp b/sources/enduro2d/high/spine_model.cpp
index ae815632..08af0451 100644
--- a/sources/enduro2d/high/spine_model.cpp
+++ b/sources/enduro2d/high/spine_model.cpp
@@ -35,7 +35,6 @@ namespace e2d
     void spine_model::swap(spine_model& other) noexcept {
         using std::swap;
         swap(atlas_, other.atlas_);
-        swap(premultiplied_alpha_, other.premultiplied_alpha_);
         swap(skeleton_, other.skeleton_);
         swap(animation_, other.animation_);
     }
@@ -52,7 +51,6 @@ namespace e2d
         if ( this != &other ) {
             spine_model m;
             m.atlas_ = other.atlas_;
-            m.premultiplied_alpha_ = other.premultiplied_alpha_;
             m.skeleton_ = other.skeleton_;
             m.animation_ = other.animation_;
             swap(m);
@@ -60,9 +58,8 @@ namespace e2d
         return *this;
     }
 
-    spine_model& spine_model::set_atlas(atlas_ptr atlas, bool premultiplied_alpha) {
+    spine_model& spine_model::set_atlas(atlas_ptr atlas) {
         atlas_ = std::move(atlas);
-        premultiplied_alpha_ = premultiplied_alpha;
         return *this;
     }
 
@@ -121,10 +118,6 @@ namespace e2d
     const spine_model::animation_data_ptr& spine_model::animation() const noexcept {
         return animation_;
     }
-
-    bool spine_model::premultiplied_alpha() const noexcept {
-        return premultiplied_alpha_;
-    }
 }
 
 namespace e2d
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index f5a7983d..61db0aef 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -267,7 +267,7 @@ namespace e2d::render_system_impl
         spSkeleton* skeleton = spine_r.skeleton().get();
         spSkeletonClipping* clipper = spine_r.clipper().get();
         const material_asset::ptr& src_mat = node_r.materials().front();
-        const bool use_premultiplied_alpha = spine_r.model()->content().premultiplied_alpha();
+        const bool use_premultiplied_alpha = false;
 
         if ( !skeleton || !clipper || !src_mat ) {
             return;

From cf04cebf441ab14999b99a929c83701ba748fdc5 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Mon, 2 Sep 2019 02:52:31 +0700
Subject: [PATCH 096/108] refactoring of spine_player loading

---
 .../enduro2d/high/components/spine_player.hpp |  44 +++---
 .../enduro2d/high/components/spine_player.cpp | 133 ++++++++++--------
 2 files changed, 90 insertions(+), 87 deletions(-)

diff --git a/headers/enduro2d/high/components/spine_player.hpp b/headers/enduro2d/high/components/spine_player.hpp
index 25e40190..7a36424e 100644
--- a/headers/enduro2d/high/components/spine_player.hpp
+++ b/headers/enduro2d/high/components/spine_player.hpp
@@ -11,53 +11,45 @@
 #include "../factory.hpp"
 #include "../assets/spine_model_asset.hpp"
 
-struct spAnimationState;
 struct spSkeleton;
 struct spSkeletonClipping;
-struct spVertexEffect;
-struct spTrackEntry;
-struct spEvent;
+struct spAnimationState;
 
 namespace e2d
 {
+    class bad_spine_player_access final : public exception {
+    public:
+        const char* what() const noexcept final {
+            return "bad spine player access";
+        }
+    };
+
     class spine_player final {
     public:
-        class on_complete_event final {
-        public:
-            on_complete_event() = default;
-
-            std::vector<str>& completed() noexcept { return completed_; }
-            const std::vector<str>& completed() const noexcept { return completed_; }
-        private:
-            std::vector<str> completed_;
-        };
-
-        using animation_ptr = std::shared_ptr<spAnimationState>;
-        using skeleton_ptr = std::shared_ptr<spSkeleton>;
         using clipping_ptr = std::shared_ptr<spSkeletonClipping>;
-        using effect_ptr = std::shared_ptr<spVertexEffect>;
+        using skeleton_ptr = std::shared_ptr<spSkeleton>;
+        using animation_ptr = std::shared_ptr<spAnimationState>;
     public:
         spine_player() = default;
         spine_player(const spine_model_asset::ptr& model);
         
-        spine_player& model(const spine_model_asset::ptr& value) noexcept;
+        spine_player& model(const spine_model_asset::ptr& value);
+
         spine_player& skin(const str& value) noexcept;
         spine_player& attachment(const str& slot, const str& name) noexcept;
 
-        spine_player& time_scale(float value) noexcept;
-        [[nodiscard]] float time_scale() const noexcept;
+        bool has_skin(const str& name) const noexcept;
+        bool has_animation(const str& name) const noexcept;
 
-        [[nodiscard]] bool has_animation(const str& name) const noexcept;
-        
-        const animation_ptr& animation() const noexcept;
-        const skeleton_ptr& skeleton() const noexcept;
         const clipping_ptr& clipper() const noexcept;
+        const skeleton_ptr& skeleton() const noexcept;
+        const animation_ptr& animation() const noexcept;
         const spine_model_asset::ptr& model() const noexcept;
     private:
+        clipping_ptr clipping_;
+        skeleton_ptr skeleton_;
         animation_ptr animation_;
         spine_model_asset::ptr model_;
-        skeleton_ptr skeleton_;
-        clipping_ptr clipping_;
     };
 
     template <>
diff --git a/sources/enduro2d/high/components/spine_player.cpp b/sources/enduro2d/high/components/spine_player.cpp
index a1c94647..a44968b8 100644
--- a/sources/enduro2d/high/components/spine_player.cpp
+++ b/sources/enduro2d/high/components/spine_player.cpp
@@ -5,6 +5,7 @@
  ******************************************************************************/
 
 #include <enduro2d/high/components/spine_player.hpp>
+
 #include <spine/spine.h>
 
 namespace e2d
@@ -13,67 +14,73 @@ namespace e2d
         this->model(model);
     }
     
-    spine_player& spine_player::model(const spine_model_asset::ptr& value) noexcept {
-        E2D_ASSERT(value);
-        E2D_ASSERT(value->content().skeleton());
-        E2D_ASSERT(value->content().atlas());
-        model_ = value;
-
-        skeleton_ = skeleton_ptr(spSkeleton_create(model_->content().skeleton().get()), spSkeleton_dispose);
-        clipping_ = clipping_ptr(spSkeletonClipping_create(), spSkeletonClipping_dispose);
-
-        if ( model_->content().animation() ) {
-            animation_ = animation_ptr(
-                spAnimationState_create(model_->content().animation().get()),
-                spAnimationState_dispose);
-            E2D_ASSERT(animation_); // TODO exception?
-        } else {
-            animation_.reset();
+    spine_player& spine_player::model(const spine_model_asset::ptr& value) {
+        clipping_ptr new_clipping = clipping_ptr(
+            spSkeletonClipping_create(),
+            spSkeletonClipping_dispose);
+        if ( !new_clipping ) {
+            throw std::bad_alloc();
         }
+
+        skeleton_ptr new_skeleton;
+        if ( value && value->content().skeleton() ) {
+            new_skeleton = skeleton_ptr(
+                spSkeleton_create(value->content().skeleton().get()),
+                spSkeleton_dispose);
+            if ( !new_skeleton ) {
+                throw std::bad_alloc();
+            }
+        }
+
+        animation_ptr new_animation;
+        if ( value && value->content().animation() ) {
+            new_animation = animation_ptr(
+                spAnimationState_create(value->content().animation().get()),
+                spAnimationState_dispose);
+            if ( !new_animation ) {
+                throw std::bad_alloc();
+            }
+        }
+
+        model_ = value;
+        clipping_ = std::move(new_clipping);
+        skeleton_ = std::move(new_skeleton);
+        animation_ = std::move(new_animation);
         return *this;
     }
 
     spine_player& spine_player::skin(const str& value) noexcept {
-        spSkeleton_setSkinByName(skeleton_.get(), value.empty() ? nullptr : value.c_str());
+        if ( !spSkeleton_setSkinByName(skeleton_.get(), value.empty() ? nullptr : value.c_str()) ) {
+            the<debug>().error("SPINE_PLAYER: can't set skin '%0'", value);
+        }
         return *this;
     }
     
     spine_player& spine_player::attachment(const str& slot, const str& name) noexcept {
-        E2D_ASSERT(!slot.empty());
-        E2D_ASSERT(!name.empty());
         if ( !spSkeleton_setAttachment(skeleton_.get(), slot.c_str(), name.c_str()) ) {
-            the<debug>().error("SPINE_RENDERER: can't set attachment '%0' to slot '%1'", name, slot);
+            the<debug>().error("SPINE_PLAYER: can't set attachment '%0' to slot '%1'", name, slot);
         }
         return *this;
     }
-    
-    const spine_player::skeleton_ptr& spine_player::skeleton() const noexcept {
-        return skeleton_;
+
+    bool spine_player::has_skin(const str& name) const noexcept {
+        return model_
+            && model()->content().skeleton()
+            && spSkeletonData_findSkin(model()->content().skeleton().get(), name.c_str());
     }
     
+    bool spine_player::has_animation(const str& name) const noexcept {
+        return model_
+            && model()->content().skeleton()
+            && spSkeletonData_findAnimation(model()->content().skeleton().get(), name.c_str());
+    }
+
     const spine_player::clipping_ptr& spine_player::clipper() const noexcept {
         return clipping_;
     }
 
-    spine_player& spine_player::time_scale(float value) noexcept {
-        E2D_ASSERT(animation_);
-        animation_->timeScale = value;
-        return *this;
-    }
-
-    float spine_player::time_scale() const noexcept {
-        E2D_ASSERT(animation_);
-        return animation_->timeScale;
-    }
-    
-    bool spine_player::has_animation(const str& name) const noexcept {
-        if ( !model_ ) {
-            return false;
-        }
-        spAnimation* anim = spSkeletonData_findAnimation(
-            model_->content().skeleton().get(),
-            name.c_str());
-        return anim != nullptr;
+    const spine_player::skeleton_ptr& spine_player::skeleton() const noexcept {
+        return skeleton_;
     }
 
     const spine_player::animation_ptr& spine_player::animation() const noexcept {
@@ -89,18 +96,19 @@ namespace e2d
 {
     const char* factory_loader<spine_player>::schema_source = R"json({
         "type" : "object",
-        "required" : [ "model" ],
+        "required" : [],
         "additionalProperties" : false,
         "properties" : {
             "model" : { "$ref": "#/common_definitions/address" },
             "skin" : { "$ref": "#/common_definitions/name" },
-            "attachments" : {
-                "type" : "array",
-                "items" : { "$ref": "#/definitions/spine_attachment" }
-            }
+            "attachments" : { "$ref": "#/definitions/attachments" }
         },
         "definitions" : {
-            "spine_attachment" : {
+            "attachments" : {
+                "type" : "array",
+                "items" : { "$ref": "#/definitions/attachment" }
+            },
+            "attachment" : {
                 "type" : "object",
                 "required" : [ "slot", "name" ],
                 "additionalProperties" : false,
@@ -127,16 +135,13 @@ namespace e2d
                     ctx.root["model"].GetString());
                 return false;
             }
-            component = spine_player(model);
-        } else {
-            the<debug>().error("SPINE_PLAYER: Property 'model' is not found");
-            return false;
+            component.model(model);
         }
         
         if ( ctx.root.HasMember("skin") ) {
             str skin;
             if ( !json_utils::try_parse_value(ctx.root["skin"], skin) ) {
-                the<debug>().error("SPINE RENDERER: Incorrect formatting of 'skin' property");
+                the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'skin' property");
                 return false;
             }
             component.skin(skin);
@@ -148,18 +153,23 @@ namespace e2d
             
             for ( rapidjson::SizeType i = 0; i < attachments_json.Size(); ++i ) {
                 E2D_ASSERT(attachments_json[i].IsObject());
-                const auto& item_json = attachments_json[i];
+                const auto& attachment_json = attachments_json[i];
 
-                if ( !item_json.HasMember("slot") ) {
-                    the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'attachments.slot' property");
-                    return false;
-                }
-                if ( !item_json.HasMember("name") ) {
-                    the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'attachments.name' property");
+                str slot;
+                E2D_ASSERT(attachment_json.HasMember("slot"));
+                if ( !json_utils::try_parse_value(attachment_json["slot"], slot) ) {
+                    the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'attachment.slot' property");
                     return false;
                 }
 
-                component.attachment(item_json["slot"].GetString(), item_json["name"].GetString());
+                str name;
+                E2D_ASSERT(attachment_json.HasMember("name"));
+                if ( !json_utils::try_parse_value(attachment_json["name"], name) ) {
+                    the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'attachment.name' property");
+                    return false;
+                }
+
+                component.attachment(slot, name);
             }
         }
 
@@ -174,6 +184,7 @@ namespace e2d
             dependencies.add_dependency<spine_model_asset>(
                 path::combine(ctx.parent_address, ctx.root["model"].GetString()));
         }
+
         return true;
     }
 }

From 8d5e0fa40b1dc623439c1feb8f000c10e6be9bb8 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Mon, 2 Sep 2019 02:52:44 +0700
Subject: [PATCH 097/108] update ecs.hpp module

---
 modules/ecs.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/ecs.hpp b/modules/ecs.hpp
index d32f4386..c4638203 160000
--- a/modules/ecs.hpp
+++ b/modules/ecs.hpp
@@ -1 +1 @@
-Subproject commit d32f438684545f29e91c3c5d7159cd583aa91dff
+Subproject commit c463820321467e709c52c5a64484ceef705b5ee4

From f4a4d612cf3a3ed5cb86875e233e0e42a8c8a188 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Mon, 2 Sep 2019 04:33:32 +0700
Subject: [PATCH 098/108] loading spine player commands and events

---
 headers/enduro2d/base/_base.hpp               |   1 +
 headers/enduro2d/high/_all.hpp                |   3 +-
 headers/enduro2d/high/_high.hpp               |   2 +
 .../high/components/spine_animation_event.hpp |  70 ----
 .../high/components/spine_player_cmd.hpp      | 210 ++++++++++
 .../high/components/spine_player_evt.hpp      | 105 +++++
 samples/bin/library/spine_coin_prefab.json    |  13 +-
 samples/bin/library/spine_raptor_prefab.json  |  39 +-
 samples/sources/sample_07/sample_07.cpp       |  59 ++-
 .../high/components/spine_animation_event.cpp |  94 -----
 .../high/components/spine_player_cmd.cpp      | 395 ++++++++++++++++++
 .../high/components/spine_player_evt.cpp      | 212 ++++++++++
 sources/enduro2d/high/starter.cpp             |   6 +-
 13 files changed, 1000 insertions(+), 209 deletions(-)
 delete mode 100644 headers/enduro2d/high/components/spine_animation_event.hpp
 create mode 100644 headers/enduro2d/high/components/spine_player_cmd.hpp
 create mode 100644 headers/enduro2d/high/components/spine_player_evt.hpp
 delete mode 100644 sources/enduro2d/high/components/spine_animation_event.cpp
 create mode 100644 sources/enduro2d/high/components/spine_player_cmd.cpp
 create mode 100644 sources/enduro2d/high/components/spine_player_evt.cpp

diff --git a/headers/enduro2d/base/_base.hpp b/headers/enduro2d/base/_base.hpp
index 01afedf1..52d3f1c4 100644
--- a/headers/enduro2d/base/_base.hpp
+++ b/headers/enduro2d/base/_base.hpp
@@ -35,6 +35,7 @@
 #include <limits>
 #include <numeric>
 #include <utility>
+#include <optional>
 #include <iterator>
 #include <exception>
 #include <stdexcept>
diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index 0df2fd6c..109ea471 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -36,7 +36,8 @@
 #include "components/renderer.hpp"
 #include "components/scene.hpp"
 #include "components/spine_player.hpp"
-#include "components/spine_animation_event.hpp"
+#include "components/spine_player_cmd.hpp"
+#include "components/spine_player_evt.hpp"
 #include "components/sprite_renderer.hpp"
 
 #include "systems/flipbook_system.hpp"
diff --git a/headers/enduro2d/high/_high.hpp b/headers/enduro2d/high/_high.hpp
index 7eda45b2..ec5b45df 100644
--- a/headers/enduro2d/high/_high.hpp
+++ b/headers/enduro2d/high/_high.hpp
@@ -48,6 +48,8 @@ namespace e2d
     class renderer;
     class scene;
     class spine_player;
+    class spine_player_cmd;
+    class spine_player_evt;
     class sprite_renderer;
 
     class flipbook_system;
diff --git a/headers/enduro2d/high/components/spine_animation_event.hpp b/headers/enduro2d/high/components/spine_animation_event.hpp
deleted file mode 100644
index 12e39b1c..00000000
--- a/headers/enduro2d/high/components/spine_animation_event.hpp
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * This file is part of the "Enduro2D"
- * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
- ******************************************************************************/
-
-#pragma once
-
-#include "../_high.hpp"
-
-#include "../factory.hpp"
-
-namespace e2d
-{
-    class spine_animation_event final {
-    public:
-        struct clear_track {
-            u32 track;
-        };
-
-        struct set_anim {
-            u32 track;
-            str name;
-            bool loop;
-            str on_complete;
-        };
-
-        struct add_anim {
-            u32 track;
-            str name;
-            bool loop;
-            secf delay;
-            str on_complete;
-        };
-
-        struct empty_anim {
-            u32 track;
-            secf duration;
-            secf delay;
-            str on_complete;
-        };
-
-        using commands_t = stdex::variant<
-            clear_track,
-            set_anim,
-            add_anim,
-            empty_anim>;
-    public:
-        spine_animation_event() = default;
-
-        std::vector<commands_t>& commands() noexcept { return commands_; }
-        const std::vector<commands_t>& commands() const noexcept { return commands_; }
-    private:
-        std::vector<commands_t> commands_;
-    };
-    
-    template <>
-    class factory_loader<spine_animation_event> final : factory_loader<> {
-    public:
-        static const char* schema_source;
-
-        bool operator()(
-            spine_animation_event& component,
-            const fill_context& ctx) const;
-            
-        bool operator()(
-            asset_dependencies& dependencies,
-            const collect_context& ctx) const;
-    };
-}
diff --git a/headers/enduro2d/high/components/spine_player_cmd.hpp b/headers/enduro2d/high/components/spine_player_cmd.hpp
new file mode 100644
index 00000000..7328aaa9
--- /dev/null
+++ b/headers/enduro2d/high/components/spine_player_cmd.hpp
@@ -0,0 +1,210 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include "../_high.hpp"
+
+#include "../factory.hpp"
+
+namespace e2d
+{
+    class spine_player_cmd final {
+    public:
+        class clear_track_cmd final {
+        public:
+            clear_track_cmd(u32 track)
+            : track_(track) {}
+
+            u32 track() const noexcept { return track_; }
+        private:
+            u32 track_{0u};
+        };
+
+        class set_anim_cmd final {
+        public:
+            set_anim_cmd(u32 track, str name)
+            : track_(track)
+            , name_(std::move(name)) {}
+
+            set_anim_cmd& loop(bool value) noexcept {
+                loop_ = value;
+                return *this;
+            }
+
+            set_anim_cmd& end_message(str value) noexcept {
+                end_message_ = std::move(value);
+                return *this;
+            }
+
+            set_anim_cmd& complete_message(str value) noexcept {
+                complete_message_ = std::move(value);
+                return *this;
+            }
+
+            u32 track() const noexcept { return track_; }
+            const str& name() const noexcept { return name_; }
+            bool loop() const noexcept { return loop_; }
+            const str& end_message() const noexcept { return complete_message_; }
+            const str& complete_message() const noexcept { return complete_message_; }
+        private:
+            u32 track_{0u};
+            str name_;
+            bool loop_{false};
+            str end_message_;
+            str complete_message_;
+        };
+
+        class add_anim_cmd final {
+        public:
+            add_anim_cmd(u32 track, str name)
+            : track_(track)
+            , name_(std::move(name)) {}
+
+            add_anim_cmd& loop(bool value) noexcept {
+                loop_ = value;
+                return *this;
+            }
+
+            add_anim_cmd& delay(secf value) noexcept {
+                delay_ = value;
+                return *this;
+            }
+
+            add_anim_cmd& end_message(str value) noexcept {
+                end_message_ = std::move(value);
+                return *this;
+            }
+
+            add_anim_cmd& complete_message(str value) noexcept {
+                complete_message_ = std::move(value);
+                return *this;
+            }
+
+            u32 track() const noexcept { return track_; }
+            const str& name() const noexcept { return name_; }
+            bool loop() const noexcept { return loop_; }
+            secf delay() const noexcept { return delay_; }
+            const str& end_message() const noexcept { return end_message_; }
+            const str& complete_message() const noexcept { return complete_message_; }
+        private:
+            u32 track_{0u};
+            str name_;
+            bool loop_{false};
+            secf delay_{0.f};
+            str end_message_;
+            str complete_message_;
+        };
+
+        class set_empty_anim_cmd final {
+        public:
+            set_empty_anim_cmd(u32 track)
+            : track_(track) {}
+
+            set_empty_anim_cmd& mix_duration(secf value) noexcept {
+                mix_duration_ = value;
+                return *this;
+            }
+
+            set_empty_anim_cmd& end_message(str value) noexcept {
+                end_message_ = std::move(value);
+                return *this;
+            }
+
+            set_empty_anim_cmd& complete_message(str value) noexcept {
+                complete_message_ = std::move(value);
+                return *this;
+            }
+
+            u32 track() const noexcept { return track_; }
+            secf mix_duration() const noexcept { return mix_duration_; }
+            const str& end_message() const noexcept { return end_message_; }
+            const str& complete_message() const noexcept { return complete_message_; }
+        private:
+            u32 track_{0u};
+            secf mix_duration_{0.f};
+            str end_message_;
+            str complete_message_;
+        };
+
+        class add_empty_anim_cmd final {
+        public:
+            add_empty_anim_cmd(u32 track)
+            : track_(track) {}
+
+            add_empty_anim_cmd& delay(secf value) noexcept {
+                delay_ = value;
+                return *this;
+            }
+
+            add_empty_anim_cmd& mix_duration(secf value) noexcept {
+                mix_duration_ = value;
+                return *this;
+            }
+
+            add_empty_anim_cmd& end_message(str value) noexcept {
+                end_message_ = std::move(value);
+                return *this;
+            }
+
+            add_empty_anim_cmd& complete_message(str value) noexcept {
+                complete_message_ = std::move(value);
+                return *this;
+            }
+
+            u32 track() const noexcept { return track_; }
+            secf delay() const noexcept { return delay_; }
+            secf mix_duration() const noexcept { return mix_duration_; }
+            const str& end_message() const noexcept { return end_message_; }
+            const str& complete_message() const noexcept { return complete_message_; }
+        private:
+            u32 track_{0u};
+            secf delay_{0.f};
+            secf mix_duration_{0.f};
+            str end_message_;
+            str complete_message_;
+        };
+
+        using command = stdex::variant<
+            clear_track_cmd,
+            set_anim_cmd,
+            add_anim_cmd,
+            set_empty_anim_cmd,
+            add_empty_anim_cmd>;
+    public:
+        spine_player_cmd() = default;
+
+        spine_player_cmd& add_command(command cmd) {
+            commands_.push_back(std::move(cmd));
+            return *this;
+        }
+
+        spine_player_cmd& clear_commands() noexcept {
+            commands_.clear();
+            return *this;
+        }
+
+        const vector<command>& commands() const noexcept {
+            return commands_;
+        }
+    private:
+        vector<command> commands_;
+    };
+
+    template <>
+    class factory_loader<spine_player_cmd> final : factory_loader<> {
+    public:
+        static const char* schema_source;
+
+        bool operator()(
+            spine_player_cmd& component,
+            const fill_context& ctx) const;
+
+        bool operator()(
+            asset_dependencies& dependencies,
+            const collect_context& ctx) const;
+    };
+}
diff --git a/headers/enduro2d/high/components/spine_player_evt.hpp b/headers/enduro2d/high/components/spine_player_evt.hpp
new file mode 100644
index 00000000..b643531d
--- /dev/null
+++ b/headers/enduro2d/high/components/spine_player_evt.hpp
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#pragma once
+
+#include "../_high.hpp"
+
+#include "../factory.hpp"
+
+namespace e2d
+{
+    class spine_player_evt final {
+    public:
+        class custom_evt final {
+        public:
+            custom_evt(str_hash name)
+            : name_(name) {}
+
+            custom_evt& int_value(i32 value) noexcept {
+                int_value_ = value;
+                return *this;
+            }
+
+            custom_evt& float_value(f32 value) noexcept {
+                float_value_ = value;
+                return *this;
+            }
+
+            custom_evt& string_value(str value) noexcept {
+                string_value_ = std::move(value);
+                return *this;
+            }
+
+            str_hash name() const noexcept { return name_; }
+            i32 int_value() const noexcept { return int_value_; }
+            f32 float_value() const noexcept { return float_value_; }
+            const str& string_value() const noexcept { return string_value_; }
+        private:
+            str_hash name_;
+            i32 int_value_{0};
+            f32 float_value_{0.f};
+            str string_value_;
+        };
+
+        class end_evt final {
+        public:
+            end_evt(str message)
+            : message_(std::move(message)) {}
+
+            const str& message() const noexcept { return message_; }
+        private:
+            str message_;
+        };
+
+        class complete_evt final {
+        public:
+            complete_evt(str message)
+            : message_(std::move(message)) {}
+
+            const str& message() const noexcept { return message_; }
+        private:
+            str message_;
+        };
+
+        using event = stdex::variant<
+            custom_evt,
+            end_evt,
+            complete_evt>;
+    public:
+        spine_player_evt() = default;
+
+        spine_player_evt& add_event(event evt) {
+            events_.push_back(std::move(evt));
+            return *this;
+        }
+
+        spine_player_evt& clear_events() noexcept {
+            events_.clear();
+            return *this;
+        }
+
+        const vector<event>& events() const noexcept {
+            return events_;
+        }
+    private:
+        vector<event> events_;
+    };
+
+    template <>
+    class factory_loader<spine_player_evt> final : factory_loader<> {
+    public:
+        static const char* schema_source;
+
+        bool operator()(
+            spine_player_evt& component,
+            const fill_context& ctx) const;
+
+        bool operator()(
+            asset_dependencies& dependencies,
+            const collect_context& ctx) const;
+    };
+}
diff --git a/samples/bin/library/spine_coin_prefab.json b/samples/bin/library/spine_coin_prefab.json
index e3ef44fb..047ab580 100644
--- a/samples/bin/library/spine_coin_prefab.json
+++ b/samples/bin/library/spine_coin_prefab.json
@@ -6,11 +6,14 @@
         "spine_player" : {
             "model" : "spine_coin.json"
         },
-        "spine_animation" : {
-            "animations" : [{
-                "track" : 0,
-                "name" : "animation",
-                "loop" : true
+        "spine_player_cmd" : {
+            "commands" : [{
+                "type" : "set_anim_cmd",
+                "desc" : {
+                    "track" : 0,
+                    "name" : "animation",
+                    "loop" : true
+                }
             }]
         }
     }
diff --git a/samples/bin/library/spine_raptor_prefab.json b/samples/bin/library/spine_raptor_prefab.json
index e7d57053..ce1a38a6 100644
--- a/samples/bin/library/spine_raptor_prefab.json
+++ b/samples/bin/library/spine_raptor_prefab.json
@@ -6,11 +6,40 @@
         "spine_player" : {
             "model" : "spine_raptor.json"
         },
-        "spine_animation" : {
-            "animations" : [{
-                "track" : 0,
-                "name" : "walk",
-                "loop" : true
+        "spine_player_cmd" : {
+            "commands" : [{
+                "type" : "add_anim_cmd",
+                "desc" : {
+                    "track" : 0,
+                    "name" : "walk"
+                }
+            }, {
+                "type" : "add_anim_cmd",
+                "desc" : {
+                    "track" : 0,
+                    "name" : "roar"
+                }
+            }, {
+                "type" : "add_anim_cmd",
+                "desc" : {
+                    "track" : 0,
+                    "name" : "walk",
+                    "loop" : true
+                }
+            }, {
+                "type" : "add_anim_cmd",
+                "desc" : {
+                    "track" : 1,
+                    "name" : "gun-grab",
+                    "delay" : 2
+                }
+            }, {
+                "type" : "add_anim_cmd",
+                "desc" : {
+                    "track" : 1,
+                    "name" : "gun-holster",
+                    "delay" : 3
+                }
             }]
         }
     }
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index e82a80e1..9818583a 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -26,43 +26,48 @@ namespace
             if ( k.is_key_pressed(keyboard_key::lsuper) && k.is_key_just_released(keyboard_key::enter) ) {
                 the<window>().toggle_fullscreen(!the<window>().fullscreen());
             }
-            
+
             // use keys R, J, G to start animations
             const bool roar = k.is_key_just_pressed(keyboard_key::r);
             const bool jump = k.is_key_just_pressed(keyboard_key::j);
             const bool gun_grab = k.is_key_just_pressed(keyboard_key::g);
 
             if ( roar || jump || gun_grab ) {
-                owner.for_each_component<spine_player>(
-                [&owner, roar, jump, gun_grab] (ecs::entity_id e, const spine_player& player) {
-                    if ( !player.has_animation("walk") ) {
-                        return;
-                    }
-                    auto& events = ecs::entity(owner, e).assign_component<spine_animation_event>();
-                    if ( roar ) {
-                        events.commands().push_back(spine_animation_event::set_anim{0, "roar", false, "1"});
-                    } else if ( jump ) {
-                        events.commands().push_back(spine_animation_event::set_anim{0, "jump", false, "1"});
-                    } else if ( gun_grab ) {
-                        events.commands().push_back(spine_animation_event::set_anim{1, "gun-grab", false, ""});
-                        events.commands().push_back(spine_animation_event::add_anim{1, "gun-holster", false, secf(3.0f), ""});
+                owner.for_each_component<spine_player>([
+                    roar, jump, gun_grab
+                ](ecs::entity e, const spine_player& p) {
+                    if ( roar && p.has_animation("roar") ) {
+                        e.ensure_component<spine_player_cmd>().add_command(
+                            spine_player_cmd::set_anim_cmd(0, "roar")
+                                .complete_message("to_walk"));
+                    } else if ( jump && p.has_animation("jump") ) {
+                        e.ensure_component<spine_player_cmd>().add_command(
+                            spine_player_cmd::set_anim_cmd(0, "jump")
+                                .complete_message("to_walk"));
+                    } else if ( gun_grab && p.has_animation("gun-grab") ) {
+                        e.ensure_component<spine_player_cmd>()
+                            .add_command(spine_player_cmd::set_anim_cmd(1, "gun-grab"))
+                            .add_command(spine_player_cmd::add_anim_cmd(1, "gun-holster")
+                                .delay(secf(3.f)));
                     }
                 });
             }
-            
-            owner.for_joined_components<spine_player::on_complete_event, spine_player>(
-            [&owner](ecs::entity_id e, const spine_player::on_complete_event& events, spine_player& player) {
-                auto& new_events = ecs::entity(owner, e).assign_component<spine_animation_event>();
 
-                for ( auto& ev : events.completed() ) {
-                    if ( ev == "1" ) {
-                        new_events.commands().push_back(spine_animation_event::add_anim{0, "walk", true, secf(), ""});
+            owner.for_joined_components<spine_player_evt, spine_player>([
+            ](ecs::entity e, const spine_player_evt& pe, spine_player& p) {
+                for ( const auto& evt : pe.events() ) {
+                    if ( auto complete_evt = stdex::get_if<spine_player_evt::complete_evt>(&evt);
+                        complete_evt && complete_evt->message() == "to_walk" )
+                    {
+                        e.ensure_component<spine_player_cmd>().add_command(
+                            spine_player_cmd::add_anim_cmd(0, "walk")
+                                .loop(true));
                     }
                 }
             });
         }
     };
-    
+
     class camera_system final : public ecs::system {
     public:
         void process(ecs::registry& owner) override {
@@ -82,7 +87,6 @@ namespace
     public:
         bool initialize() final {
             return create_scene()
-                && create_camera()
                 && create_systems();
         }
     private:
@@ -94,15 +98,6 @@ namespace
             return !!scene_go;
         }
 
-        bool create_camera() {
-            auto camera_i = the<world>().instantiate();
-            camera_i->entity_filler()
-                .component<camera>(camera()
-                    .background({1.f, 0.4f, 0.f, 1.f}))
-                .component<actor>(node::create(camera_i));
-            return true;
-        }
-
         bool create_systems() {
             ecs::registry_filler(the<world>().registry())
                 .system<game_system>(world::priority_update)
diff --git a/sources/enduro2d/high/components/spine_animation_event.cpp b/sources/enduro2d/high/components/spine_animation_event.cpp
deleted file mode 100644
index 958054f7..00000000
--- a/sources/enduro2d/high/components/spine_animation_event.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * This file is part of the "Enduro2D"
- * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
- ******************************************************************************/
-
-#include <enduro2d/high/components/spine_animation_event.hpp>
-
-namespace e2d
-{
-    const char* factory_loader<spine_animation_event>::schema_source = R"json({
-        "type" : "object",
-        "required" : [],
-        "additionalProperties" : false,
-        "properties" : {
-            "animations" : {
-                "type" : "array",
-                "items" : { "$ref": "#/definitions/spine_animation" }
-            }
-        },
-        "definitions" : {
-            "spine_animation" : {
-                "type" : "object",
-                "required" : [ "track", "name" ],
-                "additionalProperties" : false,
-                "properties" : {
-                    "track" : { "type" : "integer", "minimum" : 0, "maximum": 8 },
-                    "name" : { "$ref": "#/common_definitions/name" },
-                    "loop" : { "type" : "boolean" },
-                    "delay" : { "type" : "number" }
-                }
-            }
-        }
-    })json";
-    
-    bool factory_loader<spine_animation_event>::operator()(
-        spine_animation_event& component,
-        const fill_context& ctx) const
-    {
-        if ( ctx.root.HasMember("animations") ) {
-            const auto& animations_json = ctx.root["animations"];
-            E2D_ASSERT(animations_json.IsArray());
-            
-            for ( rapidjson::SizeType i = 0; i < animations_json.Size(); ++i ) {
-                E2D_ASSERT(animations_json[i].IsObject());
-                const auto& item_json = animations_json[i];
-
-                E2D_ASSERT(item_json.HasMember("track") && item_json.HasMember("name"));
-                u32 track = 0;
-                secf delay;
-                bool loop = false;
-                const char* name = "";
-
-                if ( item_json.HasMember("name") ) {
-                    name = item_json["name"].GetString();
-                }
-
-                if ( item_json.HasMember("track") ) {
-                    if ( !json_utils::try_parse_value(item_json["track"], track) ) {
-                        the<debug>().error("SPINE_ANIMATION: Incorrect formatting of 'animations.track' property");
-                        return false;
-                    }
-                }
-
-                if ( item_json.HasMember("delay") ) {
-                    if ( !json_utils::try_parse_value(item_json["delay"], delay.value) ) {
-                        the<debug>().error("SPINE_ANIMATION: Incorrect formatting of 'animations.delay' property");
-                        return false;
-                    }
-                }
-
-                if ( item_json.HasMember("loop") ) {
-                    if ( !json_utils::try_parse_value(item_json["loop"], loop) ) {
-                        the<debug>().error("SPINE_ANIMATION: Incorrect formatting of 'animations.loop' property");
-                        return false;
-                    }
-                }
-
-                component.commands().emplace_back(spine_animation_event::add_anim{
-                    track, name, loop, delay, ""});
-            }
-        }
-
-        return true;
-    }
-    
-    bool factory_loader<spine_animation_event>::operator()(
-        asset_dependencies& dependencies,
-        const collect_context& ctx) const
-    {
-        E2D_UNUSED(dependencies, ctx);
-        return true;
-    }
-}
diff --git a/sources/enduro2d/high/components/spine_player_cmd.cpp b/sources/enduro2d/high/components/spine_player_cmd.cpp
new file mode 100644
index 00000000..c5eeea69
--- /dev/null
+++ b/sources/enduro2d/high/components/spine_player_cmd.cpp
@@ -0,0 +1,395 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/components/spine_player_cmd.hpp>
+
+namespace
+{
+    using namespace e2d;
+
+    std::optional<spine_player_cmd::clear_track_cmd> parse_clear_track_cmd(const rapidjson::Value& root) {
+        E2D_ASSERT(root.IsObject());
+
+        u32 cmd_track{0u};
+        if ( !json_utils::try_parse_value(root["track"], cmd_track) ) {
+            the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'clear_track_cmd.track' property");
+            return std::nullopt;
+        }
+
+        return spine_player_cmd::clear_track_cmd(cmd_track);
+    }
+
+    std::optional<spine_player_cmd::set_anim_cmd> parse_set_anim_cmd(const rapidjson::Value& root) {
+        E2D_ASSERT(root.IsObject());
+
+        u32 cmd_track{0u};
+        E2D_ASSERT(root.HasMember("track"));
+        if ( !json_utils::try_parse_value(root["track"], cmd_track) ) {
+            the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'set_anim_cmd.track' property");
+            return std::nullopt;
+        }
+
+        str cmd_name;
+        E2D_ASSERT(root.HasMember("name"));
+        if ( !json_utils::try_parse_value(root["name"], cmd_name) ) {
+            the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'set_anim_cmd.name' property");
+            return std::nullopt;
+        }
+
+        spine_player_cmd::set_anim_cmd cmd(cmd_track, std::move(cmd_name));
+
+        if ( root.HasMember("loop") ) {
+            bool cmd_loop = cmd.loop();
+            if ( !json_utils::try_parse_value(root["loop"], cmd_loop) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'set_anim_cmd.loop' property");
+                return std::nullopt;
+            }
+            cmd.loop(cmd_loop);
+        }
+
+        if ( root.HasMember("end_message") ) {
+            str cmd_end_message = cmd.end_message();
+            if ( !json_utils::try_parse_value(root["end_message"], cmd_end_message) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'set_anim_cmd.end_message' property");
+                return std::nullopt;
+            }
+            cmd.end_message(std::move(cmd_end_message));
+        }
+
+        if ( root.HasMember("complete_message") ) {
+            str cmd_complete_message = cmd.complete_message();
+            if ( !json_utils::try_parse_value(root["complete_message"], cmd_complete_message) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'set_anim_cmd.complete_message' property");
+                return std::nullopt;
+            }
+            cmd.complete_message(std::move(cmd_complete_message));
+        }
+
+        return cmd;
+    }
+
+    std::optional<spine_player_cmd::add_anim_cmd> parse_add_anim_cmd(const rapidjson::Value& root) {
+        E2D_ASSERT(root.IsObject());
+
+        u32 cmd_track{0u};
+        E2D_ASSERT(root.HasMember("track"));
+        if ( !json_utils::try_parse_value(root["track"], cmd_track) ) {
+            the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'add_anim_cmd.track' property");
+            return std::nullopt;
+        }
+
+        str cmd_name;
+        E2D_ASSERT(root.HasMember("name"));
+        if ( !json_utils::try_parse_value(root["name"], cmd_name) ) {
+            the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'add_anim_cmd.name' property");
+            return std::nullopt;
+        }
+
+        spine_player_cmd::add_anim_cmd cmd(cmd_track, std::move(cmd_name));
+
+        if ( root.HasMember("loop") ) {
+            bool cmd_loop = cmd.loop();
+            if ( !json_utils::try_parse_value(root["loop"], cmd_loop) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'add_anim_cmd.loop' property");
+                return std::nullopt;
+            }
+            cmd.loop(cmd_loop);
+        }
+
+        if ( root.HasMember("delay") ) {
+            secf cmd_delay = cmd.delay();
+            if ( !json_utils::try_parse_value(root["delay"], cmd_delay) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'add_anim_cmd.delay' property");
+                return std::nullopt;
+            }
+            cmd.delay(cmd_delay);
+        }
+
+        if ( root.HasMember("end_message") ) {
+            str cmd_end_message = cmd.end_message();
+            if ( !json_utils::try_parse_value(root["end_message"], cmd_end_message) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'add_anim_cmd.end_message' property");
+                return std::nullopt;
+            }
+            cmd.end_message(std::move(cmd_end_message));
+        }
+
+        if ( root.HasMember("complete_message") ) {
+            str cmd_complete_message = cmd.complete_message();
+            if ( !json_utils::try_parse_value(root["complete_message"], cmd_complete_message) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'add_anim_cmd.complete_message' property");
+                return std::nullopt;
+            }
+            cmd.complete_message(std::move(cmd_complete_message));
+        }
+
+        return cmd;
+    }
+
+    std::optional<spine_player_cmd::set_empty_anim_cmd> parse_set_empty_anim_cmd(const rapidjson::Value& root) {
+        E2D_ASSERT(root.IsObject());
+
+        u32 cmd_track{0u};
+        E2D_ASSERT(root.HasMember("track"));
+        if ( !json_utils::try_parse_value(root["track"], cmd_track) ) {
+            the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'set_empty_anim_cmd.track' property");
+            return std::nullopt;
+        }
+
+        spine_player_cmd::set_empty_anim_cmd cmd(cmd_track);
+
+        if ( root.HasMember("mix_duration") ) {
+            secf cmd_mix_duration = cmd.mix_duration();
+            if ( !json_utils::try_parse_value(root["mix_duration"], cmd_mix_duration) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'set_empty_anim_cmd.mix_duration' property");
+                return std::nullopt;
+            }
+            cmd.mix_duration(cmd_mix_duration);
+        }
+
+        if ( root.HasMember("end_message") ) {
+            str cmd_end_message = cmd.end_message();
+            if ( !json_utils::try_parse_value(root["end_message"], cmd_end_message) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'set_empty_anim_cmd.end_message' property");
+                return std::nullopt;
+            }
+            cmd.end_message(std::move(cmd_end_message));
+        }
+
+        if ( root.HasMember("complete_message") ) {
+            str cmd_complete_message = cmd.complete_message();
+            if ( !json_utils::try_parse_value(root["complete_message"], cmd_complete_message) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'set_empty_anim_cmd.complete_message' property");
+                return std::nullopt;
+            }
+            cmd.complete_message(std::move(cmd_complete_message));
+        }
+
+        return cmd;
+    }
+
+    std::optional<spine_player_cmd::add_empty_anim_cmd> parse_add_empty_anim_cmd(const rapidjson::Value& root) {
+        E2D_ASSERT(root.IsObject());
+
+        u32 cmd_track{0u};
+        E2D_ASSERT(root.HasMember("track"));
+        if ( !json_utils::try_parse_value(root["track"], cmd_track) ) {
+            the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'add_empty_anim_cmd.track' property");
+            return std::nullopt;
+        }
+
+        spine_player_cmd::add_empty_anim_cmd cmd(cmd_track);
+
+        if ( root.HasMember("delay") ) {
+            secf cmd_delay = cmd.delay();
+            if ( !json_utils::try_parse_value(root["delay"], cmd_delay) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'add_empty_anim_cmd.delay' property");
+                return std::nullopt;
+            }
+            cmd.delay(cmd_delay);
+        }
+
+        if ( root.HasMember("mix_duration") ) {
+            secf cmd_mix_duration = cmd.mix_duration();
+            if ( !json_utils::try_parse_value(root["mix_duration"], cmd_mix_duration) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'add_empty_anim_cmd.mix_duration' property");
+                return std::nullopt;
+            }
+            cmd.mix_duration(cmd_mix_duration);
+        }
+
+        if ( root.HasMember("end_message") ) {
+            str cmd_end_message = cmd.end_message();
+            if ( !json_utils::try_parse_value(root["end_message"], cmd_end_message) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'add_empty_anim_cmd.end_message' property");
+                return std::nullopt;
+            }
+            cmd.end_message(std::move(cmd_end_message));
+        }
+
+        if ( root.HasMember("complete_message") ) {
+            str cmd_complete_message = cmd.complete_message();
+            if ( !json_utils::try_parse_value(root["complete_message"], cmd_complete_message) ) {
+                the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'add_empty_anim_cmd.complete_message' property");
+                return std::nullopt;
+            }
+            cmd.complete_message(std::move(cmd_complete_message));
+        }
+
+        return cmd;
+    }
+
+    std::optional<spine_player_cmd::command> parse_command(const rapidjson::Value& root) {
+        E2D_ASSERT(root.IsObject());
+
+        str_hash command_type;
+        E2D_ASSERT(root.HasMember("type") && root["type"].IsString());
+        if ( !json_utils::try_parse_value(root["type"], command_type) ) {
+            the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'command.type' property");
+            return std::nullopt;
+        }
+
+        E2D_ASSERT(root.HasMember("desc") && root["desc"].IsObject());
+        const auto& command_desc = root["desc"];
+
+        if ( command_type == make_hash("clear_track_cmd") ) {
+            auto cmd = parse_clear_track_cmd(command_desc);
+            return cmd ? cmd : std::nullopt;
+        } else if ( command_type == make_hash("set_anim_cmd") ) {
+            auto cmd = parse_set_anim_cmd(command_desc);
+            return cmd ? cmd : std::nullopt;
+        } else if ( command_type == make_hash("add_anim_cmd") ) {
+            auto cmd = parse_add_anim_cmd(command_desc);
+            return cmd ? cmd : std::nullopt;
+        } else if ( command_type == make_hash("set_empty_anim_cmd") ) {
+            auto cmd = parse_set_empty_anim_cmd(command_desc);
+            return cmd ? cmd : std::nullopt;
+        } else if ( command_type == make_hash("add_empty_anim_cmd") ) {
+            auto cmd = parse_add_empty_anim_cmd(command_desc);
+            return cmd ? cmd : std::nullopt;
+        } else {
+            the<debug>().error("SPINE_PLAYER_CMD: Incorrect formatting of 'command.type' property");
+            return std::nullopt;
+        }
+    }
+
+    std::optional<vector<spine_player_cmd::command>> parse_commands(const rapidjson::Value& root) {
+        E2D_ASSERT(root.IsArray());
+
+        vector<spine_player_cmd::command> cmds;
+        cmds.reserve(root.Size());
+
+        for ( rapidjson::SizeType i = 0; i < root.Size(); ++i ) {
+            auto cmd = parse_command(root[i]);
+            if ( !cmd ) {
+                return std::nullopt;
+            }
+            cmds.push_back(std::move(cmd.value()));
+        }
+
+        return cmds;
+    }
+}
+
+namespace e2d
+{
+    const char* factory_loader<spine_player_cmd>::schema_source = R"json({
+        "type" : "object",
+        "required" : [],
+        "additionalProperties" : false,
+        "properties" : {
+            "commands" : { "$ref": "#/definitions/commands" }
+        },
+        "definitions" : {
+            "commands" : {
+                "type" : "array",
+                "items" : { "$ref": "#/definitions/command" }
+            },
+            "command" : {
+                "type" : "object",
+                "required" : [ "type", "desc" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "type" : { "$ref": "#/common_definitions/name" },
+                    "desc" : {
+                        "anyOf" : [{
+                            "$ref" : "#/definitions/clear_track_cmd"
+                        }, {
+                            "$ref" : "#/definitions/set_anim_cmd"
+                        }, {
+                            "$ref" : "#/definitions/add_anim_cmd"
+                        }, {
+                            "$ref" : "#/definitions/set_empty_anim_cmd"
+                        }, {
+                            "$ref" : "#/definitions/add_empty_anim_cmd"
+                        }]
+                    }
+                }
+            },
+            "clear_track_cmd" : {
+                "type" : "object",
+                "required" : [ "track" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "track" : { "type" : "integer", "minimum" : 0 }
+                }
+            },
+            "set_anim_cmd" : {
+                "type" : "object",
+                "required" : [ "track", "name" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "track" : { "type" : "integer", "minimum" : 0 },
+                    "name" : { "$ref": "#/common_definitions/name" },
+                    "loop" : { "type" : "boolean" },
+                    "end_message" : { "type" : "string" },
+                    "complete_message" : { "type" : "string" }
+                }
+            },
+            "add_anim_cmd" : {
+                "type" : "object",
+                "required" : [ "track", "name" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "track" : { "type" : "integer", "minimum" : 0 },
+                    "name" : { "$ref": "#/common_definitions/name" },
+                    "loop" : { "type" : "boolean" },
+                    "delay" : { "type" : "number" },
+                    "end_message" : { "type" : "string" },
+                    "complete_message" : { "type" : "string" }
+                }
+            },
+            "set_empty_anim_cmd" : {
+                "type" : "object",
+                "required" : [ "track" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "track" : { "type" : "integer", "minimum" : 0 },
+                    "mix_duration" : { "type" : "number" },
+                    "end_message" : { "type" : "string" },
+                    "complete_message" : { "type" : "string" }
+                }
+            },
+            "add_empty_anim_cmd" : {
+                "type" : "object",
+                "required" : [ "track" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "track" : { "type" : "integer", "minimum" : 0 },
+                    "delay" : { "type" : "number" },
+                    "mix_duration" : { "type" : "number" },
+                    "end_message" : { "type" : "string" },
+                    "complete_message" : { "type" : "string" }
+                }
+            }
+        }
+    })json";
+
+    bool factory_loader<spine_player_cmd>::operator()(
+        spine_player_cmd& component,
+        const fill_context& ctx) const
+    {
+        if ( ctx.root.HasMember("commands") ) {
+            auto cmds = parse_commands(ctx.root["commands"]);
+            if ( !cmds ) {
+                return false;
+            }
+            for ( auto& cmd : cmds.value() ) {
+                component.add_command(std::move(cmd));
+            }
+        }
+
+        return true;
+    }
+
+    bool factory_loader<spine_player_cmd>::operator()(
+        asset_dependencies& dependencies,
+        const collect_context& ctx) const
+    {
+        E2D_UNUSED(dependencies, ctx);
+        return true;
+    }
+}
diff --git a/sources/enduro2d/high/components/spine_player_evt.cpp b/sources/enduro2d/high/components/spine_player_evt.cpp
new file mode 100644
index 00000000..622fbf1d
--- /dev/null
+++ b/sources/enduro2d/high/components/spine_player_evt.cpp
@@ -0,0 +1,212 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/components/spine_player_evt.hpp>
+
+namespace
+{
+    using namespace e2d;
+
+    std::optional<spine_player_evt::custom_evt> parse_custom_evt(const rapidjson::Value& root) {
+        E2D_ASSERT(root.IsObject());
+
+        str_hash evt_name;
+        E2D_ASSERT(root.HasMember("name"));
+        if ( !json_utils::try_parse_value(root["name"], evt_name) ) {
+            the<debug>().error("SPINE_PLAYER_EVT: Incorrect formatting of 'custom_evt.name' property");
+            return std::nullopt;
+        }
+
+        spine_player_evt::custom_evt evt(evt_name);
+
+        if ( root.HasMember("int_value") ) {
+            i32 evt_int_value = evt.int_value();
+            if ( !json_utils::try_parse_value(root["int_value"], evt_int_value) ) {
+                the<debug>().error("SPINE_PLAYER_EVT: Incorrect formatting of 'custom_evt.int_value' property");
+                return std::nullopt;
+            }
+            evt.int_value(evt_int_value);
+        }
+
+        if ( root.HasMember("float_value") ) {
+            f32 evt_float_value = evt.float_value();
+            if ( !json_utils::try_parse_value(root["float_value"], evt_float_value) ) {
+                the<debug>().error("SPINE_PLAYER_EVT: Incorrect formatting of 'custom_evt.float_value' property");
+                return std::nullopt;
+            }
+            evt.float_value(evt_float_value);
+        }
+
+        if ( root.HasMember("string_value") ) {
+            str evt_string_value = evt.string_value();
+            if ( !json_utils::try_parse_value(root["string_value"], evt_string_value) ) {
+                the<debug>().error("SPINE_PLAYER_EVT: Incorrect formatting of 'custom_evt.string_value' property");
+                return std::nullopt;
+            }
+            evt.string_value(evt_string_value);
+        }
+
+        return evt;
+    }
+
+    std::optional<spine_player_evt::end_evt> parse_end_evt(const rapidjson::Value& root) {
+        E2D_ASSERT(root.IsObject());
+
+        str evt_message;
+        E2D_ASSERT(root.HasMember("message"));
+        if ( !json_utils::try_parse_value(root["message"], evt_message) ) {
+            the<debug>().error("SPINE_PLAYER_EVT: Incorrect formatting of 'end_evt.message' property");
+            return std::nullopt;
+        }
+
+        return spine_player_evt::end_evt(evt_message);
+    }
+
+    std::optional<spine_player_evt::complete_evt> parse_complete_evt(const rapidjson::Value& root) {
+        E2D_ASSERT(root.IsObject());
+
+        str evt_message;
+        E2D_ASSERT(root.HasMember("message"));
+        if ( !json_utils::try_parse_value(root["message"], evt_message) ) {
+            the<debug>().error("SPINE_PLAYER_EVT: Incorrect formatting of 'complete_evt.message' property");
+            return std::nullopt;
+        }
+
+        return spine_player_evt::complete_evt(evt_message);
+    }
+
+    std::optional<spine_player_evt::event> parse_event(const rapidjson::Value& root) {
+        E2D_ASSERT(root.IsObject());
+
+        str_hash event_type;
+        E2D_ASSERT(root.HasMember("type") && root["type"].IsString());
+        if ( !json_utils::try_parse_value(root["type"], event_type) ) {
+            the<debug>().error("SPINE_PLAYER_EVT: Incorrect formatting of 'event.type' property");
+            return std::nullopt;
+        }
+
+        E2D_ASSERT(root.HasMember("desc") && root["desc"].IsObject());
+        const auto& event_desc = root["desc"];
+
+        if ( event_type == make_hash("custom_evt") ) {
+            auto evt = parse_custom_evt(event_desc);
+            return evt ? evt : std::nullopt;
+        } else if ( event_type == make_hash("end_evt") ) {
+            auto evt = parse_end_evt(event_desc);
+            return evt ? evt : std::nullopt;
+        } else if ( event_type == make_hash("complete_evt") ) {
+            auto evt = parse_complete_evt(event_desc);
+            return evt ? evt : std::nullopt;
+        } else {
+            the<debug>().error("SPINE_PLAYER_EVT: Incorrect formatting of 'event.type' property");
+            return std::nullopt;
+        }
+    }
+
+    std::optional<vector<spine_player_evt::event>> parse_events(const rapidjson::Value& root) {
+        E2D_ASSERT(root.IsArray());
+
+        vector<spine_player_evt::event> evts;
+        evts.reserve(root.Size());
+
+        for ( rapidjson::SizeType i = 0; i < root.Size(); ++i ) {
+            auto evt = parse_event(root[i]);
+            if ( !evt ) {
+                return std::nullopt;
+            }
+            evts.push_back(std::move(evt.value()));
+        }
+
+        return evts;
+    }
+}
+
+namespace e2d
+{
+    const char* factory_loader<spine_player_evt>::schema_source = R"json({
+        "type" : "object",
+        "required" : [],
+        "additionalProperties" : false,
+        "properties" : {
+            "events" : { "$ref": "#/definitions/events" }
+        },
+        "definitions" : {
+            "events" : {
+                "type" : "array",
+                "items" : { "$ref": "#/definitions/event" }
+            },
+            "event" : {
+                "type" : "object",
+                "required" : [ "type", "desc" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "type" : { "$ref": "#/common_definitions/name" },
+                    "desc" : {
+                        "anyOf" : [{
+                            "$ref" : "#/definitions/custom_evt"
+                        },{
+                            "$ref" : "#/definitions/end_evt"
+                        },{
+                            "$ref" : "#/definitions/complete_evt"
+                        }]
+                    }
+                }
+            },
+            "custom_evt" : {
+                "type" : "object",
+                "required" : [ "name" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "name" : { "$ref": "#/common_definitions/name" },
+                    "int_value" : { "type" : "integer" },
+                    "float_value" : { "type" : "number" },
+                    "string_value" : { "type" : "string" }
+                }
+            },
+            "end_evt" : {
+                "type" : "object",
+                "required" : [ "message" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "message" : { "$ref": "#/common_definitions/name" }
+                }
+            },
+            "complete_evt" : {
+                "type" : "object",
+                "required" : [ "message" ],
+                "additionalProperties" : false,
+                "properties" : {
+                    "message" : { "$ref": "#/common_definitions/name" }
+                }
+            }
+        }
+    })json";
+
+    bool factory_loader<spine_player_evt>::operator()(
+        spine_player_evt& component,
+        const fill_context& ctx) const
+    {
+        if ( ctx.root.HasMember("events") ) {
+            auto evts = parse_events(ctx.root["events"]);
+            if ( !evts ) {
+                return false;
+            }
+            for ( auto& evt : evts.value() ) {
+                component.add_event(std::move(evt));
+            }
+        }
+
+        return true;
+    }
+
+    bool factory_loader<spine_player_evt>::operator()(
+        asset_dependencies& dependencies,
+        const collect_context& ctx) const
+    {
+        E2D_UNUSED(dependencies, ctx);
+        return true;
+    }
+}
diff --git a/sources/enduro2d/high/starter.cpp b/sources/enduro2d/high/starter.cpp
index 60d67ba5..e0c082c1 100644
--- a/sources/enduro2d/high/starter.cpp
+++ b/sources/enduro2d/high/starter.cpp
@@ -19,7 +19,8 @@
 #include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/scene.hpp>
 #include <enduro2d/high/components/spine_player.hpp>
-#include <enduro2d/high/components/spine_animation_event.hpp>
+#include <enduro2d/high/components/spine_player_cmd.hpp>
+#include <enduro2d/high/components/spine_player_evt.hpp>
 #include <enduro2d/high/components/sprite_renderer.hpp>
 
 #include <enduro2d/high/systems/flipbook_system.hpp>
@@ -143,7 +144,8 @@ namespace e2d
             .register_component<renderer>("renderer")
             .register_component<scene>("scene")
             .register_component<spine_player>("spine_player")
-            .register_component<spine_animation_event>("spine_animation")
+            .register_component<spine_player_cmd>("spine_player_cmd")
+            .register_component<spine_player_evt>("spine_player_evt")
             .register_component<sprite_renderer>("sprite_renderer");
         safe_module_initialize<library>(params.library_root(), the<deferrer>());
         safe_module_initialize<world>();

From 8ec358afb0c86dadc9f77d5b8f449cd3443b1186 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Mon, 2 Sep 2019 07:00:07 +0700
Subject: [PATCH 099/108] two separated spine system for pre and post update

---
 headers/enduro2d/high/_all.hpp                |   2 +-
 headers/enduro2d/high/_high.hpp               |   3 +-
 .../{spine_system.hpp => spine_systems.hpp}   |  16 +-
 sources/enduro2d/high/starter.cpp             |  11 +-
 .../high/systems/spine_post_system.cpp        | 237 ++++++++++++++++++
 .../high/systems/spine_pre_system.cpp         |  62 +++++
 .../enduro2d/high/systems/spine_system.cpp    | 199 ---------------
 7 files changed, 321 insertions(+), 209 deletions(-)
 rename headers/enduro2d/high/systems/{spine_system.hpp => spine_systems.hpp} (57%)
 create mode 100644 sources/enduro2d/high/systems/spine_post_system.cpp
 create mode 100644 sources/enduro2d/high/systems/spine_pre_system.cpp
 delete mode 100644 sources/enduro2d/high/systems/spine_system.cpp

diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index 109ea471..9b884826 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -43,7 +43,7 @@
 #include "systems/flipbook_system.hpp"
 #include "systems/label_system.hpp"
 #include "systems/render_system.hpp"
-#include "systems/spine_system.hpp"
+#include "systems/spine_systems.hpp"
 
 #include "address.hpp"
 #include "asset.hpp"
diff --git a/headers/enduro2d/high/_high.hpp b/headers/enduro2d/high/_high.hpp
index ec5b45df..c21f251a 100644
--- a/headers/enduro2d/high/_high.hpp
+++ b/headers/enduro2d/high/_high.hpp
@@ -55,7 +55,8 @@ namespace e2d
     class flipbook_system;
     class label_system;
     class render_system;
-    class spine_system;
+    class spine_pre_system;
+    class spine_post_system;
 
     template < typename Asset, typename Content >
     class content_asset;
diff --git a/headers/enduro2d/high/systems/spine_system.hpp b/headers/enduro2d/high/systems/spine_systems.hpp
similarity index 57%
rename from headers/enduro2d/high/systems/spine_system.hpp
rename to headers/enduro2d/high/systems/spine_systems.hpp
index 0bdefa68..c13844a8 100644
--- a/headers/enduro2d/high/systems/spine_system.hpp
+++ b/headers/enduro2d/high/systems/spine_systems.hpp
@@ -10,10 +10,20 @@
 
 namespace e2d
 {
-    class spine_system final : public ecs::system {
+    class spine_pre_system final : public ecs::system {
     public:
-        spine_system();
-        ~spine_system() noexcept final;
+        spine_pre_system();
+        ~spine_pre_system() noexcept final;
+        void process(ecs::registry& owner) override;
+    private:
+        class internal_state;
+        std::unique_ptr<internal_state> state_;
+    };
+
+    class spine_post_system final : public ecs::system {
+    public:
+        spine_post_system();
+        ~spine_post_system() noexcept final;
         void process(ecs::registry& owner) override;
     private:
         class internal_state;
diff --git a/sources/enduro2d/high/starter.cpp b/sources/enduro2d/high/starter.cpp
index e0c082c1..0209143f 100644
--- a/sources/enduro2d/high/starter.cpp
+++ b/sources/enduro2d/high/starter.cpp
@@ -26,7 +26,7 @@
 #include <enduro2d/high/systems/flipbook_system.hpp>
 #include <enduro2d/high/systems/label_system.hpp>
 #include <enduro2d/high/systems/render_system.hpp>
-#include <enduro2d/high/systems/spine_system.hpp>
+#include <enduro2d/high/systems/spine_systems.hpp>
 
 namespace
 {
@@ -46,10 +46,11 @@ namespace
 
         bool initialize() final {
             ecs::registry_filler(the<world>().registry())
-                .system<flipbook_system>(world::priority_update)
-                .system<label_system>(world::priority_update)
-                .system<render_system>(world::priority_render)
-                .system<spine_system>(world::priority_update);
+                .system<flipbook_system>(world::priority_pre_update)
+                .system<label_system>(world::priority_pre_update)
+                .system<spine_pre_system>(world::priority_pre_update)
+                .system<spine_post_system>(world::priority_post_update)
+                .system<render_system>(world::priority_render);
             return !application_ || application_->initialize();
         }
 
diff --git a/sources/enduro2d/high/systems/spine_post_system.cpp b/sources/enduro2d/high/systems/spine_post_system.cpp
new file mode 100644
index 00000000..28fea236
--- /dev/null
+++ b/sources/enduro2d/high/systems/spine_post_system.cpp
@@ -0,0 +1,237 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/systems/spine_systems.hpp>
+
+#include <enduro2d/high/components/spine_player.hpp>
+#include <enduro2d/high/components/spine_player_cmd.hpp>
+#include <enduro2d/high/components/spine_player_evt.hpp>
+
+#include <spine/spine.h>
+
+namespace
+{
+    using namespace e2d;
+
+    struct entry_internal_state {
+        ecs::entity target;
+        str end_message;
+        str complete_message;
+
+        entry_internal_state(ecs::entity target, str end_msg, str complete_msg)
+        : target(std::move(target))
+        , end_message(std::move(end_msg))
+        , complete_message(std::move(complete_msg)) {}
+    };
+
+    void entry_listener(
+        spAnimationState*,
+        spEventType type,
+        spTrackEntry* entry,
+        spEvent* event)
+    {
+        if ( !entry->userData ) {
+            return;
+        }
+
+        entry_internal_state& entry_state =
+            *static_cast<entry_internal_state*>(entry->userData);
+
+        if ( type == SP_ANIMATION_DISPOSE || !entry_state.target.valid() ) {
+            std::unique_ptr<entry_internal_state> entry_internal(&entry_state);
+            entry->userData = nullptr;
+            return;
+        }
+
+        if ( type == SP_ANIMATION_EVENT ) {
+            if ( !event || !event->data ) {
+                return;
+            }
+            entry_state.target.ensure_component<spine_player_evt>()
+                .add_event(spine_player_evt::custom_evt(event->data->name ? event->data->name : "")
+                    .int_value(event->intValue)
+                    .float_value(event->floatValue)
+                    .string_value(event->stringValue ? event->stringValue : ""));
+        } else if ( type == SP_ANIMATION_END ) {
+            if ( entry_state.end_message.empty() ) {
+                return;
+            }
+            entry_state.target.ensure_component<spine_player_evt>()
+                .add_event(spine_player_evt::end_evt(entry_state.end_message));
+        } else if ( type == SP_ANIMATION_COMPLETE ) {
+            if ( entry_state.complete_message.empty() ) {
+                return;
+            }
+            entry_state.target.ensure_component<spine_player_evt>()
+                .add_event(spine_player_evt::complete_evt(entry_state.complete_message));
+        }
+    }
+
+    class command_visitor final : private noncopyable {
+    public:
+        command_visitor(
+            ecs::entity target,
+            spSkeletonData& skeleton_data,
+            spAnimationState& animation_state)
+        : target_(std::move(target))
+        , skeleton_data_(skeleton_data)
+        , animation_state_(animation_state) {}
+
+        void operator()(const spine_player_cmd::clear_track_cmd& cmd) const noexcept {
+            spAnimationState_clearTrack(
+                &animation_state_,
+                math::numeric_cast<int>(cmd.track()));
+        }
+
+        void operator()(const spine_player_cmd::set_anim_cmd& cmd) const noexcept {
+            spAnimation* animation = spSkeletonData_findAnimation(&skeleton_data_, cmd.name().c_str());
+            if ( !animation ) {
+                the<debug>().error("SPINE_POST_SYSTEM: animation '%0' is not found", cmd.name());
+                return;
+            }
+
+            auto entry_state = std::make_unique<entry_internal_state>(
+                target_,
+                cmd.end_message(),
+                cmd.complete_message());
+
+            spTrackEntry* entry = spAnimationState_setAnimation(
+                &animation_state_,
+                math::numeric_cast<int>(cmd.track()),
+                animation,
+                cmd.loop() ? 1 : 0);
+
+            entry->listener = &entry_listener;
+            entry->userData = entry_state.release();
+        }
+
+        void operator()(const spine_player_cmd::add_anim_cmd& cmd) const noexcept {
+            spAnimation* animation = spSkeletonData_findAnimation(&skeleton_data_, cmd.name().c_str());
+            if ( !animation ) {
+                the<debug>().error("SPINE_POST_SYSTEM: animation '%0' is not found", cmd.name());
+                return;
+            }
+
+            auto entry_state = std::make_unique<entry_internal_state>(
+                target_,
+                cmd.end_message(),
+                cmd.complete_message());
+
+            spTrackEntry* entry = spAnimationState_addAnimation(
+                &animation_state_,
+                math::numeric_cast<int>(cmd.track()),
+                animation,
+                cmd.loop() ? 1 : 0,
+                cmd.delay().value);
+
+            entry->listener = &entry_listener;
+            entry->userData = entry_state.release();
+        }
+
+        void operator()(const spine_player_cmd::set_empty_anim_cmd& cmd) const noexcept {
+            auto entry_state = std::make_unique<entry_internal_state>(
+                target_,
+                cmd.end_message(),
+                cmd.complete_message());
+
+            spTrackEntry* entry = spAnimationState_setEmptyAnimation(
+                &animation_state_,
+                math::numeric_cast<int>(cmd.track()),
+                cmd.mix_duration().value);
+
+            entry->listener = &entry_listener;
+            entry->userData = entry_state.release();
+        }
+
+        void operator()(const spine_player_cmd::add_empty_anim_cmd& cmd) const noexcept {
+            auto entry_state = std::make_unique<entry_internal_state>(
+                target_,
+                cmd.end_message(),
+                cmd.complete_message());
+
+            spTrackEntry* entry = spAnimationState_addEmptyAnimation(
+                &animation_state_,
+                math::numeric_cast<int>(cmd.track()),
+                cmd.mix_duration().value,
+                cmd.delay().value);
+
+            entry->listener = &entry_listener;
+            entry->userData = entry_state.release();
+        }
+    private:
+        ecs::entity target_;
+        spSkeletonData& skeleton_data_;
+        spAnimationState& animation_state_;
+    };
+}
+
+namespace e2d
+{
+    //
+    // internal_state
+    //
+
+    class spine_post_system::internal_state final {
+    public:
+        internal_state() = default;
+        ~internal_state() noexcept = default;
+
+        void process(ecs::registry& owner) {
+            process_commands(owner);
+            clear_commands(owner);
+            clear_events(owner);
+        }
+    private:
+        void process_commands(ecs::registry& owner) {
+            owner.for_joined_components<spine_player_cmd, spine_player>([](
+                ecs::entity e,
+                const spine_player_cmd& pc,
+                spine_player& p)
+            {
+                spSkeleton* skeleton = p.skeleton().get();
+                spAnimationState* animation_state = p.animation().get();
+
+                if ( !skeleton || !skeleton->data || !animation_state ) {
+                    return;
+                }
+
+                command_visitor v(e, *skeleton->data, *animation_state);
+                for ( const auto& cmd : pc.commands() ) {
+                    stdex::visit(v, cmd);
+                }
+            });
+        }
+
+        void clear_commands(ecs::registry& owner) {
+            owner.for_each_component<spine_player_cmd>([
+            ](const ecs::const_entity&, spine_player_cmd& pc) {
+                pc.clear_commands();
+            });
+        }
+
+        void clear_events(ecs::registry& owner) {
+            owner.for_each_component<spine_player_evt>([
+            ](const ecs::const_entity&, spine_player_evt& pe) {
+                pe.clear_events();
+            });
+        }
+    };
+
+    //
+    // spine_post_system
+    //
+
+    spine_post_system::spine_post_system()
+    : state_(new internal_state()) {}
+
+    spine_post_system::~spine_post_system() noexcept {
+        spAnimationState_disposeStatics();
+    }
+
+    void spine_post_system::process(ecs::registry& owner) {
+        state_->process(owner);
+    }
+}
diff --git a/sources/enduro2d/high/systems/spine_pre_system.cpp b/sources/enduro2d/high/systems/spine_pre_system.cpp
new file mode 100644
index 00000000..16c26d0e
--- /dev/null
+++ b/sources/enduro2d/high/systems/spine_pre_system.cpp
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * This file is part of the "Enduro2D"
+ * For conditions of distribution and use, see copyright notice in LICENSE.md
+ * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
+ ******************************************************************************/
+
+#include <enduro2d/high/systems/spine_systems.hpp>
+
+#include <enduro2d/high/components/spine_player.hpp>
+#include <enduro2d/high/components/spine_player_cmd.hpp>
+#include <enduro2d/high/components/spine_player_evt.hpp>
+
+#include <spine/spine.h>
+
+namespace e2d
+{
+    //
+    // internal_state
+    //
+
+    class spine_pre_system::internal_state final {
+    public:
+        internal_state() = default;
+        ~internal_state() noexcept = default;
+
+        void process(ecs::registry& owner) {
+            update_animations(owner);
+        }
+    private:
+        void update_animations(ecs::registry& owner) {
+            const float dt = the<engine>().delta_time();
+            owner.for_each_component<spine_player>([dt](
+                const ecs::const_entity&,
+                spine_player& p)
+            {
+                spSkeleton* skeleton = p.skeleton().get();
+                spAnimationState* anim_state = p.animation().get();
+
+                if ( !skeleton || !anim_state ) {
+                    return;
+                }
+
+                spSkeleton_update(skeleton, dt);
+                spAnimationState_update(anim_state, dt);
+                spAnimationState_apply(anim_state, skeleton);
+                spSkeleton_updateWorldTransform(skeleton);
+            });
+        }
+    };
+
+    //
+    // spine_pre_system
+    //
+
+    spine_pre_system::spine_pre_system()
+    : state_(new internal_state()) {}
+    spine_pre_system::~spine_pre_system() noexcept = default;
+
+    void spine_pre_system::process(ecs::registry& owner) {
+        state_->process(owner);
+    }
+}
diff --git a/sources/enduro2d/high/systems/spine_system.cpp b/sources/enduro2d/high/systems/spine_system.cpp
deleted file mode 100644
index 56884c62..00000000
--- a/sources/enduro2d/high/systems/spine_system.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * This file is part of the "Enduro2D"
- * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
- ******************************************************************************/
-
-#include <enduro2d/high/systems/spine_system.hpp>
-
-#include <enduro2d/high/components/spine_player.hpp>
-#include <enduro2d/high/components/spine_animation_event.hpp>
-
-#include <spine/spine.h>
-
-namespace
-{
-    // spine will allocate storage for each track, so keep number of track as small as possible
-    constexpr e2d::u32 max_track_count = 8;
-}
-
-namespace e2d
-{
-    //
-    // internal_state
-    //
-
-    class spine_system::internal_state final {
-    public:
-        void clear_events(ecs::registry& owner) const;
-        void process_new_animations(ecs::registry& owner);
-        void update_animations(ecs::registry& owner);
-
-        void add_event(spTrackEntry* entry, const str& ev_name);
-    private:
-        struct animation_visitor_;
-        static void event_listener_(spAnimationState* state, spEventType type, spTrackEntry* entry, spEvent* event);
-    private:
-        flat_map<const spTrackEntry*, str> anim_events_;
-        ecs::registry* owner_ = nullptr;
-    };
-    
-    //
-    // animation_visitor_
-    //
-
-    struct spine_system::internal_state::animation_visitor_ {
-        animation_visitor_(
-            spSkeletonData* skeleton,
-            spAnimationState* anim_state,
-            internal_state& state)
-        : skeleton_(skeleton)
-        , anim_state_(anim_state)
-        , state_(state) {}
-
-        void operator()(const spine_animation_event::clear_track& cmd) const noexcept {
-            E2D_ASSERT(cmd.track < max_track_count);
-            spAnimationState_clearTrack(anim_state_, cmd.track);
-        }
-
-        void operator()(const spine_animation_event::set_anim& cmd) const noexcept {
-            E2D_ASSERT(cmd.track < max_track_count);
-
-            spAnimation* anim = spSkeletonData_findAnimation(skeleton_, cmd.name.c_str());
-            if ( !anim ) {
-                the<debug>().error("SPINE_PLAYER: animation '%0' is not found", cmd.name);
-                return;
-            }
-            spTrackEntry* entry = spAnimationState_setAnimation(anim_state_, cmd.track, anim, cmd.loop);
-            if ( entry && !cmd.on_complete.empty() ) {
-                state_.add_event(entry, cmd.on_complete);
-            }
-        }
-        
-        void operator()(const spine_animation_event::add_anim& cmd) const noexcept {
-            E2D_ASSERT(cmd.track < max_track_count);
-            
-            spAnimation* anim = spSkeletonData_findAnimation(skeleton_, cmd.name.c_str());
-            if ( !anim ) {
-                the<debug>().error("SPINE_PLAYER: animation '%0' is not found", cmd.name);
-                return;
-            }
-            spTrackEntry* entry = spAnimationState_addAnimation(anim_state_, cmd.track, anim, cmd.loop, cmd.delay.value);
-            if ( entry && !cmd.on_complete.empty() ) {
-                state_.add_event(entry, cmd.on_complete);
-            }
-        }
-
-        void operator()(const spine_animation_event::empty_anim& cmd) const noexcept {
-            E2D_ASSERT(cmd.track < max_track_count);
-            spTrackEntry* entry = spAnimationState_addEmptyAnimation(anim_state_, cmd.track, cmd.duration.value, cmd.delay.value);
-            if ( entry && !cmd.on_complete.empty() ) {
-                state_.add_event(entry, cmd.on_complete);
-            }
-        }
-    private:
-        spSkeletonData* skeleton_;
-        spAnimationState* anim_state_;
-        internal_state& state_;
-    };
-    
-    void spine_system::internal_state::add_event(spTrackEntry* entry, const str& ev_name) {
-        anim_events_.insert_or_assign(entry, ev_name);
-        entry->listener = &event_listener_;
-        entry->userData = this;
-    }
-    
-    void spine_system::internal_state::event_listener_(spAnimationState* state, spEventType type, spTrackEntry* entry, spEvent* event) {
-        if ( !entry || !entry->userData || type == SP_ANIMATION_DISPOSE ) {
-            return;
-        }
-
-        internal_state* self = reinterpret_cast<internal_state*>(entry->userData);
-        auto entry_to_event = self->anim_events_.find(entry);
-        if ( entry_to_event == self->anim_events_.end() ) {
-            return;
-        }
-
-        ecs::entity_id id(size_t(state->userData));
-        ecs::entity ent(*self->owner_, id);
-
-        switch ( type ) {
-            case SP_ANIMATION_COMPLETE: {
-                auto* comp = ent.find_component<spine_player::on_complete_event>();
-                if ( !comp ) {
-                    comp = &ent.assign_component<spine_player::on_complete_event>();
-                }
-                comp->completed().push_back(std::move(entry_to_event->second));
-
-                self->anim_events_.erase(entry_to_event);
-                break;
-            }
-        }
-    }
-    
-    void spine_system::internal_state::clear_events(ecs::registry& owner) const {
-        owner.remove_all_components<spine_player::on_complete_event>();
-    }
-
-    void spine_system::internal_state::process_new_animations(ecs::registry& owner) {
-        owner_ = &owner;
-        owner.for_joined_components<spine_animation_event, spine_player>(
-        [this, &owner](
-            ecs::entity_id id,
-            const spine_animation_event& events,
-            spine_player& player)
-        {
-            spSkeleton* skeleton = player.skeleton().get();
-            spAnimationState* anim_state = player.animation().get();
-            
-            if ( !skeleton || !anim_state ) {
-                return;
-            }
-
-            anim_state->userData = reinterpret_cast<void*>(size_t(id));
-
-            animation_visitor_ vis(skeleton->data, anim_state, *this);
-            for ( auto& ev : events.commands() ) {
-                stdex::visit(vis, ev);
-            }
-        });
-        owner.remove_all_components<spine_animation_event>();
-        owner_ = nullptr;
-    }
-
-    void spine_system::internal_state::update_animations(ecs::registry& owner) {
-        const float dt = the<engine>().delta_time();
-        owner_ = &owner;
-        owner.for_each_component<spine_player>(
-        [dt](
-            ecs::entity_id id,
-            spine_player& player)
-        {
-            spSkeleton* skeleton = player.skeleton().get();
-            spAnimationState* anim_state = player.animation().get();
-            
-            if ( !skeleton || !anim_state ) {
-                return;
-            }
-
-            spSkeleton_update(skeleton, dt);
-            spAnimationState_update(anim_state, dt);
-            spAnimationState_apply(anim_state, skeleton);
-            spSkeleton_updateWorldTransform(skeleton);
-        });
-        owner_ = nullptr;
-    }
-
-    spine_system::spine_system()
-    : state_(new internal_state()) {}
-
-    spine_system::~spine_system() noexcept {
-        spAnimationState_disposeStatics();
-    }
-
-    void spine_system::process(ecs::registry& owner) {
-        state_->clear_events(owner);
-        state_->process_new_animations(owner);
-        state_->update_animations(owner);
-    }
-}

From 86d53a3c4073c799e6e04df80f152af3ceae3768 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Tue, 3 Sep 2019 04:03:08 +0700
Subject: [PATCH 100/108] remove custom mpark.variant and use C++17 version

---
 .gitmodules                                   |    3 -
 CMakeLists.txt                                |    1 +
 headers/3rdparty/variant/config.hpp           |   96 -
 headers/3rdparty/variant/in_place.hpp         |   35 -
 headers/3rdparty/variant/lib.hpp              |  499 ----
 headers/3rdparty/variant/variant.hpp          | 2156 -----------------
 headers/enduro2d/base/_base.hpp               |    3 +-
 headers/enduro2d/base/macros.hpp              |    1 +
 headers/enduro2d/base/types.hpp               |    7 -
 headers/enduro2d/core/render.hpp              |    4 +-
 headers/enduro2d/core/render.inl              |    2 +-
 .../high/components/spine_player_cmd.hpp      |    2 +-
 .../high/components/spine_player_evt.hpp      |    2 +-
 modules/variant                               |    1 -
 samples/sources/sample_07/sample_07.cpp       |    2 +-
 scripts/update_modules.sh                     |    3 -
 sources/enduro2d/core/render.cpp              |    2 +-
 .../core/render_impl/render_opengl.cpp        |    2 +-
 .../high/systems/spine_post_system.cpp        |    2 +-
 untests/sources/untests_core/render.cpp       |    8 +-
 untests/sources/untests_high/library.cpp      |   16 +-
 21 files changed, 25 insertions(+), 2822 deletions(-)
 delete mode 100644 headers/3rdparty/variant/config.hpp
 delete mode 100644 headers/3rdparty/variant/in_place.hpp
 delete mode 100644 headers/3rdparty/variant/lib.hpp
 delete mode 100644 headers/3rdparty/variant/variant.hpp
 delete mode 160000 modules/variant

diff --git a/.gitmodules b/.gitmodules
index d7707813..b6766fd3 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,9 +34,6 @@
 [submodule "modules/flat.hpp"]
 	path = modules/flat.hpp
 	url = https://github.com/BlackMATov/flat.hpp
-[submodule "modules/variant"]
-	path = modules/variant
-	url = https://github.com/mpark/variant
 [submodule "modules/curly.hpp"]
 	path = modules/curly.hpp
 	url = https://github.com/BlackMATov/curly.hpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8de9d652..36ff8cfe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
 
 if(NOT DEFINED PROJECT_NAME)
     set(E2D_BUILD_AS_STANDALONE ON)
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 endif()
 
 project(enduro2d)
diff --git a/headers/3rdparty/variant/config.hpp b/headers/3rdparty/variant/config.hpp
deleted file mode 100644
index f85ffb55..00000000
--- a/headers/3rdparty/variant/config.hpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// MPark.Variant
-//
-// Copyright Michael Park, 2015-2017
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
-
-#ifndef MPARK_CONFIG_HPP
-#define MPARK_CONFIG_HPP
-
-// MSVC 2015 Update 3.
-#if __cplusplus < 201103L && (!defined(_MSC_VER) || _MSC_FULL_VER < 190024210)
-#error "MPark.Variant requires C++11 support."
-#endif
-
-#ifndef __has_attribute
-#define __has_attribute(x) 0
-#endif
-
-#ifndef __has_builtin
-#define __has_builtin(x) 0
-#endif
-
-#ifndef __has_include
-#define __has_include(x) 0
-#endif
-
-#ifndef __has_feature
-#define __has_feature(x) 0
-#endif
-
-#if __has_attribute(always_inline) || defined(__GNUC__)
-#define MPARK_ALWAYS_INLINE __attribute__((__always_inline__)) inline
-#elif defined(_MSC_VER)
-#define MPARK_ALWAYS_INLINE __forceinline
-#else
-#define MPARK_ALWAYS_INLINE inline
-#endif
-
-#if __has_builtin(__builtin_addressof) || \
-    (defined(__GNUC__) && __GNUC__ >= 7) || defined(_MSC_VER)
-#define MPARK_BUILTIN_ADDRESSOF
-#endif
-
-#if __has_builtin(__builtin_unreachable) || defined(__GNUC__)
-#define MPARK_BUILTIN_UNREACHABLE __builtin_unreachable()
-#elif defined(_MSC_VER)
-#define MPARK_BUILTIN_UNREACHABLE __assume(false)
-#else
-#define MPARK_BUILTIN_UNREACHABLE
-#endif
-
-#if __has_builtin(__type_pack_element)
-#define MPARK_TYPE_PACK_ELEMENT
-#endif
-
-#if defined(__cpp_constexpr) && __cpp_constexpr >= 200704 && \
-    !(defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 9)
-#define MPARK_CPP11_CONSTEXPR
-#endif
-
-#if defined(__cpp_constexpr) && __cpp_constexpr >= 201304
-#define MPARK_CPP14_CONSTEXPR
-#endif
-
-#if __has_feature(cxx_exceptions) || defined(__cpp_exceptions) || \
-    (defined(_MSC_VER) && defined(_CPPUNWIND))
-#define MPARK_EXCEPTIONS
-#endif
-
-#if defined(__cpp_generic_lambdas) || defined(_MSC_VER)
-#define MPARK_GENERIC_LAMBDAS
-#endif
-
-#if defined(__cpp_lib_integer_sequence)
-#define MPARK_INTEGER_SEQUENCE
-#endif
-
-#if (defined(__cpp_decltype_auto) && defined(__cpp_return_type_deduction)) || defined(_MSC_VER)
-#define MPARK_RETURN_TYPE_DEDUCTION
-#endif
-
-#if defined(__cpp_lib_transparent_operators) || defined(_MSC_VER)
-#define MPARK_TRANSPARENT_OPERATORS
-#endif
-
-#if defined(__cpp_variable_templates) || defined(_MSC_VER)
-#define MPARK_VARIABLE_TEMPLATES
-#endif
-
-#if !defined(__GLIBCXX__) || __has_include(<codecvt>)  // >= libstdc++-5
-#define MPARK_TRIVIALITY_TYPE_TRAITS
-#define MPARK_INCOMPLETE_TYPE_TRAITS
-#endif
-
-#endif  // MPARK_CONFIG_HPP
diff --git a/headers/3rdparty/variant/in_place.hpp b/headers/3rdparty/variant/in_place.hpp
deleted file mode 100644
index 56cae131..00000000
--- a/headers/3rdparty/variant/in_place.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// MPark.Variant
-//
-// Copyright Michael Park, 2015-2017
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
-
-#ifndef MPARK_IN_PLACE_HPP
-#define MPARK_IN_PLACE_HPP
-
-#include <cstddef>
-
-#include "config.hpp"
-
-namespace mpark {
-
-  struct in_place_t { explicit in_place_t() = default; };
-
-  template <std::size_t I>
-  struct in_place_index_t { explicit in_place_index_t() = default; };
-
-  template <typename T>
-  struct in_place_type_t { explicit in_place_type_t() = default; };
-
-#ifdef MPARK_VARIABLE_TEMPLATES
-  constexpr in_place_t in_place{};
-
-  template <std::size_t I> constexpr in_place_index_t<I> in_place_index{};
-
-  template <typename T> constexpr in_place_type_t<T> in_place_type{};
-#endif
-
-}  // namespace mpark
-
-#endif  // MPARK_IN_PLACE_HPP
diff --git a/headers/3rdparty/variant/lib.hpp b/headers/3rdparty/variant/lib.hpp
deleted file mode 100644
index 42256686..00000000
--- a/headers/3rdparty/variant/lib.hpp
+++ /dev/null
@@ -1,499 +0,0 @@
-// MPark.Variant
-//
-// Copyright Michael Park, 2015-2017
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
-
-#ifndef MPARK_LIB_HPP
-#define MPARK_LIB_HPP
-
-#include <memory>
-#include <functional>
-#include <type_traits>
-#include <utility>
-
-#include "config.hpp"
-
-#define MPARK_RETURN(...) \
-  noexcept(noexcept(__VA_ARGS__)) -> decltype(__VA_ARGS__) { return __VA_ARGS__; }
-
-namespace mpark {
-  namespace lib {
-    template <typename T>
-    struct identity { using type = T; };
-
-    inline namespace cpp14 {
-      template <typename T, std::size_t N>
-      struct array {
-        constexpr const T &operator[](std::size_t index) const {
-          return data[index];
-        }
-
-        T data[N == 0 ? 1 : N];
-      };
-
-      template <typename T>
-      using add_pointer_t = typename std::add_pointer<T>::type;
-
-      template <typename... Ts>
-      using common_type_t = typename std::common_type<Ts...>::type;
-
-      template <typename T>
-      using decay_t = typename std::decay<T>::type;
-
-      template <bool B, typename T = void>
-      using enable_if_t = typename std::enable_if<B, T>::type;
-
-      template <typename T>
-      using remove_const_t = typename std::remove_const<T>::type;
-
-      template <typename T>
-      using remove_reference_t = typename std::remove_reference<T>::type;
-
-      template <typename T>
-      inline constexpr T &&forward(remove_reference_t<T> &t) noexcept {
-        return static_cast<T &&>(t);
-      }
-
-      template <typename T>
-      inline constexpr T &&forward(remove_reference_t<T> &&t) noexcept {
-        static_assert(!std::is_lvalue_reference<T>::value,
-                      "can not forward an rvalue as an lvalue");
-        return static_cast<T &&>(t);
-      }
-
-      template <typename T>
-      inline constexpr remove_reference_t<T> &&move(T &&t) noexcept {
-        return static_cast<remove_reference_t<T> &&>(t);
-      }
-
-#ifdef MPARK_INTEGER_SEQUENCE
-      using std::integer_sequence;
-      using std::index_sequence;
-      using std::make_index_sequence;
-      using std::index_sequence_for;
-#else
-      template <typename T, T... Is>
-      struct integer_sequence {
-        using value_type = T;
-        static constexpr std::size_t size() noexcept { return sizeof...(Is); }
-      };
-
-      template <std::size_t... Is>
-      using index_sequence = integer_sequence<std::size_t, Is...>;
-
-      template <typename Lhs, typename Rhs>
-      struct make_index_sequence_concat;
-
-      template <std::size_t... Lhs, std::size_t... Rhs>
-      struct make_index_sequence_concat<index_sequence<Lhs...>,
-                                        index_sequence<Rhs...>>
-          : identity<index_sequence<Lhs..., (sizeof...(Lhs) + Rhs)...>> {};
-
-      template <std::size_t N>
-      struct make_index_sequence_impl;
-
-      template <std::size_t N>
-      using make_index_sequence = typename make_index_sequence_impl<N>::type;
-
-      template <std::size_t N>
-      struct make_index_sequence_impl
-          : make_index_sequence_concat<make_index_sequence<N / 2>,
-                                       make_index_sequence<N - (N / 2)>> {};
-
-      template <>
-      struct make_index_sequence_impl<0> : identity<index_sequence<>> {};
-
-      template <>
-      struct make_index_sequence_impl<1> : identity<index_sequence<0>> {};
-
-      template <typename... Ts>
-      using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
-#endif
-
-      // <functional>
-#ifdef MPARK_TRANSPARENT_OPERATORS
-      using equal_to = std::equal_to<>;
-#else
-      struct equal_to {
-        template <typename Lhs, typename Rhs>
-        inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-          MPARK_RETURN(lib::forward<Lhs>(lhs) == lib::forward<Rhs>(rhs))
-      };
-#endif
-
-#ifdef MPARK_TRANSPARENT_OPERATORS
-      using not_equal_to = std::not_equal_to<>;
-#else
-      struct not_equal_to {
-        template <typename Lhs, typename Rhs>
-        inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-          MPARK_RETURN(lib::forward<Lhs>(lhs) != lib::forward<Rhs>(rhs))
-      };
-#endif
-
-#ifdef MPARK_TRANSPARENT_OPERATORS
-      using less = std::less<>;
-#else
-      struct less {
-        template <typename Lhs, typename Rhs>
-        inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-          MPARK_RETURN(lib::forward<Lhs>(lhs) < lib::forward<Rhs>(rhs))
-      };
-#endif
-
-#ifdef MPARK_TRANSPARENT_OPERATORS
-      using greater = std::greater<>;
-#else
-      struct greater {
-        template <typename Lhs, typename Rhs>
-        inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-          MPARK_RETURN(lib::forward<Lhs>(lhs) > lib::forward<Rhs>(rhs))
-      };
-#endif
-
-#ifdef MPARK_TRANSPARENT_OPERATORS
-      using less_equal = std::less_equal<>;
-#else
-      struct less_equal {
-        template <typename Lhs, typename Rhs>
-        inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-          MPARK_RETURN(lib::forward<Lhs>(lhs) <= lib::forward<Rhs>(rhs))
-      };
-#endif
-
-#ifdef MPARK_TRANSPARENT_OPERATORS
-      using greater_equal = std::greater_equal<>;
-#else
-      struct greater_equal {
-        template <typename Lhs, typename Rhs>
-        inline constexpr auto operator()(Lhs &&lhs, Rhs &&rhs) const
-          MPARK_RETURN(lib::forward<Lhs>(lhs) >= lib::forward<Rhs>(rhs))
-      };
-#endif
-    }  // namespace cpp14
-
-    inline namespace cpp17 {
-
-      // <type_traits>
-      template <bool B>
-      using bool_constant = std::integral_constant<bool, B>;
-
-      template <typename...>
-      struct voider : identity<void> {};
-
-      template <typename... Ts>
-      using void_t = typename voider<Ts...>::type;
-
-      namespace detail {
-        namespace swappable {
-
-          using std::swap;
-
-          template <typename T>
-          struct is_swappable {
-            private:
-            template <typename U,
-                      typename = decltype(swap(std::declval<U &>(),
-                                               std::declval<U &>()))>
-            inline static std::true_type test(int);
-
-            template <typename U>
-            inline static std::false_type test(...);
-
-            public:
-            static constexpr bool value = decltype(test<T>(0))::value;
-          };
-
-          template <bool IsSwappable, typename T>
-          struct is_nothrow_swappable {
-            static constexpr bool value =
-                noexcept(swap(std::declval<T &>(), std::declval<T &>()));
-          };
-
-          template <typename T>
-          struct is_nothrow_swappable<false, T> : std::false_type {};
-
-        }  // namespace swappable
-      }  // namespace detail
-
-      using detail::swappable::is_swappable;
-
-      template <typename T>
-      using is_nothrow_swappable =
-          detail::swappable::is_nothrow_swappable<is_swappable<T>::value, T>;
-
-      // <functional>
-      namespace detail {
-
-        template <typename T>
-        struct is_reference_wrapper : std::false_type {};
-
-        template <typename T>
-        struct is_reference_wrapper<std::reference_wrapper<T>>
-            : std::true_type {};
-
-        template <bool, int>
-        struct Invoke;
-
-        template <>
-        struct Invoke<true /* pmf */, 0 /* is_base_of */> {
-          template <typename R, typename T, typename Arg, typename... Args>
-          inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&... args)
-            MPARK_RETURN((lib::forward<Arg>(arg).*pmf)(lib::forward<Args>(args)...))
-        };
-
-        template <>
-        struct Invoke<true /* pmf */, 1 /* is_reference_wrapper */> {
-          template <typename R, typename T, typename Arg, typename... Args>
-          inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&... args)
-            MPARK_RETURN((lib::forward<Arg>(arg).get().*pmf)(lib::forward<Args>(args)...))
-        };
-
-        template <>
-        struct Invoke<true /* pmf */, 2 /* otherwise */> {
-          template <typename R, typename T, typename Arg, typename... Args>
-          inline static constexpr auto invoke(R T::*pmf, Arg &&arg, Args &&... args)
-            MPARK_RETURN(((*lib::forward<Arg>(arg)).*pmf)(lib::forward<Args>(args)...))
-        };
-
-        template <>
-        struct Invoke<false /* pmo */, 0 /* is_base_of */> {
-          template <typename R, typename T, typename Arg>
-          inline static constexpr auto invoke(R T::*pmo, Arg &&arg)
-            MPARK_RETURN(lib::forward<Arg>(arg).*pmo)
-        };
-
-        template <>
-        struct Invoke<false /* pmo */, 1 /* is_reference_wrapper */> {
-          template <typename R, typename T, typename Arg>
-          inline static constexpr auto invoke(R T::*pmo, Arg &&arg)
-            MPARK_RETURN(lib::forward<Arg>(arg).get().*pmo)
-        };
-
-        template <>
-        struct Invoke<false /* pmo */, 2 /* otherwise */> {
-          template <typename R, typename T, typename Arg>
-          inline static constexpr auto invoke(R T::*pmo, Arg &&arg)
-              MPARK_RETURN((*lib::forward<Arg>(arg)).*pmo)
-        };
-
-        template <typename R, typename T, typename Arg, typename... Args>
-        inline constexpr auto invoke(R T::*f, Arg &&arg, Args &&... args)
-          MPARK_RETURN(
-              Invoke<std::is_function<R>::value,
-                     (std::is_base_of<T, lib::decay_t<Arg>>::value
-                          ? 0
-                          : is_reference_wrapper<lib::decay_t<Arg>>::value
-                                ? 1
-                                : 2)>::invoke(f,
-                                              lib::forward<Arg>(arg),
-                                              lib::forward<Args>(args)...))
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#endif
-        template <typename F, typename... Args>
-        inline constexpr auto invoke(F &&f, Args &&... args)
-          MPARK_RETURN(lib::forward<F>(f)(lib::forward<Args>(args)...))
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-      }  // namespace detail
-
-      template <typename F, typename... Args>
-      inline constexpr auto invoke(F &&f, Args &&... args)
-        MPARK_RETURN(detail::invoke(lib::forward<F>(f),
-                                    lib::forward<Args>(args)...))
-
-      namespace detail {
-
-        template <typename Void, typename, typename...>
-        struct invoke_result {};
-
-        template <typename F, typename... Args>
-        struct invoke_result<void_t<decltype(lib::invoke(
-                                 std::declval<F>(), std::declval<Args>()...))>,
-                             F,
-                             Args...>
-            : identity<decltype(
-                  lib::invoke(std::declval<F>(), std::declval<Args>()...))> {};
-
-      }  // namespace detail
-
-      template <typename F, typename... Args>
-      using invoke_result = detail::invoke_result<void, F, Args...>;
-
-      template <typename F, typename... Args>
-      using invoke_result_t = typename invoke_result<F, Args...>::type;
-
-      namespace detail {
-
-        template <typename Void, typename, typename...>
-        struct is_invocable : std::false_type {};
-
-        template <typename F, typename... Args>
-        struct is_invocable<void_t<invoke_result_t<F, Args...>>, F, Args...>
-            : std::true_type {};
-
-        template <typename Void, typename, typename, typename...>
-        struct is_invocable_r : std::false_type {};
-
-        template <typename R, typename F, typename... Args>
-        struct is_invocable_r<void_t<invoke_result_t<F, Args...>>,
-                              R,
-                              F,
-                              Args...>
-            : std::is_convertible<invoke_result_t<F, Args...>, R> {};
-
-      }  // namespace detail
-
-      template <typename F, typename... Args>
-      using is_invocable = detail::is_invocable<void, F, Args...>;
-
-      template <typename R, typename F, typename... Args>
-      using is_invocable_r = detail::is_invocable_r<void, R, F, Args...>;
-
-      // <memory>
-#ifdef MPARK_BUILTIN_ADDRESSOF
-      template <typename T>
-      inline constexpr T *addressof(T &arg) noexcept {
-        return __builtin_addressof(arg);
-      }
-#else
-      namespace detail {
-
-        namespace has_addressof_impl {
-
-          struct fail;
-
-          template <typename T>
-          inline fail operator&(T &&);
-
-          template <typename T>
-          inline static constexpr bool impl() {
-            return (std::is_class<T>::value || std::is_union<T>::value) &&
-                   !std::is_same<decltype(&std::declval<T &>()), fail>::value;
-          }
-
-        }  // namespace has_addressof_impl
-
-        template <typename T>
-        using has_addressof = bool_constant<has_addressof_impl::impl<T>()>;
-
-        template <typename T>
-        inline constexpr T *addressof(T &arg, std::true_type) noexcept {
-          return std::addressof(arg);
-        }
-
-        template <typename T>
-        inline constexpr T *addressof(T &arg, std::false_type) noexcept {
-          return &arg;
-        }
-
-      }  // namespace detail
-
-      template <typename T>
-      inline constexpr T *addressof(T &arg) noexcept {
-        return detail::addressof(arg, detail::has_addressof<T>{});
-      }
-#endif
-
-      template <typename T>
-      inline constexpr T *addressof(const T &&) = delete;
-
-    }  // namespace cpp17
-
-    template <typename T>
-    struct remove_all_extents : identity<T> {};
-
-    template <typename T, std::size_t N>
-    struct remove_all_extents<array<T, N>> : remove_all_extents<T> {};
-
-    template <typename T>
-    using remove_all_extents_t = typename remove_all_extents<T>::type;
-
-    template <std::size_t N>
-    using size_constant = std::integral_constant<std::size_t, N>;
-
-    template <std::size_t I, typename T>
-    struct indexed_type : size_constant<I> { using type = T; };
-
-    template <bool... Bs>
-    using all = std::is_same<integer_sequence<bool, true, Bs...>,
-                             integer_sequence<bool, Bs..., true>>;
-
-#ifdef MPARK_TYPE_PACK_ELEMENT
-    template <std::size_t I, typename... Ts>
-    using type_pack_element_t = __type_pack_element<I, Ts...>;
-#else
-    template <std::size_t I, typename... Ts>
-    struct type_pack_element_impl {
-      private:
-      template <typename>
-      struct set;
-
-      template <std::size_t... Is>
-      struct set<index_sequence<Is...>> : indexed_type<Is, Ts>... {};
-
-      template <typename T>
-      inline static std::enable_if<true, T> impl(indexed_type<I, T>);
-
-      inline static std::enable_if<false> impl(...);
-
-      public:
-      using type = decltype(impl(set<index_sequence_for<Ts...>>{}));
-    };
-
-    template <std::size_t I, typename... Ts>
-    using type_pack_element = typename type_pack_element_impl<I, Ts...>::type;
-
-    template <std::size_t I, typename... Ts>
-    using type_pack_element_t = typename type_pack_element<I, Ts...>::type;
-#endif
-
-#ifdef MPARK_TRIVIALITY_TYPE_TRAITS
-    using std::is_trivially_copy_constructible;
-    using std::is_trivially_move_constructible;
-    using std::is_trivially_copy_assignable;
-    using std::is_trivially_move_assignable;
-#else
-    template <typename T>
-    struct is_trivially_copy_constructible
-        : bool_constant<
-              std::is_copy_constructible<T>::value && __has_trivial_copy(T)> {};
-
-    template <typename T>
-    struct is_trivially_move_constructible : bool_constant<__is_trivial(T)> {};
-
-    template <typename T>
-    struct is_trivially_copy_assignable
-        : bool_constant<
-              std::is_copy_assignable<T>::value && __has_trivial_assign(T)> {};
-
-    template <typename T>
-    struct is_trivially_move_assignable : bool_constant<__is_trivial(T)> {};
-#endif
-
-    template <typename T, bool>
-    struct dependent_type : T {};
-
-    template <typename Is, std::size_t J>
-    struct push_back;
-
-    template <typename Is, std::size_t J>
-    using push_back_t = typename push_back<Is, J>::type;
-
-    template <std::size_t... Is, std::size_t J>
-    struct push_back<index_sequence<Is...>, J> {
-      using type = index_sequence<Is..., J>;
-    };
-
-  }  // namespace lib
-}  // namespace mpark
-
-#undef MPARK_RETURN
-
-#endif  // MPARK_LIB_HPP
diff --git a/headers/3rdparty/variant/variant.hpp b/headers/3rdparty/variant/variant.hpp
deleted file mode 100644
index ef496619..00000000
--- a/headers/3rdparty/variant/variant.hpp
+++ /dev/null
@@ -1,2156 +0,0 @@
-// MPark.Variant
-//
-// Copyright Michael Park, 2015-2017
-//
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
-
-#ifndef MPARK_VARIANT_HPP
-#define MPARK_VARIANT_HPP
-
-/*
-   variant synopsis
-
-namespace std {
-
-  // 20.7.2, class template variant
-  template <class... Types>
-  class variant {
-  public:
-
-    // 20.7.2.1, constructors
-    constexpr variant() noexcept(see below);
-    variant(const variant&);
-    variant(variant&&) noexcept(see below);
-
-    template <class T> constexpr variant(T&&) noexcept(see below);
-
-    template <class T, class... Args>
-    constexpr explicit variant(in_place_type_t<T>, Args&&...);
-
-    template <class T, class U, class... Args>
-    constexpr explicit variant(
-        in_place_type_t<T>, initializer_list<U>, Args&&...);
-
-    template <size_t I, class... Args>
-    constexpr explicit variant(in_place_index_t<I>, Args&&...);
-
-    template <size_t I, class U, class... Args>
-    constexpr explicit variant(
-        in_place_index_t<I>, initializer_list<U>, Args&&...);
-
-    // 20.7.2.2, destructor
-    ~variant();
-
-    // 20.7.2.3, assignment
-    variant& operator=(const variant&);
-    variant& operator=(variant&&) noexcept(see below);
-
-    template <class T> variant& operator=(T&&) noexcept(see below);
-
-    // 20.7.2.4, modifiers
-    template <class T, class... Args>
-    T& emplace(Args&&...);
-
-    template <class T, class U, class... Args>
-    T& emplace(initializer_list<U>, Args&&...);
-
-    template <size_t I, class... Args>
-    variant_alternative<I, variant>& emplace(Args&&...);
-
-    template <size_t I, class U, class...  Args>
-    variant_alternative<I, variant>& emplace(initializer_list<U>, Args&&...);
-
-    // 20.7.2.5, value status
-    constexpr bool valueless_by_exception() const noexcept;
-    constexpr size_t index() const noexcept;
-
-    // 20.7.2.6, swap
-    void swap(variant&) noexcept(see below);
-  };
-
-  // 20.7.3, variant helper classes
-  template <class T> struct variant_size; // undefined
-
-  template <class T>
-  constexpr size_t variant_size_v = variant_size<T>::value;
-
-  template <class T> struct variant_size<const T>;
-  template <class T> struct variant_size<volatile T>;
-  template <class T> struct variant_size<const volatile T>;
-
-  template <class... Types>
-  struct variant_size<variant<Types...>>;
-
-  template <size_t I, class T> struct variant_alternative; // undefined
-
-  template <size_t I, class T>
-  using variant_alternative_t = typename variant_alternative<I, T>::type;
-
-  template <size_t I, class T> struct variant_alternative<I, const T>;
-  template <size_t I, class T> struct variant_alternative<I, volatile T>;
-  template <size_t I, class T> struct variant_alternative<I, const volatile T>;
-
-  template <size_t I, class... Types>
-  struct variant_alternative<I, variant<Types...>>;
-
-  constexpr size_t variant_npos = -1;
-
-  // 20.7.4, value access
-  template <class T, class... Types>
-  constexpr bool holds_alternative(const variant<Types...>&) noexcept;
-
-  template <size_t I, class... Types>
-  constexpr variant_alternative_t<I, variant<Types...>>&
-  get(variant<Types...>&);
-
-  template <size_t I, class... Types>
-  constexpr variant_alternative_t<I, variant<Types...>>&&
-  get(variant<Types...>&&);
-
-  template <size_t I, class... Types>
-  constexpr variant_alternative_t<I, variant<Types...>> const&
-  get(const variant<Types...>&);
-
-  template <size_t I, class... Types>
-  constexpr variant_alternative_t<I, variant<Types...>> const&&
-  get(const variant<Types...>&&);
-
-  template <class T, class...  Types>
-  constexpr T& get(variant<Types...>&);
-
-  template <class T, class... Types>
-  constexpr T&& get(variant<Types...>&&);
-
-  template <class T, class... Types>
-  constexpr const T& get(const variant<Types...>&);
-
-  template <class T, class... Types>
-  constexpr const T&& get(const variant<Types...>&&);
-
-  template <size_t I, class... Types>
-  constexpr add_pointer_t<variant_alternative_t<I, variant<Types...>>>
-  get_if(variant<Types...>*) noexcept;
-
-  template <size_t I, class... Types>
-  constexpr add_pointer_t<const variant_alternative_t<I, variant<Types...>>>
-  get_if(const variant<Types...>*) noexcept;
-
-  template <class T, class... Types>
-  constexpr add_pointer_t<T>
-  get_if(variant<Types...>*) noexcept;
-
-  template <class T, class... Types>
-  constexpr add_pointer_t<const T>
-  get_if(const variant<Types...>*) noexcept;
-
-  // 20.7.5, relational operators
-  template <class... Types>
-  constexpr bool operator==(const variant<Types...>&, const variant<Types...>&);
-
-  template <class... Types>
-  constexpr bool operator!=(const variant<Types...>&, const variant<Types...>&);
-
-  template <class... Types>
-  constexpr bool operator<(const variant<Types...>&, const variant<Types...>&);
-
-  template <class... Types>
-  constexpr bool operator>(const variant<Types...>&, const variant<Types...>&);
-
-  template <class... Types>
-  constexpr bool operator<=(const variant<Types...>&, const variant<Types...>&);
-
-  template <class... Types>
-  constexpr bool operator>=(const variant<Types...>&, const variant<Types...>&);
-
-  // 20.7.6, visitation
-  template <class Visitor, class... Variants>
-  constexpr see below visit(Visitor&&, Variants&&...);
-
-  // 20.7.7, class monostate
-  struct monostate;
-
-  // 20.7.8, monostate relational operators
-  constexpr bool operator<(monostate, monostate) noexcept;
-  constexpr bool operator>(monostate, monostate) noexcept;
-  constexpr bool operator<=(monostate, monostate) noexcept;
-  constexpr bool operator>=(monostate, monostate) noexcept;
-  constexpr bool operator==(monostate, monostate) noexcept;
-  constexpr bool operator!=(monostate, monostate) noexcept;
-
-  // 20.7.9, specialized algorithms
-  template <class... Types>
-  void swap(variant<Types...>&, variant<Types...>&) noexcept(see below);
-
-  // 20.7.10, class bad_variant_access
-  class bad_variant_access;
-
-  // 20.7.11, hash support
-  template <class T> struct hash;
-  template <class... Types> struct hash<variant<Types...>>;
-  template <> struct hash<monostate>;
-
-} // namespace std
-
-*/
-
-#include <cstddef>
-#include <exception>
-#include <functional>
-#include <initializer_list>
-#include <limits>
-#include <new>
-#include <type_traits>
-#include <utility>
-
-#include "config.hpp"
-#include "in_place.hpp"
-#include "lib.hpp"
-
-namespace mpark {
-
-#ifdef MPARK_RETURN_TYPE_DEDUCTION
-
-#define AUTO auto
-#define AUTO_RETURN(...) { return __VA_ARGS__; }
-
-#define AUTO_REFREF auto &&
-#define AUTO_REFREF_RETURN(...) { return __VA_ARGS__; }
-
-#define DECLTYPE_AUTO decltype(auto)
-#define DECLTYPE_AUTO_RETURN(...) { return __VA_ARGS__; }
-
-#else
-
-#define AUTO auto
-#define AUTO_RETURN(...) \
-  -> lib::decay_t<decltype(__VA_ARGS__)> { return __VA_ARGS__; }
-
-#define AUTO_REFREF auto
-#define AUTO_REFREF_RETURN(...)                                           \
-  -> decltype((__VA_ARGS__)) {                                            \
-    static_assert(std::is_reference<decltype((__VA_ARGS__))>::value, ""); \
-    return __VA_ARGS__;                                                   \
-  }
-
-#define DECLTYPE_AUTO auto
-#define DECLTYPE_AUTO_RETURN(...) \
-  -> decltype(__VA_ARGS__) { return __VA_ARGS__; }
-
-#endif
-
-  class bad_variant_access : public std::exception {
-    public:
-    virtual const char *what() const noexcept override { return "bad_variant_access"; }
-  };
-
-  [[noreturn]] inline void throw_bad_variant_access() {
-#ifdef MPARK_EXCEPTIONS
-    throw bad_variant_access{};
-#else
-    std::terminate();
-    MPARK_BUILTIN_UNREACHABLE;
-#endif
-  }
-
-  template <typename... Ts>
-  class variant;
-
-  template <typename T>
-  struct variant_size;
-
-#ifdef MPARK_VARIABLE_TEMPLATES
-  template <typename T>
-  constexpr std::size_t variant_size_v = variant_size<T>::value;
-#endif
-
-  template <typename T>
-  struct variant_size<const T> : variant_size<T> {};
-
-  template <typename T>
-  struct variant_size<volatile T> : variant_size<T> {};
-
-  template <typename T>
-  struct variant_size<const volatile T> : variant_size<T> {};
-
-  template <typename... Ts>
-  struct variant_size<variant<Ts...>> : lib::size_constant<sizeof...(Ts)> {};
-
-  template <std::size_t I, typename T>
-  struct variant_alternative;
-
-  template <std::size_t I, typename T>
-  using variant_alternative_t = typename variant_alternative<I, T>::type;
-
-  template <std::size_t I, typename T>
-  struct variant_alternative<I, const T>
-      : std::add_const<variant_alternative_t<I, T>> {};
-
-  template <std::size_t I, typename T>
-  struct variant_alternative<I, volatile T>
-      : std::add_volatile<variant_alternative_t<I, T>> {};
-
-  template <std::size_t I, typename T>
-  struct variant_alternative<I, const volatile T>
-      : std::add_cv<variant_alternative_t<I, T>> {};
-
-  template <std::size_t I, typename... Ts>
-  struct variant_alternative<I, variant<Ts...>> {
-    static_assert(I < sizeof...(Ts),
-                  "index out of bounds in `std::variant_alternative<>`");
-    using type = lib::type_pack_element_t<I, Ts...>;
-  };
-
-  constexpr std::size_t variant_npos = static_cast<std::size_t>(-1);
-
-  namespace detail {
-
-    constexpr std::size_t not_found = static_cast<std::size_t>(-1);
-    constexpr std::size_t ambiguous = static_cast<std::size_t>(-2);
-
-#ifdef MPARK_CPP14_CONSTEXPR
-    template <typename T, typename... Ts>
-    inline constexpr std::size_t find_index() {
-      constexpr lib::array<bool, sizeof...(Ts)> matches = {
-          {std::is_same<T, Ts>::value...}
-      };
-      std::size_t result = not_found;
-      for (std::size_t i = 0; i < sizeof...(Ts); ++i) {
-        if (matches[i]) {
-          if (result != not_found) {
-            return ambiguous;
-          }
-          result = i;
-        }
-      }
-      return result;
-    }
-#else
-    inline constexpr std::size_t find_index_impl(std::size_t result,
-                                                 std::size_t) {
-      return result;
-    }
-
-    template <typename... Bs>
-    inline constexpr std::size_t find_index_impl(std::size_t result,
-                                                 std::size_t idx,
-                                                 bool b,
-                                                 Bs... bs) {
-      return b ? (result != not_found ? ambiguous
-                                      : find_index_impl(idx, idx + 1, bs...))
-               : find_index_impl(result, idx + 1, bs...);
-    }
-
-    template <typename T, typename... Ts>
-    inline constexpr std::size_t find_index() {
-      return find_index_impl(not_found, 0, std::is_same<T, Ts>::value...);
-    }
-#endif
-
-    template <std::size_t I>
-    using find_index_sfinae_impl =
-        lib::enable_if_t<I != not_found && I != ambiguous,
-                         lib::size_constant<I>>;
-
-    template <typename T, typename... Ts>
-    using find_index_sfinae = find_index_sfinae_impl<find_index<T, Ts...>()>;
-
-    template <std::size_t I>
-    struct find_index_checked_impl : lib::size_constant<I> {
-      static_assert(I != not_found, "the specified type is not found.");
-      static_assert(I != ambiguous, "the specified type is ambiguous.");
-    };
-
-    template <typename T, typename... Ts>
-    using find_index_checked = find_index_checked_impl<find_index<T, Ts...>()>;
-
-    struct valueless_t {};
-
-    enum class Trait { TriviallyAvailable, Available, Unavailable };
-
-    template <typename T,
-              template <typename> class IsTriviallyAvailable,
-              template <typename> class IsAvailable>
-    inline constexpr Trait trait() {
-      return IsTriviallyAvailable<T>::value
-                 ? Trait::TriviallyAvailable
-                 : IsAvailable<T>::value ? Trait::Available
-                                         : Trait::Unavailable;
-    }
-
-#ifdef MPARK_CPP14_CONSTEXPR
-    template <typename... Traits>
-    inline constexpr Trait common_trait(Traits... traits_) {
-      Trait result = Trait::TriviallyAvailable;
-      lib::array<Trait, sizeof...(Traits)> traits = {{traits_...}};
-      for (std::size_t i = 0; i < sizeof...(Traits); ++i) {
-        Trait t = traits[i];
-        if (static_cast<int>(t) > static_cast<int>(result)) {
-          result = t;
-        }
-      }
-      return result;
-    }
-#else
-    inline constexpr Trait common_trait_impl(Trait result) { return result; }
-
-    template <typename... Traits>
-    inline constexpr Trait common_trait_impl(Trait result,
-                                             Trait t,
-                                             Traits... ts) {
-      return static_cast<int>(t) > static_cast<int>(result)
-                 ? common_trait_impl(t, ts...)
-                 : common_trait_impl(result, ts...);
-    }
-
-    template <typename... Traits>
-    inline constexpr Trait common_trait(Traits... ts) {
-      return common_trait_impl(Trait::TriviallyAvailable, ts...);
-    }
-#endif
-
-    template <typename... Ts>
-    struct traits {
-      static constexpr Trait copy_constructible_trait =
-          common_trait(trait<Ts,
-                             lib::is_trivially_copy_constructible,
-                             std::is_copy_constructible>()...);
-
-      static constexpr Trait move_constructible_trait =
-          common_trait(trait<Ts,
-                             lib::is_trivially_move_constructible,
-                             std::is_move_constructible>()...);
-
-      static constexpr Trait copy_assignable_trait =
-          common_trait(copy_constructible_trait,
-                       trait<Ts,
-                             lib::is_trivially_copy_assignable,
-                             std::is_copy_assignable>()...);
-
-      static constexpr Trait move_assignable_trait =
-          common_trait(move_constructible_trait,
-                       trait<Ts,
-                             lib::is_trivially_move_assignable,
-                             std::is_move_assignable>()...);
-
-      static constexpr Trait destructible_trait =
-          common_trait(trait<Ts,
-                             std::is_trivially_destructible,
-                             std::is_destructible>()...);
-    };
-
-    namespace access {
-
-      struct recursive_union {
-#ifdef MPARK_RETURN_TYPE_DEDUCTION
-        template <typename V>
-        inline static constexpr auto &&get_alt(V &&v, in_place_index_t<0>) {
-          return lib::forward<V>(v).head_;
-        }
-
-        template <typename V, std::size_t I>
-        inline static constexpr auto &&get_alt(V &&v, in_place_index_t<I>) {
-          return get_alt(lib::forward<V>(v).tail_, in_place_index_t<I - 1>{});
-        }
-#else
-        template <std::size_t I, bool Dummy = true>
-        struct get_alt_impl {
-          template <typename V>
-          inline constexpr AUTO_REFREF operator()(V &&v) const
-            AUTO_REFREF_RETURN(get_alt_impl<I - 1>{}(lib::forward<V>(v).tail_))
-        };
-
-        template <bool Dummy>
-        struct get_alt_impl<0, Dummy> {
-          template <typename V>
-          inline constexpr AUTO_REFREF operator()(V &&v) const
-            AUTO_REFREF_RETURN(lib::forward<V>(v).head_)
-        };
-
-        template <typename V, std::size_t I>
-        inline static constexpr AUTO_REFREF get_alt(V &&v, in_place_index_t<I>)
-          AUTO_REFREF_RETURN(get_alt_impl<I>{}(lib::forward<V>(v)))
-#endif
-      };
-
-      struct base {
-        template <std::size_t I, typename V>
-        inline static constexpr AUTO_REFREF get_alt(V &&v)
-#ifdef _MSC_VER
-          AUTO_REFREF_RETURN(recursive_union::get_alt(
-              lib::forward<V>(v).data_, in_place_index_t<I>{}))
-#else
-          AUTO_REFREF_RETURN(recursive_union::get_alt(
-              data(lib::forward<V>(v)), in_place_index_t<I>{}))
-#endif
-      };
-
-      struct variant {
-        template <std::size_t I, typename V>
-        inline static constexpr AUTO_REFREF get_alt(V &&v)
-          AUTO_REFREF_RETURN(base::get_alt<I>(lib::forward<V>(v).impl_))
-      };
-
-    }  // namespace access
-
-    namespace visitation {
-
-#if defined(MPARK_CPP14_CONSTEXPR) && !defined(_MSC_VER)
-#define MPARK_VARIANT_SWITCH_VISIT
-#endif
-
-      struct base {
-        template <typename Visitor, typename... Vs>
-        using dispatch_result_t = decltype(
-            lib::invoke(std::declval<Visitor>(),
-                        access::base::get_alt<0>(std::declval<Vs>())...));
-
-        template <typename Expected>
-        struct expected {
-          template <typename Actual>
-          inline static constexpr bool but_got() {
-            return std::is_same<Expected, Actual>::value;
-          }
-        };
-
-        template <typename Expected, typename Actual>
-        struct visit_return_type_check {
-          static_assert(
-              expected<Expected>::template but_got<Actual>(),
-              "`visit` requires the visitor to have a single return type");
-
-          template <typename Visitor, typename... Alts>
-          inline static constexpr DECLTYPE_AUTO invoke(Visitor &&visitor,
-                                                       Alts &&... alts)
-            DECLTYPE_AUTO_RETURN(lib::invoke(lib::forward<Visitor>(visitor),
-                                             lib::forward<Alts>(alts)...))
-        };
-
-#ifdef MPARK_VARIANT_SWITCH_VISIT
-        template <bool B, typename R, typename... ITs>
-        struct dispatcher;
-
-        template <typename R, typename... ITs>
-        struct dispatcher<false, R, ITs...> {
-          template <std::size_t B, typename F, typename... Vs>
-          MPARK_ALWAYS_INLINE static constexpr R dispatch(
-              F &&, typename ITs::type &&..., Vs &&...) {
-            MPARK_BUILTIN_UNREACHABLE;
-          }
-
-          template <std::size_t I, typename F, typename... Vs>
-          MPARK_ALWAYS_INLINE static constexpr R dispatch_case(F &&, Vs &&...) {
-            MPARK_BUILTIN_UNREACHABLE;
-          }
-
-          template <std::size_t B, typename F, typename... Vs>
-          MPARK_ALWAYS_INLINE static constexpr R dispatch_at(std::size_t,
-                                                             F &&,
-                                                             Vs &&...) {
-            MPARK_BUILTIN_UNREACHABLE;
-          }
-        };
-
-        template <typename R, typename... ITs>
-        struct dispatcher<true, R, ITs...> {
-          template <std::size_t B, typename F>
-          MPARK_ALWAYS_INLINE static constexpr R dispatch(
-              F &&f, typename ITs::type &&... visited_vs) {
-            using Expected = R;
-            using Actual = decltype(lib::invoke(
-                lib::forward<F>(f),
-                access::base::get_alt<ITs::value>(
-                    lib::forward<typename ITs::type>(visited_vs))...));
-            return visit_return_type_check<Expected, Actual>::invoke(
-                lib::forward<F>(f),
-                access::base::get_alt<ITs::value>(
-                    lib::forward<typename ITs::type>(visited_vs))...);
-          }
-
-          template <std::size_t B, typename F, typename V, typename... Vs>
-          MPARK_ALWAYS_INLINE static constexpr R dispatch(
-              F &&f, typename ITs::type &&... visited_vs, V &&v, Vs &&... vs) {
-#define MPARK_DISPATCH(I)                                                   \
-  dispatcher<(I < lib::decay_t<V>::size()),                                 \
-             R,                                                             \
-             ITs...,                                                        \
-             lib::indexed_type<I, V>>::                                     \
-      template dispatch<0>(lib::forward<F>(f),                              \
-                           lib::forward<typename ITs::type>(visited_vs)..., \
-                           lib::forward<V>(v),                              \
-                           lib::forward<Vs>(vs)...)
-
-#define MPARK_DEFAULT(I)                                                      \
-  dispatcher<(I < lib::decay_t<V>::size()), R, ITs...>::template dispatch<I>( \
-      lib::forward<F>(f),                                                     \
-      lib::forward<typename ITs::type>(visited_vs)...,                        \
-      lib::forward<V>(v),                                                     \
-      lib::forward<Vs>(vs)...)
-
-            switch (v.index()) {
-              case B + 0: return MPARK_DISPATCH(B + 0);
-              case B + 1: return MPARK_DISPATCH(B + 1);
-              case B + 2: return MPARK_DISPATCH(B + 2);
-              case B + 3: return MPARK_DISPATCH(B + 3);
-              case B + 4: return MPARK_DISPATCH(B + 4);
-              case B + 5: return MPARK_DISPATCH(B + 5);
-              case B + 6: return MPARK_DISPATCH(B + 6);
-              case B + 7: return MPARK_DISPATCH(B + 7);
-              case B + 8: return MPARK_DISPATCH(B + 8);
-              case B + 9: return MPARK_DISPATCH(B + 9);
-              case B + 10: return MPARK_DISPATCH(B + 10);
-              case B + 11: return MPARK_DISPATCH(B + 11);
-              case B + 12: return MPARK_DISPATCH(B + 12);
-              case B + 13: return MPARK_DISPATCH(B + 13);
-              case B + 14: return MPARK_DISPATCH(B + 14);
-              case B + 15: return MPARK_DISPATCH(B + 15);
-              case B + 16: return MPARK_DISPATCH(B + 16);
-              case B + 17: return MPARK_DISPATCH(B + 17);
-              case B + 18: return MPARK_DISPATCH(B + 18);
-              case B + 19: return MPARK_DISPATCH(B + 19);
-              case B + 20: return MPARK_DISPATCH(B + 20);
-              case B + 21: return MPARK_DISPATCH(B + 21);
-              case B + 22: return MPARK_DISPATCH(B + 22);
-              case B + 23: return MPARK_DISPATCH(B + 23);
-              case B + 24: return MPARK_DISPATCH(B + 24);
-              case B + 25: return MPARK_DISPATCH(B + 25);
-              case B + 26: return MPARK_DISPATCH(B + 26);
-              case B + 27: return MPARK_DISPATCH(B + 27);
-              case B + 28: return MPARK_DISPATCH(B + 28);
-              case B + 29: return MPARK_DISPATCH(B + 29);
-              case B + 30: return MPARK_DISPATCH(B + 30);
-              case B + 31: return MPARK_DISPATCH(B + 31);
-              default: return MPARK_DEFAULT(B + 32);
-            }
-
-#undef MPARK_DEFAULT
-#undef MPARK_DISPATCH
-          }
-
-          template <std::size_t I, typename F, typename... Vs>
-          MPARK_ALWAYS_INLINE static constexpr R dispatch_case(F &&f,
-                                                               Vs &&... vs) {
-            using Expected = R;
-            using Actual = decltype(
-                lib::invoke(lib::forward<F>(f),
-                            access::base::get_alt<I>(lib::forward<Vs>(vs))...));
-            return visit_return_type_check<Expected, Actual>::invoke(
-                lib::forward<F>(f),
-                access::base::get_alt<I>(lib::forward<Vs>(vs))...);
-          }
-
-          template <std::size_t B, typename F, typename V, typename... Vs>
-          MPARK_ALWAYS_INLINE static constexpr R dispatch_at(std::size_t index,
-                                                             F &&f,
-                                                             V &&v,
-                                                             Vs &&... vs) {
-            static_assert(lib::all<(lib::decay_t<V>::size() ==
-                                    lib::decay_t<Vs>::size())...>::value,
-                          "all of the variants must be the same size.");
-#define MPARK_DISPATCH_AT(I)                                               \
-  dispatcher<(I < lib::decay_t<V>::size()), R>::template dispatch_case<I>( \
-      lib::forward<F>(f), lib::forward<V>(v), lib::forward<Vs>(vs)...)
-
-#define MPARK_DEFAULT(I)                                                 \
-  dispatcher<(I < lib::decay_t<V>::size()), R>::template dispatch_at<I>( \
-      index, lib::forward<F>(f), lib::forward<V>(v), lib::forward<Vs>(vs)...)
-
-            switch (index) {
-              case B + 0: return MPARK_DISPATCH_AT(B + 0);
-              case B + 1: return MPARK_DISPATCH_AT(B + 1);
-              case B + 2: return MPARK_DISPATCH_AT(B + 2);
-              case B + 3: return MPARK_DISPATCH_AT(B + 3);
-              case B + 4: return MPARK_DISPATCH_AT(B + 4);
-              case B + 5: return MPARK_DISPATCH_AT(B + 5);
-              case B + 6: return MPARK_DISPATCH_AT(B + 6);
-              case B + 7: return MPARK_DISPATCH_AT(B + 7);
-              case B + 8: return MPARK_DISPATCH_AT(B + 8);
-              case B + 9: return MPARK_DISPATCH_AT(B + 9);
-              case B + 10: return MPARK_DISPATCH_AT(B + 10);
-              case B + 11: return MPARK_DISPATCH_AT(B + 11);
-              case B + 12: return MPARK_DISPATCH_AT(B + 12);
-              case B + 13: return MPARK_DISPATCH_AT(B + 13);
-              case B + 14: return MPARK_DISPATCH_AT(B + 14);
-              case B + 15: return MPARK_DISPATCH_AT(B + 15);
-              case B + 16: return MPARK_DISPATCH_AT(B + 16);
-              case B + 17: return MPARK_DISPATCH_AT(B + 17);
-              case B + 18: return MPARK_DISPATCH_AT(B + 18);
-              case B + 19: return MPARK_DISPATCH_AT(B + 19);
-              case B + 20: return MPARK_DISPATCH_AT(B + 20);
-              case B + 21: return MPARK_DISPATCH_AT(B + 21);
-              case B + 22: return MPARK_DISPATCH_AT(B + 22);
-              case B + 23: return MPARK_DISPATCH_AT(B + 23);
-              case B + 24: return MPARK_DISPATCH_AT(B + 24);
-              case B + 25: return MPARK_DISPATCH_AT(B + 25);
-              case B + 26: return MPARK_DISPATCH_AT(B + 26);
-              case B + 27: return MPARK_DISPATCH_AT(B + 27);
-              case B + 28: return MPARK_DISPATCH_AT(B + 28);
-              case B + 29: return MPARK_DISPATCH_AT(B + 29);
-              case B + 30: return MPARK_DISPATCH_AT(B + 30);
-              case B + 31: return MPARK_DISPATCH_AT(B + 31);
-              default: return MPARK_DEFAULT(B + 32);
-            }
-
-#undef MPARK_DEFAULT
-#undef MPARK_DISPATCH_AT
-          }
-        };
-#else
-        template <typename T>
-        inline static constexpr const T &at(const T &elem) noexcept {
-          return elem;
-        }
-
-        template <typename T, std::size_t N, typename... Is>
-        inline static constexpr const lib::remove_all_extents_t<T> &at(
-            const lib::array<T, N> &elems, std::size_t i, Is... is) noexcept {
-          return at(elems[i], is...);
-        }
-
-        template <typename F, typename... Fs>
-        inline static constexpr lib::array<lib::decay_t<F>, sizeof...(Fs) + 1>
-        make_farray(F &&f, Fs &&... fs) {
-          return {{lib::forward<F>(f), lib::forward<Fs>(fs)...}};
-        }
-
-        template <typename F, typename... Vs>
-        struct make_fmatrix_impl {
-
-          template <std::size_t... Is>
-          inline static constexpr dispatch_result_t<F, Vs...> dispatch(
-              F &&f, Vs &&... vs) {
-            using Expected = dispatch_result_t<F, Vs...>;
-            using Actual = decltype(lib::invoke(
-                lib::forward<F>(f),
-                access::base::get_alt<Is>(lib::forward<Vs>(vs))...));
-            return visit_return_type_check<Expected, Actual>::invoke(
-                lib::forward<F>(f),
-                access::base::get_alt<Is>(lib::forward<Vs>(vs))...);
-          }
-
-#ifdef MPARK_RETURN_TYPE_DEDUCTION
-          template <std::size_t... Is>
-          inline static constexpr auto impl(lib::index_sequence<Is...>) {
-            return &dispatch<Is...>;
-          }
-
-          template <typename Is, std::size_t... Js, typename... Ls>
-          inline static constexpr auto impl(Is,
-                                            lib::index_sequence<Js...>,
-                                            Ls... ls) {
-            return make_farray(impl(lib::push_back_t<Is, Js>{}, ls...)...);
-          }
-#else
-          template <typename...>
-          struct impl;
-
-          template <std::size_t... Is>
-          struct impl<lib::index_sequence<Is...>> {
-            inline constexpr AUTO operator()() const
-              AUTO_RETURN(&dispatch<Is...>)
-          };
-
-          template <typename Is, std::size_t... Js, typename... Ls>
-          struct impl<Is, lib::index_sequence<Js...>, Ls...> {
-            inline constexpr AUTO operator()() const
-              AUTO_RETURN(
-                  make_farray(impl<lib::push_back_t<Is, Js>, Ls...>{}()...))
-          };
-#endif
-        };
-
-#ifdef MPARK_RETURN_TYPE_DEDUCTION
-        template <typename F, typename... Vs>
-        inline static constexpr auto make_fmatrix() {
-          return make_fmatrix_impl<F, Vs...>::impl(
-              lib::index_sequence<>{},
-              lib::make_index_sequence<lib::decay_t<Vs>::size()>{}...);
-        }
-#else
-        template <typename F, typename... Vs>
-        inline static constexpr AUTO make_fmatrix()
-          AUTO_RETURN(
-              typename make_fmatrix_impl<F, Vs...>::template impl<
-                  lib::index_sequence<>,
-                  lib::make_index_sequence<lib::decay_t<Vs>::size()>...>{}())
-#endif
-
-        template <typename F, typename... Vs>
-        struct make_fdiagonal_impl {
-          template <std::size_t I>
-          inline static constexpr dispatch_result_t<F, Vs...> dispatch(
-              F &&f, Vs &&... vs) {
-            using Expected = dispatch_result_t<F, Vs...>;
-            using Actual = decltype(
-                lib::invoke(lib::forward<F>(f),
-                            access::base::get_alt<I>(lib::forward<Vs>(vs))...));
-            return visit_return_type_check<Expected, Actual>::invoke(
-                lib::forward<F>(f),
-                access::base::get_alt<I>(lib::forward<Vs>(vs))...);
-          }
-
-          template <std::size_t... Is>
-          inline static constexpr AUTO impl(lib::index_sequence<Is...>)
-            AUTO_RETURN(make_farray(&dispatch<Is>...))
-        };
-
-        template <typename F, typename V, typename... Vs>
-        inline static constexpr auto make_fdiagonal()
-            -> decltype(make_fdiagonal_impl<F, V, Vs...>::impl(
-                lib::make_index_sequence<lib::decay_t<V>::size()>{})) {
-          static_assert(lib::all<(lib::decay_t<V>::size() ==
-                                  lib::decay_t<Vs>::size())...>::value,
-                        "all of the variants must be the same size.");
-          return make_fdiagonal_impl<F, V, Vs...>::impl(
-              lib::make_index_sequence<lib::decay_t<V>::size()>{});
-        }
-#endif
-      };
-
-#if !defined(MPARK_VARIANT_SWITCH_VISIT) && \
-    (!defined(_MSC_VER) || _MSC_VER >= 1910)
-      template <typename F, typename... Vs>
-      using fmatrix_t = decltype(base::make_fmatrix<F, Vs...>());
-
-      template <typename F, typename... Vs>
-      struct fmatrix {
-        static constexpr fmatrix_t<F, Vs...> value =
-            base::make_fmatrix<F, Vs...>();
-      };
-
-      template <typename F, typename... Vs>
-      constexpr fmatrix_t<F, Vs...> fmatrix<F, Vs...>::value;
-
-      template <typename F, typename... Vs>
-      using fdiagonal_t = decltype(base::make_fdiagonal<F, Vs...>());
-
-      template <typename F, typename... Vs>
-      struct fdiagonal {
-        static constexpr fdiagonal_t<F, Vs...> value =
-            base::make_fdiagonal<F, Vs...>();
-      };
-
-      template <typename F, typename... Vs>
-      constexpr fdiagonal_t<F, Vs...> fdiagonal<F, Vs...>::value;
-#endif
-
-      struct alt {
-        template <typename Visitor, typename... Vs>
-        inline static constexpr DECLTYPE_AUTO visit_alt(Visitor &&visitor,
-                                                        Vs &&... vs)
-#ifdef MPARK_VARIANT_SWITCH_VISIT
-          DECLTYPE_AUTO_RETURN(
-              base::dispatcher<
-                  true,
-                  base::dispatch_result_t<Visitor,
-                                          decltype(as_base(
-                                              lib::forward<Vs>(vs)))...>>::
-                  template dispatch<0>(lib::forward<Visitor>(visitor),
-                                       as_base(lib::forward<Vs>(vs))...))
-#elif !defined(_MSC_VER) || _MSC_VER >= 1910
-          DECLTYPE_AUTO_RETURN(base::at(
-              fmatrix<Visitor &&,
-                      decltype(as_base(lib::forward<Vs>(vs)))...>::value,
-              vs.index()...)(lib::forward<Visitor>(visitor),
-                             as_base(lib::forward<Vs>(vs))...))
-#else
-          DECLTYPE_AUTO_RETURN(base::at(
-              base::make_fmatrix<Visitor &&,
-                      decltype(as_base(lib::forward<Vs>(vs)))...>(),
-              vs.index()...)(lib::forward<Visitor>(visitor),
-                             as_base(lib::forward<Vs>(vs))...))
-#endif
-
-        template <typename Visitor, typename... Vs>
-        inline static constexpr DECLTYPE_AUTO visit_alt_at(std::size_t index,
-                                                           Visitor &&visitor,
-                                                           Vs &&... vs)
-#ifdef MPARK_VARIANT_SWITCH_VISIT
-          DECLTYPE_AUTO_RETURN(
-              base::dispatcher<
-                  true,
-                  base::dispatch_result_t<Visitor,
-                                          decltype(as_base(
-                                              lib::forward<Vs>(vs)))...>>::
-                  template dispatch_at<0>(index,
-                                          lib::forward<Visitor>(visitor),
-                                          as_base(lib::forward<Vs>(vs))...))
-#elif !defined(_MSC_VER) || _MSC_VER >= 1910
-          DECLTYPE_AUTO_RETURN(base::at(
-              fdiagonal<Visitor &&,
-                        decltype(as_base(lib::forward<Vs>(vs)))...>::value,
-              index)(lib::forward<Visitor>(visitor),
-                     as_base(lib::forward<Vs>(vs))...))
-#else
-          DECLTYPE_AUTO_RETURN(base::at(
-              base::make_fdiagonal<Visitor &&,
-                        decltype(as_base(lib::forward<Vs>(vs)))...>(),
-              index)(lib::forward<Visitor>(visitor),
-                     as_base(lib::forward<Vs>(vs))...))
-#endif
-      };
-
-      struct variant {
-        private:
-        template <typename Visitor>
-        struct visitor {
-          template <typename... Values>
-          inline static constexpr bool does_not_handle() {
-            return lib::is_invocable<Visitor, Values...>::value;
-          }
-        };
-
-        template <typename Visitor, typename... Values>
-        struct visit_exhaustiveness_check {
-          static_assert(visitor<Visitor>::template does_not_handle<Values...>(),
-                        "`visit` requires the visitor to be exhaustive.");
-
-          inline static constexpr DECLTYPE_AUTO invoke(Visitor &&visitor,
-                                                       Values &&... values)
-            DECLTYPE_AUTO_RETURN(lib::invoke(lib::forward<Visitor>(visitor),
-                                             lib::forward<Values>(values)...))
-        };
-
-        template <typename Visitor>
-        struct value_visitor {
-          Visitor &&visitor_;
-
-          template <typename... Alts>
-          inline constexpr DECLTYPE_AUTO operator()(Alts &&... alts) const
-            DECLTYPE_AUTO_RETURN(
-                visit_exhaustiveness_check<
-                    Visitor,
-                    decltype((lib::forward<Alts>(alts).value))...>::
-                    invoke(lib::forward<Visitor>(visitor_),
-                           lib::forward<Alts>(alts).value...))
-        };
-
-        template <typename Visitor>
-        inline static constexpr AUTO make_value_visitor(Visitor &&visitor)
-          AUTO_RETURN(value_visitor<Visitor>{lib::forward<Visitor>(visitor)})
-
-        public:
-        template <typename Visitor, typename... Vs>
-        inline static constexpr DECLTYPE_AUTO visit_alt(Visitor &&visitor,
-                                                        Vs &&... vs)
-          DECLTYPE_AUTO_RETURN(alt::visit_alt(lib::forward<Visitor>(visitor),
-                                              lib::forward<Vs>(vs).impl_...))
-
-        template <typename Visitor, typename... Vs>
-        inline static constexpr DECLTYPE_AUTO visit_alt_at(std::size_t index,
-                                                           Visitor &&visitor,
-                                                           Vs &&... vs)
-          DECLTYPE_AUTO_RETURN(
-              alt::visit_alt_at(index,
-                                lib::forward<Visitor>(visitor),
-                                lib::forward<Vs>(vs).impl_...))
-
-        template <typename Visitor, typename... Vs>
-        inline static constexpr DECLTYPE_AUTO visit_value(Visitor &&visitor,
-                                                          Vs &&... vs)
-          DECLTYPE_AUTO_RETURN(
-              visit_alt(make_value_visitor(lib::forward<Visitor>(visitor)),
-                        lib::forward<Vs>(vs)...))
-
-        template <typename Visitor, typename... Vs>
-        inline static constexpr DECLTYPE_AUTO visit_value_at(std::size_t index,
-                                                             Visitor &&visitor,
-                                                             Vs &&... vs)
-          DECLTYPE_AUTO_RETURN(
-              visit_alt_at(index,
-                           make_value_visitor(lib::forward<Visitor>(visitor)),
-                           lib::forward<Vs>(vs)...))
-      };
-
-    }  // namespace visitation
-
-    template <std::size_t Index, typename T>
-    struct alt {
-      using value_type = T;
-
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4244)
-#endif
-      template <typename... Args>
-      inline explicit constexpr alt(in_place_t, Args &&... args)
-          : value(lib::forward<Args>(args)...) {}
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-
-      T value;
-    };
-
-    template <Trait DestructibleTrait, std::size_t Index, typename... Ts>
-    union recursive_union;
-
-    template <Trait DestructibleTrait, std::size_t Index>
-    union recursive_union<DestructibleTrait, Index> {};
-
-#define MPARK_VARIANT_RECURSIVE_UNION(destructible_trait, destructor)      \
-  template <std::size_t Index, typename T, typename... Ts>                 \
-  union recursive_union<destructible_trait, Index, T, Ts...> {             \
-    public:                                                                \
-    inline explicit constexpr recursive_union(valueless_t) noexcept        \
-        : dummy_{} {}                                                      \
-                                                                           \
-    template <typename... Args>                                            \
-    inline explicit constexpr recursive_union(in_place_index_t<0>,         \
-                                              Args &&... args)             \
-        : head_(in_place_t{}, lib::forward<Args>(args)...) {}              \
-                                                                           \
-    template <std::size_t I, typename... Args>                             \
-    inline explicit constexpr recursive_union(in_place_index_t<I>,         \
-                                              Args &&... args)             \
-        : tail_(in_place_index_t<I - 1>{}, lib::forward<Args>(args)...) {} \
-                                                                           \
-    recursive_union(const recursive_union &) = default;                    \
-    recursive_union(recursive_union &&) = default;                         \
-                                                                           \
-    destructor                                                             \
-                                                                           \
-    recursive_union &operator=(const recursive_union &) = default;         \
-    recursive_union &operator=(recursive_union &&) = default;              \
-                                                                           \
-    private:                                                               \
-    char dummy_;                                                           \
-    alt<Index, T> head_;                                                   \
-    recursive_union<destructible_trait, Index + 1, Ts...> tail_;           \
-                                                                           \
-    friend struct access::recursive_union;                                 \
-  }
-
-    MPARK_VARIANT_RECURSIVE_UNION(Trait::TriviallyAvailable,
-                                  ~recursive_union() = default;);
-    MPARK_VARIANT_RECURSIVE_UNION(Trait::Available,
-                                  ~recursive_union() {});
-    MPARK_VARIANT_RECURSIVE_UNION(Trait::Unavailable,
-                                  ~recursive_union() = delete;);
-
-#undef MPARK_VARIANT_RECURSIVE_UNION
-
-    template <typename... Ts>
-    using index_t = typename std::conditional<
-            sizeof...(Ts) < (std::numeric_limits<unsigned char>::max)(),
-            unsigned char,
-            typename std::conditional<
-                sizeof...(Ts) < (std::numeric_limits<unsigned short>::max)(),
-                unsigned short,
-                unsigned int>::type
-            >::type;
-
-    template <Trait DestructibleTrait, typename... Ts>
-    class base {
-      public:
-      inline explicit constexpr base(valueless_t tag) noexcept
-          : data_(tag), index_(static_cast<index_t<Ts...>>(-1)) {}
-
-      template <std::size_t I, typename... Args>
-      inline explicit constexpr base(in_place_index_t<I>, Args &&... args)
-          : data_(in_place_index_t<I>{}, lib::forward<Args>(args)...),
-            index_(I) {}
-
-      inline constexpr bool valueless_by_exception() const noexcept {
-        return index_ == static_cast<index_t<Ts...>>(-1);
-      }
-
-      inline constexpr std::size_t index() const noexcept {
-        return valueless_by_exception() ? variant_npos : index_;
-      }
-
-      protected:
-      using data_t = recursive_union<DestructibleTrait, 0, Ts...>;
-
-      friend inline constexpr base &as_base(base &b) { return b; }
-      friend inline constexpr const base &as_base(const base &b) { return b; }
-      friend inline constexpr base &&as_base(base &&b) { return lib::move(b); }
-      friend inline constexpr const base &&as_base(const base &&b) { return lib::move(b); }
-
-      friend inline constexpr data_t &data(base &b) { return b.data_; }
-      friend inline constexpr const data_t &data(const base &b) { return b.data_; }
-      friend inline constexpr data_t &&data(base &&b) { return lib::move(b).data_; }
-      friend inline constexpr const data_t &&data(const base &&b) { return lib::move(b).data_; }
-
-      inline static constexpr std::size_t size() { return sizeof...(Ts); }
-
-      data_t data_;
-      index_t<Ts...> index_;
-
-      friend struct access::base;
-      friend struct visitation::base;
-    };
-
-    struct dtor {
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4100)
-#endif
-      template <typename Alt>
-      inline void operator()(Alt &alt) const noexcept { alt.~Alt(); }
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-    };
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1910
-#define MPARK_INHERITING_CTOR(type, base) using base::base;
-#else
-#define MPARK_INHERITING_CTOR(type, base)         \
-  template <typename... Args>                     \
-  inline explicit constexpr type(Args &&... args) \
-      : base(lib::forward<Args>(args)...) {}
-#endif
-
-    template <typename Traits, Trait = Traits::destructible_trait>
-    class destructor;
-
-#define MPARK_VARIANT_DESTRUCTOR(destructible_trait, definition, destroy) \
-  template <typename... Ts>                                               \
-  class destructor<traits<Ts...>, destructible_trait>                     \
-      : public base<destructible_trait, Ts...> {                          \
-    using super = base<destructible_trait, Ts...>;                        \
-                                                                          \
-    public:                                                               \
-    MPARK_INHERITING_CTOR(destructor, super)                              \
-    using super::operator=;                                               \
-                                                                          \
-    destructor(const destructor &) = default;                             \
-    destructor(destructor &&) = default;                                  \
-    definition                                                            \
-    destructor &operator=(const destructor &) = default;                  \
-    destructor &operator=(destructor &&) = default;                       \
-                                                                          \
-    protected:                                                            \
-    destroy                                                               \
-  }
-
-    MPARK_VARIANT_DESTRUCTOR(
-        Trait::TriviallyAvailable,
-        ~destructor() = default;,
-        inline void destroy() noexcept {
-          this->index_ = static_cast<index_t<Ts...>>(-1);
-        });
-
-    MPARK_VARIANT_DESTRUCTOR(
-        Trait::Available,
-        ~destructor() { destroy(); },
-        inline void destroy() noexcept {
-          if (!this->valueless_by_exception()) {
-            visitation::alt::visit_alt(dtor{}, *this);
-          }
-          this->index_ = static_cast<index_t<Ts...>>(-1);
-        });
-
-    MPARK_VARIANT_DESTRUCTOR(
-        Trait::Unavailable,
-        ~destructor() = delete;,
-        inline void destroy() noexcept = delete;);
-
-#undef MPARK_VARIANT_DESTRUCTOR
-
-    template <typename Traits>
-    class constructor : public destructor<Traits> {
-      using super = destructor<Traits>;
-
-      public:
-      MPARK_INHERITING_CTOR(constructor, super)
-      using super::operator=;
-
-      protected:
-#ifndef MPARK_GENERIC_LAMBDAS
-      struct ctor {
-        template <typename LhsAlt, typename RhsAlt>
-        inline void operator()(LhsAlt &lhs_alt, RhsAlt &&rhs_alt) const {
-          constructor::construct_alt(lhs_alt,
-                                     lib::forward<RhsAlt>(rhs_alt).value);
-        }
-      };
-#endif
-
-      template <std::size_t I, typename T, typename... Args>
-      inline static T &construct_alt(alt<I, T> &a, Args &&... args) {
-        auto *result = ::new (static_cast<void *>(lib::addressof(a)))
-            alt<I, T>(in_place_t{}, lib::forward<Args>(args)...);
-        return result->value;
-      }
-
-      template <typename Rhs>
-      inline static void generic_construct(constructor &lhs, Rhs &&rhs) {
-        lhs.destroy();
-        if (!rhs.valueless_by_exception()) {
-          visitation::alt::visit_alt_at(
-              rhs.index(),
-#ifdef MPARK_GENERIC_LAMBDAS
-              [](auto &lhs_alt, auto &&rhs_alt) {
-                constructor::construct_alt(
-                    lhs_alt, lib::forward<decltype(rhs_alt)>(rhs_alt).value);
-              }
-#else
-              ctor{}
-#endif
-              ,
-              lhs,
-              lib::forward<Rhs>(rhs));
-          lhs.index_ = rhs.index_;
-        }
-      }
-    };
-
-    template <typename Traits, Trait = Traits::move_constructible_trait>
-    class move_constructor;
-
-#define MPARK_VARIANT_MOVE_CONSTRUCTOR(move_constructible_trait, definition) \
-  template <typename... Ts>                                                  \
-  class move_constructor<traits<Ts...>, move_constructible_trait>            \
-      : public constructor<traits<Ts...>> {                                  \
-    using super = constructor<traits<Ts...>>;                                \
-                                                                             \
-    public:                                                                  \
-    MPARK_INHERITING_CTOR(move_constructor, super)                           \
-    using super::operator=;                                                  \
-                                                                             \
-    move_constructor(const move_constructor &) = default;                    \
-    definition                                                               \
-    ~move_constructor() = default;                                           \
-    move_constructor &operator=(const move_constructor &) = default;         \
-    move_constructor &operator=(move_constructor &&) = default;              \
-  }
-
-    MPARK_VARIANT_MOVE_CONSTRUCTOR(
-        Trait::TriviallyAvailable,
-        move_constructor(move_constructor &&that) = default;);
-
-    MPARK_VARIANT_MOVE_CONSTRUCTOR(
-        Trait::Available,
-        move_constructor(move_constructor &&that) noexcept(
-            lib::all<std::is_nothrow_move_constructible<Ts>::value...>::value)
-            : move_constructor(valueless_t{}) {
-          this->generic_construct(*this, lib::move(that));
-        });
-
-    MPARK_VARIANT_MOVE_CONSTRUCTOR(
-        Trait::Unavailable,
-        move_constructor(move_constructor &&) = delete;);
-
-#undef MPARK_VARIANT_MOVE_CONSTRUCTOR
-
-    template <typename Traits, Trait = Traits::copy_constructible_trait>
-    class copy_constructor;
-
-#define MPARK_VARIANT_COPY_CONSTRUCTOR(copy_constructible_trait, definition) \
-  template <typename... Ts>                                                  \
-  class copy_constructor<traits<Ts...>, copy_constructible_trait>            \
-      : public move_constructor<traits<Ts...>> {                             \
-    using super = move_constructor<traits<Ts...>>;                           \
-                                                                             \
-    public:                                                                  \
-    MPARK_INHERITING_CTOR(copy_constructor, super)                           \
-    using super::operator=;                                                  \
-                                                                             \
-    definition                                                               \
-    copy_constructor(copy_constructor &&) = default;                         \
-    ~copy_constructor() = default;                                           \
-    copy_constructor &operator=(const copy_constructor &) = default;         \
-    copy_constructor &operator=(copy_constructor &&) = default;              \
-  }
-
-    MPARK_VARIANT_COPY_CONSTRUCTOR(
-        Trait::TriviallyAvailable,
-        copy_constructor(const copy_constructor &that) = default;);
-
-    MPARK_VARIANT_COPY_CONSTRUCTOR(
-        Trait::Available,
-        copy_constructor(const copy_constructor &that)
-            : copy_constructor(valueless_t{}) {
-          this->generic_construct(*this, that);
-        });
-
-    MPARK_VARIANT_COPY_CONSTRUCTOR(
-        Trait::Unavailable,
-        copy_constructor(const copy_constructor &) = delete;);
-
-#undef MPARK_VARIANT_COPY_CONSTRUCTOR
-
-    template <typename Traits>
-    class assignment : public copy_constructor<Traits> {
-      using super = copy_constructor<Traits>;
-
-      public:
-      MPARK_INHERITING_CTOR(assignment, super)
-      using super::operator=;
-
-      template <std::size_t I, typename... Args>
-      inline /* auto & */ auto emplace(Args &&... args)
-          -> decltype(this->construct_alt(access::base::get_alt<I>(*this),
-                                          lib::forward<Args>(args)...)) {
-        this->destroy();
-        auto &result = this->construct_alt(access::base::get_alt<I>(*this),
-                                           lib::forward<Args>(args)...);
-        this->index_ = I;
-        return result;
-      }
-
-      protected:
-#ifndef MPARK_GENERIC_LAMBDAS
-      template <typename That>
-      struct assigner {
-        template <typename ThisAlt, typename ThatAlt>
-        inline void operator()(ThisAlt &this_alt, ThatAlt &&that_alt) const {
-          self->assign_alt(this_alt, lib::forward<ThatAlt>(that_alt).value);
-        }
-        assignment *self;
-      };
-#endif
-
-      template <std::size_t I, typename T, typename Arg>
-      inline void assign_alt(alt<I, T> &a, Arg &&arg) {
-        if (this->index() == I) {
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4244)
-#endif
-          a.value = lib::forward<Arg>(arg);
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
-        } else {
-          struct {
-            void operator()(std::true_type) const {
-              this_->emplace<I>(lib::forward<Arg>(arg_));
-            }
-            void operator()(std::false_type) const {
-              this_->emplace<I>(T(lib::forward<Arg>(arg_)));
-            }
-            assignment *this_;
-            Arg &&arg_;
-          } impl{this, lib::forward<Arg>(arg)};
-          impl(lib::bool_constant<
-                   std::is_nothrow_constructible<T, Arg>::value ||
-                   !std::is_nothrow_move_constructible<T>::value>{});
-        }
-      }
-
-      template <typename That>
-      inline void generic_assign(That &&that) {
-        if (this->valueless_by_exception() && that.valueless_by_exception()) {
-          // do nothing.
-        } else if (that.valueless_by_exception()) {
-          this->destroy();
-        } else {
-          visitation::alt::visit_alt_at(
-              that.index(),
-#ifdef MPARK_GENERIC_LAMBDAS
-              [this](auto &this_alt, auto &&that_alt) {
-                this->assign_alt(
-                    this_alt, lib::forward<decltype(that_alt)>(that_alt).value);
-              }
-#else
-              assigner<That>{this}
-#endif
-              ,
-              *this,
-              lib::forward<That>(that));
-        }
-      }
-    };
-
-    template <typename Traits, Trait = Traits::move_assignable_trait>
-    class move_assignment;
-
-#define MPARK_VARIANT_MOVE_ASSIGNMENT(move_assignable_trait, definition) \
-  template <typename... Ts>                                              \
-  class move_assignment<traits<Ts...>, move_assignable_trait>            \
-      : public assignment<traits<Ts...>> {                               \
-    using super = assignment<traits<Ts...>>;                             \
-                                                                         \
-    public:                                                              \
-    MPARK_INHERITING_CTOR(move_assignment, super)                        \
-    using super::operator=;                                              \
-                                                                         \
-    move_assignment(const move_assignment &) = default;                  \
-    move_assignment(move_assignment &&) = default;                       \
-    ~move_assignment() = default;                                        \
-    move_assignment &operator=(const move_assignment &) = default;       \
-    definition                                                           \
-  }
-
-    MPARK_VARIANT_MOVE_ASSIGNMENT(
-        Trait::TriviallyAvailable,
-        move_assignment &operator=(move_assignment &&that) = default;);
-
-    MPARK_VARIANT_MOVE_ASSIGNMENT(
-        Trait::Available,
-        move_assignment &
-        operator=(move_assignment &&that) noexcept(
-            lib::all<(std::is_nothrow_move_constructible<Ts>::value &&
-                      std::is_nothrow_move_assignable<Ts>::value)...>::value) {
-          this->generic_assign(lib::move(that));
-          return *this;
-        });
-
-    MPARK_VARIANT_MOVE_ASSIGNMENT(
-        Trait::Unavailable,
-        move_assignment &operator=(move_assignment &&) = delete;);
-
-#undef MPARK_VARIANT_MOVE_ASSIGNMENT
-
-    template <typename Traits, Trait = Traits::copy_assignable_trait>
-    class copy_assignment;
-
-#define MPARK_VARIANT_COPY_ASSIGNMENT(copy_assignable_trait, definition) \
-  template <typename... Ts>                                              \
-  class copy_assignment<traits<Ts...>, copy_assignable_trait>            \
-      : public move_assignment<traits<Ts...>> {                          \
-    using super = move_assignment<traits<Ts...>>;                        \
-                                                                         \
-    public:                                                              \
-    MPARK_INHERITING_CTOR(copy_assignment, super)                        \
-    using super::operator=;                                              \
-                                                                         \
-    copy_assignment(const copy_assignment &) = default;                  \
-    copy_assignment(copy_assignment &&) = default;                       \
-    ~copy_assignment() = default;                                        \
-    definition                                                           \
-    copy_assignment &operator=(copy_assignment &&) = default;            \
-  }
-
-    MPARK_VARIANT_COPY_ASSIGNMENT(
-        Trait::TriviallyAvailable,
-        copy_assignment &operator=(const copy_assignment &that) = default;);
-
-    MPARK_VARIANT_COPY_ASSIGNMENT(
-        Trait::Available,
-        copy_assignment &operator=(const copy_assignment &that) {
-          this->generic_assign(that);
-          return *this;
-        });
-
-    MPARK_VARIANT_COPY_ASSIGNMENT(
-        Trait::Unavailable,
-        copy_assignment &operator=(const copy_assignment &) = delete;);
-
-#undef MPARK_VARIANT_COPY_ASSIGNMENT
-
-    template <typename... Ts>
-    class impl : public copy_assignment<traits<Ts...>> {
-      using super = copy_assignment<traits<Ts...>>;
-
-      public:
-      MPARK_INHERITING_CTOR(impl, super)
-      using super::operator=;
-
-      template <std::size_t I, typename Arg>
-      inline void assign(Arg &&arg) {
-        this->assign_alt(access::base::get_alt<I>(*this),
-                         lib::forward<Arg>(arg));
-      }
-
-      inline void swap(impl &that) {
-        if (this->valueless_by_exception() && that.valueless_by_exception()) {
-          // do nothing.
-        } else if (this->index() == that.index()) {
-          visitation::alt::visit_alt_at(this->index(),
-#ifdef MPARK_GENERIC_LAMBDAS
-                                        [](auto &this_alt, auto &that_alt) {
-                                          using std::swap;
-                                          swap(this_alt.value,
-                                               that_alt.value);
-                                        }
-#else
-                                        swapper{}
-#endif
-                                        ,
-                                        *this,
-                                        that);
-        } else {
-          impl *lhs = this;
-          impl *rhs = lib::addressof(that);
-          if (lhs->move_nothrow() && !rhs->move_nothrow()) {
-            std::swap(lhs, rhs);
-          }
-          impl tmp(lib::move(*rhs));
-#ifdef MPARK_EXCEPTIONS
-          // EXTENSION: When the move construction of `lhs` into `rhs` throws
-          // and `tmp` is nothrow move constructible then we move `tmp` back
-          // into `rhs` and provide the strong exception safety guarantee.
-          try {
-            this->generic_construct(*rhs, lib::move(*lhs));
-          } catch (...) {
-            if (tmp.move_nothrow()) {
-              this->generic_construct(*rhs, lib::move(tmp));
-            }
-            throw;
-          }
-#else
-          this->generic_construct(*rhs, lib::move(*lhs));
-#endif
-          this->generic_construct(*lhs, lib::move(tmp));
-        }
-      }
-
-      private:
-#ifndef MPARK_GENERIC_LAMBDAS
-      struct swapper {
-        template <typename ThisAlt, typename ThatAlt>
-        inline void operator()(ThisAlt &this_alt, ThatAlt &that_alt) const {
-          using std::swap;
-          swap(this_alt.value, that_alt.value);
-        }
-      };
-#endif
-
-      inline constexpr bool move_nothrow() const {
-        return this->valueless_by_exception() ||
-               lib::array<bool, sizeof...(Ts)>{
-                   {std::is_nothrow_move_constructible<Ts>::value...}
-               }[this->index()];
-      }
-    };
-
-#undef MPARK_INHERITING_CTOR
-
-    template <std::size_t I, typename T>
-    struct overload_leaf {
-      using impl = lib::size_constant<I> (*)(T);
-      operator impl() const { return nullptr; }
-    };
-
-    template <typename... Ts>
-    struct overload_impl {
-      private:
-      template <typename>
-      struct impl;
-
-      template <std::size_t... Is>
-      struct impl<lib::index_sequence<Is...>> : overload_leaf<Is, Ts>... {};
-
-      public:
-      using type = impl<lib::index_sequence_for<Ts...>>;
-    };
-
-    template <typename... Ts>
-    using overload = typename overload_impl<Ts...>::type;
-
-    template <typename T, typename... Ts>
-    using best_match = lib::invoke_result_t<overload<Ts...>, T &&>;
-
-    template <typename T>
-    struct is_in_place_index : std::false_type {};
-
-    template <std::size_t I>
-    struct is_in_place_index<in_place_index_t<I>> : std::true_type {};
-
-    template <typename T>
-    struct is_in_place_type : std::false_type {};
-
-    template <typename T>
-    struct is_in_place_type<in_place_type_t<T>> : std::true_type {};
-
-  }  // detail
-
-  template <typename... Ts>
-  class variant {
-    static_assert(0 < sizeof...(Ts),
-                  "variant must consist of at least one alternative.");
-
-    static_assert(lib::all<!std::is_array<Ts>::value...>::value,
-                  "variant can not have an array type as an alternative.");
-
-    static_assert(lib::all<!std::is_reference<Ts>::value...>::value,
-                  "variant can not have a reference type as an alternative.");
-
-    static_assert(lib::all<!std::is_void<Ts>::value...>::value,
-                  "variant can not have a void type as an alternative.");
-
-    public:
-    template <
-        typename Front = lib::type_pack_element_t<0, Ts...>,
-        lib::enable_if_t<std::is_default_constructible<Front>::value, int> = 0>
-    inline constexpr variant() noexcept(
-        std::is_nothrow_default_constructible<Front>::value)
-        : impl_(in_place_index_t<0>{}) {}
-
-    variant(const variant &) = default;
-    variant(variant &&) = default;
-
-    template <
-        typename Arg,
-        typename Decayed = lib::decay_t<Arg>,
-        lib::enable_if_t<!std::is_same<Decayed, variant>::value, int> = 0,
-        lib::enable_if_t<!detail::is_in_place_index<Decayed>::value, int> = 0,
-        lib::enable_if_t<!detail::is_in_place_type<Decayed>::value, int> = 0,
-        std::size_t I = detail::best_match<Arg, Ts...>::value,
-        typename T = lib::type_pack_element_t<I, Ts...>,
-        lib::enable_if_t<std::is_constructible<T, Arg>::value, int> = 0>
-    inline constexpr variant(Arg &&arg) noexcept(
-        std::is_nothrow_constructible<T, Arg>::value)
-        : impl_(in_place_index_t<I>{}, lib::forward<Arg>(arg)) {}
-
-    template <
-        std::size_t I,
-        typename... Args,
-        typename T = lib::type_pack_element_t<I, Ts...>,
-        lib::enable_if_t<std::is_constructible<T, Args...>::value, int> = 0>
-    inline explicit constexpr variant(
-        in_place_index_t<I>,
-        Args &&... args) noexcept(std::is_nothrow_constructible<T,
-                                                                Args...>::value)
-        : impl_(in_place_index_t<I>{}, lib::forward<Args>(args)...) {}
-
-    template <
-        std::size_t I,
-        typename Up,
-        typename... Args,
-        typename T = lib::type_pack_element_t<I, Ts...>,
-        lib::enable_if_t<std::is_constructible<T,
-                                               std::initializer_list<Up> &,
-                                               Args...>::value,
-                         int> = 0>
-    inline explicit constexpr variant(
-        in_place_index_t<I>,
-        std::initializer_list<Up> il,
-        Args &&... args) noexcept(std::
-                                      is_nothrow_constructible<
-                                          T,
-                                          std::initializer_list<Up> &,
-                                          Args...>::value)
-        : impl_(in_place_index_t<I>{}, il, lib::forward<Args>(args)...) {}
-
-    template <
-        typename T,
-        typename... Args,
-        std::size_t I = detail::find_index_sfinae<T, Ts...>::value,
-        lib::enable_if_t<std::is_constructible<T, Args...>::value, int> = 0>
-    inline explicit constexpr variant(
-        in_place_type_t<T>,
-        Args &&... args) noexcept(std::is_nothrow_constructible<T,
-                                                                Args...>::value)
-        : impl_(in_place_index_t<I>{}, lib::forward<Args>(args)...) {}
-
-    template <
-        typename T,
-        typename Up,
-        typename... Args,
-        std::size_t I = detail::find_index_sfinae<T, Ts...>::value,
-        lib::enable_if_t<std::is_constructible<T,
-                                               std::initializer_list<Up> &,
-                                               Args...>::value,
-                         int> = 0>
-    inline explicit constexpr variant(
-        in_place_type_t<T>,
-        std::initializer_list<Up> il,
-        Args &&... args) noexcept(std::
-                                      is_nothrow_constructible<
-                                          T,
-                                          std::initializer_list<Up> &,
-                                          Args...>::value)
-        : impl_(in_place_index_t<I>{}, il, lib::forward<Args>(args)...) {}
-
-    ~variant() = default;
-
-    variant &operator=(const variant &) = default;
-    variant &operator=(variant &&) = default;
-
-    template <typename Arg,
-              lib::enable_if_t<!std::is_same<lib::decay_t<Arg>, variant>::value,
-                               int> = 0,
-              std::size_t I = detail::best_match<Arg, Ts...>::value,
-              typename T = lib::type_pack_element_t<I, Ts...>,
-              lib::enable_if_t<(std::is_assignable<T &, Arg>::value &&
-                                std::is_constructible<T, Arg>::value),
-                               int> = 0>
-    inline variant &operator=(Arg &&arg) noexcept(
-        (std::is_nothrow_assignable<T &, Arg>::value &&
-         std::is_nothrow_constructible<T, Arg>::value)) {
-      impl_.template assign<I>(lib::forward<Arg>(arg));
-      return *this;
-    }
-
-    template <
-        std::size_t I,
-        typename... Args,
-        typename T = lib::type_pack_element_t<I, Ts...>,
-        lib::enable_if_t<std::is_constructible<T, Args...>::value, int> = 0>
-    inline T &emplace(Args &&... args) {
-      return impl_.template emplace<I>(lib::forward<Args>(args)...);
-    }
-
-    template <
-        std::size_t I,
-        typename Up,
-        typename... Args,
-        typename T = lib::type_pack_element_t<I, Ts...>,
-        lib::enable_if_t<std::is_constructible<T,
-                                               std::initializer_list<Up> &,
-                                               Args...>::value,
-                         int> = 0>
-    inline T &emplace(std::initializer_list<Up> il, Args &&... args) {
-      return impl_.template emplace<I>(il, lib::forward<Args>(args)...);
-    }
-
-    template <
-        typename T,
-        typename... Args,
-        std::size_t I = detail::find_index_sfinae<T, Ts...>::value,
-        lib::enable_if_t<std::is_constructible<T, Args...>::value, int> = 0>
-    inline T &emplace(Args &&... args) {
-      return impl_.template emplace<I>(lib::forward<Args>(args)...);
-    }
-
-    template <
-        typename T,
-        typename Up,
-        typename... Args,
-        std::size_t I = detail::find_index_sfinae<T, Ts...>::value,
-        lib::enable_if_t<std::is_constructible<T,
-                                               std::initializer_list<Up> &,
-                                               Args...>::value,
-                         int> = 0>
-    inline T &emplace(std::initializer_list<Up> il, Args &&... args) {
-      return impl_.template emplace<I>(il, lib::forward<Args>(args)...);
-    }
-
-    inline constexpr bool valueless_by_exception() const noexcept {
-      return impl_.valueless_by_exception();
-    }
-
-    inline constexpr std::size_t index() const noexcept {
-      return impl_.index();
-    }
-
-    template <bool Dummy = true,
-              lib::enable_if_t<
-                  lib::all<Dummy,
-                           (lib::dependent_type<std::is_move_constructible<Ts>,
-                                                Dummy>::value &&
-                            lib::dependent_type<lib::is_swappable<Ts>,
-                                                Dummy>::value)...>::value,
-                  int> = 0>
-    inline void swap(variant &that) noexcept(
-        lib::all<(std::is_nothrow_move_constructible<Ts>::value &&
-                  lib::is_nothrow_swappable<Ts>::value)...>::value) {
-      impl_.swap(that.impl_);
-    }
-
-    private:
-    detail::impl<Ts...> impl_;
-
-    friend struct detail::access::variant;
-    friend struct detail::visitation::variant;
-  };
-
-  template <std::size_t I, typename... Ts>
-  inline constexpr bool holds_alternative(const variant<Ts...> &v) noexcept {
-    return v.index() == I;
-  }
-
-  template <typename T, typename... Ts>
-  inline constexpr bool holds_alternative(const variant<Ts...> &v) noexcept {
-    return holds_alternative<detail::find_index_checked<T, Ts...>::value>(v);
-  }
-
-  namespace detail {
-    template <std::size_t I, typename V>
-    struct generic_get_impl {
-      constexpr generic_get_impl(int) noexcept {}
-
-      constexpr AUTO_REFREF operator()(V &&v) const
-        AUTO_REFREF_RETURN(
-            access::variant::get_alt<I>(lib::forward<V>(v)).value)
-    };
-
-    template <std::size_t I, typename V>
-    inline constexpr AUTO_REFREF generic_get(V &&v)
-      AUTO_REFREF_RETURN(generic_get_impl<I, V>(
-          holds_alternative<I>(v) ? 0 : (throw_bad_variant_access(), 0))(
-          lib::forward<V>(v)))
-  }  // namespace detail
-
-  template <std::size_t I, typename... Ts>
-  inline constexpr variant_alternative_t<I, variant<Ts...>> &get(
-      variant<Ts...> &v) {
-    return detail::generic_get<I>(v);
-  }
-
-  template <std::size_t I, typename... Ts>
-  inline constexpr variant_alternative_t<I, variant<Ts...>> &&get(
-      variant<Ts...> &&v) {
-    return detail::generic_get<I>(lib::move(v));
-  }
-
-  template <std::size_t I, typename... Ts>
-  inline constexpr const variant_alternative_t<I, variant<Ts...>> &get(
-      const variant<Ts...> &v) {
-    return detail::generic_get<I>(v);
-  }
-
-  template <std::size_t I, typename... Ts>
-  inline constexpr const variant_alternative_t<I, variant<Ts...>> &&get(
-      const variant<Ts...> &&v) {
-    return detail::generic_get<I>(lib::move(v));
-  }
-
-  template <typename T, typename... Ts>
-  inline constexpr T &get(variant<Ts...> &v) {
-    return get<detail::find_index_checked<T, Ts...>::value>(v);
-  }
-
-  template <typename T, typename... Ts>
-  inline constexpr T &&get(variant<Ts...> &&v) {
-    return get<detail::find_index_checked<T, Ts...>::value>(lib::move(v));
-  }
-
-  template <typename T, typename... Ts>
-  inline constexpr const T &get(const variant<Ts...> &v) {
-    return get<detail::find_index_checked<T, Ts...>::value>(v);
-  }
-
-  template <typename T, typename... Ts>
-  inline constexpr const T &&get(const variant<Ts...> &&v) {
-    return get<detail::find_index_checked<T, Ts...>::value>(lib::move(v));
-  }
-
-  namespace detail {
-
-    template <std::size_t I, typename V>
-    inline constexpr /* auto * */ AUTO generic_get_if(V *v) noexcept
-      AUTO_RETURN(v && holds_alternative<I>(*v)
-                      ? lib::addressof(access::variant::get_alt<I>(*v).value)
-                      : nullptr)
-
-  }  // namespace detail
-
-  template <std::size_t I, typename... Ts>
-  inline constexpr lib::add_pointer_t<variant_alternative_t<I, variant<Ts...>>>
-  get_if(variant<Ts...> *v) noexcept {
-    return detail::generic_get_if<I>(v);
-  }
-
-  template <std::size_t I, typename... Ts>
-  inline constexpr lib::add_pointer_t<
-      const variant_alternative_t<I, variant<Ts...>>>
-  get_if(const variant<Ts...> *v) noexcept {
-    return detail::generic_get_if<I>(v);
-  }
-
-  template <typename T, typename... Ts>
-  inline constexpr lib::add_pointer_t<T>
-  get_if(variant<Ts...> *v) noexcept {
-    return get_if<detail::find_index_checked<T, Ts...>::value>(v);
-  }
-
-  template <typename T, typename... Ts>
-  inline constexpr lib::add_pointer_t<const T>
-  get_if(const variant<Ts...> *v) noexcept {
-    return get_if<detail::find_index_checked<T, Ts...>::value>(v);
-  }
-
-  namespace detail {
-    template <typename RelOp>
-    struct convert_to_bool {
-      template <typename Lhs, typename Rhs>
-      inline constexpr bool operator()(Lhs &&lhs, Rhs &&rhs) const {
-        static_assert(std::is_convertible<lib::invoke_result_t<RelOp, Lhs, Rhs>,
-                                          bool>::value,
-                      "relational operators must return a type"
-                      " implicitly convertible to bool");
-        return lib::invoke(
-            RelOp{}, lib::forward<Lhs>(lhs), lib::forward<Rhs>(rhs));
-      }
-    };
-  }  // namespace detail
-
-  template <typename... Ts>
-  inline constexpr bool operator==(const variant<Ts...> &lhs,
-                                   const variant<Ts...> &rhs) {
-    using detail::visitation::variant;
-    using equal_to = detail::convert_to_bool<lib::equal_to>;
-#ifdef MPARK_CPP14_CONSTEXPR
-    if (lhs.index() != rhs.index()) return false;
-    if (lhs.valueless_by_exception()) return true;
-    return variant::visit_value_at(lhs.index(), equal_to{}, lhs, rhs);
-#else
-    return lhs.index() == rhs.index() &&
-           (lhs.valueless_by_exception() ||
-            variant::visit_value_at(lhs.index(), equal_to{}, lhs, rhs));
-#endif
-  }
-
-  template <typename... Ts>
-  inline constexpr bool operator!=(const variant<Ts...> &lhs,
-                                   const variant<Ts...> &rhs) {
-    using detail::visitation::variant;
-    using not_equal_to = detail::convert_to_bool<lib::not_equal_to>;
-#ifdef MPARK_CPP14_CONSTEXPR
-    if (lhs.index() != rhs.index()) return true;
-    if (lhs.valueless_by_exception()) return false;
-    return variant::visit_value_at(lhs.index(), not_equal_to{}, lhs, rhs);
-#else
-    return lhs.index() != rhs.index() ||
-           (!lhs.valueless_by_exception() &&
-            variant::visit_value_at(lhs.index(), not_equal_to{}, lhs, rhs));
-#endif
-  }
-
-  template <typename... Ts>
-  inline constexpr bool operator<(const variant<Ts...> &lhs,
-                                  const variant<Ts...> &rhs) {
-    using detail::visitation::variant;
-    using less = detail::convert_to_bool<lib::less>;
-#ifdef MPARK_CPP14_CONSTEXPR
-    if (rhs.valueless_by_exception()) return false;
-    if (lhs.valueless_by_exception()) return true;
-    if (lhs.index() < rhs.index()) return true;
-    if (lhs.index() > rhs.index()) return false;
-    return variant::visit_value_at(lhs.index(), less{}, lhs, rhs);
-#else
-    return !rhs.valueless_by_exception() &&
-           (lhs.valueless_by_exception() || lhs.index() < rhs.index() ||
-            (lhs.index() == rhs.index() &&
-             variant::visit_value_at(lhs.index(), less{}, lhs, rhs)));
-#endif
-  }
-
-  template <typename... Ts>
-  inline constexpr bool operator>(const variant<Ts...> &lhs,
-                                  const variant<Ts...> &rhs) {
-    using detail::visitation::variant;
-    using greater = detail::convert_to_bool<lib::greater>;
-#ifdef MPARK_CPP14_CONSTEXPR
-    if (lhs.valueless_by_exception()) return false;
-    if (rhs.valueless_by_exception()) return true;
-    if (lhs.index() > rhs.index()) return true;
-    if (lhs.index() < rhs.index()) return false;
-    return variant::visit_value_at(lhs.index(), greater{}, lhs, rhs);
-#else
-    return !lhs.valueless_by_exception() &&
-           (rhs.valueless_by_exception() || lhs.index() > rhs.index() ||
-            (lhs.index() == rhs.index() &&
-             variant::visit_value_at(lhs.index(), greater{}, lhs, rhs)));
-#endif
-  }
-
-  template <typename... Ts>
-  inline constexpr bool operator<=(const variant<Ts...> &lhs,
-                                   const variant<Ts...> &rhs) {
-    using detail::visitation::variant;
-    using less_equal = detail::convert_to_bool<lib::less_equal>;
-#ifdef MPARK_CPP14_CONSTEXPR
-    if (lhs.valueless_by_exception()) return true;
-    if (rhs.valueless_by_exception()) return false;
-    if (lhs.index() < rhs.index()) return true;
-    if (lhs.index() > rhs.index()) return false;
-    return variant::visit_value_at(lhs.index(), less_equal{}, lhs, rhs);
-#else
-    return lhs.valueless_by_exception() ||
-           (!rhs.valueless_by_exception() &&
-            (lhs.index() < rhs.index() ||
-             (lhs.index() == rhs.index() &&
-              variant::visit_value_at(lhs.index(), less_equal{}, lhs, rhs))));
-#endif
-  }
-
-  template <typename... Ts>
-  inline constexpr bool operator>=(const variant<Ts...> &lhs,
-                                   const variant<Ts...> &rhs) {
-    using detail::visitation::variant;
-    using greater_equal = detail::convert_to_bool<lib::greater_equal>;
-#ifdef MPARK_CPP14_CONSTEXPR
-    if (rhs.valueless_by_exception()) return true;
-    if (lhs.valueless_by_exception()) return false;
-    if (lhs.index() > rhs.index()) return true;
-    if (lhs.index() < rhs.index()) return false;
-    return variant::visit_value_at(lhs.index(), greater_equal{}, lhs, rhs);
-#else
-    return rhs.valueless_by_exception() ||
-           (!lhs.valueless_by_exception() &&
-            (lhs.index() > rhs.index() ||
-             (lhs.index() == rhs.index() &&
-              variant::visit_value_at(
-                  lhs.index(), greater_equal{}, lhs, rhs))));
-#endif
-  }
-
-  struct monostate {};
-
-  inline constexpr bool operator<(monostate, monostate) noexcept {
-    return false;
-  }
-
-  inline constexpr bool operator>(monostate, monostate) noexcept {
-    return false;
-  }
-
-  inline constexpr bool operator<=(monostate, monostate) noexcept {
-    return true;
-  }
-
-  inline constexpr bool operator>=(monostate, monostate) noexcept {
-    return true;
-  }
-
-  inline constexpr bool operator==(monostate, monostate) noexcept {
-    return true;
-  }
-
-  inline constexpr bool operator!=(monostate, monostate) noexcept {
-    return false;
-  }
-
-#ifdef MPARK_CPP14_CONSTEXPR
-  namespace detail {
-
-    inline constexpr bool all(std::initializer_list<bool> bs) {
-      for (bool b : bs) {
-        if (!b) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-  }  // namespace detail
-
-  template <typename Visitor, typename... Vs>
-  inline constexpr decltype(auto) visit(Visitor &&visitor, Vs &&... vs) {
-    return (detail::all({!vs.valueless_by_exception()...})
-                ? (void)0
-                : throw_bad_variant_access()),
-           detail::visitation::variant::visit_value(
-               lib::forward<Visitor>(visitor), lib::forward<Vs>(vs)...);
-  }
-#else
-  namespace detail {
-
-    template <std::size_t N>
-    inline constexpr bool all_impl(const lib::array<bool, N> &bs,
-                                   std::size_t idx) {
-      return idx >= N || (bs[idx] && all_impl(bs, idx + 1));
-    }
-
-    template <std::size_t N>
-    inline constexpr bool all(const lib::array<bool, N> &bs) {
-      return all_impl(bs, 0);
-    }
-
-  }  // namespace detail
-
-  template <typename Visitor, typename... Vs>
-  inline constexpr DECLTYPE_AUTO visit(Visitor &&visitor, Vs &&... vs)
-    DECLTYPE_AUTO_RETURN(
-        (detail::all(
-             lib::array<bool, sizeof...(Vs)>{{!vs.valueless_by_exception()...}})
-             ? (void)0
-             : throw_bad_variant_access()),
-        detail::visitation::variant::visit_value(lib::forward<Visitor>(visitor),
-                                                 lib::forward<Vs>(vs)...))
-#endif
-
-  template <typename... Ts>
-  inline auto swap(variant<Ts...> &lhs,
-                   variant<Ts...> &rhs) noexcept(noexcept(lhs.swap(rhs)))
-      -> decltype(lhs.swap(rhs)) {
-    lhs.swap(rhs);
-  }
-
-  namespace detail {
-
-    template <typename T, typename...>
-    using enabled_type = T;
-
-    namespace hash {
-
-      template <typename H, typename K>
-      constexpr bool meets_requirements() noexcept {
-        return std::is_copy_constructible<H>::value &&
-               std::is_move_constructible<H>::value &&
-               lib::is_invocable_r<std::size_t, H, const K &>::value;
-      }
-
-      template <typename K>
-      constexpr bool is_enabled() noexcept {
-        using H = std::hash<K>;
-        return meets_requirements<H, K>() &&
-               std::is_default_constructible<H>::value &&
-               std::is_copy_assignable<H>::value &&
-               std::is_move_assignable<H>::value;
-      }
-
-    }  // namespace hash
-
-  }  // namespace detail
-
-#undef AUTO
-#undef AUTO_RETURN
-
-#undef AUTO_REFREF
-#undef AUTO_REFREF_RETURN
-
-#undef DECLTYPE_AUTO
-#undef DECLTYPE_AUTO_RETURN
-
-}  // namespace mpark
-
-namespace std {
-
-  template <typename... Ts>
-  struct hash<mpark::detail::enabled_type<
-      mpark::variant<Ts...>,
-      mpark::lib::enable_if_t<mpark::lib::all<mpark::detail::hash::is_enabled<
-          mpark::lib::remove_const_t<Ts>>()...>::value>>> {
-    using argument_type = mpark::variant<Ts...>;
-    using result_type = std::size_t;
-
-    inline result_type operator()(const argument_type &v) const {
-      using mpark::detail::visitation::variant;
-      std::size_t result =
-          v.valueless_by_exception()
-              ? 299792458  // Random value chosen by the universe upon creation
-              : variant::visit_alt(
-#ifdef MPARK_GENERIC_LAMBDAS
-                    [](const auto &alt) {
-                      using alt_type = mpark::lib::decay_t<decltype(alt)>;
-                      using value_type = mpark::lib::remove_const_t<
-                          typename alt_type::value_type>;
-                      return hash<value_type>{}(alt.value);
-                    }
-#else
-                    hasher{}
-#endif
-                    ,
-                    v);
-      return hash_combine(result, hash<std::size_t>{}(v.index()));
-    }
-
-    private:
-#ifndef MPARK_GENERIC_LAMBDAS
-    struct hasher {
-      template <typename Alt>
-      inline std::size_t operator()(const Alt &alt) const {
-        using alt_type = mpark::lib::decay_t<Alt>;
-        using value_type =
-            mpark::lib::remove_const_t<typename alt_type::value_type>;
-        return hash<value_type>{}(alt.value);
-      }
-    };
-#endif
-
-    static std::size_t hash_combine(std::size_t lhs, std::size_t rhs) {
-      return lhs ^= rhs + 0x9e3779b9 + (lhs << 6) + (lhs >> 2);
-    }
-  };
-
-  template <>
-  struct hash<mpark::monostate> {
-    using argument_type = mpark::monostate;
-    using result_type = std::size_t;
-
-    inline result_type operator()(const argument_type &) const noexcept {
-      return 66740831;  // return a fundamentally attractive random value.
-    }
-  };
-
-}  // namespace std
-
-#endif  // MPARK_VARIANT_HPP
diff --git a/headers/enduro2d/base/_base.hpp b/headers/enduro2d/base/_base.hpp
index 52d3f1c4..68112b76 100644
--- a/headers/enduro2d/base/_base.hpp
+++ b/headers/enduro2d/base/_base.hpp
@@ -25,6 +25,8 @@
 #include <bitset>
 #include <string>
 #include <vector>
+#include <variant>
+#include <optional>
 #include <unordered_set>
 #include <unordered_map>
 
@@ -35,7 +37,6 @@
 #include <limits>
 #include <numeric>
 #include <utility>
-#include <optional>
 #include <iterator>
 #include <exception>
 #include <stdexcept>
diff --git a/headers/enduro2d/base/macros.hpp b/headers/enduro2d/base/macros.hpp
index eea2aad6..40c0fff2 100644
--- a/headers/enduro2d/base/macros.hpp
+++ b/headers/enduro2d/base/macros.hpp
@@ -6,6 +6,7 @@
 
 #pragma once
 
+#include "_base.hpp"
 #include "configs.hpp"
 
 //
diff --git a/headers/enduro2d/base/types.hpp b/headers/enduro2d/base/types.hpp
index 9c1e56f9..558c741a 100644
--- a/headers/enduro2d/base/types.hpp
+++ b/headers/enduro2d/base/types.hpp
@@ -13,8 +13,6 @@
 #include <flat.hpp/flat_multiset.hpp>
 #include <flat.hpp/flat_multimap.hpp>
 
-#include <3rdparty/variant/variant.hpp>
-
 namespace e2d
 {
     using f32 = float;
@@ -100,8 +98,3 @@ namespace e2d
              , typename Container = vector<std::pair<Key, Value>> >
     using flat_multimap = flat_hpp::flat_multimap<Key, Value, Compare, Container>;
 }
-
-namespace e2d::stdex
-{
-    using namespace mpark;
-}
diff --git a/headers/enduro2d/core/render.hpp b/headers/enduro2d/core/render.hpp
index ec116c5b..14592a0c 100644
--- a/headers/enduro2d/core/render.hpp
+++ b/headers/enduro2d/core/render.hpp
@@ -612,7 +612,7 @@ namespace e2d
             sampler_mag_filter mag_filter_ = sampler_mag_filter::linear;
         };
 
-        using property_value = stdex::variant<
+        using property_value = std::variant<
             i32, f32,
             v2i, v3i, v4i,
             v2f, v3f, v4f,
@@ -857,7 +857,7 @@ namespace e2d
             bool scissoring_ = false;
         };
 
-        using command_value = stdex::variant<
+        using command_value = std::variant<
             zero_command,
             draw_command,
             clear_command,
diff --git a/headers/enduro2d/core/render.inl b/headers/enduro2d/core/render.inl
index 4b89d604..1c72e5cb 100644
--- a/headers/enduro2d/core/render.inl
+++ b/headers/enduro2d/core/render.inl
@@ -150,7 +150,7 @@ namespace e2d
     const T* render::property_block::property(str_hash name) const noexcept {
         const property_value* prop = properties_.find(name);
         return prop
-            ? stdex::get_if<T>(prop)
+            ? std::get_if<T>(prop)
             : nullptr;
     }
 
diff --git a/headers/enduro2d/high/components/spine_player_cmd.hpp b/headers/enduro2d/high/components/spine_player_cmd.hpp
index 7328aaa9..a8192915 100644
--- a/headers/enduro2d/high/components/spine_player_cmd.hpp
+++ b/headers/enduro2d/high/components/spine_player_cmd.hpp
@@ -168,7 +168,7 @@ namespace e2d
             str complete_message_;
         };
 
-        using command = stdex::variant<
+        using command = std::variant<
             clear_track_cmd,
             set_anim_cmd,
             add_anim_cmd,
diff --git a/headers/enduro2d/high/components/spine_player_evt.hpp b/headers/enduro2d/high/components/spine_player_evt.hpp
index b643531d..6cc82d62 100644
--- a/headers/enduro2d/high/components/spine_player_evt.hpp
+++ b/headers/enduro2d/high/components/spine_player_evt.hpp
@@ -65,7 +65,7 @@ namespace e2d
             str message_;
         };
 
-        using event = stdex::variant<
+        using event = std::variant<
             custom_evt,
             end_evt,
             complete_evt>;
diff --git a/modules/variant b/modules/variant
deleted file mode 160000
index 0467c3ca..00000000
--- a/modules/variant
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 0467c3caa408c7fccb09deafad29347bfd3d765a
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_07/sample_07.cpp
index 9818583a..1e60e8c8 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_07/sample_07.cpp
@@ -56,7 +56,7 @@ namespace
             owner.for_joined_components<spine_player_evt, spine_player>([
             ](ecs::entity e, const spine_player_evt& pe, spine_player& p) {
                 for ( const auto& evt : pe.events() ) {
-                    if ( auto complete_evt = stdex::get_if<spine_player_evt::complete_evt>(&evt);
+                    if ( auto complete_evt = std::get_if<spine_player_evt::complete_evt>(&evt);
                         complete_evt && complete_evt->message() == "to_walk" )
                     {
                         e.ensure_component<spine_player_cmd>().add_command(
diff --git a/scripts/update_modules.sh b/scripts/update_modules.sh
index a59b3841..0158ef9d 100755
--- a/scripts/update_modules.sh
+++ b/scripts/update_modules.sh
@@ -58,6 +58,3 @@ cp -fv $MODULES_DIR/stb/stb_truetype.h $SOURCES_RDPARTY_DIR/stb/stb_truetype.h
 
 mkdir -p $SOURCES_RDPARTY_DIR/utfcpp
 cp -rfv $MODULES_DIR/utfcpp/source/. $SOURCES_RDPARTY_DIR/utfcpp/
-
-mkdir -p $HEADERS_RDPARTY_DIR/variant
-cp -rfv $MODULES_DIR/variant/include/mpark/. $HEADERS_RDPARTY_DIR/variant/
diff --git a/sources/enduro2d/core/render.cpp b/sources/enduro2d/core/render.cpp
index da57e880..0d30b505 100644
--- a/sources/enduro2d/core/render.cpp
+++ b/sources/enduro2d/core/render.cpp
@@ -1154,7 +1154,7 @@ namespace e2d
     render& render::execute(const command_value& command) {
         E2D_ASSERT(is_in_main_thread());
         E2D_ASSERT(!command.valueless_by_exception());
-        stdex::visit(command_value_visitor(*this), command);
+        std::visit(command_value_visitor(*this), command);
         return *this;
     }
 }
diff --git a/sources/enduro2d/core/render_impl/render_opengl.cpp b/sources/enduro2d/core/render_impl/render_opengl.cpp
index b0a44868..2c82087f 100644
--- a/sources/enduro2d/core/render_impl/render_opengl.cpp
+++ b/sources/enduro2d/core/render_impl/render_opengl.cpp
@@ -165,7 +165,7 @@ namespace
         pb.foreach_by_properties([&debug, &ps](str_hash name, const render::property_value& value) noexcept {
             ps->state().with_uniform_location(name, [&debug, &value](const uniform_info& ui) noexcept {
                 E2D_ASSERT(!value.valueless_by_exception());
-                stdex::visit(property_block_value_visitor(debug, ui), value);
+                std::visit(property_block_value_visitor(debug, ui), value);
             });
         });
         GLint unit = 0;
diff --git a/sources/enduro2d/high/systems/spine_post_system.cpp b/sources/enduro2d/high/systems/spine_post_system.cpp
index 28fea236..d6f754ab 100644
--- a/sources/enduro2d/high/systems/spine_post_system.cpp
+++ b/sources/enduro2d/high/systems/spine_post_system.cpp
@@ -200,7 +200,7 @@ namespace e2d
 
                 command_visitor v(e, *skeleton->data, *animation_state);
                 for ( const auto& cmd : pc.commands() ) {
-                    stdex::visit(v, cmd);
+                    std::visit(v, cmd);
                 }
             });
         }
diff --git a/untests/sources/untests_core/render.cpp b/untests/sources/untests_core/render.cpp
index 21fa9be1..7a43875f 100644
--- a/untests/sources/untests_core/render.cpp
+++ b/untests/sources/untests_core/render.cpp
@@ -54,16 +54,16 @@ TEST_CASE("render"){
             REQUIRE_FALSE(pb1.property<i32>("f"));
             REQUIRE(pb1.property("i"));
             REQUIRE(pb1.property("f"));
-            REQUIRE(stdex::get<i32>(*pb1.property("i")) == 42);
-            REQUIRE(stdex::get<f32>(*pb1.property("f")) == 1.f);
+            REQUIRE(std::get<i32>(*pb1.property("i")) == 42);
+            REQUIRE(std::get<f32>(*pb1.property("f")) == 1.f);
             {
                 f32 acc = 0.f;
                 pb1.foreach_by_properties([&acc](str_hash n, const render::property_value& v){
                     if ( n == make_hash("f") ) {
-                        acc += stdex::get<f32>(v);
+                        acc += std::get<f32>(v);
                     }
                     if ( n == make_hash("i") ) {
-                        acc += stdex::get<i32>(v);
+                        acc += std::get<i32>(v);
                     }
                 });
                 REQUIRE(math::approximately(acc, 43.f));
diff --git a/untests/sources/untests_high/library.cpp b/untests/sources/untests_high/library.cpp
index 8fcff166..abf1c066 100644
--- a/untests/sources/untests_high/library.cpp
+++ b/untests/sources/untests_high/library.cpp
@@ -270,7 +270,7 @@ TEST_CASE("library"){
                 const auto* property = material_res->content().properties().property("i");
                 REQUIRE(property);
                 REQUIRE(property->index() == 0);
-                REQUIRE(stdex::get<i32>(*property) == 42);
+                REQUIRE(std::get<i32>(*property) == 42);
             }
             REQUIRE(material_res->content().pass_count() == 1);
             const auto& pass = material_res->content().pass(0);
@@ -278,31 +278,31 @@ TEST_CASE("library"){
                 const auto* property = pass.properties().property("f");
                 REQUIRE(property);
                 REQUIRE(property->index() == 1);
-                REQUIRE(math::approximately(stdex::get<f32>(*property), 4.2f));
+                REQUIRE(math::approximately(std::get<f32>(*property), 4.2f));
             }
             {
                 const auto* property = pass.properties().property("v1");
                 REQUIRE(property);
                 REQUIRE(property->index() == 2);
-                REQUIRE(stdex::get<v2i>(*property) == v2i(1,2));
+                REQUIRE(std::get<v2i>(*property) == v2i(1,2));
             }
             {
                 const auto* property = pass.properties().property("v2");
                 REQUIRE(property);
                 REQUIRE(property->index() == 6);
-                REQUIRE(stdex::get<v3f>(*property) == v3f(3.f));
+                REQUIRE(std::get<v3f>(*property) == v3f(3.f));
             }
             {
                 const auto* property = pass.properties().property("v3");
                 REQUIRE(property);
                 REQUIRE(property->index() == 4);
-                REQUIRE(stdex::get<v4i>(*property) == v4i(1,2,3,4));
+                REQUIRE(std::get<v4i>(*property) == v4i(1,2,3,4));
             }
             {
                 const auto* property = pass.properties().property("m1");
                 REQUIRE(property);
                 REQUIRE(property->index() == 8);
-                REQUIRE(stdex::get<m2f>(*property) == m2f(1,2,3,4));
+                REQUIRE(std::get<m2f>(*property) == m2f(1,2,3,4));
 
                 const auto* property2 = pass.properties().property("m4");
                 REQUIRE(property2);
@@ -312,7 +312,7 @@ TEST_CASE("library"){
                 const auto* property = pass.properties().property("m2");
                 REQUIRE(property);
                 REQUIRE(property->index() == 9);
-                REQUIRE(stdex::get<m3f>(*property) == m3f(1,2,3,4,5,6,7,8,9));
+                REQUIRE(std::get<m3f>(*property) == m3f(1,2,3,4,5,6,7,8,9));
 
                 const auto* property2 = pass.properties().property("m5");
                 REQUIRE(property2);
@@ -322,7 +322,7 @@ TEST_CASE("library"){
                 const auto* property = pass.properties().property("m3");
                 REQUIRE(property);
                 REQUIRE(property->index() == 10);
-                REQUIRE(stdex::get<m4f>(*property) == m4f(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16));
+                REQUIRE(std::get<m4f>(*property) == m4f(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16));
 
                 const auto* property2 = pass.properties().property("m6");
                 REQUIRE(property2);

From 137ea5c7f65a9a72fdbe16fd6c3cfa8bdab222f8 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Tue, 3 Sep 2019 04:05:51 +0700
Subject: [PATCH 101/108] use C++17 std::invoke instead custom impl

---
 sources/enduro2d/core/render_impl/render_opengl.cpp    |  4 ++--
 .../enduro2d/core/render_impl/render_opengl_base.hpp   | 10 +++++-----
 .../enduro2d/core/render_impl/render_opengl_impl.hpp   |  8 ++++----
 sources/enduro2d/core/vfs.cpp                          |  2 +-
 sources/enduro2d/core/window_impl/window_glfw.cpp      |  2 +-
 sources/enduro2d/core/window_impl/window_none.cpp      |  2 +-
 6 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sources/enduro2d/core/render_impl/render_opengl.cpp b/sources/enduro2d/core/render_impl/render_opengl.cpp
index 2c82087f..aeab0126 100644
--- a/sources/enduro2d/core/render_impl/render_opengl.cpp
+++ b/sources/enduro2d/core/render_impl/render_opengl.cpp
@@ -301,7 +301,7 @@ namespace
     {
         bind_property_block(debug, ps, pb);
         try {
-            stdex::invoke(
+            std::invoke(
                 std::forward<F>(f),
                 std::forward<Args>(args)...);
         } catch (...) {
@@ -326,7 +326,7 @@ namespace
             }
         }
         try {
-            stdex::invoke(std::forward<F>(f), std::forward<Args>(args)...);
+            std::invoke(std::forward<F>(f), std::forward<Args>(args)...);
         } catch (...) {
             for ( std::size_t i = 0, e = geo.vertices_count(); i < e; ++i ) {
                 const vertex_buffer_ptr& vb = geo.vertices(i);
diff --git a/sources/enduro2d/core/render_impl/render_opengl_base.hpp b/sources/enduro2d/core/render_impl/render_opengl_base.hpp
index aaaf1b83..4055215c 100644
--- a/sources/enduro2d/core/render_impl/render_opengl_base.hpp
+++ b/sources/enduro2d/core/render_impl/render_opengl_base.hpp
@@ -391,7 +391,7 @@ namespace e2d::opengl
         GL_CHECK_CODE(debug, glUseProgram(
             program));
         try {
-            stdex::invoke(std::forward<F>(f), std::forward<Args>(args)...);
+            std::invoke(std::forward<F>(f), std::forward<Args>(args)...);
         } catch (...) {
             GL_CHECK_CODE(debug, glUseProgram(
                 math::numeric_cast<GLuint>(prev_program)));
@@ -418,7 +418,7 @@ namespace e2d::opengl
         GL_CHECK_CODE(debug, glBindBuffer(
             target, buffer));
         try {
-            stdex::invoke(std::forward<F>(f), std::forward<Args>(args)...);
+            std::invoke(std::forward<F>(f), std::forward<Args>(args)...);
         } catch (...) {
             GL_CHECK_CODE(debug, glBindBuffer(
                 target, math::numeric_cast<GLuint>(prev_buffer)));
@@ -445,7 +445,7 @@ namespace e2d::opengl
         GL_CHECK_CODE(debug, glBindTexture(
             target, texture));
         try {
-            stdex::invoke(std::forward<F>(f), std::forward<Args>(args)...);
+            std::invoke(std::forward<F>(f), std::forward<Args>(args)...);
         } catch (...) {
             GL_CHECK_CODE(debug, glBindTexture(
                 target, math::numeric_cast<GLuint>(prev_texture)));
@@ -472,7 +472,7 @@ namespace e2d::opengl
         GL_CHECK_CODE(debug, glBindFramebuffer(
             target, framebuffer));
         try {
-            stdex::invoke(std::forward<F>(f), std::forward<Args>(args)...);
+            std::invoke(std::forward<F>(f), std::forward<Args>(args)...);
         } catch (...) {
             GL_CHECK_CODE(debug, glBindFramebuffer(
                 target, math::numeric_cast<GLuint>(prev_framebuffer)));
@@ -499,7 +499,7 @@ namespace e2d::opengl
         GL_CHECK_CODE(debug, glBindRenderbuffer(
             target, renderbuffer));
         try {
-            stdex::invoke(std::forward<F>(f), std::forward<Args>(args)...);
+            std::invoke(std::forward<F>(f), std::forward<Args>(args)...);
         } catch (...) {
             GL_CHECK_CODE(debug, glBindRenderbuffer(
                 target, math::numeric_cast<GLuint>(prev_renderbuffer)));
diff --git a/sources/enduro2d/core/render_impl/render_opengl_impl.hpp b/sources/enduro2d/core/render_impl/render_opengl_impl.hpp
index 8889f5cf..2baf3d5f 100644
--- a/sources/enduro2d/core/render_impl/render_opengl_impl.hpp
+++ b/sources/enduro2d/core/render_impl/render_opengl_impl.hpp
@@ -43,7 +43,7 @@ namespace e2d
     void shader::internal_state::with_uniform_location(str_hash name, F&& f) const {
         const auto iter = uniforms_.find(name);
         if ( iter != uniforms_.end() ) {
-            stdex::invoke(std::forward<F>(f), iter->second);
+            std::invoke(std::forward<F>(f), iter->second);
         }
     }
 
@@ -51,7 +51,7 @@ namespace e2d
     void shader::internal_state::with_attribute_location(str_hash name, F&& f) const {
         const auto iter = attributes_.find(name);
         if ( iter != attributes_.end() ) {
-            stdex::invoke(std::forward<F>(f), iter->second);
+            std::invoke(std::forward<F>(f), iter->second);
         }
     }
 
@@ -178,10 +178,10 @@ namespace e2d
     public:
         internal_state& reset_states() noexcept;
         internal_state& set_states(const state_block& sb) noexcept;
-        
+
         internal_state& reset_shader_program() noexcept;
         internal_state& set_shader_program(const shader_ptr& sp) noexcept;
-        
+
         internal_state& reset_render_target() noexcept;
         internal_state& set_render_target(const render_target_ptr& rt) noexcept;
     private:
diff --git a/sources/enduro2d/core/vfs.cpp b/sources/enduro2d/core/vfs.cpp
index 30ade320..6fdeaded 100644
--- a/sources/enduro2d/core/vfs.cpp
+++ b/sources/enduro2d/core/vfs.cpp
@@ -98,7 +98,7 @@ namespace e2d
             const auto resolved_url = resolve_url(url);
             const auto scheme_iter = schemes.find(resolved_url.scheme());
             return (scheme_iter != schemes.cend() && scheme_iter->second)
-                ? stdex::invoke(
+                ? std::invoke(
                     std::forward<F>(f),
                     scheme_iter->second,
                     resolved_url.path())
diff --git a/sources/enduro2d/core/window_impl/window_glfw.cpp b/sources/enduro2d/core/window_impl/window_glfw.cpp
index 96a4974d..bbd112a9 100644
--- a/sources/enduro2d/core/window_impl/window_glfw.cpp
+++ b/sources/enduro2d/core/window_impl/window_glfw.cpp
@@ -322,7 +322,7 @@ namespace e2d
             std::lock_guard<std::recursive_mutex> guard(rmutex);
             for ( const event_listener_uptr& listener : listeners ) {
                 if ( listener ) {
-                    stdex::invoke(f, *listener.get(), args...);
+                    std::invoke(f, *listener.get(), args...);
                 }
             }
         }
diff --git a/sources/enduro2d/core/window_impl/window_none.cpp b/sources/enduro2d/core/window_impl/window_none.cpp
index 9f044517..fee9948d 100644
--- a/sources/enduro2d/core/window_impl/window_none.cpp
+++ b/sources/enduro2d/core/window_impl/window_none.cpp
@@ -39,7 +39,7 @@ namespace e2d
             std::lock_guard<std::recursive_mutex> guard(rmutex);
             for ( const event_listener_uptr& listener : listeners ) {
                 if ( listener ) {
-                    stdex::invoke(f, listener.get(), args...);
+                    std::invoke(f, listener.get(), args...);
                 }
             }
         }

From 0e9619087285f4a6893a83a54fa67c7ffedeb5b8 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 5 Sep 2019 02:10:00 +0700
Subject: [PATCH 102/108] just variadic min and max

---
 headers/enduro2d/math/_math.hpp           | 48 ++++++++++++++++++++++-
 headers/enduro2d/math/vec3.hpp            |  4 +-
 headers/enduro2d/math/vec4.hpp            |  4 +-
 sources/enduro2d/utils/color.cpp          | 20 +++++-----
 sources/enduro2d/utils/color32.cpp        | 28 ++++++-------
 untests/sources/untests_math/_math.cpp    | 41 +++++++++++++++++++
 untests/sources/untests_utils/color.cpp   |  3 ++
 untests/sources/untests_utils/color32.cpp |  3 ++
 8 files changed, 122 insertions(+), 29 deletions(-)

diff --git a/headers/enduro2d/math/_math.hpp b/headers/enduro2d/math/_math.hpp
index ec790af7..49094f87 100644
--- a/headers/enduro2d/math/_math.hpp
+++ b/headers/enduro2d/math/_math.hpp
@@ -570,21 +570,59 @@ namespace e2d::math
     }
 
     //
-    // min/max/minmax
+    // min
     //
 
+    template < typename T >
+    std::enable_if_t<std::is_arithmetic_v<T>, T>
+    min(T v) noexcept {
+        return v;
+    }
+
     template < typename T >
     std::enable_if_t<std::is_arithmetic_v<T>, T>
     min(T l, T r) noexcept {
         return l < r ? l : r;
     }
 
+    template < typename T, typename... Ts >
+    std::enable_if_t<std::is_arithmetic_v<T>, T>
+    min(T a, T b, T c, Ts... ts) noexcept {
+        return min(a < b ? a : b, c, ts...);
+    }
+
+    //
+    // max
+    //
+
+    template < typename T >
+    std::enable_if_t<std::is_arithmetic_v<T>, T>
+    max(T v) noexcept {
+        return v;
+    }
+
     template < typename T >
     std::enable_if_t<std::is_arithmetic_v<T>, T>
     max(T l, T r) noexcept {
         return l < r ? r : l;
     }
 
+    template < typename T, typename... Ts >
+    std::enable_if_t<std::is_arithmetic_v<T>, T>
+    max(T a, T b, T c, Ts... ts) noexcept {
+        return max(a < b ? b : a, c, ts...);
+    }
+
+    //
+    // minmax
+    //
+
+    template < typename T >
+    std::enable_if_t<std::is_arithmetic_v<T>, std::pair<T,T>>
+    minmax(T v) noexcept {
+        return std::make_pair(v, v);
+    }
+
     template < typename T >
     std::enable_if_t<std::is_arithmetic_v<T>, std::pair<T,T>>
     minmax(T l, T r) noexcept {
@@ -593,6 +631,14 @@ namespace e2d::math
             : std::make_pair(r, l);
     }
 
+    template < typename T, typename... Ts >
+    std::enable_if_t<std::is_arithmetic_v<T>, std::pair<T,T>>
+    minmax(T a, T b, T c, Ts... ts) noexcept {
+        return std::make_pair(
+            min(a, b, c, ts...),
+            max(a, b, c, ts...));
+    }
+
     //
     // clamp/saturate
     //
diff --git a/headers/enduro2d/math/vec3.hpp b/headers/enduro2d/math/vec3.hpp
index bb751d3b..ebf14812 100644
--- a/headers/enduro2d/math/vec3.hpp
+++ b/headers/enduro2d/math/vec3.hpp
@@ -522,12 +522,12 @@ namespace e2d::math
 
     template < typename T >
     T minimum(const vec3<T>& v) noexcept {
-        return math::min(math::min(v.x, v.y), v.z);
+        return math::min(v.x, v.y, v.z);
     }
 
     template < typename T >
     T maximum(const vec3<T>& v) noexcept {
-        return math::max(math::max(v.x, v.y), v.z);
+        return math::max(v.x, v.y, v.z);
     }
 
     //
diff --git a/headers/enduro2d/math/vec4.hpp b/headers/enduro2d/math/vec4.hpp
index bcda82a1..83c8c812 100644
--- a/headers/enduro2d/math/vec4.hpp
+++ b/headers/enduro2d/math/vec4.hpp
@@ -553,12 +553,12 @@ namespace e2d::math
 
     template < typename T >
     T minimum(const vec4<T>& v) noexcept {
-        return math::min(math::min(math::min(v.x, v.y), v.z), v.w);
+        return math::min(v.x, v.y, v.z, v.w);
     }
 
     template < typename T >
     T maximum(const vec4<T>& v) noexcept {
-        return math::max(math::max(math::max(v.x, v.y), v.z), v.w);
+        return math::max(v.x, v.y, v.z, v.w);
     }
 
     //
diff --git a/sources/enduro2d/utils/color.cpp b/sources/enduro2d/utils/color.cpp
index b42d9bf6..aae50e81 100644
--- a/sources/enduro2d/utils/color.cpp
+++ b/sources/enduro2d/utils/color.cpp
@@ -271,11 +271,11 @@ namespace e2d::math
     //
 
     f32 minimum(const color& c) noexcept {
-        return math::min(math::min(math::min(c.r, c.g), c.b), c.a);
+        return math::min(c.r, c.g, c.b, c.a);
     }
 
     f32 maximum(const color& c) noexcept {
-        return math::max(math::max(math::max(c.r, c.g), c.b), c.a);
+        return math::max(c.r, c.g, c.b, c.a);
     }
 
     //
@@ -322,17 +322,17 @@ namespace e2d::colors
 {
     u32 pack_color(const color& c) noexcept {
         return
-            math::numeric_cast<u32>(math::round(math::saturate(c.a) * 255.f)) << 24 |
-            math::numeric_cast<u32>(math::round(math::saturate(c.r) * 255.f)) << 16 |
-            math::numeric_cast<u32>(math::round(math::saturate(c.g) * 255.f)) <<  8 |
-            math::numeric_cast<u32>(math::round(math::saturate(c.b) * 255.f)) <<  0;
+            static_cast<u32>(math::saturate(c.a) * 255.f + 0.5f) << 24 |
+            static_cast<u32>(math::saturate(c.r) * 255.f + 0.5f) << 16 |
+            static_cast<u32>(math::saturate(c.g) * 255.f + 0.5f) <<  8 |
+            static_cast<u32>(math::saturate(c.b) * 255.f + 0.5f) <<  0;
     }
 
     color unpack_color(u32 argb) noexcept {
         return color(
-            math::numeric_cast<u8>((argb >> 16) & 0xFF) / 255.f,
-            math::numeric_cast<u8>((argb >>  8) & 0xFF) / 255.f,
-            math::numeric_cast<u8>((argb >>  0) & 0xFF) / 255.f,
-            math::numeric_cast<u8>((argb >> 24) & 0xFF) / 255.f);
+            static_cast<u8>((argb >> 16) & 0xFF) / 255.f,
+            static_cast<u8>((argb >>  8) & 0xFF) / 255.f,
+            static_cast<u8>((argb >>  0) & 0xFF) / 255.f,
+            static_cast<u8>((argb >> 24) & 0xFF) / 255.f);
     }
 }
diff --git a/sources/enduro2d/utils/color32.cpp b/sources/enduro2d/utils/color32.cpp
index 9674c44e..a98e8bee 100644
--- a/sources/enduro2d/utils/color32.cpp
+++ b/sources/enduro2d/utils/color32.cpp
@@ -55,10 +55,10 @@ namespace e2d
     }
 
     color32::color32(const color& other) noexcept
-    : r(u8(other.r * 255.0f + 0.5f))
-    , g(u8(other.g * 255.0f + 0.5f))
-    , b(u8(other.b * 255.0f + 0.5f))
-    , a(u8(other.a * 255.0f + 0.5f)) {}
+    : r(static_cast<u8>(math::saturate(other.r) * 255.f + 0.5f))
+    , g(static_cast<u8>(math::saturate(other.g) * 255.f + 0.5f))
+    , b(static_cast<u8>(math::saturate(other.b) * 255.f + 0.5f))
+    , a(static_cast<u8>(math::saturate(other.a) * 255.f + 0.5f)) {}
 
     color32::color32(u8 nr, u8 ng, u8 nb, u8 na) noexcept
     : r(nr)
@@ -271,11 +271,11 @@ namespace e2d::math
     //
 
     u8 minimum(const color32& c) noexcept {
-        return math::min(math::min(math::min(c.r, c.g), c.b), c.a);
+        return math::min(c.r, c.g, c.b, c.a);
     }
 
     u8 maximum(const color32& c) noexcept {
-        return math::max(math::max(math::max(c.r, c.g), c.b), c.a);
+        return math::max(c.r, c.g, c.b, c.a);
     }
 
     //
@@ -322,17 +322,17 @@ namespace e2d::colors
 {
     u32 pack_color32(const color32& c) noexcept {
         return
-            math::numeric_cast<u32>(c.a) << 24 |
-            math::numeric_cast<u32>(c.r) << 16 |
-            math::numeric_cast<u32>(c.g) <<  8 |
-            math::numeric_cast<u32>(c.b) <<  0;
+            static_cast<u32>(c.a) << 24 |
+            static_cast<u32>(c.r) << 16 |
+            static_cast<u32>(c.g) <<  8 |
+            static_cast<u32>(c.b) <<  0;
     }
 
     color32 unpack_color32(u32 argb) noexcept {
         return color32(
-            math::numeric_cast<u8>((argb >> 16) & 0xFF),
-            math::numeric_cast<u8>((argb >>  8) & 0xFF),
-            math::numeric_cast<u8>((argb >>  0) & 0xFF),
-            math::numeric_cast<u8>((argb >> 24) & 0xFF));
+            static_cast<u8>((argb >> 16) & 0xFF),
+            static_cast<u8>((argb >>  8) & 0xFF),
+            static_cast<u8>((argb >>  0) & 0xFF),
+            static_cast<u8>((argb >> 24) & 0xFF));
     }
 }
diff --git a/untests/sources/untests_math/_math.cpp b/untests/sources/untests_math/_math.cpp
index 4ee9b599..6d40e2b5 100644
--- a/untests/sources/untests_math/_math.cpp
+++ b/untests/sources/untests_math/_math.cpp
@@ -462,17 +462,58 @@ TEST_CASE("math") {
         REQUIRE(math::approximately(math::round(-0.6f), -1.f));
     }
     {
+        REQUIRE(math::min(1) == 1);
+
         REQUIRE(math::min(1,1) == 1);
         REQUIRE(math::min(1,2) == 1);
         REQUIRE(math::min(2,1) == 1);
 
+        REQUIRE(math::min(1,1,1) == 1);
+        REQUIRE(math::min(2,1,1) == 1);
+        REQUIRE(math::min(1,2,1) == 1);
+        REQUIRE(math::min(1,1,2) == 1);
+        REQUIRE(math::min(2,3,4) == 2);
+        REQUIRE(math::min(2,4,3) == 2);
+
+        REQUIRE(math::min(2,3,4,5) == 2);
+        REQUIRE(math::min(2,4,3,5) == 2);
+        REQUIRE(math::min(5,3,4,2) == 2);
+        REQUIRE(math::min(5,4,3,2) == 2);
+    }
+    {
+
+        REQUIRE(math::max(1) == 1);
+
         REQUIRE(math::max(1,1) == 1);
         REQUIRE(math::max(1,2) == 2);
         REQUIRE(math::max(2,1) == 2);
 
+        REQUIRE(math::max(1,1,1) == 1);
+        REQUIRE(math::max(2,1,1) == 2);
+        REQUIRE(math::max(1,2,1) == 2);
+        REQUIRE(math::max(1,1,2) == 2);
+        REQUIRE(math::max(2,3,4) == 4);
+
+        REQUIRE(math::max(2,3,4,5) == 5);
+        REQUIRE(math::max(2,4,3,5) == 5);
+        REQUIRE(math::max(5,3,4,2) == 5);
+        REQUIRE(math::max(5,4,3,2) == 5);
+    }
+    {
+        REQUIRE(math::minmax(1) == std::make_pair(1,1));
+
         REQUIRE(math::minmax(1,2) == std::make_pair(1,2));
         REQUIRE(math::minmax(2,1) == std::make_pair(1,2));
 
+        REQUIRE(math::minmax(1,2,3) == std::make_pair(1,3));
+        REQUIRE(math::minmax(3,2,1) == std::make_pair(1,3));
+
+        REQUIRE(math::minmax(1,2,3,4) == std::make_pair(1,4));
+        REQUIRE(math::minmax(1,3,2,4) == std::make_pair(1,4));
+        REQUIRE(math::minmax(4,2,3,1) == std::make_pair(1,4));
+        REQUIRE(math::minmax(4,3,2,1) == std::make_pair(1,4));
+    }
+    {
         REQUIRE(math::clamp(2,1,3) == 2);
         REQUIRE(math::clamp(3,1,3) == 3);
         REQUIRE(math::clamp(4,1,3) == 3);
diff --git a/untests/sources/untests_utils/color.cpp b/untests/sources/untests_utils/color.cpp
index 0e087cfb..80879bd4 100644
--- a/untests/sources/untests_utils/color.cpp
+++ b/untests/sources/untests_utils/color.cpp
@@ -135,5 +135,8 @@ TEST_CASE("color") {
         REQUIRE(colors::pack_color(color(color32(0x12,0x34,0x56,0x78))) == 0x78123456);
         REQUIRE(colors::unpack_color(0x04010203) == color(color32(1,2,3,4)));
         REQUIRE(colors::unpack_color(0x78123456) == color(color32(0x12,0x34,0x56,0x78)));
+
+        REQUIRE(colors::pack_color(color(0.001f,0.001f,0.001f,0.001f)) == 0x00000000);
+        REQUIRE(colors::pack_color(color(0.999f,0.999f,0.999f,0.999f)) == 0xFFFFFFFF);
     }
 }
diff --git a/untests/sources/untests_utils/color32.cpp b/untests/sources/untests_utils/color32.cpp
index e0fd312d..06f1e69c 100644
--- a/untests/sources/untests_utils/color32.cpp
+++ b/untests/sources/untests_utils/color32.cpp
@@ -127,5 +127,8 @@ TEST_CASE("color32") {
         REQUIRE(colors::pack_color32(color32(0x12,0x34,0x56,0x78)) == 0x78123456);
         REQUIRE(colors::unpack_color32(0x04010203) == color32(1,2,3,4));
         REQUIRE(colors::unpack_color32(0x78123456) == color32(0x12,0x34,0x56,0x78));
+
+        REQUIRE(colors::pack_color32(color32(0x01,0x01,0x01,0x01)) == 0x01010101);
+        REQUIRE(colors::pack_color32(color32(0xFE,0xFE,0xFE,0xFE)) == 0xFEFEFEFE);
     }
 }

From 6a017c4c2f428ec1d9687090e46fb7ab7a729a56 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 5 Sep 2019 12:08:11 +0700
Subject: [PATCH 103/108] add custom blendings and custom materials to sprite
 and spine

---
 headers/enduro2d/core/render.hpp              |   2 +-
 .../enduro2d/high/components/spine_player.hpp |  13 +-
 .../high/components/sprite_renderer.hpp       |  55 ++
 samples/bin/library/scene_prefab.json         |   3 +
 samples/bin/library/ship_prefab.json          |   5 -
 samples/bin/library/spine_coin_prefab.json    |   4 +-
 .../bin/library/spine_material_additive.json  |  14 +
 ...rial.json => spine_material_multiply.json} |   2 +-
 .../bin/library/spine_material_normal.json    |  14 +
 .../bin/library/spine_material_screen.json    |  14 +
 samples/bin/library/spine_prefab.json         |  15 +
 samples/bin/library/spine_raptor_prefab.json  |   4 +-
 samples/bin/library/spine_shader.frag         |   4 +-
 samples/bin/library/spine_shader.vert         |  18 +
 .../bin/library/sprite_material_additive.json |  14 +
 .../bin/library/sprite_material_multiply.json |  14 +
 ...erial.json => sprite_material_normal.json} |   0
 .../bin/library/sprite_material_screen.json   |  14 +
 samples/bin/library/sprite_prefab.json        |   9 +-
 sources/enduro2d/core/render.cpp              |   6 +-
 .../enduro2d/high/assets/material_asset.cpp   |   2 +-
 .../enduro2d/high/components/spine_player.cpp |  83 +++
 .../high/components/spine_player_cmd.cpp      |   3 +
 .../high/components/spine_player_evt.cpp      |   3 +
 .../high/components/sprite_renderer.cpp       | 100 ++-
 .../enduro2d/high/systems/label_system.cpp    |   6 +-
 .../render_system_drawer.cpp                  | 568 +++++++++++-------
 27 files changed, 732 insertions(+), 257 deletions(-)
 create mode 100644 samples/bin/library/spine_material_additive.json
 rename samples/bin/library/{spine_material.json => spine_material_multiply.json} (86%)
 create mode 100644 samples/bin/library/spine_material_normal.json
 create mode 100644 samples/bin/library/spine_material_screen.json
 create mode 100644 samples/bin/library/spine_prefab.json
 create mode 100644 samples/bin/library/sprite_material_additive.json
 create mode 100644 samples/bin/library/sprite_material_multiply.json
 rename samples/bin/library/{sprite_material.json => sprite_material_normal.json} (100%)
 create mode 100644 samples/bin/library/sprite_material_screen.json

diff --git a/headers/enduro2d/core/render.hpp b/headers/enduro2d/core/render.hpp
index 14592a0c..2b5cd81d 100644
--- a/headers/enduro2d/core/render.hpp
+++ b/headers/enduro2d/core/render.hpp
@@ -589,7 +589,7 @@ namespace e2d
         public:
             sampler_state& texture(const texture_ptr& texture) noexcept;
 
-            sampler_state& wrap(sampler_wrap st) noexcept;
+            sampler_state& wrap(sampler_wrap s, sampler_wrap t) noexcept;
             sampler_state& s_wrap(sampler_wrap s) noexcept;
             sampler_state& t_wrap(sampler_wrap t) noexcept;
 
diff --git a/headers/enduro2d/high/components/spine_player.hpp b/headers/enduro2d/high/components/spine_player.hpp
index 7a36424e..f15e0b5e 100644
--- a/headers/enduro2d/high/components/spine_player.hpp
+++ b/headers/enduro2d/high/components/spine_player.hpp
@@ -9,6 +9,7 @@
 #include "../_high.hpp"
 
 #include "../factory.hpp"
+#include "../assets/material_asset.hpp"
 #include "../assets/spine_model_asset.hpp"
 
 struct spSkeleton;
@@ -33,7 +34,13 @@ namespace e2d
         spine_player() = default;
         spine_player(const spine_model_asset::ptr& model);
         
-        spine_player& model(const spine_model_asset::ptr& value);
+        spine_player& model(
+            const spine_model_asset::ptr& value);
+
+        spine_player& materials(
+            flat_map<str_hash, material_asset::ptr>&& value) noexcept;
+        spine_player& materials(
+            const flat_map<str_hash, material_asset::ptr>& value);
 
         spine_player& skin(const str& value) noexcept;
         spine_player& attachment(const str& slot, const str& name) noexcept;
@@ -45,11 +52,15 @@ namespace e2d
         const skeleton_ptr& skeleton() const noexcept;
         const animation_ptr& animation() const noexcept;
         const spine_model_asset::ptr& model() const noexcept;
+
+        material_asset::ptr find_material(str_hash name) const noexcept;
+        const flat_map<str_hash, material_asset::ptr>& materials() const noexcept;
     private:
         clipping_ptr clipping_;
         skeleton_ptr skeleton_;
         animation_ptr animation_;
         spine_model_asset::ptr model_;
+        flat_map<str_hash, material_asset::ptr> materials_;
     };
 
     template <>
diff --git a/headers/enduro2d/high/components/sprite_renderer.hpp b/headers/enduro2d/high/components/sprite_renderer.hpp
index 94edf64f..c3caaad9 100644
--- a/headers/enduro2d/high/components/sprite_renderer.hpp
+++ b/headers/enduro2d/high/components/sprite_renderer.hpp
@@ -11,10 +11,18 @@
 #include "../factory.hpp"
 #include "../assets/atlas_asset.hpp"
 #include "../assets/sprite_asset.hpp"
+#include "../assets/material_asset.hpp"
 
 namespace e2d
 {
     class sprite_renderer final {
+    public:
+        enum class blendings {
+            normal,
+            additive,
+            multiply,
+            screen
+        };
     public:
         sprite_renderer() = default;
         sprite_renderer(const sprite_asset::ptr& sprite);
@@ -22,15 +30,28 @@ namespace e2d
         sprite_renderer& tint(const color32& value) noexcept;
         const color32& tint() const noexcept;
 
+        sprite_renderer& blending(blendings value) noexcept;
+        blendings blending() const noexcept;
+
         sprite_renderer& filtering(bool value) noexcept;
         bool filtering() const noexcept;
 
         sprite_renderer& sprite(const sprite_asset::ptr& value) noexcept;
         const sprite_asset::ptr& sprite() const noexcept;
+
+        sprite_renderer& materials(
+            flat_map<str_hash, material_asset::ptr>&& value) noexcept;
+        sprite_renderer& materials(
+            const flat_map<str_hash, material_asset::ptr>& value);
+
+        material_asset::ptr find_material(str_hash name) const noexcept;
+        const flat_map<str_hash, material_asset::ptr>& materials() const noexcept;
     private:
         color32 tint_ = color32::white();
+        blendings blending_ = blendings::normal;
         bool filtering_ = true;
         sprite_asset::ptr sprite_;
+        flat_map<str_hash, material_asset::ptr> materials_;
     };
 
     template <>
@@ -67,6 +88,15 @@ namespace e2d
         return *this;
     }
 
+    inline sprite_renderer& sprite_renderer::blending(blendings value) noexcept {
+        blending_ = value;
+        return *this;
+    }
+
+    inline sprite_renderer::blendings sprite_renderer::blending() const noexcept {
+        return blending_;
+    }
+
     inline bool sprite_renderer::filtering() const noexcept {
         return filtering_;
     }
@@ -79,4 +109,29 @@ namespace e2d
     inline const sprite_asset::ptr& sprite_renderer::sprite() const noexcept {
         return sprite_;
     }
+
+    inline sprite_renderer& sprite_renderer::materials(
+        flat_map<str_hash, material_asset::ptr>&& value) noexcept
+    {
+        materials_ = std::move(value);
+        return *this;
+    }
+
+    inline sprite_renderer& sprite_renderer::materials(
+        const flat_map<str_hash, material_asset::ptr>& value)
+    {
+        materials_ = value;
+        return *this;
+    }
+
+    inline material_asset::ptr sprite_renderer::find_material(str_hash name) const noexcept {
+        const auto iter = materials_.find(name);
+        return iter != materials_.end()
+            ? iter->second
+            : nullptr;
+    }
+
+    inline const flat_map<str_hash, material_asset::ptr>& sprite_renderer::materials() const noexcept {
+        return materials_;
+    }
 }
diff --git a/samples/bin/library/scene_prefab.json b/samples/bin/library/scene_prefab.json
index 8f79ef67..b81a3d72 100644
--- a/samples/bin/library/scene_prefab.json
+++ b/samples/bin/library/scene_prefab.json
@@ -15,6 +15,9 @@
     }, {
         "prototype" : "ship_prefab.json",
         "components" : {
+            "sprite_renderer" : {
+                "blending" : "additive"
+            },
             "actor" : {
                 "translation" : [-50,-50,0]
             }
diff --git a/samples/bin/library/ship_prefab.json b/samples/bin/library/ship_prefab.json
index de585dc8..4553ec5e 100644
--- a/samples/bin/library/ship_prefab.json
+++ b/samples/bin/library/ship_prefab.json
@@ -1,11 +1,6 @@
 {
     "prototype" : "sprite_prefab.json",
     "components" : {
-        "renderer" : {
-            "materials" : [
-                "sprite_material.json"
-            ]
-        },
         "sprite_renderer" : {
             "sprite" : "ship_sprite.json"
         }
diff --git a/samples/bin/library/spine_coin_prefab.json b/samples/bin/library/spine_coin_prefab.json
index 047ab580..d091ed3a 100644
--- a/samples/bin/library/spine_coin_prefab.json
+++ b/samples/bin/library/spine_coin_prefab.json
@@ -1,8 +1,6 @@
 {
+    "prototype" : "spine_prefab.json",
     "components" : {
-        "renderer" : {
-            "materials" : ["spine_material.json"]
-        },
         "spine_player" : {
             "model" : "spine_coin.json"
         },
diff --git a/samples/bin/library/spine_material_additive.json b/samples/bin/library/spine_material_additive.json
new file mode 100644
index 00000000..6520a75c
--- /dev/null
+++ b/samples/bin/library/spine_material_additive.json
@@ -0,0 +1,14 @@
+{
+    "passes" : [{
+        "shader" : "spine_shader.json",
+        "state_block" : {
+            "blending_state" : {
+                "src_factor" : "one",
+                "dst_factor" : "one"
+            },
+            "capabilities_state" : {
+                "blending" : true
+            }
+        }
+    }]
+}
diff --git a/samples/bin/library/spine_material.json b/samples/bin/library/spine_material_multiply.json
similarity index 86%
rename from samples/bin/library/spine_material.json
rename to samples/bin/library/spine_material_multiply.json
index 7d83f326..634e3dc5 100644
--- a/samples/bin/library/spine_material.json
+++ b/samples/bin/library/spine_material_multiply.json
@@ -3,7 +3,7 @@
         "shader" : "spine_shader.json",
         "state_block" : {
             "blending_state" : {
-                "src_factor" : "src_alpha",
+                "src_factor" : "dst_color",
                 "dst_factor" : "one_minus_src_alpha"
             },
             "capabilities_state" : {
diff --git a/samples/bin/library/spine_material_normal.json b/samples/bin/library/spine_material_normal.json
new file mode 100644
index 00000000..75f5fa8f
--- /dev/null
+++ b/samples/bin/library/spine_material_normal.json
@@ -0,0 +1,14 @@
+{
+    "passes" : [{
+        "shader" : "spine_shader.json",
+        "state_block" : {
+            "blending_state" : {
+                "src_factor" : "one",
+                "dst_factor" : "one_minus_src_alpha"
+            },
+            "capabilities_state" : {
+                "blending" : true
+            }
+        }
+    }]
+}
diff --git a/samples/bin/library/spine_material_screen.json b/samples/bin/library/spine_material_screen.json
new file mode 100644
index 00000000..897633f2
--- /dev/null
+++ b/samples/bin/library/spine_material_screen.json
@@ -0,0 +1,14 @@
+{
+    "passes" : [{
+        "shader" : "spine_shader.json",
+        "state_block" : {
+            "blending_state" : {
+                "src_factor" : "one",
+                "dst_factor" : "one_minus_src_color"
+            },
+            "capabilities_state" : {
+                "blending" : true
+            }
+        }
+    }]
+}
diff --git a/samples/bin/library/spine_prefab.json b/samples/bin/library/spine_prefab.json
new file mode 100644
index 00000000..c90fe931
--- /dev/null
+++ b/samples/bin/library/spine_prefab.json
@@ -0,0 +1,15 @@
+{
+    "components" : {
+        "renderer" : {},
+        "spine_player" : {
+            "materials" : {
+                "additive" : "spine_material_additive.json",
+                "multiply" : "spine_material_multiply.json",
+                "normal" : "spine_material_normal.json",
+                "screen" : "spine_material_screen.json"
+            }
+        },
+        "spine_player_cmd" : {},
+        "spine_player_evt" : {}
+    }
+}
diff --git a/samples/bin/library/spine_raptor_prefab.json b/samples/bin/library/spine_raptor_prefab.json
index ce1a38a6..f8d1b0a9 100644
--- a/samples/bin/library/spine_raptor_prefab.json
+++ b/samples/bin/library/spine_raptor_prefab.json
@@ -1,8 +1,6 @@
 {
+    "prototype" : "spine_prefab.json",
     "components" : {
-        "renderer" : {
-            "materials" : ["spine_material.json"]
-        },
         "spine_player" : {
             "model" : "spine_raptor.json"
         },
diff --git a/samples/bin/library/spine_shader.frag b/samples/bin/library/spine_shader.frag
index 878cc4cc..7ea012bd 100644
--- a/samples/bin/library/spine_shader.frag
+++ b/samples/bin/library/spine_shader.frag
@@ -4,5 +4,7 @@ varying vec2 v_st0;
 varying vec4 v_color0;
 
 void main() {
-    gl_FragColor = texture2D(u_texture, v_st0) * v_color0;
+    vec4 c = texture2D(u_texture, v_st0) * v_color0;
+    c.rgb *= c.a;
+    gl_FragColor = c;
 }
diff --git a/samples/bin/library/spine_shader.vert b/samples/bin/library/spine_shader.vert
index 4c704e6e..cf3bb179 100644
--- a/samples/bin/library/spine_shader.vert
+++ b/samples/bin/library/spine_shader.vert
@@ -1,3 +1,4 @@
+uniform vec2 u_screen_s;
 uniform mat4 u_matrix_vp;
 
 attribute vec3 a_vertex;
@@ -7,6 +8,19 @@ attribute vec4 a_color0;
 varying vec2 v_st0;
 varying vec4 v_color0;
 
+vec2 round(vec2 v) {
+    return vec2(
+        floor(v.x + 0.5),
+        floor(v.y + 0.5));
+}
+
+vec4 pixel_snap(vec4 pos) {
+    vec2 hpc = u_screen_s * 0.5;
+    vec2 pixel_pos = round((pos.xy / pos.w) * hpc);
+    pos.xy = pixel_pos / hpc * pos.w;
+    return pos;
+}
+
 vec4 vertex_to_homo(vec3 pos) {
     return vec4(pos, 1.0) * u_matrix_vp;
 }
@@ -14,5 +28,9 @@ vec4 vertex_to_homo(vec3 pos) {
 void main() {
     v_st0 = a_st0;
     v_color0 = a_color0;
+#ifndef VERTEX_SNAPPING_ON
     gl_Position = vertex_to_homo(a_vertex);
+#else
+    gl_Position = pixel_snap(vertex_to_homo(a_vertex));
+#endif
 }
diff --git a/samples/bin/library/sprite_material_additive.json b/samples/bin/library/sprite_material_additive.json
new file mode 100644
index 00000000..3e798a0b
--- /dev/null
+++ b/samples/bin/library/sprite_material_additive.json
@@ -0,0 +1,14 @@
+{
+    "passes" : [{
+        "shader" : "sprite_shader.json",
+        "state_block" : {
+            "blending_state" : {
+                "src_factor" : "one",
+                "dst_factor" : "one"
+            },
+            "capabilities_state" : {
+                "blending" : true
+            }
+        }
+    }]
+}
diff --git a/samples/bin/library/sprite_material_multiply.json b/samples/bin/library/sprite_material_multiply.json
new file mode 100644
index 00000000..2190c6cb
--- /dev/null
+++ b/samples/bin/library/sprite_material_multiply.json
@@ -0,0 +1,14 @@
+{
+    "passes" : [{
+        "shader" : "sprite_shader.json",
+        "state_block" : {
+            "blending_state" : {
+                "src_factor" : "dst_color",
+                "dst_factor" : "one_minus_src_alpha"
+            },
+            "capabilities_state" : {
+                "blending" : true
+            }
+        }
+    }]
+}
diff --git a/samples/bin/library/sprite_material.json b/samples/bin/library/sprite_material_normal.json
similarity index 100%
rename from samples/bin/library/sprite_material.json
rename to samples/bin/library/sprite_material_normal.json
diff --git a/samples/bin/library/sprite_material_screen.json b/samples/bin/library/sprite_material_screen.json
new file mode 100644
index 00000000..e3356757
--- /dev/null
+++ b/samples/bin/library/sprite_material_screen.json
@@ -0,0 +1,14 @@
+{
+    "passes" : [{
+        "shader" : "sprite_shader.json",
+        "state_block" : {
+            "blending_state" : {
+                "src_factor" : "one",
+                "dst_factor" : "one_minus_src_color"
+            },
+            "capabilities_state" : {
+                "blending" : true
+            }
+        }
+    }]
+}
diff --git a/samples/bin/library/sprite_prefab.json b/samples/bin/library/sprite_prefab.json
index 2f0beaeb..e7ed0248 100644
--- a/samples/bin/library/sprite_prefab.json
+++ b/samples/bin/library/sprite_prefab.json
@@ -1,6 +1,13 @@
 {
     "components" : {
         "renderer" : {},
-        "sprite_renderer" : {}
+        "sprite_renderer" : {
+            "materials" : {
+                "additive" : "sprite_material_additive.json",
+                "multiply" : "sprite_material_multiply.json",
+                "normal" : "sprite_material_normal.json",
+                "screen" : "sprite_material_screen.json"
+            }
+        }
     }
 }
diff --git a/sources/enduro2d/core/render.cpp b/sources/enduro2d/core/render.cpp
index 0d30b505..de8b479e 100644
--- a/sources/enduro2d/core/render.cpp
+++ b/sources/enduro2d/core/render.cpp
@@ -667,9 +667,9 @@ namespace e2d
         return *this;
     }
 
-    render::sampler_state& render::sampler_state::wrap(sampler_wrap st) noexcept {
-        s_wrap(st);
-        t_wrap(st);
+    render::sampler_state& render::sampler_state::wrap(sampler_wrap s, sampler_wrap t) noexcept {
+        s_wrap(s);
+        t_wrap(t);
         return *this;
     }
 
diff --git a/sources/enduro2d/high/assets/material_asset.cpp b/sources/enduro2d/high/assets/material_asset.cpp
index daa5d50c..e493cd13 100644
--- a/sources/enduro2d/high/assets/material_asset.cpp
+++ b/sources/enduro2d/high/assets/material_asset.cpp
@@ -544,7 +544,7 @@ namespace
             } else if ( wrap_json.IsString() ) {
                 auto wrap = content.s_wrap();
                 if ( parse_sampler_wrap(wrap_json.GetString(), wrap) ) {
-                    content.wrap(wrap);
+                    content.wrap(wrap, wrap);
                 } else {
                     E2D_ASSERT_MSG(false, "unexpected sampler wrap");
                 }
diff --git a/sources/enduro2d/high/components/spine_player.cpp b/sources/enduro2d/high/components/spine_player.cpp
index a44968b8..5dda517c 100644
--- a/sources/enduro2d/high/components/spine_player.cpp
+++ b/sources/enduro2d/high/components/spine_player.cpp
@@ -49,6 +49,20 @@ namespace e2d
         return *this;
     }
 
+    spine_player& spine_player::materials(
+        flat_map<str_hash, material_asset::ptr>&& value) noexcept
+    {
+        materials_ = std::move(value);
+        return *this;
+    }
+
+    spine_player& spine_player::materials(
+        const flat_map<str_hash, material_asset::ptr>& value)
+    {
+        materials_ = value;
+        return *this;
+    }
+
     spine_player& spine_player::skin(const str& value) noexcept {
         if ( !spSkeleton_setSkinByName(skeleton_.get(), value.empty() ? nullptr : value.c_str()) ) {
             the<debug>().error("SPINE_PLAYER: can't set skin '%0'", value);
@@ -90,6 +104,17 @@ namespace e2d
     const spine_model_asset::ptr& spine_player::model() const noexcept {
         return model_;
     }
+
+    material_asset::ptr spine_player::find_material(str_hash name) const noexcept {
+        const auto iter = materials_.find(name);
+        return iter != materials_.end()
+            ? iter->second
+            : nullptr;
+    }
+
+    const flat_map<str_hash, material_asset::ptr>& spine_player::materials() const noexcept {
+        return materials_;
+    }
 }
 
 namespace e2d
@@ -100,10 +125,22 @@ namespace e2d
         "additionalProperties" : false,
         "properties" : {
             "model" : { "$ref": "#/common_definitions/address" },
+            "materials" : { "$ref": "#/definitions/materials" },
             "skin" : { "$ref": "#/common_definitions/name" },
             "attachments" : { "$ref": "#/definitions/attachments" }
         },
         "definitions" : {
+            "materials" : {
+                "type" : "object",
+                "required" : [],
+                "additionalProperties" : false,
+                "properties" : {
+                    "normal" : { "$ref": "#/common_definitions/address" },
+                    "additive" : { "$ref": "#/common_definitions/address" },
+                    "multiply" : { "$ref": "#/common_definitions/address" },
+                    "screen" : { "$ref": "#/common_definitions/address" }
+                }
+            },
             "attachments" : {
                 "type" : "array",
                 "items" : { "$ref": "#/definitions/attachment" }
@@ -137,6 +174,41 @@ namespace e2d
             }
             component.model(model);
         }
+
+        if ( ctx.root.HasMember("materials") ) {
+            const rapidjson::Value& materials_root = ctx.root["materials"];
+            flat_map<str_hash, material_asset::ptr> materials;
+            materials.reserve(materials_root.MemberCount());
+            for ( rapidjson::Value::ConstMemberIterator material_root = materials_root.MemberBegin();
+                material_root != materials_root.MemberEnd();
+                ++material_root )
+            {
+                str_hash material_name;
+                if ( !json_utils::try_parse_value(material_root->name, material_name) ) {
+                    the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'material.name' property");
+                    return false;
+                }
+
+                str material_address;
+                if ( !json_utils::try_parse_value(material_root->value, material_address) ) {
+                    the<debug>().error("SPINE_PLAYER: Incorrect formatting of 'material.address' property");
+                    return false;
+                }
+
+                auto material = ctx.dependencies.find_asset<material_asset>(
+                    path::combine(ctx.parent_address, material_address));
+                if ( !material ) {
+                    the<debug>().error("SPINE_PLAYER: Dependency 'material' is not found:\n"
+                        "--> Parent address: %0\n"
+                        "--> Dependency address: %1",
+                        ctx.parent_address,
+                        material_address);
+                    return false;
+                }
+                materials.emplace(material_name, material);
+            }
+            component.materials(std::move(materials));
+        }
         
         if ( ctx.root.HasMember("skin") ) {
             str skin;
@@ -185,6 +257,17 @@ namespace e2d
                 path::combine(ctx.parent_address, ctx.root["model"].GetString()));
         }
 
+        if ( ctx.root.HasMember("materials") ) {
+            const rapidjson::Value& materials_root = ctx.root["materials"];
+            for ( rapidjson::Value::ConstMemberIterator material_root = materials_root.MemberBegin();
+                material_root != materials_root.MemberEnd();
+                ++material_root )
+            {
+                dependencies.add_dependency<material_asset>(
+                    path::combine(ctx.parent_address, material_root->value.GetString()));
+            }
+        }
+
         return true;
     }
 }
diff --git a/sources/enduro2d/high/components/spine_player_cmd.cpp b/sources/enduro2d/high/components/spine_player_cmd.cpp
index c5eeea69..7bbacd7f 100644
--- a/sources/enduro2d/high/components/spine_player_cmd.cpp
+++ b/sources/enduro2d/high/components/spine_player_cmd.cpp
@@ -378,6 +378,9 @@ namespace e2d
                 return false;
             }
             for ( auto& cmd : cmds.value() ) {
+                if ( cmd.valueless_by_exception() ) {
+                    return false;
+                }
                 component.add_command(std::move(cmd));
             }
         }
diff --git a/sources/enduro2d/high/components/spine_player_evt.cpp b/sources/enduro2d/high/components/spine_player_evt.cpp
index 622fbf1d..8736208f 100644
--- a/sources/enduro2d/high/components/spine_player_evt.cpp
+++ b/sources/enduro2d/high/components/spine_player_evt.cpp
@@ -195,6 +195,9 @@ namespace e2d
                 return false;
             }
             for ( auto& evt : evts.value() ) {
+                if ( evt.valueless_by_exception() ) {
+                    return false;
+                }
                 component.add_event(std::move(evt));
             }
         }
diff --git a/sources/enduro2d/high/components/sprite_renderer.cpp b/sources/enduro2d/high/components/sprite_renderer.cpp
index c34aa61e..6d53b965 100644
--- a/sources/enduro2d/high/components/sprite_renderer.cpp
+++ b/sources/enduro2d/high/components/sprite_renderer.cpp
@@ -6,6 +6,21 @@
 
 #include <enduro2d/high/components/sprite_renderer.hpp>
 
+namespace
+{
+    using namespace e2d;
+
+    bool parse_blending(str_view str, sprite_renderer::blendings& blending) noexcept {
+    #define DEFINE_IF(x) if ( str == #x ) { blending = sprite_renderer::blendings::x; return true; }
+        DEFINE_IF(normal);
+        DEFINE_IF(additive);
+        DEFINE_IF(multiply);
+        DEFINE_IF(screen);
+    #undef DEFINE_IF
+        return false;
+    }
+}
+
 namespace e2d
 {
     const char* factory_loader<sprite_renderer>::schema_source = R"json({
@@ -14,9 +29,33 @@ namespace e2d
         "additionalProperties" : false,
         "properties" : {
             "tint" : { "$ref": "#/common_definitions/color" },
+            "blending" : { "$ref": "#/definitions/blendings" },
             "filtering" : { "type" : "boolean" },
             "atlas" : { "$ref": "#/common_definitions/address" },
-            "sprite" : { "$ref": "#/common_definitions/address" }
+            "sprite" : { "$ref": "#/common_definitions/address" },
+            "materials" : { "$ref": "#/definitions/materials" }
+        },
+        "definitions" : {
+            "blendings" : {
+                "type" : "string",
+                "enum" : [
+                    "normal",
+                    "additive",
+                    "multiply",
+                    "screen"
+                ]
+            },
+            "materials" : {
+                "type" : "object",
+                "required" : [],
+                "additionalProperties" : false,
+                "properties" : {
+                    "normal" : { "$ref": "#/common_definitions/address" },
+                    "additive" : { "$ref": "#/common_definitions/address" },
+                    "multiply" : { "$ref": "#/common_definitions/address" },
+                    "screen" : { "$ref": "#/common_definitions/address" }
+                }
+            }
         }
     })json";
 
@@ -25,7 +64,7 @@ namespace e2d
         const fill_context& ctx) const
     {
         if ( ctx.root.HasMember("tint") ) {
-            auto tint = component.tint();
+            color32 tint = component.tint();
             if ( !json_utils::try_parse_value(ctx.root["tint"], tint) ) {
                 the<debug>().error("SPRITE_RENDERER: Incorrect formatting of 'tint' property");
                 return false;
@@ -33,8 +72,17 @@ namespace e2d
             component.tint(tint);
         }
 
+        if ( ctx.root.HasMember("blending") ) {
+            sprite_renderer::blendings blending = component.blending();
+            if ( !parse_blending(ctx.root["blending"].GetString(), blending) ) {
+                the<debug>().error("LABEL: Incorrect formatting of 'blending' property");
+                return false;
+            }
+            component.blending(blending);
+        }
+
         if ( ctx.root.HasMember("filtering") ) {
-            auto filtering = component.filtering();
+            bool filtering = component.filtering();
             if ( !json_utils::try_parse_value(ctx.root["filtering"], filtering) ) {
                 the<debug>().error("SPRITE_RENDERER: Incorrect formatting of 'filtering' property");
                 return false;
@@ -70,6 +118,41 @@ namespace e2d
             component.sprite(sprite);
         }
 
+        if ( ctx.root.HasMember("materials") ) {
+            const rapidjson::Value& materials_root = ctx.root["materials"];
+            flat_map<str_hash, material_asset::ptr> materials;
+            materials.reserve(materials_root.MemberCount());
+            for ( rapidjson::Value::ConstMemberIterator material_root = materials_root.MemberBegin();
+                material_root != materials_root.MemberEnd();
+                ++material_root )
+            {
+                str_hash material_name;
+                if ( !json_utils::try_parse_value(material_root->name, material_name) ) {
+                    the<debug>().error("SPRITE_RENDERER: Incorrect formatting of 'material.name' property");
+                    return false;
+                }
+
+                str material_address;
+                if ( !json_utils::try_parse_value(material_root->value, material_address) ) {
+                    the<debug>().error("SPRITE_RENDERER: Incorrect formatting of 'material.address' property");
+                    return false;
+                }
+
+                auto material = ctx.dependencies.find_asset<material_asset>(
+                    path::combine(ctx.parent_address, material_address));
+                if ( !material ) {
+                    the<debug>().error("SPRITE_RENDERER: Dependency 'material' is not found:\n"
+                        "--> Parent address: %0\n"
+                        "--> Dependency address: %1",
+                        ctx.parent_address,
+                        material_address);
+                    return false;
+                }
+                materials.emplace(material_name, material);
+            }
+            component.materials(std::move(materials));
+        }
+
         return true;
     }
 
@@ -87,6 +170,17 @@ namespace e2d
                 path::combine(ctx.parent_address, ctx.root["sprite"].GetString()));
         }
 
+        if ( ctx.root.HasMember("materials") ) {
+            const rapidjson::Value& materials_root = ctx.root["materials"];
+            for ( rapidjson::Value::ConstMemberIterator material_root = materials_root.MemberBegin();
+                material_root != materials_root.MemberEnd();
+                ++material_root )
+            {
+                dependencies.add_dependency<material_asset>(
+                    path::combine(ctx.parent_address, material_root->value.GetString()));
+            }
+        }
+
         return true;
     }
 }
diff --git a/sources/enduro2d/high/systems/label_system.cpp b/sources/enduro2d/high/systems/label_system.cpp
index 318e7da7..a0276ed1 100644
--- a/sources/enduro2d/high/systems/label_system.cpp
+++ b/sources/enduro2d/high/systems/label_system.cpp
@@ -207,7 +207,8 @@ namespace
             f32 kerning{0.f};
         };
 
-        vector<glyph_desc> glyphs;
+        static vector<glyph_desc> glyphs;
+        glyphs.clear();
         glyphs.reserve(text.size());
 
         for ( std::size_t i = 0, e = text.size(); i < e; ++i ) {
@@ -243,7 +244,8 @@ namespace
             : start(start) {}
         };
 
-        vector<string_desc> strings;
+        static vector<string_desc> strings;
+        strings.clear();
         strings.reserve(calculate_string_count(text));
 
         f32 last_space_width = 0.f;
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index 61db0aef..a71e7959 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -6,47 +6,26 @@
 
 #include "render_system_drawer.hpp"
 
-#include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/model_renderer.hpp>
-#include <enduro2d/high/components/sprite_renderer.hpp>
+#include <enduro2d/high/components/renderer.hpp>
 #include <enduro2d/high/components/spine_player.hpp>
+#include <enduro2d/high/components/sprite_renderer.hpp>
 
-#include <spine/AnimationState.h>
-#include <spine/Skeleton.h>
-#include <spine/VertexEffect.h>
-#include <spine/SkeletonClipping.h>
-#include <spine/RegionAttachment.h>
-#include <spine/MeshAttachment.h>
+#include <spine/spine.h>
 
 namespace
 {
     using namespace e2d;
 
     const str_hash screen_s_property_hash = "u_screen_s";
+
+    const str_hash matrix_m_property_hash = "u_matrix_m";
     const str_hash matrix_v_property_hash = "u_matrix_v";
     const str_hash matrix_p_property_hash = "u_matrix_p";
     const str_hash matrix_vp_property_hash = "u_matrix_vp";
-    const str_hash matrix_mvp_property_hash = "u_matrix_mvp";
-    const str_hash game_time_property_hash = "u_game_time";
-    const str_hash sprite_texture_sampler_hash = "u_texture";
 
-    const render::blending_state blend_normal = render::blending_state()
-        .factor(render::blending_factor::src_alpha, render::blending_factor::one_minus_src_alpha);
-    const render::blending_state blend_additive = render::blending_state()
-        .factor(render::blending_factor::src_alpha, render::blending_factor::one);
-    const render::blending_state blend_multiply = render::blending_state()
-        .factor(render::blending_factor::dst_color, render::blending_factor::one_minus_src_alpha);
-    const render::blending_state blend_screen = render::blending_state()
-        .factor(render::blending_factor::one, render::blending_factor::one_minus_src_color);
-    
-    const render::blending_state blend_normal_pma = render::blending_state()
-        .factor(render::blending_factor::one, render::blending_factor::one_minus_src_alpha);
-    const render::blending_state blend_additive_pma = render::blending_state()
-        .factor(render::blending_factor::one, render::blending_factor::one);
-    const render::blending_state blend_multiply_pma = render::blending_state()
-        .factor(render::blending_factor::dst_color, render::blending_factor::one_minus_src_alpha);
-    const render::blending_state blend_screen_pma = render::blending_state()
-        .factor(render::blending_factor::one, render::blending_factor::one_minus_src_color);
+    const str_hash time_property_hash = "u_time";
+    const str_hash texture_sampler_hash = "u_texture";
 }
 
 namespace e2d::render_system_impl
@@ -68,7 +47,7 @@ namespace e2d::render_system_impl
         const m4f& cam_w = cam_n
             ? cam_n->world_matrix()
             : m4f::identity();
-        const std::pair<m4f,bool> cam_w_inv = math::inversed(cam_w);
+        const std::pair<m4f, bool> cam_w_inv = math::inversed(cam_w);
 
         const m4f& m_v = cam_w_inv.second
             ? cam_w_inv.first
@@ -82,7 +61,7 @@ namespace e2d::render_system_impl
             .property(matrix_v_property_hash, m_v)
             .property(matrix_p_property_hash, m_p)
             .property(matrix_vp_property_hash, m_v * m_p)
-            .property(game_time_property_hash, engine.time());
+            .property(time_property_hash, engine.time());
 
         render.execute(render::command_block<3>()
             .add_command(render::target_command(cam.target()))
@@ -107,17 +86,14 @@ namespace e2d::render_system_impl
         const renderer* node_r = node_e.find_component<renderer>();
 
         if ( node_r && node_r->enabled() ) {
-            const model_renderer* mdl_r = node_e.find_component<model_renderer>();
-            if ( mdl_r ) {
+            if ( auto mdl_r = node_e.find_component<model_renderer>() ) {
                 draw(node, *node_r, *mdl_r);
             }
-            const sprite_renderer* spr_r = node_e.find_component<sprite_renderer>();
-            if ( spr_r ) {
-                draw(node, *node_r, *spr_r);
+            if ( auto spn_p = node_e.find_component<spine_player>() ) {
+                draw(node, *node_r, *spn_p);
             }
-            const spine_player* spine_r = node_e.find_component<spine_player>();
-            if ( spine_r ) {
-                draw(node, *node_r, *spine_r);
+            if ( auto spr_r = node_e.find_component<sprite_renderer>() ) {
+                draw(node, *node_r, *spr_r);
             }
         }
     }
@@ -141,7 +117,7 @@ namespace e2d::render_system_impl
         try {
             property_cache_
                 .merge(batcher_.flush())
-                .property("u_matrix_m", node->world_matrix())
+                .property(matrix_m_property_hash, node->world_matrix())
                 .merge(node_r.properties());
 
             const std::size_t submesh_count = math::min(
@@ -167,6 +143,289 @@ namespace e2d::render_system_impl
         property_cache_.clear();
     }
 
+    void drawer::context::draw(
+        const const_node_iptr& node,
+        const renderer& node_r,
+        const spine_player& spine_r)
+    {
+        static std::vector<float> temp_vertices(1000u, 0.f);
+        static std::vector<batcher_type::vertex_type> batch_vertices(1000u);
+
+        if ( !node || !node_r.enabled() ) {
+            return;
+        }
+
+        spSkeleton* skeleton = spine_r.skeleton().get();
+        spSkeletonClipping* clipper = spine_r.clipper().get();
+
+        if ( !skeleton || !clipper ) {
+            return;
+        }
+
+        if ( math::is_near_zero(skeleton->color.a) ) {
+            return;
+        }
+
+        material_asset::ptr normal_mat_a;
+        material_asset::ptr additive_mat_a;
+        material_asset::ptr multiply_mat_a;
+        material_asset::ptr screen_mat_a;
+
+        const m4f& sm = node->world_matrix();
+        unsigned short quad_indices[6] = { 0, 1, 2, 2, 3, 0 };
+
+        for ( int i = 0; i < skeleton->slotsCount; ++i ) {
+            spSlot* slot = skeleton->drawOrder[i];
+
+            spAttachment* attachment = slot->attachment;
+            if ( !attachment || math::is_near_zero(slot->color.a) ) {
+                spSkeletonClipping_clipEnd(clipper, slot);
+                continue;
+            }
+
+            int vertex_count = 0;
+            float* uvs = nullptr;
+            unsigned short* indices = nullptr;
+            int index_count = 0;
+            const spAtlasPage* atlas_page = nullptr;
+            const spColor* attachment_color = nullptr;
+
+            if ( attachment->type == SP_ATTACHMENT_REGION ) {
+                spRegionAttachment* region = reinterpret_cast<spRegionAttachment*>(attachment);
+
+                attachment_color = &region->color;
+                if ( math::is_near_zero(attachment_color->a) ) {
+                    spSkeletonClipping_clipEnd(clipper, slot);
+                    continue;
+                }
+
+                try {
+                    vertex_count = 8;
+                    if ( vertex_count > math::numeric_cast<int>(temp_vertices.size()) ) {
+                        temp_vertices.resize(vertex_count);
+                    }
+                } catch (...) {
+                    property_cache_.clear();
+                    spSkeletonClipping_clipEnd(clipper, slot);
+                    spSkeletonClipping_clipEnd2(clipper);
+                    throw;
+                }
+
+                spRegionAttachment_computeWorldVertices(
+                    region,
+                    slot->bone,
+                    temp_vertices.data(),
+                    0, 2);
+
+                uvs = region->uvs;
+                indices = quad_indices;
+                index_count = 6;
+                atlas_page = static_cast<spAtlasRegion*>(region->rendererObject)->page;
+            } else if ( attachment->type == SP_ATTACHMENT_MESH ) {
+                spMeshAttachment* mesh = reinterpret_cast<spMeshAttachment*>(attachment);
+
+                attachment_color = &mesh->color;
+                if ( math::is_near_zero(attachment_color->a) ) {
+                    spSkeletonClipping_clipEnd(clipper, slot);
+                    continue;
+                }
+
+                try {
+                    vertex_count = mesh->super.worldVerticesLength;
+                    if ( vertex_count > math::numeric_cast<int>(temp_vertices.size()) ) {
+                        temp_vertices.resize(vertex_count);
+                    }
+                } catch (...) {
+                    property_cache_.clear();
+                    spSkeletonClipping_clipEnd(clipper, slot);
+                    spSkeletonClipping_clipEnd2(clipper);
+                    throw;
+                }
+
+                spVertexAttachment_computeWorldVertices(
+                    &mesh->super,
+                    slot,
+                    0,
+                    mesh->super.worldVerticesLength,
+                    temp_vertices.data(),
+                    0, 2);
+
+                uvs = mesh->uvs;
+                indices = mesh->triangles;
+                index_count = mesh->trianglesCount;
+                atlas_page = static_cast<spAtlasRegion*>(mesh->rendererObject)->page;
+            } else if ( attachment->type == SP_ATTACHMENT_CLIPPING ) {
+                spClippingAttachment* clip = reinterpret_cast<spClippingAttachment*>(attachment);
+                spSkeletonClipping_clipStart(clipper, slot, clip);
+                continue;
+            } else {
+                continue;
+            }
+
+            color32 vert_color = color32(
+                color(skeleton->color.r, skeleton->color.g, skeleton->color.b, skeleton->color.a) *
+                color(slot->color.r, slot->color.g, slot->color.b, slot->color.a) *
+                color(attachment_color->r, attachment_color->g, attachment_color->b, attachment_color->a));
+
+            texture_ptr tex_p;
+            const texture_asset* texture_asset_ptr = atlas_page
+                ? static_cast<texture_asset*>(atlas_page->rendererObject)
+                : nullptr;
+            if ( texture_asset_ptr ) {
+                tex_p = texture_asset_ptr->content();
+            }
+
+            render::sampler_min_filter tex_min_f = render::sampler_min_filter::linear;
+            switch ( atlas_page->minFilter ) {
+            case SP_ATLAS_NEAREST:
+            case SP_ATLAS_MIPMAP_NEAREST_LINEAR:
+            case SP_ATLAS_MIPMAP_NEAREST_NEAREST:
+                tex_min_f = render::sampler_min_filter::nearest;
+                break;
+            default:
+                tex_min_f = render::sampler_min_filter::linear;
+                break;
+            }
+
+            render::sampler_mag_filter tex_mag_f = render::sampler_mag_filter::linear;
+            switch ( atlas_page->magFilter ) {
+            case SP_ATLAS_NEAREST:
+            case SP_ATLAS_MIPMAP_NEAREST_LINEAR:
+            case SP_ATLAS_MIPMAP_NEAREST_NEAREST:
+                tex_mag_f = render::sampler_mag_filter::nearest;
+                break;
+            default:
+                tex_mag_f = render::sampler_mag_filter::linear;
+                break;
+            }
+
+            render::sampler_wrap tex_wrap_s = render::sampler_wrap::repeat;
+            switch ( atlas_page->uWrap ) {
+            case SP_ATLAS_MIRROREDREPEAT:
+                tex_wrap_s = render::sampler_wrap::mirror;
+                break;
+            case SP_ATLAS_CLAMPTOEDGE:
+                tex_wrap_s = render::sampler_wrap::clamp;
+                break;
+            case SP_ATLAS_REPEAT:
+                tex_wrap_s = render::sampler_wrap::repeat;
+                break;
+            default:
+                E2D_ASSERT_MSG(false, "unexpected wrap mode for slot");
+                break;
+            }
+
+            render::sampler_wrap tex_wrap_t = render::sampler_wrap::repeat;
+            switch ( atlas_page->vWrap ) {
+            case SP_ATLAS_MIRROREDREPEAT:
+                tex_wrap_t = render::sampler_wrap::mirror;
+                break;
+            case SP_ATLAS_CLAMPTOEDGE:
+                tex_wrap_t = render::sampler_wrap::clamp;
+                break;
+            case SP_ATLAS_REPEAT:
+                tex_wrap_t = render::sampler_wrap::repeat;
+                break;
+            default:
+                E2D_ASSERT_MSG(false, "unexpected wrap mode for slot");
+                break;
+            }
+
+            material_asset::ptr mat_a;
+            switch ( slot->data->blendMode ) {
+                case SP_BLEND_MODE_NORMAL:
+                    if ( !normal_mat_a ) {
+                        static str_hash normal_hash = make_hash("normal");
+                        normal_mat_a = spine_r.find_material(normal_hash);
+                    }
+                    mat_a = normal_mat_a;
+                    break;
+                case SP_BLEND_MODE_ADDITIVE:
+                    if ( !additive_mat_a ) {
+                        static str_hash additive_hash = make_hash("additive");
+                        additive_mat_a = spine_r.find_material(additive_hash);
+                    }
+                    mat_a = additive_mat_a;
+                    break;
+                case SP_BLEND_MODE_MULTIPLY:
+                    if ( !multiply_mat_a ) {
+                        static str_hash multiply_hash = make_hash("multiply");
+                        multiply_mat_a = spine_r.find_material(multiply_hash);
+                    }
+                    mat_a = multiply_mat_a;
+                    break;
+                case SP_BLEND_MODE_SCREEN:
+                    if ( !screen_mat_a ) {
+                        static str_hash screen_hash = make_hash("screen");
+                        screen_mat_a = spine_r.find_material(screen_hash);
+                    }
+                    mat_a = screen_mat_a;
+                    break;
+                default:
+                    E2D_ASSERT_MSG(false, "unexpected blend mode for slot");
+                    break;
+            }
+
+            if ( math::is_near_zero(vert_color.a) || !tex_p || !mat_a ) {
+                spSkeletonClipping_clipEnd(clipper, slot);
+                continue;
+            }
+
+            const float* vertices = temp_vertices.data();
+            if ( spSkeletonClipping_isClipping(clipper) ) {
+                spSkeletonClipping_clipTriangles(
+                    clipper,
+                    temp_vertices.data(), vertex_count,
+                    indices, index_count,
+                    uvs,
+                    2);
+                vertices = clipper->clippedVertices->items;
+                vertex_count = clipper->clippedVertices->size;
+                uvs = clipper->clippedUVs->items;
+                indices = clipper->clippedTriangles->items;
+                index_count = clipper->clippedTriangles->size;
+            }
+
+            try {
+                const std::size_t batch_vertex_count =
+                    math::numeric_cast<std::size_t>(vertex_count >> 1);
+                if ( batch_vertex_count > batch_vertices.size() ) {
+                    batch_vertices.resize(batch_vertex_count);
+                }
+
+                for ( std::size_t j = 0; j < batch_vertex_count; ++j ) {
+                    batcher_type::vertex_type& vert = batch_vertices[j];
+                    vert.v = v3f(v4f(vertices[j * 2], vertices[j * 2 + 1], 0.f, 1.f) * sm);
+                    vert.t = v2f(uvs[j * 2], uvs[j * 2 + 1]);
+                    vert.c = vert_color;
+                }
+
+                property_cache_
+                    .sampler(texture_sampler_hash, render::sampler_state()
+                        .texture(tex_p)
+                        .filter(tex_min_f, tex_mag_f)
+                        .wrap(tex_wrap_s, tex_wrap_t))
+                    .merge(node_r.properties());
+
+                batcher_.batch(
+                    mat_a,
+                    property_cache_,
+                    indices, index_count,
+                    batch_vertices.data(), batch_vertex_count);
+            } catch (...) {
+                property_cache_.clear();
+                spSkeletonClipping_clipEnd(clipper, slot);
+                spSkeletonClipping_clipEnd2(clipper);
+                throw;
+            }
+
+            spSkeletonClipping_clipEnd(clipper, slot);
+        }
+
+        spSkeletonClipping_clipEnd2(clipper);
+        property_cache_.clear();
+    }
+
     void drawer::context::draw(
         const const_node_iptr& node,
         const renderer& node_r,
@@ -176,20 +435,21 @@ namespace e2d::render_system_impl
             return;
         }
 
-        if ( !spr_r.sprite() || node_r.materials().empty() ) {
+        if ( !spr_r.sprite() ) {
             return;
         }
 
         const sprite& spr = spr_r.sprite()->content();
-        const texture_asset::ptr& tex_a = spr.texture();
-        const material_asset::ptr& mat_a = node_r.materials().front();
+        const texture_ptr& tex_p = spr.texture()
+            ? spr.texture()->content()
+            : texture_ptr();
 
-        if ( !tex_a || !tex_a->content() || !mat_a ) {
+        if ( !tex_p || math::is_near_zero(spr_r.tint().a) ) {
             return;
         }
 
         const b2f& tex_r = spr.texrect();
-        const v2f& tex_s = tex_a->content()->size().cast_to<f32>();
+        const v2f& tex_s = tex_p->size().cast_to<f32>();
 
         const f32 sw = tex_r.size.x;
         const f32 sh = tex_r.size.y;
@@ -219,20 +479,46 @@ namespace e2d::render_system_impl
             { v3f(p3 * sm), {tx + tw,  ty + th }, tc },
             { v3f(p4 * sm), {tx + 0.f, ty + th }, tc }};
 
-        const render::sampler_min_filter min_filter = spr_r.filtering()
+        const render::sampler_min_filter tex_min_f = spr_r.filtering()
             ? render::sampler_min_filter::linear
             : render::sampler_min_filter::nearest;
 
-        const render::sampler_mag_filter mag_filter = spr_r.filtering()
+        const render::sampler_mag_filter tex_mag_f = spr_r.filtering()
             ? render::sampler_mag_filter::linear
             : render::sampler_mag_filter::nearest;
 
+        material_asset::ptr mat_a;
+        switch ( spr_r.blending() ) {
+        case sprite_renderer::blendings::normal:
+            static str_hash normal_hash = make_hash("normal");
+            mat_a = spr_r.find_material(normal_hash);
+            break;
+        case sprite_renderer::blendings::additive:
+            static str_hash additive_hash = make_hash("additive");
+            mat_a = spr_r.find_material(additive_hash);
+            break;
+        case sprite_renderer::blendings::multiply:
+            static str_hash multiply_hash = make_hash("multiply");
+            mat_a = spr_r.find_material(multiply_hash);
+            break;
+        case sprite_renderer::blendings::screen:
+            static str_hash screen_hash = make_hash("screen");
+            mat_a = spr_r.find_material(screen_hash);
+            break;
+        default:
+            E2D_ASSERT_MSG(false, "unexpected blend mode for sprite");
+            break;
+        }
+
+        if ( !mat_a ) {
+            return;
+        }
+
         try {
             property_cache_
-                .sampler(sprite_texture_sampler_hash, render::sampler_state()
-                    .texture(tex_a->content())
-                    .min_filter(min_filter)
-                    .mag_filter(mag_filter))
+                .sampler(texture_sampler_hash, render::sampler_state()
+                    .texture(tex_p)
+                    .filter(tex_min_f, tex_mag_f))
                 .merge(node_r.properties());
 
             batcher_.batch(
@@ -244,188 +530,6 @@ namespace e2d::render_system_impl
             property_cache_.clear();
             throw;
         }
-        property_cache_.clear();
-    }
-    
-    void drawer::context::draw(
-        const const_node_iptr& node,
-        const renderer& node_r,
-        const spine_player& spine_r)
-    {
-        constexpr int stride = 2;
-        std::vector<batcher_type::vertex_type> batch_vertices; // TODO: optimize
-        std::vector<float> temp_vertices;
-
-        if ( !node || !node_r.enabled() ) {
-            return;
-        }
-
-        if ( node_r.materials().empty() ) {
-            return;
-        }
-
-        spSkeleton* skeleton = spine_r.skeleton().get();
-        spSkeletonClipping* clipper = spine_r.clipper().get();
-        const material_asset::ptr& src_mat = node_r.materials().front();
-        const bool use_premultiplied_alpha = false;
-
-        if ( !skeleton || !clipper || !src_mat ) {
-            return;
-        }
-
-        const u16 quad_indices[6] = { 0, 1, 2, 2, 3, 0 };
-
-        if ( skeleton->color.a == 0 ) {
-            return;
-        }
-        
-        const m4f& sm = node->world_matrix();
-
-        for ( int i = 0; i < skeleton->slotsCount; ++i ) {
-            spSlot* slot = skeleton->drawOrder[i];
-            spAttachment* attachment = slot->attachment;
-            if ( !attachment ) {
-                continue;
-            }
-            if ( slot->color.a == 0 ) {
-                spSkeletonClipping_clipEnd(clipper, slot);
-                continue;
-            }
-
-            int vertex_count = 0;
-            const float* uvs = nullptr;
-            const u16* indices = nullptr;
-            int index_count = 0;
-            const spColor* attachment_color;
-            texture_ptr texture;
-
-            if ( attachment->type == SP_ATTACHMENT_REGION ) {
-                spRegionAttachment* region = reinterpret_cast<spRegionAttachment*>(attachment);
-                attachment_color = &region->color;
-
-                if ( attachment_color->a == 0 ) {
-                    spSkeletonClipping_clipEnd(clipper, slot);
-                    continue;
-                }
-                if ( temp_vertices.size() < 8 ) {
-                    temp_vertices.resize(8);
-                }
-                spRegionAttachment_computeWorldVertices(region, slot->bone, temp_vertices.data(), 0, stride);
-                vertex_count = 8;
-                uvs = region->uvs;
-                indices = quad_indices;
-                index_count = 6;
-                if ( texture_asset* asset = static_cast<texture_asset*>(static_cast<spAtlasRegion*>(region->rendererObject)->page->rendererObject) ) {
-                    texture = asset->content();
-                }
-            } else if ( attachment->type == SP_ATTACHMENT_MESH ) {
-                spMeshAttachment* mesh = reinterpret_cast<spMeshAttachment*>(attachment);
-                attachment_color = &mesh->color;
-
-                if ( attachment_color->a == 0 ) {
-                    spSkeletonClipping_clipEnd(clipper, slot);
-                    continue;
-                }
-                vertex_count = mesh->super.worldVerticesLength;
-                if ( vertex_count > int(temp_vertices.size()) ) {
-                    temp_vertices.resize(vertex_count);
-                }
-                spVertexAttachment_computeWorldVertices(&mesh->super, slot, 0, mesh->super.worldVerticesLength, temp_vertices.data(), 0, stride);
-                uvs = mesh->uvs;
-                indices = mesh->triangles;
-                index_count = mesh->trianglesCount;
-                if ( texture_asset* asset = static_cast<texture_asset*>(static_cast<spAtlasRegion*>(mesh->rendererObject)->page->rendererObject) ) {
-                    texture = asset->content();
-                }
-            } else if ( attachment->type == SP_ATTACHMENT_CLIPPING ) {
-                spClippingAttachment* clip = reinterpret_cast<spClippingAttachment*>(attachment);
-                spSkeletonClipping_clipStart(clipper, slot, clip);
-                continue;
-            } else {
-                continue;
-            }
-
-            color vert_colorf = 
-                color(skeleton->color.r, skeleton->color.g, skeleton->color.b, skeleton->color.a) *
-                color(slot->color.r, slot->color.g, slot->color.b, slot->color.a) *
-                color(attachment_color->r, attachment_color->g, attachment_color->b, attachment_color->a);
-
-            if ( use_premultiplied_alpha ) {
-                vert_colorf.r *= vert_colorf.a;
-                vert_colorf.g *= vert_colorf.a;
-                vert_colorf.b *= vert_colorf.a;
-            }
-            const color32 vert_color(vert_colorf);
-
-            render::blending_state blend_mode;
-            switch ( slot->data->blendMode ) {
-                case SP_BLEND_MODE_NORMAL :
-                    blend_mode = use_premultiplied_alpha ? blend_normal_pma : blend_normal;
-                    break;
-                case SP_BLEND_MODE_ADDITIVE :
-                    blend_mode = use_premultiplied_alpha ? blend_additive_pma : blend_additive;
-                    break;
-                case SP_BLEND_MODE_MULTIPLY :
-                    blend_mode = use_premultiplied_alpha ? blend_multiply_pma : blend_multiply;
-                    break;
-                case SP_BLEND_MODE_SCREEN :
-                    blend_mode = use_premultiplied_alpha ? blend_screen_pma : blend_screen;
-                    break;
-                default :
-                    E2D_ASSERT_MSG(false, "unexpected blend mode for slot");
-                    break;
-            }
-            
-            material_asset::ptr mat_a = material_asset::create(src_mat->content());
-            const_cast<render::state_block&>(mat_a->content().pass(0).states()).blending(blend_mode);
-            
-            const float* vertices = temp_vertices.data();
-            if ( spSkeletonClipping_isClipping(clipper) ) {
-                spSkeletonClipping_clipTriangles(
-                    clipper,
-                    temp_vertices.data(), vertex_count,
-                    const_cast<u16*>(indices), index_count,
-                    const_cast<float*>(uvs),
-                    stride);
-                vertices = clipper->clippedVertices->items;
-                vertex_count = clipper->clippedVertices->size;
-                uvs = clipper->clippedUVs->items;
-                indices = clipper->clippedTriangles->items;
-                index_count = clipper->clippedTriangles->size;
-            }
-
-            batch_vertices.resize(vertex_count >> 1);
-            for ( size_t j = 0; j < batch_vertices.size(); ++j ) {
-                auto& vert = batch_vertices[j];
-                v2f v(vertices[j*2], vertices[j*2+1]);
-                vert.v = v3f(v4f(v.x, v.y, 0.0f, 1.0f) * sm);
-                vert.t = v2f(uvs[j*2], uvs[j*2+1]);
-                vert.c = vert_color;
-            }
-
-            if ( index_count ) {
-                try {
-                    property_cache_
-                        .sampler(sprite_texture_sampler_hash, render::sampler_state()
-                            .texture(texture)
-                            .min_filter(render::sampler_min_filter::linear)
-                            .mag_filter(render::sampler_mag_filter::linear))
-                        .merge(node_r.properties());
-
-                    batcher_.batch(
-                        mat_a,
-                        property_cache_,
-                        indices, index_count,
-                        batch_vertices.data(), batch_vertices.size());
-                } catch (...) {
-                    property_cache_.clear();
-                    throw;
-                }
-            }
-            spSkeletonClipping_clipEnd(clipper, slot);
-        }
-
-        spSkeletonClipping_clipEnd2(clipper);
         
         property_cache_.clear();
     }

From 2507753ac6a3386a0b92c8568faefa8da7162888 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 5 Sep 2019 13:31:42 +0700
Subject: [PATCH 104/108] sample asset folder restructurization

---
 samples/CMakeLists.txt                        |  2 +-
 samples/bin/library/coin/coin-pma.atlas       |  3 --
 samples/bin/library/coin/coin-pma.png         |  3 --
 samples/bin/library/{ => fonts}/arial_bm.fnt  |  0
 samples/bin/library/{ => fonts}/arial_bm.png  |  0
 samples/bin/library/{ => fonts}/arial_sdf.fnt |  0
 samples/bin/library/{ => fonts}/arial_sdf.png |  0
 .../{ => materials}/font_bm_material.json     |  2 +-
 .../{ => materials}/font_sdf_material.json    |  2 +-
 .../spine_material_additive.json              |  2 +-
 .../spine_material_multiply.json              |  2 +-
 .../spine_material_normal.json                |  2 +-
 .../spine_material_screen.json                |  2 +-
 .../sprite_material_additive.json             |  2 +-
 .../sprite_material_multiply.json             |  2 +-
 .../sprite_material_normal.json               |  2 +-
 .../sprite_material_screen.json               |  2 +-
 .../library/{ => models/gnome}/gnome.e2d_mesh |  0
 .../bin/library/{ => models/gnome}/gnome.png  |  0
 .../{ => models/gnome}/gnome_material.json    |  2 +-
 .../{ => models/gnome}/gnome_model.json       |  0
 .../library/{ => prefabs}/camera_prefab.json  |  0
 .../coin_prefab.json}                         |  2 +-
 .../bin/library/prefabs/dragon_prefab.json    | 18 +++++++++++
 .../library/{ => prefabs}/gnome_prefab.json   |  4 +--
 .../{ => prefabs}/label_bm_prefab.json        |  4 +--
 .../{ => prefabs}/label_sdf_prefab.json       |  4 +--
 .../library/{ => prefabs}/model_prefab.json   |  0
 .../raptor_prefab.json}                       |  2 +-
 .../library/{ => prefabs}/ship_prefab.json    |  2 +-
 samples/bin/library/prefabs/spine_prefab.json | 15 +++++++++
 .../bin/library/prefabs/sprite_prefab.json    | 13 ++++++++
 samples/bin/library/scene_spine_prefab.json   | 24 --------------
 .../library/{ => scenes}/scene_prefab.json    | 12 +++----
 .../library/scenes/spine_scene_prefab.json    | 32 +++++++++++++++++++
 .../library/{ => shaders}/font_bm_shader.frag |  0
 .../library/{ => shaders}/font_bm_shader.json |  0
 .../library/{ => shaders}/font_bm_shader.vert |  0
 .../{ => shaders}/font_sdf_shader.frag        |  0
 .../{ => shaders}/font_sdf_shader.json        |  0
 .../{ => shaders}/font_sdf_shader.vert        |  0
 .../library/{ => shaders}/model_shader.frag   |  0
 .../library/{ => shaders}/model_shader.json   |  0
 .../library/{ => shaders}/model_shader.vert   |  0
 .../library/{ => shaders}/spine_shader.frag   |  0
 .../library/{ => shaders}/spine_shader.json   |  0
 .../library/{ => shaders}/spine_shader.vert   |  0
 .../library/{ => shaders}/sprite_shader.frag  |  0
 .../library/{ => shaders}/sprite_shader.json  |  0
 .../library/{ => shaders}/sprite_shader.vert  |  0
 samples/bin/library/ship.png                  |  3 --
 samples/bin/library/spine_prefab.json         | 15 ---------
 .../library/{ => spines}/coin/coin-pro.skel   |  0
 samples/bin/library/spines/coin/coin.atlas    |  3 ++
 samples/bin/library/spines/coin/coin.png      |  3 ++
 .../coin_spine.json}                          |  2 +-
 .../bin/library/spines/dragon/dragon-ess.skel |  3 ++
 .../bin/library/spines/dragon/dragon.atlas    |  3 ++
 samples/bin/library/spines/dragon/dragon.png  |  3 ++
 samples/bin/library/spines/dragon/dragon2.png |  3 ++
 samples/bin/library/spines/dragon_spine.json  |  5 +++
 .../{ => spines}/raptor/raptor-pro.json-large |  0
 .../{ => spines}/raptor/raptor-pro.skel       |  0
 .../library/{ => spines}/raptor/raptor.atlas  |  0
 .../library/{ => spines}/raptor/raptor.png    |  0
 .../raptor_spine.json}                        |  0
 samples/bin/library/sprite_prefab.json        | 13 --------
 samples/bin/library/{ => sprites}/cube_0.png  |  0
 .../library/{ => sprites}/cube_0_sprite.json  |  0
 samples/bin/library/{ => sprites}/cube_1.png  |  0
 .../library/{ => sprites}/cube_1_sprite.json  |  0
 .../library/{ => sprites}/cube_flipbook.json  |  0
 .../library/{ => sprites}/ship_sprite.json    |  0
 samples/bin/library/{ => sprites}/ships.png   |  0
 .../library/{ => sprites}/ships_atlas.json    |  0
 samples/sources/sample_03/sample_03.cpp       | 22 ++++++-------
 samples/sources/sample_04/sample_04.cpp       |  2 +-
 .../sample_07.cpp => sample_06/sample_06.cpp} |  6 ++--
 78 files changed, 145 insertions(+), 103 deletions(-)
 delete mode 100644 samples/bin/library/coin/coin-pma.atlas
 delete mode 100644 samples/bin/library/coin/coin-pma.png
 rename samples/bin/library/{ => fonts}/arial_bm.fnt (100%)
 rename samples/bin/library/{ => fonts}/arial_bm.png (100%)
 rename samples/bin/library/{ => fonts}/arial_sdf.fnt (100%)
 rename samples/bin/library/{ => fonts}/arial_sdf.png (100%)
 rename samples/bin/library/{ => materials}/font_bm_material.json (84%)
 rename samples/bin/library/{ => materials}/font_sdf_material.json (84%)
 rename samples/bin/library/{ => materials}/spine_material_additive.json (84%)
 rename samples/bin/library/{ => materials}/spine_material_multiply.json (85%)
 rename samples/bin/library/{ => materials}/spine_material_normal.json (85%)
 rename samples/bin/library/{ => materials}/spine_material_screen.json (85%)
 rename samples/bin/library/{ => materials}/sprite_material_additive.json (84%)
 rename samples/bin/library/{ => materials}/sprite_material_multiply.json (85%)
 rename samples/bin/library/{ => materials}/sprite_material_normal.json (84%)
 rename samples/bin/library/{ => materials}/sprite_material_screen.json (84%)
 rename samples/bin/library/{ => models/gnome}/gnome.e2d_mesh (100%)
 rename samples/bin/library/{ => models/gnome}/gnome.png (100%)
 rename samples/bin/library/{ => models/gnome}/gnome_material.json (84%)
 rename samples/bin/library/{ => models/gnome}/gnome_model.json (100%)
 rename samples/bin/library/{ => prefabs}/camera_prefab.json (100%)
 rename samples/bin/library/{spine_coin_prefab.json => prefabs/coin_prefab.json} (88%)
 create mode 100644 samples/bin/library/prefabs/dragon_prefab.json
 rename samples/bin/library/{ => prefabs}/gnome_prefab.json (62%)
 rename samples/bin/library/{ => prefabs}/label_bm_prefab.json (70%)
 rename samples/bin/library/{ => prefabs}/label_sdf_prefab.json (69%)
 rename samples/bin/library/{ => prefabs}/model_prefab.json (100%)
 rename samples/bin/library/{spine_raptor_prefab.json => prefabs/raptor_prefab.json} (95%)
 rename samples/bin/library/{ => prefabs}/ship_prefab.json (67%)
 create mode 100644 samples/bin/library/prefabs/spine_prefab.json
 create mode 100644 samples/bin/library/prefabs/sprite_prefab.json
 delete mode 100644 samples/bin/library/scene_spine_prefab.json
 rename samples/bin/library/{ => scenes}/scene_prefab.json (80%)
 create mode 100644 samples/bin/library/scenes/spine_scene_prefab.json
 rename samples/bin/library/{ => shaders}/font_bm_shader.frag (100%)
 rename samples/bin/library/{ => shaders}/font_bm_shader.json (100%)
 rename samples/bin/library/{ => shaders}/font_bm_shader.vert (100%)
 rename samples/bin/library/{ => shaders}/font_sdf_shader.frag (100%)
 rename samples/bin/library/{ => shaders}/font_sdf_shader.json (100%)
 rename samples/bin/library/{ => shaders}/font_sdf_shader.vert (100%)
 rename samples/bin/library/{ => shaders}/model_shader.frag (100%)
 rename samples/bin/library/{ => shaders}/model_shader.json (100%)
 rename samples/bin/library/{ => shaders}/model_shader.vert (100%)
 rename samples/bin/library/{ => shaders}/spine_shader.frag (100%)
 rename samples/bin/library/{ => shaders}/spine_shader.json (100%)
 rename samples/bin/library/{ => shaders}/spine_shader.vert (100%)
 rename samples/bin/library/{ => shaders}/sprite_shader.frag (100%)
 rename samples/bin/library/{ => shaders}/sprite_shader.json (100%)
 rename samples/bin/library/{ => shaders}/sprite_shader.vert (100%)
 delete mode 100755 samples/bin/library/ship.png
 delete mode 100644 samples/bin/library/spine_prefab.json
 rename samples/bin/library/{ => spines}/coin/coin-pro.skel (100%)
 create mode 100644 samples/bin/library/spines/coin/coin.atlas
 create mode 100644 samples/bin/library/spines/coin/coin.png
 rename samples/bin/library/{spine_coin.json => spines/coin_spine.json} (65%)
 create mode 100644 samples/bin/library/spines/dragon/dragon-ess.skel
 create mode 100644 samples/bin/library/spines/dragon/dragon.atlas
 create mode 100644 samples/bin/library/spines/dragon/dragon.png
 create mode 100644 samples/bin/library/spines/dragon/dragon2.png
 create mode 100644 samples/bin/library/spines/dragon_spine.json
 rename samples/bin/library/{ => spines}/raptor/raptor-pro.json-large (100%)
 rename samples/bin/library/{ => spines}/raptor/raptor-pro.skel (100%)
 rename samples/bin/library/{ => spines}/raptor/raptor.atlas (100%)
 rename samples/bin/library/{ => spines}/raptor/raptor.png (100%)
 rename samples/bin/library/{spine_raptor.json => spines/raptor_spine.json} (100%)
 delete mode 100644 samples/bin/library/sprite_prefab.json
 rename samples/bin/library/{ => sprites}/cube_0.png (100%)
 rename samples/bin/library/{ => sprites}/cube_0_sprite.json (100%)
 rename samples/bin/library/{ => sprites}/cube_1.png (100%)
 rename samples/bin/library/{ => sprites}/cube_1_sprite.json (100%)
 rename samples/bin/library/{ => sprites}/cube_flipbook.json (100%)
 rename samples/bin/library/{ => sprites}/ship_sprite.json (100%)
 rename samples/bin/library/{ => sprites}/ships.png (100%)
 rename samples/bin/library/{ => sprites}/ships_atlas.json (100%)
 rename samples/sources/{sample_07/sample_07.cpp => sample_06/sample_06.cpp} (96%)

diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 6715c073..c44205a6 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -36,4 +36,4 @@ add_e2d_sample(02)
 add_e2d_sample(03)
 add_e2d_sample(04)
 add_e2d_sample(05)
-add_e2d_sample(07)
+add_e2d_sample(06)
diff --git a/samples/bin/library/coin/coin-pma.atlas b/samples/bin/library/coin/coin-pma.atlas
deleted file mode 100644
index 63ddfbec..00000000
--- a/samples/bin/library/coin/coin-pma.atlas
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:710b5d8aa292bf75c778d960a63f3b63857d2a7ab15541020cadf5bc5239656a
-size 890
diff --git a/samples/bin/library/coin/coin-pma.png b/samples/bin/library/coin/coin-pma.png
deleted file mode 100644
index 61759bb1..00000000
--- a/samples/bin/library/coin/coin-pma.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:75e1d17fb84154f882a20d5e5069ab52d6d635ba7a9691e78b4f93c8128be35a
-size 342389
diff --git a/samples/bin/library/arial_bm.fnt b/samples/bin/library/fonts/arial_bm.fnt
similarity index 100%
rename from samples/bin/library/arial_bm.fnt
rename to samples/bin/library/fonts/arial_bm.fnt
diff --git a/samples/bin/library/arial_bm.png b/samples/bin/library/fonts/arial_bm.png
similarity index 100%
rename from samples/bin/library/arial_bm.png
rename to samples/bin/library/fonts/arial_bm.png
diff --git a/samples/bin/library/arial_sdf.fnt b/samples/bin/library/fonts/arial_sdf.fnt
similarity index 100%
rename from samples/bin/library/arial_sdf.fnt
rename to samples/bin/library/fonts/arial_sdf.fnt
diff --git a/samples/bin/library/arial_sdf.png b/samples/bin/library/fonts/arial_sdf.png
similarity index 100%
rename from samples/bin/library/arial_sdf.png
rename to samples/bin/library/fonts/arial_sdf.png
diff --git a/samples/bin/library/font_bm_material.json b/samples/bin/library/materials/font_bm_material.json
similarity index 84%
rename from samples/bin/library/font_bm_material.json
rename to samples/bin/library/materials/font_bm_material.json
index 044249a8..7e65e10f 100644
--- a/samples/bin/library/font_bm_material.json
+++ b/samples/bin/library/materials/font_bm_material.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "font_bm_shader.json",
+        "shader" : "../shaders/font_bm_shader.json",
         "state_block" : {
             "blending_state" : {
                 "src_factor" : "one",
diff --git a/samples/bin/library/font_sdf_material.json b/samples/bin/library/materials/font_sdf_material.json
similarity index 84%
rename from samples/bin/library/font_sdf_material.json
rename to samples/bin/library/materials/font_sdf_material.json
index b3b76807..0108ed2e 100644
--- a/samples/bin/library/font_sdf_material.json
+++ b/samples/bin/library/materials/font_sdf_material.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "font_sdf_shader.json",
+        "shader" : "../shaders/font_sdf_shader.json",
         "state_block" : {
             "blending_state" : {
                 "src_factor" : "one",
diff --git a/samples/bin/library/spine_material_additive.json b/samples/bin/library/materials/spine_material_additive.json
similarity index 84%
rename from samples/bin/library/spine_material_additive.json
rename to samples/bin/library/materials/spine_material_additive.json
index 6520a75c..a131c4cc 100644
--- a/samples/bin/library/spine_material_additive.json
+++ b/samples/bin/library/materials/spine_material_additive.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "spine_shader.json",
+        "shader" : "../shaders/spine_shader.json",
         "state_block" : {
             "blending_state" : {
                 "src_factor" : "one",
diff --git a/samples/bin/library/spine_material_multiply.json b/samples/bin/library/materials/spine_material_multiply.json
similarity index 85%
rename from samples/bin/library/spine_material_multiply.json
rename to samples/bin/library/materials/spine_material_multiply.json
index 634e3dc5..79d5b9dc 100644
--- a/samples/bin/library/spine_material_multiply.json
+++ b/samples/bin/library/materials/spine_material_multiply.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "spine_shader.json",
+        "shader" : "../shaders/spine_shader.json",
         "state_block" : {
             "blending_state" : {
                 "src_factor" : "dst_color",
diff --git a/samples/bin/library/spine_material_normal.json b/samples/bin/library/materials/spine_material_normal.json
similarity index 85%
rename from samples/bin/library/spine_material_normal.json
rename to samples/bin/library/materials/spine_material_normal.json
index 75f5fa8f..6463264d 100644
--- a/samples/bin/library/spine_material_normal.json
+++ b/samples/bin/library/materials/spine_material_normal.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "spine_shader.json",
+        "shader" : "../shaders/spine_shader.json",
         "state_block" : {
             "blending_state" : {
                 "src_factor" : "one",
diff --git a/samples/bin/library/spine_material_screen.json b/samples/bin/library/materials/spine_material_screen.json
similarity index 85%
rename from samples/bin/library/spine_material_screen.json
rename to samples/bin/library/materials/spine_material_screen.json
index 897633f2..7ffbe27b 100644
--- a/samples/bin/library/spine_material_screen.json
+++ b/samples/bin/library/materials/spine_material_screen.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "spine_shader.json",
+        "shader" : "../shaders/spine_shader.json",
         "state_block" : {
             "blending_state" : {
                 "src_factor" : "one",
diff --git a/samples/bin/library/sprite_material_additive.json b/samples/bin/library/materials/sprite_material_additive.json
similarity index 84%
rename from samples/bin/library/sprite_material_additive.json
rename to samples/bin/library/materials/sprite_material_additive.json
index 3e798a0b..e2173c18 100644
--- a/samples/bin/library/sprite_material_additive.json
+++ b/samples/bin/library/materials/sprite_material_additive.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "sprite_shader.json",
+        "shader" : "../shaders/sprite_shader.json",
         "state_block" : {
             "blending_state" : {
                 "src_factor" : "one",
diff --git a/samples/bin/library/sprite_material_multiply.json b/samples/bin/library/materials/sprite_material_multiply.json
similarity index 85%
rename from samples/bin/library/sprite_material_multiply.json
rename to samples/bin/library/materials/sprite_material_multiply.json
index 2190c6cb..5146b8d9 100644
--- a/samples/bin/library/sprite_material_multiply.json
+++ b/samples/bin/library/materials/sprite_material_multiply.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "sprite_shader.json",
+        "shader" : "../shaders/sprite_shader.json",
         "state_block" : {
             "blending_state" : {
                 "src_factor" : "dst_color",
diff --git a/samples/bin/library/sprite_material_normal.json b/samples/bin/library/materials/sprite_material_normal.json
similarity index 84%
rename from samples/bin/library/sprite_material_normal.json
rename to samples/bin/library/materials/sprite_material_normal.json
index 58a6a793..984749ce 100644
--- a/samples/bin/library/sprite_material_normal.json
+++ b/samples/bin/library/materials/sprite_material_normal.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "sprite_shader.json",
+        "shader" : "../shaders/sprite_shader.json",
         "state_block" : {
             "blending_state" : {
                 "src_factor" : "one",
diff --git a/samples/bin/library/sprite_material_screen.json b/samples/bin/library/materials/sprite_material_screen.json
similarity index 84%
rename from samples/bin/library/sprite_material_screen.json
rename to samples/bin/library/materials/sprite_material_screen.json
index e3356757..f755395f 100644
--- a/samples/bin/library/sprite_material_screen.json
+++ b/samples/bin/library/materials/sprite_material_screen.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "sprite_shader.json",
+        "shader" : "../shaders/sprite_shader.json",
         "state_block" : {
             "blending_state" : {
                 "src_factor" : "one",
diff --git a/samples/bin/library/gnome.e2d_mesh b/samples/bin/library/models/gnome/gnome.e2d_mesh
similarity index 100%
rename from samples/bin/library/gnome.e2d_mesh
rename to samples/bin/library/models/gnome/gnome.e2d_mesh
diff --git a/samples/bin/library/gnome.png b/samples/bin/library/models/gnome/gnome.png
similarity index 100%
rename from samples/bin/library/gnome.png
rename to samples/bin/library/models/gnome/gnome.png
diff --git a/samples/bin/library/gnome_material.json b/samples/bin/library/models/gnome/gnome_material.json
similarity index 84%
rename from samples/bin/library/gnome_material.json
rename to samples/bin/library/models/gnome/gnome_material.json
index dbf77801..9d6a0430 100644
--- a/samples/bin/library/gnome_material.json
+++ b/samples/bin/library/models/gnome/gnome_material.json
@@ -1,6 +1,6 @@
 {
     "passes" : [{
-        "shader" : "model_shader.json",
+        "shader" : "../../shaders/model_shader.json",
         "state_block" : {
             "capabilities_state" : {
                 "depth_test" : true
diff --git a/samples/bin/library/gnome_model.json b/samples/bin/library/models/gnome/gnome_model.json
similarity index 100%
rename from samples/bin/library/gnome_model.json
rename to samples/bin/library/models/gnome/gnome_model.json
diff --git a/samples/bin/library/camera_prefab.json b/samples/bin/library/prefabs/camera_prefab.json
similarity index 100%
rename from samples/bin/library/camera_prefab.json
rename to samples/bin/library/prefabs/camera_prefab.json
diff --git a/samples/bin/library/spine_coin_prefab.json b/samples/bin/library/prefabs/coin_prefab.json
similarity index 88%
rename from samples/bin/library/spine_coin_prefab.json
rename to samples/bin/library/prefabs/coin_prefab.json
index d091ed3a..9150a31e 100644
--- a/samples/bin/library/spine_coin_prefab.json
+++ b/samples/bin/library/prefabs/coin_prefab.json
@@ -2,7 +2,7 @@
     "prototype" : "spine_prefab.json",
     "components" : {
         "spine_player" : {
-            "model" : "spine_coin.json"
+            "model" : "../spines/coin_spine.json"
         },
         "spine_player_cmd" : {
             "commands" : [{
diff --git a/samples/bin/library/prefabs/dragon_prefab.json b/samples/bin/library/prefabs/dragon_prefab.json
new file mode 100644
index 00000000..af73e837
--- /dev/null
+++ b/samples/bin/library/prefabs/dragon_prefab.json
@@ -0,0 +1,18 @@
+{
+    "prototype" : "spine_prefab.json",
+    "components" : {
+        "spine_player" : {
+            "model" : "../spines/dragon_spine.json"
+        },
+        "spine_player_cmd" : {
+            "commands" : [{
+                "type" : "set_anim_cmd",
+                "desc" : {
+                    "track" : 0,
+                    "name" : "flying",
+                    "loop" : true
+                }
+            }]
+        }
+    }
+}
diff --git a/samples/bin/library/gnome_prefab.json b/samples/bin/library/prefabs/gnome_prefab.json
similarity index 62%
rename from samples/bin/library/gnome_prefab.json
rename to samples/bin/library/prefabs/gnome_prefab.json
index ed7e6306..238cb8a0 100644
--- a/samples/bin/library/gnome_prefab.json
+++ b/samples/bin/library/prefabs/gnome_prefab.json
@@ -3,11 +3,11 @@
     "components" : {
         "renderer" : {
             "materials" : [
-                "gnome_material.json"
+                "../models/gnome/gnome_material.json"
             ]
         },
         "model_renderer" : {
-            "model" : "gnome_model.json"
+            "model" : "../models/gnome/gnome_model.json"
         }
     }
 }
diff --git a/samples/bin/library/label_bm_prefab.json b/samples/bin/library/prefabs/label_bm_prefab.json
similarity index 70%
rename from samples/bin/library/label_bm_prefab.json
rename to samples/bin/library/prefabs/label_bm_prefab.json
index bc9a915b..dc46c3c9 100644
--- a/samples/bin/library/label_bm_prefab.json
+++ b/samples/bin/library/prefabs/label_bm_prefab.json
@@ -2,12 +2,12 @@
     "components" : {
         "renderer" : {
             "materials" : [
-                "font_bm_material.json"
+                "../materials/font_bm_material.json"
             ]
         },
         "model_renderer" : {},
         "label" : {
-            "font" : "arial_bm.fnt",
+            "font" : "../fonts/arial_bm.fnt",
             "text" : "Hello World!"
         },
         "label.dirty" : {}
diff --git a/samples/bin/library/label_sdf_prefab.json b/samples/bin/library/prefabs/label_sdf_prefab.json
similarity index 69%
rename from samples/bin/library/label_sdf_prefab.json
rename to samples/bin/library/prefabs/label_sdf_prefab.json
index 19c0f738..f9462f5d 100644
--- a/samples/bin/library/label_sdf_prefab.json
+++ b/samples/bin/library/prefabs/label_sdf_prefab.json
@@ -2,12 +2,12 @@
     "components" : {
         "renderer" : {
             "materials" : [
-                "font_sdf_material.json"
+                "../materials/font_sdf_material.json"
             ]
         },
         "model_renderer" : {},
         "label" : {
-            "font" : "arial_sdf.fnt",
+            "font" : "../fonts/arial_sdf.fnt",
             "text" : "Hello World!"
         },
         "label.dirty" : {}
diff --git a/samples/bin/library/model_prefab.json b/samples/bin/library/prefabs/model_prefab.json
similarity index 100%
rename from samples/bin/library/model_prefab.json
rename to samples/bin/library/prefabs/model_prefab.json
diff --git a/samples/bin/library/spine_raptor_prefab.json b/samples/bin/library/prefabs/raptor_prefab.json
similarity index 95%
rename from samples/bin/library/spine_raptor_prefab.json
rename to samples/bin/library/prefabs/raptor_prefab.json
index f8d1b0a9..89bdfc7d 100644
--- a/samples/bin/library/spine_raptor_prefab.json
+++ b/samples/bin/library/prefabs/raptor_prefab.json
@@ -2,7 +2,7 @@
     "prototype" : "spine_prefab.json",
     "components" : {
         "spine_player" : {
-            "model" : "spine_raptor.json"
+            "model" : "../spines/raptor_spine.json"
         },
         "spine_player_cmd" : {
             "commands" : [{
diff --git a/samples/bin/library/ship_prefab.json b/samples/bin/library/prefabs/ship_prefab.json
similarity index 67%
rename from samples/bin/library/ship_prefab.json
rename to samples/bin/library/prefabs/ship_prefab.json
index 4553ec5e..78a701a8 100644
--- a/samples/bin/library/ship_prefab.json
+++ b/samples/bin/library/prefabs/ship_prefab.json
@@ -2,7 +2,7 @@
     "prototype" : "sprite_prefab.json",
     "components" : {
         "sprite_renderer" : {
-            "sprite" : "ship_sprite.json"
+            "sprite" : "../sprites/ship_sprite.json"
         }
     }
 }
diff --git a/samples/bin/library/prefabs/spine_prefab.json b/samples/bin/library/prefabs/spine_prefab.json
new file mode 100644
index 00000000..c42bb58d
--- /dev/null
+++ b/samples/bin/library/prefabs/spine_prefab.json
@@ -0,0 +1,15 @@
+{
+    "components" : {
+        "renderer" : {},
+        "spine_player" : {
+            "materials" : {
+                "additive" : "../materials/spine_material_additive.json",
+                "multiply" : "../materials/spine_material_multiply.json",
+                "normal" : "../materials/spine_material_normal.json",
+                "screen" : "../materials/spine_material_screen.json"
+            }
+        },
+        "spine_player_cmd" : {},
+        "spine_player_evt" : {}
+    }
+}
diff --git a/samples/bin/library/prefabs/sprite_prefab.json b/samples/bin/library/prefabs/sprite_prefab.json
new file mode 100644
index 00000000..a76ad645
--- /dev/null
+++ b/samples/bin/library/prefabs/sprite_prefab.json
@@ -0,0 +1,13 @@
+{
+    "components" : {
+        "renderer" : {},
+        "sprite_renderer" : {
+            "materials" : {
+                "additive" : "../materials/sprite_material_additive.json",
+                "multiply" : "../materials/sprite_material_multiply.json",
+                "normal" : "../materials/sprite_material_normal.json",
+                "screen" : "../materials/sprite_material_screen.json"
+            }
+        }
+    }
+}
diff --git a/samples/bin/library/scene_spine_prefab.json b/samples/bin/library/scene_spine_prefab.json
deleted file mode 100644
index 7808c5ae..00000000
--- a/samples/bin/library/scene_spine_prefab.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "components" : {
-        "scene" : {}
-    },
-    "children" : [{
-        "prototype" : "camera_prefab.json"
-    },{
-        "prototype" : "spine_coin_prefab.json",
-        "components" : {
-            "actor" : {
-                "translation" : [200,180,0],
-                "scale" : 0.25
-            }
-        }
-    }, {
-        "prototype" : "spine_raptor_prefab.json",
-        "components" : {
-            "actor" : {
-                "translation" : [-80,-100,0],
-                "scale" : 0.25
-            }
-        }
-    }]
-}
diff --git a/samples/bin/library/scene_prefab.json b/samples/bin/library/scenes/scene_prefab.json
similarity index 80%
rename from samples/bin/library/scene_prefab.json
rename to samples/bin/library/scenes/scene_prefab.json
index b81a3d72..f1d07b21 100644
--- a/samples/bin/library/scene_prefab.json
+++ b/samples/bin/library/scenes/scene_prefab.json
@@ -3,9 +3,9 @@
         "scene" : {}
     },
     "children" : [{
-        "prototype" : "camera_prefab.json"
+        "prototype" : "../prefabs/camera_prefab.json"
     },{
-        "prototype" : "gnome_prefab.json",
+        "prototype" : "../prefabs/gnome_prefab.json",
         "components" : {
             "actor" : {
                 "translation" : [0,0,0],
@@ -13,7 +13,7 @@
             }
         }
     }, {
-        "prototype" : "ship_prefab.json",
+        "prototype" : "../prefabs/ship_prefab.json",
         "components" : {
             "sprite_renderer" : {
                 "blending" : "additive"
@@ -23,7 +23,7 @@
             }
         }
     }, {
-        "prototype" : "ship_prefab.json",
+        "prototype" : "../prefabs/ship_prefab.json",
         "components" : {
             "sprite_renderer" : {
                 "tint" : [255,0,0,255]
@@ -33,7 +33,7 @@
             }
         }
     }, {
-        "prototype" : "label_bm_prefab.json",
+        "prototype" : "../prefabs/label_bm_prefab.json",
         "components" : {
             "label" : {
                 "text" : "bm font",
@@ -47,7 +47,7 @@
             }
         }
     }, {
-        "prototype" : "label_sdf_prefab.json",
+        "prototype" : "../prefabs/label_sdf_prefab.json",
         "components" : {
             "label" : {
                 "text" : "sdf font",
diff --git a/samples/bin/library/scenes/spine_scene_prefab.json b/samples/bin/library/scenes/spine_scene_prefab.json
new file mode 100644
index 00000000..8eebb6fa
--- /dev/null
+++ b/samples/bin/library/scenes/spine_scene_prefab.json
@@ -0,0 +1,32 @@
+{
+    "components" : {
+        "scene" : {}
+    },
+    "children" : [{
+        "prototype" : "../prefabs/camera_prefab.json"
+    },{
+        "prototype" : "../prefabs/coin_prefab.json",
+        "components" : {
+            "actor" : {
+                "translation" : [350,250,0],
+                "scale" : 0.25
+            }
+        }
+    }, {
+        "prototype" : "../prefabs/raptor_prefab.json",
+        "components" : {
+            "actor" : {
+                "translation" : [300,-350,0],
+                "scale" : 0.25
+            }
+        }
+    }, {
+        "prototype" : "../prefabs/dragon_prefab.json",
+        "components" : {
+            "actor" : {
+                "translation" : [-100,0,0],
+                "scale" : 0.9
+            }
+        }
+    }]
+}
diff --git a/samples/bin/library/font_bm_shader.frag b/samples/bin/library/shaders/font_bm_shader.frag
similarity index 100%
rename from samples/bin/library/font_bm_shader.frag
rename to samples/bin/library/shaders/font_bm_shader.frag
diff --git a/samples/bin/library/font_bm_shader.json b/samples/bin/library/shaders/font_bm_shader.json
similarity index 100%
rename from samples/bin/library/font_bm_shader.json
rename to samples/bin/library/shaders/font_bm_shader.json
diff --git a/samples/bin/library/font_bm_shader.vert b/samples/bin/library/shaders/font_bm_shader.vert
similarity index 100%
rename from samples/bin/library/font_bm_shader.vert
rename to samples/bin/library/shaders/font_bm_shader.vert
diff --git a/samples/bin/library/font_sdf_shader.frag b/samples/bin/library/shaders/font_sdf_shader.frag
similarity index 100%
rename from samples/bin/library/font_sdf_shader.frag
rename to samples/bin/library/shaders/font_sdf_shader.frag
diff --git a/samples/bin/library/font_sdf_shader.json b/samples/bin/library/shaders/font_sdf_shader.json
similarity index 100%
rename from samples/bin/library/font_sdf_shader.json
rename to samples/bin/library/shaders/font_sdf_shader.json
diff --git a/samples/bin/library/font_sdf_shader.vert b/samples/bin/library/shaders/font_sdf_shader.vert
similarity index 100%
rename from samples/bin/library/font_sdf_shader.vert
rename to samples/bin/library/shaders/font_sdf_shader.vert
diff --git a/samples/bin/library/model_shader.frag b/samples/bin/library/shaders/model_shader.frag
similarity index 100%
rename from samples/bin/library/model_shader.frag
rename to samples/bin/library/shaders/model_shader.frag
diff --git a/samples/bin/library/model_shader.json b/samples/bin/library/shaders/model_shader.json
similarity index 100%
rename from samples/bin/library/model_shader.json
rename to samples/bin/library/shaders/model_shader.json
diff --git a/samples/bin/library/model_shader.vert b/samples/bin/library/shaders/model_shader.vert
similarity index 100%
rename from samples/bin/library/model_shader.vert
rename to samples/bin/library/shaders/model_shader.vert
diff --git a/samples/bin/library/spine_shader.frag b/samples/bin/library/shaders/spine_shader.frag
similarity index 100%
rename from samples/bin/library/spine_shader.frag
rename to samples/bin/library/shaders/spine_shader.frag
diff --git a/samples/bin/library/spine_shader.json b/samples/bin/library/shaders/spine_shader.json
similarity index 100%
rename from samples/bin/library/spine_shader.json
rename to samples/bin/library/shaders/spine_shader.json
diff --git a/samples/bin/library/spine_shader.vert b/samples/bin/library/shaders/spine_shader.vert
similarity index 100%
rename from samples/bin/library/spine_shader.vert
rename to samples/bin/library/shaders/spine_shader.vert
diff --git a/samples/bin/library/sprite_shader.frag b/samples/bin/library/shaders/sprite_shader.frag
similarity index 100%
rename from samples/bin/library/sprite_shader.frag
rename to samples/bin/library/shaders/sprite_shader.frag
diff --git a/samples/bin/library/sprite_shader.json b/samples/bin/library/shaders/sprite_shader.json
similarity index 100%
rename from samples/bin/library/sprite_shader.json
rename to samples/bin/library/shaders/sprite_shader.json
diff --git a/samples/bin/library/sprite_shader.vert b/samples/bin/library/shaders/sprite_shader.vert
similarity index 100%
rename from samples/bin/library/sprite_shader.vert
rename to samples/bin/library/shaders/sprite_shader.vert
diff --git a/samples/bin/library/ship.png b/samples/bin/library/ship.png
deleted file mode 100755
index 27b569bf..00000000
--- a/samples/bin/library/ship.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:65cbe87077ff41bd595d1e17d68240e3e18972ea0c018707d35c695d86389b0d
-size 3513
diff --git a/samples/bin/library/spine_prefab.json b/samples/bin/library/spine_prefab.json
deleted file mode 100644
index c90fe931..00000000
--- a/samples/bin/library/spine_prefab.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "components" : {
-        "renderer" : {},
-        "spine_player" : {
-            "materials" : {
-                "additive" : "spine_material_additive.json",
-                "multiply" : "spine_material_multiply.json",
-                "normal" : "spine_material_normal.json",
-                "screen" : "spine_material_screen.json"
-            }
-        },
-        "spine_player_cmd" : {},
-        "spine_player_evt" : {}
-    }
-}
diff --git a/samples/bin/library/coin/coin-pro.skel b/samples/bin/library/spines/coin/coin-pro.skel
similarity index 100%
rename from samples/bin/library/coin/coin-pro.skel
rename to samples/bin/library/spines/coin/coin-pro.skel
diff --git a/samples/bin/library/spines/coin/coin.atlas b/samples/bin/library/spines/coin/coin.atlas
new file mode 100644
index 00000000..89443c48
--- /dev/null
+++ b/samples/bin/library/spines/coin/coin.atlas
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:833bc92c2a02695c326080b72f8636206ec53f361010a6b02324565b470f690b
+size 831
diff --git a/samples/bin/library/spines/coin/coin.png b/samples/bin/library/spines/coin/coin.png
new file mode 100644
index 00000000..d08611e0
--- /dev/null
+++ b/samples/bin/library/spines/coin/coin.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21bc65e3de306d698df5c6a6519786a430d8529bc58f01f87013c9927819f87a
+size 402363
diff --git a/samples/bin/library/spine_coin.json b/samples/bin/library/spines/coin_spine.json
similarity index 65%
rename from samples/bin/library/spine_coin.json
rename to samples/bin/library/spines/coin_spine.json
index 7df2f2c7..2a0a6029 100644
--- a/samples/bin/library/spine_coin.json
+++ b/samples/bin/library/spines/coin_spine.json
@@ -1,5 +1,5 @@
 {
-    "atlas" : "coin/coin-pma.atlas",
+    "atlas" : "coin/coin.atlas",
     "skeleton" : "coin/coin-pro.skel",
     "skeleton_scale" : 1.0
 }
diff --git a/samples/bin/library/spines/dragon/dragon-ess.skel b/samples/bin/library/spines/dragon/dragon-ess.skel
new file mode 100644
index 00000000..24c19706
--- /dev/null
+++ b/samples/bin/library/spines/dragon/dragon-ess.skel
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d299087ede92db92396af117f151e8f50abecb57094f34b031d0a389a53d1ad
+size 7073
diff --git a/samples/bin/library/spines/dragon/dragon.atlas b/samples/bin/library/spines/dragon/dragon.atlas
new file mode 100644
index 00000000..6765e4b3
--- /dev/null
+++ b/samples/bin/library/spines/dragon/dragon.atlas
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa3a79e67d926b1e5f017ecd2f2bc2f73fa02a766f27cc83a6547f0c90556c58
+size 4224
diff --git a/samples/bin/library/spines/dragon/dragon.png b/samples/bin/library/spines/dragon/dragon.png
new file mode 100644
index 00000000..70dfda26
--- /dev/null
+++ b/samples/bin/library/spines/dragon/dragon.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a45ac203747ffc4802c83860b20bcb380b405ea55734992defb5fb64f49bbfa0
+size 628537
diff --git a/samples/bin/library/spines/dragon/dragon2.png b/samples/bin/library/spines/dragon/dragon2.png
new file mode 100644
index 00000000..50ed6210
--- /dev/null
+++ b/samples/bin/library/spines/dragon/dragon2.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:86b1a3fcd15a538e08535f0fad4b6cc1c9595060aae0d558c0f2bcc1d09a2833
+size 194829
diff --git a/samples/bin/library/spines/dragon_spine.json b/samples/bin/library/spines/dragon_spine.json
new file mode 100644
index 00000000..4997fae6
--- /dev/null
+++ b/samples/bin/library/spines/dragon_spine.json
@@ -0,0 +1,5 @@
+{
+    "atlas" : "dragon/dragon.atlas",
+    "skeleton" : "dragon/dragon-ess.skel",
+    "skeleton_scale" : 1.0
+}
diff --git a/samples/bin/library/raptor/raptor-pro.json-large b/samples/bin/library/spines/raptor/raptor-pro.json-large
similarity index 100%
rename from samples/bin/library/raptor/raptor-pro.json-large
rename to samples/bin/library/spines/raptor/raptor-pro.json-large
diff --git a/samples/bin/library/raptor/raptor-pro.skel b/samples/bin/library/spines/raptor/raptor-pro.skel
similarity index 100%
rename from samples/bin/library/raptor/raptor-pro.skel
rename to samples/bin/library/spines/raptor/raptor-pro.skel
diff --git a/samples/bin/library/raptor/raptor.atlas b/samples/bin/library/spines/raptor/raptor.atlas
similarity index 100%
rename from samples/bin/library/raptor/raptor.atlas
rename to samples/bin/library/spines/raptor/raptor.atlas
diff --git a/samples/bin/library/raptor/raptor.png b/samples/bin/library/spines/raptor/raptor.png
similarity index 100%
rename from samples/bin/library/raptor/raptor.png
rename to samples/bin/library/spines/raptor/raptor.png
diff --git a/samples/bin/library/spine_raptor.json b/samples/bin/library/spines/raptor_spine.json
similarity index 100%
rename from samples/bin/library/spine_raptor.json
rename to samples/bin/library/spines/raptor_spine.json
diff --git a/samples/bin/library/sprite_prefab.json b/samples/bin/library/sprite_prefab.json
deleted file mode 100644
index e7ed0248..00000000
--- a/samples/bin/library/sprite_prefab.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "components" : {
-        "renderer" : {},
-        "sprite_renderer" : {
-            "materials" : {
-                "additive" : "sprite_material_additive.json",
-                "multiply" : "sprite_material_multiply.json",
-                "normal" : "sprite_material_normal.json",
-                "screen" : "sprite_material_screen.json"
-            }
-        }
-    }
-}
diff --git a/samples/bin/library/cube_0.png b/samples/bin/library/sprites/cube_0.png
similarity index 100%
rename from samples/bin/library/cube_0.png
rename to samples/bin/library/sprites/cube_0.png
diff --git a/samples/bin/library/cube_0_sprite.json b/samples/bin/library/sprites/cube_0_sprite.json
similarity index 100%
rename from samples/bin/library/cube_0_sprite.json
rename to samples/bin/library/sprites/cube_0_sprite.json
diff --git a/samples/bin/library/cube_1.png b/samples/bin/library/sprites/cube_1.png
similarity index 100%
rename from samples/bin/library/cube_1.png
rename to samples/bin/library/sprites/cube_1.png
diff --git a/samples/bin/library/cube_1_sprite.json b/samples/bin/library/sprites/cube_1_sprite.json
similarity index 100%
rename from samples/bin/library/cube_1_sprite.json
rename to samples/bin/library/sprites/cube_1_sprite.json
diff --git a/samples/bin/library/cube_flipbook.json b/samples/bin/library/sprites/cube_flipbook.json
similarity index 100%
rename from samples/bin/library/cube_flipbook.json
rename to samples/bin/library/sprites/cube_flipbook.json
diff --git a/samples/bin/library/ship_sprite.json b/samples/bin/library/sprites/ship_sprite.json
similarity index 100%
rename from samples/bin/library/ship_sprite.json
rename to samples/bin/library/sprites/ship_sprite.json
diff --git a/samples/bin/library/ships.png b/samples/bin/library/sprites/ships.png
similarity index 100%
rename from samples/bin/library/ships.png
rename to samples/bin/library/sprites/ships.png
diff --git a/samples/bin/library/ships_atlas.json b/samples/bin/library/sprites/ships_atlas.json
similarity index 100%
rename from samples/bin/library/ships_atlas.json
rename to samples/bin/library/sprites/ships_atlas.json
diff --git a/samples/sources/sample_03/sample_03.cpp b/samples/sources/sample_03/sample_03.cpp
index 0c874b04..2d591ea3 100644
--- a/samples/sources/sample_03/sample_03.cpp
+++ b/samples/sources/sample_03/sample_03.cpp
@@ -72,11 +72,11 @@ namespace
         }
     private:
         bool create_scene() {
-            auto model_res = the<library>().load_asset<model_asset>("gnome_model.json");
-            auto model_mat = the<library>().load_asset<material_asset>("gnome_material.json");
-            auto sprite_res = the<library>().load_asset<sprite_asset>("ship_sprite.json");
-            auto sprite_mat = the<library>().load_asset<material_asset>("sprite_material.json");
-            auto flipbook_res = the<library>().load_asset<flipbook_asset>("cube_flipbook.json");
+            auto model_res = the<library>().load_asset<model_asset>("models/gnome/gnome_model.json");
+            auto model_mat = the<library>().load_asset<material_asset>("models/gnome/gnome_material.json");
+            auto sprite_res = the<library>().load_asset<sprite_asset>("sprites/ship_sprite.json");
+            auto sprite_mat = the<library>().load_asset<material_asset>("materials/sprite_material_normal.json");
+            auto flipbook_res = the<library>().load_asset<flipbook_asset>("sprites/cube_flipbook.json");
 
             if ( !model_res || !model_mat || !sprite_res || !sprite_mat || !flipbook_res ) {
                 return false;
@@ -111,9 +111,9 @@ namespace
                 sprite_i->entity_filler()
                     .component<rotator>(rotator{v3f::unit_z()})
                     .component<actor>(node::create(sprite_i, scene_r))
-                    .component<renderer>(renderer()
-                        .materials({sprite_mat}))
-                    .component<sprite_renderer>(sprite_res);
+                    .component<renderer>()
+                    .component<sprite_renderer>(sprite_renderer(sprite_res)
+                        .materials({{"normal", sprite_mat}}));
 
                 node_iptr sprite_n = sprite_i->get_component<actor>().get().node();
                 sprite_n->translation(v3f{0,-50.f,0});
@@ -126,10 +126,10 @@ namespace
 
                     flipbook_i->entity_filler()
                         .component<actor>(node::create(flipbook_i, scene_r))
-                        .component<renderer>(renderer()
-                            .materials({sprite_mat}))
+                        .component<renderer>()
                         .component<sprite_renderer>(sprite_renderer()
-                            .filtering(false))
+                            .filtering(false)
+                            .materials({{"normal", sprite_mat}}))
                         .component<flipbook_source>(flipbook_res)
                         .component<flipbook_player>(flipbook_player()
                             .play("idle")
diff --git a/samples/sources/sample_04/sample_04.cpp b/samples/sources/sample_04/sample_04.cpp
index 7bbf6f21..435f48ef 100644
--- a/samples/sources/sample_04/sample_04.cpp
+++ b/samples/sources/sample_04/sample_04.cpp
@@ -52,7 +52,7 @@ namespace
         }
     private:
         bool create_scene() {
-            auto scene_prefab_res = the<library>().load_asset<prefab_asset>("scene_prefab.json");
+            auto scene_prefab_res = the<library>().load_asset<prefab_asset>("scenes/scene_prefab.json");
             auto scene_go = scene_prefab_res
                 ? the<world>().instantiate(scene_prefab_res->content())
                 : nullptr;
diff --git a/samples/sources/sample_07/sample_07.cpp b/samples/sources/sample_06/sample_06.cpp
similarity index 96%
rename from samples/sources/sample_07/sample_07.cpp
rename to samples/sources/sample_06/sample_06.cpp
index 1e60e8c8..9947b56c 100644
--- a/samples/sources/sample_07/sample_07.cpp
+++ b/samples/sources/sample_06/sample_06.cpp
@@ -91,7 +91,7 @@ namespace
         }
     private:
         bool create_scene() {
-            auto scene_prefab_res = the<library>().load_asset<prefab_asset>("scene_spine_prefab.json");
+            auto scene_prefab_res = the<library>().load_asset<prefab_asset>("scenes/spine_scene_prefab.json");
             auto scene_go = scene_prefab_res
                 ? the<world>().instantiate(scene_prefab_res->content())
                 : nullptr;
@@ -109,7 +109,9 @@ namespace
 
 int e2d_main(int argc, char *argv[]) {
     const auto starter_params = starter::parameters(
-        engine::parameters("sample_07", "enduro2d")
+        engine::parameters("sample_06", "enduro2d")
+            .window_params(engine::window_parameters()
+                .size({1024, 768}))
             .timer_params(engine::timer_parameters()
                 .maximal_framerate(100)));
     modules::initialize<starter>(argc, argv, starter_params).start<game>();

From b965094d14ce292c2a8ff858e446573cbe97e31c Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 5 Sep 2019 14:09:55 +0700
Subject: [PATCH 105/108] rename spine_model to spine

---
 headers/enduro2d/high/_all.hpp                |  3 +-
 headers/enduro2d/high/_high.hpp               |  3 +-
 ...{spine_model_asset.hpp => spine_asset.hpp} |  6 +-
 .../enduro2d/high/components/spine_player.hpp | 17 ++---
 .../high/{spine_model.hpp => spine.hpp}       | 40 +++++------
 samples/bin/library/prefabs/coin_prefab.json  |  2 +-
 .../bin/library/prefabs/dragon_prefab.json    |  2 +-
 .../bin/library/prefabs/raptor_prefab.json    |  2 +-
 ...{spine_model_asset.cpp => spine_asset.cpp} | 70 +++++++++----------
 .../enduro2d/high/components/spine_player.cpp | 68 +++++++++---------
 .../high/{spine_model.cpp => spine.cpp}       | 50 ++++++-------
 untests/sources/untests_core/render.cpp       |  4 +-
 12 files changed, 135 insertions(+), 132 deletions(-)
 rename headers/enduro2d/high/assets/{spine_model_asset.hpp => spine_asset.hpp} (81%)
 rename headers/enduro2d/high/{spine_model.hpp => spine.hpp} (54%)
 rename sources/enduro2d/high/assets/{spine_model_asset.cpp => spine_asset.cpp} (86%)
 rename sources/enduro2d/high/{spine_model.cpp => spine.cpp} (65%)

diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index 9b884826..747c9796 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -21,7 +21,7 @@
 #include "assets/shader_asset.hpp"
 #include "assets/shape_asset.hpp"
 #include "assets/sound_asset.hpp"
-#include "assets/spine_model_asset.hpp"
+#include "assets/spine_asset.hpp"
 #include "assets/sprite_asset.hpp"
 #include "assets/text_asset.hpp"
 #include "assets/texture_asset.hpp"
@@ -59,6 +59,7 @@
 #include "node.hpp"
 #include "node.inl"
 #include "prefab.hpp"
+#include "spine.hpp"
 #include "sprite.hpp"
 #include "starter.hpp"
 #include "world.hpp"
diff --git a/headers/enduro2d/high/_high.hpp b/headers/enduro2d/high/_high.hpp
index c21f251a..e8c62d30 100644
--- a/headers/enduro2d/high/_high.hpp
+++ b/headers/enduro2d/high/_high.hpp
@@ -33,7 +33,7 @@ namespace e2d
     class shader_asset;
     class shape_asset;
     class sound_asset;
-    class spine_model_asset;
+    class spine_asset;
     class sprite_asset;
     class text_asset;
     class texture_asset;
@@ -74,6 +74,7 @@ namespace e2d
     class model;
     class node;
     class prefab;
+    class spine;
     class sprite;
     class starter;
     class world;
diff --git a/headers/enduro2d/high/assets/spine_model_asset.hpp b/headers/enduro2d/high/assets/spine_asset.hpp
similarity index 81%
rename from headers/enduro2d/high/assets/spine_model_asset.hpp
rename to headers/enduro2d/high/assets/spine_asset.hpp
index 8bfb86e0..bff4bbf6 100644
--- a/headers/enduro2d/high/assets/spine_model_asset.hpp
+++ b/headers/enduro2d/high/assets/spine_asset.hpp
@@ -9,13 +9,13 @@
 #include "../_high.hpp"
 
 #include "../library.hpp"
-#include "../spine_model.hpp"
+#include "../spine.hpp"
 
 namespace e2d
 {
-    class spine_model_asset final : public content_asset<spine_model_asset, spine_model> {
+    class spine_asset final : public content_asset<spine_asset, spine> {
     public:
-        static const char* type_name() noexcept { return "spine_model_asset"; }
+        static const char* type_name() noexcept { return "spine_asset"; }
         static load_async_result load_async(const library& library, str_view address);
     };
 }
diff --git a/headers/enduro2d/high/components/spine_player.hpp b/headers/enduro2d/high/components/spine_player.hpp
index f15e0b5e..e17cf2ec 100644
--- a/headers/enduro2d/high/components/spine_player.hpp
+++ b/headers/enduro2d/high/components/spine_player.hpp
@@ -9,8 +9,8 @@
 #include "../_high.hpp"
 
 #include "../factory.hpp"
+#include "../assets/spine_asset.hpp"
 #include "../assets/material_asset.hpp"
-#include "../assets/spine_model_asset.hpp"
 
 struct spSkeleton;
 struct spSkeletonClipping;
@@ -32,13 +32,14 @@ namespace e2d
         using animation_ptr = std::shared_ptr<spAnimationState>;
     public:
         spine_player() = default;
-        spine_player(const spine_model_asset::ptr& model);
-        
-        spine_player& model(
-            const spine_model_asset::ptr& value);
+        spine_player(const spine_asset::ptr& spine);
+
+        spine_player& spine(
+            const spine_asset::ptr& value);
 
         spine_player& materials(
             flat_map<str_hash, material_asset::ptr>&& value) noexcept;
+
         spine_player& materials(
             const flat_map<str_hash, material_asset::ptr>& value);
 
@@ -48,18 +49,18 @@ namespace e2d
         bool has_skin(const str& name) const noexcept;
         bool has_animation(const str& name) const noexcept;
 
+        const spine_asset::ptr& spine() const noexcept;
         const clipping_ptr& clipper() const noexcept;
         const skeleton_ptr& skeleton() const noexcept;
         const animation_ptr& animation() const noexcept;
-        const spine_model_asset::ptr& model() const noexcept;
 
         material_asset::ptr find_material(str_hash name) const noexcept;
         const flat_map<str_hash, material_asset::ptr>& materials() const noexcept;
     private:
+        spine_asset::ptr spine_;
         clipping_ptr clipping_;
         skeleton_ptr skeleton_;
         animation_ptr animation_;
-        spine_model_asset::ptr model_;
         flat_map<str_hash, material_asset::ptr> materials_;
     };
 
@@ -71,7 +72,7 @@ namespace e2d
         bool operator()(
             spine_player& component,
             const fill_context& ctx) const;
-            
+
         bool operator()(
             asset_dependencies& dependencies,
             const collect_context& ctx) const;
diff --git a/headers/enduro2d/high/spine_model.hpp b/headers/enduro2d/high/spine.hpp
similarity index 54%
rename from headers/enduro2d/high/spine_model.hpp
rename to headers/enduro2d/high/spine.hpp
index 41e28f1b..7bf39e74 100644
--- a/headers/enduro2d/high/spine_model.hpp
+++ b/headers/enduro2d/high/spine.hpp
@@ -14,39 +14,39 @@ struct spAnimationStateData;
 
 namespace e2d
 {
-    class bad_spine_model_access final : public exception {
+    class bad_spine_access final : public exception {
     public:
         const char* what() const noexcept final {
-            return "bad spine model access";
+            return "bad spine access";
         }
     };
 
-    class spine_model final {
+    class spine final {
     public:
         using atlas_ptr = std::shared_ptr<spAtlas>;
         using skeleton_data_ptr = std::shared_ptr<spSkeletonData>;
         using animation_data_ptr = std::shared_ptr<spAnimationStateData>;
     public:
-        spine_model() = default;
-        ~spine_model() noexcept = default;
+        spine() = default;
+        ~spine() noexcept = default;
 
-        spine_model(spine_model&& other) noexcept;
-        spine_model& operator=(spine_model&& other) noexcept;
-        
-        spine_model(const spine_model& other);
-        spine_model& operator=(const spine_model& other);
+        spine(spine&& other) noexcept;
+        spine& operator=(spine&& other) noexcept;
+
+        spine(const spine& other);
+        spine& operator=(const spine& other);
 
         void clear() noexcept;
-        void swap(spine_model& other) noexcept;
+        void swap(spine& other) noexcept;
 
-        spine_model& assign(spine_model&& other) noexcept;
-        spine_model& assign(const spine_model& other);
+        spine& assign(spine&& other) noexcept;
+        spine& assign(const spine& other);
 
-        spine_model& set_atlas(atlas_ptr atlas);
-        spine_model& set_skeleton(skeleton_data_ptr skeleton);
+        spine& set_atlas(atlas_ptr atlas);
+        spine& set_skeleton(skeleton_data_ptr skeleton);
 
-        spine_model& set_default_mix(secf duration);
-        spine_model& set_animation_mix(
+        spine& set_default_mix(secf duration);
+        spine& set_animation_mix(
             const str& from,
             const str& to,
             secf duration);
@@ -60,7 +60,7 @@ namespace e2d
         animation_data_ptr animation_;
     };
 
-    void swap(spine_model& l, spine_model& r) noexcept;
-    bool operator==(const spine_model& l, const spine_model& r) noexcept;
-    bool operator!=(const spine_model& l, const spine_model& r) noexcept;
+    void swap(spine& l, spine& r) noexcept;
+    bool operator==(const spine& l, const spine& r) noexcept;
+    bool operator!=(const spine& l, const spine& r) noexcept;
 }
diff --git a/samples/bin/library/prefabs/coin_prefab.json b/samples/bin/library/prefabs/coin_prefab.json
index 9150a31e..2ada0a91 100644
--- a/samples/bin/library/prefabs/coin_prefab.json
+++ b/samples/bin/library/prefabs/coin_prefab.json
@@ -2,7 +2,7 @@
     "prototype" : "spine_prefab.json",
     "components" : {
         "spine_player" : {
-            "model" : "../spines/coin_spine.json"
+            "spine" : "../spines/coin_spine.json"
         },
         "spine_player_cmd" : {
             "commands" : [{
diff --git a/samples/bin/library/prefabs/dragon_prefab.json b/samples/bin/library/prefabs/dragon_prefab.json
index af73e837..cb26173b 100644
--- a/samples/bin/library/prefabs/dragon_prefab.json
+++ b/samples/bin/library/prefabs/dragon_prefab.json
@@ -2,7 +2,7 @@
     "prototype" : "spine_prefab.json",
     "components" : {
         "spine_player" : {
-            "model" : "../spines/dragon_spine.json"
+            "spine" : "../spines/dragon_spine.json"
         },
         "spine_player_cmd" : {
             "commands" : [{
diff --git a/samples/bin/library/prefabs/raptor_prefab.json b/samples/bin/library/prefabs/raptor_prefab.json
index 89bdfc7d..b44ab93d 100644
--- a/samples/bin/library/prefabs/raptor_prefab.json
+++ b/samples/bin/library/prefabs/raptor_prefab.json
@@ -2,7 +2,7 @@
     "prototype" : "spine_prefab.json",
     "components" : {
         "spine_player" : {
-            "model" : "../spines/raptor_spine.json"
+            "spine" : "../spines/raptor_spine.json"
         },
         "spine_player_cmd" : {
             "commands" : [{
diff --git a/sources/enduro2d/high/assets/spine_model_asset.cpp b/sources/enduro2d/high/assets/spine_asset.cpp
similarity index 86%
rename from sources/enduro2d/high/assets/spine_model_asset.cpp
rename to sources/enduro2d/high/assets/spine_asset.cpp
index 61ff571c..fbd5af9d 100644
--- a/sources/enduro2d/high/assets/spine_model_asset.cpp
+++ b/sources/enduro2d/high/assets/spine_asset.cpp
@@ -4,7 +4,7 @@
  * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
  ******************************************************************************/
 
-#include <enduro2d/high/assets/spine_model_asset.hpp>
+#include <enduro2d/high/assets/spine_asset.hpp>
 
 #include <enduro2d/high/assets/json_asset.hpp>
 #include <enduro2d/high/assets/binary_asset.hpp>
@@ -17,13 +17,13 @@ namespace
 {
     using namespace e2d;
 
-    class spine_model_asset_loading_exception final : public asset_loading_exception {
+    class spine_asset_loading_exception final : public asset_loading_exception {
         const char* what() const noexcept final {
-            return "spine model asset loading exception";
+            return "spine asset loading exception";
         }
     };
 
-    const char* spine_model_asset_schema_source = R"json({
+    const char* spine_asset_schema_source = R"json({
         "type" : "object",
         "required" : [ "atlas", "skeleton" ],
         "additionalProperties" : false,
@@ -52,16 +52,16 @@ namespace
         }
     })json";
 
-    const rapidjson::SchemaDocument& spine_model_asset_schema() {
+    const rapidjson::SchemaDocument& spine_asset_schema() {
         static std::mutex mutex;
         static std::unique_ptr<rapidjson::SchemaDocument> schema;
 
         std::lock_guard<std::mutex> guard(mutex);
         if ( !schema ) {
             rapidjson::Document doc;
-            if ( doc.Parse(spine_model_asset_schema_source).HasParseError() ) {
-                the<debug>().error("SPINE: Failed to parse spine model asset schema");
-                throw spine_model_asset_loading_exception();
+            if ( doc.Parse(spine_asset_schema_source).HasParseError() ) {
+                the<debug>().error("ASSETS: Failed to parse spine asset schema");
+                throw spine_asset_loading_exception();
             }
             json_utils::add_common_schema_definitions(doc);
             schema = std::make_unique<rapidjson::SchemaDocument>(doc);
@@ -82,19 +82,19 @@ namespace
         E2D_ASSERT(root.HasMember("from") && root["from"].IsString());
         if ( !json_utils::try_parse_value(root["from"], mix.from) ) {
             the<debug>().error("SPINE: Incorrect formating of 'from' property");
-            throw spine_model_asset_loading_exception();
+            throw spine_asset_loading_exception();
         }
 
         E2D_ASSERT(root.HasMember("to") && root["to"].IsString());
         if ( !json_utils::try_parse_value(root["to"], mix.to) ) {
             the<debug>().error("SPINE: Incorrect formating of 'to' property");
-            throw spine_model_asset_loading_exception();
+            throw spine_asset_loading_exception();
         }
 
         E2D_ASSERT(root.HasMember("duration") && root["duration"].IsNumber());
         if ( !json_utils::try_parse_value(root["duration"], mix.duration) ) {
             the<debug>().error("SPINE: Incorrect formating of 'duration' property");
-            throw spine_model_asset_loading_exception();
+            throw spine_asset_loading_exception();
         }
 
         return mix;
@@ -105,7 +105,7 @@ namespace
         asset_dependencies loading;
     };
 
-    stdex::promise<spine_model::atlas_ptr> load_atlas(
+    stdex::promise<spine::atlas_ptr> load_atlas(
         const library& library,
         const str& parent_address,
         const str& atlas_address)
@@ -120,7 +120,7 @@ namespace
         ](const binary_asset::load_result& atlas_data){
             auto atlas_internal = std::make_unique<atlas_internal_state>();
 
-            spine_model::atlas_ptr atlas(
+            spine::atlas_ptr atlas(
                 spAtlas_create(
                     reinterpret_cast<const char*>(atlas_data->content().data()),
                     math::numeric_cast<int>(atlas_data->content().size()),
@@ -130,7 +130,7 @@ namespace
 
             if ( !atlas ) {
                 the<debug>().error("SPINE: Failed to create preload atlas");
-                throw spine_model_asset_loading_exception();
+                throw spine_asset_loading_exception();
             }
 
             return stdex::make_tuple_promise(std::make_tuple(
@@ -146,7 +146,7 @@ namespace
             auto atlas_internal = std::make_unique<atlas_internal_state>();
             atlas_internal->loaded = std::get<0>(results);
 
-            spine_model::atlas_ptr atlas(
+            spine::atlas_ptr atlas(
                 spAtlas_create(
                     reinterpret_cast<const char*>(std::get<1>(results)->content().data()),
                     math::numeric_cast<int>(std::get<1>(results)->content().size()),
@@ -156,13 +156,13 @@ namespace
 
             if ( !atlas ) {
                 the<debug>().error("SPINE: Failed to create preloaded atlas");
-                throw spine_model_asset_loading_exception();
+                throw spine_asset_loading_exception();
             }
 
             for ( const spAtlasPage* page = atlas->pages; page; page = page->next ) {
                 if ( !page->rendererObject ) {
                     the<debug>().error("SPINE: Failed to create preloaded atlas");
-                    throw spine_model_asset_loading_exception();
+                    throw spine_asset_loading_exception();
                 }
             }
 
@@ -171,12 +171,12 @@ namespace
         });
     }
 
-    stdex::promise<spine_model::skeleton_data_ptr> load_skeleton_data(
+    stdex::promise<spine::skeleton_data_ptr> load_skeleton_data(
         const library& library,
         const str& parent_address,
         const str& skeleton_address,
         f32 skeleton_scale,
-        const spine_model::atlas_ptr& atlas)
+        const spine::atlas_ptr& atlas)
     {
         return library.load_asset_async<binary_asset>(
             path::combine(parent_address, skeleton_address))
@@ -196,12 +196,12 @@ namespace
 
                 if ( !binary_skeleton ) {
                     the<debug>().error("SPINE: Failed to create binary skeleton");
-                    throw spine_model_asset_loading_exception();
+                    throw spine_asset_loading_exception();
                 }
 
                 binary_skeleton->scale = skeleton_scale;
 
-                spine_model::skeleton_data_ptr data_skeleton(
+                spine::skeleton_data_ptr data_skeleton(
                     spSkeletonBinary_readSkeletonData(
                         binary_skeleton.get(),
                         reinterpret_cast<const unsigned char*>(skeleton_data->content().data()),
@@ -212,7 +212,7 @@ namespace
                     the<debug>().error("SPINE: Failed to read binary skeleton data:\n"
                         "--> Error: %0",
                         binary_skeleton->error);
-                    throw spine_model_asset_loading_exception();
+                    throw spine_asset_loading_exception();
                 }
 
                 return data_skeleton;
@@ -227,12 +227,12 @@ namespace
 
                 if ( !json_skeleton ) {
                     the<debug>().error("SPINE: Failed to create json skeleton");
-                    throw spine_model_asset_loading_exception();
+                    throw spine_asset_loading_exception();
                 }
 
                 json_skeleton->scale = skeleton_scale;
 
-                spine_model::skeleton_data_ptr data_skeleton(
+                spine::skeleton_data_ptr data_skeleton(
                     spSkeletonJson_readSkeletonData(
                         json_skeleton.get(),
                         reinterpret_cast<const char*>(skeleton_data->content().data())),
@@ -242,7 +242,7 @@ namespace
                     the<debug>().error("SPINE: Failed to read json skeleton data:\n"
                         "--> Error: %0",
                         json_skeleton->error);
-                    throw spine_model_asset_loading_exception();
+                    throw spine_asset_loading_exception();
                 }
 
                 return data_skeleton;
@@ -250,7 +250,7 @@ namespace
         });
     }
 
-    stdex::promise<spine_model> parse_spine_model(
+    stdex::promise<spine> parse_spine(
         const library& library,
         const str& parent_address,
         const rapidjson::Value& root)
@@ -297,7 +297,7 @@ namespace
             atlas_address,
             skeleton_scale,
             skeleton_address
-        ](const spine_model::atlas_ptr& atlas){
+        ](const spine::atlas_ptr& atlas){
             return stdex::make_tuple_promise(std::make_tuple(
                 stdex::make_resolved_promise(atlas),
                 load_skeleton_data(
@@ -311,10 +311,10 @@ namespace
             default_animation_mix,
             animation_mixes = std::move(animation_mixes)
         ](const std::tuple<
-            spine_model::atlas_ptr,
-            spine_model::skeleton_data_ptr
+            spine::atlas_ptr,
+            spine::skeleton_data_ptr
         >& results){
-            spine_model content;
+            spine content;
             content.set_atlas(std::get<0>(results));
             content.set_skeleton(std::get<1>(results));
             content.set_default_mix(default_animation_mix);
@@ -328,7 +328,7 @@ namespace
 
 namespace e2d
 {
-    spine_model_asset::load_async_result spine_model_asset::load_async(
+    spine_asset::load_async_result spine_asset::load_async(
         const library& library, str_view address)
     {
         return library.load_asset_async<json_asset>(address)
@@ -339,7 +339,7 @@ namespace e2d
         ](const json_asset::load_result& spine_data){
             return the<deferrer>().do_in_worker_thread([address, spine_data](){
                 const rapidjson::Document& doc = *spine_data->content();
-                rapidjson::SchemaValidator validator(spine_model_asset_schema());
+                rapidjson::SchemaValidator validator(spine_asset_schema());
 
                 if ( doc.Accept(validator) ) {
                     return;
@@ -358,14 +358,14 @@ namespace e2d
                     the<debug>().error("ASSET: Failed to validate asset json");
                 }
 
-                throw spine_model_asset_loading_exception();
+                throw spine_asset_loading_exception();
             })
             .then([&library, parent_address, spine_data](){
-                return parse_spine_model(
+                return parse_spine(
                     library, parent_address, *spine_data->content());
             })
             .then([](auto&& content){
-                return spine_model_asset::create(
+                return spine_asset::create(
                     std::forward<decltype(content)>(content));
             });
         });
diff --git a/sources/enduro2d/high/components/spine_player.cpp b/sources/enduro2d/high/components/spine_player.cpp
index 5dda517c..9a6d6562 100644
--- a/sources/enduro2d/high/components/spine_player.cpp
+++ b/sources/enduro2d/high/components/spine_player.cpp
@@ -10,11 +10,11 @@
 
 namespace e2d
 {
-    spine_player::spine_player(const spine_model_asset::ptr& model) {
-        this->model(model);
+    spine_player::spine_player(const spine_asset::ptr& spine) {
+        this->spine(spine);
     }
-    
-    spine_player& spine_player::model(const spine_model_asset::ptr& value) {
+
+    spine_player& spine_player::spine(const spine_asset::ptr& value) {
         clipping_ptr new_clipping = clipping_ptr(
             spSkeletonClipping_create(),
             spSkeletonClipping_dispose);
@@ -42,7 +42,7 @@ namespace e2d
             }
         }
 
-        model_ = value;
+        spine_ = value;
         clipping_ = std::move(new_clipping);
         skeleton_ = std::move(new_skeleton);
         animation_ = std::move(new_animation);
@@ -69,7 +69,7 @@ namespace e2d
         }
         return *this;
     }
-    
+
     spine_player& spine_player::attachment(const str& slot, const str& name) noexcept {
         if ( !spSkeleton_setAttachment(skeleton_.get(), slot.c_str(), name.c_str()) ) {
             the<debug>().error("SPINE_PLAYER: can't set attachment '%0' to slot '%1'", name, slot);
@@ -78,17 +78,21 @@ namespace e2d
     }
 
     bool spine_player::has_skin(const str& name) const noexcept {
-        return model_
-            && model()->content().skeleton()
-            && spSkeletonData_findSkin(model()->content().skeleton().get(), name.c_str());
-    }
-    
-    bool spine_player::has_animation(const str& name) const noexcept {
-        return model_
-            && model()->content().skeleton()
-            && spSkeletonData_findAnimation(model()->content().skeleton().get(), name.c_str());
+        return spine_
+            && spine()->content().skeleton()
+            && spSkeletonData_findSkin(spine()->content().skeleton().get(), name.c_str());
     }
 
+    bool spine_player::has_animation(const str& name) const noexcept {
+        return spine_
+            && spine()->content().skeleton()
+            && spSkeletonData_findAnimation(spine()->content().skeleton().get(), name.c_str());
+    }
+
+    const spine_asset::ptr& spine_player::spine() const noexcept {
+        return spine_;
+    }
+    
     const spine_player::clipping_ptr& spine_player::clipper() const noexcept {
         return clipping_;
     }
@@ -100,10 +104,6 @@ namespace e2d
     const spine_player::animation_ptr& spine_player::animation() const noexcept {
         return animation_;
     }
-    
-    const spine_model_asset::ptr& spine_player::model() const noexcept {
-        return model_;
-    }
 
     material_asset::ptr spine_player::find_material(str_hash name) const noexcept {
         const auto iter = materials_.find(name);
@@ -124,7 +124,7 @@ namespace e2d
         "required" : [],
         "additionalProperties" : false,
         "properties" : {
-            "model" : { "$ref": "#/common_definitions/address" },
+            "spine" : { "$ref": "#/common_definitions/address" },
             "materials" : { "$ref": "#/definitions/materials" },
             "skin" : { "$ref": "#/common_definitions/name" },
             "attachments" : { "$ref": "#/definitions/attachments" }
@@ -156,23 +156,23 @@ namespace e2d
             }
         }
     })json";
-    
+
     bool factory_loader<spine_player>::operator()(
         spine_player& component,
         const fill_context& ctx) const
     {
-        if ( ctx.root.HasMember("model") ) {
-            auto model = ctx.dependencies.find_asset<spine_model_asset>(
-                path::combine(ctx.parent_address, ctx.root["model"].GetString()));
-            if ( !model ) {
-                the<debug>().error("SPINE_PLAYER: Dependency 'model' is not found:\n"
+        if ( ctx.root.HasMember("spine") ) {
+            auto spine = ctx.dependencies.find_asset<spine_asset>(
+                path::combine(ctx.parent_address, ctx.root["spine"].GetString()));
+            if ( !spine ) {
+                the<debug>().error("SPINE_PLAYER: Dependency 'spine' is not found:\n"
                     "--> Parent address: %0\n"
                     "--> Dependency address: %1",
                     ctx.parent_address,
-                    ctx.root["model"].GetString());
+                    ctx.root["spine"].GetString());
                 return false;
             }
-            component.model(model);
+            component.spine(spine);
         }
 
         if ( ctx.root.HasMember("materials") ) {
@@ -209,7 +209,7 @@ namespace e2d
             }
             component.materials(std::move(materials));
         }
-        
+
         if ( ctx.root.HasMember("skin") ) {
             str skin;
             if ( !json_utils::try_parse_value(ctx.root["skin"], skin) ) {
@@ -222,7 +222,7 @@ namespace e2d
         if ( ctx.root.HasMember("attachments") ) {
             const auto& attachments_json = ctx.root["attachments"];
             E2D_ASSERT(attachments_json.IsArray());
-            
+
             for ( rapidjson::SizeType i = 0; i < attachments_json.Size(); ++i ) {
                 E2D_ASSERT(attachments_json[i].IsObject());
                 const auto& attachment_json = attachments_json[i];
@@ -247,14 +247,14 @@ namespace e2d
 
         return true;
     }
-    
+
     bool factory_loader<spine_player>::operator()(
         asset_dependencies& dependencies,
         const collect_context& ctx) const
     {
-        if ( ctx.root.HasMember("model") ) {
-            dependencies.add_dependency<spine_model_asset>(
-                path::combine(ctx.parent_address, ctx.root["model"].GetString()));
+        if ( ctx.root.HasMember("spine") ) {
+            dependencies.add_dependency<spine_asset>(
+                path::combine(ctx.parent_address, ctx.root["spine"].GetString()));
         }
 
         if ( ctx.root.HasMember("materials") ) {
diff --git a/sources/enduro2d/high/spine_model.cpp b/sources/enduro2d/high/spine.cpp
similarity index 65%
rename from sources/enduro2d/high/spine_model.cpp
rename to sources/enduro2d/high/spine.cpp
index 08af0451..1fc798a9 100644
--- a/sources/enduro2d/high/spine_model.cpp
+++ b/sources/enduro2d/high/spine.cpp
@@ -4,52 +4,52 @@
  * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
  ******************************************************************************/
 
-#include <enduro2d/high/spine_model.hpp>
+#include <enduro2d/high/spine.hpp>
 
 #include <spine/spine.h>
 
 namespace e2d
 {
-    spine_model::spine_model(spine_model&& other) noexcept {
+    spine::spine(spine&& other) noexcept {
         assign(std::move(other));
     }
 
-    spine_model& spine_model::operator=(spine_model&& other) noexcept {
+    spine& spine::operator=(spine&& other) noexcept {
         return assign(std::move(other));
     }
-    
-    spine_model::spine_model(const spine_model& other) {
+
+    spine::spine(const spine& other) {
         assign(other);
     }
 
-    spine_model& spine_model::operator=(const spine_model& other) {
+    spine& spine::operator=(const spine& other) {
         return assign(other);
     }
 
-    void spine_model::clear() noexcept {
+    void spine::clear() noexcept {
         atlas_.reset();
         skeleton_.reset();
         animation_.reset();
     }
 
-    void spine_model::swap(spine_model& other) noexcept {
+    void spine::swap(spine& other) noexcept {
         using std::swap;
         swap(atlas_, other.atlas_);
         swap(skeleton_, other.skeleton_);
         swap(animation_, other.animation_);
     }
 
-    spine_model& spine_model::assign(spine_model&& other) noexcept {
+    spine& spine::assign(spine&& other) noexcept {
         if ( this != &other ) {
             swap(other);
             other.clear();
         }
         return *this;
     }
-    
-    spine_model& spine_model::assign(const spine_model& other) {
+
+    spine& spine::assign(const spine& other) {
         if ( this != &other ) {
-            spine_model m;
+            spine m;
             m.atlas_ = other.atlas_;
             m.skeleton_ = other.skeleton_;
             m.animation_ = other.animation_;
@@ -58,12 +58,12 @@ namespace e2d
         return *this;
     }
 
-    spine_model& spine_model::set_atlas(atlas_ptr atlas) {
+    spine& spine::set_atlas(atlas_ptr atlas) {
         atlas_ = std::move(atlas);
         return *this;
     }
 
-    spine_model& spine_model::set_skeleton(skeleton_data_ptr skeleton) {
+    spine& spine::set_skeleton(skeleton_data_ptr skeleton) {
         animation_data_ptr animation;
         if ( skeleton ) {
             animation.reset(
@@ -78,15 +78,15 @@ namespace e2d
         return *this;
     }
 
-    spine_model& spine_model::set_default_mix(secf duration) {
+    spine& spine::set_default_mix(secf duration) {
         if ( !animation_ ) {
-            throw bad_spine_model_access();
+            throw bad_spine_access();
         }
         animation_->defaultMix = duration.value;
         return *this;
     }
 
-    spine_model& spine_model::set_animation_mix(
+    spine& spine::set_animation_mix(
         const str& from,
         const str& to,
         secf duration)
@@ -100,39 +100,39 @@ namespace e2d
             : nullptr;
 
         if ( !from_anim || !to_anim ) {
-            throw bad_spine_model_access();
+            throw bad_spine_access();
         }
 
         spAnimationStateData_setMix(animation_.get(), from_anim, to_anim, duration.value);
         return *this;
     }
 
-    const spine_model::atlas_ptr& spine_model::atlas() const noexcept {
+    const spine::atlas_ptr& spine::atlas() const noexcept {
         return atlas_;
     }
 
-    const spine_model::skeleton_data_ptr& spine_model::skeleton() const noexcept {
+    const spine::skeleton_data_ptr& spine::skeleton() const noexcept {
         return skeleton_;
     }
 
-    const spine_model::animation_data_ptr& spine_model::animation() const noexcept {
+    const spine::animation_data_ptr& spine::animation() const noexcept {
         return animation_;
     }
 }
 
 namespace e2d
 {
-    void swap(spine_model& l, spine_model& r) noexcept {
+    void swap(spine& l, spine& r) noexcept {
         l.swap(r);
     }
-    
-    bool operator==(const spine_model& l, const spine_model& r) noexcept {
+
+    bool operator==(const spine& l, const spine& r) noexcept {
         return l.atlas() == r.atlas()
             && l.skeleton() == r.skeleton()
             && l.animation() == r.animation();
     }
 
-    bool operator!=(const spine_model& l, const spine_model& r) noexcept {
+    bool operator!=(const spine& l, const spine& r) noexcept {
         return !(l == r);
     }
 }
diff --git a/untests/sources/untests_core/render.cpp b/untests/sources/untests_core/render.cpp
index 7a43875f..a282cfd7 100644
--- a/untests/sources/untests_core/render.cpp
+++ b/untests/sources/untests_core/render.cpp
@@ -35,10 +35,10 @@ TEST_CASE("render"){
         }
         {
             const auto ss = render::sampler_state()
-                .wrap(render::sampler_wrap::clamp)
+                .wrap(render::sampler_wrap::clamp, render::sampler_wrap::mirror)
                 .filter(render::sampler_min_filter::linear, render::sampler_mag_filter::nearest);
             REQUIRE(ss.s_wrap() == render::sampler_wrap::clamp);
-            REQUIRE(ss.t_wrap() == render::sampler_wrap::clamp);
+            REQUIRE(ss.t_wrap() == render::sampler_wrap::mirror);
             REQUIRE(ss.min_filter() == render::sampler_min_filter::linear);
             REQUIRE(ss.mag_filter() == render::sampler_mag_filter::nearest);
         }

From 21b8dc049ef32060483ec76763568ccb54637d4f Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 5 Sep 2019 14:58:17 +0700
Subject: [PATCH 106/108] remove flipbook_source and move flipbook source to
 flipbook_player

---
 headers/enduro2d/high/_all.hpp                |  1 -
 headers/enduro2d/high/_high.hpp               |  1 -
 .../high/components/flipbook_player.hpp       | 17 ++++++
 .../high/components/flipbook_source.hpp       | 55 -------------------
 samples/sources/sample_03/sample_03.cpp       |  3 +-
 .../high/components/flipbook_player.cpp       | 35 +++++++++---
 .../high/components/flipbook_source.cpp       | 52 ------------------
 sources/enduro2d/high/starter.cpp             |  2 -
 .../enduro2d/high/systems/flipbook_system.cpp | 13 ++---
 9 files changed, 50 insertions(+), 129 deletions(-)
 delete mode 100644 headers/enduro2d/high/components/flipbook_source.hpp
 delete mode 100644 sources/enduro2d/high/components/flipbook_source.cpp

diff --git a/headers/enduro2d/high/_all.hpp b/headers/enduro2d/high/_all.hpp
index 747c9796..8fdf9090 100644
--- a/headers/enduro2d/high/_all.hpp
+++ b/headers/enduro2d/high/_all.hpp
@@ -30,7 +30,6 @@
 #include "components/actor.hpp"
 #include "components/camera.hpp"
 #include "components/flipbook_player.hpp"
-#include "components/flipbook_source.hpp"
 #include "components/label.hpp"
 #include "components/model_renderer.hpp"
 #include "components/renderer.hpp"
diff --git a/headers/enduro2d/high/_high.hpp b/headers/enduro2d/high/_high.hpp
index e8c62d30..2e239c2f 100644
--- a/headers/enduro2d/high/_high.hpp
+++ b/headers/enduro2d/high/_high.hpp
@@ -42,7 +42,6 @@ namespace e2d
     class actor;
     class camera;
     class flipbook_player;
-    class flipbook_source;
     class label;
     class model_renderer;
     class renderer;
diff --git a/headers/enduro2d/high/components/flipbook_player.hpp b/headers/enduro2d/high/components/flipbook_player.hpp
index a8e64882..13fb78eb 100644
--- a/headers/enduro2d/high/components/flipbook_player.hpp
+++ b/headers/enduro2d/high/components/flipbook_player.hpp
@@ -16,6 +16,7 @@ namespace e2d
     class flipbook_player final {
     public:
         flipbook_player() = default;
+        flipbook_player(const flipbook_asset::ptr& flipbook);
 
         // data access
 
@@ -37,6 +38,9 @@ namespace e2d
         flipbook_player& sequence(str_hash value) noexcept;
         str_hash sequence() const noexcept;
 
+        flipbook_player& flipbook(const flipbook_asset::ptr& value) noexcept;
+        const flipbook_asset::ptr& flipbook() const noexcept;
+
         // helpers
 
         flipbook_player& stop(f32 ntime) noexcept;
@@ -50,6 +54,7 @@ namespace e2d
         bool looped_{false};
         bool playing_{false};
         str_hash sequence_;
+        flipbook_asset::ptr flipbook_;
     };
 
     template <>
@@ -69,6 +74,9 @@ namespace e2d
 
 namespace e2d
 {
+    inline flipbook_player::flipbook_player(const flipbook_asset::ptr& flipbook)
+    : flipbook_(flipbook) {}
+
     inline flipbook_player& flipbook_player::time(f32 value) noexcept {
         time_ = value;
         return *this;
@@ -123,6 +131,15 @@ namespace e2d
         return sequence_;
     }
 
+    inline flipbook_player& flipbook_player::flipbook(const flipbook_asset::ptr& value) noexcept {
+        flipbook_ = value;
+        return *this;
+    }
+
+    inline const flipbook_asset::ptr& flipbook_player::flipbook() const noexcept {
+        return flipbook_;
+    }
+
     inline flipbook_player& flipbook_player::stop(f32 ntime) noexcept {
         return time(ntime).stopped(true);
     }
diff --git a/headers/enduro2d/high/components/flipbook_source.hpp b/headers/enduro2d/high/components/flipbook_source.hpp
deleted file mode 100644
index 2ca0e546..00000000
--- a/headers/enduro2d/high/components/flipbook_source.hpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * This file is part of the "Enduro2D"
- * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
- ******************************************************************************/
-
-#pragma once
-
-#include "../_high.hpp"
-
-#include "../factory.hpp"
-#include "../assets/flipbook_asset.hpp"
-
-namespace e2d
-{
-    class flipbook_source final {
-    public:
-        flipbook_source() = default;
-        flipbook_source(const flipbook_asset::ptr& flipbook);
-
-        flipbook_source& flipbook(const flipbook_asset::ptr& value) noexcept;
-        const flipbook_asset::ptr& flipbook() const noexcept;
-    private:
-        flipbook_asset::ptr flipbook_;
-    };
-
-    template <>
-    class factory_loader<flipbook_source> final : factory_loader<> {
-    public:
-        static const char* schema_source;
-
-        bool operator()(
-            flipbook_source& component,
-            const fill_context& ctx) const;
-            
-        bool operator()(
-            asset_dependencies& dependencies,
-            const collect_context& ctx) const;
-    };
-}
-
-namespace e2d
-{
-    inline flipbook_source::flipbook_source(const flipbook_asset::ptr& flipbook)
-    : flipbook_(flipbook) {}
-
-    inline flipbook_source& flipbook_source::flipbook(const flipbook_asset::ptr& value) noexcept {
-        flipbook_ = value;
-        return *this;
-    }
-
-    inline const flipbook_asset::ptr& flipbook_source::flipbook() const noexcept {
-        return flipbook_;
-    }
-}
diff --git a/samples/sources/sample_03/sample_03.cpp b/samples/sources/sample_03/sample_03.cpp
index 2d591ea3..77d68f29 100644
--- a/samples/sources/sample_03/sample_03.cpp
+++ b/samples/sources/sample_03/sample_03.cpp
@@ -130,8 +130,7 @@ namespace
                         .component<sprite_renderer>(sprite_renderer()
                             .filtering(false)
                             .materials({{"normal", sprite_mat}}))
-                        .component<flipbook_source>(flipbook_res)
-                        .component<flipbook_player>(flipbook_player()
+                        .component<flipbook_player>(flipbook_player(flipbook_res)
                             .play("idle")
                             .looped(true));
 
diff --git a/sources/enduro2d/high/components/flipbook_player.cpp b/sources/enduro2d/high/components/flipbook_player.cpp
index 9991d384..2ba058c9 100644
--- a/sources/enduro2d/high/components/flipbook_player.cpp
+++ b/sources/enduro2d/high/components/flipbook_player.cpp
@@ -18,7 +18,8 @@ namespace e2d
             "looped" : { "type" : "boolean" },
             "stopped" : { "type" : "boolean" },
             "playing" : { "type" : "boolean" },
-            "sequence" : { "$ref": "#/common_definitions/name" }
+            "sequence" : { "$ref": "#/common_definitions/name" },
+            "flipbook" : { "$ref": "#/common_definitions/address" }
         }
     })json";
 
@@ -27,7 +28,7 @@ namespace e2d
         const fill_context& ctx) const
     {
         if ( ctx.root.HasMember("time") ) {
-            auto time = component.time();
+            f32 time = component.time();
             if ( !json_utils::try_parse_value(ctx.root["time"], time) ) {
                 the<debug>().error("FLIPBOOK_PLAYER: Incorrect formatting of 'time' property");
                 return false;
@@ -36,7 +37,7 @@ namespace e2d
         }
 
         if ( ctx.root.HasMember("speed") ) {
-            auto speed = component.speed();
+            f32 speed = component.speed();
             if ( !json_utils::try_parse_value(ctx.root["speed"], speed) ) {
                 the<debug>().error("FLIPBOOK_PLAYER: Incorrect formatting of 'speed' property");
                 return false;
@@ -45,7 +46,7 @@ namespace e2d
         }
 
         if ( ctx.root.HasMember("looped") ) {
-            auto looped = component.looped();
+            bool looped = component.looped();
             if ( !json_utils::try_parse_value(ctx.root["looped"], looped) ) {
                 the<debug>().error("FLIPBOOK_PLAYER: Incorrect formatting of 'looped' property");
                 return false;
@@ -54,7 +55,7 @@ namespace e2d
         }
 
         if ( ctx.root.HasMember("stopped") ) {
-            auto stopped = component.stopped();
+            bool stopped = component.stopped();
             if ( !json_utils::try_parse_value(ctx.root["stopped"], stopped) ) {
                 the<debug>().error("FLIPBOOK_PLAYER: Incorrect formatting of 'stopped' property");
                 return false;
@@ -63,7 +64,7 @@ namespace e2d
         }
 
         if ( ctx.root.HasMember("playing") ) {
-            auto playing = component.playing();
+            bool playing = component.playing();
             if ( !json_utils::try_parse_value(ctx.root["playing"], playing) ) {
                 the<debug>().error("FLIPBOOK_PLAYER: Incorrect formatting of 'playing' property");
                 return false;
@@ -72,7 +73,7 @@ namespace e2d
         }
 
         if ( ctx.root.HasMember("sequence") ) {
-            auto sequence = component.sequence();
+            str_hash sequence = component.sequence();
             if ( !json_utils::try_parse_value(ctx.root["sequence"], sequence) ) {
                 the<debug>().error("FLIPBOOK_PLAYER: Incorrect formatting of 'sequence' property");
                 return false;
@@ -80,6 +81,20 @@ namespace e2d
             component.sequence(sequence);
         }
 
+        if ( ctx.root.HasMember("flipbook") ) {
+            auto flipbook = ctx.dependencies.find_asset<flipbook_asset>(
+                path::combine(ctx.parent_address, ctx.root["flipbook"].GetString()));
+            if ( !flipbook ) {
+                the<debug>().error("FLIPBOOK_PLAYER: Dependency 'flipbook' is not found:\n"
+                    "--> Parent address: %0\n"
+                    "--> Dependency address: %1",
+                    ctx.parent_address,
+                    ctx.root["flipbook"].GetString());
+                return false;
+            }
+            component.flipbook(flipbook);
+        }
+
         return true;
     }
 
@@ -87,7 +102,11 @@ namespace e2d
         asset_dependencies& dependencies,
         const collect_context& ctx) const
     {
-        E2D_UNUSED(dependencies, ctx);
+        if ( ctx.root.HasMember("flipbook") ) {
+            dependencies.add_dependency<flipbook_asset>(
+                path::combine(ctx.parent_address, ctx.root["flipbook"].GetString()));
+        }
+
         return true;
     }
 }
diff --git a/sources/enduro2d/high/components/flipbook_source.cpp b/sources/enduro2d/high/components/flipbook_source.cpp
deleted file mode 100644
index 13c4436d..00000000
--- a/sources/enduro2d/high/components/flipbook_source.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * This file is part of the "Enduro2D"
- * For conditions of distribution and use, see copyright notice in LICENSE.md
- * Copyright (C) 2018-2019, by Matvey Cherevko (blackmatov@gmail.com)
- ******************************************************************************/
-
-#include <enduro2d/high/components/flipbook_source.hpp>
-
-namespace e2d
-{
-    const char* factory_loader<flipbook_source>::schema_source = R"json({
-        "type" : "object",
-        "required" : [],
-        "additionalProperties" : false,
-        "properties" : {
-            "flipbook" : { "$ref": "#/common_definitions/address" }
-        }
-    })json";
-
-    bool factory_loader<flipbook_source>::operator()(
-        flipbook_source& component,
-        const fill_context& ctx) const
-    {
-        if ( ctx.root.HasMember("flipbook") ) {
-            auto flipbook = ctx.dependencies.find_asset<flipbook_asset>(
-                path::combine(ctx.parent_address, ctx.root["flipbook"].GetString()));
-            if ( !flipbook ) {
-                the<debug>().error("FLIPBOOK_SOURCE: Dependency 'flipbook' is not found:\n"
-                    "--> Parent address: %0\n"
-                    "--> Dependency address: %1",
-                    ctx.parent_address,
-                    ctx.root["flipbook"].GetString());
-                return false;
-            }
-            component.flipbook(flipbook);
-        }
-
-        return true;
-    }
-
-    bool factory_loader<flipbook_source>::operator()(
-        asset_dependencies& dependencies,
-        const collect_context& ctx) const
-    {
-        if ( ctx.root.HasMember("flipbook") ) {
-            dependencies.add_dependency<flipbook_asset>(
-                path::combine(ctx.parent_address, ctx.root["flipbook"].GetString()));
-        }
-
-        return true;
-    }
-}
diff --git a/sources/enduro2d/high/starter.cpp b/sources/enduro2d/high/starter.cpp
index 0209143f..8cc67463 100644
--- a/sources/enduro2d/high/starter.cpp
+++ b/sources/enduro2d/high/starter.cpp
@@ -13,7 +13,6 @@
 #include <enduro2d/high/components/actor.hpp>
 #include <enduro2d/high/components/camera.hpp>
 #include <enduro2d/high/components/flipbook_player.hpp>
-#include <enduro2d/high/components/flipbook_source.hpp>
 #include <enduro2d/high/components/label.hpp>
 #include <enduro2d/high/components/model_renderer.hpp>
 #include <enduro2d/high/components/renderer.hpp>
@@ -138,7 +137,6 @@ namespace e2d
             .register_component<actor>("actor")
             .register_component<camera>("camera")
             .register_component<flipbook_player>("flipbook_player")
-            .register_component<flipbook_source>("flipbook_source")
             .register_component<label>("label")
             .register_component<label::dirty>("label.dirty")
             .register_component<model_renderer>("model_renderer")
diff --git a/sources/enduro2d/high/systems/flipbook_system.cpp b/sources/enduro2d/high/systems/flipbook_system.cpp
index 6749a27f..5877ec3c 100644
--- a/sources/enduro2d/high/systems/flipbook_system.cpp
+++ b/sources/enduro2d/high/systems/flipbook_system.cpp
@@ -7,7 +7,6 @@
 #include <enduro2d/high/systems/flipbook_system.hpp>
 
 #include <enduro2d/high/components/flipbook_player.hpp>
-#include <enduro2d/high/components/flipbook_source.hpp>
 #include <enduro2d/high/components/sprite_renderer.hpp>
 
 namespace
@@ -15,15 +14,14 @@ namespace
     using namespace e2d;
 
     void update_flipbook_timers(f32 dt, ecs::registry& owner) {
-        owner.for_joined_components<flipbook_player, flipbook_source>([dt](
+        owner.for_joined_components<flipbook_player>([dt](
             const ecs::const_entity&,
-            flipbook_player& fp,
-            const flipbook_source& fs)
+            flipbook_player& fp)
         {
             if ( fp.speed() <= 0.f || fp.stopped() ) {
                 return;
             }
-            const flipbook_asset::ptr& flipbook_res = fs.flipbook();
+            const flipbook_asset::ptr& flipbook_res = fp.flipbook();
             if ( !flipbook_res ) {
                 return;
             }
@@ -47,13 +45,12 @@ namespace
     }
 
     void update_flipbook_sprites(ecs::registry& owner) {
-        owner.for_joined_components<flipbook_player, flipbook_source, sprite_renderer>([](
+        owner.for_joined_components<flipbook_player, sprite_renderer>([](
             const ecs::const_entity&,
             const flipbook_player& fp,
-            const flipbook_source& fs,
             sprite_renderer& sr)
         {
-            const flipbook_asset::ptr& flipbook_res = fs.flipbook();
+            const flipbook_asset::ptr& flipbook_res = fp.flipbook();
             if ( !flipbook_res ) {
                 sr.sprite(nullptr);
                 return;

From c69c95ebc644e03f2879a0178be80efb87c163ec Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 5 Sep 2019 15:19:49 +0700
Subject: [PATCH 107/108] fix CI build errors

---
 CMakeLists.txt                                |  3 +-
 .../render_system_drawer.cpp                  | 51 ++++++++-----------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36ff8cfe..f00adc07 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,8 @@ cmake_minimum_required(VERSION 3.11 FATAL_ERROR)
 
 if(NOT DEFINED PROJECT_NAME)
     set(E2D_BUILD_AS_STANDALONE ON)
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14"
+        CACHE STRING "Minimum OS X version to target for deployment" FORCE)
 endif()
 
 project(enduro2d)
diff --git a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
index a71e7959..0d9d8718 100644
--- a/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
+++ b/sources/enduro2d/high/systems/render_system_impl/render_system_drawer.cpp
@@ -26,6 +26,11 @@ namespace
 
     const str_hash time_property_hash = "u_time";
     const str_hash texture_sampler_hash = "u_texture";
+
+    const str_hash normal_material_hash = "normal";
+    const str_hash additive_material_hash = "additive";
+    const str_hash multiply_material_hash = "multiply";
+    const str_hash screen_material_hash = "screen";
 }
 
 namespace e2d::render_system_impl
@@ -334,32 +339,24 @@ namespace e2d::render_system_impl
             material_asset::ptr mat_a;
             switch ( slot->data->blendMode ) {
                 case SP_BLEND_MODE_NORMAL:
-                    if ( !normal_mat_a ) {
-                        static str_hash normal_hash = make_hash("normal");
-                        normal_mat_a = spine_r.find_material(normal_hash);
-                    }
-                    mat_a = normal_mat_a;
+                    mat_a = normal_mat_a
+                        ? normal_mat_a
+                        : (normal_mat_a = spine_r.find_material(normal_material_hash));
                     break;
                 case SP_BLEND_MODE_ADDITIVE:
-                    if ( !additive_mat_a ) {
-                        static str_hash additive_hash = make_hash("additive");
-                        additive_mat_a = spine_r.find_material(additive_hash);
-                    }
-                    mat_a = additive_mat_a;
+                    mat_a = additive_mat_a
+                        ? additive_mat_a
+                        : (additive_mat_a = spine_r.find_material(additive_material_hash));
                     break;
                 case SP_BLEND_MODE_MULTIPLY:
-                    if ( !multiply_mat_a ) {
-                        static str_hash multiply_hash = make_hash("multiply");
-                        multiply_mat_a = spine_r.find_material(multiply_hash);
-                    }
-                    mat_a = multiply_mat_a;
+                    mat_a = multiply_mat_a
+                        ? multiply_mat_a
+                        : (multiply_mat_a = spine_r.find_material(multiply_material_hash));
                     break;
                 case SP_BLEND_MODE_SCREEN:
-                    if ( !screen_mat_a ) {
-                        static str_hash screen_hash = make_hash("screen");
-                        screen_mat_a = spine_r.find_material(screen_hash);
-                    }
-                    mat_a = screen_mat_a;
+                    mat_a = screen_mat_a
+                        ? screen_mat_a
+                        : (screen_mat_a = spine_r.find_material(screen_material_hash));
                     break;
                 default:
                     E2D_ASSERT_MSG(false, "unexpected blend mode for slot");
@@ -490,20 +487,16 @@ namespace e2d::render_system_impl
         material_asset::ptr mat_a;
         switch ( spr_r.blending() ) {
         case sprite_renderer::blendings::normal:
-            static str_hash normal_hash = make_hash("normal");
-            mat_a = spr_r.find_material(normal_hash);
+            mat_a = spr_r.find_material(normal_material_hash);
             break;
         case sprite_renderer::blendings::additive:
-            static str_hash additive_hash = make_hash("additive");
-            mat_a = spr_r.find_material(additive_hash);
+            mat_a = spr_r.find_material(additive_material_hash);
             break;
         case sprite_renderer::blendings::multiply:
-            static str_hash multiply_hash = make_hash("multiply");
-            mat_a = spr_r.find_material(multiply_hash);
+            mat_a = spr_r.find_material(multiply_material_hash);
             break;
         case sprite_renderer::blendings::screen:
-            static str_hash screen_hash = make_hash("screen");
-            mat_a = spr_r.find_material(screen_hash);
+            mat_a = spr_r.find_material(screen_material_hash);
             break;
         default:
             E2D_ASSERT_MSG(false, "unexpected blend mode for sprite");
@@ -530,7 +523,7 @@ namespace e2d::render_system_impl
             property_cache_.clear();
             throw;
         }
-        
+
         property_cache_.clear();
     }
 

From 0ae038b51e5b6fa7a23aa0b5afd966e7ee255d79 Mon Sep 17 00:00:00 2001
From: BlackMATov <blackmatov@gmail.com>
Date: Thu, 5 Sep 2019 18:14:55 +0700
Subject: [PATCH 108/108] fix same CI warnings

---
 CMakeLists.txt                                      | 7 +------
 samples/sources/sample_06/sample_06.cpp             | 4 ++--
 sources/3rdparty/bass/linux/bass.h                  | 8 ++++----
 sources/3rdparty/bass/windows/bass.h                | 8 ++++----
 sources/enduro2d/core/render_impl/render_opengl.cpp | 1 +
 untests/sources/untests_utils/intrusive_ptr.cpp     | 2 +-
 6 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f00adc07..91b421ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,12 +87,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         /we4554   # check operator precedence for possible error; use parentheses to clarify precedence
         /w14100   # unreferenced formal parameter
         /w14189   # local variable is initialized but not referenced
-        /we4456   # declaration of 'var' hides previous local declaration
-        )
-    if(CMAKE_CXX_FLAGS_RELWITHDEBINFO)
-        set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /Ob2")
-        set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Ob2")
-    endif()
+        /we4456)  # declaration of 'var' hides previous local declaration
 endif()
 string(REPLACE ";" " " E2D_SHARED_CXX_FLAGS "${E2D_SHARED_CXX_FLAGS}")
 
diff --git a/samples/sources/sample_06/sample_06.cpp b/samples/sources/sample_06/sample_06.cpp
index 9947b56c..c8c64dfb 100644
--- a/samples/sources/sample_06/sample_06.cpp
+++ b/samples/sources/sample_06/sample_06.cpp
@@ -53,8 +53,8 @@ namespace
                 });
             }
 
-            owner.for_joined_components<spine_player_evt, spine_player>([
-            ](ecs::entity e, const spine_player_evt& pe, spine_player& p) {
+            owner.for_joined_components<spine_player_evt>([
+            ](ecs::entity e, const spine_player_evt& pe) {
                 for ( const auto& evt : pe.events() ) {
                     if ( auto complete_evt = std::get_if<spine_player_evt::complete_evt>(&evt);
                         complete_evt && complete_evt->message() == "to_walk" )
diff --git a/sources/3rdparty/bass/linux/bass.h b/sources/3rdparty/bass/linux/bass.h
index 388d4068..e3bf8dcc 100644
--- a/sources/3rdparty/bass/linux/bass.h
+++ b/sources/3rdparty/bass/linux/bass.h
@@ -724,7 +724,7 @@ typedef struct {
 	BYTE Reserved[190];
 #if defined(__GNUC__) && __GNUC__<3
 	char CodingHistory[0];			// history
-#elif 1 // change to 0 if compiler fails the following line
+#elif 0 // change to 0 if compiler fails the following line
 	char CodingHistory[];			// history
 #else
 	char CodingHistory[1];			// history
@@ -762,7 +762,7 @@ typedef struct
 	char URL[1024];					// uniform resource locator
 #if defined(__GNUC__) && __GNUC__<3
 	char TagText[0];				// free form text for scripts or tags
-#elif 1 // change to 0 if compiler fails the following line
+#elif 0 // change to 0 if compiler fails the following line
 	char TagText[];					// free form text for scripts or tags
 #else
 	char TagText[1];				// free form text for scripts or tags
@@ -785,7 +785,7 @@ typedef struct
 	DWORD dwCuePoints;
 #if defined(__GNUC__) && __GNUC__<3
 	TAG_CUE_POINT CuePoints[0];
-#elif 1 // change to 0 if compiler fails the following line
+#elif 0 // change to 0 if compiler fails the following line
 	TAG_CUE_POINT CuePoints[];
 #else
 	TAG_CUE_POINT CuePoints[1];
@@ -816,7 +816,7 @@ typedef struct
 	DWORD cbSamplerData;
 #if defined(__GNUC__) && __GNUC__<3
 	TAG_SMPL_LOOP SampleLoops[0];
-#elif 1 // change to 0 if compiler fails the following line
+#elif 0 // change to 0 if compiler fails the following line
 	TAG_SMPL_LOOP SampleLoops[];
 #else
 	TAG_SMPL_LOOP SampleLoops[1];
diff --git a/sources/3rdparty/bass/windows/bass.h b/sources/3rdparty/bass/windows/bass.h
index 388d4068..e3bf8dcc 100644
--- a/sources/3rdparty/bass/windows/bass.h
+++ b/sources/3rdparty/bass/windows/bass.h
@@ -724,7 +724,7 @@ typedef struct {
 	BYTE Reserved[190];
 #if defined(__GNUC__) && __GNUC__<3
 	char CodingHistory[0];			// history
-#elif 1 // change to 0 if compiler fails the following line
+#elif 0 // change to 0 if compiler fails the following line
 	char CodingHistory[];			// history
 #else
 	char CodingHistory[1];			// history
@@ -762,7 +762,7 @@ typedef struct
 	char URL[1024];					// uniform resource locator
 #if defined(__GNUC__) && __GNUC__<3
 	char TagText[0];				// free form text for scripts or tags
-#elif 1 // change to 0 if compiler fails the following line
+#elif 0 // change to 0 if compiler fails the following line
 	char TagText[];					// free form text for scripts or tags
 #else
 	char TagText[1];				// free form text for scripts or tags
@@ -785,7 +785,7 @@ typedef struct
 	DWORD dwCuePoints;
 #if defined(__GNUC__) && __GNUC__<3
 	TAG_CUE_POINT CuePoints[0];
-#elif 1 // change to 0 if compiler fails the following line
+#elif 0 // change to 0 if compiler fails the following line
 	TAG_CUE_POINT CuePoints[];
 #else
 	TAG_CUE_POINT CuePoints[1];
@@ -816,7 +816,7 @@ typedef struct
 	DWORD cbSamplerData;
 #if defined(__GNUC__) && __GNUC__<3
 	TAG_SMPL_LOOP SampleLoops[0];
-#elif 1 // change to 0 if compiler fails the following line
+#elif 0 // change to 0 if compiler fails the following line
 	TAG_SMPL_LOOP SampleLoops[];
 #else
 	TAG_SMPL_LOOP SampleLoops[1];
diff --git a/sources/enduro2d/core/render_impl/render_opengl.cpp b/sources/enduro2d/core/render_impl/render_opengl.cpp
index aeab0126..8cb6410f 100644
--- a/sources/enduro2d/core/render_impl/render_opengl.cpp
+++ b/sources/enduro2d/core/render_impl/render_opengl.cpp
@@ -1100,6 +1100,7 @@ namespace e2d
 
         if ( tex->decl().is_compressed() ) {
             const v2u block_size = tex->decl().block_size();
+            E2D_UNUSED(block_size);
             E2D_ASSERT(region.position.x % block_size.x == 0 && region.position.y % block_size.y == 0);
             E2D_ASSERT(region.size.x % block_size.x == 0 && region.size.y % block_size.y == 0);
             opengl::with_gl_bind_texture(state_->dbg(), tex->state().id(),
diff --git a/untests/sources/untests_utils/intrusive_ptr.cpp b/untests/sources/untests_utils/intrusive_ptr.cpp
index d460d6e1..03cc6551 100644
--- a/untests/sources/untests_utils/intrusive_ptr.cpp
+++ b/untests/sources/untests_utils/intrusive_ptr.cpp
@@ -231,7 +231,7 @@ TEST_CASE("intrusive_ptr") {
         REQUIRE(obj_t::dtor_counter == 4u);
     }
     {
-        std::make_unique<obj_t>(10);
+        E2D_UNUSED(std::make_unique<obj_t>(10));
         intrusive_ptr<const obj_t> p1(new derived2_t());
         intrusive_ptr<const derived2_t> p2 = static_pointer_cast<const derived2_t>(p1);
         REQUIRE(p2->i == 21);