X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_shared.h;h=4a5bfbf7a9a73e64f4cb0fbcc40acb6c25487f4b;hp=9950b0fefac46eeb95e6b69d9146c9575af97468;hb=870050f3179e27ee351cc9e1d4e797ef9dc00307;hpb=7fd79071d59a0cd0cd40ba401235643f578c8ecc diff --git a/model_shared.h b/model_shared.h index 9950b0fe..4a5bfbf7 100644 --- a/model_shared.h +++ b/model_shared.h @@ -82,6 +82,11 @@ typedef struct skinframe_s qboolean qgeneratemerged; qboolean qgeneratenmap; qboolean qgenerateglow; + // for q2 wal files we have some extra info + int q2flags; + int q2value; + int q2contents; + // we could also store the q2animname from the wal but we have no current need of it } skinframe_t; @@ -103,41 +108,35 @@ blendweights_t; typedef struct r_vertexgeneric_s { - // 24 bytes + // 36 bytes float vertex3f[3]; - unsigned char color4ub[4]; + float color4f[4]; float texcoord2f[2]; } r_vertexgeneric_t; typedef struct r_vertexmesh_s { - // 68 bytes + // 88 bytes float vertex3f[3]; - unsigned char color4ub[4]; + float color4f[4]; float texcoordtexture2f[2]; float texcoordlightmap2f[2]; float svector3f[3]; float tvector3f[3]; float normal3f[3]; + unsigned char skeletalindex4ub[4]; + unsigned char skeletalweight4ub[4]; } r_vertexmesh_t; -typedef struct r_vertexbouncelight_s -{ - // 32 bytes - float vertex3f[3]; - unsigned char color4ub[4]; - float texcoord4f[4]; -} -r_vertexbouncelight_t; - typedef struct r_meshbuffer_s { int bufferobject; // OpenGL void *devicebuffer; // Direct3D size_t size; qboolean isindexbuffer; + qboolean isuniformbuffer; qboolean isdynamic; qboolean isindex16; char name[MAX_QPATH]; @@ -152,10 +151,10 @@ typedef struct surfmesh_s 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 r_meshbuffer_t *data_element3i_indexbuffer; - size_t data_element3i_bufferoffset; + int data_element3i_bufferoffset; unsigned short *data_element3s; // unsigned short[tris*3] triangles of the mesh in unsigned short format (NULL if num_vertices > 65536) r_meshbuffer_t *data_element3s_indexbuffer; - size_t data_element3s_bufferoffset; + int data_element3s_bufferoffset; int *data_neighbor3i; // int[tris*3] neighboring triangle on each edge (-1 if none) // vertex data in system memory int num_vertices; // number of vertices in the mesh @@ -166,16 +165,22 @@ typedef struct surfmesh_s float *data_texcoordtexture2f; // float[verts*2] texcoords for surface texture float *data_texcoordlightmap2f; // float[verts*2] texcoords for lightmap texture float *data_lightmapcolor4f; + unsigned char *data_skeletalindex4ub; + unsigned char *data_skeletalweight4ub; int *data_lightmapoffsets; // index into surface's lightmap samples for vertex lighting + r_vertexmesh_t *data_vertexmesh; // interleaved arrays for D3D // vertex buffer object (stores geometry in video memory) r_meshbuffer_t *vbo_vertexbuffer; - 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; + int vbooffset_vertex3f; + int vbooffset_svector3f; + int vbooffset_tvector3f; + int vbooffset_normal3f; + int vbooffset_texcoordtexture2f; + int vbooffset_texcoordlightmap2f; + int vbooffset_lightmapcolor4f; + int vbooffset_skeletalindex4ub; + int vbooffset_skeletalweight4ub; + int vbooffset_vertexmesh; // morph blending, these are zero if model is skeletal or static int num_morphframes; struct md3vertex_s *data_morphmd3vertex; @@ -192,9 +197,7 @@ typedef struct surfmesh_s qboolean isanimated; // vertex and index buffers for rendering - r_vertexmesh_t *vertexmesh; - r_meshbuffer_t *vertex3fbuffer; - r_meshbuffer_t *vertexmeshbuffer; + r_meshbuffer_t *vertexmesh_vertexbuffer; } surfmesh_t; @@ -226,10 +229,13 @@ typedef struct shadowmesh_s // used always int *element3i; r_meshbuffer_t *element3i_indexbuffer; - size_t element3i_bufferoffset; + int element3i_bufferoffset; unsigned short *element3s; r_meshbuffer_t *element3s_indexbuffer; - size_t element3s_bufferoffset; + int element3s_bufferoffset; + // vertex/index buffers for rendering + // (created by Mod_ShadowMesh_Finish if possible) + r_vertexmesh_t *vertexmesh; // usually NULL // used for shadow mapping cubemap side partitioning int sideoffsets[6], sidetotals[6]; // used for shadow mesh (NULL on light mesh) @@ -238,16 +244,12 @@ typedef struct shadowmesh_s // while building meshes shadowmeshvertexhash_t **vertexhashtable, *vertexhashentries; r_meshbuffer_t *vbo_vertexbuffer; - size_t vbooffset_vertex3f; - size_t vbooffset_svector3f; - size_t vbooffset_tvector3f; - size_t vbooffset_normal3f; - size_t vbooffset_texcoord2f; - // vertex/index buffers for rendering - // (created by Mod_ShadowMesh_Finish if possible) - r_vertexmesh_t *vertexmesh; // usually NULL - r_meshbuffer_t *vertex3fbuffer; - r_meshbuffer_t *vertexmeshbuffer; // usually NULL + int vbooffset_vertex3f; + int vbooffset_svector3f; + int vbooffset_tvector3f; + int vbooffset_normal3f; + int vbooffset_texcoord2f; + int vbooffset_vertexmesh; } shadowmesh_t; @@ -260,6 +262,7 @@ shadowmesh_t; #define Q3TEXTUREFLAG_REFLECTION 512 #define Q3TEXTUREFLAG_WATERSHADER 1024 #define Q3TEXTUREFLAG_CAMERA 2048 +#define Q3TEXTUREFLAG_TRANSPARENTSORT 4096 #define Q3PATHLENGTH 64 #define TEXTURE_MAXFRAMES 64 @@ -435,12 +438,19 @@ typedef enum dpoffsetmapping_technique_s OFFSETMAPPING_RELIEF // relief }dpoffsetmapping_technique_t; +typedef enum dptransparentsort_category_e +{ + TRANSPARENTSORT_SKY, + TRANSPARENTSORT_DISTANCE, + TRANSPARENTSORT_HUD, +}dptransparentsortcategory_t; typedef struct q3shaderinfo_s { char name[Q3PATHLENGTH]; #define Q3SHADERINFO_COMPARE_START surfaceparms int surfaceparms; + int surfaceflags; int textureflags; int numlayers; qboolean lighting; @@ -454,12 +464,16 @@ typedef struct q3shaderinfo_s // dp-specific additions: // shadow control + qboolean dpnortlight; qboolean dpshadow; qboolean dpnoshadow; // add collisions to all triangles of the surface qboolean dpmeshcollisions; + // kill shader based on cvar checks + qboolean dpshaderkill; + // fake reflection char dpreflectcube[Q3PATHLENGTH]; @@ -476,14 +490,21 @@ typedef struct q3shaderinfo_s // offsetmapping dpoffsetmapping_technique_t offsetmapping; float offsetscale; + float offsetbias; // 0 is normal, 1 leads to alpha 0 being neutral and alpha 1 pushing "out" // polygonoffset (only used if Q3TEXTUREFLAG_POLYGONOFFSET) float biaspolygonoffset, biaspolygonfactor; + // transparent sort category + dptransparentsortcategory_t transparentsort; + // gloss float specularscalemod; float specularpowermod; -#define Q3SHADERINFO_COMPARE_END specularpowermod + + // rtlighting ambient addition + float rtlightambient; +#define Q3SHADERINFO_COMPARE_END rtlightambient } q3shaderinfo_t; @@ -522,6 +543,8 @@ typedef struct texture_s int basematerialflags; // current material flags (updated each bmodel render) int currentmaterialflags; + // base material alpha (used for Q2 materials) + float basealpha; // PolygonOffset values for rendering this material // (these are added to the r_refdef values and submodel values) @@ -544,14 +567,14 @@ typedef struct texture_s // direct pointers to each of the frames in the sequences // (indexed as [alternate][frame]) struct texture_s *anim_frames[2][10]; - // set if animated or there is an alternate frame set - // (this is an optimization in the renderer) + // 1 = q1bsp animation with anim_total[0] >= 2 (animated) or anim_total[1] >= 1 (alternate frame set) + // 2 = q2bsp animation with anim_total[0] >= 2 (uses self.frame) int animated; // renderer checks if this texture needs updating... int update_lastrenderframe; void *update_lastrenderentity; - // the current alpha of this texture (may be affected by r_wateralpha) + // the current alpha of this texture (may be affected by r_wateralpha, also basealpha, and ent->alpha) float currentalpha; // the current texture frame in animation struct texture_s *currentframe; @@ -600,9 +623,15 @@ typedef struct texture_s char name[64]; int surfaceflags; int supercontents; - int surfaceparms; int textureflags; + // q2bsp + // we have to load the texture multiple times when Q2SURF_ flags differ, + // though it still shares the skinframe + int q2flags; + int q2value; + int q2contents; + // 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) @@ -617,18 +646,29 @@ typedef struct texture_s // offsetmapping dpoffsetmapping_technique_t offsetmapping; float offsetscale; + float offsetbias; + + // transparent sort category + dptransparentsortcategory_t transparentsort; // gloss float specularscalemod; float specularpowermod; + + // diffuse and ambient + float rtlightambient; } texture_t; typedef struct mtexinfo_s { - float vecs[2][4]; - texture_t *texture; - int flags; + float vecs[2][4]; // [s/t][xyz offset] + int textureindex; + int q1flags; + int q2flags; // miptex flags + overrides + int q2value; // light emission, etc + char q2texture[32]; // texture name (textures/*.wal) + int q2nexttexinfo; // for animations, -1 = end of chain } mtexinfo_t; @@ -721,6 +761,12 @@ typedef struct model_brush_s { // true if this model is a HalfLife .bsp file qboolean ishlbsp; + // true if this model is a BSP2rmqe .bsp file (expanded 32bit bsp format for rmqe) + qboolean isbsp2rmqe; + // true if this model is a BSP2 .bsp file (expanded 32bit bsp format for DarkPlaces, others?) + qboolean isbsp2; + // true if this model is a Quake2 .bsp file (IBSP46) + qboolean isq2bsp; // string of entity definitions (.map format) char *entities; @@ -796,7 +842,7 @@ typedef struct model_brush_s int (*FindBoxClusters)(struct model_s *model, const vec3_t mins, const vec3_t maxs, int maxclusters, int *clusterlist); void (*LightPoint)(struct model_s *model, const vec3_t p, vec3_t ambientcolor, vec3_t diffusecolor, vec3_t diffusenormal); void (*FindNonSolidLocation)(struct model_s *model, const vec3_t in, vec3_t out, vec_t radius); - mleaf_t *(*PointInLeaf)(struct model_s *model, const float *p); + mleaf_t *(*PointInLeaf)(struct model_s *model, const vec3_t p); // 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); @@ -818,7 +864,7 @@ model_brush_t; typedef struct model_brushq1_s { - dmodel_t *submodels; + mmodel_t *submodels; int numvertexes; mvertex_t *vertexes; @@ -854,12 +900,11 @@ typedef struct model_brushq1_s } model_brushq1_t; -/* MSVC can't compile empty structs, so this is commented out for now typedef struct model_brushq2_s { + int dummy; // MSVC can't handle an empty struct } model_brushq2_t; -*/ typedef struct model_brushq3_s { @@ -976,10 +1021,10 @@ typedef struct model_s // for skeletal models int num_bones; aliasbone_t *data_bones; - float num_posescale; // scaling factor from origin in poses6s format (includes divide by 32767) - float num_poseinvscale; // scaling factor to origin in poses6s format (includes multiply by 32767) + float num_posescale; // scaling factor from origin in poses7s format (includes divide by 32767) + float num_poseinvscale; // scaling factor to origin in poses7s format (includes multiply by 32767) int num_poses; - short *data_poses6s; // origin xyz, quat xyz, w implied negative, unit length, values normalized to +/-32767 range + short *data_poses7s; // origin xyz, quat xyzw, unit length, values normalized to +/-32767 range float *data_baseboneposeinverse; // textures of this model int num_textures; @@ -1031,19 +1076,20 @@ typedef struct model_s void (*TracePoint)(struct model_s *model, const struct frameblend_s *frameblend, const struct skeleton_s *skeleton, struct trace_s *trace, const vec3_t start, int hitsupercontentsmask); // find the supercontents value at a point in this model int (*PointSuperContents)(struct model_s *model, int frame, const vec3_t point); + // trace a line against geometry in this model and report correct texture (used by r_shadow_bouncegrid) + void (*TraceLineAgainstSurfaces)(struct model_s *model, const struct frameblend_s *frameblend, const struct skeleton_s *skeleton, struct trace_s *trace, const vec3_t start, const vec3_t end, int hitsupercontentsmask); // fields belonging to some types of model model_sprite_t sprite; model_brush_t brush; model_brushq1_t brushq1; - /* MSVC can't handle an empty struct, so this is commented out for now model_brushq2_t brushq2; - */ model_brushq3_t brushq3; // flags this model for offseting sounds to the model center (used by brush models) int soundfromcenter; // if set, the model contains light information (lightmap, or vertexlight) qboolean lit; + float lightmapscale; } dp_model_t; @@ -1105,13 +1151,6 @@ qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qbool extern cvar_t r_mipskins; extern cvar_t r_mipnormalmaps; -typedef struct skeleton_s -{ - const dp_model_t *model; - matrix4x4_t *relativetransforms; -} -skeleton_t; - typedef struct skinfileitem_s { struct skinfileitem_s *next; @@ -1162,6 +1201,9 @@ void Mod_BrushInit(void); // used for talking to the QuakeC mainly int Mod_Q1BSP_NativeContentsFromSuperContents(struct model_s *model, int supercontents); int Mod_Q1BSP_SuperContentsFromNativeContents(struct model_s *model, int nativecontents); +// used for loading wal files in Mod_LoadTextureFromQ3Shader +int Mod_Q2BSP_SuperContentsFromNativeContents(dp_model_t *model, int nativecontents); +int Mod_Q2BSP_NativeContentsFromSuperContents(dp_model_t *model, int supercontents); // a lot of model formats use the Q1BSP code, so here are the prototypes... struct entity_render_s; @@ -1184,6 +1226,8 @@ void Mod_CollisionBIH_TraceLine(dp_model_t *model, const struct frameblend_s *fr void Mod_CollisionBIH_TraceBox(dp_model_t *model, const struct frameblend_s *frameblend, const skeleton_t *skeleton, struct trace_s *trace, const vec3_t start, const vec3_t boxmins, const vec3_t boxmaxs, const vec3_t end, int hitsupercontentsmask); void Mod_CollisionBIH_TraceBrush(dp_model_t *model, const struct frameblend_s *frameblend, const skeleton_t *skeleton, struct trace_s *trace, struct colbrushf_s *start, struct colbrushf_s *end, int hitsupercontentsmask); void Mod_CollisionBIH_TracePoint_Mesh(dp_model_t *model, const struct frameblend_s *frameblend, const skeleton_t *skeleton, struct trace_s *trace, const vec3_t start, int hitsupercontentsmask); +qboolean Mod_CollisionBIH_TraceLineOfSight(struct model_s *model, const vec3_t start, const vec3_t end); +int Mod_CollisionBIH_PointSuperContents(struct model_s *model, int frame, const vec3_t point); int Mod_CollisionBIH_PointSuperContents_Mesh(struct model_s *model, int frame, const vec3_t point); bih_t *Mod_MakeCollisionBIH(dp_model_t *model, qboolean userendersurfaces, bih_t *out);