From 3ba56286ac7b8c3ced10fe3da9ca6a157ac2ab00 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Wed, 9 May 2001 22:08:21 +0000 Subject: [PATCH] more missed removals --- qw/include/bspfile.h | 262 ------------------------------------------ qw/include/modelgen.h | 129 --------------------- 2 files changed, 391 deletions(-) delete mode 100644 qw/include/bspfile.h delete mode 100644 qw/include/modelgen.h diff --git a/qw/include/bspfile.h b/qw/include/bspfile.h deleted file mode 100644 index 0d6d3a9c5..000000000 --- a/qw/include/bspfile.h +++ /dev/null @@ -1,262 +0,0 @@ -/* - bspfile.h - - BSP (Binary Space Partitioning) file definitions - - Copyright (C) 1996-1997 Id Software, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to: - - Free Software Foundation, Inc. - 59 Temple Place - Suite 330 - Boston, MA 02111-1307, USA - - $Id$ -*/ -#ifndef __bspfile_h_ -#define __bspfile_h_ - -#include "QF/qtypes.h" -#include "QF/sound.h" - -// upper design bounds - -#define MAX_MAP_HULLS 4 - -#define MAX_MAP_MODELS 256 -#define MAX_MAP_BRUSHES 4096 -#define MAX_MAP_ENTITIES 1024 -#define MAX_MAP_ENTSTRING 65536 - -#define MAX_MAP_PLANES 8192 -#define MAX_MAP_NODES 32767 // because negative shorts are contents -#define MAX_MAP_CLIPNODES 32767 // -#define MAX_MAP_LEAFS 32767 // -#define MAX_MAP_VERTS 65535 -#define MAX_MAP_FACES 65535 -#define MAX_MAP_MARKSURFACES 65535 -#define MAX_MAP_TEXINFO 4096 -#define MAX_MAP_EDGES 256000 -#define MAX_MAP_SURFEDGES 512000 -#define MAX_MAP_MIPTEX 0x200000 -#define MAX_MAP_LIGHTING 0x100000 -#define MAX_MAP_VISIBILITY 0x100000 - -// key / value pair sizes - -#define MAX_KEY 32 -#define MAX_VALUE 1024 - - -//============================================================================= - - -#define BSPVERSION 29 - -typedef struct { - int fileofs; - int filelen; -} lump_t; - -#define LUMP_ENTITIES 0 -#define LUMP_PLANES 1 -#define LUMP_TEXTURES 2 -#define LUMP_VERTEXES 3 -#define LUMP_VISIBILITY 4 -#define LUMP_NODES 5 -#define LUMP_TEXINFO 6 -#define LUMP_FACES 7 -#define LUMP_LIGHTING 8 -#define LUMP_CLIPNODES 9 -#define LUMP_LEAFS 10 -#define LUMP_MARKSURFACES 11 -#define LUMP_EDGES 12 -#define LUMP_SURFEDGES 13 -#define LUMP_MODELS 14 - -#define HEADER_LUMPS 15 - -typedef struct { - float mins[3], maxs[3]; - float origin[3]; - int headnode[MAX_MAP_HULLS]; - int visleafs; // not including the solid leaf 0 - int firstface, numfaces; -} dmodel_t; - -typedef struct { - int version; - lump_t lumps[HEADER_LUMPS]; -} dheader_t; - -typedef struct { - int nummiptex; - int dataofs[4]; // [nummiptex] -} dmiptexlump_t; - -#define MIPLEVELS 4 -typedef struct miptex_s { - char name[16]; - unsigned int width, height; - unsigned int offsets[MIPLEVELS]; // four mip maps stored -} miptex_t; - - -typedef struct { - float point[3]; -} dvertex_t; - - -// 0-2 are axial planes -#define PLANE_X 0 -#define PLANE_Y 1 -#define PLANE_Z 2 - -// 3-5 are non-axial planes snapped to the nearest -#define PLANE_ANYX 3 -#define PLANE_ANYY 4 -#define PLANE_ANYZ 5 - -typedef struct { - float normal[3]; - float dist; - int type; // PLANE_X - PLANE_ANYZ ?remove? trivial to regenerate -} dplane_t; - -#define CONTENTS_EMPTY -1 -#define CONTENTS_SOLID -2 -#define CONTENTS_WATER -3 -#define CONTENTS_SLIME -4 -#define CONTENTS_LAVA -5 -#define CONTENTS_SKY -6 - -// !!! if this is changed, it must be changed in asm_i386.h too !!! -typedef struct { - int planenum; - short children[2]; // negative numbers are -(leafs+1), not nodes - short mins[3]; // for sphere culling - short maxs[3]; - unsigned short firstface; - unsigned short numfaces; // counting both sides -} dnode_t; - -typedef struct { - int planenum; - short children[2]; // negative numbers are contents -} dclipnode_t; - - -typedef struct texinfo_s { - float vecs[2][4]; // [s/t][xyz offset] - int miptex; - int flags; -} texinfo_t; -#define TEX_SPECIAL 1 // sky or slime, no lightmap or 256 subdivision - -// note that edge 0 is never used, because negative edge nums are used for -// counterclockwise use of the edge in a face -typedef struct { - unsigned short v[2]; // vertex numbers -} dedge_t; - -#define MAXLIGHTMAPS 4 -typedef struct { - short planenum; - short side; - - int firstedge; // we must support > 64k edges - short numedges; - short texinfo; - -// lighting info - byte styles[MAXLIGHTMAPS]; - int lightofs; // start of [numstyles*surfsize] samples -} dface_t; - - - -// leaf 0 is the generic CONTENTS_SOLID leaf, used for all solid areas -// all other leafs need visibility info -typedef struct { - int contents; - int visofs; // -1 = no visibility info - - short mins[3]; // for frustum culling - short maxs[3]; - - unsigned short firstmarksurface; - unsigned short nummarksurfaces; - - byte ambient_level[NUM_AMBIENTS]; -} dleaf_t; - -//============================================================================ - -#ifndef QUAKE_GAME - -// the utilities get to be lazy and just use large static arrays - -extern int nummodels; -extern dmodel_t dmodels[MAX_MAP_MODELS]; - -extern int visdatasize; -extern byte dvisdata[MAX_MAP_VISIBILITY]; - -extern int lightdatasize; -extern byte dlightdata[MAX_MAP_LIGHTING]; - -extern int texdatasize; -extern byte dtexdata[MAX_MAP_MIPTEX]; // (dmiptexlump_t) - -extern int entdatasize; -extern char dentdata[MAX_MAP_ENTSTRING]; - -extern int numleafs; -extern dleaf_t dleafs[MAX_MAP_LEAFS]; - -extern int numplanes; -extern dplane_t dplanes[MAX_MAP_PLANES]; - -extern int numvertexes; -extern dvertex_t dvertexes[MAX_MAP_VERTS]; - -extern int numnodes; -extern dnode_t dnodes[MAX_MAP_NODES]; - -extern int numtexinfo; -extern texinfo_t texinfo[MAX_MAP_TEXINFO]; - -extern int numfaces; -extern dface_t dfaces[MAX_MAP_FACES]; - -extern int numclipnodes; -extern dclipnode_t dclipnodes[MAX_MAP_CLIPNODES]; - -extern int numedges; -extern dedge_t dedges[MAX_MAP_EDGES]; - -extern int nummarksurfaces; -extern unsigned short dmarksurfaces[MAX_MAP_MARKSURFACES]; - -extern int numsurfedges; -extern int dsurfedges[MAX_MAP_SURFEDGES]; - - -void LoadBSPFile (char *filename); -void WriteBSPFile (char *filename); -void PrintBSPFileSizes (void); - -#endif -#endif // __bspfile_h_ diff --git a/qw/include/modelgen.h b/qw/include/modelgen.h deleted file mode 100644 index f17df7dec..000000000 --- a/qw/include/modelgen.h +++ /dev/null @@ -1,129 +0,0 @@ -/* - modelgen.h - - header file for model generation program - - Copyright (C) 1996-1997 Id Software, Inc. - - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to: - - Free Software Foundation, Inc. - 59 Temple Place - Suite 330 - Boston, MA 02111-1307, USA - - $Id$ -*/ - -// ********************************************************* -// * This file must be identical in the modelgen directory * -// * and in the Quake directory, because it's used to * -// * pass data from one to the other via model files. * -// ********************************************************* - -#ifndef _MODELGEN_H -#define _MODELGEN_H - -#include "QF/mathlib.h" - -#define ALIAS_VERSION 6 - -#define ALIAS_ONSEAM 0x0020 - -// must match definition in spritegn.h -#ifndef SYNCTYPE_T -#define SYNCTYPE_T -typedef enum {ST_SYNC=0, ST_RAND } synctype_t; -#endif - -typedef enum { ALIAS_SINGLE=0, ALIAS_GROUP } aliasframetype_t; - -typedef enum { ALIAS_SKIN_SINGLE=0, ALIAS_SKIN_GROUP } aliasskintype_t; - -typedef struct { - int ident; - int version; - vec3_t scale; - vec3_t scale_origin; - float boundingradius; - vec3_t eyeposition; - int numskins; - int skinwidth; - int skinheight; - int numverts; - int numtris; - int numframes; - synctype_t synctype; - int flags; - float size; -} mdl_t; - -// TODO: could be shorts - -typedef struct { - int onseam; - int s; - int t; -} stvert_t; - -typedef struct dtriangle_s { - int facesfront; - int vertindex[3]; -} dtriangle_t; - -#define DT_FACES_FRONT 0x0010 - -// This mirrors trivert_t in trilib.h, is present so Quake knows how to -// load this data - -typedef struct { - byte v[3]; - byte lightnormalindex; -} trivertx_t; - -typedef struct { - trivertx_t bboxmin; // lightnormal isn't used - trivertx_t bboxmax; // lightnormal isn't used - char name[16]; // frame name from grabbing -} daliasframe_t; - -typedef struct { - int numframes; - trivertx_t bboxmin; // lightnormal isn't used - trivertx_t bboxmax; // lightnormal isn't used -} daliasgroup_t; - -typedef struct { - int numskins; -} daliasskingroup_t; - -typedef struct { - float interval; -} daliasinterval_t; - -typedef struct { - float interval; -} daliasskininterval_t; - -typedef struct { - aliasframetype_t type; -} daliasframetype_t; - -typedef struct { - aliasskintype_t type; -} daliasskintype_t; - -#define IDPOLYHEADER (('O'<<24)+('P'<<16)+('D'<<8)+'I') - // little-endian "IDPO" -#endif // _MODELGEN_H