New UI Work

Source/Atomic/Engine/Engine.cpp

@@ -683,10 +683,9 @@ void Engine::Render()
     GetSubsystem<Renderer>()->Render();
 
 #ifdef ATOMIC_TBUI
-    GetSubsystem<TBUI>()->Render();
+    //GetSubsystem<TBUI>()->Render();
 #endif
 
-    //GetSubsystem<UI>()->Render();
     graphics->EndFrame();
 }
 

Source/Atomic/UI/TBUI.cpp

@@ -27,10 +27,6 @@
 #include <TurboBadger/tb_window.h>
 
 
-void register_tbbf_font_renderer();
-void register_stb_font_renderer();
-void register_freetype_font_renderer();
-
 using namespace tb;
 
 namespace tb
@@ -46,209 +42,13 @@ void TBSystem::RescheduleTimer(double fire_time)
 namespace Atomic
 {
 
-extern const char* UI_CATEGORY;
-
-static MODIFIER_KEYS GetModifierKeys(int qualifiers, bool superKey)
-{
-    MODIFIER_KEYS code = TB_MODIFIER_NONE;
-    if (qualifiers & QUAL_ALT)	code |= TB_ALT;
-    if (qualifiers & QUAL_CTRL)	code |= TB_CTRL;
-    if (qualifiers & QUAL_SHIFT)	code |= TB_SHIFT;
-    if (superKey)	code |= TB_SUPER;
-    return code;
-}
-
-
-// @return Return the upper case of a ascii charcter. Only for shortcut handling.
-static int toupr_ascii(int ascii)
-{
-    if (ascii >= 'a' && ascii <= 'z')
-        return ascii + 'A' - 'a';
-    return ascii;
-}
-
-
-class TBUIRenderer;
-
-class TBUIBitmap : public tb::TBBitmap
-{
-public:
-    TBUIBitmap(TBUIRenderer *renderer);
-    virtual ~TBUIBitmap();
-
-    bool Init(int width, int height, tb::uint32 *data);
-
-    virtual int Width() { return width_; }
-    virtual int Height() { return height_; }
-    virtual void SetData(tb::uint32 *data);
-public:
-
-    TBUIRenderer *renderer_;
-    int width_;
-    int height_;
-    SharedPtr<Texture2D> texture_;
-};
-
-TBUIBitmap::TBUIBitmap(TBUIRenderer *renderer)
-    : renderer_(renderer), width_(0), height_(0)
-{
-}
-
-
-
-class TBUIRenderer : public TBRendererBatcher
-{
-public:
-
-    WeakPtr<Context> context_;
-    WeakPtr<TBUI> tbui_;
-    PODVector<UIBatch>* batches_;
-    PODVector<float>* vertexData_;
-    IntRect currentScissor_;
-
-    TBUIRenderer(Context* context)
-    {
-        context_ = context;
-    }
-
-    virtual ~TBUIRenderer()
-    {
-
-    }
-
-    void BeginPaint(int render_target_w, int render_target_h)
-    {
-        TBRendererBatcher::BeginPaint(render_target_w, render_target_h);
-    }
-
-    void EndPaint()
-    {
-        TBRendererBatcher::EndPaint();
-    }
-
-    TBBitmap *CreateBitmap(int width, int height, uint32 *data)
-    {
-        TBUIBitmap *bitmap = new TBUIBitmap(this);
-
-        if (!bitmap->Init(width, height, data))
-        {
-            delete bitmap;
-            return nullptr;
-        }
-
-        return bitmap;
-    }
-
-    void RenderBatch(Batch *batch)
-    {
-        if (!batch->vertex_count)
-            return;
-
-        Texture2D* texture = NULL;
-
-        if (batch->bitmap)
-        {
-            TBUIBitmap* tbuibitmap = (TBUIBitmap*)batch->bitmap;
-            texture = tbuibitmap->texture_;
-        }
-
-        UIBatch b(BLEND_ALPHA , currentScissor_, texture, vertexData_);
-
-        float fadeAlpha = tbui_->GetFadeAlpha();
-
-        unsigned begin = b.vertexData_->Size();
-        b.vertexData_->Resize(begin + batch->vertex_count * UI_VERTEX_SIZE);
-        float* dest = &(b.vertexData_->At(begin));
-        b.vertexEnd_ = b.vertexData_->Size();
-
-        // winding is reversed, however switching it causes rendering
-        // issues, so turned off culling in UI module
-        //for (int i = batch->vertex_count - 1; i >= 0; i--)
-        for (int i = 0; i < batch->vertex_count; i++)
-        {
-            Vertex* v = &batch->vertex[i];
-            dest[0] = v->x; dest[1] = v->y; dest[2] = 0.0f;
-
-            v->a *= fadeAlpha;
-
-            ((unsigned&)dest[3]) = v->col;
-            dest[4] = v->u; dest[5] = v->v;
-            dest += UI_VERTEX_SIZE;
-        }
-
-        UIBatch::AddOrMerge(b, *batches_);
-    }
-
-    void SetClipRect(const TBRect &rect)
-    {
-        currentScissor_.top_ = rect.y;
-        currentScissor_.bottom_ = rect.y + rect.h;
-        currentScissor_.left_ = rect.x;
-        currentScissor_.right_ = rect.x + rect.w;
-
-    }
-
-    static TBUIRenderer* renderer_;
-
-};
-
-TBUIRenderer* TBUIRenderer::renderer_ = NULL;
-
-TBUIBitmap::~TBUIBitmap()
-{
-    // Must flush and unbind before we delete the texture
-    renderer_->FlushBitmap(this);
-}
-
-bool TBUIBitmap::Init(int width, int height, tb::uint32 *data)
-{
-    assert(width == tb::TBGetNearestPowerOfTwo(width));
-    assert(height == tb::TBGetNearestPowerOfTwo(height));
-
-    width_ = width;
-    height_ = height;
-
-    texture_ = new Texture2D(renderer_->context_);
-    texture_->SetMipsToSkip(QUALITY_LOW, 0); // No quality reduction
-    texture_->SetNumLevels(1);
-    texture_->SetAddressMode(COORD_U, ADDRESS_BORDER);
-    texture_->SetAddressMode(COORD_V, ADDRESS_BORDER),
-    texture_->SetBorderColor(Color(0.0f, 0.0f, 0.0f, 0.0f));
-    texture_->SetSize(width_, height_,  Graphics::GetRGBAFormat(), TEXTURE_STATIC);
-
-    SetData(data);
-
-    return true;
-}
-
-void TBUIBitmap::SetData(tb::uint32 *data)
-{   
-    renderer_->FlushBitmap(this);
-    texture_->SetData(0, 0, 0, width_, height_, data);
-}
-
-class TBUIRootWidget : public TBWidget
-{
-public:
-
-
-};
-
-WeakPtr<Context> TBUI::readerContext_;
-
 TBUI::TBUI(Context* context) :
     Object(context),
     rootWidget_(0),
     initialized_(false),
-    inputDisabled_(false),
-    keyboardDisabled_(false),
-    fadeAlpha_(1.0f),
-    fadeTarget_(1.0f),
-    currentFadeTime_(0.0f),
-    fadeTime_(0.0f),
     shuttingDown_(false)
 {
-    SubscribeToEvent(E_SCREENMODE, HANDLER(TBUI, HandleScreenMode));
+//    /SubscribeToEvent(E_SCREENMODE, HANDLER(TBUI, HandleScreenMode));
 }
 
 TBUI::~TBUI()
@@ -263,511 +63,20 @@ TBUI::~TBUI()
     }
 }
 
-void TBUI::Initialize()
-{
-    assert(!initialized_);
-
-    Graphics* graphics = GetSubsystem<Graphics>();
-    assert(graphics);
-    assert(graphics->IsInitialized());
-
-    readerContext_ = context_;
-    TBFile::SetReaderFunction(TBFileReader);
-
-    graphics_ = graphics;
-    vertexBuffer_ = new VertexBuffer(context_);
-
-    TBWidgetsAnimationManager::Init();
-    TBUIRenderer::renderer_ = new TBUIRenderer(graphics->GetContext());
-    TBUIRenderer::renderer_->tbui_ = this;
-    tb_core_init(TBUIRenderer::renderer_, "AtomicEditor/resources/language/lng_en.tb.txt");
-
-    // Load the default skin, and override skin that contains the graphics specific to the demo.
-    tb::g_tb_skin->Load("AtomicEditor/resources/default_skin/skin.tb.txt", "AtomicEditor/editor/skin/skin.tb.txt");
-
-    //register_tbbf_font_renderer();
-    //register_stb_font_renderer();
-    register_freetype_font_renderer();
-
-    tb::g_font_manager->AddFontInfo("AtomicEditor/resources/MesloLGS-Regular.ttf", "Monaco");
-    tb::g_font_manager->AddFontInfo("AtomicEditor/resources/vera.ttf", "Vera");
-
-    tb::TBFontDescription fd;
-    fd.SetID(tb::TBIDC("Vera"));
-    fd.SetSize(tb::g_tb_skin->GetDimensionConverter()->DpToPx(12));
-    tb::g_font_manager->SetDefaultFontDescription(fd);
-
-    // Create the font now.
-    tb::TBFontFace *font = tb::g_font_manager->CreateFontFace(tb::g_font_manager->GetDefaultFontDescription());
-
-    // Render some glyphs in one go now since we know we are going to use them. It would work fine
-    // without this since glyphs are rendered when needed, but with some extra updating of the glyph bitmap.
-    if (font)
-        font->RenderGlyphs(" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~•·åäöÅÄÖ");
-
-    rootWidget_ = new TBUIRootWidget();
-    //rootWidget_->SetSkinBg(tb::TBIDC("background"));
-
-    int width = graphics->GetWidth();
-    int height = graphics->GetHeight();
-    rootWidget_->SetSize(width, height);
-    //SetSize(width, height);
-
-    rootWidget_->SetVisibilility(tb::WIDGET_VISIBILITY_VISIBLE);
-
-    SubscribeToEvent(E_MOUSEBUTTONDOWN, HANDLER(TBUI, HandleMouseButtonDown));
-    SubscribeToEvent(E_MOUSEBUTTONUP, HANDLER(TBUI, HandleMouseButtonUp));
-    SubscribeToEvent(E_MOUSEMOVE, HANDLER(TBUI, HandleMouseMove));
-    SubscribeToEvent(E_MOUSEWHEEL, HANDLER(TBUI, HandleMouseWheel));
-    SubscribeToEvent(E_KEYDOWN, HANDLER(TBUI, HandleKeyDown));
-    SubscribeToEvent(E_KEYUP, HANDLER(TBUI, HandleKeyUp));
-    SubscribeToEvent(E_TEXTINPUT, HANDLER(TBUI, HandleTextInput));
-    SubscribeToEvent(E_UPDATE, HANDLER(TBUI, HandleUpdate));
-
-    SubscribeToEvent(E_RENDERUPDATE, HANDLER(TBUI, HandleRenderUpdate));
-
-    //TB_DEBUG_SETTING(LAYOUT_BOUNDS) = 1;
-
-    initialized_ = true;
-}
 
 void TBUI::Shutdown()
 {
     shuttingDown_ = true;
-    SetInputDisabled(true);
-}
-
-void TBUI::GetBatches(PODVector<UIBatch>& batches, PODVector<float>& vertexData, const IntRect& currentScissor)
-{
-    if (!initialized_)
-        return;
-
-    TBAnimationManager::Update();
-    rootWidget_->InvokeProcessStates();
-    rootWidget_->InvokeProcess();
-
-    if (fadeAlpha_ > 0.0f)
-    {
-        tb::g_renderer->BeginPaint(rootWidget_->GetRect().w, rootWidget_->GetRect().h);
-
-        TBUIRenderer::renderer_->currentScissor_ = currentScissor;
-        TBUIRenderer::renderer_->batches_ = &batches;
-        TBUIRenderer::renderer_->vertexData_ = &vertexData;
-        rootWidget_->InvokePaint(tb::TBWidget::PaintProps());
-
-        tb::g_renderer->EndPaint();
-    }
-}
-
-void TBUI::SubmitBatchVertexData(Texture* texture, const PODVector<float>& vertexData)
-{
-    UIBatch b(BLEND_ALPHA , TBUIRenderer::renderer_->currentScissor_, texture, &vertexData_);
-
-    unsigned begin = b.vertexData_->Size();
-    b.vertexData_->Resize(begin + vertexData.Size());
-    float* dest = &(b.vertexData_->At(begin));
-    b.vertexEnd_ = b.vertexData_->Size();
-
-    for (unsigned i = 0; i < vertexData.Size(); i++, dest++)
-    {
-        *dest = vertexData[i];
-    }
-
-    UIBatch::AddOrMerge(b, batches_);
-
-}
-
-void TBUI::HandleScreenMode(StringHash eventType, VariantMap& eventData)
-{
-    if (!initialized_)
-        return;
-
-    using namespace ScreenMode;
-    rootWidget_->SetSize(eventData[P_WIDTH].GetInt(), eventData[P_HEIGHT].GetInt());
-    //SetSize(eventData[P_WIDTH].GetInt(), eventData[P_HEIGHT].GetInt());
-}
-
-void TBUI::HandleMouseButtonDown(StringHash eventType, VariantMap& eventData)
-{
-    if (!initialized_ || inputDisabled_)
-        return;
-
-    using namespace MouseButtonDown;
-    unsigned button = eventData[P_BUTTON].GetUInt();
-
-    IntVector2 pos;
-    pos = GetSubsystem<Input>()->GetMousePosition();
-
-    Input* input = GetSubsystem<Input>();
-    int qualifiers = input->GetQualifiers();
-
-#ifdef ATOMIC_PLATFORM_WINDOWS
-    bool superdown = input->GetKeyDown(KEY_LCTRL) || input->GetKeyDown(KEY_RCTRL);
-#else
-    bool superdown = input->GetKeyDown(KEY_LGUI) || input->GetKeyDown(KEY_RGUI);
-#endif
-
-    MODIFIER_KEYS mod = GetModifierKeys(qualifiers, superdown);
-
-
-    static double last_time = 0;
-    static int counter = 1;
-
-    Time* t = GetSubsystem<Time>();
-
-    double time = t->GetElapsedTime() * 1000;
-    if (time < last_time + 600)
-        counter++;
-    else
-        counter = 1;
-
-    last_time = time;
-    if (button == MOUSEB_RIGHT)
-        rootWidget_->InvokeRightPointerDown(pos.x_, pos.y_, counter, mod);
-    else
-        rootWidget_->InvokePointerDown(pos.x_, pos.y_, counter, mod, false);
-
-
+    //SetInputDisabled(true);
 }
 
 
-void TBUI::HandleMouseButtonUp(StringHash eventType, VariantMap& eventData)
-{
-    if (!initialized_ || inputDisabled_)
-        return;
-
-    using namespace MouseButtonUp;
-    unsigned button = eventData[P_BUTTON].GetUInt();
-
-    IntVector2 pos;
-
-    Input* input = GetSubsystem<Input>();
-    pos = input->GetMousePosition();
-    int qualifiers = input->GetQualifiers();
-
-#ifdef ATOMIC_PLATFORM_WINDOWS
-    bool superdown = input->GetKeyDown(KEY_LCTRL) || input->GetKeyDown(KEY_RCTRL);
-#else
-    bool superdown = input->GetKeyDown(KEY_LGUI) || input->GetKeyDown(KEY_RGUI);
-#endif
-
-    MODIFIER_KEYS mod = GetModifierKeys(qualifiers, superdown);
-
-
-    if (button == MOUSEB_RIGHT)
-        rootWidget_->InvokeRightPointerUp(pos.x_, pos.y_, mod);
-    else
-        rootWidget_->InvokePointerUp(pos.x_, pos.y_, mod, false);
-}
-
-
-void TBUI::HandleMouseMove(StringHash eventType, VariantMap& eventData)
-{
-    using namespace MouseMove;
-
-    if (!initialized_ || inputDisabled_)
-        return;
-
-    int px = eventData[P_X].GetInt();
-    int py = eventData[P_Y].GetInt();
-
-    rootWidget_->InvokePointerMove(px, py, tb::TB_MODIFIER_NONE, false);
-
-}
-
-
-void TBUI::HandleMouseWheel(StringHash eventType, VariantMap& eventData)
-{
-    if (!initialized_ || inputDisabled_)
-        return;
-
-    using namespace MouseWheel;
-
-    int delta = eventData[P_WHEEL].GetInt();
-
-    Input* input = GetSubsystem<Input>();
-
-    rootWidget_->InvokeWheel(input->GetMousePosition().x_, input->GetMousePosition().y_, 0, delta > 0 ? -1 : 1, tb::TB_MODIFIER_NONE);
-
-}
-
-static bool InvokeShortcut(int key, SPECIAL_KEY special_key, MODIFIER_KEYS modifierkeys, bool down)
-{
-#ifdef __APPLE__
-    bool shortcut_key = (modifierkeys & TB_SUPER) ? true : false;
-#else
-    bool shortcut_key = (modifierkeys & TB_CTRL) ? true : false;
-#endif
-    if (!TBWidget::focused_widget || !down || (!shortcut_key && special_key ==TB_KEY_UNDEFINED))
-        return false;
-    bool reverse_key = (modifierkeys & TB_SHIFT) ? true : false;
-    int upper_key = toupr_ascii(key);
-    TBID id;
-    if (upper_key == 'X')
-        id = TBIDC("cut");
-    else if (upper_key == 'C' || special_key == TB_KEY_INSERT)
-        id = TBIDC("copy");
-    else if (upper_key == 'V' || (special_key == TB_KEY_INSERT && reverse_key))
-        id = TBIDC("paste");
-    else if (upper_key == 'A')
-        id = TBIDC("selectall");
-    else if (upper_key == 'Z' || upper_key == 'Y')
-    {
-        bool undo = upper_key == 'Z';
-        if (reverse_key)
-            undo = !undo;
-        id = undo ? TBIDC("undo") : TBIDC("redo");
-    }
-    else if (upper_key == 'N')
-        id = TBIDC("new");
-    else if (upper_key == 'O')
-        id = TBIDC("open");
-    else if (upper_key == 'S')
-        id = TBIDC("save");
-    else if (upper_key == 'W')
-        id = TBIDC("close");
-    else if (upper_key == 'F')
-        id = TBIDC("find");
- #ifdef ATOMIC_PLATFORM_OSX
-    else if (upper_key == 'G' && (modifierkeys & TB_SHIFT))
-        id = TBIDC("findprev");
-    else if (upper_key == 'G')
-        id = TBIDC("findnext");
-#else
-    else if (special_key == TB_KEY_F3 && (modifierkeys & TB_SHIFT))
-        id = TBIDC("findprev");
-    else if (special_key == TB_KEY_F3)
-        id = TBIDC("findnext");
-
-#endif
-    else if (upper_key == 'P')
-        id = TBIDC("play");
-    else if (upper_key == 'I')
-        id = TBIDC("beautify");
-    else if (special_key == TB_KEY_PAGE_UP)
-        id = TBIDC("prev_doc");
-    else if (special_key == TB_KEY_PAGE_DOWN)
-        id = TBIDC("next_doc");
-    else
-        return false;
-
-    TBWidgetEvent ev(EVENT_TYPE_SHORTCUT);
-    ev.modifierkeys = modifierkeys;
-    ev.ref_id = id;
-    return TBWidget::focused_widget->InvokeEvent(ev);
-}
-
-static bool InvokeKey(TBWidget* root, unsigned int key, SPECIAL_KEY special_key, MODIFIER_KEYS modifierkeys, bool keydown)
-{
-    if (InvokeShortcut(key, special_key, modifierkeys, keydown))
-        return true;
-    root->InvokeKey(key, special_key, modifierkeys, keydown);
-    return true;
-}
-
-
-void TBUI::HandleKey(bool keydown, int keycode, int scancode)
-{
-
-#ifdef ATOMIC_PLATFORM_WINDOWS
-    if (keycode == KEY_LCTRL || keycode == KEY_RCTRL)
-        return;
-#else
-    if (keycode == KEY_LGUI || keycode == KEY_RGUI)
-        return;
-#endif
-
-    Input* input = GetSubsystem<Input>();
-    int qualifiers = input->GetQualifiers();
-
-#ifdef ATOMIC_PLATFORM_WINDOWS
-    bool superdown = input->GetKeyDown(KEY_LCTRL) || input->GetKeyDown(KEY_RCTRL);
-#else
-    bool superdown = input->GetKeyDown(KEY_LGUI) || input->GetKeyDown(KEY_RGUI);
-#endif
-    MODIFIER_KEYS mod = GetModifierKeys(qualifiers, superdown);
-
-    switch (keycode)
-    {
-    case KEY_RETURN:
-    case KEY_RETURN2:
-    case KEY_KP_ENTER:
-        InvokeKey(rootWidget_, 0, TB_KEY_ENTER, mod, keydown);
-        break;
-
-    case KEY_F1:
-        InvokeKey(rootWidget_, 0, TB_KEY_F1, mod, keydown);
-        break;
-    case KEY_F2:
-        InvokeKey(rootWidget_, 0, TB_KEY_F2, mod, keydown);
-        break;
-    case KEY_F3:
-        InvokeKey(rootWidget_, 0, TB_KEY_F3, mod, keydown);
-        break;
-    case KEY_F4:
-        InvokeKey(rootWidget_, 0, TB_KEY_F4, mod, keydown);
-        break;
-    case KEY_F5:
-        InvokeKey(rootWidget_, 0, TB_KEY_F5, mod, keydown);
-        break;
-    case KEY_F6:
-        InvokeKey(rootWidget_, 0, TB_KEY_F6, mod, keydown);
-        break;
-    case KEY_F7:
-        InvokeKey(rootWidget_, 0, TB_KEY_F7, mod, keydown);
-        break;
-    case KEY_F8:
-        InvokeKey(rootWidget_, 0, TB_KEY_F8, mod, keydown);
-        break;
-    case KEY_F9:
-        InvokeKey(rootWidget_, 0, TB_KEY_F9, mod, keydown);
-        break;
-    case KEY_F10:
-        InvokeKey(rootWidget_, 0, TB_KEY_F10, mod, keydown);
-        break;
-    case KEY_F11:
-        InvokeKey(rootWidget_, 0, TB_KEY_F11, mod, keydown);
-        break;
-    case KEY_F12:
-        InvokeKey(rootWidget_, 0, TB_KEY_F12, mod, keydown);
-        break;
-    case KEY_LEFT:
-        InvokeKey(rootWidget_, 0, TB_KEY_LEFT, mod, keydown);
-        break;
-    case KEY_UP:
-        InvokeKey(rootWidget_, 0, TB_KEY_UP, mod, keydown);
-        break;
-    case KEY_RIGHT:
-        InvokeKey(rootWidget_, 0, TB_KEY_RIGHT, mod, keydown);
-        break;
-    case KEY_DOWN:
-        InvokeKey(rootWidget_, 0, TB_KEY_DOWN, mod, keydown);
-        break;
-    case KEY_PAGEUP:
-        InvokeKey(rootWidget_, 0, TB_KEY_PAGE_UP, mod, keydown);
-        break;
-    case KEY_PAGEDOWN:
-        InvokeKey(rootWidget_, 0, TB_KEY_PAGE_DOWN, mod, keydown);
-        break;
-    case KEY_HOME:
-        InvokeKey(rootWidget_, 0, TB_KEY_HOME, mod, keydown);
-        break;
-    case KEY_END:
-        InvokeKey(rootWidget_, 0, TB_KEY_END, mod, keydown);
-        break;
-    case KEY_INSERT:
-        InvokeKey(rootWidget_, 0, TB_KEY_INSERT, mod, keydown);
-        break;
-    case KEY_TAB:
-        InvokeKey(rootWidget_, 0, TB_KEY_TAB, mod, keydown);
-        break;
-    case KEY_DELETE:
-        InvokeKey(rootWidget_, 0, TB_KEY_DELETE, mod, keydown);
-        break;
-    case KEY_BACKSPACE:
-        InvokeKey(rootWidget_, 0, TB_KEY_BACKSPACE, mod, keydown);
-        break;
-    case KEY_ESC:
-        InvokeKey(rootWidget_, 0, TB_KEY_ESC, mod, keydown);
-        break;
-    default:
-        if (mod & TB_SUPER)
-        {
-            InvokeKey(rootWidget_, keycode, TB_KEY_UNDEFINED, mod, keydown);
-        }
-
-    }
-
-}
-
-void TBUI::HandleKeyDown(StringHash eventType, VariantMap& eventData)
-{
-    if (inputDisabled_ || keyboardDisabled_)
-        return;
-
-    using namespace KeyDown;
-
-    int keycode = eventData[P_KEY].GetInt();
-    int scancode = eventData[P_SCANCODE].GetInt();
-
-    HandleKey(true, keycode, scancode);
-
-}
-
-void TBUI::HandleKeyUp(StringHash eventType, VariantMap& eventData)
-{
-    if (inputDisabled_ || keyboardDisabled_)
-        return;
-
-    using namespace KeyUp;
-
-    int keycode = eventData[P_KEY].GetInt();
-    int scancode = eventData[P_SCANCODE].GetInt();
-
-    HandleKey(false, keycode, scancode);
-
-}
-
-void TBUI::HandleTextInput(StringHash eventType, VariantMap& eventData)
-{
-    if (inputDisabled_ || keyboardDisabled_)
-        return;
-
-    using namespace TextInput;
-
-    const String& text = eventData[P_TEXT].GetString();
-
-    for (unsigned i = 0; i < text.Length(); i++)
-    {
-        InvokeKey(rootWidget_, text[i], TB_KEY_UNDEFINED, TB_MODIFIER_NONE, true);
-        InvokeKey(rootWidget_, text[i], TB_KEY_UNDEFINED, TB_MODIFIER_NONE, false);
-    }
-
-}
-
-void TBUI::HandleUpdate(StringHash eventType, VariantMap& eventData)
+void TBUI::Initialize()
 {
 
-    TBMessageHandler::ProcessMessages();
-
-    // Timestep parameter is same no matter what event is being listened to
-    float timeStep = eventData[Update::P_TIMESTEP].GetFloat();
-
-    if (fadeTarget_ != fadeAlpha_)
-    {
-        currentFadeTime_ += timeStep;
-
-        if (currentFadeTime_ >= fadeTime_)
-        {
-            fadeAlpha_ = fadeTarget_;
-        }
-        else
-        {
-            if (fadeAlpha_ > fadeTarget_)
-            {
-                fadeAlpha_ =  1.0f  - (currentFadeTime_/fadeTime_);
-            }
-            else
-                fadeAlpha_ =  (currentFadeTime_/fadeTime_ * (fadeTarget_));
-        }
-    }
 }
 
 
-void TBUI::FadeOut(float time)
-{
-    fadeTarget_ = 0.0f;
-    currentFadeTime_ = 0.0f;
-    fadeTime_ = time;
-}
-
-void TBUI::FadeIn(float time)
-{
-    fadeTarget_ = 1.0f;
-    currentFadeTime_ = 0.0f;
-    fadeTime_ = time;
-}
-
 bool TBUI::LoadResourceFile(TBWidget* widget, const String& filename)
 {
 
@@ -781,155 +90,8 @@ bool TBUI::LoadResourceFile(TBWidget* widget, const String& filename)
     return true;
 }
 
-void TBUI::Render(VertexBuffer* buffer, const PODVector<UIBatch>& batches, unsigned batchStart, unsigned batchEnd)
-{
-
-    if (batches.Empty())
-        return;
-
-    Vector2 invScreenSize(1.0f / (float)graphics_->GetWidth(), 1.0f / (float)graphics_->GetHeight());
-    Vector2 scale(2.0f * invScreenSize.x_, -2.0f * invScreenSize.y_);
-    Vector2 offset(-1.0f, 1.0f);
-
-    Matrix4 projection(Matrix4::IDENTITY);
-    projection.m00_ = scale.x_;
-    projection.m03_ = offset.x_;
-    projection.m11_ = scale.y_;
-    projection.m13_ = offset.y_;
-    projection.m22_ = 1.0f;
-    projection.m23_ = 0.0f;
-    projection.m33_ = 1.0f;
-
-    graphics_->ClearParameterSources();
-    graphics_->SetColorWrite(true);
-    graphics_->SetCullMode(CULL_NONE);
-    graphics_->SetDepthTest(CMP_ALWAYS);
-    graphics_->SetDepthWrite(false);
-    graphics_->SetDrawAntialiased(false);
-    graphics_->SetFillMode(FILL_SOLID);
-    graphics_->SetStencilTest(false);
-
-    graphics_->ResetRenderTargets();
-
-    graphics_->SetVertexBuffer(buffer);
-
-    ShaderVariation* noTextureVS = graphics_->GetShader(VS, "Basic", "VERTEXCOLOR");
-    ShaderVariation* diffTextureVS = graphics_->GetShader(VS, "Basic", "DIFFMAP VERTEXCOLOR");
-    ShaderVariation* noTexturePS = graphics_->GetShader(PS, "Basic", "VERTEXCOLOR");
-    ShaderVariation* diffTexturePS = graphics_->GetShader(PS, "Basic", "DIFFMAP VERTEXCOLOR");
-    ShaderVariation* diffMaskTexturePS = graphics_->GetShader(PS, "Basic", "DIFFMAP ALPHAMASK VERTEXCOLOR");
-    ShaderVariation* alphaTexturePS = graphics_->GetShader(PS, "Basic", "ALPHAMAP VERTEXCOLOR");
-
-    unsigned alphaFormat = Graphics::GetAlphaFormat();
-
-    for (unsigned i = batchStart; i < batchEnd; ++i)
-    {
-        const UIBatch& batch = batches[i];
-        if (batch.vertexStart_ == batch.vertexEnd_)
-            continue;
-
-        ShaderVariation* ps;
-        ShaderVariation* vs;
-
-        if (!batch.texture_)
-        {
-            ps = noTexturePS;
-            vs = noTextureVS;
-        }
-        else
-        {
-            // If texture contains only an alpha channel, use alpha shader (for fonts)
-            vs = diffTextureVS;
-
-            if (batch.texture_->GetFormat() == alphaFormat)
-                ps = alphaTexturePS;
-            else if (batch.blendMode_ != BLEND_ALPHA && batch.blendMode_ != BLEND_ADDALPHA && batch.blendMode_ != BLEND_PREMULALPHA)
-                ps = diffMaskTexturePS;
-            else
-                ps = diffTexturePS;
-        }
-
-        graphics_->SetShaders(vs, ps);
-        if (graphics_->NeedParameterUpdate(SP_OBJECTTRANSFORM, this))
-            graphics_->SetShaderParameter(VSP_MODEL, Matrix3x4::IDENTITY);
-        if (graphics_->NeedParameterUpdate(SP_CAMERA, this))
-            graphics_->SetShaderParameter(VSP_VIEWPROJ, projection);
-        if (graphics_->NeedParameterUpdate(SP_MATERIAL, this))
-            graphics_->SetShaderParameter(PSP_MATDIFFCOLOR, Color(1.0f, 1.0f, 1.0f, 1.0f));
-
-        graphics_->SetBlendMode(batch.blendMode_);
-        graphics_->SetScissorTest(true, batch.scissor_);
-        graphics_->SetTexture(0, batch.texture_);
-        graphics_->Draw(TRIANGLE_LIST, batch.vertexStart_ / UI_VERTEX_SIZE, (batch.vertexEnd_ - batch.vertexStart_) /
-            UI_VERTEX_SIZE);
-    }
-}
-
-void TBUI::SetVertexData(VertexBuffer* dest, const PODVector<float>& vertexData)
-{
-    if (vertexData.Empty())
-        return;
-
-    // Update quad geometry into the vertex buffer
-    // Resize the vertex buffer first if too small or much too large
-    unsigned numVertices = vertexData.Size() / UI_VERTEX_SIZE;
-    if (dest->GetVertexCount() < numVertices || dest->GetVertexCount() > numVertices * 2)
-        dest->SetSize(numVertices, MASK_POSITION | MASK_COLOR | MASK_TEXCOORD1, true);
-
-    dest->SetData(&vertexData[0]);
-}
-
-
-void TBUI::Render()
-{
-    SetVertexData(vertexBuffer_, vertexData_);
-    Render(vertexBuffer_, batches_, 0, batches_.Size());
-}
-
-void TBUI::HandleRenderUpdate(StringHash eventType, VariantMap& eventData)
-{
-    PROFILE(GetTBUIBatches);
-
-    // Get rendering batches from the non-modal UI elements
-    batches_.Clear();
-    vertexData_.Clear();
-
-    TBRect rect = rootWidget_->GetRect();
-
-    IntRect currentScissor = IntRect(0, 0, rect.w, rect.h);
-    GetBatches(batches_, vertexData_, currentScissor);
-
-}
-
-void TBUI::TBFileReader(const char* filename, void** data, unsigned* length)
-{
-    *data = 0;
-    *length = 0;
 
-    ResourceCache* cache = readerContext_->GetSubsystem<ResourceCache>();
-    SharedPtr<File> file = cache->GetFile(filename);
-    if (!file || !file->IsOpen())
-        return;
 
-    unsigned size = file->GetSize();
-
-    if (!size)
-        return;
-
-    void* _data = malloc(size);
-    if (!_data)
-        return;
-
-    if (file->Read(_data, size) != size)
-    {
-        free(_data);
-        return;
-    }
-
-    *length = size;
-    *data = _data;
-
-}
 
 
 

Source/Atomic/UI/TBUI.h

@@ -20,80 +20,28 @@ class VertexBuffer;
 /// %UI element which renders a 3D scene.
 class ATOMIC_API TBUI : public Object
 {
-    OBJECT(TBUI);
+    OBJECT(TBUI)
 
     tb::TBWidget* rootWidget_;
     bool initialized_;    
 
-    void HandleScreenMode(StringHash eventType, VariantMap& eventData);
-    void HandleMouseButtonDown(StringHash eventType, VariantMap& eventData);
-    void HandleMouseButtonUp(StringHash eventType, VariantMap& eventData);
-    void HandleMouseMove(StringHash eventType, VariantMap& eventData);
-    void HandleMouseWheel(StringHash eventType, VariantMap& eventData);
-    void HandleKeyDown(StringHash eventType, VariantMap& eventData);
-    void HandleKeyUp(StringHash eventType, VariantMap& eventData);
-    void HandleKey(bool keydown, int keycode, int scancode);
-    void HandleTextInput(StringHash eventType, VariantMap& eventData);
-    void HandleUpdate(StringHash eventType, VariantMap& eventData);
-    void HandleRenderUpdate(StringHash eventType, VariantMap& eventData);
-
 public:
     /// Construct.
     TBUI(Context* context);
     /// Destruct.
-    ~TBUI();
+    virtual ~TBUI();
 
     tb::TBWidget* GetRootWidget() { return rootWidget_; }
 
     bool LoadResourceFile(tb::TBWidget* widget, const String& filename);
 
-    void Render();
-
-    void GetBatches(PODVector<UIBatch>& batches, PODVector<float>& vertexData, const IntRect& currentScissor);
-
-    void SubmitBatchVertexData(Texture* texture, const PODVector<float>& vertexData);
-
-    void SetKeyboardDisabled(bool disabled) {keyboardDisabled_ = disabled; }
-    void SetInputDisabled(bool disabled) { inputDisabled_ = disabled; }
-
-    void FadeOut(float time);
-    void FadeIn(float time);
-
-    float GetFadeAlpha() { return fadeAlpha_; }
-    void SetFadeAlpha(float fadeAlpha) { fadeAlpha_ = fadeAlpha; }
-
     void Initialize();
 
     void Shutdown();
 
 private:
 
-    static WeakPtr<Context> readerContext_;
-    static void TBFileReader(const char* filename, void** data, unsigned* length);
-
-    void Render(VertexBuffer* buffer, const PODVector<UIBatch>& batches, unsigned batchStart, unsigned batchEnd);
-    void SetVertexData(VertexBuffer* dest, const PODVector<float>& vertexData);
-
-    bool inputDisabled_;
-    bool keyboardDisabled_;
-
-    float fadeAlpha_;
-    float fadeTarget_;
-    float currentFadeTime_;
-    float fadeTime_;
-
-    /// UI rendering batches.
-    PODVector<UIBatch> batches_;
-    /// UI rendering vertex data.
-    PODVector<float> vertexData_;
-    SharedPtr<VertexBuffer> vertexBuffer_;
-
-    WeakPtr<Graphics> graphics_;
-
     bool shuttingDown_;
-
-
-
 };
 
 }

Source/Atomic/UI/UIRenderer.cpp

@@ -0,0 +1,148 @@
+#include <TurboBadger/tb_core.h>
+#include <TurboBadger/tb_system.h>
+#include <TurboBadger/tb_debug.h>
+#include <TurboBadger/tb_node_tree.h>
+#include <TurboBadger/tb_widgets_reader.h>
+
+
+#include "../Graphics/Graphics.h"
+#include "../Graphics/Texture2D.h"
+#include "UIRenderer.h"
+
+namespace Atomic
+{
+
+class TBUIBitmap : public tb::TBBitmap
+{
+public:
+    TBUIBitmap(UIRenderer *renderer);
+    virtual ~TBUIBitmap();
+
+    bool Init(int width, int height, tb::uint32 *data);
+
+    virtual int Width() { return width_; }
+    virtual int Height() { return height_; }
+    virtual void SetData(tb::uint32 *data);
+public:
+
+    UIRenderer *renderer_;
+    int width_;
+    int height_;
+    SharedPtr<Texture2D> texture_;
+};
+
+TBUIBitmap::TBUIBitmap(UIRenderer *renderer)
+    : renderer_(renderer), width_(0), height_(0)
+{
+}
+
+
+
+UIRenderer::UIRenderer(Context* context)
+{
+    context_ = context;
+}
+
+UIRenderer::~UIRenderer()
+{
+
+}
+
+void UIRenderer::BeginPaint(int render_target_w, int render_target_h)
+{
+    TBRendererBatcher::BeginPaint(render_target_w, render_target_h);
+}
+
+void UIRenderer::EndPaint()
+{
+    TBRendererBatcher::EndPaint();
+}
+
+tb::TBBitmap *UIRenderer::CreateBitmap(int width, int height, tb::uint32 *data)
+{
+    TBUIBitmap *bitmap = new TBUIBitmap(this);
+
+    if (!bitmap->Init(width, height, data))
+    {
+        delete bitmap;
+        return nullptr;
+    }
+
+    return bitmap;
+}
+
+void UIRenderer::RenderBatch(Batch *batch)
+{
+    if (!batch->vertex_count)
+        return;
+
+    Texture2D* texture = NULL;
+
+    if (batch->bitmap)
+    {
+        TBUIBitmap* tbuibitmap = (TBUIBitmap*)batch->bitmap;
+        texture = tbuibitmap->texture_;
+    }
+
+    UIBatch b(BLEND_ALPHA , currentScissor_, texture, vertexData_);
+
+    unsigned begin = b.vertexData_->Size();
+    b.vertexData_->Resize(begin + batch->vertex_count * UI_VERTEX_SIZE);
+    float* dest = &(b.vertexData_->At(begin));
+    b.vertexEnd_ = b.vertexData_->Size();
+
+    for (int i = 0; i < batch->vertex_count; i++)
+    {
+        Vertex* v = &batch->vertex[i];
+        dest[0] = v->x; dest[1] = v->y; dest[2] = 0.0f;
+        ((unsigned&)dest[3]) = v->col;
+        dest[4] = v->u; dest[5] = v->v;
+        dest += UI_VERTEX_SIZE;
+    }
+
+    UIBatch::AddOrMerge(b, *batches_);
+}
+
+void UIRenderer::SetClipRect(const tb::TBRect &rect)
+{
+    currentScissor_.top_ = rect.y;
+    currentScissor_.bottom_ = rect.y + rect.h;
+    currentScissor_.left_ = rect.x;
+    currentScissor_.right_ = rect.x + rect.w;
+
+}
+
+TBUIBitmap::~TBUIBitmap()
+{
+    // Must flush and unbind before we delete the texture
+    renderer_->FlushBitmap(this);
+}
+
+bool TBUIBitmap::Init(int width, int height, tb::uint32 *data)
+{
+    assert(width == tb::TBGetNearestPowerOfTwo(width));
+    assert(height == tb::TBGetNearestPowerOfTwo(height));
+
+    width_ = width;
+    height_ = height;
+
+    texture_ = new Texture2D(renderer_->GetContext());
+    texture_->SetMipsToSkip(QUALITY_LOW, 0); // No quality reduction
+    texture_->SetNumLevels(1);
+    texture_->SetAddressMode(COORD_U, ADDRESS_BORDER);
+    texture_->SetAddressMode(COORD_V, ADDRESS_BORDER),
+            texture_->SetBorderColor(Color(0.0f, 0.0f, 0.0f, 0.0f));
+    texture_->SetSize(width_, height_,  Graphics::GetRGBAFormat(), TEXTURE_STATIC);
+
+    SetData(data);
+
+    return true;
+}
+
+void TBUIBitmap::SetData(tb::uint32 *data)
+{
+    renderer_->FlushBitmap(this);
+    texture_->SetData(0, 0, 0, width_, height_, data);
+}
+
+}

Source/Atomic/UI/UIRenderer.h

@@ -0,0 +1,46 @@
+
+#pragma once
+
+#include <TurboBadger/tb_types.h>
+#include <TurboBadger/renderers/tb_renderer_batcher.h>
+#include "../Core/Context.h"
+#include "UIBatch.h"
+
+namespace tb
+{
+class TBBitmap;
+class TBRect;
+}
+
+namespace Atomic
+{
+
+class TBUI;
+
+class UIRenderer : public tb::TBRendererBatcher
+{
+    friend class UIView;
+public:
+
+    UIRenderer(Context* context);
+    virtual ~UIRenderer();
+
+    void BeginPaint(int render_target_w, int render_target_h);
+    void EndPaint();
+
+    tb::TBBitmap *CreateBitmap(int width, int height, tb::uint32 *data);
+
+    void RenderBatch(Batch *batch);
+
+    void SetClipRect(const tb::TBRect &rect);
+
+    Context* GetContext() { return context_; }
+
+private:
+    WeakPtr<Context> context_;
+    PODVector<UIBatch>* batches_;
+    PODVector<float>* vertexData_;
+    IntRect currentScissor_;
+};
+
+}

Source/Atomic/UI/UIView.cpp

@@ -0,0 +1,671 @@
+
+#include <TurboBadger/tb_core.h>
+#include <TurboBadger/tb_system.h>
+#include <TurboBadger/tb_debug.h>
+#include <TurboBadger/animation/tb_widget_animation.h>
+#include <TurboBadger/renderers/tb_renderer_batcher.h>
+#include <TurboBadger/tb_font_renderer.h>
+#include <TurboBadger/tb_node_tree.h>
+#include <TurboBadger/tb_widgets_reader.h>
+#include <TurboBadger/tb_window.h>
+
+void register_tbbf_font_renderer();
+void register_stb_font_renderer();
+void register_freetype_font_renderer();
+
+using namespace tb;
+
+#include "../Core/CoreEvents.h"
+#include "../Input/Input.h"
+#include "../Input/InputEvents.h"
+#include "../Resource/ResourceCache.h"
+#include "../Graphics/Graphics.h"
+#include "../Graphics/GraphicsEvents.h"
+#include "../Graphics/Texture2D.h"
+#include "../Graphics/VertexBuffer.h"
+
+#include "UIRenderer.h"
+#include "UIView.h"
+
+namespace Atomic
+{
+
+WeakPtr<Context> UIView::readerContext_;
+
+
+UIView::UIView(Context* context) :
+    Object(context),
+    rootWidget_(0),
+    inputDisabled_(false),
+    keyboardDisabled_(false)
+{
+    Graphics* graphics = GetSubsystem<Graphics>();
+    assert(graphics);
+    assert(graphics->IsInitialized());
+    graphics_ = graphics;
+
+    vertexBuffer_ = new VertexBuffer(context_);
+
+}
+
+UIView::~UIView()
+{
+
+}
+
+// refactor
+void UIView::Initialize()
+{
+    readerContext_ = context_;
+    TBFile::SetReaderFunction(TBFileReader);
+
+    TBWidgetsAnimationManager::Init();
+
+    renderer_ = new UIRenderer(graphics_->GetContext());
+    tb_core_init(renderer_, "AtomicEditor/resources/language/lng_en.tb.txt");
+
+    // Load the default skin, and override skin that contains the graphics specific to the demo.
+    tb::g_tb_skin->Load("AtomicEditor/resources/default_skin/skin.tb.txt", "AtomicEditor/editor/skin/skin.tb.txt");
+
+    //register_tbbf_font_renderer();
+    //register_stb_font_renderer();
+    register_freetype_font_renderer();
+
+    tb::g_font_manager->AddFontInfo("AtomicEditor/resources/MesloLGS-Regular.ttf", "Monaco");
+    tb::g_font_manager->AddFontInfo("AtomicEditor/resources/vera.ttf", "Vera");
+
+    tb::TBFontDescription fd;
+    fd.SetID(tb::TBIDC("Vera"));
+    fd.SetSize(tb::g_tb_skin->GetDimensionConverter()->DpToPx(12));
+    tb::g_font_manager->SetDefaultFontDescription(fd);
+
+    // Create the font now.
+    tb::TBFontFace *font = tb::g_font_manager->CreateFontFace(tb::g_font_manager->GetDefaultFontDescription());
+
+    // Render some glyphs in one go now since we know we are going to use them. It would work fine
+    // without this since glyphs are rendered when needed, but with some extra updating of the glyph bitmap.
+    if (font)
+        font->RenderGlyphs(" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~•·åäöÅÄÖ");
+
+    rootWidget_ = new TBWidget();
+    //rootWidget_->SetSkinBg(tb::TBIDC("background"));
+
+    int width = graphics_->GetWidth();
+    int height = graphics_->GetHeight();
+    rootWidget_->SetSize(width, height);
+    //SetSize(width, height);
+
+    rootWidget_->SetVisibilility(tb::WIDGET_VISIBILITY_VISIBLE);
+
+    SubscribeToEvent(E_MOUSEBUTTONDOWN, HANDLER(UIView, HandleMouseButtonDown));
+    SubscribeToEvent(E_MOUSEBUTTONUP, HANDLER(UIView, HandleMouseButtonUp));
+    SubscribeToEvent(E_MOUSEMOVE, HANDLER(UIView, HandleMouseMove));
+    SubscribeToEvent(E_MOUSEWHEEL, HANDLER(UIView, HandleMouseWheel));
+    SubscribeToEvent(E_KEYDOWN, HANDLER(UIView, HandleKeyDown));
+    SubscribeToEvent(E_KEYUP, HANDLER(UIView, HandleKeyUp));
+    SubscribeToEvent(E_TEXTINPUT, HANDLER(UIView, HandleTextInput));
+    SubscribeToEvent(E_UPDATE, HANDLER(UIView, HandleUpdate));
+
+    SubscribeToEvent(E_RENDERUPDATE, HANDLER(UIView, HandleRenderUpdate));
+
+    //TB_DEBUG_SETTING(LAYOUT_BOUNDS) = 1;
+}
+
+
+void UIView::Render(VertexBuffer* buffer, const PODVector<UIBatch>& batches, unsigned batchStart, unsigned batchEnd)
+{
+
+    if (batches.Empty())
+        return;
+
+    Vector2 invScreenSize(1.0f / (float)graphics_->GetWidth(), 1.0f / (float)graphics_->GetHeight());
+    Vector2 scale(2.0f * invScreenSize.x_, -2.0f * invScreenSize.y_);
+    Vector2 offset(-1.0f, 1.0f);
+
+    Matrix4 projection(Matrix4::IDENTITY);
+    projection.m00_ = scale.x_;
+    projection.m03_ = offset.x_;
+    projection.m11_ = scale.y_;
+    projection.m13_ = offset.y_;
+    projection.m22_ = 1.0f;
+    projection.m23_ = 0.0f;
+    projection.m33_ = 1.0f;
+
+    graphics_->ClearParameterSources();
+    graphics_->SetColorWrite(true);
+    graphics_->SetCullMode(CULL_NONE);
+    graphics_->SetDepthTest(CMP_ALWAYS);
+    graphics_->SetDepthWrite(false);
+    graphics_->SetDrawAntialiased(false);
+    graphics_->SetFillMode(FILL_SOLID);
+    graphics_->SetStencilTest(false);
+
+    graphics_->ResetRenderTargets();
+
+    graphics_->SetVertexBuffer(buffer);
+
+    ShaderVariation* noTextureVS = graphics_->GetShader(VS, "Basic", "VERTEXCOLOR");
+    ShaderVariation* diffTextureVS = graphics_->GetShader(VS, "Basic", "DIFFMAP VERTEXCOLOR");
+    ShaderVariation* noTexturePS = graphics_->GetShader(PS, "Basic", "VERTEXCOLOR");
+    ShaderVariation* diffTexturePS = graphics_->GetShader(PS, "Basic", "DIFFMAP VERTEXCOLOR");
+    ShaderVariation* diffMaskTexturePS = graphics_->GetShader(PS, "Basic", "DIFFMAP ALPHAMASK VERTEXCOLOR");
+    ShaderVariation* alphaTexturePS = graphics_->GetShader(PS, "Basic", "ALPHAMAP VERTEXCOLOR");
+
+    unsigned alphaFormat = Graphics::GetAlphaFormat();
+
+    for (unsigned i = batchStart; i < batchEnd; ++i)
+    {
+        const UIBatch& batch = batches[i];
+        if (batch.vertexStart_ == batch.vertexEnd_)
+            continue;
+
+        ShaderVariation* ps;
+        ShaderVariation* vs;
+
+        if (!batch.texture_)
+        {
+            ps = noTexturePS;
+            vs = noTextureVS;
+        }
+        else
+        {
+            // If texture contains only an alpha channel, use alpha shader (for fonts)
+            vs = diffTextureVS;
+
+            if (batch.texture_->GetFormat() == alphaFormat)
+                ps = alphaTexturePS;
+            else if (batch.blendMode_ != BLEND_ALPHA && batch.blendMode_ != BLEND_ADDALPHA && batch.blendMode_ != BLEND_PREMULALPHA)
+                ps = diffMaskTexturePS;
+            else
+                ps = diffTexturePS;
+        }
+
+        graphics_->SetShaders(vs, ps);
+        if (graphics_->NeedParameterUpdate(SP_OBJECTTRANSFORM, this))
+            graphics_->SetShaderParameter(VSP_MODEL, Matrix3x4::IDENTITY);
+        if (graphics_->NeedParameterUpdate(SP_CAMERA, this))
+            graphics_->SetShaderParameter(VSP_VIEWPROJ, projection);
+        if (graphics_->NeedParameterUpdate(SP_MATERIAL, this))
+            graphics_->SetShaderParameter(PSP_MATDIFFCOLOR, Color(1.0f, 1.0f, 1.0f, 1.0f));
+
+        graphics_->SetBlendMode(batch.blendMode_);
+        graphics_->SetScissorTest(true, batch.scissor_);
+        graphics_->SetTexture(0, batch.texture_);
+        graphics_->Draw(TRIANGLE_LIST, batch.vertexStart_ / UI_VERTEX_SIZE, (batch.vertexEnd_ - batch.vertexStart_) /
+            UI_VERTEX_SIZE);
+    }
+}
+
+void UIView::SetVertexData(VertexBuffer* dest, const PODVector<float>& vertexData)
+{
+    if (vertexData.Empty())
+        return;
+
+    // Update quad geometry into the vertex buffer
+    // Resize the vertex buffer first if too small or much too large
+    unsigned numVertices = vertexData.Size() / UI_VERTEX_SIZE;
+    if (dest->GetVertexCount() < numVertices || dest->GetVertexCount() > numVertices * 2)
+        dest->SetSize(numVertices, MASK_POSITION | MASK_COLOR | MASK_TEXCOORD1, true);
+
+    dest->SetData(&vertexData[0]);
+}
+
+
+void UIView::Render()
+{
+    SetVertexData(vertexBuffer_, vertexData_);
+    Render(vertexBuffer_, batches_, 0, batches_.Size());
+}
+
+void UIView::HandleRenderUpdate(StringHash eventType, VariantMap& eventData)
+{
+    // Get rendering batches from the non-modal UI elements
+    batches_.Clear();
+    vertexData_.Clear();
+
+    tb::TBRect rect = rootWidget_->GetRect();
+
+    IntRect currentScissor = IntRect(0, 0, rect.w, rect.h);
+    GetBatches(batches_, vertexData_, currentScissor);
+
+}
+
+void UIView::GetBatches(PODVector<UIBatch>& batches, PODVector<float>& vertexData, const IntRect& currentScissor)
+{
+    //if (!initialized_)
+    //    return;
+
+    // TBAnimationManager::Update();
+
+    rootWidget_->InvokeProcessStates();
+    rootWidget_->InvokeProcess();
+
+    tb::g_renderer->BeginPaint(rootWidget_->GetRect().w, rootWidget_->GetRect().h);
+
+    renderer_->currentScissor_ = currentScissor;
+    renderer_->batches_ = &batches;
+    renderer_->vertexData_ = &vertexData;
+    rootWidget_->InvokePaint(tb::TBWidget::PaintProps());
+
+    tb::g_renderer->EndPaint();
+}
+
+void UIView::SubmitBatchVertexData(Texture* texture, const PODVector<float>& vertexData)
+{
+    UIBatch b(BLEND_ALPHA , renderer_->currentScissor_, texture, &vertexData_);
+
+    unsigned begin = b.vertexData_->Size();
+    b.vertexData_->Resize(begin + vertexData.Size());
+    float* dest = &(b.vertexData_->At(begin));
+    b.vertexEnd_ = b.vertexData_->Size();
+
+    for (unsigned i = 0; i < vertexData.Size(); i++, dest++)
+    {
+        *dest = vertexData[i];
+    }
+
+    UIBatch::AddOrMerge(b, batches_);
+
+}
+
+void UIView::TBFileReader(const char* filename, void** data, unsigned* length)
+{
+    *data = 0;
+    *length = 0;
+
+    ResourceCache* cache = readerContext_->GetSubsystem<ResourceCache>();
+    SharedPtr<File> file = cache->GetFile(filename);
+    if (!file || !file->IsOpen())
+        return;
+
+    unsigned size = file->GetSize();
+
+    if (!size)
+        return;
+
+    void* _data = malloc(size);
+    if (!_data)
+        return;
+
+    if (file->Read(_data, size) != size)
+    {
+        free(_data);
+        return;
+    }
+
+    *length = size;
+    *data = _data;
+
+}
+
+void UIView::HandleScreenMode(StringHash eventType, VariantMap& eventData)
+{
+    using namespace ScreenMode;
+    rootWidget_->SetSize(eventData[P_WIDTH].GetInt(), eventData[P_HEIGHT].GetInt());
+    //SetSize(eventData[P_WIDTH].GetInt(), eventData[P_HEIGHT].GetInt());
+}
+
+static MODIFIER_KEYS GetModifierKeys(int qualifiers, bool superKey)
+{
+    MODIFIER_KEYS code = TB_MODIFIER_NONE;
+    if (qualifiers & QUAL_ALT)	code |= TB_ALT;
+    if (qualifiers & QUAL_CTRL)	code |= TB_CTRL;
+    if (qualifiers & QUAL_SHIFT)	code |= TB_SHIFT;
+    if (superKey)	code |= TB_SUPER;
+    return code;
+}
+
+
+// @return Return the upper case of a ascii charcter. Only for shortcut handling.
+static int toupr_ascii(int ascii)
+{
+    if (ascii >= 'a' && ascii <= 'z')
+        return ascii + 'A' - 'a';
+    return ascii;
+}
+
+void UIView::HandleMouseButtonDown(StringHash eventType, VariantMap& eventData)
+{
+    if (inputDisabled_)
+        return;
+
+    using namespace MouseButtonDown;
+    unsigned button = eventData[P_BUTTON].GetUInt();
+
+    IntVector2 pos;
+    pos = GetSubsystem<Input>()->GetMousePosition();
+
+    Input* input = GetSubsystem<Input>();
+    int qualifiers = input->GetQualifiers();
+
+#ifdef ATOMIC_PLATFORM_WINDOWS
+    bool superdown = input->GetKeyDown(KEY_LCTRL) || input->GetKeyDown(KEY_RCTRL);
+#else
+    bool superdown = input->GetKeyDown(KEY_LGUI) || input->GetKeyDown(KEY_RGUI);
+#endif
+
+    MODIFIER_KEYS mod = GetModifierKeys(qualifiers, superdown);
+
+
+    static double last_time = 0;
+    static int counter = 1;
+
+    Time* t = GetSubsystem<Time>();
+
+    double time = t->GetElapsedTime() * 1000;
+    if (time < last_time + 600)
+        counter++;
+    else
+        counter = 1;
+
+    last_time = time;
+    if (button == MOUSEB_RIGHT)
+        rootWidget_->InvokeRightPointerDown(pos.x_, pos.y_, counter, mod);
+    else
+        rootWidget_->InvokePointerDown(pos.x_, pos.y_, counter, mod, false);
+
+
+}
+
+
+void UIView::HandleMouseButtonUp(StringHash eventType, VariantMap& eventData)
+{
+    if (inputDisabled_)
+        return;
+
+    using namespace MouseButtonUp;
+    unsigned button = eventData[P_BUTTON].GetUInt();
+
+    IntVector2 pos;
+
+    Input* input = GetSubsystem<Input>();
+    pos = input->GetMousePosition();
+    int qualifiers = input->GetQualifiers();
+
+#ifdef ATOMIC_PLATFORM_WINDOWS
+    bool superdown = input->GetKeyDown(KEY_LCTRL) || input->GetKeyDown(KEY_RCTRL);
+#else
+    bool superdown = input->GetKeyDown(KEY_LGUI) || input->GetKeyDown(KEY_RGUI);
+#endif
+
+    MODIFIER_KEYS mod = GetModifierKeys(qualifiers, superdown);
+
+
+    if (button == MOUSEB_RIGHT)
+        rootWidget_->InvokeRightPointerUp(pos.x_, pos.y_, mod);
+    else
+        rootWidget_->InvokePointerUp(pos.x_, pos.y_, mod, false);
+}
+
+
+void UIView::HandleMouseMove(StringHash eventType, VariantMap& eventData)
+{
+    using namespace MouseMove;
+
+    if (inputDisabled_)
+        return;
+
+    int px = eventData[P_X].GetInt();
+    int py = eventData[P_Y].GetInt();
+
+    rootWidget_->InvokePointerMove(px, py, tb::TB_MODIFIER_NONE, false);
+
+}
+
+
+void UIView::HandleMouseWheel(StringHash eventType, VariantMap& eventData)
+{
+    if (inputDisabled_)
+        return;
+
+    using namespace MouseWheel;
+
+    int delta = eventData[P_WHEEL].GetInt();
+
+    Input* input = GetSubsystem<Input>();
+
+    rootWidget_->InvokeWheel(input->GetMousePosition().x_, input->GetMousePosition().y_, 0, delta > 0 ? -1 : 1, tb::TB_MODIFIER_NONE);
+
+}
+
+static bool InvokeShortcut(int key, SPECIAL_KEY special_key, MODIFIER_KEYS modifierkeys, bool down)
+{
+#ifdef __APPLE__
+    bool shortcut_key = (modifierkeys & TB_SUPER) ? true : false;
+#else
+    bool shortcut_key = (modifierkeys & TB_CTRL) ? true : false;
+#endif
+    if (!TBWidget::focused_widget || !down || (!shortcut_key && special_key ==TB_KEY_UNDEFINED))
+        return false;
+    bool reverse_key = (modifierkeys & TB_SHIFT) ? true : false;
+    int upper_key = toupr_ascii(key);
+    TBID id;
+    if (upper_key == 'X')
+        id = TBIDC("cut");
+    else if (upper_key == 'C' || special_key == TB_KEY_INSERT)
+        id = TBIDC("copy");
+    else if (upper_key == 'V' || (special_key == TB_KEY_INSERT && reverse_key))
+        id = TBIDC("paste");
+    else if (upper_key == 'A')
+        id = TBIDC("selectall");
+    else if (upper_key == 'Z' || upper_key == 'Y')
+    {
+        bool undo = upper_key == 'Z';
+        if (reverse_key)
+            undo = !undo;
+        id = undo ? TBIDC("undo") : TBIDC("redo");
+    }
+    else if (upper_key == 'N')
+        id = TBIDC("new");
+    else if (upper_key == 'O')
+        id = TBIDC("open");
+    else if (upper_key == 'S')
+        id = TBIDC("save");
+    else if (upper_key == 'W')
+        id = TBIDC("close");
+    else if (upper_key == 'F')
+        id = TBIDC("find");
+ #ifdef ATOMIC_PLATFORM_OSX
+    else if (upper_key == 'G' && (modifierkeys & TB_SHIFT))
+        id = TBIDC("findprev");
+    else if (upper_key == 'G')
+        id = TBIDC("findnext");
+#else
+    else if (special_key == TB_KEY_F3 && (modifierkeys & TB_SHIFT))
+        id = TBIDC("findprev");
+    else if (special_key == TB_KEY_F3)
+        id = TBIDC("findnext");
+
+#endif
+    else if (upper_key == 'P')
+        id = TBIDC("play");
+    else if (upper_key == 'I')
+        id = TBIDC("beautify");
+    else if (special_key == TB_KEY_PAGE_UP)
+        id = TBIDC("prev_doc");
+    else if (special_key == TB_KEY_PAGE_DOWN)
+        id = TBIDC("next_doc");
+    else
+        return false;
+
+    TBWidgetEvent ev(EVENT_TYPE_SHORTCUT);
+    ev.modifierkeys = modifierkeys;
+    ev.ref_id = id;
+    return TBWidget::focused_widget->InvokeEvent(ev);
+}
+
+static bool InvokeKey(TBWidget* root, unsigned int key, SPECIAL_KEY special_key, MODIFIER_KEYS modifierkeys, bool keydown)
+{
+    if (InvokeShortcut(key, special_key, modifierkeys, keydown))
+        return true;
+    root->InvokeKey(key, special_key, modifierkeys, keydown);
+    return true;
+}
+
+
+void UIView::HandleKey(bool keydown, int keycode, int scancode)
+{
+
+#ifdef ATOMIC_PLATFORM_WINDOWS
+    if (keycode == KEY_LCTRL || keycode == KEY_RCTRL)
+        return;
+#else
+    if (keycode == KEY_LGUI || keycode == KEY_RGUI)
+        return;
+#endif
+
+    Input* input = GetSubsystem<Input>();
+    int qualifiers = input->GetQualifiers();
+
+#ifdef ATOMIC_PLATFORM_WINDOWS
+    bool superdown = input->GetKeyDown(KEY_LCTRL) || input->GetKeyDown(KEY_RCTRL);
+#else
+    bool superdown = input->GetKeyDown(KEY_LGUI) || input->GetKeyDown(KEY_RGUI);
+#endif
+    MODIFIER_KEYS mod = GetModifierKeys(qualifiers, superdown);
+
+    switch (keycode)
+    {
+    case KEY_RETURN:
+    case KEY_RETURN2:
+    case KEY_KP_ENTER:
+        InvokeKey(rootWidget_, 0, TB_KEY_ENTER, mod, keydown);
+        break;
+
+    case KEY_F1:
+        InvokeKey(rootWidget_, 0, TB_KEY_F1, mod, keydown);
+        break;
+    case KEY_F2:
+        InvokeKey(rootWidget_, 0, TB_KEY_F2, mod, keydown);
+        break;
+    case KEY_F3:
+        InvokeKey(rootWidget_, 0, TB_KEY_F3, mod, keydown);
+        break;
+    case KEY_F4:
+        InvokeKey(rootWidget_, 0, TB_KEY_F4, mod, keydown);
+        break;
+    case KEY_F5:
+        InvokeKey(rootWidget_, 0, TB_KEY_F5, mod, keydown);
+        break;
+    case KEY_F6:
+        InvokeKey(rootWidget_, 0, TB_KEY_F6, mod, keydown);
+        break;
+    case KEY_F7:
+        InvokeKey(rootWidget_, 0, TB_KEY_F7, mod, keydown);
+        break;
+    case KEY_F8:
+        InvokeKey(rootWidget_, 0, TB_KEY_F8, mod, keydown);
+        break;
+    case KEY_F9:
+        InvokeKey(rootWidget_, 0, TB_KEY_F9, mod, keydown);
+        break;
+    case KEY_F10:
+        InvokeKey(rootWidget_, 0, TB_KEY_F10, mod, keydown);
+        break;
+    case KEY_F11:
+        InvokeKey(rootWidget_, 0, TB_KEY_F11, mod, keydown);
+        break;
+    case KEY_F12:
+        InvokeKey(rootWidget_, 0, TB_KEY_F12, mod, keydown);
+        break;
+    case KEY_LEFT:
+        InvokeKey(rootWidget_, 0, TB_KEY_LEFT, mod, keydown);
+        break;
+    case KEY_UP:
+        InvokeKey(rootWidget_, 0, TB_KEY_UP, mod, keydown);
+        break;
+    case KEY_RIGHT:
+        InvokeKey(rootWidget_, 0, TB_KEY_RIGHT, mod, keydown);
+        break;
+    case KEY_DOWN:
+        InvokeKey(rootWidget_, 0, TB_KEY_DOWN, mod, keydown);
+        break;
+    case KEY_PAGEUP:
+        InvokeKey(rootWidget_, 0, TB_KEY_PAGE_UP, mod, keydown);
+        break;
+    case KEY_PAGEDOWN:
+        InvokeKey(rootWidget_, 0, TB_KEY_PAGE_DOWN, mod, keydown);
+        break;
+    case KEY_HOME:
+        InvokeKey(rootWidget_, 0, TB_KEY_HOME, mod, keydown);
+        break;
+    case KEY_END:
+        InvokeKey(rootWidget_, 0, TB_KEY_END, mod, keydown);
+        break;
+    case KEY_INSERT:
+        InvokeKey(rootWidget_, 0, TB_KEY_INSERT, mod, keydown);
+        break;
+    case KEY_TAB:
+        InvokeKey(rootWidget_, 0, TB_KEY_TAB, mod, keydown);
+        break;
+    case KEY_DELETE:
+        InvokeKey(rootWidget_, 0, TB_KEY_DELETE, mod, keydown);
+        break;
+    case KEY_BACKSPACE:
+        InvokeKey(rootWidget_, 0, TB_KEY_BACKSPACE, mod, keydown);
+        break;
+    case KEY_ESC:
+        InvokeKey(rootWidget_, 0, TB_KEY_ESC, mod, keydown);
+        break;
+    default:
+        if (mod & TB_SUPER)
+        {
+            InvokeKey(rootWidget_, keycode, TB_KEY_UNDEFINED, mod, keydown);
+        }
+
+    }
+
+}
+
+void UIView::HandleKeyDown(StringHash eventType, VariantMap& eventData)
+{
+    if (inputDisabled_ || keyboardDisabled_)
+        return;
+
+    using namespace KeyDown;
+
+    int keycode = eventData[P_KEY].GetInt();
+    int scancode = eventData[P_SCANCODE].GetInt();
+
+    HandleKey(true, keycode, scancode);
+
+}
+
+void UIView::HandleKeyUp(StringHash eventType, VariantMap& eventData)
+{
+    if (inputDisabled_ || keyboardDisabled_)
+        return;
+
+    using namespace KeyUp;
+
+    int keycode = eventData[P_KEY].GetInt();
+    int scancode = eventData[P_SCANCODE].GetInt();
+
+    HandleKey(false, keycode, scancode);
+
+}
+
+void UIView::HandleTextInput(StringHash eventType, VariantMap& eventData)
+{
+    if (inputDisabled_ || keyboardDisabled_)
+        return;
+
+    using namespace TextInput;
+
+    const String& text = eventData[P_TEXT].GetString();
+
+    for (unsigned i = 0; i < text.Length(); i++)
+    {
+        InvokeKey(rootWidget_, text[i], TB_KEY_UNDEFINED, TB_MODIFIER_NONE, true);
+        InvokeKey(rootWidget_, text[i], TB_KEY_UNDEFINED, TB_MODIFIER_NONE, false);
+    }
+
+}
+
+void UIView::HandleUpdate(StringHash eventType, VariantMap& eventData)
+{
+    TBMessageHandler::ProcessMessages();
+}
+
+
+}

Source/Atomic/UI/UIView.h

@@ -0,0 +1,76 @@
+
+#pragma once
+
+#include "../Core/Object.h"
+#include "../UI/UIBatch.h"
+
+namespace tb
+{
+class TBWidget;
+}
+
+namespace Atomic
+{
+
+class VertexBuffer;
+class UIRenderer;
+
+class UIView : public Object
+{
+    OBJECT(UIView)
+
+public:
+
+    /// Construct.
+    UIView(Context* context);
+    /// Destruct.
+    virtual ~UIView();
+
+    void SetKeyboardDisabled(bool disabled) {keyboardDisabled_ = disabled; }
+    void SetInputDisabled(bool disabled) { inputDisabled_ = disabled; }
+
+    void Render();
+    void GetBatches(PODVector<UIBatch>& batches, PODVector<float>& vertexData, const IntRect& currentScissor);
+    void SubmitBatchVertexData(Texture* texture, const PODVector<float>& vertexData);
+
+private:
+
+    void Initialize();
+
+    static WeakPtr<Context> readerContext_;
+    static void TBFileReader(const char* filename, void** data, unsigned* length);
+
+    void HandleRenderUpdate(StringHash eventType, VariantMap& eventData);
+    void Render(VertexBuffer* buffer, const PODVector<UIBatch>& batches, unsigned batchStart, unsigned batchEnd);
+    void SetVertexData(VertexBuffer* dest, const PODVector<float>& vertexData);
+
+    tb::TBWidget* rootWidget_;
+    UIRenderer* renderer_;
+
+    /// UI rendering batches.
+    PODVector<UIBatch> batches_;
+    /// UI rendering vertex data.
+    PODVector<float> vertexData_;
+    SharedPtr<VertexBuffer> vertexBuffer_;
+
+    WeakPtr<Graphics> graphics_;
+
+    bool inputDisabled_;
+    bool keyboardDisabled_;
+
+    // Events
+    void HandleScreenMode(StringHash eventType, VariantMap& eventData);
+    void HandleMouseButtonDown(StringHash eventType, VariantMap& eventData);
+    void HandleMouseButtonUp(StringHash eventType, VariantMap& eventData);
+    void HandleMouseMove(StringHash eventType, VariantMap& eventData);
+    void HandleMouseWheel(StringHash eventType, VariantMap& eventData);
+    void HandleKeyDown(StringHash eventType, VariantMap& eventData);
+    void HandleKeyUp(StringHash eventType, VariantMap& eventData);
+    void HandleKey(bool keydown, int keycode, int scancode);
+    void HandleTextInput(StringHash eventType, VariantMap& eventData);
+    void HandleUpdate(StringHash eventType, VariantMap& eventData);
+
+
+};
+
+}

Source/AtomicEditor/Source/AEEditor.cpp

@@ -169,13 +169,11 @@ void Editor::HandlePlayStop(StringHash eventType, VariantMap& eventData)
     if (!player_)
         return;
 
-    TBUI* tbui = GetSubsystem<TBUI>();
-    tbui->SetKeyboardDisabled(false);
+    //TBUI* tbui = GetSubsystem<TBUI>();
+    //tbui->SetKeyboardDisabled(false);
     if (player_->GetMode() != AE_PLAYERMODE_WIDGET)
     {
-
-        tbui->SetInputDisabled(false);
-        tbui->FadeIn(.5f);
+        //tbui->SetInputDisabled(false);
     }
 
     Input* input = GetSubsystem<Input>();
@@ -272,12 +270,11 @@ void Editor::HandlePlayRequest(StringHash eventType, VariantMap& eventData)
     AEPlayerMode mode = (AEPlayerMode) eventData[EditorPlayStarted::P_MODE].GetUInt();
 
     TBUI* tbui = GetSubsystem<TBUI>();
-    tbui->SetKeyboardDisabled(true);
+    //tbui->SetKeyboardDisabled(true);
 
     if (mode != AE_PLAYERMODE_WIDGET)
     {
-        tbui->SetInputDisabled(true);
-        tbui->FadeOut(.5f);
+        //tbui->SetInputDisabled(true);
     }
 
     player_ = new AEPlayer(context_);

Source/AtomicEditor/Source/UI/UIView3D.cpp

@@ -221,7 +221,7 @@ void View3DWidget::OnPaint(const PaintProps &paint_props)
     data[30] = rect.x;
     data[31] = rect.y + rect.h;
 
-    view3D_->GetSubsystem<TBUI>()->SubmitBatchVertexData(view3D_->GetRenderTexture(), vertexData_);
+    //view3D_->GetSubsystem<TBUI>()->SubmitBatchVertexData(view3D_->GetRenderTexture(), vertexData_);
 
 }