preliminary work for unified wrapping code

Author: HeliumAnt

Source/Renderer/GraphicalPrimitive.cpp

@@ -30,29 +30,48 @@ const GraphicalPrimitive::PrimitiveType TextPrimitive::c_PrimitiveType = Primiti
 const GraphicalPrimitive::PrimitiveType BitmapPrimitive::c_PrimitiveType = PrimitiveType::Bitmap;
 
 Vector GraphicalPrimitive::WrapCoordinates(Vector targetPos, const Vector& scenePos) const {
-	Vector drawPos = scenePos;
+	return targetPos + scenePos;
+}
+
+void GraphicalPrimitive::DrawTiled(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 tiledTarget{targetPos};
 	if (g_SceneMan.SceneWrapsX()) {
-		float sceneWidth = static_cast<float>(g_SceneMan.GetSceneWidth());
-		if (targetPos.m_X <= sceneWidth && targetPos.m_X > sceneWidth / 2) {
-			targetPos.m_X -= sceneWidth;
-		}
+		tiledTarget.m_X = std::fmodf(targetPos.m_X, g_SceneMan.GetSceneWidth());
 	}
-	drawPos.m_X -= targetPos.m_X;
-
 	if (g_SceneMan.SceneWrapsY()) {
-		float sceneHeight = static_cast<float>(g_SceneMan.GetSceneHeight());
-		if (targetPos.m_Y <= sceneHeight && targetPos.m_Y > sceneHeight / 2) {
-			targetPos.m_Y -= sceneHeight;
+		tiledTarget.m_Y = std::fmodf(targetPos.m_Y, g_SceneMan.GetSceneHeight());
+	}
+	DrawLineV(-tiledTarget + Vector(-30, -30), -tiledTarget + Vector(30, 30), {53, 0, 0, 255});
+	DrawLineV(-tiledTarget + Vector(30, -30), -tiledTarget + Vector(-30, 30), {53, 0, 0, 255});
+
+	float bitmapWidth = g_SceneMan.GetSceneWidth();
+	float bitmapHeight = g_SceneMan.GetSceneHeight();
+	int areaToCoverX = drawScreen->w;
+	int areaToCoverY = drawScreen->h;
+
+	for (int tiledOffsetX = 0; tiledOffsetX < areaToCoverX;) {
+		float destX = tiledOffsetX - tiledTarget.m_X;
+
+		for (int tiledOffsetY = 0; tiledOffsetY < areaToCoverY;) {
+			float destY = tiledOffsetY - tiledTarget.m_Y;
+			Draw(drawScreen, Vector(destX, destY));
+			if (!g_SceneMan.SceneWrapsY()) {
+				break;
+			}
+			tiledOffsetY += bitmapHeight;
+		}
+		if (!g_SceneMan.SceneWrapsX()) {
+			break;
 		}
+		tiledOffsetX += bitmapWidth;
 	}
-	drawPos.m_Y -= targetPos.m_Y;
-	return drawPos;
+	// Draw(drawScreen, targetPos);
 }
 
 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);
 	DrawLineEx(drawStart, drawEnd, m_Thickness, {m_Color, 0, 0, 255});

Source/Renderer/GraphicalPrimitive.h

@@ -5,6 +5,7 @@
 #include <array>
 #include <string>
 #include <vector>
+#include <algorithm>
 
 namespace RTE {
 
@@ -43,6 +44,7 @@ namespace RTE {
 
 		Vector m_StartPos; //!< Start position of the primitive.
 		Vector m_EndPos; //!< End position of the primitive.
+		float m_DrawRadiusSquared{0.0f};
 		unsigned char m_Color = 0; //!< Color to draw this primitive with.
 		int m_Player = -1; //!< Player screen to draw this primitive on.
 		DrawBlendMode m_BlendMode = DrawBlendMode::NoBlend; //!< The blending mode that will be used when drawing this primitive.
@@ -56,6 +58,8 @@ namespace RTE {
 		/// @param scenePos Position on scene.
 		Vector WrapCoordinates(Vector targetPos, const Vector& scenePos) const;
 
+		void DrawTiled(BITMAP* drawScreen, const Vector& targetPos);
+
 		/// Draws this primitive on provided bitmap.
 		/// @param drawScreen Bitmap to draw on.
 		/// @param targetPos Position of graphical primitive.
@@ -87,6 +91,7 @@ namespace RTE {
 		LinePrimitive(int player, const Vector& startPos, const Vector& endPos, unsigned char color) {
 			m_StartPos = startPos;
 			m_EndPos = endPos;
+			m_DrawRadiusSquared = std::abs((m_StartPos - m_EndPos).GetSqrMagnitude());
 			m_Color = color;
 			m_Player = player;
 			m_Thickness = 1;
@@ -100,6 +105,7 @@ namespace RTE {
 		LinePrimitive(int player, const Vector& startPos, const Vector& endPos, float thickness, unsigned char color) {
 			m_StartPos = startPos;
 			m_EndPos = endPos;
+			m_DrawRadiusSquared = std::abs((m_StartPos - m_EndPos).GetSqrMagnitude());
 			m_Color = color;
 			m_Player = player;
 			m_Thickness = thickness;
@@ -135,6 +141,7 @@ namespace RTE {
 			m_StartPos = centerPos;
 			m_Color = color;
 			m_Player = player;
+			m_DrawRadiusSquared = (m_Radius + m_Thickness) * (m_Radius + m_Thickness);
 		}
 
 	private:
@@ -166,6 +173,7 @@ namespace RTE {
 			m_EndPos = endPos;
 			m_Color = color;
 			m_Player = player;
+			m_DrawRadiusSquared = std::max<float>({(startPos - guideA).GetSqrMagnitude(), (startPos - guideB).GetSqrMagnitude(), (startPos - endPos).GetSqrMagnitude()});
 		}
 
 	private:
@@ -190,6 +198,7 @@ namespace RTE {
 			m_EndPos = bottomRightPos;
 			m_Color = color;
 			m_Player = player;
+			m_DrawRadiusSquared = (m_EndPos - m_StartPos).GetSqrMagnitude();
 		}
 
 	private:
@@ -214,6 +223,7 @@ namespace RTE {
 			m_EndPos = bottomRightPos;
 			m_Color = color;
 			m_Player = player;
+			m_DrawRadiusSquared = (m_StartPos - m_EndPos).GetSqrMagnitude();
 		}
 
 	private:
@@ -243,6 +253,7 @@ namespace RTE {
 			m_EndPos = bottomRightPos;
 			m_Color = color;
 			m_Player = player;
+			m_DrawRadiusSquared = (m_EndPos - m_StartPos).GetSqrMagnitude();
 		}
 
 	private: