Add PitchOffset and RollOffset to voxels

ZDoom · Feb 3, 2025 · 9e6d3a2 · 9e6d3a2
1 parent ec42c77
commit 9e6d3a2
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 5 deletions.
diff --git a/src/common/models/voxels.cpp b/src/common/models/voxels.cpp
@@ -320,6 +320,8 @@ FVoxelDef *R_LoadVoxelDef(int lumpnum, int spin)
 		voxdef->Scale = 1.;
 		voxdef->DroppedSpin = voxdef->PlacedSpin = spin;
 		voxdef->AngleOffset = DAngle::fromDeg(90.);
+		voxdef->PitchOffset = nullAngle;
+		voxdef->RollOffset = nullAngle;
 
 		Voxels.Push(vox);
 		VoxelDefs.Push(voxdef);

diff --git a/src/common/models/voxels.h b/src/common/models/voxels.h
@@ -73,6 +73,8 @@ struct FVoxelDef
 	int VoxeldefIndex;		// Needed by GZDoom
 	double		Scale;
 	DAngle		AngleOffset;// added to actor's angle to compensate for wrong-facing voxels
+	DAngle		PitchOffset;
+	DAngle		RollOffset;
 	double		xoffset;
 	double		yoffset;
 	double		zoffset;

diff --git a/src/r_data/models.cpp b/src/r_data/models.cpp
@@ -183,8 +183,16 @@ void RenderModel(FModelRenderer *renderer, float x, float y, float z, FSpriteMod
 
 	// 5) Applying model rotations.
 	objectToWorldMatrix.rotate(-smf->angleoffset, 0, 1, 0);
-	objectToWorldMatrix.rotate(smf->pitchoffset, 0, 0, 1);
-	objectToWorldMatrix.rotate(-smf->rolloffset, 1, 0, 0);
+	if (!smf->isVoxel)
+	{
+		objectToWorldMatrix.rotate(smf->pitchoffset, 0, 0, 1);
+		objectToWorldMatrix.rotate(-smf->rolloffset, 1, 0, 0);
+	}
+	else
+	{
+		objectToWorldMatrix.rotate(-smf->pitchoffset, 1, 0, 0);
+		objectToWorldMatrix.rotate(smf->rolloffset, 0, 0, 1);
+	}
 
 	if (!(smf_flags & MDL_CORRECTPIXELSTRETCH))
 	{
@@ -247,8 +255,16 @@ void RenderHUDModel(FModelRenderer *renderer, DPSprite *psp, FVector3 translatio
 
 	// Applying angleoffset, pitchoffset, rolloffset.
 	objectToWorldMatrix.rotate(-smf->angleoffset, 0, 1, 0);
-	objectToWorldMatrix.rotate(smf->pitchoffset, 0, 0, 1);
-	objectToWorldMatrix.rotate(-smf->rolloffset, 1, 0, 0);
+	if (!smf->isVoxel)
+	{
+		objectToWorldMatrix.rotate(smf->pitchoffset, 0, 0, 1);
+		objectToWorldMatrix.rotate(-smf->rolloffset, 1, 0, 0);
+	}
+	else
+	{
+		objectToWorldMatrix.rotate(-smf->pitchoffset, 1, 0, 0);
+		objectToWorldMatrix.rotate(smf->rolloffset, 0, 0, 1);
+	}
 
 	float orientation = smf->xscale * smf->yscale * smf->zscale;
 
@@ -602,11 +618,13 @@ void InitModels()
 		smf.animationIDs[0] = -1;
 		smf.xscale = smf.yscale = smf.zscale = VoxelDefs[i]->Scale;
 		smf.angleoffset = VoxelDefs[i]->AngleOffset.Degrees();
+		smf.pitchoffset = VoxelDefs[i]->PitchOffset.Degrees();
+		smf.rolloffset = VoxelDefs[i]->RollOffset.Degrees();
 		smf.xoffset = VoxelDefs[i]->xoffset;
 		smf.yoffset = VoxelDefs[i]->yoffset;
 		smf.zoffset = VoxelDefs[i]->zoffset;
 		// this helps catching uninitialized data.
-		assert(VoxelDefs[i]->PitchFromMomentum == true || VoxelDefs[i]->PitchFromMomentum == false);
+		//assert(VoxelDefs[i]->PitchFromMomentum == true || VoxelDefs[i]->PitchFromMomentum == false);
 		if (VoxelDefs[i]->PitchFromMomentum) smf.flags |= MDL_PITCHFROMMOMENTUM;
 		if (VoxelDefs[i]->UseActorPitch) smf.flags |= MDL_USEACTORPITCH;
 		if (VoxelDefs[i]->UseActorRoll) smf.flags |= MDL_USEACTORROLL;

diff --git a/src/r_data/voxeldef.cpp b/src/r_data/voxeldef.cpp
@@ -58,6 +58,8 @@ struct VoxelOptions
 	int			PlacedSpin = 0;
 	double		Scale = 1;
 	DAngle		AngleOffset = DAngle90;
+	DAngle		PitchOffset = nullAngle;
+	DAngle		RollOffset = nullAngle;
 	double		xoffset = 0.0;
 	double		yoffset = 0.0;
 	double		zoffset = 0.0;
@@ -180,6 +182,38 @@ static void VOX_ReadOptions(FScanner &sc, VoxelOptions &opts)
 			}
 			opts.AngleOffset = DAngle::fromDeg(mul * sc.Float + 90.);
 		}
+		else if (sc.Compare("pitchoffset"))
+		{
+			int mul = 1;
+			sc.MustGetToken('=');
+			if (sc.CheckToken('-')) mul = -1;
+			sc.MustGetAnyToken();
+			if (sc.TokenType == TK_IntConst)
+			{
+				sc.Float = sc.Number;
+			}
+			else
+			{
+				sc.TokenMustBe(TK_FloatConst);
+			}
+			opts.PitchOffset = DAngle::fromDeg(mul * sc.Float);
+		}
+		else if (sc.Compare("rolloffset"))
+		{
+			int mul = 1;
+			sc.MustGetToken('=');
+			if (sc.CheckToken('-')) mul = -1;
+			sc.MustGetAnyToken();
+			if (sc.TokenType == TK_IntConst)
+			{
+				sc.Float = sc.Number;
+			}
+			else
+			{
+				sc.TokenMustBe(TK_FloatConst);
+			}
+			opts.RollOffset = DAngle::fromDeg(mul * sc.Float);
+		}
 		else if (sc.Compare("xoffset"))
 		{
 			int mul = 1;
@@ -313,6 +347,8 @@ void R_InitVoxels()
 				def->DroppedSpin = opts.DroppedSpin;
 				def->PlacedSpin = opts.PlacedSpin;
 				def->AngleOffset = opts.AngleOffset;
+				def->PitchOffset = opts.PitchOffset;
+				def->RollOffset = opts.RollOffset;
 				def->xoffset = opts.xoffset;
 				def->yoffset = opts.yoffset;
 				def->zoffset = opts.zoffset;