X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=bspfile.h;h=fa4178b02b3e9dd95650ffab48834c3e2ccf7dcd;hp=acae753f8a186c811d6456f322329b2376a5c165;hb=7654bd9684b667c0e755205846fbd62948bd1098;hpb=f1ad1e170799ce0b162b1738628006516a36d902 diff --git a/bspfile.h b/bspfile.h index acae753f..fa4178b0 100644 --- a/bspfile.h +++ b/bspfile.h @@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define MAX_MAP_HULLS 4 +#define MAX_MAP_HULLS 16 // was 4 #define MAX_MAP_LEAFS 65536 // was 8192 // key / value pair sizes @@ -31,9 +31,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define BSPVERSION 29 -#define TOOLVERSION 2 +#define MCBSPVERSION 2 -typedef struct +typedef struct lump_s { int fileofs, filelen; } lump_t; @@ -55,7 +55,15 @@ typedef struct #define LUMP_MODELS 14 #define HEADER_LUMPS 15 -typedef struct +typedef struct hullinfo_s +{ + int numhulls; + int filehulls; + float hullsizes[MAX_MAP_HULLS][2][3]; +} hullinfo_t; + +// WARNING: this struct does NOT match q1bsp's disk format because MAX_MAP_HULLS has been changed by Sajt's MCBSP code, this struct is only being used in memory as a result +typedef struct dmodel_s { float mins[3], maxs[3]; float origin[3]; @@ -64,13 +72,13 @@ typedef struct int firstface, numfaces; } dmodel_t; -typedef struct +typedef struct dheader_s { int version; lump_t lumps[HEADER_LUMPS]; } dheader_t; -typedef struct +typedef struct dmiptexlump_s { int nummiptex; int dataofs[4]; // [nummiptex] @@ -85,7 +93,7 @@ typedef struct miptex_s } miptex_t; -typedef struct +typedef struct dvertex_s { float point[3]; } dvertex_t; @@ -101,7 +109,7 @@ typedef struct #define PLANE_ANYY 4 #define PLANE_ANYZ 5 -typedef struct +typedef struct dplane_s { float normal[3]; float dist; @@ -109,28 +117,109 @@ typedef struct } dplane_t; +// contents values in Q1 maps +#define CONTENTS_EMPTY -1 +#define CONTENTS_SOLID -2 +#define CONTENTS_WATER -3 +#define CONTENTS_SLIME -4 +#define CONTENTS_LAVA -5 +#define CONTENTS_SKY -6 +// these were #ifdef QUAKE2 in the quake source +#define CONTENTS_ORIGIN -7 // removed at csg time +#define CONTENTS_CLIP -8 // changed to contents_solid +#define CONTENTS_CURRENT_0 -9 +#define CONTENTS_CURRENT_90 -10 +#define CONTENTS_CURRENT_180 -11 +#define CONTENTS_CURRENT_270 -12 +#define CONTENTS_CURRENT_UP -13 +#define CONTENTS_CURRENT_DOWN -14 + +//contents flags in Q2 maps +#define CONTENTSQ2_SOLID 0x00000001 // an eye is never valid in a solid +#define CONTENTSQ2_WINDOW 0x00000002 // translucent, but not watery +#define CONTENTSQ2_AUX 0x00000004 +#define CONTENTSQ2_LAVA 0x00000008 +#define CONTENTSQ2_SLIME 0x00000010 +#define CONTENTSQ2_WATER 0x00000020 +#define CONTENTSQ2_MIST 0x00000040 +#define CONTENTSQ2_AREAPORTAL 0x00008000 +#define CONTENTSQ2_PLAYERCLIP 0x00010000 +#define CONTENTSQ2_MONSTERCLIP 0x00020000 +#define CONTENTSQ2_CURRENT_0 0x00040000 +#define CONTENTSQ2_CURRENT_90 0x00080000 +#define CONTENTSQ2_CURRENT_180 0x00100000 +#define CONTENTSQ2_CURRENT_270 0x00200000 +#define CONTENTSQ2_CURRENT_UP 0x00400000 +#define CONTENTSQ2_CURRENT_DOWN 0x00800000 +#define CONTENTSQ2_ORIGIN 0x01000000 // removed before bsping an entity +#define CONTENTSQ2_MONSTER 0x02000000 // should never be on a brush, only in game +#define CONTENTSQ2_DEADMONSTER 0x04000000 +#define CONTENTSQ2_DETAIL 0x08000000 // brushes to be added after vis leafs +#define CONTENTSQ2_TRANSLUCENT 0x10000000 // auto set if any surface has trans +#define CONTENTSQ2_LADDER 0x20000000 + +//contents flags in Q3 maps +#define CONTENTSQ3_SOLID 0x00000001 // solid (opaque and transparent) +#define CONTENTSQ3_LAVA 0x00000008 // lava +#define CONTENTSQ3_SLIME 0x00000010 // slime +#define CONTENTSQ3_WATER 0x00000020 // water +#define CONTENTSQ3_FOG 0x00000040 // unused? +#define CONTENTSQ3_AREAPORTAL 0x00008000 // areaportal (separates areas) +#define CONTENTSQ3_PLAYERCLIP 0x00010000 // block players +#define CONTENTSQ3_MONSTERCLIP 0x00020000 // block monsters +#define CONTENTSQ3_TELEPORTER 0x00040000 // hint for Q3's bots +#define CONTENTSQ3_JUMPPAD 0x00080000 // hint for Q3's bots +#define CONTENTSQ3_CLUSTERPORTAL 0x00100000 // hint for Q3's bots +#define CONTENTSQ3_DONOTENTER 0x00200000 // hint for Q3's bots +#define CONTENTSQ3_ORIGIN 0x01000000 // used by origin brushes to indicate origin of bmodel (removed by map compiler) +#define CONTENTSQ3_BODY 0x02000000 // used by bbox entities (should never be on a brush) +#define CONTENTSQ3_CORPSE 0x04000000 // used by dead bodies (SOLID_CORPSE in darkplaces) +#define CONTENTSQ3_DETAIL 0x08000000 // brushes that do not split the bsp tree (decorations) +#define CONTENTSQ3_STRUCTURAL 0x10000000 // brushes that split the bsp tree +#define CONTENTSQ3_TRANSLUCENT 0x20000000 // leaves surfaces that are inside for rendering +#define CONTENTSQ3_TRIGGER 0x40000000 // used by trigger entities +#define CONTENTSQ3_NODROP 0x80000000 // remove items that fall into this brush + +#define SUPERCONTENTS_SOLID 0x00000001 +#define SUPERCONTENTS_WATER 0x00000002 +#define SUPERCONTENTS_SLIME 0x00000004 +#define SUPERCONTENTS_LAVA 0x00000008 +#define SUPERCONTENTS_SKY 0x00000010 +#define SUPERCONTENTS_BODY 0x00000020 +#define SUPERCONTENTS_CORPSE 0x00000040 +#define SUPERCONTENTS_NODROP 0x00000080 +#define SUPERCONTENTS_PLAYERCLIP 0x00000100 +#define SUPERCONTENTS_MONSTERCLIP 0x00000200 +#define SUPERCONTENTS_DONOTENTER 0x00000400 +#define SUPERCONTENTS_LIQUIDSMASK (SUPERCONTENTS_LAVA | SUPERCONTENTS_SLIME | SUPERCONTENTS_WATER) -#define CONTENTS_EMPTY -1 -#define CONTENTS_SOLID -2 -#define CONTENTS_WATER -3 -#define CONTENTS_SLIME -4 -#define CONTENTS_LAVA -5 -#define CONTENTS_SKY -6 -#define CONTENTS_ORIGIN -7 // removed at csg time -#define CONTENTS_CLIP -8 // changed to contents_solid - -// LordHavoc: Q2 water /* -#define CONTENTS_CURRENT_0 -9 -#define CONTENTS_CURRENT_90 -10 -#define CONTENTS_CURRENT_180 -11 -#define CONTENTS_CURRENT_270 -12 -#define CONTENTS_CURRENT_UP -13 -#define CONTENTS_CURRENT_DOWN -14 +#define SUPERCONTENTS_DEADMONSTER 0x00000000 +#define SUPERCONTENTS_CURRENT_0 0x00000000 +#define SUPERCONTENTS_CURRENT_90 0x00000000 +#define SUPERCONTENTS_CURRENT_180 0x00000000 +#define SUPERCONTENTS_CURRENT_270 0x00000000 +#define SUPERCONTENTS_CURRENT_DOWN 0x00000000 +#define SUPERCONTENTS_CURRENT_UP 0x00000000 +#define SUPERCONTENTS_AREAPORTAL 0x00000000 +#define SUPERCONTENTS_AUX 0x00000000 +#define SUPERCONTENTS_CLUSTERPORTAL 0x00000000 +#define SUPERCONTENTS_DETAIL 0x00000000 +#define SUPERCONTENTS_STRUCTURAL 0x00000000 +#define SUPERCONTENTS_DONOTENTER 0x00000000 +#define SUPERCONTENTS_JUMPPAD 0x00000000 +#define SUPERCONTENTS_LADDER 0x00000000 +#define SUPERCONTENTS_MONSTER 0x00000000 +#define SUPERCONTENTS_MONSTERCLIP 0x00000000 +#define SUPERCONTENTS_PLAYERCLIP 0x00000000 +#define SUPERCONTENTS_TELEPORTER 0x00000000 +#define SUPERCONTENTS_TRANSLUCENT 0x00000000 +#define SUPERCONTENTS_TRIGGER 0x00000000 +#define SUPERCONTENTS_WINDOW 0x00000000 */ -typedef struct +typedef struct dnode_s { int planenum; short children[2]; // negative numbers are -(leafs+1), not nodes @@ -140,14 +229,14 @@ typedef struct unsigned short numfaces; // counting both sides } dnode_t; -typedef struct +typedef struct dclipnode_s { int planenum; short children[2]; // negative numbers are contents } dclipnode_t; -typedef struct +typedef struct texinfo_s { float vecs[2][4]; // [s/t][xyz offset] int miptex; @@ -157,13 +246,13 @@ typedef struct // note that edge 0 is never used, because negative edge nums are used for // counterclockwise use of the edge in a face -typedef struct +typedef struct dedge_s { unsigned short v[2]; // vertex numbers } dedge_t; #define MAXLIGHTMAPS 4 -typedef struct +typedef struct dface_s { // LordHavoc: changed from short to unsigned short for q2 support unsigned short planenum; @@ -174,7 +263,7 @@ typedef struct short texinfo; // lighting info - qbyte styles[MAXLIGHTMAPS]; + unsigned char styles[MAXLIGHTMAPS]; int lightofs; // start of [numstyles*surfsize] samples } dface_t; @@ -189,7 +278,7 @@ typedef struct // leaf 0 is the generic CONTENTS_SOLID leaf, used for all solid areas // all other leafs need visibility info -typedef struct +typedef struct dleaf_s { int contents; int visofs; // -1 = no visibility info @@ -200,6 +289,6 @@ typedef struct unsigned short firstmarksurface; unsigned short nummarksurfaces; - qbyte ambient_level[NUM_AMBIENTS]; + unsigned char ambient_level[NUM_AMBIENTS]; } dleaf_t;