OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- moved the offsets to FGameTexture.

Browse source 
# Conflicts:
#	src/common/textures/textures.h
This commit is contained in:
Christoph Oelckers 2020-04-17 22:30:25 +02:00
commit 61380fc505
6 changed files with 37 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/common/textures/texture.cpp
View file

@ -111,7 +111,6 @@ FTexture::FTexture (const char *name, int lumpnum)
bTranslucent = -1;
_LeftOffset[0] = _LeftOffset[1] = _TopOffset[0] = _TopOffset[1] = 0;
if (name != NULL)
{
Name = name;
@ -795,11 +794,11 @@ void FGameTexture::SetSpriteRect()
{
if (!spi) return;
auto leftOffset = GetLeftOffsetHW();
auto topOffset = GetTopOffsetHW();
auto leftOffset = GetTexelLeftOffset(r_spriteadjustHW);
auto topOffset = GetTexelTopOffset(r_spriteadjustHW);
float fxScale = (float)Base->Scale.X;
float fyScale = (float)Base->Scale.Y;
float fxScale = GetScaleX();
float fyScale = GetScaleY();
for (int i = 0; i < 2; i++)
{