libretro/libretro-tyrquake
1
0
Fork 0
mirror of https://github.com/libretro/libretro-tyrquake.git synced 2024-11-23 08:00:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sky: use stdint types and trivial comment tidy up

Browse Source 
Signed-off-by: Kevin Shanahan <kmshanah@disenchant.net>
This commit is contained in:
Kevin Shanahan 2013-05-17 20:10:46 +09:30
parent 8fa770b1f2
commit 2c17b77b27
1 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
common/r_sky.c
View File

@ -17,7 +17,8 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
// r_sky.c
#include <stdint.h>
#include "quakedef.h" #include "quakedef.h"
#include "r_local.h" #include "r_local.h"
@ -33,19 +34,16 @@ float skytime;
byte *r_skysource; byte *r_skysource;
int r_skymade; int r_skymade;
int r_skydirect; // not used? int r_skydirect;
// TODO: clean up these routines
byte bottomsky[128 * 131]; byte bottomsky[128 * 131];
byte bottommask[128 * 131]; byte bottommask[128 * 131];
byte newsky[128 * 256]; // newsky and topsky both pack in here, 128 bytes
// of newsky on the left of each scan, 128 bytes
// of topsky on the right, because the low-level
// drawers need 256-byte scan widths
/*
* newsky and topsky both pack in here, 128 bytes of newsky on the
* left of each scan, 128 bytes of topsky on the right, because the
* low-level drawers need 256-byte scan widths
*/
byte newsky[128 * 256];
/* /*
============= =============
@ -95,7 +93,7 @@ R_MakeSky(void)
int x, y; int x, y;
int ofs, baseofs; int ofs, baseofs;
int xshift, yshift; int xshift, yshift;
unsigned *pnewsky; uint32_t *pnewsky;
static int xlast = -1, ylast = -1; static int xlast = -1, ylast = -1;
xshift = skytime * skyspeed; xshift = skytime * skyspeed;
@ -107,21 +105,21 @@ R_MakeSky(void)
xlast = xshift; xlast = xshift;
ylast = yshift; ylast = yshift;
pnewsky = (unsigned *)&newsky[0]; pnewsky = (uint32_t *)&newsky[0];
for (y = 0; y < SKYSIZE; y++) { for (y = 0; y < SKYSIZE; y++) {
baseofs = ((y + yshift) & SKYMASK) * 131; baseofs = ((y + yshift) & SKYMASK) * 131;
for (x = 0; x < SKYSIZE; x += 4) { for (x = 0; x < SKYSIZE; x += 4) {
unsigned bsky, bmask; uint32_t bsky, bmask;
ofs = baseofs + ((x + xshift) & SKYMASK); ofs = baseofs + ((x + xshift) & SKYMASK);
memcpy(&bsky, &bottomsky[ofs], sizeof(bsky)); memcpy(&bsky, &bottomsky[ofs], sizeof(bsky));
memcpy(&bmask, &bottommask[ofs], sizeof(bmask)); memcpy(&bmask, &bottommask[ofs], sizeof(bmask));
*pnewsky = (pnewsky[128 / sizeof(unsigned)] & bmask) | bsky; *pnewsky = (pnewsky[128 / sizeof(uint32_t)] & bmask) | bsky;
pnewsky++; pnewsky++;
} }
pnewsky += 128 / sizeof(unsigned); pnewsky += 128 / sizeof(uint32_t);
} }
r_skymade = 1; r_skymade = 1;
@ -139,29 +137,29 @@ R_GenSkyTile(void *pdest)
int x, y; int x, y;
int ofs, baseofs; int ofs, baseofs;
int xshift, yshift; int xshift, yshift;
unsigned *pnewsky; uint32_t *pnewsky;
unsigned *pd; uint32_t *pd;
xshift = skytime * skyspeed; xshift = skytime * skyspeed;
yshift = skytime * skyspeed; yshift = skytime * skyspeed;
pnewsky = (unsigned *)&newsky[0]; pnewsky = (uint32_t *)&newsky[0];
pd = (unsigned *)pdest; pd = (uint32_t *)pdest;
for (y = 0; y < SKYSIZE; y++) { for (y = 0; y < SKYSIZE; y++) {
baseofs = ((y + yshift) & SKYMASK) * 131; baseofs = ((y + yshift) & SKYMASK) * 131;
for (x = 0; x < SKYSIZE; x += 4) { for (x = 0; x < SKYSIZE; x += 4) {
unsigned bsky, bmask; uint32_t bsky, bmask;
ofs = baseofs + ((x + xshift) & SKYMASK); ofs = baseofs + ((x + xshift) & SKYMASK);
memcpy(&bsky, &bottomsky[ofs], sizeof(bsky)); memcpy(&bsky, &bottomsky[ofs], sizeof(bsky));
memcpy(&bmask, &bottommask[ofs], sizeof(bmask)); memcpy(&bmask, &bottommask[ofs], sizeof(bmask));
*pd = (pnewsky[128 / sizeof(unsigned)] & bmask) | bsky; *pd = (pnewsky[128 / sizeof(uint32_t)] & bmask) | bsky;
pnewsky++; pnewsky++;
pd++; pd++;
} }
pnewsky += 128 / sizeof(unsigned); pnewsky += 128 / sizeof(uint32_t);
} }
} }
@ -178,19 +176,17 @@ R_GenSkyTile16(void *pdest)
int ofs, baseofs; int ofs, baseofs;
int xshift, yshift; int xshift, yshift;
byte *pnewsky; byte *pnewsky;
unsigned short *pd; uint16_t *pd;
xshift = skytime * skyspeed; xshift = skytime * skyspeed;
yshift = skytime * skyspeed; yshift = skytime * skyspeed;
pnewsky = (byte *)&newsky[0]; pnewsky = (byte *)&newsky[0];
pd = (unsigned short *)pdest; pd = (uint16_t *)pdest;
for (y = 0; y < SKYSIZE; y++) { for (y = 0; y < SKYSIZE; y++) {
baseofs = ((y + yshift) & SKYMASK) * 131; baseofs = ((y + yshift) & SKYMASK) * 131;
// FIXME: clean this up
// FIXME: do faster unaligned version?
for (x = 0; x < SKYSIZE; x++) { for (x = 0; x < SKYSIZE; x++) {
ofs = baseofs + ((x + xshift) & SKYMASK); ofs = baseofs + ((x + xshift) & SKYMASK);