zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- little bit of engine cleanup.

Browse source
This commit is contained in:
Christoph Oelckers 2021-02-25 12:16:21 +01:00
parent 4589f6f26d
commit 99f1f0952a
8 changed files with 19 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
source/build/include/build.h
View file

@ -229,7 +229,7 @@ EXTERN int16_t thewall[MAXWALLSB];
EXTERN tspriteptr_t tspriteptr[MAXSPRITESONSCREEN + 1]; EXTERN tspriteptr_t tspriteptr[MAXSPRITESONSCREEN + 1];
EXTERN int32_t wx1, wy1, wx2, wy2; EXTERN int32_t wx1, wy1, wx2, wy2;
EXTERN int32_t xdim, ydim, numpages, upscalefactor; EXTERN int32_t xdim, ydim;
EXTERN int32_t yxaspect, viewingrange; EXTERN int32_t yxaspect, viewingrange;
#ifndef GEKKO #ifndef GEKKO
@ -448,7 +448,6 @@ int32_t qloadkvx(int32_t voxindex, const char *filename);
void vox_undefine(int32_t const); void vox_undefine(int32_t const);
void vox_deinit(); void vox_deinit();
int32_t videoSetGameMode(char davidoption, int32_t daupscaledxdim, int32_t daupscaledydim, int32_t dabpp, int32_t daupscalefactor);
void videoSetCorrectedAspect(); void videoSetCorrectedAspect();
void videoSetViewableArea(int32_t x1, int32_t y1, int32_t x2, int32_t y2); void videoSetViewableArea(int32_t x1, int32_t y1, int32_t x2, int32_t y2);
void renderSetAspect(int32_t daxrange, int32_t daaspect); void renderSetAspect(int32_t daxrange, int32_t daaspect);
@ -463,6 +462,7 @@ void renderCompleteMirror(void);
int32_t renderDrawRoomsQ16(int32_t daposx, int32_t daposy, int32_t daposz, fixed_t daang, fixed_t dahoriz, int16_t dacursectnum); int32_t renderDrawRoomsQ16(int32_t daposx, int32_t daposy, int32_t daposz, fixed_t daang, fixed_t dahoriz, int16_t dacursectnum);
void renderDrawMasks(void); void renderDrawMasks(void);
void setVideoMode();
void videoInit(); void videoInit();
void videoClearViewableArea(int32_t dacol); void videoClearViewableArea(int32_t dacol);
void videoClearScreen(int32_t dacol); void videoClearScreen(int32_t dacol);

2
source/build/include/polymost.h
View file

@ -99,7 +99,7 @@ enum {
static_assert(DAMETH_NARROW_MASKPROPS(DAMETH_MASKPROPS) == DAMETH_MASK); static_assert(DAMETH_NARROW_MASKPROPS(DAMETH_MASKPROPS) == DAMETH_MASK);
extern float fcosglobalang, fsinglobalang; extern float fcosglobalang, fsinglobalang;
extern float fxdim, fydim, fydimen, fviewingrange; extern float fydimen, fviewingrange;
extern int32_t viewingrangerecip; extern int32_t viewingrangerecip;
#endif #endif

62
source/build/src/engine.cpp
View file

@ -45,7 +45,7 @@ int32_t r_rorphase = 0;
int32_t mdtims, omdtims; int32_t mdtims, omdtims;
float fcosglobalang, fsinglobalang; float fcosglobalang, fsinglobalang;
float fxdim, fydim, fydimen, fviewingrange; float fydimen, fviewingrange;
uint8_t globalr = 255, globalg = 255, globalb = 255; uint8_t globalr = 255, globalg = 255, globalb = 255;
@ -82,7 +82,6 @@ static int32_t qradarang[10240];
uint16_t ATTRIBUTE((used)) sqrtable[4096], ATTRIBUTE((used)) shlookup[4096+256], ATTRIBUTE((used)) sqrtable_old[2048]; uint16_t ATTRIBUTE((used)) sqrtable[4096], ATTRIBUTE((used)) shlookup[4096+256], ATTRIBUTE((used)) sqrtable_old[2048];
static char kensmessage[128];
const char *engineerrstr = "No error"; const char *engineerrstr = "No error";
int32_t showfirstwall=0; int32_t showfirstwall=0;
@ -194,7 +193,6 @@ int16_t numscans, numbunches;
static int16_t numhits; static int16_t numhits;
int16_t searchit; int16_t searchit;
int32_t searchx = -1, searchy; //search input
int16_t searchsector, searchwall, searchstat; //search output int16_t searchsector, searchwall, searchstat; //search output
// SEARCHBOTTOMWALL: // SEARCHBOTTOMWALL:
@ -831,8 +829,6 @@ const int16_t* getpsky(int32_t picnum, int32_t* dapyscale, int32_t* dapskybits,
// //
// preinitengine // preinitengine
// //
static int32_t preinitcalled = 0;
static spriteext_t spriteext_s[MAXSPRITES+MAXUNIQHUDID]; static spriteext_t spriteext_s[MAXSPRITES+MAXUNIQHUDID];
static spritesmooth_t spritesmooth_s[MAXSPRITES+MAXUNIQHUDID]; static spritesmooth_t spritesmooth_s[MAXSPRITES+MAXUNIQHUDID];
static sectortype sector_s[MAXSECTORS]; static sectortype sector_s[MAXSECTORS];
@ -842,17 +838,12 @@ static tspritetype tsprite_s[MAXSPRITESONSCREEN];
int32_t enginePreInit(void) int32_t enginePreInit(void)
{ {
polymost_initosdfuncs();
sector = sector_s; sector = sector_s;
wall = wall_s; wall = wall_s;
sprite = sprite_s; sprite = sprite_s;
tsprite = tsprite_s; tsprite = tsprite_s;
spriteext = spriteext_s; spriteext = spriteext_s;
spritesmooth = spritesmooth_s; spritesmooth = spritesmooth_s;
preinitcalled = 1;
return 0; return 0;
} }
@ -862,14 +853,6 @@ int32_t enginePreInit(void)
// //
int32_t engineInit(void) int32_t engineInit(void)
{ {
int32_t i;
if (!preinitcalled)
{
i = enginePreInit();
if (i) return i;
}
if (engineLoadTables()) if (engineLoadTables())
return 1; return 1;
@ -877,7 +860,7 @@ int32_t engineInit(void)
voxelmemory.Reset(); voxelmemory.Reset();
for (i=0; i<MAXTILES; i++) for (int i=0; i<MAXTILES; i++)
tiletovox[i] = -1; tiletovox[i] = -1;
for (auto& v : voxscale) v = 65536; for (auto& v : voxscale) v = 65536;
memset(voxrotate, 0, sizeof(voxrotate)); memset(voxrotate, 0, sizeof(voxrotate));
@ -1573,8 +1556,8 @@ static void renderFillPolygon(int32_t npoints)
xtex.Y = ((float)asm2) * (1.f / 4294967296.f); xtex.Y = ((float)asm2) * (1.f / 4294967296.f);
ytex.X = ((float)x1) * (1.f / 4294967296.f); ytex.X = ((float)x1) * (1.f / 4294967296.f);
ytex.Y = ((float)y2) * (-1.f / 4294967296.f); ytex.Y = ((float)y2) * (-1.f / 4294967296.f);
otex.X = (fxdim * xtex.X + fydim * ytex.X) * -0.5f + fglobalposx * (1.f / 4294967296.f); otex.X = (xdim * xtex.X + ydim * ytex.X) * -0.5f + fglobalposx * (1.f / 4294967296.f);
otex.Y = (fxdim * xtex.Y + fydim * ytex.Y) * -0.5f - fglobalposy * (1.f / 4294967296.f); otex.Y = (xdim * xtex.Y + ydim * ytex.Y) * -0.5f - fglobalposy * (1.f / 4294967296.f);
FillPolygon(rx1, ry1, xb1, npoints, globalpicnum, globalpal, globalshade, globalorientation, xtex, ytex, otex, windowxy1.x, windowxy1.y, windowxy2.x, windowxy2.y); FillPolygon(rx1, ry1, xb1, npoints, globalpicnum, globalpal, globalshade, globalorientation, xtex, ytex, otex, windowxy1.x, windowxy1.y, windowxy2.x, windowxy2.y);
} }
@ -1822,43 +1805,6 @@ void renderDrawMapView(int32_t dax, int32_t day, int32_t zoome, int16_t ang)
} }
} }
//
// setgamemode
//
// JBF: davidoption now functions as a windowed-mode flag (0 == windowed, 1 == fullscreen)
int32_t videoSetGameMode(char davidoption, int32_t daupscaledxdim, int32_t daupscaledydim, int32_t dabpp, int32_t daupscalefactor)
{
int32_t j;
if (dabpp != 32) return -1; // block software mode.
daupscaledxdim = max(320, daupscaledxdim);
daupscaledydim = max(200, daupscaledydim);
strcpy(kensmessage,"!!!! BUILD engine&tools programmed by Ken Silverman of E.G. RI."
" (c) Copyright 1995 Ken Silverman. Summary: BUILD = Ken. !!!!");
upscalefactor = 1;
xdim = daupscaledxdim;
ydim = daupscaledydim;
V_UpdateModeSize(xdim, ydim);
numpages = 1; // We have only one page, no exceptions.
#ifdef USE_OPENGL
fxdim = (float) xdim;
fydim = (float) ydim;
#endif
j = ydim*4; //Leave room for horizlookup&horizlookup2
videoSetViewableArea(0L,0L,xdim-1,ydim-1);
videoClearScreen(0L);
if (searchx < 0) { searchx = halfxdimen; searchy = (ydimen>>1); }
return 0;
}
// //
// qloadkvx // qloadkvx
// //

1
source/build/src/engine_priv.h
View file

@ -102,7 +102,6 @@ extern int32_t globalorientation;
extern int16_t editstatus; extern int16_t editstatus;
extern int16_t searchit; extern int16_t searchit;
extern int32_t searchx, searchy;
extern int16_t searchsector, searchwall, searchstat; extern int16_t searchsector, searchwall, searchstat;
extern int16_t searchbottomwall, searchisbottom; extern int16_t searchbottomwall, searchisbottom;

4
source/build/src/polymost.cpp
View file

@ -3538,10 +3538,6 @@ _drawsprite_return:
static_assert((int)RS_YFLIP == (int)HUDFLAG_FLIPPED); static_assert((int)RS_YFLIP == (int)HUDFLAG_FLIPPED);
void polymost_initosdfuncs(void)
{
}
void polymost_precache(int32_t dapicnum, int32_t dapalnum, int32_t datype) void polymost_precache(int32_t dapicnum, int32_t dapalnum, int32_t datype)
{ {
// dapicnum and dapalnum are like you'd expect // dapicnum and dapalnum are like you'd expect

17
source/core/gamecontrol.cpp
View file

@ -912,11 +912,7 @@ int RunGame()
if (Args->CheckParm("-sounddebug")) if (Args->CheckParm("-sounddebug"))
C_DoCommand("stat sounddebug"); C_DoCommand("stat sounddebug");
if (enginePreInit()) enginePreInit();
{
I_FatalError("There was a problem initializing the Build engine: %s\n", engineerrstr);
}
SetupGameButtons(); SetupGameButtons();
gameinfo.mBackButton = "engine/graphics/m_back.png"; gameinfo.mBackButton = "engine/graphics/m_back.png";
gi->app_init(); gi->app_init();
@ -1000,11 +996,20 @@ void updatePauseStatus()
void PolymostProcessVoxels(void); void PolymostProcessVoxels(void);
void setVideoMode()
{
xdim = screen->GetWidth();
ydim = screen->GetHeight();
V_UpdateModeSize(xdim, ydim);
videoSetViewableArea(0, 0, xdim - 1, ydim - 1);
videoClearScreen(0);
}
void videoInit() void videoInit()
{ {
lookups.postLoadLookups(); lookups.postLoadLookups();
V_Init2(); V_Init2();
videoSetGameMode(vid_fullscreen, screen->GetWidth(), screen->GetHeight(), 32, 1); setVideoMode();
PolymostProcessVoxels(); PolymostProcessVoxels();
GLInterface.Init(screen->GetWidth()); GLInterface.Init(screen->GetWidth());

2
source/core/inputstate.cpp
View file

@ -157,7 +157,7 @@ int32_t handleevents(void)
// change the view size if needed // change the view size if needed
if (setsizeneeded) if (setsizeneeded)
{ {
videoSetGameMode(vid_fullscreen, SCREENWIDTH, SCREENHEIGHT, 32, 1); setVideoMode();
setViewport(hud_size); setViewport(hud_size);
setsizeneeded = false; setsizeneeded = false;
} }

1
source/games/sw/src/panel.h
View file

@ -122,7 +122,6 @@ struct PANEL_SPRITEstruct
short picndx; // for pip stuff in conpic.h short picndx; // for pip stuff in conpic.h
short picnum; // bypass pip stuff in conpic.h short picnum; // bypass pip stuff in conpic.h
short vel, vel_adj; short vel, vel_adj;
short numpages;
int xorig, yorig, flags, priority; int xorig, yorig, flags, priority;
int scale; int scale;
int jump_speed, jump_grav; // jumping vars int jump_speed, jump_grav; // jumping vars