Better line drawing for Legend

This should also be the line drawing for Anniversary if the compiler there didn't completely optimize away all functions needed for it.

Author: TheIndra55

src/render/Draw.cpp

@@ -15,6 +15,7 @@ void TRANS_RotTransPersVectorf(cdc::Vector3* srcvector, cdc::Vector3* dstvector)
 	Hooking::Call(addr, srcvector, dstvector);
 }
 
+#ifdef TR8
 void TRANS_TransToDrawVertex(cdc::Vector3* vec, DRAWVERTEX* v)
 {
 	auto addr = GET_ADDRESS(0x000000, 0x000000, 0x48A450);
@@ -28,6 +29,7 @@ void TRANS_TransToLineVertex(cdc::Vector3* vec, LINEVERTEX* v)
 
 	Hooking::Call(addr, vec, v);
 }
+#endif
 
 void DRAW_DrawQuads(int flags, int tpage, DRAWVERTEX* verts, int numquads)
 {
@@ -38,7 +40,7 @@ void DRAW_DrawQuads(int flags, int tpage, DRAWVERTEX* verts, int numquads)
 
 void DRAW_DrawLines(LINEVERTEX* verts, int numlines)
 {
-	auto addr = GET_ADDRESS(0x000000, 0x000000, 0x5BFCD0);
+	auto addr = GET_ADDRESS(0x406120, 0x000000, 0x5BFCD0);
 
 	Hooking::Call(addr, verts, numlines);
 }
@@ -50,7 +52,7 @@ void DRAW_DrawTriangles(int flags, int tpage, DRAWVERTEX* verts, int numtris)
 	Hooking::Call(addr, flags, tpage, verts, numtris);
 }
 
-inline void TransformToVertex(DRAWVERTEX* v, cdc::Vector3* vec)
+inline void TransformToDrawVertex(DRAWVERTEX* v, cdc::Vector3* vec)
 {
 #ifndef TR8
 	TRANS_TransToDrawVertexV4f(v, vec);
@@ -59,13 +61,22 @@ inline void TransformToVertex(DRAWVERTEX* v, cdc::Vector3* vec)
 #endif
 }
 
+inline void TransformToLineVertex(LINEVERTEX* v, cdc::Vector3* vec)
+{
+#ifndef TR8
+	TRANS_TransToDrawVertexV4f((DRAWVERTEX*)v, vec);
+#else
+	TRANS_TransToLineVertex(vec, v);
+#endif
+}
+
 void DrawTriangle(cdc::Vector3* v0, cdc::Vector3* v1, cdc::Vector3* v2, int color)
 {
 	DRAWVERTEX verts[3];
 
-	TransformToVertex(verts, v0);
-	TransformToVertex(&verts[1], v1);
-	TransformToVertex(&verts[2], v2);
+	TransformToDrawVertex(verts, v0);
+	TransformToDrawVertex(&verts[1], v1);
+	TransformToDrawVertex(&verts[2], v2);
 
 	verts[0].color = color;
 	verts[1].color = color;
@@ -81,12 +92,12 @@ void DrawPlane(cdc::Vector3* v0, cdc::Vector3* v1, int color)
 	auto v2 = cdc::Vector3{ v0->x, v0->y, v1->z };
 	auto v3 = cdc::Vector3{ v1->x, v1->y, v0->z };
 
-	TransformToVertex(verts, v0);
-	TransformToVertex(&verts[1], &v2);
-	TransformToVertex(&verts[2], v1);
-	TransformToVertex(&verts[3], &v3);
-	TransformToVertex(&verts[4], v1);
-	TransformToVertex(&verts[5], v0);
+	TransformToDrawVertex(verts, v0);
+	TransformToDrawVertex(&verts[1], &v2);
+	TransformToDrawVertex(&verts[2], v1);
+	TransformToDrawVertex(&verts[3], &v3);
+	TransformToDrawVertex(&verts[4], v1);
+	TransformToDrawVertex(&verts[5], v0);
 
 	verts[0].color = color;
 	verts[1].color = color;
@@ -98,10 +109,9 @@ void DrawPlane(cdc::Vector3* v0, cdc::Vector3* v1, int color)
 	DRAW_DrawTriangles(2, 0, verts, 2);
 }
 
-// Scuffed ass line, TODO fix
 void DrawLine(cdc::Vector3* v0, cdc::Vector3* v1, int color)
 {
-#ifndef TR8
+#ifdef TRAE
 	DRAWVERTEX verts[6];
 
 	auto v2 = *v1;
@@ -112,12 +122,12 @@ void DrawLine(cdc::Vector3* v0, cdc::Vector3* v1, int color)
 	v2.y += 20.f;
 	v3.y += 20.f;
 
-	TransformToVertex(verts, v0);
-	TransformToVertex(&verts[1], &v2);
-	TransformToVertex(&verts[2], v1);
-	TransformToVertex(&verts[3], &v3);
-	TransformToVertex(&verts[4], v1);
-	TransformToVertex(&verts[5], v0);
+	TransformToDrawVertex(verts, v0);
+	TransformToDrawVertex(&verts[1], &v2);
+	TransformToDrawVertex(&verts[2], v1);
+	TransformToDrawVertex(&verts[3], &v3);
+	TransformToDrawVertex(&verts[4], v1);
+	TransformToDrawVertex(&verts[5], v0);
 
 	verts[0].color = color;
 	verts[1].color = color;
@@ -130,8 +140,8 @@ void DrawLine(cdc::Vector3* v0, cdc::Vector3* v1, int color)
 #else
 	LINEVERTEX lines[2];
 
-	TRANS_TransToLineVertex(v0, lines);
-	TRANS_TransToLineVertex(v1, &lines[1]);
+	TransformToLineVertex(lines, v0);
+	TransformToLineVertex(&lines[1], v1);
 
 	lines[0].color = color;
 	lines[1].color = color;

src/render/Draw.h

@@ -32,19 +32,22 @@ struct LINEVERTEX
 
 void TRANS_TransToDrawVertexV4f(DRAWVERTEX* v, cdc::Vector3* vec);
 void TRANS_RotTransPersVectorf(cdc::Vector3* srcvector, cdc::Vector3* dstvector);
+
+#ifdef TR8
 void TRANS_TransToDrawVertex(cdc::Vector3* vec, DRAWVERTEX* v);
 void TRANS_TransToLineVertex(cdc::Vector3* vec, LINEVERTEX* v);
+#endif
 
 void DRAW_DrawQuads(int flags, int tpage, DRAWVERTEX* verts, int numquads);
 void DRAW_DrawTriangles(int flags, int tpage, DRAWVERTEX* verts, int numtris);
 void DRAW_DrawLines(LINEVERTEX* verts, int numlines);
 
-void TransformToVertex(DRAWVERTEX* v, cdc::Vector3* vec);
+void TransformToDrawVertex(DRAWVERTEX* v, cdc::Vector3* vec);
+void TransformToLineVertex(LINEVERTEX* v, cdc::Vector3* vec);
 
 void DrawTriangle(cdc::Vector3* v0, cdc::Vector3* v1, cdc::Vector3* v2, int color);
 void DrawPlane(cdc::Vector3* v0, cdc::Vector3* v1, int color);
 void DrawLine(cdc::Vector3* v0, cdc::Vector3* v1, int color);
 void DrawBoundingBox(cdc::Vector3* v0, cdc::Vector3* v1, int color);
 void DrawBoundingBox(cdc::Vector3* v0, cdc::Vector3* v1, cdc::Vector3* v2, cdc::Vector3* v3, int color);
-
 void DrawBox(cdc::Vector3* v0, cdc::Vector3* v1, cdc::Vector3* v2, cdc::Vector3* v3, int color);