From 351881cbddc70354cd48d82a679232bbb9f93966 Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Tue, 21 Nov 2023 22:47:56 +0100
Subject: [PATCH 1/2] weapon pickup voxels spinning in place

---
 src/r_voxel.c | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/r_voxel.c b/src/r_voxel.c
index 1c06a861..6696fd86 100644
--- a/src/r_voxel.c
+++ b/src/r_voxel.c
@@ -393,10 +393,28 @@ static int VX_RotateModeForThing (mobj_t * thing)
 			break;
 	}
 
-	// in most maps, items don't have "nice" facing directions, so this
-	// option orientates them in a way similar to sprites.
-	if (vx_rotate_items && (thing->flags & MF_SPECIAL))
-		return 1;
+	if (vx_rotate_items)
+	{
+		switch (thing->sprite)
+		{
+			case SPR_SHOT:
+			case SPR_MGUN:
+			case SPR_LAUN:
+			case SPR_PLAS:
+			case SPR_BFUG:
+			case SPR_CSAW:
+			case SPR_SGN2:
+				return 3;
+
+			default:
+				break;
+		}
+
+		// in most maps, items don't have "nice" facing directions, so this
+		// option orientates them in a way similar to sprites.
+		if (thing->flags & MF_SPECIAL)
+			return 1;
+	}
 
 	// use existing angle
 	return 0;
@@ -534,6 +552,10 @@ boolean VX_ProjectVoxel (mobj_t * thing)
 		case 2:
 			angle = R_PointToAngle (gx, gy) + ANG180;
 			break;
+
+		case 3:
+			angle = 4 * leveltime * ANG1;
+			break;
 	}
 
 	angle_t ang2 = ANG180 - viewangle + angle;

From 0ec6f016f39798653b8743fead1d34d79d1e56ab Mon Sep 17 00:00:00 2001
From: Roman Fomin <rfomin@gmail.com>
Date: Wed, 22 Nov 2023 15:58:58 +0700
Subject: [PATCH 2/2] interpolate item rotation angle

---
 src/r_voxel.c | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/r_voxel.c b/src/r_voxel.c
index 6696fd86..37024312 100644
--- a/src/r_voxel.c
+++ b/src/r_voxel.c
@@ -53,6 +53,8 @@ struct Voxel
 
 static struct Voxel *** all_voxels;
 
+#define VX_ITEM_ROTATION_ANGLE (4 * ANG1)
+
 static int vx_rotate_items = 1;
 
 
@@ -421,6 +423,29 @@ static int VX_RotateModeForThing (mobj_t * thing)
 }
 
 
+static angle_t VX_GetItemRotationAngle (void)
+{
+	static int oldgametic = -1;
+	static angle_t oldangle, newangle;
+
+	if (oldgametic < gametic)
+	{
+		oldangle = newangle;
+		newangle = leveltime * VX_ITEM_ROTATION_ANGLE;
+		oldgametic = gametic;
+	}
+
+	if (uncapped)
+	{
+		return R_InterpolateAngle (oldangle, newangle, fractionaltic);
+	}
+	else
+	{
+		return newangle;
+	}
+}
+
+
 static boolean VX_CheckFrustum (fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2,
                          fixed_t x3, fixed_t y3, fixed_t x4, fixed_t y4)
 {
@@ -554,7 +579,7 @@ boolean VX_ProjectVoxel (mobj_t * thing)
 			break;
 
 		case 3:
-			angle = 4 * leveltime * ANG1;
+			angle = VX_GetItemRotationAngle ();
 			break;
 	}