X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=1f171ca382cbd8df991e64c4fa50117ab1e172bd;hb=3c1cea722b752981259169c795de9d2cbe94952f;hp=4020b2b716a096a6c844819a8368d1fb38e733f5;hpb=873252304e74ca61e2572542bf58400399cecc80;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.h b/model_shared.h index 4020b2b7..1f171ca3 100644 --- a/model_shared.h +++ b/model_shared.h @@ -75,20 +75,6 @@ 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 +91,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 +158,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 +166,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; @@ -341,6 +331,7 @@ typedef struct q3shaderinfo_layer_s int clampmap; float framerate; int numframes; + int texflags; char** texturename; int blendfunc[2]; q3shaderinfo_layer_rgbgen_t rgbgen; @@ -373,12 +364,14 @@ typedef struct q3shaderinfo_s char skyboxname[Q3PATHLENGTH]; q3shaderinfo_deform_t deforms[Q3MAXDEFORMS]; + // 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) float refractfactor; // amount of refraction distort (1.0 = like the cvar specifies) vec4_t refractcolor4f; // color tint of refraction (including alpha factor) 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 } q3shaderinfo_t; @@ -429,11 +422,10 @@ typedef struct texture_s // current material flags (updated each bmodel render) int currentmaterialflags; - // current PolygonOffset values for rendering this material - float currentpolygonfactor; - float currentpolygonoffset; - float basepolygonfactor; - float basepolygonoffset; + // PolygonOffset values for rendering this material + // (these are added to the r_refdef values and submodel values) + float biaspolygonfactor; + float biaspolygonoffset; // textures to use when rendering this material skinframe_t *currentskinframe; @@ -478,6 +470,10 @@ typedef struct texture_s float specularpower; // color tint (colormod * currentalpha) used for rtlighting this material float dlightcolor[3]; + // color tint (colormod * 2) used for lightmapped lighting on this material + // includes alpha as 4th component + // replaces role of gl_Color in GLSL shader + float lightmapcolor[4]; // from q3 shaders int customblendfunc[2]; @@ -499,6 +495,7 @@ typedef struct texture_s vec4_t refractcolor4f; // color tint of refraction (including alpha factor) 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 } texture_t; @@ -514,7 +511,7 @@ typedef struct msurface_lightmapinfo_s { // texture mapping properties used by this surface mtexinfo_t *texinfo; // q1bsp - // index into r_refdef.lightstylevalue array, 255 means not used (black) + // index into r_refdef.scene.lightstylevalue array, 255 means not used (black) unsigned char styles[MAXLIGHTMAPS]; // q1bsp // RGB lighting data [numstyles][height][width][3] unsigned char *samples; // q1bsp @@ -593,8 +590,6 @@ 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; @@ -699,7 +694,6 @@ typedef struct model_brushq1_s int numclipnodes; mclipnode_t *clipnodes; - int numhulls; // this variable is only used by MCBSP, other formats know it intuitively hull_t hulls[MAX_MAP_HULLS]; int num_compressedpvs; @@ -776,6 +770,8 @@ typedef struct model_brushq3_s } model_brushq3_t; +struct frameblend_s; + typedef struct model_s { // name and path of model, for example "progs/player.mdl" @@ -847,6 +843,8 @@ typedef struct model_s surfmesh_t surfmesh; // data type of model const char *modeldatatypestring; + // generates vertex data for a given frameblend + void(*AnimateVertices)(const struct model_s *model, const struct frameblend_s *frameblend, float *vertex3f, float *normal3f, float *svector3f, float *tvector3f); // draw the model's sky polygons (only used by brush models) void(*DrawSky)(struct entity_render_s *ent); // draw refraction/reflection textures for the model's water polygons (only used by brush models) @@ -867,6 +865,8 @@ typedef struct model_s void(*DrawLight)(struct entity_render_s *ent, int numsurfaces, const int *surfacelist, const unsigned char *trispvs); // trace a box against this model 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); + // find the supercontents value at a point in this model + int (*PointSuperContents)(struct model_s *model, int frame, const vec3_t point); // fields belonging to some types of model model_sprite_t sprite; model_brush_t brush; @@ -875,17 +875,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; @@ -894,16 +892,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, qboolean isworldmodel); +dp_model_t *Mod_FindName (const char *name); +dp_model_t *Mod_ForName (const char *name, qboolean crash, qboolean checkdisk, qboolean isworldmodel); +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); @@ -926,7 +924,7 @@ void Mod_ShadowMesh_Free(shadowmesh_t *mesh); void Mod_LoadQ3Shaders(void); q3shaderinfo_t *Mod_LookupQ3Shader(const char *name); -qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qboolean q1bsp, qboolean q3bsp, qboolean md3); +qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qboolean warnmissing, qboolean fallback, int defaulttexflags); extern cvar_t r_mipskins; @@ -974,28 +972,27 @@ void R_Q1BSP_DrawLight(struct entity_render_s *ent, int numsurfaces, const int * // alias models struct frameblend_s; void Mod_AliasInit(void); -void Mod_Alias_GetMesh_Vertices(const model_t *model, const struct frameblend_s *frameblend, float *vertex3f, float *normal3f, float *svector3f, float *tvector3f); -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); // 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_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