X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=f7b2445c5246736bb8ac2fb61ace85aff022b321;hb=84abed4f5fb96c3812143d967aa065e49e55d19d;hp=aa64aa2056ef5c1b537c8778e21a7cbf54e5c2c9;hpb=2a1615321fd8f4a44b97d5b980bb15a4a2132292;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.h b/model_shared.h index aa64aa20..f7b2445c 100644 --- a/model_shared.h +++ b/model_shared.h @@ -72,15 +72,6 @@ typedef struct overridetagnameset_s } overridetagnameset_t; -typedef struct surfmeshvertexboneweight_s -{ - unsigned int vertexindex; - unsigned int boneindex; - float origin[3]; - float weight; -} -surfmeshvertexboneweight_t; - // used for mesh lists in q1bsp/q3bsp map models // (the surfaces reference portions of these meshes) typedef struct surfmesh_s @@ -100,9 +91,9 @@ typedef struct surfmesh_s // morph blending, these are zero if model is skeletal or static int num_morphframes; float *data_morphvertex3f; - // skeletal blending, these are zero if model is morph or static - int num_vertexboneweights; - surfmeshvertexboneweight_t *data_vertexboneweights; + // skeletal blending, these are NULL if model is morph or static + int *data_vertexweightindex4i; + float *data_vertexweightinfluence4f; } surfmesh_t; @@ -144,10 +135,7 @@ shadowmesh_t; typedef enum texturelayertype_e { TEXTURELAYERTYPE_INVALID, - TEXTURELAYERTYPE_SKY, - TEXTURELAYERTYPE_LITTEXTURE_COMBINE, - TEXTURELAYERTYPE_LITTEXTURE_MULTIPASS, - TEXTURELAYERTYPE_LITTEXTURE_VERTEX, + TEXTURELAYERTYPE_LITTEXTURE, TEXTURELAYERTYPE_TEXTURE, TEXTURELAYERTYPE_FOG, } @@ -210,12 +198,20 @@ typedef struct texture_s // current texture transform matrix (used for water scrolling) matrix4x4_t currenttexmatrix; + qboolean colormapping; + rtexture_t *basetexture; + rtexture_t *glosstexture; + float specularscale; + float specularpower; + + // from q3 shaders + int customblendfunc[2]; + int currentnumlayers; texturelayer_t currentlayers[16]; // q3bsp char name[64]; - char firstpasstexturename[64]; // used only during loading int surfaceflags; int supercontents; int surfaceparms; @@ -241,12 +237,13 @@ typedef struct msurface_lightmapinfo_s unsigned char styles[MAXLIGHTMAPS]; // q1bsp // RGB lighting data [numstyles][height][width][3] unsigned char *samples; // q1bsp + // RGB normalmap data [numstyles][height][width][3] + unsigned char *nmapsamples; // q1bsp // stain to apply on lightmap (soot/dirt/blood/whatever) unsigned char *stainsamples; // q1bsp - // the stride when building lightmaps to comply with fragment update - int lightmaptexturestride; // q1bsp int texturemins[2]; // q1bsp int extents[2]; // q1bsp + int lightmaporigin[2]; // q1bsp } msurface_lightmapinfo_t; @@ -260,13 +257,14 @@ typedef struct msurface_s texture_t *texture; // the lightmap texture fragment to use on the rendering mesh rtexture_t *lightmaptexture; + // the lighting direction texture fragment to use on the rendering mesh + rtexture_t *deluxemaptexture; - // this surface is part of this mesh - surfmesh_t *groupmesh; - int num_triangles; // number of triangles in the mesh - int num_firsttriangle; // first triangle in the mesh (index into groupmesh) - int num_vertices; // number of vertices in the mesh - int num_firstvertex; // first vertex in the mesh (index into groupmesh) + // surfaces own ranges of vertices and triangles in the model->surfmesh + int num_triangles; // number of triangles + int num_firsttriangle; // first triangle + int num_vertices; // number of vertices + int num_firstvertex; // first vertex // shadow volume building information int num_firstshadowmeshtriangle; // index into model->brush.shadowmesh @@ -377,10 +375,14 @@ typedef struct model_brush_s 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]; + char skybox[MAX_QPATH]; rtexture_t *solidskytexture; rtexture_t *alphaskytexture; + + // QuakeWorld + int qw_md4sum; + int qw_md4sum2; } model_brush_t; @@ -413,9 +415,7 @@ typedef struct model_brushq1_s int num_lightdata; unsigned char *lightdata; - - int numlights; - mlight_t *lights; + unsigned char *nmaplightdata; // deluxemap file // lightmap update chains for light styles int light_styles; @@ -438,9 +438,10 @@ typedef struct model_brushq3_s int num_models; q3dmodel_t *data_models; - // freed after loading! + // used only during loading - freed after loading! int num_vertices; float *data_vertex3f; + float *data_normal3f; float *data_texcoordtexture2f; float *data_texcoordlightmap2f; float *data_color4f; @@ -471,6 +472,14 @@ typedef struct model_brushq3_s int num_lightgrid_dimensions[3]; // transform modelspace coordinates to lightgrid index matrix4x4_t num_lightgrid_indexfromworld; + + // true if this q3bsp file has been detected as using deluxemapping + // (lightmap texture pairs, every odd one is never directly refernced, + // and contains lighting normals, not colors) + qboolean deluxemapping; + // true if the detected deluxemaps are the modelspace kind, rather than + // the faster tangentspace kind + qboolean deluxemapping_modelspace; } model_brushq3_t; @@ -533,6 +542,8 @@ typedef struct model_s aliasbone_t *data_bones; int num_poses; float *data_poses; + float *data_basebonepose; + float *data_baseboneposeinverse; // textures of this model int num_textures; texture_t *data_textures; @@ -541,11 +552,8 @@ typedef struct model_s msurface_t *data_surfaces; // optional lightmapinfo data for surface lightmap updates msurface_lightmapinfo_t *data_surfaces_lightmapinfo; - // 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; + // all surfaces belong to this mesh + surfmesh_t surfmesh; // 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 @@ -559,7 +567,7 @@ typedef struct model_s // draw the lighting on a model (through stencil) 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; @@ -587,7 +595,6 @@ extern cvar_t r_fullbrights; void Mod_Init (void); model_t *Mod_LoadModel(model_t *mod, qboolean crash, qboolean checkdisk, qboolean isworldmodel); -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_UnloadModel (model_t *mod); @@ -601,11 +608,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(int *elements, int numtriangles, int numverts, const char *filename, int fileline); +void Mod_ValidateElements(int *elements, int numtriangles, int firstvertex, int numverts, const char *filename, int fileline); 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); +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); -surfmesh_t *Mod_AllocSurfMesh(mempool_t *mempool, int numvertices, int numtriangles, qboolean lightmapoffsets, qboolean vertexcolors, qboolean neighbors); +void 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); @@ -662,7 +669,7 @@ 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_Vertex3f(const model_t *model, const struct frameblend_s *frameblend, const struct surfmesh_s *mesh, float *out3f); +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);