zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-08 22:41:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Give rotatesprite 'orientation' bits enum names, too.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@4175 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-11-22 19:26:52 +00:00
parent 9aa8bc7c82
commit 198ba2d697
4 changed files with 90 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
polymer/eduke32/build/include/build.h
View file

@ -209,7 +209,22 @@ void yax_drawrooms(void (*SpriteAnimFunc)(int32_t,int32_t,int32_t,int32_t),
// max x/y val (= max editorgridextent in Mapster32) // max x/y val (= max editorgridextent in Mapster32)
#define BXY_MAX 524288 #define BXY_MAX 524288
// rotatesprite 'orientation' (actually much more) bits
enum { enum {
RS_TRANS1 = 1,
RS_AUTO = 2,
RS_YFLIP = 4,
RS_NOCLIP = 8,
RS_TOPLEFT = 16,
RS_TRANS2 = 32,
RS_NOMASK = 64,
RS_PERM = 128,
RS_ALIGN_L = 256,
RS_ALIGN_R = 512,
RS_ALIGN_MASK = 768,
RS_STRETCH = 1024,
ROTATESPRITE_FULL16 = 2048, ROTATESPRITE_FULL16 = 2048,
// ROTATESPRITE_MAX-1 is the mask of all externally available orientation bits // ROTATESPRITE_MAX-1 is the mask of all externally available orientation bits
ROTATESPRITE_MAX = 4096, ROTATESPRITE_MAX = 4096,

2
polymer/eduke32/build/src/cache1d.c
View file

@ -1371,6 +1371,8 @@ CACHE1D_FIND_REC *klistpath(const char *_path, const char *mask, int32_t type)
} }
Bfree(path); Bfree(path);
// XXX: may be NULL if no file was listed, and thus indistinguishable from
// an error condition.
return rec; return rec;
failure: failure:
Bfree(path); Bfree(path);

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

@ -7126,9 +7126,9 @@ void dorotspr_handle_bit2(int32_t *sxptr, int32_t *syptr, int32_t *z, int32_t da
int32_t cx1_plus_cx2, int32_t cy1_plus_cy2, int32_t cx1_plus_cx2, int32_t cy1_plus_cy2,
int32_t *ret_yxaspect, int32_t *ret_xyaspect) int32_t *ret_yxaspect, int32_t *ret_xyaspect)
{ {
if ((dastat&2) == 0) if ((dastat & RS_AUTO) == 0)
{ {
if (!(dastat & 1024) && 4*ydim <= 3*xdim) if (!(dastat & RS_STRETCH) && 4*ydim <= 3*xdim)
{ {
*ret_yxaspect = (12<<16)/10; *ret_yxaspect = (12<<16)/10;
*ret_xyaspect = (10<<16)/12; *ret_xyaspect = (10<<16)/12;
@ -7155,7 +7155,7 @@ void dorotspr_handle_bit2(int32_t *sxptr, int32_t *syptr, int32_t *z, int32_t da
// screen center to s[xy], 320<<16 coords. // screen center to s[xy], 320<<16 coords.
const int32_t normxofs = sx-(320<<15), normyofs = sy-(200<<15); const int32_t normxofs = sx-(320<<15), normyofs = sy-(200<<15);
if (!(dastat & 1024) && 4*ydim <= 3*xdim) if (!(dastat & RS_STRETCH) && 4*ydim <= 3*xdim)
{ {
xdim = (4*ydim)/3; xdim = (4*ydim)/3;
@ -7164,7 +7164,7 @@ void dorotspr_handle_bit2(int32_t *sxptr, int32_t *syptr, int32_t *z, int32_t da
} }
// nasty hacks go here // nasty hacks go here
if (!(dastat&8)) if (!(dastat & RS_NOCLIP))
{ {
const int32_t twice_midcx = cx1_plus_cx2+2; const int32_t twice_midcx = cx1_plus_cx2+2;
@ -7173,11 +7173,11 @@ void dorotspr_handle_bit2(int32_t *sxptr, int32_t *syptr, int32_t *z, int32_t da
int32_t xbord = 0; int32_t xbord = 0;
if (dastat & (256|512)) if (dastat & RS_ALIGN_MASK)
{ {
xbord = scale(oxdim-xdim, twice_midcx, oxdim); xbord = scale(oxdim-xdim, twice_midcx, oxdim);
if ((dastat & 512)==0) if ((dastat & RS_ALIGN_R)==0)
xbord = -xbord; xbord = -xbord;
} }
@ -7193,9 +7193,9 @@ void dorotspr_handle_bit2(int32_t *sxptr, int32_t *syptr, int32_t *z, int32_t da
sx = (xdim<<15)+32768 + scale(normxofs,xdim,320); sx = (xdim<<15)+32768 + scale(normxofs,xdim,320);
if (dastat & 512) if (dastat & RS_ALIGN_R)
sx += (oxdim-xdim)<<16; sx += (oxdim-xdim)<<16;
else if ((dastat & 256) == 0) else if ((dastat & RS_ALIGN_L) == 0)
sx += (oxdim-xdim)<<15; sx += (oxdim-xdim)<<15;
if (dastat & RS_CENTERORIGIN) if (dastat & RS_CENTERORIGIN)
@ -7238,8 +7238,8 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
if (g_rotatespriteNoWidescreen) if (g_rotatespriteNoWidescreen)
{ {
dastat |= 1024; dastat |= RS_STRETCH;
dastat &= ~(512+256); dastat &= ~RS_ALIGN_MASK;
} }
//============================================================================= //POLYMOST BEGINS //============================================================================= //POLYMOST BEGINS
@ -7263,7 +7263,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
xsiz = tilesizx[picnum]; xsiz = tilesizx[picnum];
ysiz = tilesizy[picnum]; ysiz = tilesizy[picnum];
if (dastat&16) if (dastat & RS_TOPLEFT)
{ {
// Bit 1<<4 set: origin is top left corner? // Bit 1<<4 set: origin is top left corner?
xoff = 0; xoff = 0;
@ -7278,7 +7278,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
} }
// Bit 1<<2: invert y // Bit 1<<2: invert y
if (dastat&4) if (dastat & RS_YFLIP)
yoff = ysiz-yoff; yoff = ysiz-yoff;
cosang = sintable[(a+512)&2047]; cosang = sintable[(a+512)&2047];
@ -7288,7 +7288,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
xv = mulscale14(cosang,z); xv = mulscale14(cosang,z);
yv = mulscale14(sinang,z); yv = mulscale14(sinang,z);
if ((dastat&2) || (dastat&8) == 0) //Don't aspect unscaled perms if ((dastat&RS_AUTO) || (dastat&RS_NOCLIP) == 0) //Don't aspect unscaled perms
{ {
xv2 = mulscale16(xv,ourxyaspect); xv2 = mulscale16(xv,ourxyaspect);
yv2 = mulscale16(yv,ourxyaspect); yv2 = mulscale16(yv,ourxyaspect);
@ -7361,14 +7361,14 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
// TODO: a real implementation // TODO: a real implementation
if (daalpha > 84) // if alpha is 0 (which is the default) this structure should only necessitate one comparison if (daalpha > 84) // if alpha is 0 (which is the default) this structure should only necessitate one comparison
{ {
if ((dastat&1) && daalpha > 127) // this covers the multiplicative aspect used in the Polymodes if ((dastat & RS_TRANS1) && daalpha > 127) // this covers the multiplicative aspect used in the Polymodes
dastat |= 32; dastat |= RS_TRANS2;
dastat |= 1; dastat |= RS_TRANS1;
if (daalpha > 168) if (daalpha > 168)
{ {
dastat |= 32; dastat |= RS_TRANS2;
if (daalpha == 255) if (daalpha == 255)
return; return;
@ -7378,7 +7378,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
i = divscale32(1L,z); i = divscale32(1L,z);
xv = mulscale14(sinang,i); xv = mulscale14(sinang,i);
yv = mulscale14(cosang,i); yv = mulscale14(cosang,i);
if ((dastat&2) || (dastat&8)==0) //Don't aspect unscaled perms if ((dastat&RS_AUTO) || (dastat&RS_NOCLIP)==0) //Don't aspect unscaled perms
{ {
yv2 = mulscale16(-xv,ouryxaspect); yv2 = mulscale16(-xv,ouryxaspect);
xv2 = mulscale16(yv,ouryxaspect); xv2 = mulscale16(yv,ouryxaspect);
@ -7398,7 +7398,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
bx = dmulscale16(x,xv2,y,xv); bx = dmulscale16(x,xv2,y,xv);
by = dmulscale16(x,yv2,y,yv); by = dmulscale16(x,yv2,y,yv);
if (dastat&4) if (dastat & RS_YFLIP)
{ {
yv = -yv; yv = -yv;
yv2 = -yv2; yv2 = -yv2;
@ -7406,16 +7406,16 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
} }
#if defined ENGINE_USING_A_C #if defined ENGINE_USING_A_C
if ((dastat&1)==0 && ((a&1023) == 0) && (ysiz <= 256)) //vlineasm4 has 256 high limit! if ((dastat&RS_TRANS1)==0 && ((a&1023) == 0) && (ysiz <= 256)) //vlineasm4 has 256 high limit!
#else #else
if ((dastat&1) == 0) if ((dastat&RS_TRANS1) == 0)
#endif #endif
{ {
int32_t y1ve[4], y2ve[4], u4, d4; int32_t y1ve[4], y2ve[4], u4, d4;
if (((a&1023) == 0) && (ysiz <= 256)) //vlineasm4 has 256 high limit! if (((a&1023) == 0) && (ysiz <= 256)) //vlineasm4 has 256 high limit!
{ {
if (dastat&64) if (dastat & RS_NOMASK)
setupvlineasm(24L); setupvlineasm(24L);
else else
setupmvlineasm(24L, 0); setupmvlineasm(24L, 0);
@ -7436,7 +7436,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
bx += xv2; bx += xv2;
y1 = uplc[x+xx]; y2 = dplc[x+xx]; y1 = uplc[x+xx]; y2 = dplc[x+xx];
if ((dastat&8) == 0) if ((dastat & RS_NOCLIP) == 0)
{ {
if (startumost[x+xx] > y1) y1 = startumost[x+xx]; if (startumost[x+xx] > y1) y1 = startumost[x+xx];
if (startdmost[x+xx] < y2) y2 = startdmost[x+xx]; if (startdmost[x+xx] < y2) y2 = startdmost[x+xx];
@ -7474,7 +7474,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
// u4 = max(max(y1ve[0],y1ve[1]),max(y1ve[2],y1ve[3])); // u4 = max(max(y1ve[0],y1ve[1]),max(y1ve[2],y1ve[3]));
// d4 = min(min(y2ve[0],y2ve[1]),min(y2ve[2],y2ve[3])); // d4 = min(min(y2ve[0],y2ve[1]),min(y2ve[2],y2ve[3]));
if (dastat&64) if (dastat & RS_NOMASK)
{ {
if ((bad != 0) || (u4 >= d4)) if ((bad != 0) || (u4 >= d4))
{ {
@ -7532,7 +7532,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
int32_t ny1, ny2; int32_t ny1, ny2;
int32_t qlinemode = 0; int32_t qlinemode = 0;
if (dastat&64) if (dastat & RS_NOMASK)
{ {
if ((xv2&0x0000ffff) == 0) if ((xv2&0x0000ffff) == 0)
{ {
@ -7549,12 +7549,13 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
setuprmhlineasm4(xv2<<16,yv2<<16,(xv2>>16)*ysiz+(yv2>>16),palookupoffs,ysiz,0L); setuprmhlineasm4(xv2<<16,yv2<<16,(xv2>>16)*ysiz+(yv2>>16),palookupoffs,ysiz,0L);
y1 = uplc[x1]; y1 = uplc[x1];
if (((dastat&8) == 0) && (startumost[x1] > y1)) y1 = startumost[x1]; if (((dastat & RS_NOCLIP) == 0) && startumost[x1] > y1)
y1 = startumost[x1];
y2 = y1; y2 = y1;
for (x=x1; x<x2; x++) for (x=x1; x<x2; x++)
{ {
ny1 = uplc[x]-1; ny2 = dplc[x]; ny1 = uplc[x]-1; ny2 = dplc[x];
if ((dastat&8) == 0) if ((dastat & RS_NOCLIP) == 0)
{ {
if (startumost[x]-1 > ny1) ny1 = startumost[x]-1; if (startumost[x]-1 > ny1) ny1 = startumost[x]-1;
if (startdmost[x] < ny2) ny2 = startdmost[x]; if (startdmost[x] < ny2) ny2 = startdmost[x];
@ -7570,7 +7571,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
//x,y1 //x,y1
bx += xv*(y1-oy); by += yv*(y1-oy); oy = y1; bx += xv*(y1-oy); by += yv*(y1-oy); oy = y1;
if (dastat&64) if (dastat & RS_NOMASK)
{ {
if (qlinemode) qrhlineasm4(x-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,0L ,by<<16,ylookup[y1]+x+frameplace); if (qlinemode) qrhlineasm4(x-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,0L ,by<<16,ylookup[y1]+x+frameplace);
else rhlineasm4(x-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,bx<<16,by<<16,ylookup[y1]+x+frameplace); else rhlineasm4(x-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,bx<<16,by<<16,ylookup[y1]+x+frameplace);
@ -7587,7 +7588,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
//x,y1 //x,y1
bx += xv*(y1-oy); by += yv*(y1-oy); oy = y1; bx += xv*(y1-oy); by += yv*(y1-oy); oy = y1;
if (dastat&64) if (dastat & RS_NOMASK)
{ {
if (qlinemode) qrhlineasm4(x-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,0L ,by<<16,ylookup[y1]+x+frameplace); if (qlinemode) qrhlineasm4(x-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,0L ,by<<16,ylookup[y1]+x+frameplace);
else rhlineasm4(x-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,bx<<16,by<<16,ylookup[y1]+x+frameplace); else rhlineasm4(x-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,bx<<16,by<<16,ylookup[y1]+x+frameplace);
@ -7604,7 +7605,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
//x,y2 //x,y2
bx += xv*(y2-oy); by += yv*(y2-oy); oy = y2; bx += xv*(y2-oy); by += yv*(y2-oy); oy = y2;
if (dastat&64) if (dastat & RS_NOMASK)
{ {
if (qlinemode) qrhlineasm4(x-lastx[y2],(bx>>16)*ysiz+(by>>16)+bufplc,0L,0L ,by<<16,ylookup[y2]+x+frameplace); if (qlinemode) qrhlineasm4(x-lastx[y2],(bx>>16)*ysiz+(by>>16)+bufplc,0L,0L ,by<<16,ylookup[y2]+x+frameplace);
else rhlineasm4(x-lastx[y2],(bx>>16)*ysiz+(by>>16)+bufplc,0L,bx<<16,by<<16,ylookup[y2]+x+frameplace); else rhlineasm4(x-lastx[y2],(bx>>16)*ysiz+(by>>16)+bufplc,0L,bx<<16,by<<16,ylookup[y2]+x+frameplace);
@ -7622,7 +7623,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
//x,y1 //x,y1
bx += xv*(y1-oy); by += yv*(y1-oy); oy = y1; bx += xv*(y1-oy); by += yv*(y1-oy); oy = y1;
if (dastat&64) if (dastat & RS_NOMASK)
{ {
if (qlinemode) qrhlineasm4(x-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,0L ,by<<16,ylookup[y1]+x+frameplace); if (qlinemode) qrhlineasm4(x-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,0L ,by<<16,ylookup[y1]+x+frameplace);
else rhlineasm4(x-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,bx<<16,by<<16,ylookup[y1]+x+frameplace); else rhlineasm4(x-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,bx<<16,by<<16,ylookup[y1]+x+frameplace);
@ -7632,7 +7633,8 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
if (x == x2-1) { bx += xv2; by += yv2; break; } if (x == x2-1) { bx += xv2; by += yv2; break; }
y1 = uplc[x+1]; y1 = uplc[x+1];
if (((dastat&8) == 0) && (startumost[x+1] > y1)) y1 = startumost[x+1]; if (((dastat & RS_NOCLIP) == 0) && startumost[x+1] > y1)
y1 = startumost[x+1];
y2 = y1; y2 = y1;
} }
bx += xv2; by += yv2; bx += xv2; by += yv2;
@ -7644,7 +7646,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
//x2,y1 //x2,y1
bx += xv*(y1-oy); by += yv*(y1-oy); oy = y1; bx += xv*(y1-oy); by += yv*(y1-oy); oy = y1;
if (dastat&64) if (dastat & RS_NOMASK)
{ {
if (qlinemode) qrhlineasm4(x2-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,0L,by<<16,ylookup[y1]+x2+frameplace); if (qlinemode) qrhlineasm4(x2-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,0L,by<<16,ylookup[y1]+x2+frameplace);
else rhlineasm4(x2-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,bx<<16,by<<16,ylookup[y1]+x2+frameplace); else rhlineasm4(x2-lastx[y1],(bx>>16)*ysiz+(by>>16)+bufplc,0L,bx<<16,by<<16,ylookup[y1]+x2+frameplace);
@ -7656,15 +7658,15 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
} }
else else
{ {
if ((dastat&1) == 0) if ((dastat & RS_TRANS1) == 0)
{ {
#if !defined ENGINE_USING_A_C #if !defined ENGINE_USING_A_C
if (dastat&64) if (dastat & RS_NOMASK)
setupspritevline(palookupoffs,(xv>>16)*ysiz,xv<<16,ysiz,yv,0L); setupspritevline(palookupoffs,(xv>>16)*ysiz,xv<<16,ysiz,yv,0L);
else else
msetupspritevline(palookupoffs,(xv>>16)*ysiz,xv<<16,ysiz,yv,0L); msetupspritevline(palookupoffs,(xv>>16)*ysiz,xv<<16,ysiz,yv,0L);
#else #else
if (dastat&64) if (dastat & RS_NOMASK)
setupspritevline(palookupoffs,xv,yv,ysiz); setupspritevline(palookupoffs,xv,yv,ysiz);
else else
msetupspritevline(palookupoffs,xv,yv,ysiz); msetupspritevline(palookupoffs,xv,yv,ysiz);
@ -7677,7 +7679,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
#else #else
tsetupspritevline(palookupoffs,xv,yv,ysiz); tsetupspritevline(palookupoffs,xv,yv,ysiz);
#endif #endif
if (dastat&32) settransreverse(); else settransnormal(); if (dastat & RS_TRANS2) settransreverse(); else settransnormal();
} }
for (x=x1; x<x2; x++) for (x=x1; x<x2; x++)
@ -7685,7 +7687,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
bx += xv2; by += yv2; bx += xv2; by += yv2;
y1 = uplc[x]; y2 = dplc[x]; y1 = uplc[x]; y2 = dplc[x];
if ((dastat&8) == 0) if ((dastat & RS_NOCLIP) == 0)
{ {
if (startumost[x] > y1) y1 = startumost[x]; if (startumost[x] > y1) y1 = startumost[x];
if (startdmost[x] < y2) y2 = startdmost[x]; if (startdmost[x] < y2) y2 = startdmost[x];
@ -7706,15 +7708,15 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
p = ylookup[y1]+x+frameplace; p = ylookup[y1]+x+frameplace;
if ((dastat&1) == 0) if ((dastat & RS_TRANS1) == 0)
{ {
#if !defined ENGINE_USING_A_C #if !defined ENGINE_USING_A_C
if (dastat&64) if (dastat & RS_NOMASK)
spritevline(0L,by<<16,y2-y1+1,bx<<16,(bx>>16)*ysiz+(by>>16)+bufplc,p); spritevline(0L,by<<16,y2-y1+1,bx<<16,(bx>>16)*ysiz+(by>>16)+bufplc,p);
else else
mspritevline(0L,by<<16,y2-y1+1,bx<<16,(bx>>16)*ysiz+(by>>16)+bufplc,p); mspritevline(0L,by<<16,y2-y1+1,bx<<16,(bx>>16)*ysiz+(by>>16)+bufplc,p);
#else #else
if (dastat&64) if (dastat & RS_NOMASK)
spritevline(bx&65535,by&65535,y2-y1+1,(bx>>16)*ysiz+(by>>16)+bufplc,p); spritevline(bx&65535,by&65535,y2-y1+1,(bx>>16)*ysiz+(by>>16)+bufplc,p);
else else
mspritevline(bx&65535,by&65535,y2-y1+1,(bx>>16)*ysiz+(by>>16)+bufplc,p); mspritevline(bx&65535,by&65535,y2-y1+1,(bx>>16)*ysiz+(by>>16)+bufplc,p);
@ -7734,7 +7736,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
} }
} }
/* if ((dastat&128) && (origbuffermode == 0)) /* if ((dastat & RS_PERM) && (origbuffermode == 0))
{ {
buffermode = obuffermode; buffermode = obuffermode;
setactivepage(activepage); setactivepage(activepage);
@ -14198,18 +14200,20 @@ void rotatesprite_(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnum,
// bit RS_CENTERORIGIN: see dorotspr_handle_bit2 // bit RS_CENTERORIGIN: see dorotspr_handle_bit2
//////////////////// ////////////////////
if (((dastat&128) == 0) || (numpages < 2) || (beforedrawrooms != 0)) if (((dastat & RS_PERM) == 0) || (numpages < 2) || (beforedrawrooms != 0))
{ {
begindrawing(); //{{{ begindrawing(); //{{{
dorotatesprite(sx,sy,z,a,picnum,dashade,dapalnum,dastat,daalpha,cx1,cy1,cx2,cy2,guniqhudid); dorotatesprite(sx,sy,z,a,picnum,dashade,dapalnum,dastat,daalpha,cx1,cy1,cx2,cy2,guniqhudid);
enddrawing(); //}}} enddrawing(); //}}}
} }
if ((dastat&64) && (cx1 <= 0) && (cy1 <= 0) && (cx2 >= xdim-1) && (cy2 >= ydim-1) && if ((dastat & RS_NOMASK) && (cx1 <= 0) && (cy1 <= 0) && (cx2 >= xdim-1) && (cy2 >= ydim-1) &&
(sx == (160<<16)) && (sy == (100<<16)) && (z == 65536L) && (a == 0) && ((dastat&1) == 0)) (sx == (160<<16)) && (sy == (100<<16)) && (z == 65536L) && (a == 0) && ((dastat&RS_TRANS1) == 0))
permhead = permtail = 0; permhead = permtail = 0;
if ((dastat&128) == 0) return; if ((dastat & RS_PERM) == 0)
return;
if (numpages >= 2) if (numpages >= 2)
{ {
per = &permfifo[permhead]; per = &permfifo[permhead];
@ -14223,7 +14227,7 @@ void rotatesprite_(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t picnum,
per->uniqid = guniqhudid; //JF extension per->uniqid = guniqhudid; //JF extension
//Would be better to optimize out true bounding boxes //Would be better to optimize out true bounding boxes
if (dastat&64) //If non-masking write, checking for overlapping cases if (dastat & RS_NOMASK) //If non-masking write, checking for overlapping cases
{ {
for (i=permtail; i!=permhead; i=((i+1)&(MAXPERMS-1))) for (i=permtail; i!=permhead; i=((i+1)&(MAXPERMS-1)))
{ {

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

@ -4109,6 +4109,8 @@ void polymost_drawsprite(int32_t snum)
tilesizy[globalpicnum]=oldsizy; tilesizy[globalpicnum]=oldsizy;
} }
EDUKE32_STATIC_ASSERT((int)RS_YFLIP == (int)HUDFLAG_FLIPPED);
//sx,sy center of sprite; screen coords*65536 //sx,sy center of sprite; screen coords*65536
//z zoom*65536. > is zoomed in //z zoom*65536. > is zoomed in
//a angle (0 is default) //a angle (0 is default)
@ -4183,7 +4185,7 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
double fx = ((double)sx)*(1.0/65536.0); double fx = ((double)sx)*(1.0/65536.0);
double fy = ((double)sy)*(1.0/65536.0); double fy = ((double)sy)*(1.0/65536.0);
if (dastat&16) if (dastat & RS_TOPLEFT)
{ {
xsiz = tilesizx[picnum]; ysiz = tilesizy[picnum]; xsiz = tilesizx[picnum]; ysiz = tilesizy[picnum];
xoff = picanm[picnum].xofs + (xsiz>>1); xoff = picanm[picnum].xofs + (xsiz>>1);
@ -4192,13 +4194,13 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
d = (double)z/(65536.0*16384.0); d = (double)z/(65536.0*16384.0);
cosang2 = cosang = (double)sintable[(a+512)&2047]*d; cosang2 = cosang = (double)sintable[(a+512)&2047]*d;
sinang2 = sinang = (double)sintable[a&2047]*d; sinang2 = sinang = (double)sintable[a&2047]*d;
if ((dastat&2) || (!(dastat&8))) //Don't aspect unscaled perms if ((dastat&RS_AUTO) || (!(dastat&RS_NOCLIP))) //Don't aspect unscaled perms
{ d = (double)xyaspect/65536.0; cosang2 *= d; sinang2 *= d; } { d = (double)xyaspect/65536.0; cosang2 *= d; sinang2 *= d; }
fx += -(double)xoff*cosang2+ (double)yoff*sinang2; fx += -(double)xoff*cosang2+ (double)yoff*sinang2;
fy += -(double)xoff*sinang - (double)yoff*cosang; fy += -(double)xoff*sinang - (double)yoff*cosang;
} }
if (!(dastat&2)) if (!(dastat & RS_AUTO))
{ {
x1 += fx/((double)(xdim<<15))-1.0; //-1: left of screen, +1: right of screen x1 += fx/((double)(xdim<<15))-1.0; //-1: left of screen, +1: right of screen
y1 += fy/((double)(ydim<<15))-1.0; //-1: top of screen, +1: bottom of screen y1 += fy/((double)(ydim<<15))-1.0; //-1: top of screen, +1: bottom of screen
@ -4217,7 +4219,7 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
} }
#endif #endif
if (dastat&4) { x1 = -x1; y1 = -y1; } if (dastat & RS_YFLIP) { x1 = -x1; y1 = -y1; }
// In Polymost, we don't care if the model is very big // In Polymost, we don't care if the model is very big
if (getrendermode() < REND_POLYMER) if (getrendermode() < REND_POLYMER)
@ -4246,10 +4248,13 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
tspr.shade = dashade; tspr.shade = dashade;
tspr.pal = dapalnum; tspr.pal = dapalnum;
tspr.owner = uniqid+MAXSPRITES; tspr.owner = uniqid+MAXSPRITES;
globalorientation = (dastat&1)+((dastat&32)<<4)+((dastat&4)<<1); // 1 -> 1
// 32 -> 32*16 = 512
// 4 -> 8
globalorientation = (dastat&RS_TRANS1) + ((dastat&RS_TRANS2)<<4) + ((dastat&RS_YFLIP)<<1);
tspr.cstat = globalorientation; tspr.cstat = globalorientation;
if ((dastat&10) == 2) if ((dastat&(RS_AUTO|RS_NOCLIP)) == RS_AUTO)
bglViewport(windowx1,yres-(windowy2+1),windowx2-windowx1+1,windowy2-windowy1+1); bglViewport(windowx1,yres-(windowy2+1),windowx2-windowx1+1,windowy2-windowy1+1);
else else
{ {
@ -4261,7 +4266,7 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
{ {
bglMatrixMode(GL_PROJECTION); bglMatrixMode(GL_PROJECTION);
memset(m,0,sizeof(m)); memset(m,0,sizeof(m));
if ((dastat&10) == 2) if ((dastat&(RS_AUTO|RS_NOCLIP)) == RS_AUTO)
{ {
const float ratioratio = 1.0; //(float)xdim/ydim; const float ratioratio = 1.0; //(float)xdim/ydim;
float f = 1.0; float f = 1.0;
@ -4410,10 +4415,12 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
#endif #endif
method = 0; method = 0;
if (!(dastat&64)) if (!(dastat & RS_NOMASK))
{ {
if (dastat & RS_TRANS1)
method = (dastat & RS_TRANS2) ? 3 : 2;
else
method = 1; method = 1;
if (dastat&1) { if (!(dastat&32)) method = 2; else method = 3; }
} }
method |= 4; //Use OpenGL clamping - dorotatesprite never repeats method |= 4; //Use OpenGL clamping - dorotatesprite never repeats
@ -4422,7 +4429,7 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
xsiz = tilesizx[globalpicnum]; xsiz = tilesizx[globalpicnum];
ysiz = tilesizy[globalpicnum]; ysiz = tilesizy[globalpicnum];
if (dastat&16) if (dastat & RS_TOPLEFT)
{ {
xoff = 0; xoff = 0;
yoff = 0; yoff = 0;
@ -4433,7 +4440,7 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
yoff = picanm[globalpicnum].yofs + (ysiz>>1); yoff = picanm[globalpicnum].yofs + (ysiz>>1);
} }
if (dastat&4) if (dastat & RS_YFLIP)
yoff = ysiz-yoff; yoff = ysiz-yoff;
{ {
@ -4444,7 +4451,7 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
d = (double)z/(65536.0*16384.0); d = (double)z/(65536.0*16384.0);
cosang2 = cosang = (double)sintable[(a+512)&2047]*d; cosang2 = cosang = (double)sintable[(a+512)&2047]*d;
sinang2 = sinang = (double)sintable[a&2047]*d; sinang2 = sinang = (double)sintable[a&2047]*d;
if ((dastat&2) || (!(dastat&8))) //Don't aspect unscaled perms if ((dastat&RS_AUTO) || (!(dastat&RS_NOCLIP))) //Don't aspect unscaled perms
{ {
d = (double)ourxyaspect/65536.0; d = (double)ourxyaspect/65536.0;
cosang2 *= d; cosang2 *= d;
@ -4470,7 +4477,7 @@ void polymost_dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16
guy = (px[0]-px[3])*((double)xsiz-.0001)*d; guy = (px[0]-px[3])*((double)xsiz-.0001)*d;
guo = 0 - px[0]*gux - py[0]*guy; guo = 0 - px[0]*gux - py[0]*guy;
if (!(dastat&4)) if (!(dastat & RS_YFLIP))
{ {
//px[0]*gvx + py[0]*gvy + gvo = 0 //px[0]*gvx + py[0]*gvy + gvo = 0
//px[1]*gvx + py[1]*gvy + gvo = 0 //px[1]*gvx + py[1]*gvy + gvo = 0