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

Enable sector drawing and textured map in Mapster32 sideview mode with a sideview elevation of 512 (straight up and down).

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5278 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2015-07-08 03:34:31 +00:00
parent 558c2dae48
commit d47187a92d
3 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3368,7 +3368,7 @@ void overheadeditor(void)
setup_sideview_sincos(); setup_sideview_sincos();
if (graphicsmode && !m32_sideview) if (graphicsmode && (!m32_sideview || m32_sideelev == 512))
{ {
Bmemset(show2dsector, 0, sizeof(show2dsector)); Bmemset(show2dsector, 0, sizeof(show2dsector));
for (i=0; i<numsectors; i++) for (i=0; i<numsectors; i++)
@ -3382,7 +3382,7 @@ void overheadeditor(void)
if (graphicsmode == 2) if (graphicsmode == 2)
totalclocklock = totalclock; totalclocklock = totalclock;
drawmapview(pos.x, pos.y, zoom, 1536); drawmapview(pos.x, pos.y, zoom, m32_sideview ? -m32_sideang + 1536 : 1536);
} }
draw2dgrid(pos.x,pos.y,pos.z,cursectnum,ang,zoom,grid); draw2dgrid(pos.x,pos.y,pos.z,cursectnum,ang,zoom,grid);
@ -6683,7 +6683,10 @@ end_join_sectors:
keystatus[0x2e] = 0; keystatus[0x2e] = 0;
} }
bad = keystatus[0x39] && !m32_sideview; //Gotta do this to save lots of 3 spaces! bad = keystatus[0x39] && (!m32_sideview || m32_sideelev == 512); //Gotta do this to save lots of 3 spaces!
if (keystatus[0x39] && !bad)
message("Unable to create sectors in angled sideview mode.");
if (circlewall >= 0) if (circlewall >= 0)
{ {

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

@ -17454,14 +17454,13 @@ void draw2dscreen(const vec3_t *pos, int16_t cursectnum, int16_t ange, int32_t z
m32_wallsprite[m32_swcnt++] = j; m32_wallsprite[m32_swcnt++] = j;
sideview_getdist(j, i); sideview_getdist(j, i);
} }
/*
// j = sector[numsectors-1].wallptr + sector[numsectors-1].wallnum // j = sector[numsectors-1].wallptr + sector[numsectors-1].wallnum
for (; j<numwalls; j++) // new walls ... for (; j < numwalls; j++) // new walls ...
{ {
m32_wallsprite[m32_swcnt++] = j; m32_wallsprite[m32_swcnt++] = j;
m32_sidedist[j] = sideview_getdist(j, 0); sideview_getdist(j, 0);
} }
*/
} }
faketimerhandler(); faketimerhandler();

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

@ -10114,7 +10114,7 @@ void ExtPreCheckKeys(void) // just before drawrooms
// if (cursectornum >= 0) // if (cursectornum >= 0)
// fillsector(cursectornum, 31); // fillsector(cursectornum, 31);
if (graphicsmode && !m32_sideview && zoom >= 256) if (graphicsmode && (!m32_sideview || m32_sideelev == 512) && zoom >= 256)
{ {
for (i=ii=0; i<MAXSPRITES && ii < Numsprites; i++) for (i=ii=0; i<MAXSPRITES && ii < Numsprites; i++)
{ {
@ -10218,10 +10218,18 @@ void ExtPreCheckKeys(void) // just before drawrooms
if (shade < 6) if (shade < 6)
shade = 6; shade = 6;
} }
if (m32_sideview)
{
screencoords(&xp1, &yp1, sprite[i].x-pos.x, sprite[i].y-pos.y, zoom);
yp1 += midydim16 + getscreenvdisp(sprite[i].z-pos.z, zoom);
yp1 -= mulscale14(tilesiz[picnum].y<<2, zoom);
xp1 += halfxdim16;
}
else
ovhscrcoords(sprite[i].x, sprite[i].y-(tilesiz[picnum].y<<2), &xp1, &yp1);
ovhscrcoords(sprite[i].x, sprite[i].y-(tilesiz[picnum].y<<2), &xp1, &yp1); ydim16 = ydim - STATUS2DSIZ2; // XXX?
ydim16 = ydim-STATUS2DSIZ2; // XXX?
if (xp1 < 4 || xp1 > xdim-6 || yp1 < 4 || yp1 > ydim16-6) if (xp1 < 4 || xp1 > xdim-6 || yp1 < 4 || yp1 > ydim16-6)
continue; continue;