X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=bc539a23ad30922807d86729096743fa8e224a54;hb=123d759d4e8793229127f44661afe7c1960fae99;hp=cf771ed11ffc180d26d84913ab48c347b2b2aaa7;hpb=e3272446d9f13cc12b1822a99b4e7cf512454db9;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.h b/model_shared.h index cf771ed1..bc539a23 100644 --- a/model_shared.h +++ b/model_shared.h @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef MODEL_SHARED_H #define MODEL_SHARED_H -typedef enum {ST_SYNC=0, ST_RAND } synctype_t; +typedef enum synctype_e {ST_SYNC=0, ST_RAND } synctype_t; /* @@ -30,7 +30,7 @@ m*_t structures are in-memory */ -typedef enum {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} modtype_t; typedef struct animscene_s { @@ -51,7 +51,6 @@ typedef struct skinframe_s rtexture_t *shirt; // shirt only (in greyscale) rtexture_t *nmap; // normalmap (bumpmap for dot3) rtexture_t *gloss; // glossmap (for dot3) - rtexture_t *detail; // detail texture (silly bumps for non-dot3) rtexture_t *glow; // glow only (fullbrights) rtexture_t *fog; // alpha of the base texture (if not opaque) } @@ -96,7 +95,6 @@ typedef struct surfmesh_s float *data_normal3f; // float[verts*3] direction of 'R' (out) texture axis for each vertex 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_lightmapoffsets; // index into surface's lightmap samples for vertex lighting // morph blending, these are zero if model is skeletal or static @@ -143,6 +141,41 @@ typedef struct shadowmesh_s } shadowmesh_t; +typedef enum texturelayertype_e +{ + TEXTURELAYERTYPE_INVALID, + TEXTURELAYERTYPE_SKY, + TEXTURELAYERTYPE_LITTEXTURE_COMBINE, + TEXTURELAYERTYPE_LITTEXTURE_MULTIPASS, + TEXTURELAYERTYPE_LITTEXTURE_VERTEX, + TEXTURELAYERTYPE_TEXTURE, + TEXTURELAYERTYPE_FOG, +} +texturelayertype_t; + +typedef enum texturelayerflag_e +{ + // indicates that the pass should apply fog darkening; used on + // transparent surfaces where simply blending an alpha fog as a final + // pass would not behave properly, so all the surfaces must be darkened, + // and the fog color added as a separate pass + TEXTURELAYERFLAG_FOGDARKEN = 1, +} +texturelayerflag_t; + +typedef struct texturelayer_s +{ + texturelayertype_t type; + qboolean depthmask; + int blendfunc1; + int blendfunc2; + rtexture_t *texture; + matrix4x4_t texmatrix; + vec4_t color; + int flags; +} +texturelayer_t; + typedef struct texture_s { // q1bsp @@ -169,10 +202,16 @@ typedef struct texture_s // set if animated or there is an alternate frame set // (this is an optimization in the renderer) int animated; + + // 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 alpha of the texture - float currentalpha; + // current texture transform matrix (used for water scrolling) + matrix4x4_t currenttexmatrix; + + int currentnumlayers; + texturelayer_t currentlayers[16]; // q3bsp char name[64]; @@ -186,7 +225,7 @@ typedef struct texture_s } texture_t; -typedef struct +typedef struct mtexinfo_s { float vecs[2][4]; texture_t *texture; @@ -198,12 +237,12 @@ typedef struct msurface_lightmapinfo_s { // texture mapping properties used by this surface mtexinfo_t *texinfo; // q1bsp - // index into d_lightstylevalue array, 255 means not used (black) - qbyte styles[MAXLIGHTMAPS]; // q1bsp + // index into r_refdef.lightstylevalue array, 255 means not used (black) + unsigned char styles[MAXLIGHTMAPS]; // q1bsp // RGB lighting data [numstyles][height][width][3] - qbyte *samples; // q1bsp + unsigned char *samples; // q1bsp // stain to apply on lightmap (soot/dirt/blood/whatever) - qbyte *stainsamples; // q1bsp + unsigned char *stainsamples; // q1bsp // the stride when building lightmaps to comply with fragment update int lightmaptexturestride; // q1bsp int texturemins[2]; // q1bsp @@ -266,6 +305,8 @@ typedef struct model_brush_s { // true if this model is a HalfLife .bsp file qboolean ishlbsp; + // true if this model is a Martial Concert .bsp file + qboolean ismcbsp; // string of entity definitions (.map format) char *entities; @@ -323,22 +364,27 @@ typedef struct model_brush_s // common functions int (*SuperContentsFromNativeContents)(struct model_s *model, int nativecontents); int (*NativeContentsFromSuperContents)(struct model_s *model, int supercontents); - qbyte *(*GetPVS)(struct model_s *model, const vec3_t p); - int (*FatPVS)(struct model_s *model, const vec3_t org, vec_t radius, qbyte *pvsbuffer, int pvsbufferlength); - int (*BoxTouchingPVS)(struct model_s *model, const qbyte *pvs, const vec3_t mins, const vec3_t maxs); - int (*BoxTouchingLeafPVS)(struct model_s *model, const qbyte *pvs, const vec3_t mins, const vec3_t maxs); - int (*BoxTouchingVisibleLeafs)(struct model_s *model, const qbyte *visibleleafs, const vec3_t mins, const vec3_t maxs); + unsigned char *(*GetPVS)(struct model_s *model, const vec3_t p); + int (*FatPVS)(struct model_s *model, const vec3_t org, vec_t radius, unsigned char *pvsbuffer, int pvsbufferlength); + int (*BoxTouchingPVS)(struct model_s *model, const unsigned char *pvs, const vec3_t mins, const vec3_t maxs); + int (*BoxTouchingLeafPVS)(struct model_s *model, const unsigned char *pvs, const vec3_t mins, const vec3_t maxs); + int (*BoxTouchingVisibleLeafs)(struct model_s *model, const unsigned char *visibleleafs, const vec3_t mins, const vec3_t maxs); + int (*FindBoxClusters)(struct model_s *model, const vec3_t mins, const vec3_t maxs, int maxclusters, int *clusterlist); void (*LightPoint)(struct model_s *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal); void (*FindNonSolidLocation)(struct model_s *model, const vec3_t in, vec3_t out, vec_t radius); mleaf_t *(*PointInLeaf)(struct model_s *model, const float *p); // these are actually only found on brushq1, but NULL is handled gracefully - void (*AmbientSoundLevelsForPoint)(struct model_s *model, const vec3_t p, qbyte *out, int outsize); + void (*AmbientSoundLevelsForPoint)(struct model_s *model, const vec3_t p, unsigned char *out, int outsize); 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; + + // QuakeWorld + int qw_md4sum; + int qw_md4sum2; } model_brush_t; @@ -367,17 +413,17 @@ typedef struct model_brushq1_s hull_t hulls[MAX_MAP_HULLS]; int num_compressedpvs; - qbyte *data_compressedpvs; + unsigned char *data_compressedpvs; int num_lightdata; - qbyte *lightdata; + unsigned char *lightdata; int numlights; mlight_t *lights; // lightmap update chains for light styles int light_styles; - qbyte *light_style; + unsigned char *light_style; int *light_stylevalue; msurface_t ***light_styleupdatechains; msurface_t **light_styleupdatechainsbuffer; @@ -509,13 +555,15 @@ typedef struct model_s // draw the model using lightmap/dlight shading void(*Draw)(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, qbyte *outleafpvs, int *outnumleafspointer, int *outsurfacelist, qbyte *outsurfacepvs, int *outnumsurfacespointer); + 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); + // compile a shadow volume for the model based on light source + void(*CompileShadowVolume)(struct entity_render_s *ent, vec3_t relativelightorigin, 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, 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, float *lightcolor, int numsurfaces, const int *surfacelist); + void(*DrawLight)(struct entity_render_s *ent, 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); + void (*TraceBox)(struct model_s *model, int frame, struct trace_s *trace, const vec3_t start, const vec3_t boxmins, const vec3_t boxmaxs, const vec3_t end, int hitsupercontentsmask); // fields belonging to some types of model model_sprite_t sprite; model_brush_t brush; @@ -535,14 +583,13 @@ model_t; // model loading extern model_t *loadmodel; -extern qbyte *mod_base; +extern unsigned char *mod_base; // sky/water subdivision //extern cvar_t gl_subdivide_size; // texture fullbrights extern cvar_t r_fullbrights; void Mod_Init (void); -#define Mod_CheckLoaded(mod) (mod ? (mod->loaded ? (mod->used = true) : (Mod_LoadModel(mod, true, true, mod->isworldmodel), true)) : false) model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolean isworldmodel); void Mod_ClearAll (void); model_t *Mod_FindName (const char *name); @@ -552,7 +599,6 @@ void Mod_UnloadModel (model_t *mod); void Mod_ClearUsed(void); void Mod_PurgeUnused(void); void Mod_RemoveStaleWorldModels(model_t *skip); // only used during loading! -void Mod_LoadModels(void); extern model_t *loadmodel; extern char loadname[32]; // for hunk tags @@ -563,7 +609,7 @@ void Mod_ValidateElements(int *elements, int numtriangles, int numverts, const c void Mod_BuildNormals(int firstvertex, int numvertices, int numtriangles, const float *vertex3f, const int *elements, float *normal3f, qboolean areaweighting); void Mod_BuildTextureVectorsAndNormals(int firstvertex, int numvertices, int numtriangles, const float *vertex, const float *texcoord, const int *elements, float *svectors, float *tvectors, float *normals, qboolean areaweighting); -surfmesh_t *Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qboolean detailtexcoords, qboolean lightmapoffsets, qboolean vertexcolors, qboolean neighbors); +surfmesh_t *Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qboolean lightmapoffsets, qboolean vertexcolors, qboolean neighbors); 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); @@ -575,8 +621,8 @@ 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); -int Mod_LoadSkinFrame(skinframe_t *skinframe, char *basename, int textureflags, int loadpantsandshirt, int usedetailtexture, int loadglowtexture); -int Mod_LoadSkinFrame_Internal(skinframe_t *skinframe, char *basename, int textureflags, int loadpantsandshirt, int usedetailtexture, int loadglowtexture, qbyte *skindata, int width, int height); +int Mod_LoadSkinFrame(skinframe_t *skinframe, const char *basename, int textureflags, int loadpantsandshirt, int loadglowtexture); +int Mod_LoadSkinFrame_Internal(skinframe_t *skinframe, const char *basename, int textureflags, int loadpantsandshirt, int loadglowtexture, const unsigned char *skindata, int width, int height, int bitsperpixel, const unsigned int *palette, const unsigned int *alphapalette); extern cvar_t r_mipskins; @@ -608,6 +654,15 @@ void Mod_BrushInit(void); int Mod_Q1BSP_NativeContentsFromSuperContents(struct model_s *model, int supercontents); int Mod_Q1BSP_SuperContentsFromNativeContents(struct model_s *model, int nativecontents); +// a lot of model formats use the Q1BSP code, so here are the prototypes... +struct entity_render_s; +void R_Q1BSP_DrawSky(struct entity_render_s *ent); +void R_Q1BSP_Draw(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); +void R_Q1BSP_CompileShadowVolume(struct entity_render_s *ent, vec3_t relativelightorigin, float lightradius, int numsurfaces, const int *surfacelist); +void R_Q1BSP_DrawShadowVolume(struct entity_render_s *ent, vec3_t relativelightorigin, 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); + // alias models struct frameblend_s; void Mod_AliasInit(void);