X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=3ca435b291b5f7e45a56922a23aaee31d56e4a58;hb=1fd37f5239fe019e4d53c3e19b6fa9ff67da12e1;hp=02d90b9fbd45c2061835de9cebebdc76e7e32446;hpb=fc5543ede6f9704cbde901604c9f4adecac4bb7e;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.h b/model_shared.h index 02d90b9f..3ca435b2 100644 --- a/model_shared.h +++ b/model_shared.h @@ -30,7 +30,7 @@ m*_t structures are in-memory */ -typedef enum modtype_e {mod_invalid, mod_brushq1, mod_sprite, mod_alias, mod_brushq2, mod_brushq3} modtype_t; +typedef enum modtype_e {mod_invalid, mod_brushq1, mod_sprite, mod_alias, mod_brushq2, mod_brushq3, mod_null} modtype_t; typedef struct animscene_s { @@ -70,25 +70,13 @@ typedef struct skinframe_s int loadsequence; // on 32bit systems this makes the struct 128 bytes long int padding; + // average texture color, if applicable + float avgcolor[4]; } skinframe_t; #define MAX_SKINS 256 -typedef struct overridetagname_s -{ - char name[MAX_QPATH]; -} -overridetagname_t; - -// a replacement set of tag names, per skin -typedef struct overridetagnameset_s -{ - int num_overridetagnames; - overridetagname_t *data_overridetagnames; -} -overridetagnameset_t; - struct md3vertex_s; struct trivertx_s; typedef struct texvecvertex_s @@ -105,9 +93,11 @@ typedef struct surfmesh_s // triangle data in system memory int num_triangles; // number of triangles in the mesh int *data_element3i; // int[tris*3] triangles of the mesh, 3 indices into vertex arrays for each + unsigned short *data_element3s; // unsigned short[tris*3] triangles of the mesh in unsigned short format (NULL if num_vertices > 65536) int *data_neighbor3i; // int[tris*3] neighboring triangle on each edge (-1 if none) // element buffer object (stores triangles in video memory) - int ebo; + int ebo3i; // unsigned int format (only allocated if num_vertices > 65536) + int ebo3s; // unsigned short format (only allocated if num_vertices <= 65536) // vertex data in system memory int num_vertices; // number of vertices in the mesh float *data_vertex3f; // float[verts*3] vertex locations @@ -170,6 +160,7 @@ typedef struct shadowmesh_s float *texcoord2f; // used always int *element3i; + unsigned short *element3s; // used for shadow mesh (NULL on light mesh) int *neighbor3i; // these are NULL after Mod_ShadowMesh_Finish is performed, only used @@ -177,7 +168,8 @@ typedef struct shadowmesh_s shadowmeshvertexhash_t **vertexhashtable, *vertexhashentries; // element buffer object (stores triangles in video memory) // (created by Mod_ShadowMesh_Finish if possible) - int ebo; + int ebo3i; + int ebo3s; // vertex buffer object (stores vertices in video memory) // (created by Mod_ShadowMesh_Finish if possible) int vbo; @@ -297,6 +289,7 @@ typedef enum q3tcmod_e Q3TCMOD_STRETCH, Q3TCMOD_TRANSFORM, Q3TCMOD_TURBULENT, + Q3TCMOD_PAGE, Q3TCMOD_COUNT } q3tcmod_t; @@ -363,6 +356,7 @@ q3shaderinfo_deform_t; typedef struct q3shaderinfo_s { char name[Q3PATHLENGTH]; +#define Q3SHADERINFO_COMPARE_START surfaceparms int surfaceparms; int textureflags; int numlayers; @@ -374,6 +368,12 @@ typedef struct q3shaderinfo_s char skyboxname[Q3PATHLENGTH]; q3shaderinfo_deform_t deforms[Q3MAXDEFORMS]; + // dp-specific additions: + + // shadow control + qboolean dpshadow; + qboolean dpnoshadow; + // reflection float reflectmin; // when refraction is used, minimum amount of reflection (when looking straight down) float reflectmax; // when refraction is used, maximum amount of reflection (when looking parallel to water) @@ -382,6 +382,7 @@ typedef struct q3shaderinfo_s float reflectfactor; // amount of reflection distort (1.0 = like the cvar specifies) vec4_t reflectcolor4f; // color tint of reflection (including alpha factor) float r_water_wateralpha; // additional wateralpha to apply when r_water is active +#define Q3SHADERINFO_COMPARE_END r_water_wateralpha } q3shaderinfo_t; @@ -457,18 +458,23 @@ typedef struct texture_s // (this is an optimization in the renderer) int animated; + // renderer checks if this texture needs updating... + int update_lastrenderframe; + void *update_lastrenderentity; // the current alpha of this texture (may be affected by r_wateralpha) float currentalpha; // the current texture frame in animation struct texture_s *currentframe; // current texture transform matrix (used for water scrolling) matrix4x4_t currenttexmatrix; + matrix4x4_t currentbackgroundtexmatrix; // various q3 shader features q3shaderinfo_layer_rgbgen_t rgbgen; q3shaderinfo_layer_alphagen_t alphagen; q3shaderinfo_layer_tcgen_t tcgen; q3shaderinfo_layer_tcmod_t tcmods[Q3MAXTCMODS]; + q3shaderinfo_layer_tcmod_t backgroundtcmods[Q3MAXTCMODS]; q3shaderinfo_deform_t deforms[Q3MAXDEFORMS]; qboolean colormapping; @@ -558,7 +564,6 @@ typedef struct msurface_s int num_firstshadowmeshtriangle; // index into model->brush.shadowmesh // lightmaptexture rebuild information not used in q3bsp - int cached_dlight; // q1bsp // forces rebuild of lightmaptexture msurface_lightmapinfo_t *lightmapinfo; // q1bsp // mesh information for collisions (only used by q3bsp curves) @@ -569,6 +574,12 @@ typedef struct msurface_s struct q3deffect_s *effect; // q3bsp // FIXME: collisionmarkframe should be kept in a separate array int collisionmarkframe; // q3bsp // don't collide twice in one trace + + // optimization... + float *data_collisionbbox6f; // collision optimization - contains combined bboxes of every data_collisionstride triangles + int num_collisionbboxstride; + float *data_bbox6f; // collision optimization - contains combined bboxes of every data_collisionstride triangles + int num_bboxstride; } msurface_t; @@ -603,14 +614,15 @@ typedef struct model_brush_s // string of entity definitions (.map format) char *entities; - // if non-zero this is a submodel + // if not NULL this is a submodel + struct model_s *parentmodel; // (this is the number of the submodel, an index into submodels) int submodel; // 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 + // pointers to each of the submodels struct model_s **submodels; int num_planes; @@ -716,6 +728,9 @@ typedef struct model_brushq1_s // lightmap update chains for light styles int num_lightstyles; model_brush_lightstyleinfo_t *data_lightstyleinfo; + + // this contains bytes that are 1 if a surface needs its lightmap rebuilt + unsigned char *lightmapupdateflags; } model_brushq1_t; @@ -765,8 +780,6 @@ typedef struct model_brushq3_s int num_lightgrid_imins[3]; int num_lightgrid_imaxs[3]; int num_lightgrid_isize[3]; - // indexing/clamping - int num_lightgrid_dimensions[3]; // transform modelspace coordinates to lightgrid index matrix4x4_t num_lightgrid_indexfromworld; @@ -777,6 +790,9 @@ typedef struct model_brushq3_s // true if the detected deluxemaps are the modelspace kind, rather than // the faster tangentspace kind qboolean deluxemapping_modelspace; + // size of lightmaps (128 by default, but may be another poweroftwo if + // external lightmaps are used (q3map2 -lightmapsize) + int lightmapsize; } model_brushq3_t; @@ -790,8 +806,6 @@ typedef struct model_s 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) - qboolean isworldmodel; // CRC of the file this model was loaded from, to reload if changed unsigned int crc; // mod_brush, mod_alias, mod_sprite @@ -825,6 +839,7 @@ typedef struct model_s // range of surface numbers in this (sub)model int firstmodelsurface; int nummodelsurfaces; + int *sortedmodelsurfaces; // range of collision brush numbers in this (sub)model int firstmodelbrush; int nummodelbrushes; @@ -866,11 +881,11 @@ typedef struct model_s // draw any enabled debugging effects on this model (such as showing triangles, normals, collision brushes...) void(*DrawDebug)(struct entity_render_s *ent); // gathers info on which clusters and surfaces are lit by light, as well as calculating a bounding box - void(*GetLightInfo)(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer, unsigned char *outshadowtrispvs, unsigned char *outlighttrispvs); + void(*GetLightInfo)(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer, unsigned char *outshadowtrispvs, unsigned char *outlighttrispvs, unsigned char *visitingleafpvs); // compile a shadow volume for the model based on light source void(*CompileShadowVolume)(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist); // draw a shadow volume for the model based on light source - void(*DrawShadowVolume)(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs); + void(*DrawShadowVolume)(struct entity_render_s *ent, const vec3_t relativelightorigin, const vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs); // draw the lighting on a model (through stencil) void(*DrawLight)(struct entity_render_s *ent, int numsurfaces, const int *surfacelist, const unsigned char *trispvs); // trace a box against this model @@ -885,17 +900,15 @@ typedef struct model_s model_brushq2_t brushq2; */ model_brushq3_t brushq3; - // skin files can have different tags for each skin - overridetagnameset_t *data_overridetagnamesforskin; // flags this model for offseting sounds to the model center (used by brush models) int soundfromcenter; } -model_t; +dp_model_t; //============================================================================ // model loading -extern model_t *loadmodel; +extern dp_model_t *loadmodel; extern unsigned char *mod_base; // sky/water subdivision //extern cvar_t gl_subdivide_size; @@ -904,16 +917,16 @@ extern cvar_t r_fullbrights; void Mod_Init (void); void Mod_Reload (void); -model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolean isworldmodel); -model_t *Mod_FindName (const char *name); -model_t *Mod_ForName (const char *name, qboolean crash, qboolean checkdisk, qboolean isworldmodel); -void Mod_UnloadModel (model_t *mod); +dp_model_t *Mod_LoadModel(dp_model_t *mod, qboolean crash, qboolean checkdisk); +dp_model_t *Mod_FindName (const char *name, const char *parentname); +dp_model_t *Mod_ForName (const char *name, qboolean crash, qboolean checkdisk, const char *parentname); +void Mod_UnloadModel (dp_model_t *mod); void Mod_ClearUsed(void); void Mod_PurgeUnused(void); -void Mod_RemoveStaleWorldModels(model_t *skip); // only used during loading! +void Mod_RemoveStaleWorldModels(dp_model_t *skip); // only used during loading! -extern model_t *loadmodel; +extern dp_model_t *loadmodel; extern char loadname[32]; // for hunk tags int Mod_BuildVertexRemapTableFromElements(int numelements, const int *elements, int numvertices, int *remapvertices); @@ -923,6 +936,7 @@ void Mod_BuildNormals(int firstvertex, int numvertices, int numtriangles, const void Mod_BuildTextureVectorsFromNormals(int firstvertex, int numvertices, int numtriangles, const float *vertex3f, const float *texcoord2f, const float *normal3f, const int *elements, float *svector3f, float *tvector3f, qboolean areaweighting); void Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qboolean lightmapoffsets, qboolean vertexcolors, qboolean neighbors); +void Mod_MakeSortedSurfaces(dp_model_t *mod); 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); @@ -934,6 +948,7 @@ shadowmesh_t *Mod_ShadowMesh_Finish(mempool_t *mempool, shadowmesh_t *firstmesh, void Mod_ShadowMesh_CalcBBox(shadowmesh_t *firstmesh, vec3_t mins, vec3_t maxs, vec3_t center, float *radius); void Mod_ShadowMesh_Free(shadowmesh_t *mesh); +void Mod_FreeQ3Shaders(void); void Mod_LoadQ3Shaders(void); q3shaderinfo_t *Mod_LookupQ3Shader(const char *name); qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qboolean warnmissing, qboolean fallback, int defaulttexflags); @@ -976,35 +991,37 @@ void R_Q1BSP_DrawSky(struct entity_render_s *ent); void R_Q1BSP_Draw(struct entity_render_s *ent); void R_Q1BSP_DrawDepth(struct entity_render_s *ent); void R_Q1BSP_DrawDebug(struct entity_render_s *ent); -void R_Q1BSP_GetLightInfo(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer, unsigned char *outshadowtrispvs, unsigned char *outlighttrispvs); +void R_Q1BSP_GetLightInfo(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, vec3_t outmins, vec3_t outmaxs, int *outleaflist, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *outsurfacepvs, int *outnumsurfacespointer, unsigned char *outshadowtrispvs, unsigned char *outlighttrispvs, unsigned char *visitingleafpvs); void R_Q1BSP_CompileShadowVolume(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist); -void R_Q1BSP_DrawShadowVolume(struct entity_render_s *ent, vec3_t relativelightorigin, vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs); +void R_Q1BSP_DrawShadowVolume(struct entity_render_s *ent, const vec3_t relativelightorigin, const vec3_t relativelightdirection, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs); void R_Q1BSP_DrawLight(struct entity_render_s *ent, int numsurfaces, const int *surfacelist, const unsigned char *trispvs); // alias models struct frameblend_s; void Mod_AliasInit(void); -int Mod_Alias_GetTagMatrix(const model_t *model, int poseframe, int tagindex, matrix4x4_t *outmatrix); -int Mod_Alias_GetTagIndexForName(const model_t *model, unsigned int skin, const char *tagname); +int Mod_Alias_GetTagMatrix(const dp_model_t *model, int poseframe, int tagindex, matrix4x4_t *outmatrix); +int Mod_Alias_GetTagIndexForName(const dp_model_t *model, unsigned int skin, const char *tagname); +int Mod_Alias_GetExtendedTagInfoForIndex(const dp_model_t *model, unsigned int skin, int poseframe, int tagindex, int *parentindex, const char **tagname, matrix4x4_t *tag_localmatrix); // sprite models void Mod_SpriteInit(void); // loaders -void Mod_Q1BSP_Load(model_t *mod, void *buffer, void *bufferend); -void Mod_IBSP_Load(model_t *mod, void *buffer, void *bufferend); -void Mod_MAP_Load(model_t *mod, void *buffer, void *bufferend); -void Mod_IDP0_Load(model_t *mod, void *buffer, void *bufferend); -void Mod_IDP2_Load(model_t *mod, void *buffer, void *bufferend); -void Mod_IDP3_Load(model_t *mod, void *buffer, void *bufferend); -void Mod_ZYMOTICMODEL_Load(model_t *mod, void *buffer, void *bufferend); -void Mod_DARKPLACESMODEL_Load(model_t *mod, void *buffer, void *bufferend); -void Mod_PSKMODEL_Load(model_t *mod, void *buffer, void *bufferend); -void Mod_IDSP_Load(model_t *mod, void *buffer, void *bufferend); -void Mod_IDS2_Load(model_t *mod, void *buffer, void *bufferend); +void Mod_Q1BSP_Load(dp_model_t *mod, void *buffer, void *bufferend); +void Mod_IBSP_Load(dp_model_t *mod, void *buffer, void *bufferend); +void Mod_MAP_Load(dp_model_t *mod, void *buffer, void *bufferend); +void Mod_OBJ_Load(dp_model_t *mod, void *buffer, void *bufferend); +void Mod_IDP0_Load(dp_model_t *mod, void *buffer, void *bufferend); +void Mod_IDP2_Load(dp_model_t *mod, void *buffer, void *bufferend); +void Mod_IDP3_Load(dp_model_t *mod, void *buffer, void *bufferend); +void Mod_ZYMOTICMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend); +void Mod_DARKPLACESMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend); +void Mod_PSKMODEL_Load(dp_model_t *mod, void *buffer, void *bufferend); +void Mod_IDSP_Load(dp_model_t *mod, void *buffer, void *bufferend); +void Mod_IDS2_Load(dp_model_t *mod, void *buffer, void *bufferend); // utility -qboolean Mod_CanSeeBox_Trace(int numsamples, float t, model_t *model, vec3_t eye, vec3_t minsX, vec3_t maxsX); +qboolean Mod_CanSeeBox_Trace(int numsamples, float t, dp_model_t *model, vec3_t eye, vec3_t minsX, vec3_t maxsX); #endif // MODEL_SHARED_H