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

Map-int VX: rearrange members so that ceiling* and floor* are contiguous.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@3731 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-05-06 19:43:28 +00:00
parent 5b672a19e3
commit 258e28bafb
2 changed files with 73 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -374,30 +374,54 @@ typedef struct
typedef struct
{
Tracker(Sector, int16_t) wallptr, wallnum;
Tracker(Sector, int32_t) ceilingz, floorz;
Tracker(Sector, uint16_t) ceilingstat, floorstat;
Tracker(Sector, int16_t) ceilingpicnum, ceilingheinum, ceilingbunch;
Tracker(Sector, uint16_t) ceilingstat;
Tracker(Sector, int32_t) ceilingz;
Tracker(Sector, int8_t) ceilingshade;
Tracker(Sector, uint8_t) ceilingpal, /*CM_FLOORZ:*/ ceilingxpanning, ceilingypanning;
Tracker(Sector, int16_t) floorpicnum, floorheinum, floorbunch;
Tracker(Sector, uint16_t) floorstat;
Tracker(Sector, int32_t) floorz;
Tracker(Sector, int8_t) floorshade;
Tracker(Sector, uint8_t) floorpal, floorxpanning, floorypanning;
Tracker(Sector, uint8_t) /*CM_CEILINGZ:*/ visibility, filler;
Tracker(Sector, uint16_t) lotag, hitag;
Tracker(Sector, int16_t) extra;
} sectortypevx;
# define SECTORVX_SZ2 offsetof(sectortypevx, floorbunch)-offsetof(sectortypevx, ceilingshade)
# define SECTORVX_SZ3 sizeof(sectortypevx)-offsetof(sectortypevx, floorshade)
# define SECTORVX_SZ1 offsetof(sectortypevx, ceilingpicnum)
# define SECTORVX_SZ4 sizeof(sectortypevx)-offsetof(sectortypevx, visibility)
static inline void copy_v7_from_vx_sector(sectortypev7 *v7sec, const sectortypevx *vxsec)
{
/* [wallptr..ceilingheinum] */
Bmemcpy(v7sec, vxsec, offsetof(sectortypevx, ceilingbunch));
/* [ceilingshade..floorheinum] */
Bmemcpy(&v7sec->ceilingshade, &vxsec->ceilingshade, SECTORVX_SZ2);
/* [floorshade..extra] */
Bmemcpy(&v7sec->floorshade, &vxsec->floorshade, SECTORVX_SZ3);
/* [wallptr..wallnum] */
Bmemcpy(v7sec, vxsec, SECTORVX_SZ1);
/* ceiling* */
v7sec->ceilingpicnum = vxsec->ceilingpicnum;
v7sec->ceilingheinum = vxsec->ceilingheinum;
v7sec->ceilingstat = vxsec->ceilingstat;
v7sec->ceilingz = vxsec->ceilingz;
v7sec->ceilingshade = vxsec->ceilingshade;
v7sec->ceilingpal = vxsec->ceilingpal;
v7sec->ceilingxpanning = vxsec->ceilingxpanning;
v7sec->ceilingypanning = vxsec->ceilingypanning;
/* floor* */
v7sec->floorpicnum = vxsec->floorpicnum;
v7sec->floorheinum = vxsec->floorheinum;
v7sec->floorstat = vxsec->floorstat;
v7sec->floorz = vxsec->floorz;
v7sec->floorshade = vxsec->floorshade;
v7sec->floorpal = vxsec->floorpal;
v7sec->floorxpanning = vxsec->floorxpanning;
v7sec->floorypanning = vxsec->floorypanning;
/* [visibility..extra] */
Bmemcpy(&v7sec->visibility, &vxsec->visibility, SECTORVX_SZ4);
/* Clear YAX_BIT of ceiling and floor. (New-map format build saves TROR
* maps as map-text.) */
@ -408,11 +432,35 @@ static inline void copy_v7_from_vx_sector(sectortypev7 *v7sec, const sectortypev
static inline void inplace_vx_from_v7_sector(sectortypevx *vxsec)
{
const sectortypev7 *v7sec = (sectortypev7 *)vxsec;
sectortypev7 bakv7sec;
/* [floorshade..extra] */
Bmemmove(&vxsec->floorshade, &v7sec->floorshade, SECTORVX_SZ3);
/* [ceilingshade..floorheinum] */
Bmemmove(&vxsec->ceilingshade, &v7sec->ceilingshade, SECTORVX_SZ2);
// Can't do this in-place since the members were rearranged.
Bmemcpy(&bakv7sec, v7sec, sizeof(sectortypev7));
/* [wallptr..wallnum] is already at the right place */
/* ceiling* */
vxsec->ceilingpicnum = bakv7sec.ceilingpicnum;
vxsec->ceilingheinum = bakv7sec.ceilingheinum;
vxsec->ceilingstat = bakv7sec.ceilingstat;
vxsec->ceilingz = bakv7sec.ceilingz;
vxsec->ceilingshade = bakv7sec.ceilingshade;
vxsec->ceilingpal = bakv7sec.ceilingpal;
vxsec->ceilingxpanning = bakv7sec.ceilingxpanning;
vxsec->ceilingypanning = bakv7sec.ceilingypanning;
/* floor* */
vxsec->floorpicnum = bakv7sec.floorpicnum;
vxsec->floorheinum = bakv7sec.floorheinum;
vxsec->floorstat = bakv7sec.floorstat;
vxsec->floorz = bakv7sec.floorz;
vxsec->floorshade = bakv7sec.floorshade;
vxsec->floorpal = bakv7sec.floorpal;
vxsec->floorxpanning = bakv7sec.floorxpanning;
vxsec->floorypanning = bakv7sec.floorypanning;
/* [visibility..extra] */
Bmemmove(&vxsec->visibility, &bakv7sec.visibility, SECTORVX_SZ4);
}
static inline void inplace_vx_tweak_sector(sectortypevx *vxsec, int32_t yaxp)
@ -440,8 +488,8 @@ static inline void inplace_vx_tweak_sector(sectortypevx *vxsec, int32_t yaxp)
vxsec->floorstat &= ~YAX_BIT__COMPAT;
}
# undef SECTORVX_SZ2
# undef SECTORVX_SZ3
# undef SECTORVX_SZ1
# undef SECTORVX_SZ4
// 36 bytes
typedef struct

12
polymer/eduke32/source/lunatic/defs_common.lua
View file

@ -119,20 +119,26 @@ bitint_new_struct_type("uint16_t", "UBit16")
local SECTOR_STRUCT = [[
struct {
const int16_t wallptr, wallnum;
int32_t ceilingz, floorz;
uint16_t ceilingstat, floorstat;
const int16_t ceilingpicnum;
int16_t ceilingheinum;
const int16_t ceilingbunch;
uint16_t ceilingstat;
int32_t ceilingz;
int8_t ceilingshade;
uint8_t ceilingpal, ceilingxpanning, ceilingypanning;
const int16_t floorpicnum;
int16_t floorheinum;
const int16_t floorbunch;
uint16_t floorstat;
int32_t floorz;
int8_t floorshade;
uint8_t floorpal, floorxpanning, floorypanning;
uint8_t visibility, filler;
int16_t lotag, hitag, extra;
int16_t lotag, hitag; // NOTE: signed for Lunatic
int16_t extra;
}]]
local SPRITE_STRUCT = [[