mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-04 10:03:36 +00:00
Revert "Change LOD calculation formula. Use the maximum value of the change of S and T per change in X and Y."
This reverts commit 73b2d0060b
.
This commit is contained in:
parent
0c30bdf4e2
commit
44e809ed13
|
@ -2065,9 +2065,9 @@ public:
|
||||||
" readtex1 = TextureMipMap(uTex1, tcData1, 0.0); \n"
|
" readtex1 = TextureMipMap(uTex1, tcData1, 0.0); \n"
|
||||||
" \n"
|
" \n"
|
||||||
" mediump float fMaxTile = float(uMaxTile); \n"
|
" mediump float fMaxTile = float(uMaxTile); \n"
|
||||||
" mediump vec2 dx = abs(dFdx(vLodTexCoord)) * uScreenScale; \n"
|
" mediump vec2 dx = abs(dFdx(vLodTexCoord)) * uScreenScale; \n"
|
||||||
" mediump vec2 dy = abs(dFdy(vLodTexCoord)) * uScreenScale; \n"
|
" mediump vec2 dy = abs(dFdy(vLodTexCoord)) * uScreenScale; \n"
|
||||||
" mediump float lod = max(max(dx.x,dx.y), max(dy.x,dy.y)); \n"
|
" mediump float lod = max(dx.x + dx.y, dy.x + dy.y); \n" /*LINEAR*/
|
||||||
" bool magnify = lod < 1.0; \n"
|
" bool magnify = lod < 1.0; \n"
|
||||||
" mediump float lod_tile = magnify ? 0.0 : floor(log2(floor(lod))); \n"
|
" mediump float lod_tile = magnify ? 0.0 : floor(log2(floor(lod))); \n"
|
||||||
" bool distant = lod > 128.0 || lod_tile >= fMaxTile; \n"
|
" bool distant = lod > 128.0 || lod_tile >= fMaxTile; \n"
|
||||||
|
@ -2174,9 +2174,9 @@ public:
|
||||||
" READ_TEX_MIPMAP(readtex1, uTex1, tcData1, 0); \n"
|
" READ_TEX_MIPMAP(readtex1, uTex1, tcData1, 0); \n"
|
||||||
" \n"
|
" \n"
|
||||||
" mediump float fMaxTile = float(uMaxTile); \n"
|
" mediump float fMaxTile = float(uMaxTile); \n"
|
||||||
" mediump vec2 dx = abs(dFdx(vLodTexCoord)) * uScreenScale; \n"
|
" mediump vec2 dx = abs(dFdx(vLodTexCoord)); \n"
|
||||||
" mediump vec2 dy = abs(dFdy(vLodTexCoord)) * uScreenScale; \n"
|
" dx *= uScreenScale; \n"
|
||||||
" mediump float lod = max(max(dx.x,dx.y), max(dy.x,dy.y)); \n"
|
" mediump float lod = max(dx.x, dx.y); \n"
|
||||||
" bool magnify = lod < 1.0; \n"
|
" bool magnify = lod < 1.0; \n"
|
||||||
" mediump float lod_tile = magnify ? 0.0 : floor(log2(floor(lod))); \n"
|
" mediump float lod_tile = magnify ? 0.0 : floor(log2(floor(lod))); \n"
|
||||||
" bool distant = lod > 128.0 || lod_tile >= fMaxTile; \n"
|
" bool distant = lod > 128.0 || lod_tile >= fMaxTile; \n"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user