ui and graphics changes

* implement draw clipping using opengl stencil buffers
* allow to create Widgets by style name with g_ui.createWidgetByStyle
* styles can now have children widgets
* make proper use of the isNotPathable in pathfinding
* add scrollbar skin

modules/client_entergame/characterlist.otui

@@ -18,11 +18,17 @@ MainWindow
   TextList
     id: characterList
     anchors.fill: parent
-    anchors.bottom: next.top
+    anchors.bottom: accountStatusLabel.top
     margin-bottom: 5
     padding: 1
     focusable: false
 
+  VerticalScrollBar
+    attached-to: characterList
+    anchors.top: characterList.top
+    anchors.bottom: characterList.bottom
+    anchors.right: characterList.right
+
   Label
     id: accountStatusLabel
     text: |-

modules/core_lib/core_lib.otmod

@@ -40,4 +40,5 @@ Module
     dofile 'widgets/uiwindow'
     dofile 'widgets/uimessagebox'
     dofile 'widgets/uisplitter'
+    dofile 'widgets/uiscrollbar'
 

modules/core_lib/globals.lua

@@ -12,27 +12,12 @@ function displayUI(otui, parent)
   return g_ui.loadUI(otuiFilePath, parent)
 end
 
-function createWidget(style, parent)
-  local className = g_ui.getStyleClass(style)
-  if className == "" then
-    error('could not find style ' .. style)
-    return
-  end
-
-  local class = _G[className]
-  if not class then
-    error('could not find widget class ' .. className)
-    return
-  end
-
-  local widget = class.create()
-  if parent then
+function createWidget(stylename, parent)
   if type(parent) == 'string' then
     parent = rootWidget:recursiveGetChildById(parent)
   end
-    parent:addChild(widget)
-  end
-  widget:setStyle(style)
+  local widget = g_ui.createWidgetFromStyle(stylename, parent)
+  --widget:setStyle(stylename)
   return widget
 end
 

modules/core_lib/widgets/uiscrollbar.lua

@@ -0,0 +1,30 @@
+UIScrollBar = extends(UIWidget)
+
+function UIScrollBar.create()
+  local scrollbar = UIScrollBar.internalCreate()
+  scrollbar:setFocusable(false)
+  return scrollbar
+end
+
+function UIScrollBar:onSetup()
+  --self.getChildById('upButton').onClick = function() self.navigateUp() end
+  --self.getChildById('upButton').onClick = function() self.navigateDown() end
+end
+
+function UIScrollBar:attachWidget(widget)
+  self.attachedWidget = widget
+end
+
+function UIScrollBar:onStyleApply(styleName, styleNode)
+  if styleNode['attached-to'] then
+    local id = styleNode['attached-to']
+    local parent = self:getParent()
+    local widget
+    if id == 'parent' then
+      widget = parent
+    elseif parent then
+      widget = parent:getChildById(id)
+    end
+    self:attachWidget(widget)
+  end
+end

modules/core_lib/widgets/uisplitter.lua

@@ -50,9 +50,10 @@ function UISplitter:onMouseRelease(mousePos, mouseButton)
 end
 
 function UISplitter:onStyleApply(styleName, styleNode)
-  if styleNode['relative-margin'] then
-    self.relativeMargin = styleNode['relative-margin']
-  end
+  --TODO: relative margins
+  --if styleNode['relative-margin'] then
+  ---  self.relativeMargin = styleNode['relative-margin']
+  --end
 end
 
 function UISplitter:canUpdateMargin(newMargin)

modules/core_styles/core_styles.otmod

@@ -28,3 +28,4 @@ Module
     importStyle 'styles/comboboxes.otui'
     importStyle 'styles/spinboxes.otui'
     importStyle 'styles/messageboxes.otui'
+    importStyle 'styles/scrollbars.otui'

modules/core_styles/styles/scrollbars.otui

@@ -0,0 +1,30 @@
+VerticalScrollBar < UIScrollBar
+  width: 13
+  image-source: images/vscrollbar.png
+  image-clip: 0 39 13 32
+  image-border: 1
+
+  UIButton
+    id: upButton
+    anchors.top: parent.top
+    anchors.right: parent.right
+    image-source: images/vscrollbar.png
+    image-clip: 0 0 13 13
+    size: 13 13
+
+  UIButton
+    id: downButton
+    anchors.bottom: parent.bottom
+    anchors.right: parent.right
+    size: 13 13
+    image-source: images/vscrollbar.png
+    image-clip: 0 13 13 13
+
+  //UIButton
+    //id: middleButton
+    //anchors.top: parent.top
+    //anchors.right: parent.right
+    //size: 13 13
+    //margin-top: 30
+    //image-source: images/vscrollbar.png
+    //image-clip: 0 26 13 13

src/framework/graphics/graphics.cpp

@@ -49,6 +49,7 @@ void Graphics::init()
 #endif
 
     glEnable(GL_BLEND);
+    glDisable(GL_DEPTH_TEST);
 
     m_emptyTexture = TexturePtr(new Texture);
 
@@ -113,6 +114,29 @@ void Graphics::endRender()
 {
 }
 
+void Graphics::beginClipping(const Rect& clipRect)
+{
+    // setup stencil buffer for writing
+    glClear(GL_STENCIL_BUFFER_BIT);
+    glEnable(GL_STENCIL_TEST);
+    glStencilFunc(GL_ALWAYS, 1, 1);
+    glStencilOp(GL_REPLACE, GL_REPLACE, GL_REPLACE);
+
+    // draw the clipping area into the stencil buffer
+    glColorMask(0, 0, 0, 0);
+    g_painter.drawFilledRect(clipRect);
+
+    // set stencil buffer for clippig
+    glColorMask(1, 1, 1, 1);
+    glStencilFunc(GL_EQUAL, 1, 1);
+    glStencilOp(GL_KEEP, GL_KEEP, GL_KEEP);
+}
+
+void Graphics::endClipping()
+{
+    glDisable(GL_STENCIL_TEST);
+}
+
 void Graphics::setViewportSize(const Size& size)
 {
     glViewport(0, 0, size.width(), size.height());

src/framework/graphics/graphics.h

@@ -44,6 +44,9 @@ public:
     void beginRender();
     void endRender();
 
+    void beginClipping(const Rect& clipRect);
+    void endClipping();
+
     void setViewportSize(const Size& size);
 
     int getMaxTextureSize();

src/framework/luafunctions.cpp

@@ -489,6 +489,8 @@ void Application::registerLuaFunctions()
     g_lua.bindClassStaticFunction("g_ui", "getStyle", std::bind(&UIManager::getStyle, &g_ui, _1));
     g_lua.bindClassStaticFunction("g_ui", "getStyleClass", std::bind(&UIManager::getStyleClass, &g_ui, _1));
     g_lua.bindClassStaticFunction("g_ui", "loadUI", std::bind(&UIManager::loadUI, &g_ui, _1, _2));
+    g_lua.bindClassStaticFunction("g_ui", "createWidgetFromStyle", std::bind(&UIManager::createWidgetFromStyle, &g_ui, _1, _2));
+    g_lua.bindClassStaticFunction("g_ui", "createWidgetFromOTML", std::bind(&UIManager::createWidgetFromOTML, &g_ui, _1, _2));
     g_lua.bindClassStaticFunction("g_ui", "getRootWidget", std::bind(&UIManager::getRootWidget, &g_ui));
     g_lua.bindClassStaticFunction("g_ui", "getDraggingWidget", std::bind(&UIManager::getDraggingWidget, &g_ui));
     g_lua.bindClassStaticFunction("g_ui", "setDebugBoxesDrawing", std::bind(&UIManager::setDebugBoxesDrawing, &g_ui, _1));

src/framework/otml/otmldocument.cpp

@@ -36,8 +36,9 @@ OTMLDocumentPtr OTMLDocument::create()
 OTMLDocumentPtr OTMLDocument::parse(const std::string& fileName)
 {
     std::stringstream fin;
-    g_resources.loadFile(fileName, fin);
-    return parse(fin, fileName);
+    std::string source = g_resources.checkPath(fileName);
+    g_resources.loadFile(source, fin);
+    return parse(fin, source);
 }
 
 OTMLDocumentPtr OTMLDocument::parse(std::istream& in, const std::string& source)

src/framework/platform/win32window.cpp

@@ -306,16 +306,16 @@ void WIN32Window::internalChooseGLVisual()
                                          0,                          // No Accumulation Buffer
                                          0, 0, 0, 0,                 // Accumulation Bits Ignored
                                          16,                         // 16Bit Z-Buffer (Depth Buffer)
-                                         0,                          // No Stencil Buffer
+                                         1,                          // 1Bit Stencil Buffer
                                          0,                          // No Auxiliary Buffer
                                          PFD_MAIN_PLANE,             // Main Drawing Layer
                                          0,                          // Reserved
                                          0, 0, 0 };                  // Layer Masks Ignored
 
-    pixelFormat = ChoosePixelFormat(m_deviceContext, &pfd);
     if(!pixelFormat)
         logFatal("Could not find a suitable pixel format");
 
+    pfd.cStencilBits = 8;
     if(!SetPixelFormat(m_deviceContext, pixelFormat, &pfd))
         logFatal("Could not set the pixel format");
 }

src/framework/platform/x11window.cpp

@@ -367,6 +367,7 @@ void X11Window::internalChooseGLVisual()
         GLX_USE_GL,
         GLX_RGBA,
         GLX_DOUBLEBUFFER,
+        GLX_STENCIL_SIZE, 1,
         None
     };
 
@@ -379,6 +380,7 @@ void X11Window::internalChooseGLVisual()
     static int attrList[] = {
         //EGL_BUFFER_SIZE, 24,
         EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
+        EGL_STENCIL_SIZE, 1,
         EGL_NONE
     };
 

src/framework/ui/uianchorlayout.cpp

@@ -197,6 +197,7 @@ void UIAnchorLayout::updateWidget(const UIWidgetPtr& widget, UIAnchorGroup& anch
         }
     }
 
+    newRect.translate(-parentWidget->getVirtualOffset());
     widget->setRect(newRect);
     anchorGroup.setUpdated(true);
 }

src/framework/ui/uiframecounter.cpp

@@ -36,9 +36,9 @@ UIFrameCounter::UIFrameCounter()
     m_frameCount = 0;
 }
 
-void UIFrameCounter::draw()
+void UIFrameCounter::drawSelf()
 {
-    UIWidget::draw();
+    UIWidget::drawSelf();
 
     if(g_clock.ticksElapsed(m_lastFrameTicks) >= 1000) {
         m_fpsText = Fw::formatString("FPS: %d", m_frameCount);

src/framework/ui/uiframecounter.h

@@ -29,7 +29,7 @@ class UIFrameCounter : public UIWidget
 {
 public:
     UIFrameCounter();
-    virtual void draw();
+    void drawSelf();
 
     void setAlign(Fw::AlignmentFlag align) { m_align = align; }
     Fw::AlignmentFlag getAlign() { return m_align; }

src/framework/ui/uimanager.cpp

@@ -53,7 +53,7 @@ void UIManager::terminate()
 
 void UIManager::render()
 {
-    m_rootWidget->draw();
+    m_rootWidget->draw(m_rootWidget->getRect());
 }
 
 void UIManager::resize(const Size& size)
@@ -349,23 +349,24 @@ UIWidgetPtr UIManager::loadUI(const std::string& file, const UIWidgetPtr& parent
             else {
                 if(widget)
                     Fw::throwException("cannot have multiple main widgets in otui files");
-                widget = loadWidgetFromOTML(node, parent);
+                widget = createWidgetFromOTML(node, parent);
             }
         }
 
         return widget;
     } catch(Exception& e) {
-        logError("Failed to load UI from '", file, "': ", e.what());
+        logError("failed to load UI from '", file, "': ", e.what());
         return nullptr;
     }
 }
-/*
-UIWidgetPtr UIManager::loadWidgetFromStyle()
-{
 
+UIWidgetPtr UIManager::createWidgetFromStyle(const std::string& styleName, const UIWidgetPtr& parent)
+{
+    OTMLNodePtr node = OTMLNode::create(styleName);
+    return createWidgetFromOTML(node, parent);
 }
-*/
-UIWidgetPtr UIManager::loadWidgetFromOTML(const OTMLNodePtr& widgetNode, const UIWidgetPtr& parent)
+
+UIWidgetPtr UIManager::createWidgetFromOTML(const OTMLNodePtr& widgetNode, const UIWidgetPtr& parent)
 {
     OTMLNodePtr originalStyleNode = getStyle(widgetNode->tag());
     if(!originalStyleNode)
@@ -384,9 +385,11 @@ UIWidgetPtr UIManager::loadWidgetFromOTML(const OTMLNodePtr& widgetNode, const U
     if(widget) {
         widget->setStyleFromNode(styleNode);
 
-        for(const OTMLNodePtr& childNode : widgetNode->children()) {
-            if(!childNode->isUnique())
-                loadWidgetFromOTML(childNode, widget);
+        for(const OTMLNodePtr& childNode : styleNode->children()) {
+            if(!childNode->isUnique()) {
+                createWidgetFromOTML(childNode, widget);
+                styleNode->removeChild(childNode);
+            }
         }
     } else
         Fw::throwException("unable to create widget of type '", widgetType, "'");

src/framework/ui/uimanager.h

@@ -46,8 +46,9 @@ public:
     OTMLNodePtr getStyle(const std::string& styleName);
     std::string getStyleClass(const std::string& styleName);
 
-    UIWidgetPtr loadUI(const std::string& file, const UIWidgetPtr& parent = nullptr);
-    UIWidgetPtr loadWidgetFromOTML(const OTMLNodePtr& widgetNode, const UIWidgetPtr& parent);
+    UIWidgetPtr loadUI(const std::string& file, const UIWidgetPtr& parent);
+    UIWidgetPtr createWidgetFromStyle(const std::string& styleName, const UIWidgetPtr& parent);
+    UIWidgetPtr createWidgetFromOTML(const OTMLNodePtr& widgetNode, const UIWidgetPtr& parent);
 
     void setMouseReceiver(const UIWidgetPtr& widget) { m_mouseReceiver = widget; }
     void setKeyboardReceiver(const UIWidgetPtr& widget) { m_keyboardReceiver = widget; }

src/framework/ui/uiwidget.cpp

@@ -51,10 +51,22 @@ UIWidget::~UIWidget()
 #endif
 }
 
-void UIWidget::draw()
+void UIWidget::draw(const Rect& visibleRect)
 {
     drawSelf();
-    drawChildren();
+    if(m_children.size() > 0) {
+        bool clip = true;
+        if(this == g_ui.getRootWidget().get())
+            clip = false;
+
+        if(clip)
+            g_graphics.beginClipping(visibleRect);
+
+        drawChildren(visibleRect);
+
+        if(clip)
+            g_graphics.endClipping();
+    }
 }
 
 void UIWidget::drawSelf()
@@ -72,15 +84,18 @@ void UIWidget::drawSelf()
     drawText(m_rect);
 }
 
-void UIWidget::drawChildren()
+void UIWidget::drawChildren(const Rect& visibleRect)
 {
     // draw children
     for(const UIWidgetPtr& child : m_children) {
         // render only visible children with a valid rect inside parent rect
-        if(child->isExplicitlyVisible() &&
-           child->getRect().isValid() &&
-           child->getOpacity() > 0.0f &&
-           child->getRect().intersects(m_rect)) {
+        if(!child->isExplicitlyVisible() || !child->getRect().isValid() || child->getOpacity() == 0.0f)
+            continue;
+
+        Rect childVisibleRect = visibleRect.intersection(child->getRect());
+        if(!childVisibleRect.isValid())
+            continue;
+
         // store current graphics opacity
         float oldOpacity = g_painter.getOpacity();
 
@@ -88,7 +103,7 @@ void UIWidget::drawChildren()
         if(child->getOpacity() < oldOpacity)
             g_painter.setOpacity(child->getOpacity());
 
-            child->draw();
+        child->draw(childVisibleRect);
 
         // debug draw box
         if(g_ui.isDrawingDebugBoxes()) {
@@ -99,7 +114,6 @@ void UIWidget::drawChildren()
 
         g_painter.setOpacity(oldOpacity);
     }
-    }
 }
 
 void UIWidget::addChild(const UIWidgetPtr& child)
@@ -747,6 +761,7 @@ void UIWidget::setStyle(const std::string& styleName)
         logTraceError("unable to retrive style '", styleName, "': not a defined style");
         return;
     }
+    styleNode = styleNode->clone();
     applyStyle(styleNode);
     m_style = styleNode;
     updateStyle();
@@ -839,6 +854,13 @@ void UIWidget::setLastFocusReason(Fw::FocusReason reason)
     m_lastFocusReason = reason;
 }
 
+void UIWidget::setVirtualOffset(const Point& offset)
+{
+    m_virtualOffset = offset;
+    if(m_layout)
+        m_layout->update();
+}
+
 bool UIWidget::isVisible()
 {
     if(!m_visible)

src/framework/ui/uiwidget.h

@@ -49,14 +49,15 @@ public:
     virtual ~UIWidget();
 
 protected:
-    virtual void draw();
+    virtual void draw(const Rect& visibleRect);
     virtual void drawSelf();
-    virtual void drawChildren();
+    virtual void drawChildren(const Rect& visibleRect);
 
     friend class UIManager;
 
     std::string m_id;
     Rect m_rect;
+    Point m_virtualOffset;
     Boolean<true> m_enabled;
     Boolean<true> m_visible;
     Boolean<true> m_focusable;
@@ -121,6 +122,7 @@ public:
     void setFixedSize(bool fixed);
     void setLastFocusReason(Fw::FocusReason reason);
     void setAutoRepeatDelay(int delay) { m_autoRepeatDelay = delay; }
+    void setVirtualOffset(const Point& offset);
 
     bool isVisible();
     bool isChildLocked(const UIWidgetPtr& child);
@@ -240,6 +242,7 @@ public:
     int getChildCount() { return m_children.size(); }
     Fw::FocusReason getLastFocusReason() { return m_lastFocusReason; }
     int getAutoRepeatDelay() { return m_autoRepeatDelay; }
+    Point getVirtualOffset() { return m_virtualOffset; }
     std::string getStyleName() { return m_style->tag(); }
 
 

src/framework/ui/uiwidgetbasestyle.cpp

@@ -81,9 +81,9 @@ void UIWidget::parseBaseStyle(const OTMLNodePtr& styleNode)
         else if(node->tag() == "background-rect")
             setBackgroundRect(node->value<Rect>());
         else if(node->tag() == "icon")
-            setIcon(node->value());
+            setIcon(Fw::resolvePath(node->value(), node->source()));
         else if(node->tag() == "icon-source")
-            setIcon(node->value());
+            setIcon(Fw::resolvePath(node->value(), node->source()));
         else if(node->tag() == "icon-color")
             setIconColor(node->value<Color>());
         else if(node->tag() == "icon-offset-x")

src/framework/ui/uiwidgetimage.cpp

@@ -35,7 +35,7 @@ void UIWidget::parseImageStyle(const OTMLNodePtr& styleNode)
 {
     for(const OTMLNodePtr& node : styleNode->children()) {
         if(node->tag() == "image-source")
-            setImageSource(Fw::resolvePath(node->value(), styleNode->source()));
+            setImageSource(Fw::resolvePath(node->value(), node->source()));
         else if(node->tag() == "image-offset-x")
             setImageOffsetX(node->value<int>());
         else if(node->tag() == "image-offset-y")

src/otclient/core/map.cpp

@@ -459,7 +459,7 @@ std::vector<Otc::Direction> Map::findPath(const Position& startPos, const Positi
 
                 Position neighborPos = currentNode->pos.translated(i, j);
                 const TilePtr& tile = getTile(neighborPos);
-                if(!tile || !tile->isWalkable())
+                if(!tile || (!tile->isPathable() && neighborPos != goalPos) || (!tile->isWalkable() && neighborPos == goalPos))
                     continue;
 
                 float walkFactor;

src/otclient/core/thing.h

@@ -79,6 +79,7 @@ public:
     bool isNotMoveable() { return m_type->properties[ThingType::IsNotMovable]; }
     bool isNotWalkable() { return m_type->properties[ThingType::NotWalkable]; }
     bool isPickupable() { return m_type->properties[ThingType::IsPickupable]; }
+    bool isNotPathable() { return m_type->properties[ThingType::NotPathable]; }
     bool isIgnoreLook() { return m_type->properties[ThingType::IgnoreLook]; }
     bool isHangable() { return m_type->properties[ThingType::IsHangable]; }
     bool isHookSouth() { return m_type->properties[ThingType::HookSouth]; }

src/otclient/core/tile.cpp

@@ -358,6 +358,19 @@ bool Tile::isWalkable()
     return true;
 }
 
+bool Tile::isPathable()
+{
+    if(!isWalkable())
+        return false;
+
+    for(const ThingPtr& thing : m_things) {
+        if(thing->isNotPathable())
+            return false;
+    }
+
+    return true;
+}
+
 bool Tile::isFullGround()
 {
     ItemPtr ground = getGround();

src/otclient/core/tile.h

@@ -58,6 +58,7 @@ public:
     ItemPtr getGround();
     int getGroundSpeed();
     int getThingCount() { return m_things.size() + m_effects.size(); }
+    bool isPathable();
     bool isWalkable();
     bool isFullGround();
     bool isFullyOpaque();

src/otclient/ui/uicreature.cpp

@@ -24,17 +24,15 @@
 #include <framework/otml/otml.h>
 #include <framework/graphics/graphics.h>
 
-void UICreature::draw()
+void UICreature::drawSelf()
 {
-    drawSelf();
+    UIWidget::drawSelf();
 
     if(m_creature) {
         g_painter.setColor(Color::white);
         Rect drawRect = getChildrenRect();
         m_creature->drawOutfit(drawRect, !m_fixedCreatureSize);
     }
-
-    drawChildren();
 }
 
 void UICreature::onStyleApply(const std::string& styleName, const OTMLNodePtr& styleNode)

src/otclient/ui/uicreature.h

@@ -30,7 +30,7 @@
 class UICreature : public UIWidget
 {
 public:
-    void draw();
+    void drawSelf();
 
     void setCreature(const CreaturePtr& creature) { m_creature = creature; }
     void setFixedCreatureSize(bool fixed) { m_fixedCreatureSize = fixed; }

src/otclient/ui/uiitem.cpp

@@ -30,9 +30,9 @@ UIItem::UIItem()
     m_dragable = true;
 }
 
-void UIItem::draw()
+void UIItem::drawSelf()
 {
-    drawSelf();
+    UIWidget::drawSelf();
 
     if(m_item) {
         Point topLeft = m_rect.bottomRight() - Point(32, 32) + Point(m_padding.left, m_padding.top);
@@ -48,9 +48,6 @@ void UIItem::draw()
 
         //m_font->renderText(Fw::unsafeCast<std::string>(m_item->getId()), m_rect);
     }
-
-
-    drawChildren();
 }
 
 void UIItem::setItemId(int id)

src/otclient/ui/uiitem.h

@@ -31,7 +31,7 @@ class UIItem : public UIWidget
 {
 public:
     UIItem();
-    void draw();
+    void drawSelf();
 
     void setItemId(int id);
     void setItemCount(int count) { if(m_item) m_item->setCount(count); }

src/otclient/ui/uimap.cpp

@@ -40,17 +40,15 @@ UIMap::~UIMap()
     g_map.removeMapView(m_mapView);
 }
 
-void UIMap::draw()
+void UIMap::drawSelf()
 {
-    drawSelf();
+    UIWidget::drawSelf();
 
     // draw map border
     g_painter.setColor(Color::black);
     g_painter.drawBoundingRect(m_mapRect.expanded(1));
 
     m_mapView->draw(m_mapRect);
-
-    drawChildren();
 }
 
 void UIMap::zoomIn()

src/otclient/ui/uimap.h

@@ -33,7 +33,7 @@ public:
     UIMap();
     ~UIMap();
 
-    void draw();
+    void drawSelf();
 
     void zoomIn();
     void zoomOut();