Get latest GUI sources from RTE

Correct some paths
Replace some custom methods/macros with std variants

Author: MaximDude

Editor/GUIEditorApp.cpp

@@ -9,6 +9,8 @@
 #include "AllegroInput.h"
 #include "AllegroBitmap.h"
 
+#include "RTEError.h"
+
 namespace RTE {
 
 volatile bool g_Quit;
@@ -826,8 +828,8 @@ void GUIEditorApp::CalculateHandleResize(int MouseX, int MouseY, int *X, int *Y,
         CtrlHeight += Diff;
     }
 
-    CtrlWidth = MAX(CtrlWidth, MinSize);
-    CtrlHeight = MAX(CtrlHeight, MinSize);
+    CtrlWidth = std::max(CtrlWidth, MinSize);
+    CtrlHeight = std::max(CtrlHeight, MinSize);
 
     *X = CtrlX;
     *Y = CtrlY;

GUI/GUI.cpp

@@ -0,0 +1,10 @@
+#include "GUI.h"
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+void SetRect(GUIRect *pRect, int left, int top, int right, int bottom) {
+	pRect->left = left;
+	pRect->top = top;
+	pRect->right = right;
+	pRect->bottom = bottom;
+}

GUI/GUI.h

@@ -1,21 +1,33 @@
 #ifndef _GUI_
 #define _GUI_
 
+#pragma region Rectangle Structure
 /// <summary>
-/// Main header file for the GUI library.
-/// Original Author: Jason Boettcher
-/// [email protected]
-/// www.shplorb.com/~jackal
+/// The GUIRect structure defines a rectangle by the coordinates of its upper-left and lower-right corners.
 /// </summary>
+struct GUIRect { long left; long top; long right; long bottom; };
 
-#include "GUIUtil.h"
-#include "GUIInterface.h"
+/// <summary>
+/// Sets the bounds of a GUIRect.
+/// </summary>
+/// <param name="pRect">Pointer to the GUIRect.</param>
+/// <param name="left">Position of top left corner on X axis.</param>
+/// <param name="top">Position of top left corner on Y axis.</param>
+/// <param name="right">Position of bottom right corner on X axis.</param>
+/// <param name="bottom">Position of bottom right corner on Y axis.</param>
+void SetRect(GUIRect *pRect, int left, int top, int right, int bottom);
+#pragma endregion
+
+//#include "RTETools.h"
+
+#include "Interface.h"
 #include "GUIProperties.h"
 #include "GUIInput.h"
 #include "GUIFont.h"
 #include "GUISkin.h"
 #include "GUIPanel.h"
 #include "GUIManager.h"
+#include "GUIUtil.h"
 #include "GUIControl.h"
 #include "GUIEvent.h"
 #include "GUIControlFactory.h"

GUI/GUIBanner.cpp

@@ -16,8 +16,8 @@
 
 namespace RTE {
 
-std::map<std::string, GUIBanner::FontChar *> GUIBanner::m_sFontCache;
-std::map<std::string, int> GUIBanner::m_sCharCapCache;
+map<string, GUIBanner::FontChar *> GUIBanner::m_sFontCache;
+map<string, int> GUIBanner::m_sCharCapCache;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -59,20 +59,19 @@ GUIBanner::GUIBanner()
 bool GUIBanner::Create(const std::string fontFilePath, const std::string fontBlurFilePath, int bitDepth)
 {
     // Package the font bitmap paths o they are more easily processed below
-    std::string filePaths[2] = {fontFilePath, fontBlurFilePath};
+    string filePaths[2] = {fontFilePath, fontBlurFilePath};
 
     // Now process them and extract the character data from each
     ContentFile fontFile;
-	std::map<std::string, FontChar *>::iterator fontItr;
-	std::map<std::string, int>::iterator indexItr;
+    map<string, FontChar *>::iterator fontItr;
+    map<string, int>::iterator indexItr;
     int y, dotColor;
     for (int mode = REGULAR; mode < FONTMODECOUNT; ++mode)
     {
         // Load the font images
         fontFile.SetDataPath(filePaths[mode].c_str());
         m_pFontImage[mode] = fontFile.GetAsBitmap(bitDepth == 8 ? COLORCONV_REDUCE_TO_256 : COLORCONV_8_TO_32);
-        //RTEAssert(m_pFontImage[mode], "Couldn't load font bitmap for banner font from this file:\n" + fontFilePath);
-        assert(m_pFontImage[mode]);
+        RTEAssert(m_pFontImage[mode], "Couldn't load font bitmap for banner font from this file:\n" + fontFilePath);
 
         // Check the color key to be the same color as the Bottom-Right hand corner pixel
         int keyColor = getpixel(m_pFontImage[mode], m_pFontImage[mode]->w - 1, m_pFontImage[mode]->h - 1);
@@ -158,7 +157,7 @@ bool GUIBanner::Create(const std::string fontFilePath, const std::string fontBlu
                     {
                         int Pixel = getpixel(m_pFontImage[mode], i, j);
                         if (Pixel != dotColor && Pixel != keyColor)
-                            Height = MAX(Height, j - y);
+                            Height = std::max(Height, j - y);
                     }
                 }
 
@@ -183,14 +182,14 @@ bool GUIBanner::Create(const std::string fontFilePath, const std::string fontBlu
 
         // Add the calculated charIndexcap to the cache so we can use it in other banner instances
         // that use the same font bitmap files.
-        m_sCharCapCache.insert(std::pair<std::string, int>(filePaths[mode], m_CharIndexCap));
+        m_sCharCapCache.insert(pair<string, int>(filePaths[mode], m_CharIndexCap));
         // Also add the now calculated font char data to the cache
         // Allocate a dynamic array to throw into the map.. probably until app close
         FontChar *aNewCache = new FontChar[MAXBANNERFONTCHARS];
         // Copy the font data into the cache
         memcpy(aNewCache, m_aaFontChars[mode], sizeof(FontChar) * MAXBANNERFONTCHARS);
         // Now put it into the cache map
-        m_sFontCache.insert(std::pair<std::string, FontChar *>(filePaths[mode], aNewCache));
+        m_sFontCache.insert(pair<string, FontChar *>(filePaths[mode], aNewCache));
     }
 
     return true;
@@ -229,7 +228,7 @@ int GUIBanner::SpaceBetween(const FlyingChar &first, FontMode firstMode, const F
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Starts the display animation of a text string in this banner's font.
 
-void GUIBanner::ShowText(const std::string text, AnimMode mode, long duration, Vector targetSize, float yOnTarget, int flySpeed, int flySpacing)
+void GUIBanner::ShowText(const string text, AnimMode mode, long duration, Vector targetSize, float yOnTarget, int flySpeed, int flySpacing)
 {
     m_BannerText = text;
     m_AnimMode = mode;
@@ -250,7 +249,7 @@ void GUIBanner::ShowText(const std::string text, AnimMode mode, long duration, V
     // The showing position for the first character
     int showPosX = (m_TargetSize.m_X / 2) - (CalculateWidth(text, REGULAR) / 2);
     int whichChar = 0;
-    for (std::string::const_iterator tItr = text.begin(); tItr != text.end(); ++tItr)
+    for (string::const_iterator tItr = text.begin(); tItr != text.end(); ++tItr)
     {
         whichChar++;
         // Create the flying character entry
@@ -324,8 +323,8 @@ void GUIBanner::Update()
     int flyDirection = m_AnimMode == FLYBYLEFTWARD ? -1 : 1;
     int whichChar = 0;
     // Go through every character, updating their positions and states
-	std::list<FlyingChar>::iterator prevItr = m_BannerChars.end();
-    for (std::list<FlyingChar>::iterator cItr = m_BannerChars.begin(); cItr != m_BannerChars.end(); ++cItr)
+    list<FlyingChar>::iterator prevItr = m_BannerChars.end();
+    for (list<FlyingChar>::iterator cItr = m_BannerChars.begin(); cItr != m_BannerChars.end(); ++cItr)
     {
         whichChar++;
         // Start off each character's motion at the appropriate order and timing
@@ -419,7 +418,7 @@ void GUIBanner::Draw(BITMAP *pTargetBitmap)
     // Go through every character in the banner, drawing the ones that are showing
     unsigned char c;
     int mode, charWidth, offX, offY;
-    for (std::list<FlyingChar>::iterator cItr = m_BannerChars.begin(); cItr != m_BannerChars.end(); ++cItr)
+    for (list<FlyingChar>::iterator cItr = m_BannerChars.begin(); cItr != m_BannerChars.end(); ++cItr)
     {
         // Only draw anything if the character is even visible
         if ((*cItr).m_MoveState >= SHOWING && (*cItr).m_MoveState <= HIDING)

GUI/GUIBanner.h

@@ -13,12 +13,12 @@
 
 #include "Vector.h"
 #include "Timer.h"
+#include "allegro.h"
 
 struct BITMAP;
 
 #define MAXBANNERFONTCHARS 256
 
-using namespace RTE;
 namespace RTE
 {
 

GUI/GUIButton.cpp

@@ -147,7 +147,7 @@ void GUIButton::BuildBitmap(void)
     m_DrawBitmap = m_Skin->CreateBitmap(m_Width, m_Height*3);
 
     // Pre-cache the font
-	std::string Filename;
+    string Filename;
     m_Skin->GetValue("Button_Up", "Font", &Filename);
     m_Skin->GetValue("Button_Up", "FontColor", &m_FontColor);
     m_Skin->GetValue("Button_Up", "FontShadow", &m_FontShadow);
@@ -367,7 +367,7 @@ void GUIButton::StoreProperties(void)
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Sets the text.
 
-void GUIButton::SetText(const std::string Text)
+void GUIButton::SetText(const string Text)
 {
     m_Text = Text;
 
@@ -380,7 +380,7 @@ void GUIButton::SetText(const std::string Text)
 //////////////////////////////////////////////////////////////////////////////////////////
 // Description:     Gets the text.
 
-std::string GUIButton::GetText(void)
+string GUIButton::GetText(void)
 {
     return m_Text;
 }

GUI/GUIButton.h

@@ -57,7 +57,7 @@ class GUIButton :
 // Description:     Called when the control has been created.
 // Arguments:       Name, Position.
 
-    void Create(const std::string Name, int X, int Y, int Width = -1, int Height = -1);
+    void Create(const std::string Name, int X, int Y, int Width = -1, int Height = -1) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -66,7 +66,7 @@ class GUIButton :
 // Description:     Called when the control has been destroyed.
 // Arguments:       None.
 
-    void Destroy(void);
+    void Destroy() override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -75,7 +75,7 @@ class GUIButton :
 // Description:     Called when the control has been created.
 // Arguments:       Properties.
 
-    void Create(GUIProperties *Props);
+    void Create(GUIProperties *Props) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -84,7 +84,7 @@ class GUIButton :
 // Description:     Called when the skin has been changed.
 // Arguments:       New skin pointer.
 
-    void ChangeSkin(GUISkin *Skin);
+    void ChangeSkin(GUISkin *Skin) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -93,7 +93,7 @@ class GUIButton :
 // Description:     Draws the panel
 // Arguments:       Screen class
 
-    void Draw(GUIScreen *Screen);
+    void Draw(GUIScreen *Screen) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -102,7 +102,7 @@ class GUIButton :
 // Description:     Called when the mouse goes down on the panel
 // Arguments:       Mouse Position, Mouse Buttons, Modifier.
 
-    void OnMouseDown(int X, int Y, int Buttons, int Modifier);
+    void OnMouseDown(int X, int Y, int Buttons, int Modifier) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -111,7 +111,7 @@ class GUIButton :
 // Description:     Called when the mouse goes up on the panel
 // Arguments:       Mouse Position, Mouse Buttons, Modifier.
 
-    void OnMouseUp(int X, int Y, int Buttons, int Modifier);
+    void OnMouseUp(int X, int Y, int Buttons, int Modifier) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -120,7 +120,7 @@ class GUIButton :
 // Description:     Called when the mouse moves (over the panel, or when captured).
 // Arguments:       Mouse Position, Mouse Buttons, Modifier.
 
-    void OnMouseMove(int X, int Y, int Buttons, int Modifier);
+    void OnMouseMove(int X, int Y, int Buttons, int Modifier) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -129,7 +129,7 @@ class GUIButton :
 // Description:     Called when the mouse enters the panel.
 // Arguments:       Mouse Position, Mouse Buttons, Modifier.
 
-    void OnMouseEnter(int X, int Y, int Buttons, int Modifier);
+    void OnMouseEnter(int X, int Y, int Buttons, int Modifier) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -138,7 +138,7 @@ class GUIButton :
 // Description:     Called when the mouse leaves the panel.
 // Arguments:       Mouse Position, Mouse Buttons, Modifier.
 
-    void OnMouseLeave(int X, int Y, int Buttons, int Modifier);
+    void OnMouseLeave(int X, int Y, int Buttons, int Modifier) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -147,7 +147,7 @@ class GUIButton :
 // Description:     Called when a key goes down.
 // Arguments:       KeyCode, Modifier.
 
-    virtual void OnKeyDown(int KeyCode, int Modifier);
+	void OnKeyDown(int KeyCode, int Modifier) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -157,7 +157,7 @@ class GUIButton :
 // Arguments:       None.
 // Returns:         0 if the control does not have a panel, otherwise the topmost panel.
 
-    GUIPanel *GetPanel(void);
+    GUIPanel * GetPanel() override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -166,7 +166,7 @@ class GUIButton :
 // Description:     Returns a string representing the control's ID
 // Arguments:       None.
 
-    static std::string GetControlID(void)    { return "BUTTON"; };
+    static std::string GetControlID()    { return "BUTTON"; };
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -175,7 +175,7 @@ class GUIButton :
 // Description:     Gets the rectangle of the control.
 // Arguments:       Position, Size.
 
-    void GetControlRect(int *X, int *Y, int *Width, int *Height);
+    void GetControlRect(int *X, int *Y, int *Width, int *Height) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -184,7 +184,7 @@ class GUIButton :
 // Description:     Gets the control to store the values into properties.
 // Arguments:       None.
 
-    void StoreProperties(void);
+    void StoreProperties() override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -193,7 +193,7 @@ class GUIButton :
 // Description:     Called when the control needs to be moved.
 // Arguments:       New position.
 
-    void Move(int X, int Y);
+    void Move(int X, int Y) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -202,7 +202,7 @@ class GUIButton :
 // Description:     Called when the control needs to be resized.
 // Arguments:       New size.
 
-    void Resize(int Width, int Height);
+    void Resize(int Width, int Height) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -229,7 +229,7 @@ class GUIButton :
 // Description:     Gets the text.
 // Arguments:       None.
 
-    std::string GetText(void);
+    std::string GetText();
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -238,7 +238,7 @@ class GUIButton :
 // Description:     Applies new properties to the control.
 // Arguments:       GUIProperties.
 
-    void ApplyProperties(GUIProperties *Props);
+    void ApplyProperties(GUIProperties *Props) override;
 
 
 //////////////////////////////////////////////////////////////////////////////////////////
@@ -253,7 +253,7 @@ class GUIButton :
 // Description:     Create the button bitmap to draw.
 // Arguments:       None.
 
-    void BuildBitmap(void);
+    void BuildBitmap();
 
 
 // Members