zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-29 15:32:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve flat mipmap selection

Browse source
This commit is contained in:
Magnus Norddahl 2016-11-06 11:39:28 +01:00
parent aad2cde332
commit 3a7532fd9b
4 changed files with 18 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/r_draw.cpp
View file

@ -1046,6 +1046,7 @@ dsfixed_t ds_xstep;
dsfixed_t ds_ystep; dsfixed_t ds_ystep;
int ds_xbits; int ds_xbits;
int ds_ybits; int ds_ybits;
double ds_lod;
// start of a floor/ceiling tile image // start of a floor/ceiling tile image
const BYTE* ds_source; const BYTE* ds_source;

1
src/r_draw.h
View file

@ -316,6 +316,7 @@ extern "C" dsfixed_t ds_ystep;
extern "C" int ds_xbits; extern "C" int ds_xbits;
extern "C" int ds_ybits; extern "C" int ds_ybits;
extern "C" fixed_t ds_alpha; extern "C" fixed_t ds_alpha;
extern "C" double ds_lod;
// start of a 64*64 tile image // start of a 64*64 tile image
extern "C" const BYTE* ds_source; extern "C" const BYTE* ds_source;

17
src/r_draw_rgba.cpp
View file

@ -97,7 +97,7 @@ public:
args.flags = 0; args.flags = 0;
if (ds_shade_constants.simple_shade) if (ds_shade_constants.simple_shade)
args.flags |= DrawSpanArgs::simple_shade; args.flags |= DrawSpanArgs::simple_shade;
if (!sampler_setup(args.source, args.xbits, args.ybits, args.xstep, args.ystep, ds_source_mipmapped)) if (!sampler_setup(args.source, args.xbits, args.ybits, ds_source_mipmapped))
args.flags |= DrawSpanArgs::nearest_filter; args.flags |= DrawSpanArgs::nearest_filter;
} }
@ -117,18 +117,13 @@ protected:
DrawSpanArgs args; DrawSpanArgs args;
private: private:
inline static bool sampler_setup(const uint32_t * &source, int &xbits, int &ybits, fixed_t xstep, fixed_t ystep, bool mipmapped) inline static bool sampler_setup(const uint32_t * &source, int &xbits, int &ybits, bool mipmapped)
{ {
// Is this a magfilter or minfilter? bool magnifying = ds_lod < 0.0f;
fixed_t xmagnitude = abs(xstep) >> (32 - xbits - FRACBITS);
fixed_t ymagnitude = abs(ystep) >> (32 - ybits - FRACBITS);
fixed_t magnitude = (xmagnitude + ymagnitude) * 2 + (1 << (FRACBITS - 1));
bool magnifying = (magnitude >> FRACBITS == 0);
if (r_mipmap && mipmapped) if (r_mipmap && mipmapped)
{ {
int level = magnitude >> (FRACBITS + 1); int level = (int)ds_lod;
while (level != 0) while (level > 0)
{ {
if (xbits <= 2 || ybits <= 2) if (xbits <= 2 || ybits <= 2)
break; break;
@ -136,7 +131,7 @@ private:
source += (1 << (xbits)) * (1 << (ybits)); source += (1 << (xbits)) * (1 << (ybits));
xbits -= 1; xbits -= 1;
ybits -= 1; ybits -= 1;
level >>= 1; level--;
} }
} }

10
src/r_plane.cpp
View file

@ -245,6 +245,16 @@ void R_MapPlane (int y, int x1)
ds_yfrac = 0; ds_yfrac = 0;
} }
if (r_swtruecolor)
{
double distance2 = planeheight * yslope[(y + 1 < viewheight) ? y + 1 : y - 1];
double xmagnitude = fabs(ystepscale * (distance2 - distance) * FocalLengthX);
double ymagnitude = fabs(xstepscale * (distance2 - distance) * FocalLengthX);
double magnitude = MAX(ymagnitude, xmagnitude);
double min_lod = -1000.0;
ds_lod = MAX(log2(magnitude) + r_lod_bias, min_lod);
}
if (plane_shade) if (plane_shade)
{ {
// Determine lighting based on the span's distance from the viewer. // Determine lighting based on the span's distance from the viewer.