- implement +SQUAREPIXELS flag

RicardoLuis0 · Sep 8, 2024 · 5895f9b · 5895f9b
1 parent 76c8b6d
commit 5895f9b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/src/playsim/actor.h b/src/playsim/actor.h
@@ -503,6 +503,7 @@ enum ActorRenderFlag2
 	RF2_CAMFOLLOWSPLAYER		= 0x0040,	// Matches the cam's base position and angles to the main viewpoint.
 	RF2_NOMIPMAP				= 0x0080,	// [Nash] forces no mipmapping on sprites. Useful for tiny sprites that need to remain visually crisp
 	RF2_ISOMETRICSPRITES		= 0x0100,
+	RF2_SQUAREPIXELS		= 0x0200,	// apply +ROLLSPRITE scaling math so that non rolling sprites get the same scaling
 };
 
 // This translucency value produces the closest match to Heretic's TINTTAB.

diff --git a/src/rendering/hwrenderer/scene/hw_sprites.cpp b/src/rendering/hwrenderer/scene/hw_sprites.cpp
@@ -1036,7 +1036,7 @@ void HWSprite::Process(HWDrawInfo *di, AActor* thing, sector_t * sector, area_t
 
 		r.Scale(sprscale.X, isSpriteShadow ? sprscale.Y * 0.15 * thing->isoscaleY : sprscale.Y * thing->isoscaleY);
 
-		if (thing->renderflags & (RF_ROLLSPRITE|RF_FLATSPRITE))
+		if ((thing->renderflags & (RF_ROLLSPRITE|RF_FLATSPRITE)) || (thing->renderflags2 & RF2_SQUAREPIXELS))
 		{
 			double ps = di->Level->pixelstretch;
 			double mult = 1.0 / sqrt(ps); // shrink slightly

diff --git a/src/scripting/thingdef_data.cpp b/src/scripting/thingdef_data.cpp
@@ -386,6 +386,7 @@ static FFlagDef ActorFlagDefs[]=
 	DEFINE_FLAG(RF2, CAMFOLLOWSPLAYER, AActor, renderflags2),
 	DEFINE_FLAG(RF2, NOMIPMAP, AActor, renderflags2),
 	DEFINE_FLAG(RF2, ISOMETRICSPRITES, AActor, renderflags2),
+	DEFINE_FLAG(RF2, SQUAREPIXELS, AActor, renderflags2),
 
 	// Bounce flags
 	DEFINE_FLAG2(BOUNCE_Walls, BOUNCEONWALLS, AActor, BounceFlags),