zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 09:21:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

Re-enable the use of psky_t's yoffset.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5896 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2016-10-14 07:40:50 +00:00
parent 52e6cd09cf
commit 527181f151
4 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
polymer/eduke32/build/src/engine.c
View file

@ -3577,9 +3577,6 @@ static void parascan(int32_t dax1, int32_t dax2, int32_t sectnum, char dastat, i
int32_t j, k, l, m, n, x, z, wallnum, nextsectnum, globalhorizbak; int32_t j, k, l, m, n, x, z, wallnum, nextsectnum, globalhorizbak;
int16_t *topptr, *botptr; int16_t *topptr, *botptr;
int32_t dapyscale, dapskybits;
const int8_t *dapskyoff;
int32_t logtilesizy, tsizy; int32_t logtilesizy, tsizy;
UNREFERENCED_PARAMETER(dax1); UNREFERENCED_PARAMETER(dax1);
@ -3623,7 +3620,9 @@ static void parascan(int32_t dax1, int32_t dax2, int32_t sectnum, char dastat, i
if (tsizy==0) if (tsizy==0)
return; return;
dapskyoff = getpsky(globalpicnum, &dapyscale, &dapskybits);
int32_t dapyscale, dapskybits, dapyoffs;
int8_t const * const dapskyoff = getpsky(globalpicnum, &dapyscale, &dapskybits, &dapyoffs);
globalshiftval = logtilesizy; globalshiftval = logtilesizy;
@ -3637,14 +3636,14 @@ static void parascan(int32_t dax1, int32_t dax2, int32_t sectnum, char dastat, i
globaltilesizy = tsizy; globaltilesizy = tsizy;
globalyscale = 65536 / tsizy; globalyscale = 65536 / tsizy;
globalshiftval = 0; globalshiftval = 0;
globalzd = divscale32(((tsizy>>1)+parallaxyoffs_override/*+g_psky.yoffs*/), tsizy) + ((uint32_t)globalypanning<<24); globalzd = divscale32(((tsizy>>1)+dapyoffs), tsizy) + ((uint32_t)globalypanning<<24);
} }
else else
#endif #endif
{ {
globalshiftval = 32-globalshiftval; globalshiftval = 32-globalshiftval;
globalyscale = (8<<(globalshiftval-19)); globalyscale = (8<<(globalshiftval-19));
globalzd = (((tsizy>>1)+parallaxyoffs_override/*+g_psky.yoffs*/)<<globalshiftval) + ((uint32_t)globalypanning<<24); globalzd = (((tsizy>>1)+dapyoffs)<<globalshiftval) + ((uint32_t)globalypanning<<24);
} }
//if (globalorientation&256) globalyscale = -globalyscale, globalzd = -globalzd; //if (globalorientation&256) globalyscale = -globalyscale, globalzd = -globalzd;

6
polymer/eduke32/build/src/engine_priv.h
View file

@ -441,8 +441,8 @@ FORCE_INLINE void setgotpic(int32_t tilenume)
#endif #endif
// Get properties of parallaxed sky to draw. // Get properties of parallaxed sky to draw.
// Returns: pointer to tile offset array. Sets-by-pointer the other two. // Returns: pointer to tile offset array. Sets-by-pointer the other three.
static inline const int8_t *getpsky(int32_t picnum, int32_t *dapyscale, int32_t *dapskybits) FORCE_INLINE const int8_t *getpsky(int32_t picnum, int32_t *dapyscale, int32_t *dapskybits, int32_t *dapyoffs)
{ {
psky_t const * const psky = &multipsky[getpskyidx(picnum)]; psky_t const * const psky = &multipsky[getpskyidx(picnum)];
@ -450,6 +450,8 @@ static inline const int8_t *getpsky(int32_t picnum, int32_t *dapyscale, int32_t
*dapskybits = (pskybits_override == -1 ? psky->lognumtiles : pskybits_override); *dapskybits = (pskybits_override == -1 ? psky->lognumtiles : pskybits_override);
if (dapyscale) if (dapyscale)
*dapyscale = (parallaxyscale_override == 0 ? psky->horizfrac : parallaxyscale_override); *dapyscale = (parallaxyscale_override == 0 ? psky->horizfrac : parallaxyscale_override);
if (dapyoffs)
*dapyoffs = psky->yoffs + parallaxyoffs_override;
return psky->tileofs; return psky->tileofs;
} }

4
polymer/eduke32/build/src/polymer.c
View file

@ -4100,7 +4100,7 @@ static void polymer_getsky(void)
curskypal = sector[i].ceilingpal; curskypal = sector[i].ceilingpal;
curskyshade = sector[i].ceilingshade; curskyshade = sector[i].ceilingshade;
getpsky(cursky, &horizfrac, NULL); getpsky(cursky, &horizfrac, NULL, NULL);
switch (horizfrac) switch (horizfrac)
{ {
@ -4176,7 +4176,7 @@ static void polymer_drawartsky(int16_t tilenum, char palnum, int8_t shad
GLfloat height = 2.45f / 2.0f; GLfloat height = 2.45f / 2.0f;
int32_t dapskybits; int32_t dapskybits;
const int8_t *dapskyoff = getpsky(tilenum, NULL, &dapskybits); const int8_t *dapskyoff = getpsky(tilenum, NULL, &dapskybits, NULL);
const int32_t numskytilesm1 = (1<<dapskybits)-1; const int32_t numskytilesm1 = (1<<dapskybits)-1;
i = 0; i = 0;

10
polymer/eduke32/build/src/polymost.c
View file

@ -2927,8 +2927,8 @@ static void polymost_drawalls(int32_t const bunch)
DO_TILE_ANIM(globalpicnum, sectnum); DO_TILE_ANIM(globalpicnum, sectnum);
int32_t dapskybits; int32_t dapskybits, dapyoffs;
int8_t const * dapskyoff = getpsky(globalpicnum, NULL, &dapskybits); int8_t const * dapskyoff = getpsky(globalpicnum, NULL, &dapskybits, &dapyoffs);
global_cf_fogpal = sec->fogpal; global_cf_fogpal = sec->fogpal;
global_cf_shade = sec->floorshade, global_cf_pal = sec->floorpal; global_cf_z = sec->floorz; // REFACT global_cf_shade = sec->floorshade, global_cf_pal = sec->floorpal; global_cf_z = sec->floorz; // REFACT
@ -2958,7 +2958,7 @@ static void polymost_drawalls(int32_t const bunch)
float vv[2]; float vv[2];
float t = (float)((1<<(picsiz[globalpicnum]&15))<<dapskybits); float t = (float)((1<<(picsiz[globalpicnum]&15))<<dapskybits);
vv[1] = dd*((float)xdimscale*fviewingrange) * (1.f/(65536.f*65536.f)); vv[1] = dd*((float)xdimscale*fviewingrange) * (1.f/(65536.f*65536.f));
vv[0] = dd*((float)((tilesiz[globalpicnum].y>>1)+parallaxyoffs_override/*+g_psky.yoffs*/)) - vv[1]*ghoriz; vv[0] = dd*((float)((tilesiz[globalpicnum].y>>1)+dapyoffs)) - vv[1]*ghoriz;
int i = (1<<(picsiz[globalpicnum]>>4)); if (i != tilesiz[globalpicnum].y) i += i; int i = (1<<(picsiz[globalpicnum]>>4)); if (i != tilesiz[globalpicnum].y) i += i;
vec3f_t o; vec3f_t o;
@ -3220,7 +3220,7 @@ static void polymost_drawalls(int32_t const bunch)
DO_TILE_ANIM(globalpicnum, sectnum); DO_TILE_ANIM(globalpicnum, sectnum);
dapskyoff = getpsky(globalpicnum, NULL, &dapskybits); dapskyoff = getpsky(globalpicnum, NULL, &dapskybits, &dapyoffs);
global_cf_fogpal = sec->fogpal; global_cf_fogpal = sec->fogpal;
global_cf_shade = sec->ceilingshade, global_cf_pal = sec->ceilingpal; global_cf_z = sec->ceilingz; // REFACT global_cf_shade = sec->ceilingshade, global_cf_pal = sec->ceilingpal; global_cf_z = sec->ceilingz; // REFACT
@ -3250,7 +3250,7 @@ static void polymost_drawalls(int32_t const bunch)
float vv[2]; float vv[2];
float t = (float)((1<<(picsiz[globalpicnum]&15))<<dapskybits); float t = (float)((1<<(picsiz[globalpicnum]&15))<<dapskybits);
vv[1] = dd*((float)xdimscale*fviewingrange) * (1.f/(65536.f*65536.f)); vv[1] = dd*((float)xdimscale*fviewingrange) * (1.f/(65536.f*65536.f));
vv[0] = dd*((float)((tilesiz[globalpicnum].y>>1)+parallaxyoffs_override/*+g_psky.yoffs*/)) - vv[1]*ghoriz; vv[0] = dd*((float)((tilesiz[globalpicnum].y>>1)+dapyoffs)) - vv[1]*ghoriz;
int i = (1<<(picsiz[globalpicnum]>>4)); if (i != tilesiz[globalpicnum].y) i += i; int i = (1<<(picsiz[globalpicnum]>>4)); if (i != tilesiz[globalpicnum].y) i += i;
vec3f_t o; vec3f_t o;