* Added the 3D move gizmo rendering.

* Merged 2D/3D gizmo render function in viewport code (no need to keep two
functions in sync).

Author: luciusDXL

TheForceEngine/TFE_Editor/LevelEditor/Rendering/gizmo.cpp

@@ -202,6 +202,48 @@ namespace LevelEditor
 		}
 	}
 
+	void gizmo_drawMove3d(Vec3f p0, Vec3f p1)
+	{
+		Vec3f offset0 = { p0.x - s_camera.pos.x, p0.y - s_camera.pos.y, p0.z - s_camera.pos.z };
+		Vec3f offset1 = { p1.x - s_camera.pos.x, p1.y - s_camera.pos.y, p1.z - s_camera.pos.z };
+		f32 scale0 = sqrtf(TFE_Math::dot(&offset0, &offset0));
+		f32 scale1 = sqrtf(TFE_Math::dot(&offset1, &offset1));
+
+		const u32 colorMain = 0xff00a5ff;
+		const u32 colorXAxis = 0xff4040ff;
+		const u32 colorZAxis = 0xffff4040;
+		const Vec3f vtx[] =
+		{
+			p0, p1
+		};
+		const u32 colorsMain[] = { colorMain, colorMain };
+		const u32 colorsXAxis[] = { colorXAxis, colorXAxis };
+		const u32 colorsZAxis[] = { colorZAxis, colorZAxis };
+
+		f32 dx = fabsf(p1.x - p0.x);
+		f32 dz = fabsf(p1.z - p0.z);
+
+		lineDraw3d_setLineDrawMode(LINE_DRAW_DASHED);
+		// Draw movement line.
+		const u32* distColor = colorsMain;
+		if (dx < 0.001f) distColor = colorsZAxis;
+		else if (dz < 0.001f) distColor = colorsXAxis;
+		lineDraw3d_addLine(2.5f, vtx, distColor);
+		// Draw X & Y movement lines.
+		if (fabsf(p1.x - p0.x) > 0.001f && fabsf(p1.z - p0.z) > 0.001f)
+		{
+			const Vec3f zaxis[] = { {vtx[0].x, vtx[0].y, vtx[0].z}, {vtx[0].x, vtx[0].y, vtx[1].z} };
+			const Vec3f xaxis[] = { {vtx[0].x, vtx[0].y, vtx[1].z}, {vtx[1].x, vtx[0].y, vtx[1].z} };
+
+			lineDraw3d_addLine(2.5f, zaxis, colorsZAxis);
+			lineDraw3d_addLine(2.5f, xaxis, colorsXAxis);
+		}
+		lineDraw3d_setLineDrawMode();
+
+		drawBox3d(&vtx[0], 0.0075f * scale0, 2.0f, colorMain);
+		drawBox3d(&vtx[1], 0.0075f * scale1, 2.0f, colorMain);
+	}
+
 	void gizmo_drawRotation3d(Vec3f center)
 	{
 		const RotationGizmoPart hoveredPart = (RotationGizmoPart)edit_getTransformRotationHover();

TheForceEngine/TFE_Editor/LevelEditor/Rendering/gizmo.h

@@ -29,6 +29,7 @@ namespace LevelEditor
 
 	// Transform Gizmos.
 	void gizmo_drawMove2d(Vec3f p0, Vec3f p1);
+	void gizmo_drawMove3d(Vec3f p0, Vec3f p1);
 	void gizmo_drawRotation2d(Vec2f center);
 	void gizmo_drawRotation3d(Vec3f center);
 	f32 gizmo_getRotationRadiusWS(RotationGizmoPart part, Vec3f* center = nullptr);

TheForceEngine/TFE_Editor/LevelEditor/Rendering/viewport.cpp

@@ -173,7 +173,7 @@ namespace LevelEditor
 	void drawArrow3d(f32 width, f32 lenInPixels, Vec3f pos, Vec3f dir, Vec3f nrm, u32 color);
 	void drawArrow3d_Segment(f32 width, f32 lenInPixels, Vec3f pos0, Vec3f pos1, Vec3f nrm, u32 color);
 	void drawNoteIcon3d(LevelNote* note, s32 id, u32 objColor, const Vec3f& cameraRgt, const Vec3f& cameraUp);
-	void drawTransformGizmo3d();
+	void drawTransformGizmo();
 	bool computeSignCorners(const EditorSector* sector, const EditorWall* wall, Vec3f* corners);
 
 	void viewport_init()
@@ -316,21 +316,24 @@ namespace LevelEditor
 		camera.projMtx.m3.w = 1.0f;
 	}
 
-	void drawTransformGizmo2d()
+	void drawTransformGizmo()
 	{
 		if (!edit_isTransformToolActive()) { return; }
-
-		TransformMode mode = edit_getTransformMode();
-		if (mode == TRANS_MOVE)
-		{
-			const Vec3f p0 = edit_getTransformAnchor();
-			const Vec3f p1 = edit_getTransformPos();
-			gizmo_drawMove2d(p0, p1);
-		}
-		else if (mode == TRANS_ROTATE)
+		switch (edit_getTransformMode())
 		{
-			const Vec3f centerWS = edit_getTransformAnchor();
-			gizmo_drawRotation2d({ centerWS.x, centerWS.z });
+			case TRANS_MOVE:
+			{
+				const Vec3f p0 = edit_getTransformAnchor();
+				const Vec3f p1 = edit_getTransformPos();
+				if (s_view == EDIT_VIEW_2D) { gizmo_drawMove2d(p0, p1); }
+				else { gizmo_drawMove3d(p0, p1); }
+			} break;
+			case TRANS_ROTATE:
+			{
+				const Vec3f centerWS = edit_getTransformAnchor();
+				if (s_view == EDIT_VIEW_2D) { gizmo_drawRotation2d({ centerWS.x, centerWS.z }); }
+				else { gizmo_drawRotation3d(centerWS); }
+			} break;
 		}
 	}
 
@@ -532,7 +535,7 @@ namespace LevelEditor
 		}
 
 		// Transform Gizmos
-		drawTransformGizmo2d();
+		drawTransformGizmo();
 
 		// Compute the camera and projection for the model draw.
 		Camera3d camera;
@@ -1836,7 +1839,7 @@ namespace LevelEditor
 		triDraw3d_begin(&s_grid);
 		lineDraw3d_begin(s_viewportSize.x, s_viewportSize.z);
 
-		drawTransformGizmo3d();
+		drawTransformGizmo();
 
 		triDraw3d_draw(&s_camera, (f32)s_viewportSize.x, (f32)s_viewportSize.z, s_grid.size, 0.0f, false, false);
 		lineDraw3d_drawLines(&s_camera, false, false);
@@ -2133,21 +2136,7 @@ namespace LevelEditor
 
 		return u32(colorSum.x * 255.0f) | (u32(colorSum.y * 255.0f) << 8) | (u32(colorSum.z * 255.0f) << 16) | (u32(alpha * 255.0f) << 24);
 	}
-
-	void drawTransformGizmo3d()
-	{
-		if (!edit_isTransformToolActive()) { return; }
-
-		TransformMode mode = edit_getTransformMode();
-		if (mode == TRANS_ROTATE)
-		{
-			Vec3f centerWS = edit_getTransformAnchor();
-			Vec3f rotation = edit_getTransformRotation();
-
-			gizmo_drawRotation3d(centerWS);
-		}
-	}
-
+		
 	void renderLevel3D()
 	{
 		viewport_updateRail();