zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-12 03:00:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@1193 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-12-25 09:43:00 +00:00
parent 93ab84eaa3
commit 90ff26bdc1
2 changed files with 43 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,8 @@ int hvel;
int grponlymode = 0; int grponlymode = 0;
extern int editorgridextent; // in engine.c extern int editorgridextent; // in engine.c
extern double msens; extern double msens;
int graphicsmode = 0;
extern int xyaspect;
int synctics = 0, lockclock = 0; int synctics = 0, lockclock = 0;
@ -1533,6 +1535,7 @@ void overheadeditor(void)
} }
} }
if (!graphicsmode)
idle(); idle();
OSD_DispatchQueued(); OSD_DispatchQueued();
@ -1612,21 +1615,27 @@ void overheadeditor(void)
clear2dscreen(); clear2dscreen();
for (i=0;i<(MAXSECTORS>>3);i++) if (graphicsmode)
show2dsector[i] = 255; {
for (i=0;i<(MAXWALLS>>3);i++) int ii;
show2dwall[i] = 255;
for (i=0;i<(MAXSPRITES>>3);i++) Bmemset(show2dsector, 255, sizeof(show2dsector));
show2dsprite[i] = 255; Bmemset(show2dwall, 255, sizeof(show2dwall));
Bmemset(show2dsprite, 255, sizeof(show2dsprite));
setview(0,0,xdim-1,ydim16-1); setview(0,0,xdim-1,ydim16-1);
i = yxaspect; i = yxaspect;
yxaspect = 65536; yxaspect = 65536;
j = ydim; j = ydim;
ydim = ydim16; ydim -= scale(128,ydim,768);
ii = xyaspect;
xyaspect = 65536;
drawmapview(posx, posy, zoom, 1536); drawmapview(posx, posy, zoom, 1536);
yxaspect = i; yxaspect = i;
ydim = j; ydim = j;
xyaspect = ii;
}
draw2dgrid(posx,posy,ang,zoom,grid); draw2dgrid(posx,posy,ang,zoom,grid);
ExtPreCheckKeys(); ExtPreCheckKeys();
@ -4132,7 +4141,9 @@ SKIP:
} }
} }
if (keystatus[0x0e] && (newnumwalls >= numwalls)) //Backspace if (keystatus[0x0e]) //Backspace
{
if (newnumwalls >= numwalls)
{ {
if (newnumwalls > numwalls) if (newnumwalls > numwalls)
{ {
@ -4147,6 +4158,13 @@ SKIP:
keystatus[0x0e] = 0; keystatus[0x0e] = 0;
} }
} }
else
{
graphicsmode = !graphicsmode;
printmessage16("2D mode textures %s",graphicsmode?"enabled":"disabled");
keystatus[0x0e] = 0;
}
}
if (keystatus[0xd3] && (keystatus[0x1d]||keystatus[0x9d]) && (numwalls >= 0)) if (keystatus[0xd3] && (keystatus[0x1d]||keystatus[0x9d]) && (numwalls >= 0))
{ {

3
polymer/eduke32/source/astub.c
View file

@ -8695,6 +8695,7 @@ static char wallpals[MAXWALLS];
static char sectorpals[MAXSECTORS][2]; static char sectorpals[MAXSECTORS][2];
static char spritepals[MAXSPRITES]; static char spritepals[MAXSPRITES];
static char wallflag[MAXWALLS]; static char wallflag[MAXWALLS];
extern int graphicsmode;
void ExtPreCheckKeys(void) // just before drawrooms void ExtPreCheckKeys(void) // just before drawrooms
{ {
@ -8781,7 +8782,7 @@ void ExtPreCheckKeys(void) // just before drawrooms
xp1 = mulscale14(sprite[i].x-posx,zoom); xp1 = mulscale14(sprite[i].x-posx,zoom);
yp1 = mulscale14(sprite[i].y-posy,zoom); yp1 = mulscale14(sprite[i].y-posy,zoom);
if (zoom >= 256 && (sprite[i].cstat & 48) == 0) if (graphicsmode && zoom >= 256 && (sprite[i].cstat & 48) == 0)
rotatesprite((halfxdim16+xp1)<<16,(midydim16+yp1)<<16,zoom<<5,0,sprite[i].picnum, rotatesprite((halfxdim16+xp1)<<16,(midydim16+yp1)<<16,zoom<<5,0,sprite[i].picnum,
(i+16384 == pointhighlight && totalclock&32)?8:0,sprite[i].pal,0,0,0,xdim-1,ydim16-1); (i+16384 == pointhighlight && totalclock&32)?8:0,sprite[i].pal,0,0,0,xdim-1,ydim16-1);