add thickness to line primitive

Author: HeliumAnt

Source/Lua/LuaBindingsPrimitives.cpp

@@ -11,7 +11,8 @@ LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, GraphicalPrimi
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, LinePrimitive) {
 	return luabind::class_<LinePrimitive, GraphicalPrimitive>("LinePrimitive")
 
-	    .def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>());
+	    .def(luabind::constructor<int, const Vector&, const Vector&, unsigned char>())
+	    .def(luabind::constructor<int, const Vector&, const Vector&, float, unsigned char>());
 }
 
 LuaBindingRegisterFunctionDefinitionForType(PrimitiveLuaBindings, ArcPrimitive) {

Source/Managers/PrimitiveMan.cpp

@@ -71,18 +71,7 @@ void PrimitiveMan::SchedulePrimitivesForBlendedDrawing(DrawBlendMode blendMode,
 }
 
 void PrimitiveMan::DrawLinePrimitive(int player, const Vector& startPos, const Vector& endPos, unsigned char color, int thickness) {
-	if (thickness > 1) {
-		Vector dirVector = g_SceneMan.ShortestDistance(startPos, endPos, g_SceneMan.SceneWrapsX()).SetMagnitude(static_cast<float>(thickness - 1) / 2.0F).Perpendicularize();
-		Vector pointA = startPos + dirVector;
-		Vector pointB = startPos - dirVector;
-		Vector pointC = endPos + dirVector;
-		Vector pointD = endPos - dirVector;
-
-		DrawTriangleFillPrimitive(player, pointA, pointB, pointC, color);
-		DrawTriangleFillPrimitive(player, pointC, pointD, pointB, color);
-	} else {
-		SchedulePrimitive(std::make_unique<LinePrimitive>(player, startPos, endPos, color));
-	}
+	SchedulePrimitive(std::make_unique<LinePrimitive>(player, startPos, endPos, thickness, color));
 }
 
 void PrimitiveMan::DrawArcPrimitive(const Vector& centerPos, float startAngle, float endAngle, int radius, unsigned char color) {

Source/System/GraphicalPrimitive.cpp

@@ -51,9 +51,11 @@ Vector GraphicalPrimitive::WrapCoordinates(Vector targetPos, const Vector& scene
 }
 
 void LinePrimitive::Draw(BITMAP* drawScreen, const Vector& targetPos) {
+	DrawLineV(targetPos + Vector(-30, -30), targetPos + Vector(30,30), {53, 0, 0, 255});
+	DrawLineV(targetPos + Vector(30, -30), targetPos + Vector(-30,30), {53, 0, 0, 255});
 	Vector drawStart = WrapCoordinates(targetPos, m_StartPos);
 	Vector drawEnd = WrapCoordinates(targetPos, m_EndPos);
-	DrawLine(drawStart.GetFloorIntX(), drawStart.GetFloorIntY(), drawEnd.GetFloorIntX(), drawEnd.GetFloorIntY(), {m_Color, 0, 0, 255});
+	DrawLineEx(drawStart, drawEnd, m_Thickness, {m_Color, 0, 0, 255});
 }
 
 void ArcPrimitive::Draw(BITMAP* drawScreen, const Vector& targetPos) {

Source/System/GraphicalPrimitive.h

@@ -77,6 +77,8 @@ namespace RTE {
 	public:
 		GraphicalPrimitiveOverrideMethods;
 
+		float m_Thickness{1.0f};
+
 		/// Constructor method for LinePrimitive object.
 		/// @param player Player screen to draw this primitive on.
 		/// @param startPos Start position of the primitive.
@@ -87,6 +89,20 @@ namespace RTE {
 			m_EndPos = endPos;
 			m_Color = color;
 			m_Player = player;
+			m_Thickness = 1;
+		}
+		/// Constructor method for LinePrimitive object.
+		/// @param player Player screen to draw this primitive on.
+		/// @param startPos Start position of the primitive.
+		/// @param end End position of the primitive.
+		/// @param thickness Thickness of the line.
+		/// @param color Color to draw this primitive with.
+		LinePrimitive(int player, const Vector& startPos, const Vector& endPos, float thickness, unsigned char color) {
+			m_StartPos = startPos;
+			m_EndPos = endPos;
+			m_Color = color;
+			m_Player = player;
+			m_Thickness = thickness;
 		}
 
 	private: