X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_shared.h;h=43dec612066ff2ef13a7757fe05c9c36dc93b582;hp=779da1f64bb18a9c8fcefd7429dc360b8c9b0ca3;hb=697da87440cb50b17feea1c256b48c73434bcb89;hpb=0e6ee75ea28c1f0f9027b698779d945c71e65213 diff --git a/model_shared.h b/model_shared.h index 779da1f6..43dec612 100644 --- a/model_shared.h +++ b/model_shared.h @@ -73,6 +73,30 @@ typedef struct overridetagnameset_s } overridetagnameset_t; +// LordHavoc: replaces glpoly, triangle mesh +typedef struct surfmesh_s +{ + int num_vertices; // number of vertices in the mesh + int num_triangles; // number of triangles in the mesh + float *data_vertex3f; // float[verts*3] vertex locations + float *data_svector3f; // float[verts*3] direction of 'S' (right) texture axis for each vertex + float *data_tvector3f; // float[verts*3] direction of 'T' (down) texture axis for each vertex + float *data_normal3f; // float[verts*3] direction of 'R' (out) texture axis for each vertex + int *data_lightmapoffsets; // index into surface's lightmap samples for vertex lighting + float *data_texcoordtexture2f; // float[verts*2] texcoords for surface texture + float *data_texcoordlightmap2f; // float[verts*2] texcoords for lightmap texture + float *data_texcoorddetail2f; // float[verts*2] texcoords for detail texture + float *data_lightmapcolor4f; + int *data_element3i; // int[tris*3] triangles of the mesh, 3 indices into vertex arrays for each + int *data_neighbor3i; // int[tris*3] neighboring triangle on each edge (-1 if none) + + int num_collisionvertices; + int num_collisiontriangles; + float *data_collisionvertex3f; + int *data_collisionelement3i; +} +surfmesh_t; + #define SHADOWMESHVERTEXHASH 1024 typedef struct shadowmeshvertexhash_s { @@ -154,6 +178,8 @@ typedef struct model_brush_s // number of submodels in this map (just used by server to know how many // submodels to load) int numsubmodels; + // pointers to each of the submodels if .isworldmodel is true + struct model_s **submodels; // pvs int num_pvsclusters; @@ -163,7 +189,7 @@ typedef struct model_brush_s //pvschain = model->brush.data_pvsclusters + mycluster * model->brush.num_pvsclusterbytes; //if (pvschain[thatcluster >> 3] & (1 << (thatcluster & 7))) - // a mesh containing all shadow casting geometry for the whole model (including submodels), portions of this are referenced by each surface's num_firstshadowmeshtriangle + // a mesh containing all shadow casting geometry for the whole model (including submodels), portions of this are referenced by each surface's num_firstshadowmeshtriangle shadowmesh_t *shadowmesh; // common functions @@ -179,6 +205,9 @@ 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; @@ -212,10 +241,7 @@ typedef struct model_brushq1_s int numsurfaces; msurface_t *surfaces; - int *surfacevisframes; - int *surfacepvsframes; msurface_t *surfacepvsnext; - surfmesh_t *entiremesh; int numsurfedges; int *surfedges; @@ -246,19 +272,6 @@ typedef struct model_brushq1_s int numlights; mlight_t *lights; - // pvs visibility marking - mleaf_t *pvsviewleaf; - int pvsviewleafnovis; - int pvsframecount; - mleaf_t *pvsleafchain; - int *pvssurflist; - int pvssurflistlength; - // these get rebuilt as the player moves around if this is the world, - // otherwise they are left alone (no pvs for bmodels) - msurface_t ***pvstexturechains; - msurface_t **pvstexturechainsbuffer; - int *pvstexturechainslength; - // lightmap update chains for light styles int light_styles; qbyte *light_style; @@ -267,7 +280,6 @@ typedef struct model_brushq1_s msurface_t **light_styleupdatechainsbuffer; mleaf_t *(*PointInLeaf)(struct model_s *model, const float *p); - void (*BuildPVSTextureChains)(struct model_s *model); } model_brushq1_t; @@ -326,17 +338,33 @@ model_brushq2_t; #define Q3SURFACEPARM_STRUCTURAL 8388608 #define Q3SURFACEPARM_TRANS 16777216 #define Q3SURFACEPARM_WATER 33554432 - +#define Q3SURFACEPARM_POINTLIGHT 67108864 + +// 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; @@ -347,7 +375,8 @@ typedef struct q3mnode_s struct q3mnode_s *parent; vec3_t mins; vec3_t maxs; - // this part unique to nodes + + // this part unique to node struct q3mnode_s *children[2]; } q3mnode_t; @@ -359,11 +388,13 @@ typedef struct q3mleaf_s struct q3mnode_s *parent; vec3_t mins; vec3_t maxs; - // this part unique to leafs - int clusterindex; + + // this part unique to leaf + int clusterindex; // -1 is not in pvs, >= 0 is pvs bit number int areaindex; int numleaffaces; - struct q3mface_s **firstleafface; + struct q3msurface_s **firstleafface; + int *firstleaffacenum; int numleafbrushes; struct q3mbrush_s **firstleafbrush; } @@ -374,7 +405,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; } @@ -404,50 +435,26 @@ typedef struct q3meffect_s } q3meffect_t; -typedef struct q3mface_s +typedef struct q3msurface_s { + // FIXME: collisionmarkframe 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; // bounding box for culling float mins[3]; float maxs[3]; - int num_vertices; - int num_triangles; - float *data_vertex3f; - float *data_texcoordtexture2f; - float *data_texcoordlightmap2f; - float *data_svector3f; - float *data_tvector3f; - float *data_normal3f; - float *data_color4f; - int *data_element3i; - int *data_neighbor3i; - - int num_collisionvertices; - int num_collisiontriangles; - float *data_collisionvertex3f; - int *data_collisionelement3i; + surfmesh_t mesh; // index into model->brush.shadowmesh int num_firstshadowmeshtriangle; - + // used for shadow volume generation int shadowmark; - - // temporary use by light processing - int lighttemp_castshadow; } q3msurface_t; @@ -459,6 +466,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; @@ -474,6 +483,7 @@ typedef struct model_brushq3_s int num_leaffaces; q3msurface_t **data_leaffaces; + int *data_leaffacenums; int num_models; q3mmodel_t *data_models; @@ -531,8 +541,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) @@ -549,8 +559,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 @@ -576,6 +584,11 @@ typedef struct model_s int nummodelsurfaces; // list of surface numbers in this (sub)model int *surfacelist; + // surface meshes are merged to a smaller set of meshes to allow reduced + // vertex array switching, the meshes are limited to 65536 vertices each + // to play nice with Geforce1 hardware + int nummeshes; + surfmesh_t **meshlist; // draw the model's sky polygons (only used by brush models) void(*DrawSky)(struct entity_render_s *ent); // draw the model using lightmap/dlight shading @@ -585,7 +598,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 @@ -628,7 +641,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); @@ -641,8 +653,11 @@ 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); +surfmesh_t *Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, int numcollisionvertices, int numcollisiontriangles, qboolean detailtexcoords, qboolean lightmapoffsets, qboolean vertexcolors); + 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); shadowmesh_t *Mod_ShadowMesh_ReAlloc(mempool_t *mempool, shadowmesh_t *oldmesh, int light, int neighbors); int Mod_ShadowMesh_AddVertex(shadowmesh_t *mesh, float *vertex14f); @@ -681,6 +696,7 @@ 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_SHARED_H