X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_shared.h;h=14aba985d1a9e8816bbf40a4651eadb8a4f3c306;hp=811b4d3cebad48ce846852db37a63a5ca6b33cff;hb=59d1e032103c4af43759dc4f1b9eaccab7aed1bd;hpb=cdbfdb392f82ca6770a15238094be0c3448df1a5

diff --git a/model_shared.h b/model_shared.h
index 811b4d3c..14aba985 100644
--- a/model_shared.h
+++ b/model_shared.h
@@ -72,22 +72,20 @@ 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)
 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
 	int *data_neighbor3i; // int[tris*3] neighboring triangle on each edge (-1 if none)
+	// element buffer object (stores triangles in video memory)
+	int ebo;
+	// vertex data in system memory
 	int num_vertices; // number of vertices in the mesh
 	float *data_vertex3f; // float[verts*3] vertex locations
 	float *data_svector3f; // float[verts*3] direction of 'S' (right) texture axis for each vertex
@@ -97,12 +95,27 @@ typedef struct surfmesh_s
 	float *data_texcoordlightmap2f; // float[verts*2] texcoords for lightmap texture
 	float *data_lightmapcolor4f;
 	int *data_lightmapoffsets; // index into surface's lightmap samples for vertex lighting
+	// vertex buffer object (stores geometry in video memory)
+	int vbo;
+	size_t vbooffset_vertex3f;
+	size_t vbooffset_svector3f;
+	size_t vbooffset_tvector3f;
+	size_t vbooffset_normal3f;
+	size_t vbooffset_texcoordtexture2f;
+	size_t vbooffset_texcoordlightmap2f;
+	size_t vbooffset_lightmapcolor4f;
 	// 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;
 
@@ -138,15 +151,26 @@ typedef struct shadowmesh_s
 	// these are NULL after Mod_ShadowMesh_Finish is performed, only used
 	// while building meshes
 	shadowmeshvertexhash_t **vertexhashtable, *vertexhashentries;
+	// element buffer object (stores triangles in video memory)
+	// (created by Mod_ShadowMesh_Finish if possible)
+	int ebo;
+	// vertex buffer object (stores vertices in video memory)
+	// (created by Mod_ShadowMesh_Finish if possible)
+	int vbo;
+	size_t vbooffset_vertex3f;
+	size_t vbooffset_svector3f;
+	size_t vbooffset_tvector3f;
+	size_t vbooffset_normal3f;
+	size_t vbooffset_texcoord2f;
 }
 shadowmesh_t;
 
+#define TEXTURE_MAXFRAMES 64
+
 typedef enum texturelayertype_e
 {
 	TEXTURELAYERTYPE_INVALID,
-	TEXTURELAYERTYPE_LITTEXTURE_COMBINE,
-	TEXTURELAYERTYPE_LITTEXTURE_MULTIPASS,
-	TEXTURELAYERTYPE_LITTEXTURE_VERTEX,
+	TEXTURELAYERTYPE_LITTEXTURE,
 	TEXTURELAYERTYPE_TEXTURE,
 	TEXTURELAYERTYPE_FOG,
 }
@@ -190,8 +214,16 @@ typedef struct texture_s
 	// current material flags (updated each bmodel render)
 	int currentmaterialflags;
 
-	// loaded the same as model skins
-	skinframe_t skin;
+	// textures to use when rendering this material
+	skinframe_t *currentskinframe;
+	int numskinframes;
+	float skinframerate;
+	skinframe_t skinframes[TEXTURE_MAXFRAMES];
+	// background layer (for terrain texture blending)
+	skinframe_t *backgroundcurrentskinframe;
+	int backgroundnumskinframes;
+	float backgroundskinframerate;
+	skinframe_t backgroundskinframes[TEXTURE_MAXFRAMES];
 
 	// total frames in sequence and alternate sequence
 	int anim_total[2];
@@ -212,15 +244,19 @@ typedef struct texture_s
 	qboolean colormapping;
 	rtexture_t *basetexture;
 	rtexture_t *glosstexture;
+	rtexture_t *backgroundbasetexture;
+	rtexture_t *backgroundglosstexture;
 	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 +305,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
@@ -384,12 +419,16 @@ typedef struct model_brush_s
 	// these are actually only found on brushq1, but NULL is handled gracefully
 	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);
+	// trace a line of sight through this model (returns false if the line if sight is definitely blocked)
+	qboolean (*TraceLineOfSight)(struct model_s *model, const vec3_t start, const vec3_t end);
 
 	char skybox[MAX_QPATH];
 
 	rtexture_t *solidskytexture;
 	rtexture_t *alphaskytexture;
 
+	qboolean supportwateralpha;
+
 	// QuakeWorld
 	int qw_md4sum;
 	int qw_md4sum2;
@@ -448,9 +487,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;
@@ -463,8 +503,12 @@ typedef struct model_brushq3_s
 	q3deffect_t *data_effects;
 
 	// lightmap textures
-	int num_lightmaps;
+	int num_originallightmaps;
+	int num_mergedlightmaps;
+	int num_lightmapmergepower;
+	int num_lightmapmerge;
 	rtexture_t **data_lightmaps;
+	rtexture_t **data_deluxemaps;
 
 	// voxel light data with directional shading
 	int num_lightgrid;
@@ -551,6 +595,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,23 +605,20 @@ 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
 	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, unsigned char *outleafpvs, int *outnumleafspointer, int *outsurfacelist, unsigned char *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, unsigned char *outshadowtrispvs, unsigned char *outlighttrispvs);
 	// 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);
+	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, float lightradius, int numsurfaces, const int *surfacelist, const vec3_t lightmins, const vec3_t lightmaxs);
+	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);
 	// draw the lighting on a model (through stencil)
-	void(*DrawLight)(struct entity_render_s *ent, int numsurfaces, const int *surfacelist);
+	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);
 	// fields belonging to some types of model
@@ -604,6 +647,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);
@@ -620,9 +664,9 @@ int Mod_BuildVertexRemapTableFromElements(int numelements, const int *elements,
 void Mod_BuildTriangleNeighbors(int *neighbors, const int *elements, int numtriangles);
 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);
@@ -630,7 +674,7 @@ int Mod_ShadowMesh_AddVertex(shadowmesh_t *mesh, float *vertex14f);
 void Mod_ShadowMesh_AddTriangle(mempool_t *mempool, shadowmesh_t *mesh, rtexture_t *map_diffuse, rtexture_t *map_specular, rtexture_t *map_normal, float *vertex14f);
 void Mod_ShadowMesh_AddMesh(mempool_t *mempool, shadowmesh_t *mesh, rtexture_t *map_diffuse, rtexture_t *map_specular, rtexture_t *map_normal, const float *vertex3f, const float *svector3f, const float *tvector3f, const float *normal3f, const float *texcoord2f, int numtris, const int *element3i);
 shadowmesh_t *Mod_ShadowMesh_Begin(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_Finish(mempool_t *mempool, shadowmesh_t *firstmesh, int light, int neighbors);
+shadowmesh_t *Mod_ShadowMesh_Finish(mempool_t *mempool, shadowmesh_t *firstmesh, qboolean light, qboolean neighbors, qboolean createvbo);
 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);
 
@@ -660,6 +704,7 @@ int Mod_CountSkinFiles(skinfile_t *skinfile);
 
 void Mod_SnapVertices(int numcomponents, int numvertices, float *vertices, float snap);
 int Mod_RemoveDegenerateTriangles(int numtriangles, const int *inelement3i, int *outelement3i, const float *vertex3f);
+void Mod_VertexRangeFromElements(int numelements, const int *elements, int *firstvertexpointer, int *lastvertexpointer);
 
 // bsp models
 void Mod_BrushInit(void);
@@ -671,15 +716,15 @@ int Mod_Q1BSP_SuperContentsFromNativeContents(struct model_s *model, int nativec
 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);
+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_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_DrawLight(struct entity_render_s *ent, int numsurfaces, const int *surfacelist, const unsigned char *trispvs);
 
 // 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);
 
@@ -699,5 +744,8 @@ 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);
 
+// utility
+qboolean Mod_CanSeeBox_Trace(int numsamples, float t, model_t *model, vec3_t eye, vec3_t minsX, vec3_t maxsX);
+
 #endif	// MODEL_SHARED_H