X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=c7472b1165a115fa6eb94afbf463df8e33aa977b;hb=5e20bfd1146312b43ea9cad50e4cc47c3900c3f7;hp=3d91791b1c69ffd1582154dd47543383656c3bf5;hpb=bc89be2fc84ac06c2c8c378c3936b8d982dc76ec;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.h b/model_shared.h index 3d91791b..c7472b11 100644 --- a/model_shared.h +++ b/model_shared.h @@ -18,13 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __MODEL__ -#define __MODEL__ +#ifndef MODEL_SHARED_H +#define MODEL_SHARED_H -#ifndef SYNCTYPE_T -#define SYNCTYPE_T typedef enum {ST_SYNC=0, ST_RAND } synctype_t; -#endif /* @@ -33,7 +30,7 @@ m*_t structures are in-memory */ -typedef enum {mod_invalid, mod_brush, mod_sprite, mod_alias, mod_brushq2, mod_brushq3} modtype_t; +typedef enum {mod_invalid, mod_brushq1, mod_sprite, mod_alias, mod_brushq2, mod_brushq3} modtype_t; typedef struct animscene_s { @@ -120,31 +117,22 @@ shadowmesh_t; typedef struct model_alias_s { - // LordHavoc: Q2/ZYM model support - int aliastype; + // mdl/md2/md3/zym model formats are treated the same after loading - // mdl/md2/md3 models are the same after loading + // the shader meshes comprising this model int aliasnum_meshes; aliasmesh_t *aliasdata_meshes; + // for md3 models int aliasnum_tags; int aliasnum_tagframes; aliastag_t *aliasdata_tags; - // for Zymotic models - int zymnum_verts; - int zymnum_tris; - int zymnum_shaders; - int zymnum_bones; - int zymnum_scenes; - float *zymdata_texcoords; - rtexture_t **zymdata_textures; - qbyte *zymdata_trizone; - zymbone_t *zymdata_bones; - unsigned int *zymdata_vertbonecounts; - zymvertex_t *zymdata_verts; - unsigned int *zymdata_renderlist; - float *zymdata_poses; + // for skeletal models + int aliasnum_bones; + aliasbone_t *aliasdata_bones; + int aliasnum_poses; + float *aliasdata_poses; } model_alias_t; @@ -191,13 +179,14 @@ typedef struct model_brush_s void (*RoundUpToHullSize)(struct model_s *cmodel, const vec3_t inmins, const vec3_t inmaxs, vec3_t outmins, vec3_t outmaxs); char skybox[64]; + + rtexture_t *solidskytexture; + rtexture_t *alphaskytexture; } model_brush_t; typedef struct model_brushq1_s { - int firstmodelsurface, nummodelsurfaces; - // lightmap format, set to r_lightmaprgba when model is loaded int lightmaprgba; @@ -279,7 +268,6 @@ typedef struct model_brushq1_s int *light_stylevalue; msurface_t ***light_styleupdatechains; msurface_t **light_styleupdatechainsbuffer; - float light_ambient; mleaf_t *(*PointInLeaf)(struct model_s *model, const float *p); void (*BuildPVSTextureChains)(struct model_s *model); @@ -342,16 +330,32 @@ model_brushq2_t; #define Q3SURFACEPARM_TRANS 16777216 #define Q3SURFACEPARM_WATER 33554432 +// various flags from shaders +#define Q3TEXTUREFLAG_TWOSIDED 1 +#define Q3TEXTUREFLAG_ADDITIVE 2 +#define Q3TEXTUREFLAG_NOMIPMAPS 4 +#define Q3TEXTUREFLAG_NOPICMIP 8 +#define Q3TEXTUREFLAG_AUTOSPRITE 16 +#define Q3TEXTUREFLAG_AUTOSPRITE2 32 +#define Q3TEXTUREFLAG_ALPHATEST 64 + +struct q3msurface_s; typedef struct q3mtexture_s { char name[Q3PATHLENGTH]; + char firstpasstexturename[Q3PATHLENGTH]; int surfaceflags; int nativecontents; int supercontents; int surfaceparms; + int textureflags; int number; skinframe_t skin; + + int numfaces; + struct q3msurface_s **facelist; + int *facenumlist; } q3mtexture_t; @@ -378,7 +382,8 @@ typedef struct q3mleaf_s int clusterindex; int areaindex; int numleaffaces; - struct q3mface_s **firstleafface; + struct q3msurface_s **firstleafface; + int *firstleaffacenum; int numleafbrushes; struct q3mbrush_s **firstleafbrush; } @@ -389,7 +394,7 @@ typedef struct q3mmodel_s vec3_t mins; vec3_t maxs; int numfaces; - struct q3mface_s *firstface; + struct q3msurface_s *firstface; int numbrushes; struct q3mbrush_s *firstbrush; } @@ -419,21 +424,17 @@ typedef struct q3meffect_s } q3meffect_t; -typedef struct q3mface_s +typedef struct q3msurface_s { + // FIXME: collisionmarkframe should be kept in a separate array + // FIXME: visframe should be kept in a separate array + // FIXME: shadowmark should be kept in a separate array + struct q3mtexture_s *texture; struct q3meffect_s *effect; rtexture_t *lightmaptexture; - int collisions; // performs per triangle collisions on this surface int collisionmarkframe; // don't collide twice in one trace - int type; - int firstvertex; - int firstelement; - int patchsize[2]; - // used for processing - int markframe; - // (world only) visframe == r_framecount means it is visible this frame - int visframe; + int visframe; // visframe == r_framecount means it is visible this frame // bounding box for culling float mins[3]; float maxs[3]; @@ -457,14 +458,11 @@ typedef struct q3mface_s // index into model->brush.shadowmesh int num_firstshadowmeshtriangle; - + // used for shadow volume generation int shadowmark; - - // temporary use by light processing - int lighttemp_castshadow; } -q3mface_t; +q3msurface_t; typedef struct model_brushq3_s { @@ -474,6 +472,8 @@ typedef struct model_brushq3_s int num_textures; q3mtexture_t *data_textures; + q3msurface_t **data_texturefaces; + int *data_texturefacenums; int num_planes; mplane_t *data_planes; @@ -488,7 +488,8 @@ typedef struct model_brushq3_s q3mbrush_t **data_leafbrushes; int num_leaffaces; - q3mface_t **data_leaffaces; + q3msurface_t **data_leaffaces; + int *data_leaffacenums; int num_models; q3mmodel_t *data_models; @@ -518,7 +519,7 @@ typedef struct model_brushq3_s q3meffect_t *data_effects; int num_faces; - q3mface_t *data_faces; + q3msurface_t *data_faces; // lightmap textures int num_lightmaps; @@ -546,8 +547,8 @@ typedef struct model_s { // name and path of model, for example "progs/player.mdl" char name[MAX_QPATH]; - // model needs to be loaded if this is true - qboolean needload; + // model needs to be loaded if this is false + qboolean loaded; // set if the model is used in current map, models which are not, are purged qboolean used; // true if this is the world model (I.E. defines what sky to use, and may contain submodels) @@ -564,8 +565,6 @@ typedef struct model_s int flags; // engine calculated flags, ones that can not be set in the file int flags2; - // LordHavoc: if true (normally only for sprites) the model/sprite/bmodel is always rendered fullbright - int fullbright; // number of QC accessible frame(group)s in the model int numframes; // number of QC accessible skin(group)s in the model @@ -586,8 +585,9 @@ typedef struct model_s animscene_t *skinscenes; // [numskins] // skin animation info animscene_t *animscenes; // [numframes] - // how many surfaces this (sub)model has - int numsurfaces; + // range of surface numbers in this (sub)model + int firstmodelsurface; + int nummodelsurfaces; // list of surface numbers in this (sub)model int *surfacelist; // draw the model's sky polygons (only used by brush models) @@ -599,7 +599,7 @@ typedef struct model_s // draw a shadow volume for the model based on light source void(*DrawShadowVolume)(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist); // draw the lighting on a model (through stencil) - void(*DrawLight)(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, int numsurfaces, const int *surfacelist); + void(*DrawLight)(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativeeyeorigin, float lightradius, float *lightcolor, const matrix4x4_t *matrix_modeltolight, const matrix4x4_t *matrix_modeltoattenuationxyz, const matrix4x4_t *matrix_modeltoattenuationz, rtexture_t *lightcubemap, vec_t ambientscale, vec_t diffusescale, vec_t specularscale, int numsurfaces, const int *surfacelist); // trace a box against this model void (*TraceBox)(struct model_s *model, int frame, struct trace_s *trace, const vec3_t boxstartmins, const vec3_t boxstartmaxs, const vec3_t boxendmins, const vec3_t boxendmaxs, int hitsupercontentsmask); // fields belonging to each type of model @@ -642,7 +642,6 @@ void Mod_CheckLoaded (model_t *mod); void Mod_ClearAll (void); model_t *Mod_FindName (const char *name); model_t *Mod_ForName (const char *name, qboolean crash, qboolean checkdisk, qboolean isworldmodel); -void Mod_TouchModel (const char *name); void Mod_UnloadModel (model_t *mod); void Mod_ClearUsed(void); @@ -652,8 +651,10 @@ void Mod_LoadModels(void); extern model_t *loadmodel; extern char loadname[32]; // for hunk tags +int Mod_BuildVertexRemapTableFromElements(int numelements, const int *elements, int numvertices, int *remapvertices); void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtriangles); void Mod_ValidateElements(const int *elements, int numtriangles, int numverts, const char *filename, int fileline); +void Mod_BuildNormals(int numverts, int numtriangles, const float *vertex3f, const int *elements, float *normal3f); void Mod_BuildTextureVectorsAndNormals(int numverts, int numtriangles, const float *vertex, const float *texcoord, const int *elements, float *svectors, float *tvectors, float *normals); shadowmesh_t *Mod_ShadowMesh_Alloc(mempool_t *mempool, int maxverts, int maxtriangles, rtexture_t *map_diffuse, rtexture_t *map_specular, rtexture_t *map_normal, int light, int neighbors, int expandable); @@ -694,7 +695,8 @@ skinfile_t *Mod_LoadSkinFiles(void); void Mod_FreeSkinFiles(skinfile_t *skinfile); int Mod_CountSkinFiles(skinfile_t *skinfile); +void Mod_SnapVertices(int numcomponents, int numvertices, float *vertices, float snap); int Mod_RemoveDegenerateTriangles(int numtriangles, const int *inelement3i, int *outelement3i, const float *vertex3f); -#endif // __MODEL__ +#endif // MODEL_SHARED_H