Debug stuff (REMOVE BEFORE MERGE)

Author: falbrechtskirchinger

libs/s25main/Window.cpp

@@ -491,6 +491,20 @@ void Window::DrawLine(DrawPoint pt1, DrawPoint pt2, unsigned short width, unsign
     VIDEODRIVER.GetRenderer()->DrawLine(pt1, pt2, width, color);
 }
 
+// DEBUG REMOVE BEFORE MERGE
+void Window::DrawCross(DrawPoint pt, unsigned short length, unsigned short width, unsigned color)
+{
+    auto* renderer = VIDEODRIVER.GetRenderer();
+
+    DrawPoint pt1 = pt - DrawPoint(-length, length);
+    DrawPoint pt2 = pt - DrawPoint(length, -length);
+    DrawPoint pt3 = pt - DrawPoint(length, length);
+    DrawPoint pt4 = pt - DrawPoint(-length, -length);
+
+    renderer->DrawLine(pt1, pt2, width, color);
+    renderer->DrawLine(pt3, pt4, width, color);
+}
+
 void Window::Msg_PaintBefore()
 {
     animations_.update(VIDEODRIVER.GetTickCount());

libs/s25main/Window.h

@@ -201,6 +201,8 @@ class Window
     static void DrawRectangle(const Rect& rect, unsigned color);
     /// Zeichnet eine Linie
     static void DrawLine(DrawPoint pt1, DrawPoint pt2, unsigned short width, unsigned color);
+    // DEBUG REMOVE BEFORE MERGE
+    static void DrawCross(DrawPoint pt, unsigned short length, unsigned short width, unsigned color);
 
     // GUI-Notify-Messages
 

libs/s25main/desktops/dskGameInterface.cpp

@@ -4,6 +4,7 @@
 
 #include "dskGameInterface.h"
 #include "CollisionDetection.h"
+#include "DrawPoint.h"
 #include "EventManager.h"
 #include "Game.h"
 #include "GamePlayer.h"
@@ -82,6 +83,7 @@
 #include "gameData/TerrainDesc.h"
 #include "gameData/const_gui_ids.h"
 #include "liblobby/LobbyClient.h"
+#include "s25util/colors.h"
 #include <algorithm>
 #include <cstdio>
 #include <utility>
@@ -668,6 +670,10 @@ bool dskGameInterface::Msg_LeftDown(const MouseCoords& mc)
             actionwindow->Close();
         VIDEODRIVER.SetMousePos(mc.GetPos());
 
+        // DEBUG REMOVE BEFORE MERGE
+        ClearDebugPoints();
+        SetDebugPoint(0, mc.GetPos(), 8, 4, MakeColor(255, 0, 255, 255));
+
         ShowActionWindow(action_tabs, cSel, mc.GetPos(), enable_military_buildings);
     }
 
@@ -980,6 +986,13 @@ void dskGameInterface::Run()
     }
 
     messenger.Draw();
+
+    // DEBUG REMOVE BEFORE MERGE
+    for(const auto &debugPoint : debugPoints)
+    {
+        if(!debugPoint.valid) continue;
+        DrawCross(debugPoint.pos, debugPoint.length, debugPoint.width, debugPoint.color);
+    }
 }
 
 void dskGameInterface::GI_StartRoadBuilding(const MapPoint startPt, bool waterRoad)
@@ -1391,3 +1404,22 @@ void dskGameInterface::GI_TeamWinner(const unsigned playerMask)
     messenger.AddMessage("", 0, ChatDestination::System, text, COLOR_ORANGE);
     WINDOWMANAGER.Show(std::make_unique<iwVictory>(winners));
 }
+
+// DEBUG REMOVE BEFORE MERGE
+void dskGameInterface::SetDebugPoint(unsigned i, DrawPoint pos, unsigned short length, unsigned short width, unsigned color)
+{
+    unsigned minSize = i + 1;
+    if(debugPoints.size() < minSize)
+        debugPoints.resize(minSize);
+
+    debugPoints[i] = {true, pos, length, width, color};
+}
+
+// DEBUG REMOVE BEFORE MERGE
+void dskGameInterface::ClearDebugPoints()
+{
+    debugPoints.clear();
+}
+
+// DEBUG REMOVE BEFORE MERGE
+std::vector<DebugPoint> dskGameInterface::debugPoints;

libs/s25main/desktops/dskGameInterface.h

@@ -5,6 +5,7 @@
 #pragma once
 
 #include "Desktop.h"
+#include "DrawPoint.h"
 #include "GameInterface.h"
 #include "IngameMinimap.h"
 #include "Messenger.h"
@@ -30,6 +31,15 @@ struct BuildingNote;
 struct KeyEvent;
 class NWFInfo;
 
+// DEBUG REMOVE BEFORE MERGE
+struct DebugPoint {
+    bool valid = false;
+    DrawPoint pos;
+    unsigned short length;
+    unsigned short width;
+    unsigned color;
+};
+
 class dskGameInterface :
     public Desktop,
     public ClientInterface,
@@ -38,6 +48,10 @@ class dskGameInterface :
     public IChatCmdListener
 {
 public:
+    // DEBUG REMOVE BEFORE MERGE
+    static void SetDebugPoint(unsigned i, DrawPoint pos, unsigned short length, unsigned short width, unsigned color);
+    static void ClearDebugPoints();
+
     dskGameInterface(std::shared_ptr<Game> game, std::shared_ptr<const NWFInfo> nwfInfo, unsigned playerIdx,
                      bool initOGL = true);
     ~dskGameInterface() override;
@@ -164,4 +178,7 @@ class dskGameInterface :
     bool isCheatModeOn;
     std::string curCheatTxt;
     Subscription evBld;
+
+    // DEBUG REMOVE BEFORE MERGE
+    static std::vector<DebugPoint> debugPoints;
 };