X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=4b539e2341590b0c415dc4776e64d00b8e3531c7;hb=57a9c653ec7db430c87047ac8ee5c5edb5f556cc;hp=8d7b62642b91b261c52af6ebf0cd3fa3a9ff95a2;hpb=0a8550780de817b305bb007df85405f9ce873da6;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.h b/model_shared.h index 8d7b6264..4b539e23 100644 --- a/model_shared.h +++ b/model_shared.h @@ -72,14 +72,8 @@ typedef struct overridetagnameset_s } overridetagnameset_t; -typedef struct surfmeshvertexboneweight_s -{ - unsigned int vertexindex; - unsigned int boneindex; - float origin[3]; - float weight; -} -surfmeshvertexboneweight_t; +struct md3vertex_s; +struct trivertex_s; // used for mesh lists in q1bsp/q3bsp map models // (the surfaces reference portions of these meshes) @@ -99,10 +93,16 @@ typedef struct surfmesh_s int *data_lightmapoffsets; // index into surface's lightmap samples for vertex lighting // 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; + struct md3vertex_s *data_morphmd3vertex; + struct trivertx_s *data_morphmdlvertex; + float *data_morphmd2framesize6f; + float num_morphmdlframescale[3]; + float num_morphmdlframetranslate[3]; + // skeletal blending, these are NULL if model is morph or static + int *data_vertexweightindex4i; + float *data_vertexweightinfluence4f; + // set if there is some kind of animation on this model + qboolean isanimated; } surfmesh_t; @@ -144,9 +144,7 @@ shadowmesh_t; typedef enum texturelayertype_e { TEXTURELAYERTYPE_INVALID, - TEXTURELAYERTYPE_LITTEXTURE_COMBINE, - TEXTURELAYERTYPE_LITTEXTURE_MULTIPASS, - TEXTURELAYERTYPE_LITTEXTURE_VERTEX, + TEXTURELAYERTYPE_LITTEXTURE, TEXTURELAYERTYPE_TEXTURE, TEXTURELAYERTYPE_FOG, } @@ -215,12 +213,14 @@ typedef struct texture_s 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; @@ -269,12 +269,11 @@ typedef struct msurface_s // 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 @@ -448,9 +447,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; @@ -551,6 +551,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; @@ -559,11 +561,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 @@ -604,6 +603,7 @@ extern unsigned char *mod_base; 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); @@ -618,11 +618,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); @@ -679,7 +679,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);