X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=2c3630eafef79e46fb9cfc91b9d14c95cf93c186;hb=d560c170ab305550f8fc6ab39d94daee5b732fbd;hp=04012cd552552c874f7f80f437d76bef44012981;hpb=15d156000c710dcbad5b2372e6ffbc0fddf7dde2;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.h b/model_shared.h index 04012cd5..2c3630ea 100644 --- a/model_shared.h +++ b/model_shared.h @@ -18,13 +18,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef __MODEL__ -#define __MODEL__ +#ifndef MODEL_SHARED_H +#define MODEL_SHARED_H -#ifndef SYNCTYPE_T -#define SYNCTYPE_T typedef enum {ST_SYNC=0, ST_RAND } synctype_t; -#endif /* @@ -33,7 +30,7 @@ m*_t structures are in-memory */ -typedef enum {mod_invalid, mod_brush, mod_sprite, mod_alias, mod_brushq2, mod_brushq3} modtype_t; +typedef enum {mod_invalid, mod_brushq1, mod_sprite, mod_alias, mod_brushq2, mod_brushq3} modtype_t; typedef struct animscene_s { @@ -120,31 +117,22 @@ shadowmesh_t; typedef struct model_alias_s { - // LordHavoc: Q2/ZYM model support - int aliastype; + // mdl/md2/md3/zym model formats are treated the same after loading - // mdl/md2/md3 models are the same after loading + // the shader meshes comprising this model int aliasnum_meshes; aliasmesh_t *aliasdata_meshes; + // for md3 models int aliasnum_tags; int aliasnum_tagframes; aliastag_t *aliasdata_tags; - // for Zymotic models - int zymnum_verts; - int zymnum_tris; - int zymnum_shaders; - int zymnum_bones; - int zymnum_scenes; - float *zymdata_texcoords; - rtexture_t **zymdata_textures; - qbyte *zymdata_trizone; - zymbone_t *zymdata_bones; - unsigned int *zymdata_vertbonecounts; - zymvertex_t *zymdata_verts; - unsigned int *zymdata_renderlist; - float *zymdata_poses; + // for skeletal models + int aliasnum_bones; + aliasbone_t *aliasdata_bones; + int aliasnum_poses; + float *aliasdata_poses; } model_alias_t; @@ -277,7 +265,6 @@ typedef struct model_brushq1_s int *light_stylevalue; msurface_t ***light_styleupdatechains; msurface_t **light_styleupdatechainsbuffer; - float light_ambient; mleaf_t *(*PointInLeaf)(struct model_s *model, const float *p); void (*BuildPVSTextureChains)(struct model_s *model); @@ -340,6 +327,7 @@ model_brushq2_t; #define Q3SURFACEPARM_TRANS 16777216 #define Q3SURFACEPARM_WATER 33554432 +struct q3msurface_s; typedef struct q3mtexture_s { char name[Q3PATHLENGTH]; @@ -350,6 +338,10 @@ typedef struct q3mtexture_s int number; skinframe_t skin; + + int numfaces; + struct q3msurface_s **facelist; + int *facenumlist; } q3mtexture_t; @@ -376,7 +368,8 @@ typedef struct q3mleaf_s int clusterindex; int areaindex; int numleaffaces; - struct q3mface_s **firstleafface; + struct q3msurface_s **firstleafface; + int *firstleaffacenum; int numleafbrushes; struct q3mbrush_s **firstleafbrush; } @@ -387,7 +380,7 @@ typedef struct q3mmodel_s vec3_t mins; vec3_t maxs; int numfaces; - struct q3mface_s *firstface; + struct q3msurface_s *firstface; int numbrushes; struct q3mbrush_s *firstbrush; } @@ -417,21 +410,17 @@ typedef struct q3meffect_s } q3meffect_t; -typedef struct q3mface_s +typedef struct q3msurface_s { + // FIXME: collisionmarkframe should be kept in a separate array + // FIXME: visframe should be kept in a separate array + // FIXME: shadowmark should be kept in a separate array + struct q3mtexture_s *texture; struct q3meffect_s *effect; rtexture_t *lightmaptexture; - int collisions; // performs per triangle collisions on this surface int collisionmarkframe; // don't collide twice in one trace - int type; - int firstvertex; - int firstelement; - int patchsize[2]; - // used for processing - int markframe; - // (world only) visframe == r_framecount means it is visible this frame - int visframe; + int visframe; // visframe == r_framecount means it is visible this frame // bounding box for culling float mins[3]; float maxs[3]; @@ -455,12 +444,9 @@ typedef struct q3mface_s // index into model->brush.shadowmesh int num_firstshadowmeshtriangle; - + // used for shadow volume generation int shadowmark; - - // temporary use by light processing - int lighttemp_castshadow; } q3msurface_t; @@ -472,6 +458,8 @@ typedef struct model_brushq3_s int num_textures; q3mtexture_t *data_textures; + q3msurface_t **data_texturefaces; + int *data_texturefacenums; int num_planes; mplane_t *data_planes; @@ -487,6 +475,7 @@ typedef struct model_brushq3_s int num_leaffaces; q3msurface_t **data_leaffaces; + int *data_leaffacenums; int num_models; q3mmodel_t *data_models; @@ -562,8 +551,6 @@ typedef struct model_s int flags; // engine calculated flags, ones that can not be set in the file int flags2; - // LordHavoc: if true (normally only for sprites) the model/sprite/bmodel is always rendered fullbright - int fullbright; // number of QC accessible frame(group)s in the model int numframes; // number of QC accessible skin(group)s in the model @@ -651,8 +638,10 @@ void Mod_LoadModels(void); extern model_t *loadmodel; 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(const int *elements, int numtriangles, int numverts, const char *filename, int fileline); +void Mod_BuildNormals(int numverts, int numtriangles, const float *vertex3f, const int *elements, float *normal3f); void Mod_BuildTextureVectorsAndNormals(int numverts, int numtriangles, const float *vertex, const float *texcoord, const int *elements, float *svectors, float *tvectors, float *normals); 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); @@ -695,5 +684,5 @@ int Mod_CountSkinFiles(skinfile_t *skinfile); int Mod_RemoveDegenerateTriangles(int numtriangles, const int *inelement3i, int *outelement3i, const float *vertex3f); -#endif // __MODEL__ +#endif // MODEL_SHARED_H