xrGame: Added new features stubs for UIProgressBar

OpenXRay · Jun 19, 2018 · ce6164a · ce6164a
1 parent 0383b14
commit ce6164a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/src/xrGame/ui/UIProgressBar.cpp b/src/xrGame/ui/UIProgressBar.cpp
@@ -62,6 +62,10 @@ void CUIProgressBar::UpdateProgressBar()
         }
         else
             m_UIProgressItem.SetTextureColor(m_maxColor.get());
+
+        // XXX: Implement color smoothing
+        if (colorSmoothing)
+            R_ASSERT2(false, "color smoothing is not implemented.");
     }
 }
 
@@ -112,6 +116,10 @@ void CUIProgressBar::Draw()
     case om_vert: progress_rect.set(0, GetHeight() - m_CurrentLength, GetWidth(), GetHeight()); break;
     case om_back: progress_rect.set(GetWidth() - m_CurrentLength * 1.01f, 0, GetWidth(), GetHeight()); break;
     case om_down: progress_rect.set(0, 0, GetWidth(), m_CurrentLength); break;
+    // XXX: Implement two-way progress bar
+    case om_twoway: R_ASSERT2(false, "two_way mode is not implemented."); break;
+    case om_vtwoway: R_ASSERT2(false, "vert_two_way mode is not implemented."); break;
+    case om_tocenter: R_ASSERT2(false, "from_edges_to_center mode is not implemented."); break;
     default: NODEFAULT; break;
     }
 

diff --git a/src/xrGame/ui/UIProgressBar.h b/src/xrGame/ui/UIProgressBar.h
@@ -16,6 +16,9 @@ class CUIProgressBar : public CUIWindow
         om_vert = 1,
         om_back = 2,
         om_down = 3,
+        om_twoway = 4,
+        om_vtwoway = 5,
+        om_tocenter = 6,
         om_count
     } m_orient_mode;
 
@@ -33,6 +36,7 @@ class CUIProgressBar : public CUIWindow
 public:
     bool m_bUseColor;
     bool m_bUseGradient; //Alundaio: if false then use only solid color with m_maxColor
+    bool colorSmoothing;
     Fcolor m_minColor;
     Fcolor m_middleColor;
     Fcolor m_maxColor;

diff --git a/src/xrGame/ui/UIXmlInit.cpp b/src/xrGame/ui/UIXmlInit.cpp
@@ -559,6 +559,18 @@ bool CUIXmlInit::InitProgressBar(CUIXml& xml_doc, LPCSTR path, int index, CUIPro
     {
         mode = CUIProgressBar::om_down;
     }
+    else if (xr_stricmp(mode_str, "two_way") == 0)
+    {
+        mode = CUIProgressBar::om_twoway;
+    }
+    else if (xr_stricmp(mode_str, "vert_two_way") == 0)
+    {
+        mode = CUIProgressBar::om_vtwoway;
+    }
+    else if (xr_stricmp(mode_str, "to_center") == 0)
+    {
+        mode = CUIProgressBar::om_tocenter;
+    }
 
     pWnd->InitProgressBar(pos, size, mode);
 
@@ -569,6 +581,8 @@ bool CUIXmlInit::InitProgressBar(CUIXml& xml_doc, LPCSTR path, int index, CUIPro
     pWnd->SetRange(min, max);
     pWnd->SetProgressPos(ppos);
     pWnd->m_inertion = xml_doc.ReadAttribFlt(path, index, "inertion", 0.0f);
+    pWnd->colorSmoothing = xml_doc.ReadAttribInt(path, index, "color_smoothing");
+
     // progress
     strconcat(sizeof(buf), buf, path, ":progress");