Add wall drawers

src/r_draw_pal.cpp

@@ -13,58 +13,411 @@ namespace swrenderer
 {
 	PalWall1Command::PalWall1Command()
 	{
+		using namespace drawerargs;
+
+		_iscale = dc_iscale;
+		_texturefrac = dc_texturefrac;
+		_colormap = dc_colormap;
+		_count = dc_count;
+		_source = dc_source;
+		_dest = dc_dest;
+		_vlinebits = vlinebits;
+		_mvlinebits = mvlinebits;
+		_tmvlinebits = tmvlinebits;
+		_pitch = dc_pitch;
+		_srcblend = dc_srcblend;
+		_destblend = dc_destblend;
 	}
 
 	PalWall4Command::PalWall4Command()
 	{
+		using namespace drawerargs;
+
+		_dest = dc_dest;
+		_count = dc_count;
+		_pitch = dc_pitch;
+		_vlinebits = vlinebits;
+		_mvlinebits = mvlinebits;
+		_tmvlinebits = tmvlinebits;
+		for (int col = 0; col < 4; col++)
+		{
+			_palookupoffse[col] = palookupoffse[col];
+			_bufplce[col] = bufplce[col];
+			_vince[col] = vince[col];
+			_vplce[col] = vplce[col];
+		}
+		_srcblend = dc_srcblend;
+		_destblend = dc_destblend;
 	}
 
 	void DrawWall1PalCommand::Execute(DrawerThread *thread)
 	{
+		uint32_t fracstep = _iscale;
+		uint32_t frac = _texturefrac;
+		uint8_t *colormap = _colormap;
+		int count = _count;
+		const uint8_t *source = _source;
+		uint8_t *dest = _dest;
+		int bits = _vlinebits;
+		int pitch = _pitch;
+
+		do
+		{
+			*dest = colormap[source[frac >> bits]];
+			frac += fracstep;
+			dest += pitch;
+		} while (--count);
 	}
 
 	void DrawWall4PalCommand::Execute(DrawerThread *thread)
 	{
+		uint8_t *dest = _dest;
+		int count = _count;
+		int bits = _vlinebits;
+		uint32_t place;
+		auto pal0 = _palookupoffse[0];
+		auto pal1 = _palookupoffse[1];
+		auto pal2 = _palookupoffse[2];
+		auto pal3 = _palookupoffse[3];
+		auto buf0 = _bufplce[0];
+		auto buf1 = _bufplce[1];
+		auto buf2 = _bufplce[2];
+		auto buf3 = _bufplce[3];
+		const auto vince0 = _vince[0];
+		const auto vince1 = _vince[1];
+		const auto vince2 = _vince[2];
+		const auto vince3 = _vince[3];
+		auto vplce0 = _vplce[0];
+		auto vplce1 = _vplce[1];
+		auto vplce2 = _vplce[2];
+		auto vplce3 = _vplce[3];
+		auto pitch = _pitch;
+
+		do
+		{
+			dest[0] = pal0[buf0[(place = vplce0) >> bits]]; vplce0 = place + vince0;
+			dest[1] = pal1[buf1[(place = vplce1) >> bits]]; vplce1 = place + vince1;
+			dest[2] = pal2[buf2[(place = vplce2) >> bits]]; vplce2 = place + vince2;
+			dest[3] = pal3[buf3[(place = vplce3) >> bits]]; vplce3 = place + vince3;
+			dest += pitch;
+		} while (--count);
 	}
 
 	void DrawWallMasked1PalCommand::Execute(DrawerThread *thread)
 	{
+		uint32_t fracstep = _iscale;
+		uint32_t frac = _texturefrac;
+		uint8_t *colormap = _colormap;
+		int count = _count;
+		const uint8_t *source = _source;
+		uint8_t *dest = _dest;
+		int bits = _mvlinebits;
+		int pitch = _pitch;
+
+		do
+		{
+			uint8_t pix = source[frac >> bits];
+			if (pix != 0)
+			{
+				*dest = colormap[pix];
+			}
+			frac += fracstep;
+			dest += pitch;
+		} while (--count);
 	}
 
 	void DrawWallMasked4PalCommand::Execute(DrawerThread *thread)
 	{
+		uint8_t *dest = _dest;
+		int count = _count;
+		int bits = _mvlinebits;
+		uint32_t place;
+		auto pal0 = _palookupoffse[0];
+		auto pal1 = _palookupoffse[1];
+		auto pal2 = _palookupoffse[2];
+		auto pal3 = _palookupoffse[3];
+		auto buf0 = _bufplce[0];
+		auto buf1 = _bufplce[1];
+		auto buf2 = _bufplce[2];
+		auto buf3 = _bufplce[3];
+		const auto vince0 = _vince[0];
+		const auto vince1 = _vince[1];
+		const auto vince2 = _vince[2];
+		const auto vince3 = _vince[3];
+		auto vplce0 = _vplce[0];
+		auto vplce1 = _vplce[1];
+		auto vplce2 = _vplce[2];
+		auto vplce3 = _vplce[3];
+		auto pitch = _pitch;
+
+		do
+		{
+			uint8_t pix;
+
+			pix = buf0[(place = vplce0) >> bits]; if (pix) dest[0] = pal0[pix]; vplce0 = place + vince0;
+			pix = buf1[(place = vplce1) >> bits]; if (pix) dest[1] = pal1[pix]; vplce1 = place + vince1;
+			pix = buf2[(place = vplce2) >> bits]; if (pix) dest[2] = pal2[pix]; vplce2 = place + vince2;
+			pix = buf3[(place = vplce3) >> bits]; if (pix) dest[3] = pal3[pix]; vplce3 = place + vince3;
+			dest += pitch;
+		} while (--count);
 	}
 
 	void DrawWallAdd1PalCommand::Execute(DrawerThread *thread)
 	{
+		uint32_t fracstep = _iscale;
+		uint32_t frac = _texturefrac;
+		uint8_t *colormap = _colormap;
+		int count = _count;
+		const uint8_t *source = _source;
+		uint8_t *dest = _dest;
+		int bits = _tmvlinebits;
+		int pitch = _pitch;
+
+		uint32_t *fg2rgb = _srcblend;
+		uint32_t *bg2rgb = _destblend;
+
+		do
+		{
+			uint8_t pix = source[frac >> bits];
+			if (pix != 0)
+			{
+				uint32_t fg = fg2rgb[colormap[pix]];
+				uint32_t bg = bg2rgb[*dest];
+				fg = (fg + bg) | 0x1f07c1f;
+				*dest = RGB32k.All[fg & (fg >> 15)];
+			}
+			frac += fracstep;
+			dest += pitch;
+		} while (--count);
 	}
 
 	void DrawWallAdd4PalCommand::Execute(DrawerThread *thread)
 	{
+		uint8_t *dest = _dest;
+		int count = _count;
+		int bits = _tmvlinebits;
+
+		uint32_t *fg2rgb = _srcblend;
+		uint32_t *bg2rgb = _destblend;
+
+		uint32_t vplce[4] = { _vplce[0], _vplce[1], _vplce[2], _vplce[3] };
+
+		do
+		{
+			for (int i = 0; i < 4; ++i)
+			{
+				uint8_t pix = _bufplce[i][vplce[i] >> bits];
+				if (pix != 0)
+				{
+					uint32_t fg = fg2rgb[_palookupoffse[i][pix]];
+					uint32_t bg = bg2rgb[dest[i]];
+					fg = (fg + bg) | 0x1f07c1f;
+					dest[i] = RGB32k.All[fg & (fg >> 15)];
+				}
+				vplce[i] += _vince[i];
+			}
+			dest += _pitch;
+		} while (--count);
 	}
 
 	void DrawWallAddClamp1PalCommand::Execute(DrawerThread *thread)
 	{
+		uint32_t fracstep = _iscale;
+		uint32_t frac = _texturefrac;
+		uint8_t *colormap = _colormap;
+		int count = _count;
+		const uint8_t *source = _source;
+		uint8_t *dest = _dest;
+		int bits = _tmvlinebits;
+		int pitch = _pitch;
+
+		uint32_t *fg2rgb = _srcblend;
+		uint32_t *bg2rgb = _destblend;
+
+		do
+		{
+			uint8_t pix = source[frac >> bits];
+			if (pix != 0)
+			{
+				uint32_t a = fg2rgb[colormap[pix]] + bg2rgb[*dest];
+				uint32_t b = a;
+
+				a |= 0x01f07c1f;
+				b &= 0x40100400;
+				a &= 0x3fffffff;
+				b = b - (b >> 5);
+				a |= b;
+				*dest = RGB32k.All[a & (a >> 15)];
+			}
+			frac += fracstep;
+			dest += pitch;
+		} while (--count);
 	}
 
 	void DrawWallAddClamp4PalCommand::Execute(DrawerThread *thread)
 	{
+		uint8_t *dest = _dest;
+		int count = _count;
+		int bits = _tmvlinebits;
+
+		uint32_t *fg2rgb = _srcblend;
+		uint32_t *bg2rgb = _destblend;
+
+		uint32_t vplce[4] = { _vplce[0], _vplce[1], _vplce[2], _vplce[3] };
+
+		do
+		{
+			for (int i = 0; i < 4; ++i)
+			{
+				uint8_t pix = _bufplce[i][vplce[i] >> bits];
+				if (pix != 0)
+				{
+					uint32_t a = fg2rgb[_palookupoffse[i][pix]] + bg2rgb[dest[i]];
+					uint32_t b = a;
+
+					a |= 0x01f07c1f;
+					b &= 0x40100400;
+					a &= 0x3fffffff;
+					b = b - (b >> 5);
+					a |= b;
+					dest[i] = RGB32k.All[a & (a >> 15)];
+				}
+				vplce[i] += _vince[i];
+			}
+			dest += _pitch;
+		} while (--count);
 	}
 
 	void DrawWallSubClamp1PalCommand::Execute(DrawerThread *thread)
 	{
+		uint32_t fracstep = _iscale;
+		uint32_t frac = _texturefrac;
+		uint8_t *colormap = _colormap;
+		int count = _count;
+		const uint8_t *source = _source;
+		uint8_t *dest = _dest;
+		int bits = _tmvlinebits;
+		int pitch = _pitch;
+
+		uint32_t *fg2rgb = _srcblend;
+		uint32_t *bg2rgb = _destblend;
+
+		do
+		{
+			uint8_t pix = source[frac >> bits];
+			if (pix != 0)
+			{
+				uint32_t a = (fg2rgb[colormap[pix]] | 0x40100400) - bg2rgb[*dest];
+				uint32_t b = a;
+
+				b &= 0x40100400;
+				b = b - (b >> 5);
+				a &= b;
+				a |= 0x01f07c1f;
+				*dest = RGB32k.All[a & (a >> 15)];
+			}
+			frac += fracstep;
+			dest += pitch;
+		} while (--count);
 	}
 
 	void DrawWallSubClamp4PalCommand::Execute(DrawerThread *thread)
 	{
+		uint8_t *dest = _dest;
+		int count = _count;
+		int bits = _tmvlinebits;
+
+		uint32_t *fg2rgb = _srcblend;
+		uint32_t *bg2rgb = _destblend;
+
+		uint32_t vplce[4] = { _vplce[0], _vplce[1], _vplce[2], _vplce[3] };
+
+		do
+		{
+			for (int i = 0; i < 4; ++i)
+			{
+				uint8_t pix = _bufplce[i][vplce[i] >> bits];
+				if (pix != 0)
+				{
+					uint32_t a = (fg2rgb[_palookupoffse[i][pix]] | 0x40100400) - bg2rgb[dest[i]];
+					uint32_t b = a;
+
+					b &= 0x40100400;
+					b = b - (b >> 5);
+					a &= b;
+					a |= 0x01f07c1f;
+					dest[i] = RGB32k.All[a & (a >> 15)];
+				}
+				vplce[i] += _vince[i];
+			}
+			dest += _pitch;
+		} while (--count);
 	}
 
 	void DrawWallRevSubClamp1PalCommand::Execute(DrawerThread *thread)
 	{
+		uint32_t fracstep = _iscale;
+		uint32_t frac = _texturefrac;
+		uint8_t *colormap = _colormap;
+		int count = _count;
+		const uint8_t *source = _source;
+		uint8_t *dest = _dest;
+		int bits = _tmvlinebits;
+		int pitch = _pitch;
+
+		uint32_t *fg2rgb = _srcblend;
+		uint32_t *bg2rgb = _destblend;
+
+		do
+		{
+			uint8_t pix = source[frac >> bits];
+			if (pix != 0)
+			{
+				uint32_t a = (bg2rgb[*dest] | 0x40100400) - fg2rgb[colormap[pix]];
+				uint32_t b = a;
+
+				b &= 0x40100400;
+				b = b - (b >> 5);
+				a &= b;
+				a |= 0x01f07c1f;
+				*dest = RGB32k.All[a & (a >> 15)];
+			}
+			frac += fracstep;
+			dest += pitch;
+		} while (--count);
 	}
 
 	void DrawWallRevSubClamp4PalCommand::Execute(DrawerThread *thread)
 	{
+		uint8_t *dest = _dest;
+		int count = _count;
+		int bits = _tmvlinebits;
+
+		uint32_t *fg2rgb = _srcblend;
+		uint32_t *bg2rgb = _destblend;
+
+		uint32_t vplce[4] = { _vplce[0], _vplce[1], _vplce[2], _vplce[3] };
+
+		do
+		{
+			for (int i = 0; i < 4; ++i)
+			{
+				uint8_t pix = _bufplce[i][vplce[i] >> bits];
+				if (pix != 0)
+				{
+					uint32_t a = (bg2rgb[dest[i]] | 0x40100400) - fg2rgb[_palookupoffse[i][pix]];
+					uint32_t b = a;
+
+					b &= 0x40100400;
+					b = b - (b >> 5);
+					a &= b;
+					a |= 0x01f07c1f;
+					dest[i] = RGB32k.All[a & (a >> 15)];
+				}
+				vplce[i] += _vince[i];
+			}
+			dest += _pitch;
+		} while (--count);
 	}
 
 	PalSkyCommand::PalSkyCommand(uint32_t solid_top, uint32_t solid_bottom)

src/r_draw_pal.h

@@ -12,6 +12,20 @@ namespace swrenderer
 	public:
 		PalWall1Command();
 		FString DebugInfo() override { return "PalWallCommand"; }
+
+	protected:
+		uint32_t _iscale;
+		uint32_t _texturefrac;
+		uint8_t *_colormap;
+		int _count;
+		const uint8_t *_source;
+		uint8_t *_dest;
+		int _vlinebits;
+		int _mvlinebits;
+		int _tmvlinebits;
+		int _pitch;
+		uint32_t *_srcblend;
+		uint32_t *_destblend;
 	};
 
 	class PalWall4Command : public DrawerCommand
@@ -19,6 +33,20 @@ namespace swrenderer
 	public:
 		PalWall4Command();
 		FString DebugInfo() override { return "PalWallCommand"; }
+
+	protected:
+		uint8_t *_dest;
+		int _count;
+		int _pitch;
+		int _vlinebits;
+		int _mvlinebits;
+		int _tmvlinebits;
+		uint8_t *_palookupoffse[4];
+		const uint8_t *_bufplce[4];
+		uint32_t _vince[4];
+		uint32_t _vplce[4];
+		uint32_t *_srcblend;
+		uint32_t *_destblend;
 	};
 
 	class DrawWall1PalCommand : public PalWall1Command { public: void Execute(DrawerThread *thread) override; };